Request 463 (accepted)

Overview

Request 463 (accepted)

Update to 0.9.9, no idea where I got the .ebuild from ...

Created by dnh over 11 years ago
In state accepted
Package maintainers: dnh, frispete, and pbleser

Submit handbrake

Submit package home:dnh:branches:Multimedia / handbrake to package Multimedia / handbrake

handbrake.changes Changed

handbrake.spec Changed

@@ -14,9 +14,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           handbrake
-#define rev 3549
-#Version:			0.9.4+r%{rev}
-Version:        0.9.8
+Version:        0.9.9
 Release:        1.pm.1
 License:        GPL-2.0+
 Summary:        Multithreaded Video Transcoder
@@ -27,32 +25,21 @@
 Source:         http://prdownloads.sourceforge.net/handbrake/HandBrake-%{version}.tar.bz2
 Source101:      http://download.handbrake.fr/handbrake/contrib/a52dec-0.7.4.tar.gz
 Source102:      http://download.handbrake.fr/handbrake/contrib/faac-1.28.tar.gz
-Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
-Source104:      http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2
-Source105:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
-Source106:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
-Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
-Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
+#Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
+Source104:      http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
+Source105:      http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
+Source106:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
+Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
+Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
 Source109:      http://download.handbrake.fr/handbrake/contrib/libmkv-0.6.5-0-g82075ae.tar.gz
-Source110:      http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
-Source111:      http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
-Source112:      http://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
-Source113:      http://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2
-Source114:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
-Source115:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
-Source116:      http://download.handbrake.fr/handbrake/contrib/x264-r2146-bcd41db.tar.gz
-Source117:      http://download.m0k.org/handbrake/contrib/fontconfig-2.8.0.tar.gz
-Source118:      http://download.handbrake.fr/handbrake/contrib/freetype-2.4.7.tar.bz2
-Source119:      http://download.handbrake.fr/handbrake/contrib/libass-0.10.0-1.tar.gz
-Source120:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.0.1-pre-213-ga869da8.tar.gz
-Source121:      http://download.m0k.org/handbrake/contrib/libxml2-2.7.7.tar.gz
-Source122:      http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
-Source123:      http://download.handbrake.fr/handbrake/contrib/yasm-1.1.0.tar.gz
+Source110:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
+Source111:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
+Source112:      http://download.handbrake.fr/handbrake/contrib/x264-r2273-b3065e6.tar.gz
+Source113:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.2.3.tar.bz2
+#Source120:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
 Source151:      handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
 Source152:      handbrake-libmkv_no_return_in_nonvoid_function.patch
 Source99:       handbrake-rpmlintrc
-Patch0:         handbrake-harfbuzz.patch
-Patch1:         handbrake-CLI_libs.patch
 BuildRequires:  alsa-devel
 BuildRequires:  curl
 BuildRequires:  fribidi-devel
@@ -92,9 +79,9 @@
 BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  make
-BuildRequires:  nasm
 BuildRequires:  update-desktop-files
-BuildRequires:  yasm
+BuildRequires:  fontconfig-devel freetype2-devel libxml2-devel libass-devel
+BuildRequires:  libogg-devel libvorbis-devel libtheora-devel libsamplerate-devel
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -129,16 +116,22 @@
 %setup -q -n "HandBrake-%{version}"
 %endif
 
-%patch0 -p1
-%patch1 -p0
+# unstable, so patch from 0.9.8 did not apply, use the script
+# used to generate the patch instead
+mv -i libhb/hb.h libhb/handbrake.h
+mv -i gtk/src/hb-backend.h gtk/src/handbrake-backend.h
+find $ -name '*.h' -o -name '*.c' $ -exec \
+    grep -l 'include.*"hb.h\|hb-backend.h"' {} + | \
+    xargs perl -pi -e 's/include\s*"hb.h"/include "handbrake.h"/;
+      s/include\s*"hb-backend.h"/include "handbrake-backend.h"/'
 
 # Copy 3rd party dependencies into expected locations:
 mkdir download
+# 
 for f in \
-%{S:101} %{S:102} %{S:103} %{S:104} %{S:105} %{S:106} \
+%{S:101} %{S:102} %{S:104} %{S:105} %{S:106} \
 %{S:107} %{S:108} %{S:109} %{S:110} %{S:111} %{S:112} \
-%{S:113} %{S:114} %{S:115} %{S:116} %{S:117} %{S:118} \
-%{S:119} %{S:120} %{S:121} %{S:122} %{S:123} \
+%{S:113} \
 ; do
      ln -s "$f" download/
 done
@@ -151,7 +144,10 @@
 | while read url; do
      f=$(echo "$url" | sed 's|^.*/||')
      case $f in
-    	  bzip2*|libiconv*|pthreads*|zlib*) continue ;;
+    	  bzip2*|libiconv*|pthreads*|zlib*|autoconf*|automake*|\
+          fdk-aac*|fontconfig*|freetype*|libass*|libogg*|libsamplerate*|\
+          libtheora*|libtool*|libvorbis*|libxml2*|m4*)
+            continue ;;
      esac
      [ -e "$RPM_SOURCE_DIR/$f" ] || echo "$url">>"$missing"
 done
@@ -163,22 +159,20 @@
 fi
 
 %build
-# will be removed when the makefiles are fixed, currently
-# fails on openSUSE factory because of --as-needed
-# export SUSE_ASNEEDED=0
 export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused"
 export CXXFLAGS="$CFLAGS -Wno-reorder"
+export PATH="%{_builddir}/HandBrake-%{version}/build/contrib/bin:$PATH"
 
-# cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch
 cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch
 
-mkdir build
+mkdir -p build
 ./configure \
      --force \
      --build="$PWD/build" \
      --prefix="%{buildroot}%{_prefix}" \
      --strip="/bin/true" \
      --optimize=speed \
+     --enable-ff-mpeg2 \
      --debug=max
 
 GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify"
@@ -189,7 +183,7 @@
 pushd build
 make libhb/project.h
 make %{?_smp_mflags} V=1 \
-    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb" \
+    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb -I../../contrib/include" \
     GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
 popd #build

handbrake-CLI_libs.patch Deleted

handbrake-harfbuzz.patch Deleted

@@ -1,1443 +0,0 @@
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/audiohandler.c HandBrake-0.9.8/gtk/src/audiohandler.c
---- HandBrake-0.9.8.orig/gtk/src/audiohandler.c	2012-05-05 20:13:43.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/audiohandler.c	2013-04-05 20:37:10.000000000 +0200
-@@ -12,9 +12,9 @@
-  */
- 
- #include "ghbcompat.h"
--#include "hb.h"
-+#include "handbrake.h"
- #include "settings.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "values.h"
- #include "callbacks.h"
- #include "preview.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/callbacks.c HandBrake-0.9.8/gtk/src/callbacks.c
---- HandBrake-0.9.8.orig/gtk/src/callbacks.c	2012-06-21 20:31:30.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/callbacks.c	2013-04-05 20:37:10.000000000 +0200
-@@ -64,7 +64,7 @@
- #include <libappindicator/app-indicator.h>
- #endif
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "callbacks.h"
- #include "queuehandler.h"
- #include "audiohandler.h"
-@@ -76,7 +76,7 @@
- #include "values.h"
- #include "plist.h"
- #include "appcast.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "ghb-dvd.h"
- #include "ghbcellrenderertext.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h HandBrake-0.9.8/gtk/src/handbrake-backend.h
---- HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h	1970-01-01 01:00:00.000000000 +0100
-+++ HandBrake-0.9.8/gtk/src/handbrake-backend.h	2013-04-05 20:56:10.000000000 +0200
-@@ -0,0 +1,184 @@
-+/*
-+ * 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 Library 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
-+ */
-+ 
-+#if !defined(_HBBACKEND_H_)
-+#define _HBBACKEND_H_
-+
-+#include "settings.h"
-+#include "handbrake.h"
-+
-+enum
-+{
-+	GHB_ERROR_NONE,
-+	GHB_ERROR_CANCELED,
-+	GHB_ERROR_FAIL,
-+};
-+
-+typedef struct
-+{
-+	gint state;
-+
-+	// SCANNING
-+	gint title_count;
-+	gint title_cur;
-+
-+	// WORKING
-+	gint unique_id;
-+	gint job_cur;
-+	gint job_count;
-+	gdouble progress;
-+	gdouble rate_cur;
-+	gdouble rate_avg;
-+	gint hours;
-+	gint minutes;
-+	gint seconds;
-+	gint error;
-+} ghb_instance_status_t;
-+
-+typedef struct
-+{
-+	ghb_instance_status_t scan;
-+	ghb_instance_status_t queue;
-+} ghb_status_t;
-+
-+#define GHB_PIC_KEEP_WIDTH          0x01
-+#define GHB_PIC_KEEP_HEIGHT         0x02
-+#define GHB_PIC_KEEP_DISPLAY_WIDTH  0x04
-+#define GHB_PIC_KEEP_DISPLAY_HEIGHT 0x08
-+#define GHB_PIC_KEEP_DAR            0x10
-+#define GHB_PIC_KEEP_PAR            0x20
-+#define GHB_PIC_USE_MAX             0x40
-+
-+typedef struct
-+{
-+	gchar *path;
-+	gchar *name;
-+	gint index;
-+	gint type;
-+	char *video_codec_name;
-+	gint width;
-+	gint height;
-+	gint crop[4];
-+	gint num_chapters;
-+	gint rate;
-+	gint rate_base;
-+	gint interlaced;
-+	gint aspect_n;
-+	gint aspect_d;
-+	gint hours;
-+	gint minutes;
-+	gint seconds;
-+	gint64 duration;
-+	gint angle_count;
-+} ghb_title_info_t;
-+
-+#define GHB_AUDIO_SAMPLERATE 1
-+#define GHB_AUDIO_BITRATE 2
-+#define GHB_FRAMERATE 3
-+
-+const gchar* ghb_version(void);
-+void ghb_vquality_range(
-+	signal_user_data_t *ud, 
-+	gdouble *min, 
-+	gdouble *max,
-+	gdouble *step,
-+	gdouble *page,
-+	gint *digits,
-+	gboolean *inverted);
-+//const gchar* ghb_get_rate_string(gint rate, gint type);
-+void ghb_combo_init(signal_user_data_t *ud);
-+void ghb_backend_init(gint debug);
-+void ghb_backend_close(void);
-+void ghb_add_job(GValue *js, gint unique_id);
-+void ghb_remove_job(gint unique_id);
-+void ghb_start_queue(void);
-+void ghb_stop_queue(void);
-+void ghb_pause_queue(void);
-+
-+void ghb_add_live_job(GValue *js, gint unique_id);
-+void ghb_start_live_encode();
-+void ghb_stop_live_encode();
-+
-+void ghb_clear_scan_state(gint state);
-+void ghb_clear_queue_state(gint state);
-+
-+void ghb_set_state(gint state);
-+gint ghb_get_scan_state();
-+gint ghb_get_queue_state();
-+void ghb_get_status(ghb_status_t *status);
-+void ghb_track_status(void);
-+void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
-+void ghb_backend_scan_stop();
-+void ghb_backend_queue_scan(const gchar *path, gint titleindex);
-+gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
-+void ghb_par_init(signal_user_data_t *ud);
-+void ghb_set_scale(signal_user_data_t *ud, gint mode);
-+void ghb_set_scale_settings(GValue *settings, gint mode);
-+GValue* ghb_get_chapters(gint titleindex);
-+void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss);
-+void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
-+gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix);
-+gboolean ghb_ac3_in_audio_list(const GValue *audio_list);
-+gboolean ghb_audio_is_passthru(gint acodec);
-+gboolean ghb_audio_can_passthru(gint acodec);
-+gint ghb_get_default_acodec(void);
-+hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
-+void ghb_set_bitrate_opts(
-+	GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
-+void ghb_grey_combo_options(signal_user_data_t *ud);
-+void ghb_update_ui_combo_box(
-+	signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
-+gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
-+gint ghb_find_audio_track(
-+	gint titleindex, const gchar *lang, gint acodec, 
-+	gint fallback_acodec, GHashTable *track_indices);
-+const gchar* ghb_audio_track_description(gint track, int titleindex);
-+void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
-+gint ghb_find_pref_subtitle_track(const gchar *lang);
-+gint ghb_find_subtitle_track(
-+	gint titleindex, const gchar *lang, gboolean burn, 
-+	gboolean force, gint source, GHashTable *track_indices);
-+gint ghb_pick_subtitle_track(signal_user_data_t *ud);
-+gint ghb_find_cc_track(gint titleindex);
-+gint ghb_longest_title(void);
-+gchar* ghb_build_advanced_opts_string(GValue *settings);
-+GdkPixbuf* ghb_get_preview_image(
-+	gint titleindex, gint index, signal_user_data_t *ud,
-+	gint *width, gint *height);
-+gchar* ghb_dvd_volname(const gchar *device);
-+gint ghb_get_title_number(gint titleindex);
-+int ghb_get_title_count();
-+gint ghb_subtitle_track_source(GValue *settings, gint track);
-+const char* ghb_subtitle_track_source_name(GValue *settings, gint track);
-+const char* ghb_subtitle_source_name(gint source);
-+gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
-+
-+gboolean ghb_validate_vquality(GValue *settings);
-+gboolean ghb_validate_audio(GValue *settings);
-+gboolean ghb_validate_subtitles(GValue *settings);
-+gboolean ghb_validate_video(GValue *settings);
-+gboolean ghb_validate_filters(GValue *settings);
-+gboolean ghb_validate_filter_string(const gchar *str, gint max_fields);
-+void ghb_hb_cleanup(gboolean partial);
-+gint ghb_lookup_combo_int(const gchar *name, const GValue *gval);
-+gdouble ghb_lookup_combo_double(const gchar *name, const GValue *gval);
-+const gchar* ghb_lookup_combo_option(const gchar *name, const GValue *gval);
-+const gchar* ghb_lookup_combo_string(const gchar *name, const GValue *gval);
-+gchar* ghb_get_tmp_dir();
-+gint ghb_find_closest_audio_rate(gint rate);
-+GValue* ghb_lookup_acodec_value(gint val);
-+
-+#endif // _HBBACKEND_H_
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/hb-backend.c HandBrake-0.9.8/gtk/src/hb-backend.c
---- HandBrake-0.9.8.orig/gtk/src/hb-backend.c	2012-06-08 22:39:42.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/hb-backend.c	2013-04-05 20:37:10.000000000 +0200
-@@ -24,10 +24,10 @@
- #define _GNU_SOURCE
- #include <limits.h>
- #include <math.h>
--#include "hb.h"
-+#include "handbrake.h"
- #include "ghbcompat.h"
- #include <glib/gstdio.h>
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "settings.h"
- #include "callbacks.h"
- #include "subtitlehandler.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/hb-backend.h HandBrake-0.9.8/gtk/src/hb-backend.h
---- HandBrake-0.9.8.orig/gtk/src/hb-backend.h	2011-10-16 19:33:20.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/hb-backend.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,184 +0,0 @@
--/*
-- * 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 Library 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
-- */
-- 
--#if !defined(_HBBACKEND_H_)
--#define _HBBACKEND_H_
--
--#include "settings.h"
--#include "hb.h"
--
--enum
--{
--	GHB_ERROR_NONE,
--	GHB_ERROR_CANCELED,
--	GHB_ERROR_FAIL,
--};
--
--typedef struct
--{
--	gint state;
--
--	// SCANNING
--	gint title_count;
--	gint title_cur;
--
--	// WORKING
--	gint unique_id;
--	gint job_cur;
--	gint job_count;
--	gdouble progress;
--	gdouble rate_cur;
--	gdouble rate_avg;
--	gint hours;
--	gint minutes;
--	gint seconds;
--	gint error;
--} ghb_instance_status_t;
--
--typedef struct
--{
--	ghb_instance_status_t scan;
--	ghb_instance_status_t queue;
--} ghb_status_t;
--
--#define GHB_PIC_KEEP_WIDTH          0x01
--#define GHB_PIC_KEEP_HEIGHT         0x02
--#define GHB_PIC_KEEP_DISPLAY_WIDTH  0x04
--#define GHB_PIC_KEEP_DISPLAY_HEIGHT 0x08
--#define GHB_PIC_KEEP_DAR            0x10
--#define GHB_PIC_KEEP_PAR            0x20
--#define GHB_PIC_USE_MAX             0x40
--
--typedef struct
--{
--	gchar *path;
--	gchar *name;
--	gint index;
--	gint type;
--	char *video_codec_name;
--	gint width;
--	gint height;
--	gint crop[4];
--	gint num_chapters;
--	gint rate;
--	gint rate_base;
--	gint interlaced;
--	gint aspect_n;
--	gint aspect_d;
--	gint hours;
--	gint minutes;
--	gint seconds;
--	gint64 duration;
--	gint angle_count;
--} ghb_title_info_t;
--
--#define GHB_AUDIO_SAMPLERATE 1
--#define GHB_AUDIO_BITRATE 2
--#define GHB_FRAMERATE 3
--
--const gchar* ghb_version(void);
--void ghb_vquality_range(
--	signal_user_data_t *ud, 
--	gdouble *min, 
--	gdouble *max,
--	gdouble *step,
--	gdouble *page,
--	gint *digits,
--	gboolean *inverted);
--//const gchar* ghb_get_rate_string(gint rate, gint type);
--void ghb_combo_init(signal_user_data_t *ud);
--void ghb_backend_init(gint debug);
--void ghb_backend_close(void);
--void ghb_add_job(GValue *js, gint unique_id);
--void ghb_remove_job(gint unique_id);
--void ghb_start_queue(void);
--void ghb_stop_queue(void);
--void ghb_pause_queue(void);
--
--void ghb_add_live_job(GValue *js, gint unique_id);
--void ghb_start_live_encode();
--void ghb_stop_live_encode();
--
--void ghb_clear_scan_state(gint state);
--void ghb_clear_queue_state(gint state);
--
--void ghb_set_state(gint state);
--gint ghb_get_scan_state();
--gint ghb_get_queue_state();
--void ghb_get_status(ghb_status_t *status);
--void ghb_track_status(void);
--void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
--void ghb_backend_scan_stop();
--void ghb_backend_queue_scan(const gchar *path, gint titleindex);
--gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
--void ghb_par_init(signal_user_data_t *ud);
--void ghb_set_scale(signal_user_data_t *ud, gint mode);
--void ghb_set_scale_settings(GValue *settings, gint mode);
--GValue* ghb_get_chapters(gint titleindex);
--void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss);
--void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
--gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix);
--gboolean ghb_ac3_in_audio_list(const GValue *audio_list);
--gboolean ghb_audio_is_passthru(gint acodec);
--gboolean ghb_audio_can_passthru(gint acodec);
--gint ghb_get_default_acodec(void);
--hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
--void ghb_set_bitrate_opts(
--	GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
--void ghb_grey_combo_options(signal_user_data_t *ud);
--void ghb_update_ui_combo_box(
--	signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
--gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
--gint ghb_find_audio_track(
--	gint titleindex, const gchar *lang, gint acodec, 
--	gint fallback_acodec, GHashTable *track_indices);
--const gchar* ghb_audio_track_description(gint track, int titleindex);
--void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
--gint ghb_find_pref_subtitle_track(const gchar *lang);
--gint ghb_find_subtitle_track(
--	gint titleindex, const gchar *lang, gboolean burn, 
--	gboolean force, gint source, GHashTable *track_indices);
--gint ghb_pick_subtitle_track(signal_user_data_t *ud);
--gint ghb_find_cc_track(gint titleindex);
--gint ghb_longest_title(void);
--gchar* ghb_build_advanced_opts_string(GValue *settings);
--GdkPixbuf* ghb_get_preview_image(
--	gint titleindex, gint index, signal_user_data_t *ud,
--	gint *width, gint *height);
--gchar* ghb_dvd_volname(const gchar *device);
--gint ghb_get_title_number(gint titleindex);
--int ghb_get_title_count();
--gint ghb_subtitle_track_source(GValue *settings, gint track);
--const char* ghb_subtitle_track_source_name(GValue *settings, gint track);
--const char* ghb_subtitle_source_name(gint source);
--gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
--
--gboolean ghb_validate_vquality(GValue *settings);
--gboolean ghb_validate_audio(GValue *settings);
--gboolean ghb_validate_subtitles(GValue *settings);
--gboolean ghb_validate_video(GValue *settings);
--gboolean ghb_validate_filters(GValue *settings);
--gboolean ghb_validate_filter_string(const gchar *str, gint max_fields);
--void ghb_hb_cleanup(gboolean partial);
--gint ghb_lookup_combo_int(const gchar *name, const GValue *gval);
--gdouble ghb_lookup_combo_double(const gchar *name, const GValue *gval);
--const gchar* ghb_lookup_combo_option(const gchar *name, const GValue *gval);
--const gchar* ghb_lookup_combo_string(const gchar *name, const GValue *gval);
--gchar* ghb_get_tmp_dir();
--gint ghb_find_closest_audio_rate(gint rate);
--GValue* ghb_lookup_acodec_value(gint val);
--
--#endif // _HBBACKEND_H_
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/main.c HandBrake-0.9.8/gtk/src/main.c
---- HandBrake-0.9.8.orig/gtk/src/main.c	2011-11-14 05:22:37.000000000 +0100
-+++ HandBrake-0.9.8/gtk/src/main.c	2013-04-05 20:37:10.000000000 +0200
-@@ -53,9 +53,9 @@
- 
- #include <glib/gstdio.h>
- #include <gio/gio.h>
--#include "hb.h"
-+#include "handbrake.h"
- #include "renderer_button.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "ghb-dvd.h"
- #include "ghbcellrenderertext.h"
- #include "values.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/presets.c HandBrake-0.9.8/gtk/src/presets.c
---- HandBrake-0.9.8.orig/gtk/src/presets.c	2012-07-17 19:40:33.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/presets.c	2013-04-05 20:37:10.000000000 +0200
-@@ -20,12 +20,12 @@
- #include <glib/gstdio.h>
- #include <string.h>
- #include "ghbcompat.h"
--#include "hb.h"
-+#include "handbrake.h"
- #include "settings.h"
- #include "callbacks.h"
- #include "audiohandler.h"
- #include "subtitlehandler.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "plist.h"
- #include "resources.h"
- #include "presets.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/preview.c HandBrake-0.9.8/gtk/src/preview.c
---- HandBrake-0.9.8.orig/gtk/src/preview.c	2011-06-03 17:55:00.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/preview.c	2013-04-05 20:37:10.000000000 +0200
-@@ -31,10 +31,10 @@
- #include "settings.h"
- #include "presets.h"
- #include "callbacks.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "preview.h"
- #include "values.h"
--#include "hb.h"
-+#include "handbrake.h"
- 
- #define PREVIEW_STATE_IMAGE 0
- #define PREVIEW_STATE_LIVE 1
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/queuehandler.c HandBrake-0.9.8/gtk/src/queuehandler.c
---- HandBrake-0.9.8.orig/gtk/src/queuehandler.c	2012-03-31 17:37:30.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/queuehandler.c	2013-04-05 20:37:10.000000000 +0200
-@@ -14,9 +14,9 @@
- #include "ghbcompat.h"
- #include <glib/gstdio.h>
- #include <gio/gio.h>
--#include "hb.h"
-+#include "handbrake.h"
- #include "settings.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "values.h"
- #include "callbacks.h"
- #include "presets.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/settings.c HandBrake-0.9.8/gtk/src/settings.c
---- HandBrake-0.9.8.orig/gtk/src/settings.c	2011-10-16 19:33:20.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/settings.c	2013-04-05 20:37:10.000000000 +0200
-@@ -18,7 +18,7 @@
- #include <string.h>
- #include "ghbcompat.h"
- #include "settings.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "values.h"
- 
- void dump_settings(GValue *settings);
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/subtitlehandler.c HandBrake-0.9.8/gtk/src/subtitlehandler.c
---- HandBrake-0.9.8.orig/gtk/src/subtitlehandler.c	2011-10-16 19:33:20.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/subtitlehandler.c	2013-04-05 20:37:10.000000000 +0200
-@@ -12,9 +12,9 @@
-  */
- 
- #include "ghbcompat.h"
--#include "hb.h"
-+#include "handbrake.h"
- #include "settings.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "values.h"
- #include "callbacks.h"
- #include "preview.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/x264handler.c HandBrake-0.9.8/gtk/src/x264handler.c
---- HandBrake-0.9.8.orig/gtk/src/x264handler.c	2011-08-03 17:02:49.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/x264handler.c	2013-04-05 20:37:10.000000000 +0200
-@@ -17,7 +17,7 @@
- #include "values.h"
- #include "callbacks.h"
- #include "presets.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "x264handler.h"
- 
- gint ghb_lookup_bframes(const gchar *options);
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/batch.c HandBrake-0.9.8/libhb/batch.c
---- HandBrake-0.9.8.orig/libhb/batch.c	2011-07-27 17:09:49.000000000 +0200
-+++ HandBrake-0.9.8/libhb/batch.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "lang.h"
- 
- struct hb_batch_s
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/bd.c HandBrake-0.9.8/libhb/bd.c
---- HandBrake-0.9.8.orig/libhb/bd.c	2011-09-19 17:35:46.000000000 +0200
-+++ HandBrake-0.9.8/libhb/bd.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "lang.h"
- #include "hbffmpeg.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/common.c HandBrake-0.9.8/libhb/common.c
---- HandBrake-0.9.8.orig/libhb/common.c	2012-03-19 23:02:23.000000000 +0100
-+++ HandBrake-0.9.8/libhb/common.c	2013-04-05 20:10:38.000000000 +0200
-@@ -11,7 +11,7 @@
- 
- #include "common.h"
- #include "lang.h"
--#include "hb.h"
-+#include "handbrake.h"
- 
- /**********************************************************************
-  * Global variables
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deblock.c HandBrake-0.9.8/libhb/deblock.c
---- HandBrake-0.9.8.orig/libhb/deblock.c	2008-12-13 07:55:01.000000000 +0100
-+++ HandBrake-0.9.8/libhb/deblock.c	2013-04-05 20:10:38.000000000 +0200
-@@ -16,7 +16,7 @@
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deca52.c HandBrake-0.9.8/libhb/deca52.c
---- HandBrake-0.9.8.orig/libhb/deca52.c	2012-05-01 12:08:03.000000000 +0200
-+++ HandBrake-0.9.8/libhb/deca52.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "downmix.h"
- 
- #include "a52dec/a52.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decavcodec.c HandBrake-0.9.8/libhb/decavcodec.c
---- HandBrake-0.9.8.orig/libhb/decavcodec.c	2012-07-17 00:37:08.000000000 +0200
-+++ HandBrake-0.9.8/libhb/decavcodec.c	2013-04-05 20:10:38.000000000 +0200
-@@ -35,7 +35,7 @@
-     VC1 decoder) can't easily be used by the HB mpeg stream reader.
-  */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "downmix.h"
- #include "libavcodec/audioconvert.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deccc608sub.c HandBrake-0.9.8/libhb/deccc608sub.c
---- HandBrake-0.9.8.orig/libhb/deccc608sub.c	2010-05-30 19:08:12.000000000 +0200
-+++ HandBrake-0.9.8/libhb/deccc608sub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-  *
-  * Note that the SRT sub generation from CC could be useful for mkv subs.
-  */
--#include "hb.h"
-+#include "handbrake.h"
- #include "deccc608sub.h"
- 
- /*
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decdca.c HandBrake-0.9.8/libhb/decdca.c
---- HandBrake-0.9.8.orig/libhb/decdca.c	2012-05-01 12:08:03.000000000 +0200
-+++ HandBrake-0.9.8/libhb/decdca.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "downmix.h"
- 
- #include "dca.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/declpcm.c HandBrake-0.9.8/libhb/declpcm.c
---- HandBrake-0.9.8.orig/libhb/declpcm.c	2012-05-01 12:08:03.000000000 +0200
-+++ HandBrake-0.9.8/libhb/declpcm.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "downmix.h"
- 
- struct hb_work_private_s
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decmpeg2.c HandBrake-0.9.8/libhb/decmpeg2.c
---- HandBrake-0.9.8.orig/libhb/decmpeg2.c	2011-11-11 00:29:23.000000000 +0100
-+++ HandBrake-0.9.8/libhb/decmpeg2.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decomb.c HandBrake-0.9.8/libhb/decomb.c
---- HandBrake-0.9.8.orig/libhb/decomb.c	2012-07-07 01:13:03.000000000 +0200
-+++ HandBrake-0.9.8/libhb/decomb.c	2013-04-05 20:10:38.000000000 +0200
-@@ -74,7 +74,7 @@
- 16: DOES NOT WORK BY ITSELF-- mcdeint needs to be fed by another deinterlacer
- *****/
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- #include "eedi2.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decsrtsub.c HandBrake-0.9.8/libhb/decsrtsub.c
---- HandBrake-0.9.8.orig/libhb/decsrtsub.c	2010-06-02 01:02:41.000000000 +0200
-+++ HandBrake-0.9.8/libhb/decsrtsub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -8,7 +8,7 @@
- #include <string.h>
- #include <iconv.h>
- #include <errno.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- struct start_and_end {
-     unsigned long start, end;
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decssasub.c HandBrake-0.9.8/libhb/decssasub.c
---- HandBrake-0.9.8.orig/libhb/decssasub.c	2011-09-24 20:42:05.000000000 +0200
-+++ HandBrake-0.9.8/libhb/decssasub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -21,7 +21,7 @@
-  */
- #include <stdlib.h>
- #include <stdio.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- #include <ass/ass.h>
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/dectx3gsub.c HandBrake-0.9.8/libhb/dectx3gsub.c
---- HandBrake-0.9.8.orig/libhb/dectx3gsub.c	2010-06-01 22:21:49.000000000 +0200
-+++ HandBrake-0.9.8/libhb/dectx3gsub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- typedef enum {
-     BOLD        = 0x1,
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decutf8sub.c HandBrake-0.9.8/libhb/decutf8sub.c
---- HandBrake-0.9.8.orig/libhb/decutf8sub.c	2010-05-04 18:56:43.000000000 +0200
-+++ HandBrake-0.9.8/libhb/decutf8sub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -14,7 +14,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- static int decutf8Init( hb_work_object_t * w, hb_job_t * job )
- {
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decvobsub.c HandBrake-0.9.8/libhb/decvobsub.c
---- HandBrake-0.9.8.orig/libhb/decvobsub.c	2011-12-22 17:36:51.000000000 +0100
-+++ HandBrake-0.9.8/libhb/decvobsub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -24,7 +24,7 @@
-  *   }
-  */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- struct hb_work_private_s
- {
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deinterlace.c HandBrake-0.9.8/libhb/deinterlace.c
---- HandBrake-0.9.8.orig/libhb/deinterlace.c	2012-06-25 09:49:25.000000000 +0200
-+++ HandBrake-0.9.8/libhb/deinterlace.c	2013-04-05 20:10:38.000000000 +0200
-@@ -16,7 +16,7 @@
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- #include "mcdeint.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/demuxmpeg.c HandBrake-0.9.8/libhb/demuxmpeg.c
---- HandBrake-0.9.8.orig/libhb/demuxmpeg.c	2012-03-18 21:03:10.000000000 +0100
-+++ HandBrake-0.9.8/libhb/demuxmpeg.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- static inline void check_mpeg_scr( hb_psdemux_t *state, int64_t scr, int tol )
- {
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/denoise.c HandBrake-0.9.8/libhb/denoise.c
---- HandBrake-0.9.8.orig/libhb/denoise.c	2008-12-13 07:55:01.000000000 +0100
-+++ HandBrake-0.9.8/libhb/denoise.c	2013-04-05 20:10:38.000000000 +0200
-@@ -16,7 +16,7 @@
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/detelecine.c HandBrake-0.9.8/libhb/detelecine.c
---- HandBrake-0.9.8.orig/libhb/detelecine.c	2009-10-31 16:09:22.000000000 +0100
-+++ HandBrake-0.9.8/libhb/detelecine.c	2013-04-05 20:10:38.000000000 +0200
-@@ -1,4 +1,4 @@
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/dvd.c HandBrake-0.9.8/libhb/dvd.c
---- HandBrake-0.9.8.orig/libhb/dvd.c	2012-05-01 13:24:28.000000000 +0200
-+++ HandBrake-0.9.8/libhb/dvd.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "lang.h"
- #include "dvd.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/dvdnav.c HandBrake-0.9.8/libhb/dvdnav.c
---- HandBrake-0.9.8.orig/libhb/dvdnav.c	2011-09-26 22:37:46.000000000 +0200
-+++ HandBrake-0.9.8/libhb/dvdnav.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "lang.h"
- #include "dvd.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/eedi2.c HandBrake-0.9.8/libhb/eedi2.c
---- HandBrake-0.9.8.orig/libhb/eedi2.c	2009-03-19 18:30:56.000000000 +0100
-+++ HandBrake-0.9.8/libhb/eedi2.c	2013-04-05 20:10:38.000000000 +0200
-@@ -8,7 +8,7 @@
-    http://web.missouri.edu/~kes25c/
- */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "eedi2.h"
- 
- /**
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encavcodec.c HandBrake-0.9.8/libhb/encavcodec.c
---- HandBrake-0.9.8.orig/libhb/encavcodec.c	2011-10-15 23:32:20.000000000 +0200
-+++ HandBrake-0.9.8/libhb/encavcodec.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- 
- /*
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encavcodecaudio.c HandBrake-0.9.8/libhb/encavcodecaudio.c
---- HandBrake-0.9.8.orig/libhb/encavcodecaudio.c	2012-07-17 00:37:08.000000000 +0200
-+++ HandBrake-0.9.8/libhb/encavcodecaudio.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "downmix.h"
- #include "libavcodec/audioconvert.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encfaac.c HandBrake-0.9.8/libhb/encfaac.c
---- HandBrake-0.9.8.orig/libhb/encfaac.c	2011-10-12 22:19:33.000000000 +0200
-+++ HandBrake-0.9.8/libhb/encfaac.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #include "faac.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/enclame.c HandBrake-0.9.8/libhb/enclame.c
---- HandBrake-0.9.8.orig/libhb/enclame.c	2011-10-12 22:19:33.000000000 +0200
-+++ HandBrake-0.9.8/libhb/enclame.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #include "lame/lame.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/enctheora.c HandBrake-0.9.8/libhb/enctheora.c
---- HandBrake-0.9.8.orig/libhb/enctheora.c	2011-03-21 03:20:48.000000000 +0100
-+++ HandBrake-0.9.8/libhb/enctheora.c	2013-04-05 20:10:38.000000000 +0200
-@@ -2,7 +2,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "theora/codec.h"
- #include "theora/theoraenc.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encvobsub.c HandBrake-0.9.8/libhb/encvobsub.c
---- HandBrake-0.9.8.orig/libhb/encvobsub.c	2009-05-20 00:27:11.000000000 +0200
-+++ HandBrake-0.9.8/libhb/encvobsub.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- struct hb_work_private_s
- {
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encvorbis.c HandBrake-0.9.8/libhb/encvorbis.c
---- HandBrake-0.9.8.orig/libhb/encvorbis.c	2012-02-22 00:56:12.000000000 +0100
-+++ HandBrake-0.9.8/libhb/encvorbis.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #include "vorbis/vorbisenc.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encx264.c HandBrake-0.9.8/libhb/encx264.c
---- HandBrake-0.9.8.orig/libhb/encx264.c	2011-10-02 23:28:45.000000000 +0200
-+++ HandBrake-0.9.8/libhb/encx264.c	2013-04-05 20:10:38.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- #include <stdarg.h>
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #include "x264.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/fifo.c HandBrake-0.9.8/libhb/fifo.c
---- HandBrake-0.9.8.orig/libhb/fifo.c	2011-12-21 23:07:05.000000000 +0100
-+++ HandBrake-0.9.8/libhb/fifo.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #ifndef SYS_DARWIN
- #include <malloc.h>
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/handbrake.h HandBrake-0.9.8/libhb/handbrake.h
---- HandBrake-0.9.8.orig/libhb/handbrake.h	1970-01-01 01:00:00.000000000 +0100
-+++ HandBrake-0.9.8/libhb/handbrake.h	2012-07-07 01:29:10.000000000 +0200
-@@ -0,0 +1,126 @@
-+#ifndef HB_HB_H
-+#define HB_HB_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "project.h"
-+#include "common.h"
-+
-+#ifdef __APPLE__
-+#include <CoreServices/CoreServices.h> // for Gestalt
-+#include <AudioToolbox/AudioToolbox.h>
-+#include <dlfcn.h>
-+#endif
-+/* Whether the Core Audio HE-AAC encoder is available on the system. */
-+int encca_haac_available();
-+
-+/* hb_init()
-+   Initializes a libhb session (launches his own thread, detects CPUs,
-+   etc) */
-+#define HB_DEBUG_NONE 0
-+#define HB_DEBUG_ALL  1
-+void          hb_register( hb_work_object_t * );
-+void          hb_register_logger( void (*log_cb)(const char* message) );
-+hb_handle_t * hb_init( int verbose, int update_check );
-+hb_handle_t * hb_init_dl ( int verbose, int update_check ); // hb_init for use with dylib
-+
-+/* hb_get_version() */
-+char        * hb_get_version( hb_handle_t * );
-+int           hb_get_build( hb_handle_t * );
-+
-+/* hb_check_update()
-+   Checks for an update on the website. If there is, returns the build
-+   number and points 'version' to a version description. Returns a
-+   negative value otherwise. */
-+int           hb_check_update( hb_handle_t * h, char ** version );
-+
-+
-+char *        hb_dvd_name( char * path );
-+void          hb_dvd_set_dvdnav( int enable );
-+
-+/* hb_scan()
-+   Scan the specified path. Can be a DVD device, a VIDEO_TS folder or
-+   a VOB file. If title_index is 0, scan all titles. */
-+void          hb_scan( hb_handle_t *, const char * path,
-+                       int title_index, int preview_count,
-+                       int store_previews, uint64_t min_duration );
-+void          hb_scan_stop( hb_handle_t * );
-+hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings);
-+uint64_t      hb_first_duration( hb_handle_t * );
-+
-+/* hb_get_titles()
-+   Returns the list of valid titles detected by the latest scan. */
-+hb_list_t   * hb_get_titles( hb_handle_t * );
-+
-+/* hb_detect_comb()
-+   Analyze a frame for interlacing artifacts, returns true if they're found.
-+   Taken from Thomas Oestreich's 32detect filter in the Transcode project.  */
-+int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold );
-+
-+void          hb_get_preview_by_index( hb_handle_t *, int, int, uint8_t * );
-+void          hb_get_preview( hb_handle_t *, hb_title_t *, int,
-+                              uint8_t * );
-+void          hb_set_size( hb_job_t *, double ratio, int pixels );
-+void          hb_set_anamorphic_size_by_index( hb_handle_t *, int,
-+                int *output_width, int *output_height,
-+                int *output_par_width, int *output_par_height );
-+void          hb_set_anamorphic_size( hb_job_t *,
-+                int *output_width, int *output_height,
-+                int *output_par_width, int *output_par_height );
-+
-+/* Handling jobs */
-+int           hb_count( hb_handle_t * );
-+hb_job_t *    hb_job( hb_handle_t *, int );
-+void          hb_set_chapter_name( hb_handle_t *, int, int, const char * );
-+void          hb_set_job( hb_handle_t *, int, hb_job_t * );
-+void          hb_add( hb_handle_t *, hb_job_t * );
-+void          hb_rem( hb_handle_t *, hb_job_t * );
-+
-+void          hb_start( hb_handle_t * );
-+void          hb_pause( hb_handle_t * );
-+void          hb_resume( hb_handle_t * );
-+void          hb_stop( hb_handle_t * );
-+
-+/* Persistent data between jobs. */
-+typedef struct hb_interjob_s
-+{
-+    int last_job;          /* job->sequence_id & 0xFFFFFF */
-+    int frame_count;       /* number of frames counted by sync */
-+    int out_frame_count;   /* number of frames counted by render */
-+    uint64_t total_time;   /* real length in 90kHz ticks (i.e. seconds / 90000) */
-+    int vrate;             /* actual measured output vrate from 1st pass */
-+    int vrate_base;        /* actual measured output vrate_base from 1st pass */
-+
-+    hb_subtitle_t *select_subtitle; /* foreign language scan subtitle */
-+} hb_interjob_t;
-+
-+hb_interjob_t * hb_interjob_get( hb_handle_t * ); 
-+
-+/* hb_get_state()
-+   Should be regularly called by the UI (like 5 or 10 times a second).
-+   Look at test/test.c to see how to use it. */
-+void hb_get_state( hb_handle_t *, hb_state_t * );
-+void hb_get_state2( hb_handle_t *, hb_state_t * );
-+/* hb_get_scancount() is called by the MacGui in UpdateUI to
-+   check for a new scan during HB_STATE_WORKING phase  */
-+int hb_get_scancount( hb_handle_t * );
-+
-+/* hb_close()
-+   Aborts all current jobs if any, frees memory. */
-+void          hb_close( hb_handle_t ** );
-+
-+/* hb_global_close()
-+   Performs final cleanup for the process. */
-+void          hb_global_close();
-+
-+/* hb_get_instance_id()
-+   Return the unique instance id of an libhb instance created by hb_init. */
-+int hb_get_instance_id( hb_handle_t * h );
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/hb.c HandBrake-0.9.8/libhb/hb.c
---- HandBrake-0.9.8.orig/libhb/hb.c	2012-07-07 01:29:10.000000000 +0200
-+++ HandBrake-0.9.8/libhb/hb.c	2013-04-05 20:10:38.000000000 +0200
-@@ -1,4 +1,4 @@
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include <stdio.h>
- #include <unistd.h>
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/hb.h HandBrake-0.9.8/libhb/hb.h
---- HandBrake-0.9.8.orig/libhb/hb.h	2012-07-07 01:29:10.000000000 +0200
-+++ HandBrake-0.9.8/libhb/hb.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,126 +0,0 @@
--#ifndef HB_HB_H
--#define HB_HB_H
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#include "project.h"
--#include "common.h"
--
--#ifdef __APPLE__
--#include <CoreServices/CoreServices.h> // for Gestalt
--#include <AudioToolbox/AudioToolbox.h>
--#include <dlfcn.h>
--#endif
--/* Whether the Core Audio HE-AAC encoder is available on the system. */
--int encca_haac_available();
--
--/* hb_init()
--   Initializes a libhb session (launches his own thread, detects CPUs,
--   etc) */
--#define HB_DEBUG_NONE 0
--#define HB_DEBUG_ALL  1
--void          hb_register( hb_work_object_t * );
--void          hb_register_logger( void (*log_cb)(const char* message) );
--hb_handle_t * hb_init( int verbose, int update_check );
--hb_handle_t * hb_init_dl ( int verbose, int update_check ); // hb_init for use with dylib
--
--/* hb_get_version() */
--char        * hb_get_version( hb_handle_t * );
--int           hb_get_build( hb_handle_t * );
--
--/* hb_check_update()
--   Checks for an update on the website. If there is, returns the build
--   number and points 'version' to a version description. Returns a
--   negative value otherwise. */
--int           hb_check_update( hb_handle_t * h, char ** version );
--
--
--char *        hb_dvd_name( char * path );
--void          hb_dvd_set_dvdnav( int enable );
--
--/* hb_scan()
--   Scan the specified path. Can be a DVD device, a VIDEO_TS folder or
--   a VOB file. If title_index is 0, scan all titles. */
--void          hb_scan( hb_handle_t *, const char * path,
--                       int title_index, int preview_count,
--                       int store_previews, uint64_t min_duration );
--void          hb_scan_stop( hb_handle_t * );
--hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings);
--uint64_t      hb_first_duration( hb_handle_t * );
--
--/* hb_get_titles()
--   Returns the list of valid titles detected by the latest scan. */
--hb_list_t   * hb_get_titles( hb_handle_t * );
--
--/* hb_detect_comb()
--   Analyze a frame for interlacing artifacts, returns true if they're found.
--   Taken from Thomas Oestreich's 32detect filter in the Transcode project.  */
--int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold );
--
--void          hb_get_preview_by_index( hb_handle_t *, int, int, uint8_t * );
--void          hb_get_preview( hb_handle_t *, hb_title_t *, int,
--                              uint8_t * );
--void          hb_set_size( hb_job_t *, double ratio, int pixels );
--void          hb_set_anamorphic_size_by_index( hb_handle_t *, int,
--                int *output_width, int *output_height,
--                int *output_par_width, int *output_par_height );
--void          hb_set_anamorphic_size( hb_job_t *,
--                int *output_width, int *output_height,
--                int *output_par_width, int *output_par_height );
--
--/* Handling jobs */
--int           hb_count( hb_handle_t * );
--hb_job_t *    hb_job( hb_handle_t *, int );
--void          hb_set_chapter_name( hb_handle_t *, int, int, const char * );
--void          hb_set_job( hb_handle_t *, int, hb_job_t * );
--void          hb_add( hb_handle_t *, hb_job_t * );
--void          hb_rem( hb_handle_t *, hb_job_t * );
--
--void          hb_start( hb_handle_t * );
--void          hb_pause( hb_handle_t * );
--void          hb_resume( hb_handle_t * );
--void          hb_stop( hb_handle_t * );
--
--/* Persistent data between jobs. */
--typedef struct hb_interjob_s
--{
--    int last_job;          /* job->sequence_id & 0xFFFFFF */
--    int frame_count;       /* number of frames counted by sync */
--    int out_frame_count;   /* number of frames counted by render */
--    uint64_t total_time;   /* real length in 90kHz ticks (i.e. seconds / 90000) */
--    int vrate;             /* actual measured output vrate from 1st pass */
--    int vrate_base;        /* actual measured output vrate_base from 1st pass */
--
--    hb_subtitle_t *select_subtitle; /* foreign language scan subtitle */
--} hb_interjob_t;
--
--hb_interjob_t * hb_interjob_get( hb_handle_t * ); 
--
--/* hb_get_state()
--   Should be regularly called by the UI (like 5 or 10 times a second).
--   Look at test/test.c to see how to use it. */
--void hb_get_state( hb_handle_t *, hb_state_t * );
--void hb_get_state2( hb_handle_t *, hb_state_t * );
--/* hb_get_scancount() is called by the MacGui in UpdateUI to
--   check for a new scan during HB_STATE_WORKING phase  */
--int hb_get_scancount( hb_handle_t * );
--
--/* hb_close()
--   Aborts all current jobs if any, frees memory. */
--void          hb_close( hb_handle_t ** );
--
--/* hb_global_close()
--   Performs final cleanup for the process. */
--void          hb_global_close();
--
--/* hb_get_instance_id()
--   Return the unique instance id of an libhb instance created by hb_init. */
--int hb_get_instance_id( hb_handle_t * h );
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/mcdeint.c HandBrake-0.9.8/libhb/mcdeint.c
---- HandBrake-0.9.8.orig/libhb/mcdeint.c	2011-10-15 23:32:20.000000000 +0200
-+++ HandBrake-0.9.8/libhb/mcdeint.c	2013-04-05 20:10:38.000000000 +0200
-@@ -16,7 +16,7 @@
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "mpeg2dec/mpeg2.h"
- #include "mcdeint.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/muxcommon.c HandBrake-0.9.8/libhb/muxcommon.c
---- HandBrake-0.9.8.orig/libhb/muxcommon.c	2011-11-15 00:50:18.000000000 +0100
-+++ HandBrake-0.9.8/libhb/muxcommon.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #define MIN_BUFFERING (1024*1024*10)
- #define MAX_BUFFERING (1024*1024*50)
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/muxmkv.c HandBrake-0.9.8/libhb/muxmkv.c
---- HandBrake-0.9.8.orig/libhb/muxmkv.c	2012-06-29 14:24:41.000000000 +0200
-+++ HandBrake-0.9.8/libhb/muxmkv.c	2013-04-05 20:10:38.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- #include <ogg/ogg.h>
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "lang.h"
- 
- /* Scale factor to apply to timecodes to convert from HandBrake's
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/muxmp4.c HandBrake-0.9.8/libhb/muxmp4.c
---- HandBrake-0.9.8.orig/libhb/muxmp4.c	2011-11-15 22:36:45.000000000 +0100
-+++ HandBrake-0.9.8/libhb/muxmp4.c	2013-04-05 20:10:38.000000000 +0200
-@@ -7,7 +7,7 @@
- #include "mp4v2/mp4v2.h"
- #include "a52dec/a52.h"
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- struct hb_mux_object_s
- {
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/platform/macosx/encca_aac.c HandBrake-0.9.8/libhb/platform/macosx/encca_aac.c
---- HandBrake-0.9.8.orig/libhb/platform/macosx/encca_aac.c	2012-06-29 14:33:47.000000000 +0200
-+++ HandBrake-0.9.8/libhb/platform/macosx/encca_aac.c	2013-04-05 20:10:38.000000000 +0200
-@@ -2,7 +2,7 @@
-  Homepage: <http://handbrake.fr/>.
-  It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "downmix.h"
- #include <AudioToolbox/AudioToolbox.h>
- #include <CoreAudio/CoreAudio.h>
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/ports.c HandBrake-0.9.8/libhb/ports.c
---- HandBrake-0.9.8.orig/libhb/ports.c	2012-05-01 13:24:28.000000000 +0200
-+++ HandBrake-0.9.8/libhb/ports.c	2013-04-05 20:10:38.000000000 +0200
-@@ -66,7 +66,7 @@
- #include <stddef.h>
- #include <unistd.h>
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- /************************************************************************
-  * hb_get_date()
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/reader.c HandBrake-0.9.8/libhb/reader.c
---- HandBrake-0.9.8.orig/libhb/reader.c	2012-07-03 20:53:04.000000000 +0200
-+++ HandBrake-0.9.8/libhb/reader.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- static int  hb_reader_init( hb_work_object_t * w, hb_job_t * job );
- static void hb_reader_close( hb_work_object_t * w );
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/render.c HandBrake-0.9.8/libhb/render.c
---- HandBrake-0.9.8.orig/libhb/render.c	2012-07-17 16:34:34.000000000 +0200
-+++ HandBrake-0.9.8/libhb/render.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- 
- struct hb_work_private_s
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/rotate.c HandBrake-0.9.8/libhb/rotate.c
---- HandBrake-0.9.8.orig/libhb/rotate.c	2009-12-19 16:19:12.000000000 +0100
-+++ HandBrake-0.9.8/libhb/rotate.c	2013-04-05 20:10:38.000000000 +0200
-@@ -1,5 +1,5 @@
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- //#include "mpeg2dec/mpeg2.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/scan.c HandBrake-0.9.8/libhb/scan.c
---- HandBrake-0.9.8.orig/libhb/scan.c	2012-07-07 01:29:10.000000000 +0200
-+++ HandBrake-0.9.8/libhb/scan.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "a52dec/a52.h"
- #include "dca.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/stream.c HandBrake-0.9.8/libhb/stream.c
---- HandBrake-0.9.8.orig/libhb/stream.c	2012-06-17 16:12:10.000000000 +0200
-+++ HandBrake-0.9.8/libhb/stream.c	2013-04-05 20:10:38.000000000 +0200
-@@ -8,7 +8,7 @@
- #include <ctype.h>
- #include <errno.h>
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include "lang.h"
- #include "a52dec/a52.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/sync.c HandBrake-0.9.8/libhb/sync.c
---- HandBrake-0.9.8.orig/libhb/sync.c	2012-05-01 12:08:03.000000000 +0200
-+++ HandBrake-0.9.8/libhb/sync.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "hbffmpeg.h"
- #include <stdio.h>
- #include "samplerate.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/update.c HandBrake-0.9.8/libhb/update.c
---- HandBrake-0.9.8.orig/libhb/update.c	2009-06-24 05:18:52.000000000 +0200
-+++ HandBrake-0.9.8/libhb/update.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- static void UpdateFunc( void * );
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/work.c HandBrake-0.9.8/libhb/work.c
---- HandBrake-0.9.8.orig/libhb/work.c	2012-02-22 00:56:12.000000000 +0100
-+++ HandBrake-0.9.8/libhb/work.c	2013-04-05 20:10:38.000000000 +0200
-@@ -4,7 +4,7 @@
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "a52dec/a52.h"
- #include "dca.h"
- #include "libavformat/avformat.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/ChapterTitles.h HandBrake-0.9.8/macosx/ChapterTitles.h
---- HandBrake-0.9.8.orig/macosx/ChapterTitles.h	2009-03-01 19:00:26.000000000 +0100
-+++ HandBrake-0.9.8/macosx/ChapterTitles.h	2013-04-05 20:56:10.000000000 +0200
-@@ -5,7 +5,7 @@
-    It may be used under the terms of the GNU General Public License. */
- 
- #include <Cocoa/Cocoa.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- @interface ChapterTitles : NSObject {
-     hb_title_t *fTitle;
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/Controller.h HandBrake-0.9.8/macosx/Controller.h
---- HandBrake-0.9.8.orig/macosx/Controller.h	2012-01-24 18:13:26.000000000 +0100
-+++ HandBrake-0.9.8/macosx/Controller.h	2013-04-05 20:56:10.000000000 +0200
-@@ -7,7 +7,7 @@
- #import <Cocoa/Cocoa.h>
- #import <Growl/Growl.h>
- 
--#include "hb.h"
-+#include "handbrake.h"
- 
- #import "ChapterTitles.h"
- #import "HBSubtitles.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/HBPreviewController.h HandBrake-0.9.8/macosx/HBPreviewController.h
---- HandBrake-0.9.8.orig/macosx/HBPreviewController.h	2010-08-05 18:45:00.000000000 +0200
-+++ HandBrake-0.9.8/macosx/HBPreviewController.h	2013-04-05 20:56:10.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- #import <Cocoa/Cocoa.h>
- 
--#include "hb.h"
-+#include "handbrake.h"
- /* Needed for Quicktime movie previews */
- #import <QTKit/QTKit.h> 
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/HBQueueController.h HandBrake-0.9.8/macosx/HBQueueController.h
---- HandBrake-0.9.8.orig/macosx/HBQueueController.h	2010-07-19 19:02:43.000000000 +0200
-+++ HandBrake-0.9.8/macosx/HBQueueController.h	2013-04-05 20:56:10.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- 
- #import <Cocoa/Cocoa.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- @class HBController;
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/HBSubtitles.h HandBrake-0.9.8/macosx/HBSubtitles.h
---- HandBrake-0.9.8.orig/macosx/HBSubtitles.h	2010-01-21 19:58:17.000000000 +0100
-+++ HandBrake-0.9.8/macosx/HBSubtitles.h	2013-04-05 20:56:10.000000000 +0200
-@@ -5,7 +5,7 @@
-    It may be used under the terms of the GNU General Public License. */
- 
- #import <Cocoa/Cocoa.h>
--#include "hb.h"
-+#include "handbrake.h"
- 
- 
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/PictureController.h HandBrake-0.9.8/macosx/PictureController.h
---- HandBrake-0.9.8.orig/macosx/PictureController.h	2010-08-05 18:45:00.000000000 +0200
-+++ HandBrake-0.9.8/macosx/PictureController.h	2013-04-05 20:56:10.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- #import <Cocoa/Cocoa.h>
- 
--#include "hb.h" 
-+#include "handbrake.h" 
- 
- @class HBController;
- @class PreviewController;
-diff -x '*~' -urN HandBrake-0.9.8.orig/test/parsecsv.c HandBrake-0.9.8/test/parsecsv.c
---- HandBrake-0.9.8.orig/test/parsecsv.c	2009-06-24 05:18:52.000000000 +0200
-+++ HandBrake-0.9.8/test/parsecsv.c	2013-04-05 20:10:38.000000000 +0200
-@@ -5,7 +5,7 @@
-    It may be used under the terms of the GNU General Public License. */
- 
- #include <fcntl.h>
--#include "hb.h"
-+#include "handbrake.h"
- #include "parsecsv.h"
- 
- /* Internal declarations */
-diff -x '*~' -urN HandBrake-0.9.8.orig/test/test.c HandBrake-0.9.8/test/test.c
---- HandBrake-0.9.8.orig/test/test.c	2012-07-17 18:39:18.000000000 +0200
-+++ HandBrake-0.9.8/test/test.c	2013-04-05 20:10:38.000000000 +0200
-@@ -19,7 +19,7 @@
- #include <pthread.h>
- #endif
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "lang.h"
- #include "parsecsv.h"
-

HandBrake-0.9.8.tar.bz2/contrib/a52dec/A00-dpl2.patch Deleted

@@ -1,114 +0,0 @@
-diff -Naur a52dec_original/include/a52.h a52dec_patched/include/a52.h
---- a52dec_original/include/a52.h	2002-01-28 05:37:54.000000000 +0000
-+++ a52dec_patched/include/a52.h	2007-04-04 19:12:57.000000000 +0100
-@@ -48,6 +48,10 @@
- #define A52_LFE 16
- #define A52_ADJUST_LEVEL 32
- 
-+// this next constant can be ORed with A52_DOLBY to tell liba52 to use 5.0 DPLII matrix encoding,
-+// rather than just 4.0 Dolby Surround matrix encoding
-+#define A52_USE_DPLII 64
-+
- a52_state_t * a52_init (uint32_t mm_accel);
- sample_t * a52_samples (a52_state_t * state);
- int a52_syncinfo (uint8_t * buf, int * flags,
-diff -Naur a52dec_original/liba52/a52_internal.h a52dec_patched/liba52/a52_internal.h
---- a52dec_original/liba52/a52_internal.h	2002-07-28 02:52:06.000000000 +0100
-+++ a52dec_patched/liba52/a52_internal.h	2007-04-04 19:11:43.000000000 +0100
-@@ -93,6 +93,10 @@
- #define LEVEL_45DB 0.5946035575013605
- #define LEVEL_6DB 0.5
- 
-+// these next two constants are used for DPL matrix encoding in downmix.c
-+#define LEVEL_SQRT_1_2 0.5
-+#define LEVEL_SQRT_3_4 0.8660254037844386
-+
- #define EXP_REUSE (0)
- #define EXP_D15   (1)
- #define EXP_D25   (2)
-diff -Naur a52dec_original/liba52/downmix.c a52dec_patched/liba52/downmix.c
---- a52dec_original/liba52/downmix.c	2002-01-28 05:37:54.000000000 +0000
-+++ a52dec_patched/liba52/downmix.c	2007-04-06 13:47:49.000000000 +0100
-@@ -34,6 +34,7 @@
- int a52_downmix_init (int input, int flags, sample_t * level,
- 		      sample_t clev, sample_t slev)
- {
-+
-     static uint8_t table[11][8] = {
- 	{A52_CHANNEL,	A52_DOLBY,	A52_STEREO,	A52_STEREO,
- 	 A52_STEREO,	A52_STEREO,	A52_STEREO,	A52_STEREO},
-@@ -148,6 +149,9 @@
- 	    break;
- 	}
- 
-+	// add the DPLII flag back into the output if it was passed in
-+	output = output | (flags & A52_USE_DPLII);
-+
-     return output;
- }
- 
-@@ -418,17 +422,46 @@
-     }
- }
- 
--static void mix32toS (sample_t * samples, sample_t bias)
-+static void mix32toS (sample_t * samples, sample_t bias, int use_dpl2)
- {
--    int i;
--    sample_t common, surround;
- 
--    for (i = 0; i < 256; i++) {
--	common = samples[i + 256] + bias;
--	surround = samples[i + 768] + samples[i + 1024];
--	samples[i] += common - surround;
--	samples[i + 256] = samples[i + 512] + common + surround;
--    }
-+	if (use_dpl2 == 1) {
-+
-+		int i;
-+		sample_t cc, Lt, Rt, Ls, Rs, Lss, Rss;
-+	
-+		for (i = 0; i < 256; i++) {
-+	
-+			cc = samples[i + 256] * LEVEL_3DB;
-+		
-+			Lt = samples[i] + cc;
-+			Rt = samples[i + 512] + cc;
-+		
-+			Ls = samples[i + 768];
-+			Rs = samples[i + 1024];
-+			
-+			Lss = (LEVEL_SQRT_3_4 * Ls) - (LEVEL_SQRT_1_2 * Rs);
-+			Rss = -(LEVEL_SQRT_1_2 * Ls) + (LEVEL_SQRT_3_4 * Rs);
-+		
-+			samples[i] = bias + Lt + Lss;
-+			samples[i + 256] = bias + Rt + Rss;
-+	
-+		}
-+
-+	} else {
-+
-+		int i;
-+		sample_t common, surround;
-+	
-+		for (i = 0; i < 256; i++) {
-+		common = samples[i + 256] + bias;
-+		surround = samples[i + 768] + samples[i + 1024];
-+		samples[i] += common - surround;
-+		samples[i + 256] = samples[i + 512] + common + surround;
-+		}
-+
-+	}
-+
- }
- 
- static void move2to1 (sample_t * src, sample_t * dest, sample_t bias)
-@@ -533,7 +566,7 @@
- 	break;
- 
-     case CONVERT (A52_3F2R, A52_DOLBY):
--	mix32toS (samples, bias);
-+	mix32toS (samples, bias, ((output & A52_USE_DPLII) == A52_USE_DPLII));
- 	break;
- 
-     case CONVERT (A52_3F1R, A52_3F):

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A01-mpegleak.patch Deleted

@@ -1,62 +0,0 @@
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 9889224..041fccf 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -3848,7 +3848,7 @@ static int decode_frame(AVCodecContext *avctx,
-     if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
-         if (avctx->skip_frame >= AVDISCARD_NONREF)
-             return 0;
--        av_log(avctx, AV_LOG_ERROR, "no frame!\n");
-+        av_log(avctx, AV_LOG_DEBUG, "no frame!\n");
-         return -1;
-     }
- 
-diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
-index 1f30916..dce88f3 100644
---- a/libavcodec/h264_refs.c
-+++ b/libavcodec/h264_refs.c
-@@ -634,7 +634,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
-          * stream. Need to discard one frame. Prevents overrun of the
-          * short_ref and long_ref buffers.
-          */
--        av_log(h->s.avctx, AV_LOG_ERROR,
-+        av_log(h->s.avctx, AV_LOG_DEBUG,
-                "number of reference frames (%d+%d) exceeds max (%d; probably "
-                "corrupt input), discarding one\n",
-                h->long_ref_count, h->short_ref_count, h->sps.ref_frame_count);
-diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
-index e418e95..87cb73c 100644
---- a/libavcodec/mpegvideo.c
-+++ b/libavcodec/mpegvideo.c
-@@ -1004,19 +1004,18 @@ int ff_find_unused_picture(MpegEncContext *s, int shared){
-     }
- 
-     av_log(s->avctx, AV_LOG_FATAL, "Internal error, picture buffer overflow\n");
--    /* We could return -1, but the codec would crash trying to draw into a
--     * non-existing frame anyway. This is safer than waiting for a random crash.
--     * Also the return of this is never useful, an encoder must only allocate
--     * as much as allowed in the specification. This has no relationship to how
--     * much libavcodec could allocate (and MAX_PICTURE_COUNT is always large
--     * enough for such valid streams).
--     * Plus, a decoder has to check stream validity and remove frames if too
--     * many reference frames are around. Waiting for "OOM" is not correct at
--     * all. Similarly, missing reference frames have to be replaced by
--     * interpolated/MC frames, anything else is a bug in the codec ...
--     */
--    abort();
--    return -1;
-+    /* XXX there seems to be a leak caused by h264 in mpeg transport
-+     * streams: Over-the-air streams have a lot of errors. A picture
-+     * may be marked as referenced but the actual references get lost
-+     * so it never gets released. We take care of that here by releasing
-+     * the oldest we have & reusing its slot. */
-+    int oldest=0;
-+    for(i=0; i<MAX_PICTURE_COUNT; i++){
-+        if (s->picture[i].f.coded_picture_number < s->picture[oldest].f.coded_picture_number)
-+            oldest = i;
-+    }
-+    s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[oldest]);
-+    return oldest;
- }
- 
- static void update_noise_reduction(MpegEncContext *s){

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A02-audioconvert.patch Deleted

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A03-png-sequences.patch Deleted

@@ -1,31 +0,0 @@
-diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
-index a40cebb..26239e2 100644
---- a/libavcodec/pngdec.c
-+++ b/libavcodec/pngdec.c
-@@ -599,6 +599,18 @@ static int decode_frame(AVCodecContext *avctx,
-         }
-     }
-  exit_loop:
-+/* ffmpeg-r18421 introduced support for CorePNG p-frames which
-+ * breaks raw png sequences created by QuickTime Pro.
-+ * since only the first png appears to be marked as PKT_FLAG_KEY
-+ * it means either QuickTime Pro is encoding incorrectly, or
-+ * this code block needs to find other criteria.
-+ *
-+ * As of ffmpeg-r19079 this patch should no longer be required.
-+ * It offers a similar solution; forces code block to be skipped.
-+ *
-+ * --kb
-+ */
-+#if 0
-      /* handle p-frames only if a predecessor frame is available */
-      if(s->last_picture->data[0] != NULL) {
-          if(!(avpkt->flags & AV_PKT_FLAG_KEY)) {
-@@ -615,6 +627,7 @@ static int decode_frame(AVCodecContext *avctx,
-             }
-         }
-     }
-+#endif
- 
-     *picture= *s->current_picture;
-     *data_size = sizeof(AVFrame);

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A04-channel-layout-order.patch Deleted

@@ -1,86 +0,0 @@
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 3c4e2f8..5cfd1bf 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -142,7 +142,7 @@ OBJS-$(CONFIG_FFV1_DECODER)            += ffv1.o rangecoder.o
- OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1.o rangecoder.o
- OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o
- OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o
--OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o
-+OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o vorbis_data.o
- OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o
- OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
- OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
-diff --git a/libavcodec/flac.c b/libavcodec/flac.c
-index e6a427a..397155e 100644
---- a/libavcodec/flac.c
-+++ b/libavcodec/flac.c
-@@ -22,6 +22,7 @@
- #include "libavutil/crc.h"
- #include "flac.h"
- #include "flacdata.h"
-+#include "vorbis.h"
- 
- static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 0 };
- 
-@@ -54,9 +55,12 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
-     fi->ch_mode = get_bits(gb, 4);
-     if (fi->ch_mode < FLAC_MAX_CHANNELS) {
-         fi->channels = fi->ch_mode + 1;
-+        if (fi->ch_mode <= 5)
-+            avctx->channel_layout = ff_vorbis_channel_layouts[fi->ch_mode];
-         fi->ch_mode = FLAC_CHMODE_INDEPENDENT;
-     } else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) {
-         fi->channels = 2;
-+        avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-     } else {
-         av_log(avctx, AV_LOG_ERROR + log_level_offset,
-                "invalid channel mode: %d\n", fi->ch_mode);
-diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
-index c90285a..58235c8 100644
---- a/libavcodec/mlpdec.c
-+++ b/libavcodec/mlpdec.c
-@@ -133,6 +133,9 @@ typedef struct MLPDecodeContext {
-     //! Index of the last substream to decode - further substreams are skipped.
-     uint8_t     max_decoded_substream;
- 
-+    //! Stream needs channel reordering to comply with FFmpeg's channel order
-+    uint8_t     needs_reordering;
-+
-     //! number of PCM samples contained in each frame
-     int         access_unit_size;
-     //! next power of two above the number of samples in each frame
-@@ -326,6 +329,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
-     for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
-         m->substream[substr].restart_seen = 0;
- 
-+    m->needs_reordering = mh.channels_mlp >= 18 && mh.channels_mlp <= 20;
-+
-     return 0;
- }
- 
-@@ -436,6 +441,24 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
-         s->ch_assign[ch_assign] = ch;
-     }
- 
-+    if (m->avctx->codec_id == CODEC_ID_MLP && m->needs_reordering) {
-+        if (m->avctx->channel_layout == (AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY) ||
-+            m->avctx->channel_layout == AV_CH_LAYOUT_5POINT0) {
-+            int i = s->ch_assign[4];
-+            s->ch_assign[4] = s->ch_assign[3];
-+            s->ch_assign[3] = s->ch_assign[2];
-+            s->ch_assign[2] = i;
-+        } else if (m->avctx->channel_layout == AV_CH_LAYOUT_5POINT1) {
-+            FFSWAP(int, s->ch_assign[2], s->ch_assign[4]);
-+            FFSWAP(int, s->ch_assign[3], s->ch_assign[5]);
-+        }
-+    }
-+    if (m->avctx->codec_id == CODEC_ID_TRUEHD &&
-+        m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1) {
-+        FFSWAP(int, s->ch_assign[4], s->ch_assign[6]);
-+        FFSWAP(int, s->ch_assign[5], s->ch_assign[7]);
-+    }
-+
-     checksum = ff_mlp_restart_checksum(buf, get_bits_count(gbp) - start_count);
- 
-     if (checksum != get_bits(gbp, 8))

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A05-asf-seek.patch Deleted

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A06-h264-recovery-point.patch Deleted

@@ -1,63 +0,0 @@
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 9889224..ae77285 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -2229,6 +2229,7 @@ static void flush_dpb(AVCodecContext *avctx){
-     h->s.first_field= 0;
-     ff_h264_reset_sei(h);
-     ff_mpeg_flush(avctx);
-+    h->recovery_frame= -1;
- }
- 
- static int init_poc(H264Context *h){
-@@ -3654,9 +3655,18 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
-             if((err = decode_slice_header(hx, h)))
-                break;
- 
-+            if (h->sei_recovery_frame_cnt >= 0 && h->recovery_frame < 0) {
-+                h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) %
-+                                    (1 << h->sps.log2_max_frame_num);
-+            }
-+
-             s->current_picture_ptr->f.key_frame |=
--                    (hx->nal_unit_type == NAL_IDR_SLICE) ||
--                    (h->sei_recovery_frame_cnt >= 0);
-+                    (hx->nal_unit_type == NAL_IDR_SLICE);
-+
-+            if (h->recovery_frame == h->frame_num) {
-+                s->current_picture_ptr->f.key_frame |= 1;
-+                h->recovery_frame = -1;
-+            }
- 
-             if (h->current_slice == 1) {
-                 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)) {
-diff --git a/libavcodec/h264.h b/libavcodec/h264.h
-index 122a54a..cd044b0 100644
---- a/libavcodec/h264.h
-+++ b/libavcodec/h264.h
-@@ -575,6 +575,13 @@ typedef struct H264Context{
-      * frames.
-      */
-     int sei_recovery_frame_cnt;
-+    /**
-+     * recovery_frame is the frame_num at which the next frame should
-+     * be fully constructed.
-+     *
-+     * Set to -1 when not expecting a recovery point.
-+     */
-+    int recovery_frame;
- 
-     int luma_weight_flag[2];   ///< 7.4.3.2 luma_weight_lX_flag
-     int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag
-diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
-index 4f52bbe..8d3c40b 100644
---- a/libavcodec/h264_sei.c
-+++ b/libavcodec/h264_sei.c
-@@ -38,6 +38,7 @@ static const uint8_t sei_num_clock_ts_table[9]={
- };
- 
- void ff_h264_reset_sei(H264Context *h) {
-+    h->recovery_frame               = -1;
-     h->sei_recovery_frame_cnt       = -1;
-     h->sei_dpb_output_delay         =  0;
-     h->sei_cpb_removal_delay        = -1;

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A07-swscale-stack-alignment.patch Deleted

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/A08-vc1-decode.patch Deleted

@@ -1,40 +0,0 @@
-diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
-index 60cca33..1b03215 100644
---- a/libavcodec/vc1dec.c
-+++ b/libavcodec/vc1dec.c
-@@ -3317,7 +3317,7 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n,
-             i += skip;
-             if (i > 63)
-                 break;
--            if (!v->interlace)
-+            if (!v->fcm)
-                 idx = v->zz_8x8[0][i++];
-             else
-                 idx = v->zzi_8x8[i++];
-@@ -3345,7 +3345,7 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n,
-                 i += skip;
-                 if (i > 15)
-                     break;
--                if (!v->interlace)
-+                if (!v->fcm)
-                     idx = ff_vc1_simple_progressive_4x4_zz[i++];
-                 else
-                     idx = ff_vc1_adv_interlaced_4x4_zz[i++];
-@@ -3372,7 +3372,7 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n,
-                 i += skip;
-                 if (i > 31)
-                     break;
--                if (!v->interlace)
-+                if (!v->fcm)
-                     idx = v->zz_8x4[i++] + off;
-                 else
-                     idx = ff_vc1_adv_interlaced_8x4_zz[i++] + off;
-@@ -3399,7 +3399,7 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n,
-                 i += skip;
-                 if (i > 31)
-                     break;
--                if (!v->interlace)
-+                if (!v->fcm)
-                     idx = v->zz_4x8[i++] + off;
-                 else
-                     idx = ff_vc1_adv_interlaced_4x8_zz[i++] + off;

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/P04-darwin-memalign.patch Deleted

HandBrake-0.9.8.tar.bz2/contrib/libdca Deleted

HandBrake-0.9.8.tar.bz2/contrib/libdca/A00-general.patch Deleted

@@ -1,834 +0,0 @@
-diff -Naur libdca/include/audio_out.h libdca_patched/include/audio_out.h
---- libdca/include/audio_out.h	2007-05-02 10:05:03.000000000 +0100
-+++ libdca_patched/include/audio_out.h	2007-05-02 10:09:42.000000000 +0100
-@@ -26,8 +26,8 @@
- 
- struct ao_instance_s {
-     int (* setup) (ao_instance_t * instance, int sample_rate, int * flags,
--		   level_t * level, sample_t * bias);
--    int (* play) (ao_instance_t * instance, int flags, sample_t * samples);
-+		   dca_level_t * level, dca_sample_t * bias);
-+    int (* play) (ao_instance_t * instance, int flags, dca_sample_t * samples);
-     void (* close) (ao_instance_t * instance);
- };
- 
-diff -Naur libdca/include/dca.h libdca_patched/include/dca.h
---- libdca/include/dca.h	2007-05-02 10:05:03.000000000 +0100
-+++ libdca_patched/include/dca.h	2007-05-02 10:09:36.000000000 +0100
-@@ -32,14 +32,14 @@
- uint32_t mm_accel (void);
- 
- #if defined(LIBDCA_FIXED)
--typedef int32_t sample_t;
--typedef int32_t level_t;
-+typedef int32_t dca_sample_t;
-+typedef int32_t dca_level_t;
- #elif defined(LIBDCA_DOUBLE)
--typedef double sample_t;
--typedef double level_t;
-+typedef double dca_sample_t;
-+typedef double dca_level_t;
- #else
--typedef float sample_t;
--typedef float level_t;
-+typedef float dca_sample_t;
-+typedef float dca_level_t;
- #endif
- 
- typedef struct dca_state_s dca_state_t;
-@@ -65,21 +65,24 @@
- #define DCA_LFE 0x80
- #define DCA_ADJUST_LEVEL 0x100
- 
-+#define DCA_OUT_DPLI  0x200
-+#define DCA_OUT_DPLII 0x400
-+
- dca_state_t * dca_init (uint32_t mm_accel);
- 
- int dca_syncinfo (dca_state_t *state, uint8_t * buf, int * flags,
-                   int * sample_rate, int * bit_rate, int *frame_length);
- 
- int dca_frame (dca_state_t * state, uint8_t * buf, int * flags,
--               level_t * level, sample_t bias);
-+               dca_level_t * level, dca_sample_t bias);
- 
- void dca_dynrng (dca_state_t * state,
--                 level_t (* call) (level_t, void *), void * data);
-+                 dca_level_t (* call) (dca_level_t, void *), void * data);
- 
- int dca_blocks_num (dca_state_t * state);
- int dca_block (dca_state_t * state);
- 
--sample_t * dca_samples (dca_state_t * state);
-+dca_sample_t * dca_samples (dca_state_t * state);
- 
- void dca_free (dca_state_t * state);
- 
-diff -Naur libdca/libao/audio_out_aif.c libdca_patched/libao/audio_out_aif.c
---- libdca/libao/audio_out_aif.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_aif.c	2007-05-02 10:09:41.000000000 +0100
-@@ -49,7 +49,7 @@
- };
- 
- static int aif_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--		      level_t * level, sample_t * bias)
-+		      dca_level_t * level, dca_sample_t * bias)
- {
-     aif_instance_t * instance = (aif_instance_t *) _instance;
- 
-@@ -78,7 +78,7 @@
-     buf[1] = value;
- }
- 
--static int aif_play (ao_instance_t * _instance, int flags, sample_t * _samples)
-+static int aif_play (ao_instance_t * _instance, int flags, dca_sample_t * _samples)
- {
-     aif_instance_t * instance = (aif_instance_t *) _instance;
-     int16_t int16_samples[256*2];
-diff -Naur libdca/libao/audio_out_al.c libdca_patched/libao/audio_out_al.c
---- libdca/libao/audio_out_al.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_al.c	2007-05-02 10:09:41.000000000 +0100
-@@ -44,7 +44,7 @@
- } al_instance_t;
- 
- static int al_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--		     level_t * level, sample_t * bias)
-+		     dca_level_t * level, dca_sample_t * bias)
- {
-     al_instance_t * instance = (al_instance_t *) _instance;
- 
-@@ -59,7 +59,7 @@
-     return 0;
- }
- 
--static int al_play (ao_instance_t * _instance, int flags, sample_t * _samples)
-+static int al_play (ao_instance_t * _instance, int flags, dca_sample_t * _samples)
- {
-     al_instance_t * instance = (al_instance_t *) _instance;
-     int16_t int16_samples[256*6];
-diff -Naur libdca/libao/audio_out_float.c libdca_patched/libao/audio_out_float.c
---- libdca/libao/audio_out_float.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_float.c	2007-05-02 10:09:40.000000000 +0100
-@@ -32,7 +32,7 @@
- #include "audio_out_internal.h"
- 
- static int float_setup (ao_instance_t * instance, int sample_rate, int * flags,
--			level_t * level, sample_t * bias)
-+			dca_level_t * level, dca_sample_t * bias)
- {
-     (void)instance;
-     (void)sample_rate;
-@@ -44,7 +44,7 @@
- }
- 
- static int float_play (ao_instance_t * instance, int flags,
--		       sample_t * _samples)
-+		       dca_sample_t * _samples)
- {
- #if defined(LIBDCA_FIXED)
-     float samples[256 * 2];
-diff -Naur libdca/libao/audio_out_internal.h libdca_patched/libao/audio_out_internal.h
---- libdca/libao/audio_out_internal.h	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_internal.h	2007-05-02 10:09:40.000000000 +0100
-@@ -25,7 +25,7 @@
- #ifdef LIBDCA_DOUBLE
- typedef float convert_t;
- #else
--typedef sample_t convert_t;
-+typedef dca_sample_t convert_t;
- #endif
- 
- #ifdef LIBDCA_FIXED
-diff -Naur libdca/libao/audio_out_null.c libdca_patched/libao/audio_out_null.c
---- libdca/libao/audio_out_null.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_null.c	2007-05-02 10:09:39.000000000 +0100
-@@ -36,7 +36,7 @@
- } null_instance_t;
- 
- static int null_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--		       level_t * level, sample_t * bias)
-+		       dca_level_t * level, dca_sample_t * bias)
- {
-     null_instance_t * instance = (null_instance_t *) _instance;
- 
-@@ -48,7 +48,7 @@
-     return 0;
- }
- 
--static int null_play (ao_instance_t * instance, int flags, sample_t * samples)
-+static int null_play (ao_instance_t * instance, int flags, dca_sample_t * samples)
- {
-     (void)instance; (void)flags; (void)samples;
-     return 0;
-diff -Naur libdca/libao/audio_out_oss.c libdca_patched/libao/audio_out_oss.c
---- libdca/libao/audio_out_oss.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_oss.c	2007-05-02 10:09:38.000000000 +0100
-@@ -68,7 +68,7 @@
- } oss_instance_t;
- 
- static int oss_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--		      level_t * level, sample_t * bias)
-+		      dca_level_t * level, dca_sample_t * bias)
- {
-     oss_instance_t * instance = (oss_instance_t *) _instance;
- 
-@@ -83,7 +83,7 @@
-     return 0;
- }
- 
--static int oss_play (ao_instance_t * _instance, int flags, sample_t * _samples)
-+static int oss_play (ao_instance_t * _instance, int flags, dca_sample_t * _samples)
- {
-     oss_instance_t * instance = (oss_instance_t *) _instance;
-     int16_t int16_samples[256*6];
-diff -Naur libdca/libao/audio_out_peak.c libdca_patched/libao/audio_out_peak.c
---- libdca/libao/audio_out_peak.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_peak.c	2007-05-02 10:09:38.000000000 +0100
-@@ -16,7 +16,7 @@
- } peak_instance_t;
- 
- static int peak_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--		       level_t * level, sample_t * bias)
-+		       dca_level_t * level, dca_sample_t * bias)
- {
-     peak_instance_t * instance = (peak_instance_t *) _instance;
- 
-@@ -29,7 +29,7 @@
-     return 0;
- }
- 
--static int peak_play (ao_instance_t * _instance, int flags, sample_t * samples)
-+static int peak_play (ao_instance_t * _instance, int flags, dca_sample_t * samples)
- {
-     peak_instance_t * instance = (peak_instance_t *) _instance;
-     int i;
-diff -Naur libdca/libao/audio_out_solaris.c libdca_patched/libao/audio_out_solaris.c
---- libdca/libao/audio_out_solaris.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_solaris.c	2007-05-02 10:09:37.000000000 +0100
-@@ -47,7 +47,7 @@
- } solaris_instance_t;
- 
- static int solaris_setup (ao_instance_t * _instance, int sample_rate,
--			  int * flags, level_t * level, sample_t * bias)
-+			  int * flags, dca_level_t * level, dca_sample_t * bias)
- {
-     solaris_instance_t * instance = (solaris_instance_t *) _instance;
- 
-@@ -63,7 +63,7 @@
- }
- 
- static int solaris_play (ao_instance_t * _instance, int flags,
--			 sample_t * _samples)
-+			 dca_sample_t * _samples)
- {
-     solaris_instance_t * instance = (solaris_instance_t *) _instance;
-     int16_t int16_samples[256*2];
-diff -Naur libdca/libao/audio_out_wav.c libdca_patched/libao/audio_out_wav.c
---- libdca/libao/audio_out_wav.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_wav.c	2007-05-02 10:09:37.000000000 +0100
-@@ -87,7 +87,7 @@
- };
- 
- static int wav_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--                      level_t * level, sample_t * bias)
-+                      dca_level_t * level, dca_sample_t * bias)
- {
-     wav_instance_t * instance = (wav_instance_t *) _instance;
- 
-@@ -157,7 +157,7 @@
- 
- #include <stdio.h>
- 
--static int wav_play (ao_instance_t * _instance, int flags, sample_t * _samples)
-+static int wav_play (ao_instance_t * _instance, int flags, dca_sample_t * _samples)
- {
-     wav_instance_t * instance = (wav_instance_t *) _instance;
-     union
-diff -Naur libdca/libao/audio_out_win.c libdca_patched/libao/audio_out_win.c
---- libdca/libao/audio_out_win.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/libao/audio_out_win.c	2007-05-02 10:09:36.000000000 +0100
-@@ -55,7 +55,7 @@
- } win_instance_t;
- 
- static int win_setup (ao_instance_t * _instance, int sample_rate, int * flags,
--		      level_t * level, sample_t * bias)
-+		      dca_level_t * level, dca_sample_t * bias)
- {
-     win_instance_t * instance = (win_instance_t *) _instance;
- 
-@@ -70,7 +70,7 @@
-     return 0;
- }
- 
--static int win_play (ao_instance_t * _instance, int flags, sample_t * _samples)
-+static int win_play (ao_instance_t * _instance, int flags, dca_sample_t * _samples)
- {
-     win_instance_t * instance = (win_instance_t *) _instance;
-     int current_buffer;
-diff -Naur libdca/libdca/dca_internal.h libdca_patched/libdca/dca_internal.h
---- libdca/libdca/dca_internal.h	2007-05-02 10:05:05.000000000 +0100
-+++ libdca_patched/libdca/dca_internal.h	2007-05-02 10:09:35.000000000 +0100
-@@ -116,20 +116,20 @@
-     double subband_fir_noidea[DCA_PRIM_CHANNELS_MAX][64];
- 
-     /* Audio output */
--    level_t clev;            /* centre channel mix level */
--    level_t slev;            /* surround channels mix level */
-+    dca_level_t clev;            /* centre channel mix level */
-+    dca_level_t slev;            /* surround channels mix level */
- 
-     int output;              /* type of output */
--    level_t level;           /* output level */
--    sample_t bias;           /* output bias */
-+    dca_level_t level;           /* output level */
-+    dca_sample_t bias;           /* output bias */
- 
--    sample_t * samples;      /* pointer to the internal audio samples buffer */
-+    dca_sample_t * samples;      /* pointer to the internal audio samples buffer */
-     int downmixed;
- 
-     int dynrnge;             /* apply dynamic range */
--    level_t dynrng;          /* dynamic range */
-+    dca_level_t dynrng;          /* dynamic range */
-     void * dynrngdata;       /* dynamic range callback funtion and data */
--    level_t (* dynrngcall) (level_t range, void * dynrngdata);
-+    dca_level_t (* dynrngcall) (dca_level_t range, void * dynrngdata);
- 
-     /* Bitstream handling */
-     uint32_t * buffer_start;
-@@ -155,19 +155,23 @@
- #define LEVEL_45DB 0.5946035575013605
- #define LEVEL_6DB 0.5
- 
--int dca_downmix_init (int input, int flags, level_t * level,
--                      level_t clev, level_t slev);
--int dca_downmix_coeff (level_t * coeff, int acmod, int output, level_t level,
--                       level_t clev, level_t slev);
--void dca_downmix (sample_t * samples, int acmod, int output, sample_t bias,
--                  level_t clev, level_t slev);
--void dca_upmix (sample_t * samples, int acmod, int output);
-+// these next two constants are used for DPL matrix encoding in downmix.c
-+#define LEVEL_SQRT_1_2 0.5
-+#define LEVEL_SQRT_3_4 0.8660254037844386
-+
-+int dca_downmix_init (int input, int flags, dca_level_t * level,
-+                      dca_level_t clev, dca_level_t slev);
-+int dca_downmix_coeff (dca_level_t * coeff, int acmod, int output, dca_level_t level,
-+                       dca_level_t clev, dca_level_t slev);
-+void dca_downmix (dca_sample_t * samples, int acmod, int output, dca_sample_t bias,
-+                  dca_level_t clev, dca_level_t slev);
-+void dca_upmix (dca_sample_t * samples, int acmod, int output);
- 
- #define ROUND(x) ((int)((x) + ((x) > 0 ? 0.5 : -0.5)))
- 
- #ifndef LIBDCA_FIXED
- 
--typedef sample_t quantizer_t;
-+typedef dca_sample_t quantizer_t;
- #define SAMPLE(x) (x)
- #define LEVEL(x) (x)
- #define MUL(a,b) ((a) * (b))
-@@ -179,8 +183,8 @@
- #else /* LIBDCA_FIXED */
- 
- typedef int16_t quantizer_t;
--#define SAMPLE(x) (sample_t)((x) * (1 << 30))
--#define LEVEL(x) (level_t)((x) * (1 << 26))
-+#define SAMPLE(x) (dca_sample_t)((x) * (1 << 30))
-+#define LEVEL(x) (dca_level_t)((x) * (1 << 26))
- 
- #if 0
- #define MUL(a,b) ((int)(((int64_t)(a) * (b) + (1 << 29)) >> 30))
-diff -Naur libdca/libdca/downmix.c libdca_patched/libdca/downmix.c
---- libdca/libdca/downmix.c	2007-05-02 10:05:05.000000000 +0100
-+++ libdca_patched/libdca/downmix.c	2007-05-06 19:45:54.000000000 +0100
-@@ -33,8 +33,8 @@
- 
- #define CONVERT(acmod,output) (((output) << DCA_CHANNEL_BITS) + (acmod))
- 
--int dca_downmix_init (int input, int flags, level_t * level,
--		      level_t clev, level_t slev)
-+int dca_downmix_init (int input, int flags, dca_level_t * level,
-+		      dca_level_t clev, dca_level_t slev)
- {
-     static uint8_t table[11][10] = {
-         /* DCA_MONO */
-@@ -96,7 +96,7 @@
- 	output = DCA_DOLBY;
- 
-     if (flags & DCA_ADJUST_LEVEL) {
--	level_t adjust;
-+	dca_level_t adjust;
- 
- 	switch (CONVERT (input & 7, output)) {
- 
-@@ -181,13 +181,16 @@
- 	*level = MUL_L (*level, adjust);
-     }
- 
-+	// add the DPLI/DPLII flag back into the output if one was passed in
-+	output = output | (flags & DCA_OUT_DPLI) | (flags & DCA_OUT_DPLII);
-+
-     return output;
- }
- 
--int dca_downmix_coeff (level_t * coeff, int acmod, int output, level_t level,
--		       level_t clev, level_t slev)
-+int dca_downmix_coeff (dca_level_t * coeff, int acmod, int output, dca_level_t level,
-+		       dca_level_t clev, dca_level_t slev)
- {
--    level_t level_3db;
-+    dca_level_t level_3db;
- 
-     level_3db = MUL_C (level, LEVEL_3DB);
- 
-@@ -344,7 +347,7 @@
-     return -1;	/* NOTREACHED */
- }
- 
--static void mix2to1 (sample_t * dest, sample_t * src, sample_t bias)
-+static void mix2to1 (dca_sample_t * dest, dca_sample_t * src, dca_sample_t bias)
- {
-     int i;
- 
-@@ -352,7 +355,7 @@
- 	dest[i] += BIAS (src[i]);
- }
- 
--static void mix3to1 (sample_t * samples, sample_t bias)
-+static void mix3to1 (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
- 
-@@ -360,7 +363,7 @@
- 	samples[i] += BIAS (samples[i + 256] + samples[i + 512]);
- }
- 
--static void mix4to1 (sample_t * samples, sample_t bias)
-+static void mix4to1 (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
- 
-@@ -369,7 +372,7 @@
- 			    samples[i + 768]);
- }
- 
--static void mix5to1 (sample_t * samples, sample_t bias)
-+static void mix5to1 (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
- 
-@@ -378,10 +381,10 @@
- 			    samples[i + 768] + samples[i + 1024]);
- }
- 
--static void mix3to2 (sample_t * samples, sample_t bias)
-+static void mix3to2 (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
--    sample_t common;
-+    dca_sample_t common;
- 
-     for (i = 0; i < 256; i++) {
- 	common = BIAS (samples[i]);
-@@ -390,10 +393,10 @@
-     }
- }
- 
--static void mix21to2 (sample_t * left, sample_t * right, sample_t bias)
-+static void mix21to2 (dca_sample_t * left, dca_sample_t * right, dca_sample_t bias)
- {
-     int i;
--    sample_t common;
-+    dca_sample_t common;
- 
-     for (i = 0; i < 256; i++) {
- 	common = BIAS (right[i + 256]);
-@@ -402,10 +405,10 @@
-     }
- }
- 
--static void mix21toS (sample_t * samples, sample_t bias)
-+static void mix21toS (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
--    sample_t surround;
-+    dca_sample_t surround;
- 
-     for (i = 0; i < 256; i++) {
- 	surround = samples[i + 512];
-@@ -414,10 +417,10 @@
-     }
- }
- 
--static void mix31to2 (sample_t * samples, sample_t bias)
-+static void mix31to2 (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
--    sample_t common;
-+    dca_sample_t common;
- 
-     for (i = 0; i < 256; i++) {
- 	common = BIAS (samples[i] + samples[i + 768]);
-@@ -426,23 +429,32 @@
-     }
- }
- 
--static void mix31toS (sample_t * samples, sample_t bias)
-+static void mix31toS (dca_sample_t * samples, dca_sample_t bias)
- {
--    int i;
--    sample_t common, surround;
- 
--    for (i = 0; i < 256; i++) {
--	common = BIAS (samples[i]);
--	surround = samples[i + 768];
--	samples[i] = samples[i + 256] + common - surround;
--	samples[i + 256] = samples[i + 512] + common + surround;
--    }
-+	int i;
-+	dca_sample_t cc, surround, Lt, Rt;
-+
-+	for (i = 0; i < 256; i++) {
-+
-+		cc = samples[i] * LEVEL_3DB;
-+
-+		surround = samples[i + 768];
-+
-+		Lt = samples[i + 256] + cc;
-+		Rt = samples[i + 512] + cc;
-+
-+		samples[i] = Lt - surround;
-+		samples[i + 256] = Rt + surround;
-+
-+	}
-+
- }
- 
--static void mix22toS (sample_t * samples, sample_t bias)
-+static void mix22toS (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
--    sample_t surround;
-+    dca_sample_t surround;
- 
-     for (i = 0; i < 256; i++) {
- 	surround = samples[i + 512] + samples[i + 768];
-@@ -451,10 +463,10 @@
-     }
- }
- 
--static void mix32to2 (sample_t * samples, sample_t bias)
-+static void mix32to2 (dca_sample_t * samples, dca_sample_t bias)
- {
-     int i;
--    sample_t common;
-+    dca_sample_t common;
- 
-     for (i = 0; i < 256; i++) {
- 	common = BIAS (samples[i]);
-@@ -463,20 +475,55 @@
-     }
- }
- 
--static void mix32toS (sample_t * samples, sample_t bias)
-+static void mix32toS (dca_sample_t * samples, dca_sample_t bias, int use_dpl2)
- {
--    int i;
--    sample_t common, surround;
- 
--    for (i = 0; i < 256; i++) {
--	common = BIAS (samples[i]);
--	surround = samples[i + 768] + samples[i + 1024];
--	samples[i] = samples[i + 256] + common - surround;
--	samples[i + 256] = samples[i + 512] + common + surround;
--    }
--}
-+	if (use_dpl2 == 1) {
- 
--static void move2to1 (sample_t * src, sample_t * dest, sample_t bias)
-+		int i;
-+		dca_sample_t cc, Lt, Rt, Ls, Rs, Lss, Rss;
-+	
-+		for (i = 0; i < 256; i++) {
-+	
-+			cc = samples[i] * LEVEL_3DB;
-+		
-+			Lt = samples[i + 256] + cc;
-+			Rt = samples[i + 512] + cc;
-+		
-+			Ls = samples[i + 768];
-+			Rs = samples[i + 1024];
-+			
-+			Lss = (LEVEL_SQRT_3_4 * Ls) - (LEVEL_SQRT_1_2 * Rs);
-+			Rss = -(LEVEL_SQRT_1_2 * Ls) + (LEVEL_SQRT_3_4 * Rs);
-+		
-+			samples[i] = Lt + Lss;
-+			samples[i + 256] = Rt + Rss;
-+	
-+		}
-+
-+	} else {
-+
-+		int i;
-+		dca_sample_t cc, surround, Lt, Rt;
-+	
-+		for (i = 0; i < 256; i++) {
-+
-+			cc = samples[i] * LEVEL_3DB;
-+
-+			surround = samples[i + 768] + samples[i + 1024];
-+
-+			Lt = samples[i + 256] + cc;
-+			Rt = samples[i + 512] + cc;
-+
-+			samples[i] = Lt - surround;
-+			samples[i + 256] = Rt + surround;
-+
-+		}
-+
-+	}
-+
-+}
-+static void move2to1 (dca_sample_t * src, dca_sample_t * dest, dca_sample_t bias)
- {
-     int i;
- 
-@@ -484,7 +531,7 @@
- 	dest[i] = BIAS (src[i] + src[i + 256]);
- }
- 
--static void zero (sample_t * samples)
-+static void zero (dca_sample_t * samples)
- {
-     int i;
- 
-@@ -492,8 +539,8 @@
- 	samples[i] = 0;
- }
- 
--void dca_downmix (sample_t * samples, int acmod, int output, sample_t bias,
--		  level_t clev, level_t slev)
-+void dca_downmix (dca_sample_t * samples, int acmod, int output, dca_sample_t bias,
-+		  dca_level_t clev, dca_level_t slev)
- {
-     (void)clev;
- 
-@@ -529,7 +576,7 @@
- 	break;
- 
-     case CONVERT (DCA_MONO, DCA_DOLBY):
--	memcpy (samples + 256, samples, 256 * sizeof (sample_t));
-+	memcpy (samples + 256, samples, 256 * sizeof (dca_sample_t));
- 	break;
- 
-     case CONVERT (DCA_3F, DCA_STEREO):
-@@ -576,7 +623,7 @@
- 	break;
- 
-     case CONVERT (DCA_3F2R, DCA_DOLBY):
--	mix32toS (samples, bias);
-+	mix32toS (samples, bias, 0);
- 	break;
- 
-     case CONVERT (DCA_3F1R, DCA_3F):
-@@ -594,7 +641,7 @@
- 
-     case CONVERT (DCA_3F1R, DCA_2F1R):
- 	mix3to2 (samples, bias);
--	memcpy (samples + 512, samples + 768, 256 * sizeof (sample_t));
-+	memcpy (samples + 512, samples + 768, 256 * sizeof (dca_sample_t));
- 	break;
- 
-     case CONVERT (DCA_2F2R, DCA_2F1R):
-@@ -608,30 +655,52 @@
- 
-     case CONVERT (DCA_3F2R, DCA_3F1R):
- 	mix2to1 (samples + 768, samples + 1024, bias);
-+	/* deal with the special-case 5.0 to 4.0 DPL mix */
-+    if (output & DCA_OUT_DPLI)
-+    {
-+		mix31toS (samples, bias);
-+	}
- 	break;
- 
-     case CONVERT (DCA_2F1R, DCA_2F2R):
--	memcpy (samples + 768, samples + 512, 256 * sizeof (sample_t));
-+	memcpy (samples + 768, samples + 512, 256 * sizeof (dca_sample_t));
- 	break;
- 
-     case CONVERT (DCA_3F1R, DCA_2F2R):
- 	mix3to2 (samples, bias);
--	memcpy (samples + 512, samples + 768, 256 * sizeof (sample_t));
-+	memcpy (samples + 512, samples + 768, 256 * sizeof (dca_sample_t));
- 	break;
- 
-     case CONVERT (DCA_3F2R, DCA_2F2R):
- 	mix3to2 (samples, bias);
--	memcpy (samples + 512, samples + 768, 256 * sizeof (sample_t));
--	memcpy (samples + 768, samples + 1024, 256 * sizeof (sample_t));
-+	memcpy (samples + 512, samples + 768, 256 * sizeof (dca_sample_t));
-+	memcpy (samples + 768, samples + 1024, 256 * sizeof (dca_sample_t));
- 	break;
- 
-     case CONVERT (DCA_3F1R, DCA_3F2R):
--	memcpy (samples + 1024, samples + 768, 256 * sizeof (sample_t));
-+	memcpy (samples + 1024, samples + 768, 256 * sizeof (dca_sample_t));
-+	break;
-+
-+	/* deal with the special-case DPL mixes */
-+
-+    case CONVERT (DCA_3F1R, DCA_3F1R):
-+    if (output & DCA_OUT_DPLI)
-+    {
-+		mix31toS (samples, bias);
-+	}
- 	break;
-+
-+    case CONVERT (DCA_3F2R, DCA_3F2R):
-+    if (output & DCA_OUT_DPLII)
-+    {
-+		mix32toS (samples, bias, 1);
-+	}
-+	break;
-+
-     }
- }
- 
--void dca_upmix (sample_t * samples, int acmod, int output)
-+void dca_upmix (dca_sample_t * samples, int acmod, int output)
- {
-     switch (CONVERT (acmod, output & DCA_CHANNEL_MASK)) {
- 
-@@ -657,7 +726,7 @@
-     case CONVERT (DCA_3F, DCA_STEREO):
-     case CONVERT (DCA_3F, DCA_DOLBY):
-     mix_3to2:
--	memcpy (samples + 512, samples + 256, 256 * sizeof (sample_t));
-+	memcpy (samples + 512, samples + 256, 256 * sizeof (dca_sample_t));
- 	zero (samples + 256);
- 	break;
- 
-@@ -684,11 +753,11 @@
- 	zero (samples + 1024);
-     case CONVERT (DCA_3F1R, DCA_2F1R):
-     mix_31to21:
--	memcpy (samples + 768, samples + 512, 256 * sizeof (sample_t));
-+	memcpy (samples + 768, samples + 512, 256 * sizeof (dca_sample_t));
- 	goto mix_3to2;
- 
-     case CONVERT (DCA_3F2R, DCA_2F2R):
--	memcpy (samples + 1024, samples + 768, 256 * sizeof (sample_t));
-+	memcpy (samples + 1024, samples + 768, 256 * sizeof (dca_sample_t));
- 	goto mix_31to21;
-     }
- }
-diff -Naur libdca/libdca/parse.c libdca_patched/libdca/parse.c
---- libdca/libdca/parse.c	2007-05-02 10:05:05.000000000 +0100
-+++ libdca_patched/libdca/parse.c	2007-05-02 10:09:33.000000000 +0100
-@@ -59,12 +59,12 @@
- static int decode_blockcode (int code, int levels, int *values);
- 
- static void qmf_32_subbands (dca_state_t * state, int chans,
--                             double samples_in[32][8], sample_t *samples_out,
--                             double rScale, sample_t bias);
-+                             double samples_in[32][8], dca_sample_t *samples_out,
-+                             double rScale, dca_sample_t bias);
- 
- static void lfe_interpolation_fir (int nDecimationSelect, int nNumDeciSample,
--                                   double *samples_in, sample_t *samples_out,
--                                   double rScale, sample_t bias );
-+                                   double *samples_in, dca_sample_t *samples_out,
-+                                   double rScale, dca_sample_t bias );
- 
- static void pre_calc_cosmod( dca_state_t * state );
- 
-@@ -80,7 +80,7 @@
- 
-     memset (state, 0, sizeof(dca_state_t));
- 
--    state->samples = (sample_t *) memalign (16, 256 * 12 * sizeof (sample_t));
-+    state->samples = (dca_sample_t *) memalign (16, 256 * 12 * sizeof (dca_sample_t));
-     if (state->samples == NULL) {
-         free (state);
-         return NULL;
-@@ -97,7 +97,7 @@
-     return state;
- }
- 
--sample_t * dca_samples (dca_state_t * state)
-+dca_sample_t * dca_samples (dca_state_t * state)
- {
-     return state->samples;
- }
-@@ -207,7 +207,7 @@
- }
- 
- int dca_frame (dca_state_t * state, uint8_t * buf, int * flags,
--               level_t * level, sample_t bias)
-+               dca_level_t * level, dca_sample_t bias)
- {
-     int i, j;
-     static float adj_table[] = { 1.0, 1.1250, 1.2500, 1.4375 };
-@@ -996,7 +996,7 @@
-     {
-         dca_upmix (state->samples, state->amode, state->output);
-     } else
--    if (state->prim_channels > dca_channels[state->output & DCA_CHANNEL_MASK])
-+    if (state->prim_channels >= dca_channels[state->output & DCA_CHANNEL_MASK])
-     {
-         dca_downmix (state->samples, state->amode, state->output, state->bias,
-                      state->clev, state->slev);
-@@ -1142,8 +1142,8 @@
- }
- 
- static void qmf_32_subbands (dca_state_t * state, int chans,
--                             double samples_in[32][8], sample_t *samples_out,
--                             double scale, sample_t bias)
-+                             double samples_in[32][8], dca_sample_t *samples_out,
-+                             double scale, dca_sample_t bias)
- {
-     double *prCoeff;
-     int i, j, k;
-@@ -1224,8 +1224,8 @@
- }
- 
- static void lfe_interpolation_fir (int nDecimationSelect, int nNumDeciSample,
--                                   double *samples_in, sample_t *samples_out,
--                                   double scale, sample_t bias)
-+                                   double *samples_in, dca_sample_t *samples_out,
-+                                   double scale, dca_sample_t bias)
- {
-     /* samples_in: An array holding decimated samples.
-      *   Samples in current subframe starts from samples_in[0],
-@@ -1275,7 +1275,7 @@
- }
- 
- void dca_dynrng (dca_state_t * state,
--                 level_t (* call) (level_t, void *), void * data)
-+                 dca_level_t (* call) (dca_level_t, void *), void * data)
- {
-     state->dynrange = 0;
-     if (call) {
-diff -Naur libdca/src/dcadec.c libdca_patched/src/dcadec.c
---- libdca/src/dcadec.c	2007-05-02 10:05:04.000000000 +0100
-+++ libdca_patched/src/dcadec.c	2007-05-02 10:09:35.000000000 +0100
-@@ -280,15 +280,15 @@
- 		}
- 		bufpos = buf + length;
- 	    } else {
--		level_t level;
--		sample_t bias;
-+		dca_level_t level;
-+		dca_sample_t bias;
- 		int i;
- 
- 		if (output->setup (output, sample_rate, &flags, &level, &bias))
- 		    goto error;
- 		if (!disable_adjust)
- 		    flags |= DCA_ADJUST_LEVEL;
--		level = (level_t) (level * gain);
-+		level = (dca_level_t) (level * gain);
- 		if (dca_frame (state, buf, &flags, &level, bias))
- 		    goto error;
- 		if (disable_dynrng)

HandBrake-0.9.8.tar.bz2/contrib/libdca/module.defs Deleted

HandBrake-0.9.8.tar.bz2/contrib/libdca/module.rules Deleted

HandBrake-0.9.8.tar.bz2/contrib/x264/P01-solaris.patch Deleted

@@ -1,31 +0,0 @@
-diff -ru x264/Makefile x264.solaris/Makefile
---- x264/Makefile	Mon Jun  9 01:36:08 2008
-+++ x264.solaris/Makefile	Thu Jun 19 11:54:53 2008
-@@ -150,8 +150,10 @@
- 	$(MAKE) -C gtk distclean
- 
- install: x264$(EXE) $(SONAME)
--	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
--	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
-+	install -d $(DESTDIR)$(bindir) 
-+	install -d $(DESTDIR)$(includedir)
-+	install -d $(DESTDIR)$(libdir) 
-+	install -d $(DESTDIR)$(libdir)/pkgconfig
- 	install -m 644 x264.h $(DESTDIR)$(includedir)
- 	install -m 644 libx264.a $(DESTDIR)$(libdir)
- 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
-diff -ru x264/configure x264.solaris/configure
---- x264/configure	Tue Aug 12 03:26:58 2008
-+++ x264.modified/configure	Tue Aug 19 16:09:32 2008
-@@ -329,8 +327,10 @@
- 
- echo "unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';" > conftest.c
- $CC $CFLAGS conftest.c -c -o conftest.o 2>$DEVNULL || die "endian test failed"
--grep -q BIGE conftest.o && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
-+/usr/bin/tr -cd "BIGE" < conftest.o | /usr/xpg4/bin/grep -q BIGE && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
- 
-+echo $CFLAGS
-+
- # autodetect options that weren't forced nor disabled
- 
- libpthread=""

HandBrake-0.9.8.tar.bz2/doc/BUILD-Cygwin Deleted

@@ -1,483 +0,0 @@
-Guide to Building HandBrake svn4394 (2012010401) on Cygwin
-**********************************************************
-
-Table of Contents
-*****************
-
-1 Introduction
-2 Prerequisites
-3 QuickStart
-4 Overview
-5 Building via Terminal
-  5.1 Checkout Sources
-  5.2 Configure
-  5.3 Build
-  5.4 Make Targets
-    5.4.1 Global
-    5.4.2 General Modules
-    5.4.3 Contrib Modules
-    5.4.4 Contrib Touch and Untouch
-    5.4.5 Contrib Aggregates
-  5.5 Customizing Make
-6 Troubleshooting
-Appendix A Project Repository Details
-
-
-1 Introduction
-**************
-
-This guide documents the recommended process to build HandBrake on
-Cygwin hosts from the official source-code repository. Building from
-any other source is not supported.
-
-2 Prerequisites
-***************
-
-The following are the recommended specifications for building on
-Cygwin; but is not necessarily the only configuration that is possible:
-
-   * Intel 32-bit or 64-bit hardware (only 32-bit product binaries are
-     supported)
-
-   * Cygwin, gcc 4.2.4
-
-   * yasm 0.7.2.2153 (for i386 or x86_64 architectures)
-
-     Note: It is recommended to use the platform distribution's
-     standard compiler for maximum C++ compatibility. If you build with
-     a custom compiler it will likely introduce non-standard runtime
-     requirements and have new/delete, exception and RTTI
-     incompatibilities. There are of course many valid reasons to build
-     with unbundled compilers, but be aware it is generally unsupported
-     and left as an exercise to the reader.
-
-     Note: As of this writing, Cygwin has available to it several
-     versions of gcc; only one of which may be found and used in the
-     path as `gcc' and `g++'. Configure will thus find what is probably
-     the older version of gcc in a typical Cygwin environment. If you
-     desire to build with the newer gcc, it is found in the path as
-     `gcc-4' and `g++-4' respectively and you must indicate to
-     configure the desired versions. The following syntax should do the
-     trick:
-
-     ../configure --gcc=gcc-4
-
-The following general tools are used on various platforms and it is
-recommended you use these versions or similar:
-
-   * subversion - 1.6.16
-
-   * python - Python 2.7.1
-
-   * curl - curl 7.21.4 (or wget)
-
-   * m4 - GNU M4 1.4.6
-
-   * make - GNU Make 3.81
-
-   * patch - Patch 2.5.8
-
-   * tar - GNU tar 1.26
-
-   * wget - GNU Wget 1.13.4 (or curl)
-
-3 QuickStart
-************
-
-This chapter is for building from a terminal/shell environment in as
-few commands as possible. Upon completion of the following commands you
-should have a fresh build of HandBrake. Further instructions are
-available beginning with *note overview:: which describes procedures
-suitable for repeating builds. This chapter should be skipped by those
-seeking more than a minimalist build.
-
-     svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
-     cd hb-trunk
-     ./configure --launch
-
-The special option `--launch' selects launch mode and performs the
-following steps:
-
-   * assert scratch directory `build/' does not exist
-
-   * create scratch directory `build/'
-
-   * change to directory `build/'
-
-   * launch `make'
-
-   * capture build output to `build/log/build.txt'
-
-   * echo build output
-
-   * print elapsed time
-
-   * indicate if build ultimately succeeded or failed
-
-4 Overview
-**********
-
-Cygwin builds are performed from a terminal. There is no support for
-building from any IDEs.
-
-5 Building via Terminal
-***********************
-
-5.1 Checkout Sources
-====================
-
-Checkout HandBrake from the official source-code repository.
-
-     svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
-     cd hb-trunk
-
-Sources are checked out from the `trunk' branch. This document was
-generated from that very branch, and for example purposes, we will use
-exactly the same branch.
-
-If you have write-access to the repository, then you may add the
-appropriate login/password information as needed. It is recommended to
-use Subversion 1.6.0 or higher. Lower versions should also work.
-
-5.2 Configure
-=============
-
-Configure the build system.
-
-     ./configure
-
-Configure will automatically create a scratch build directory `build'
-unless you use GNU-style build procedures and first `cd' to a directory
-other than top-level source. Additionally you may use `--build' to
-specify the directory. The name of the directory is arbitrary but it is
-recommended to use something which indicates transient files which are
-not checked into the repository.
-
-The `configure' utility accepts many options. It is recommended that
-you specify `--help' for the complete list of options. The following
-options are also documented here:
-
-`--help'
-     List available options.
-
-`--src=DIR'
-     Specify top-level source directory for HandBrake sources.
-
-`--build=DIR'
-     Specify destination directory for final product install. The
-     default is to use either `build' if in the top-level source
-     directory, otherwise `.'
-
-`--prefix=DIR'
-     Specify destination directory for final product install.  This
-     defaults to a reasonable platform-specific value.
-
-`--launch'
-     All-in-one option which launches the build and logs output
-     automatically.  Useful for novices and quick-start procedures.
-
-`--disable-gtk'
-     Disable building the GTK GUI on applicable platforms such as
-     Linux.
-
-`--debug=MODE'
-     Select debug mode. Must be one of `none', `min', `std', `max'.
-     This generally maps to gcc options `-g0', `-g1', `-g2', `-g3'.
-
-`--optimize=MODE'
-     Select optimize mode. Must be one of `none', `speed', `size'.
-     This generally maps to gcc options `-g0', `-O0', `-O3', `-Os'.
-
-`--arch=MODE'
-     Select build architecture. The available architectures vary by
-     platform. Most platforms support exactly one architecture except
-     Mac OS X which has support for various universal binary
-     architectures. The available choices are hard-coded per platform
-     and no sanity checks for the required tools are performed.
-
-`--disable-xcode'
-     Disable shunting the build through `xcodebuild'. If this option is
-     applied, `HandBrakeCLI' will be produced in a similar fashion as
-     it is on other platforms; sans Xcode and the Cocoa application
-     will not be produced. Mac OS X only.
-
-`--xcconfig=MODE'
-     Select Xcode project configuration file. The available modes are
-     the basenames of files located in `macosx/xcconfig/*.xcconfig'
-     which direct Xcode to build using various architecture and Mac OS
-     X deployment options. Mac OS X only.
-
-Clean-room procedures dictate that when certain factors change, old
-builds should be scrapped and new builds configured. This is the main
-reason for requiring a scratch directory; to promote consistent,
-reliable and clean software builds. The following is a short list of
-some of the reasons why someone may choose to scrap an existing build:
-
-   * configure with different options
-
-   * subversion working dir is updated and you want configure to
-     re-evaluate working dir metadata.
-
-   * build corruption is suspected
-
-There are generally two methods for scrapping a build. The `build'
-directory can be recursively removed which has the effect of loosing
-your existing configuration but does guarantee no residuals are left
-behind. The other method is to ask the build system to perform an `make
-xclean'. This is known to work well but will leave empty directories
-behind. However, the configuration is left intact.
-
-5.3 Build
-=========
-
-Build main product. All necessary dependencies are also built if
-required.
-
-     make
-
-Parallel builds may optionally be enabled. Be aware that while a
-parallel build may save time on systems with additional cores, the
-output is often mixed, overlapped and sometimes even corrupted with
-binary characters. Thus if you experience a build issue, you should
-clean and redo the build in default serial mode to produce a readable
-log. The following command allows for up to 4 concurrent jobs via make:
-
-     make -j4
-
-5.4 Make Targets
-================
-
-The build system supports passing many kinds of targets some of which
-become very useful in normal development cycles. The targets by
-convention are lower-case words passed to `make'. Global targets are
-one-word targets. Scoped targets are usually two-words separated by a
-period.
-
-5.4.1 Global
-------------
-
-`make'
-     Alias for `make build'.
-
-`make build'
-     Build main product. All necessary dependencies are also built if
-     required.
-
-`make clean'
-     Clean all build output excluding contrib modules. Configuration is
-     retained.
-
-`make install'
-     Perform final product(s) install.  This will install build
-     products to a standard directory or one specified via `configure
-     --prefix' option.
-
-`make uninstall'
-     Perform final product(s) uninstall.  This will uninstall any
-     products which may have been previously installed.
-
-`make xclean'
-     Clean all build output including contrib modules. Configuration is
-     retained.
-
-`make doc'
-     Build auto-generated project documentation. Various articles are
-     produced and may be found in `build/doc/articles'.
-
-`make doc.post'
-     Build auto-generated project documentation and post produced
-     articles directly to source tree.
-
-`make report.help'
-     Print list of available makefile vars report targets.  These
-     reports detail var definitions and expanded values used by the
-     build system.  For experts only.
-
-`make report.all'
-     Convenience target which aggregates all reports.  For experts only.
-
-5.4.2 General Modules
----------------------
-
-General modules such as `libhb', `test' and `gtk' have the following
-scoped targets:
-
-`make MODULE.build'
-     Build MODULE.
-
-`make MODULE.clean'
-     Clean build output for MODULE.
-
-5.4.3 Contrib Modules
----------------------
-
-Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg',
-`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray',
-`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv',
-`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis',
-`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the
-following scoped targets:
-
-`make MODULE.fetch'
-     Download source tarball from the Internet and save to
-     `TOP/downloads' directory. No check-summing is performed.
-
-`make MODULE.extract'
-     Extract source tarball into `build' tree.
-
-`make MODULE.patch'
-     Apply appropriate patches (if any) to module sources.
-
-`make MODULE.configure'
-     Configure module sources.  This usually invokes autotool configure.
-
-`make MODULE.build'
-     Build module.  This usually invokes autotool build.
-
-`make MODULE.install'
-     Install module products such as headers and libraries into `build'
-     tree.  This usually invokes autotool install.
-
-`make MODULE.uninstall'
-     Uninstall module products; generally the reverse of install.  This
-     usually invokes autotool uninstall.
-
-`make MODULE.clean'
-     Clean module; generally the reverse of build.  This usually
-     invokes autotool clean.
-
-`make MODULE.xclean'
-     Extra clean module; first invokes uninstall then recursively
-     removes the module build directory.
-
-5.4.4 Contrib Touch and Untouch
--------------------------------
-
-Also available are some very granular targets which help force builds
-from specific cycle points. The following targets are available to
-touch and untouch the respective module target; this will force the
-build system to treat the target as satisfied after a touch or
-unsatisfied after an untouch:
-
-   * make MODULE.extract.touch
-
-   * make MODULE.extract.untouch
-
-   * make MODULE.patch.touch
-
-   * make MODULE.patch.untouch
-
-   * make MODULE.configure.touch
-
-   * make MODULE.configure.untouch
-
-   * make MODULE.build.touch
-
-   * make MODULE.build.untouch
-
-   * make MODULE.install.touch
-
-   * make MODULE.install.untouch
-
-5.4.5 Contrib Aggregates
-------------------------
-
-For convenience, the following targets aggregate the all contrib
-modules' respective targets together:
-
-   * make contrib.fetch
-
-   * make contrib.extract
-
-   * make contrib.patch
-
-   * make contrib.configure
-
-   * make contrib.build
-
-   * make contrib.install
-
-   * make contrib.uninstall
-
-   * make contrib.clean
-
-   * make contrib.xclean
-
-5.5 Customizing Make
-====================
-
-If the need arises to override settings in the build system
-(essentially gnu-make variables) the recommended method is to create
-optional include files which are automatically included if present and
-follow this naming convention; Do not check these files into the
-repository:
-
-`_SRC_/custom.defs'
-     Custom makevar definitions outside `build'. Suitable for settings
-     which apply across all builds for a particular checkout; or which
-     survives manual removal of `build'.
-
-`_SRC_/custom.rules'
-     Custom make rules outside `build'. Suitable for rules which apply
-     across all builds for a particular checkout; or which survives
-     manual removal of `build'.
-
-`_BUILD_/GNUmakefile.custom.defs'
-     Custom makevar definitions specific to a `build' directory.
-
-`_BUILD_/GNUmakefile.custom.rules'
-     Custom makevar rules specific to a `build' directory.
-
-
-The purpose is to allow a place to store local build settings for
-testing, tweaking, and experimenting with build configuration without
-losing your settings if `configure' is invoked; ie: `configure' would
-overwrite `GNUmakefile' and any customizations contained therein would
-be lost. Here is a short example of what the contents of
-`_SRC_/custom.defs' might contain:
-
-     ## bump to gcc-4.6 in current path
-     GCC.gcc = /usr/bin/gcc-4.6
-
-     ## replace optimize for 'speed' with more aggressive settings
-     GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2
-
-See also `make report.help' which displays a set of reports used to
-dump makefile vars.
-
-6 Troubleshooting
-*****************
-
-When troubleshooting build issues, the following files relative to the
-`build/' directory may be especially useful:
-
-`GNUmakefile'
-     Top-level makefile which contains build settings generated via
-     configure.
-
-`log/config.info.txt'
-     Record of output from configure.
-
-`log/config.verbose.txt'
-     Record of verbose output from configure.
-
-`log/build.txt'
-     Record of output from `configure --launch'. Similar output may be
-     recorded using `make' depending on which shell is in use, eg:
-     `make >& log/build.txt' or `make > log/build.txt 2>&1'.
-
-`log/xcodemake.env.txt'
-     Environment (variables) dump as seen when Xcode forks `make'.
-     Mac OS X only.
-
-Appendix A Project Repository Details
-*************************************
-
-     url:    svn://svn.handbrake.fr/HandBrake/trunk
-     root:   svn://svn.handbrake.fr/HandBrake
-     branch: trunk
-     uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    4394
-     date:   2011-12-30 17:21:44 -0500
-     type:   developer
-

HandBrake-0.9.8.tar.bz2/doc/texi/Building.cygwin.texi Deleted

@@ -1,48 +0,0 @@
-@input texinfo @c -*- Texinfo -*-
-@c %**start of header
-@setfilename Building.cygwin.info
-@include base/article.texi
-@include building/command.texi
-@paragraphindent none
-
-@set BG.platform cygwin
-@c %**end of header
-
-@majorheading Guide to Building @value{HB.title} on @value{OS.@value{BG.platform}}
-@contents
-@include building/chapter.introduction.texi
-
-@c %**-------------------------------------------------------------------------
-@anchor{prerequisites}
-@chapter Prerequisites
-The following are the recommended specifications for building on @value{OS.cygwin}; but is not necessarily the only configuration that is possible:
-
-@itemize @bullet
-@item Intel 32-bit or 64-bit hardware (only 32-bit product binaries are supported)
-@item @value{OS.cygwin}, gcc 4.2.4
-@item yasm 0.7.2.2153 (for i386 or x86_64 architectures)
-@end itemize
-
-@include building/prerequisites.bundled.texi
-
-@quotation Note
-As of this writing, @value{OS.cygwin} has available to it several versions of gcc; only one of which may be found and used in the path as @code{gcc} and @code{g++}. Configure will thus find what is probably the older version of gcc in a typical @value{OS.cygwin} environment. If you desire to build with the newer gcc, it is found in the path as @command{gcc-4} and @command{g++-4} respectively and you must indicate to configure the desired versions. The following syntax should do the trick:
-@end quotation
-
-@example
-../configure --gcc=gcc-4
-@end example
-
-@include building/prerequisites.common.texi
-
-@c %**-------------------------------------------------------------------------
-@include building/chapter.quickstart.texi
-
-@anchor{overview}
-@chapter Overview
-@value{OS.cygwin} builds are performed from a @b{terminal}. There is no support for building from any IDEs.
-
-@c %**-------------------------------------------------------------------------
-@include building/chapter.via.terminal.texi
-@include building/chapter.troubleshooting.texi
-@include building/appendix.repo.texi

HandBrake-0.9.8.tar.bz2/gtk/src/hb-drawer.32.png Deleted

HandBrake-0.9.8.tar.bz2/gtk/src/hb-queue-delete.16.png Deleted

HandBrake-0.9.8.tar.bz2/gtk/src/hb-remove.32.png Deleted

HandBrake-0.9.8.tar.bz2/libhb/decdca.c Deleted

@@ -1,372 +0,0 @@
-/* $Id: decdca.c,v 1.14 2005/03/03 17:21:57 titer Exp $
-
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
-#include "hb.h"
-#include "downmix.h"
-
-#include "dca.h"
-
-struct hb_work_private_s
-{
-    hb_job_t    * job;
-
-    /* libdca handle */
-    dca_state_t * state;
-
-    double        next_pts;
-    int64_t       last_buf_pts;
-    int           flags_in;
-    int           flags_out;
-    int           rate;
-    int           bitrate;
-    int           frame_length;
-    float         level;
-
-    int           error;
-    int           sync;
-    int           size;
-
-    /* max frame size of the 16 bits version is 16384 */
-    /* max frame size of the 14 bits version is 18726 */
-    uint8_t       frame[18726];
-
-    hb_list_t   * list;
-
-    int           out_discrete_channels;
-
-};
-
-static int  decdcaInit( hb_work_object_t *, hb_job_t * );
-static int  decdcaWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-static void decdcaClose( hb_work_object_t * );
-static int  decdcaBSInfo( hb_work_object_t *, const hb_buffer_t *,
-                          hb_work_info_t * );
-
-hb_work_object_t hb_decdca =
-{
-    WORK_DECDCA,
-    "DCA decoder",
-    decdcaInit,
-    decdcaWork,
-    decdcaClose,
-    0,
-    decdcaBSInfo
-};
-
-/***********************************************************************
- * Local prototypes
- **********************************************************************/
-static hb_buffer_t * Decode( hb_work_object_t * w );
-
-/***********************************************************************
- * hb_work_decdca_init
- ***********************************************************************
- * Allocate the work object, initialize libdca
- **********************************************************************/
-static int decdcaInit( hb_work_object_t * w, hb_job_t * job )
-{
-    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
-    hb_audio_t * audio = w->audio;
-    w->private_data = pv;
-
-    pv->job   = job;
-
-    pv->list      = hb_list_init();
-    pv->state     = dca_init( 0 );
-
-    /* Decide what format we want out of libdca
-    work.c has already done some of this deduction for us in do_job() */
-
-    pv->flags_out = HB_AMIXDOWN_GET_DCA_FORMAT(audio->config.out.mixdown);
-
-    /* pass the number of channels used into the private work data */
-    /* will only be actually used if we're not doing AC3 passthru */
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
-
-    pv->level     = 1.0;
-
-    return 0;
-}
-
-/***********************************************************************
- * Close
- ***********************************************************************
- * Free memory
- **********************************************************************/
-static void decdcaClose( hb_work_object_t * w )
-{
-    hb_work_private_t * pv = w->private_data;
-    dca_free( pv->state );
-    hb_list_empty( &pv->list );
-    free( pv );
-    w->private_data = NULL;
-}
-
-/***********************************************************************
- * Work
- ***********************************************************************
- * Add the given buffer to the data we already have, and decode as much
- * as we can
- **********************************************************************/
-static int decdcaWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
-                hb_buffer_t ** buf_out )
-{
-    hb_work_private_t * pv = w->private_data;
-    hb_buffer_t * buf;
-
-    if ( (*buf_in)->size <= 0 )
-    {
-        /* EOF on input stream - send it downstream & say that we're done */
-        *buf_out = *buf_in;
-        *buf_in = NULL;
-        return HB_WORK_DONE;
-    }
-
-    if ( (*buf_in)->start < -1 && pv->next_pts == 0 )
-    {
-        // discard buffers that start before video time 0
-        *buf_out = NULL;
-        return HB_WORK_OK;
-    }
-
-    hb_list_add( pv->list, *buf_in );
-    *buf_in = NULL;
-
-    /* If we got more than a frame, chain raw buffers */
-    *buf_out = buf = Decode( w );
-    while( buf )
-    {
-        buf->next = Decode( w );
-        buf       = buf->next;
-    }
-
-    return HB_WORK_OK;
-}
-
-/***********************************************************************
- * Decode
- ***********************************************************************
- *
- **********************************************************************/
-static hb_buffer_t * Decode( hb_work_object_t * w )
-{
-    hb_work_private_t * pv = w->private_data;
-    hb_buffer_t * buf;
-    hb_audio_t  * audio = w->audio;
-    int           i, j, k;
-    int64_t       pts, pos;
-    uint64_t      upts, upos;
-    int           num_blocks;
-
-    /* Get a frame header if don't have one yet */
-    if( !pv->sync )
-    {
-        while( hb_list_bytes( pv->list ) >= 14 )
-        {
-            /* We have 14 bytes, check if this is a correct header */
-            hb_list_seebytes( pv->list, pv->frame, 14 );
-            pv->size = dca_syncinfo( pv->state, pv->frame, &pv->flags_in, &pv->rate,
-                                    &pv->bitrate, &pv->frame_length );
-            if( pv->size )
-            {
-                /* It is. W00t. */
-                if( pv->error )
-                {
-                    hb_log( "dca_syncinfo ok" );
-                }
-                pv->error = 0;
-                pv->sync  = 1;
-                break;
-            }
-
-            /* It is not */
-            if( !pv->error )
-            {
-                hb_log( "dca_syncinfo failed" );
-                pv->error = 1;
-            }
-
-            /* Try one byte later */
-            hb_list_getbytes( pv->list, pv->frame, 1, NULL, NULL );
-        }
-    }
-
-    if( !pv->sync || hb_list_bytes( pv->list ) < pv->size )
-    {
-        /* Need more data */
-        return NULL;
-    }
-
-    /* Get the whole frame */
-    hb_list_getbytes( pv->list, pv->frame, pv->size, &upts, &upos );
-    pts = (int64_t)upts;
-    pos = (int64_t)upos;
-
-    if ( pts != pv->last_buf_pts )
-    {
-        pv->last_buf_pts = pts;
-    }
-    else
-    {
-        // spec says that the PTS is the start time of the first frame
-        // that starts in the PES frame so we only use the PTS once then
-        // get the following frames' PTS from the frame length.
-        pts = -1;
-    }
-
-    // mkv files typically use a 1ms timebase which results in a lot of
-    // truncation error in their timestamps. Also, TSMuxer or something
-    // in the m2ts-to-mkv toolchain seems to take a very casual attitude
-    // about time - timestamps seem to randomly offset by ~40ms for a few
-    // seconds then recover. So, if the pts we got is within 50ms of the
-    // pts computed from the data stream, use the data stream pts.
-    if ( pts == -1 || ( pv->next_pts && fabs( pts - pv->next_pts ) < 50.*90. ) )
-    {
-        pts = pv->next_pts;
-    }
-
-    double frame_dur = (double)(pv->frame_length & ~0xFF) / (double)pv->rate * 90000.;
-
-    /* DCA passthrough: don't decode the DCA frame */
-    if( audio->config.out.codec == HB_ACODEC_DCA_PASS )
-    {
-        buf = hb_buffer_init( pv->size );
-        memcpy( buf->data, pv->frame, pv->size );
-        buf->start = pts;
-        buf->duration = frame_dur;
-        pv->next_pts = pts + frame_dur;
-        buf->stop  = pv->next_pts;
-        pv->sync = 0;
-        return buf;
-    }
-
-    /* Feed libdca */
-    dca_frame( pv->state, pv->frame, &pv->flags_out, &pv->level, 0 );
-
-    /* find out how many blocks are in this frame */
-    num_blocks = dca_blocks_num( pv->state );
-
-    /* num_blocks blocks per frame, 256 samples per block, channelsused channels */
-    int nsamp = num_blocks * 256;
-    frame_dur = (double)nsamp / (double)pv->rate * 90000.;
-    buf = hb_buffer_init( nsamp * pv->out_discrete_channels * sizeof( float ) );
-
-    buf->start = pts;
-    buf->duration = frame_dur;
-    pv->next_pts = pts + frame_dur;
-    buf->stop  = pv->next_pts;
-
-    for( i = 0; i < num_blocks; i++ )
-    {
-        dca_sample_t * samples_in;
-        float    * samples_out;
-
-        dca_block( pv->state );
-        samples_in  = dca_samples( pv->state );
-        samples_out = ((float *) buf->data) + 256 * pv->out_discrete_channels * i;
-
-        /* Interleave */
-        for( j = 0; j < 256; j++ )
-        {
-            for ( k = 0; k < pv->out_discrete_channels; k++ )
-            {
-                samples_out[(pv->out_discrete_channels*j)+k]   = samples_in[(256*k)+j];
-            }
-        }
-
-    }
-
-    pv->sync = 0;
-    return buf;
-}
-
-
-static int decdcaBSInfo( hb_work_object_t *w, const hb_buffer_t *b,
-                         hb_work_info_t *info )
-{
-    int i, flags, rate, bitrate, frame_length;
-    dca_state_t * state = dca_init( 0 );
-
-    memset( info, 0, sizeof(*info) );
-
-    /* since DCA frames don't line up with MPEG ES frames scan the
-     * entire frame for an DCA sync pattern.  */
-    for ( i = 0; i < b->size - 7; ++i )
-    {
-        if( dca_syncinfo( state, &b->data[i], &flags, &rate, &bitrate,
-                          &frame_length ) )
-        {
-            break;
-        }
-    }
-    if ( i >= b->size - 7 )
-    {
-        /* didn't find DCA sync */
-        dca_free( state );
-        return 0;
-    }
-
-    info->name = "DCA";
-    info->rate = rate;
-    info->rate_base = 1;
-    info->bitrate = bitrate;
-    info->flags = flags;
-    info->samples_per_frame = frame_length;
-
-    if ( ( flags & DCA_CHANNEL_MASK) == DCA_DOLBY )
-    {
-        info->flags |= AUDIO_F_DOLBY;
-    }
-
-    switch( flags & DCA_CHANNEL_MASK )
-    {
-        /* mono sources */
-        case DCA_MONO:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_MONO;
-            break;
-        /* stereo input */
-        case DCA_CHANNEL:
-        case DCA_STEREO:
-        case DCA_STEREO_SUMDIFF:
-        case DCA_STEREO_TOTAL:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
-            break;
-        /* 3F/2R input */
-        case DCA_3F2R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_3F2R;
-            break;
-        /* 3F/1R input */
-        case DCA_3F1R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_3F1R;
-            break;
-        /* other inputs */
-        case DCA_3F:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_3F;
-            break;
-        case DCA_2F1R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_2F1R;
-            break;
-        case DCA_2F2R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_2F2R;
-            break;
-        case DCA_4F2R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_4F2R;
-            break;
-        /* unknown */
-        default:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
-    }
-
-    if (flags & DCA_LFE)
-    {
-        info->channel_layout |= HB_INPUT_CH_LAYOUT_HAS_LFE;
-    }
-
-    info->channel_map = &hb_qt_chan_map;
-
-    dca_free( state );
-    return 1;
-}

HandBrake-0.9.8.tar.bz2/libhb/downmix.c Deleted

@@ -1,1608 +0,0 @@
-/* $Id: downmix.c,v 1.15 2005/03/17 19:22:47 stebbins Exp $
-
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
-#include <string.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include "common.h"
-#include "downmix.h"
-
-#define LVL_PLUS6DB 2.0
-#define LVL_PLUS3DB 1.4142135623730951
-#define LVL_3DB 0.7071067811865476
-#define LVL_45DB 0.5946035575013605
-#define LVL_6DB 0.5
-
-#define LVL_SQRT_1_4 0.5
-#define LVL_SQRT_3_4 0.866025404
-
-#define HB_CH_FRONT_LEFT             0x00000001
-#define HB_CH_FRONT_RIGHT            0x00000002
-#define HB_CH_FRONT_CENTER           0x00000004
-#define HB_CH_LOW_FREQUENCY          0x00000008
-#define HB_CH_BACK_LEFT              0x00000010
-#define HB_CH_BACK_RIGHT             0x00000020
-#define HB_CH_BACK_CENTER            0x00000040
-#define HB_CH_SIDE_LEFT              0x00000080
-#define HB_CH_SIDE_RIGHT             0x00000100
-
-#define HB_CH_SURROUND_MASK          0x000001f0
-#define HB_CH_MASK                   0x000007ff
-
-#define HB_CH_DOLBY                  0x00000800
-#define HB_CH_DPLII                  0x00001000
-
-#define DOWNMIX_MONO 0
-#define DOWNMIX_STEREO 1
-#define DOWNMIX_3F 2
-#define DOWNMIX_2F1R 3
-#define DOWNMIX_3F1R 4
-#define DOWNMIX_2F2R 5
-#define DOWNMIX_3F2R 6
-#define DOWNMIX_3F4R 7
-#define DOWNMIX_DOLBY 8
-#define DOWNMIX_DPLII 9
-#define DOWNMIX_NUM_MODES 10
-
-#define DOWNMIX_CHANNEL_MASK 0x0f
-
-#define DOWNMIX_LFE_FLAG 0x10
-#define DOWNMIX_FLAGS_MASK 0x10
-
-hb_sample_t downmix_matrix[DOWNMIX_NUM_MODES][DOWNMIX_NUM_MODES][8][8] =
-{
-// MONO in
-{
-    // MONO out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       1, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       1, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 1, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 1, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 } },
-    // 2F2R out
-    { { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 1, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-    // 3F2R out
-    { { 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 1, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 } },
-    // 3F4R out
-    { { 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 1 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 } },
-    // DOLBY out
-    { { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       1, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       1, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-},
-// STEREO in
-{
-    // MONO out
-    { { LVL_3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, 0, 0, 0, 0, 0, 0, 0 },
-      {       0, 1, 0, 0, 0, 0, 0, 0 },
-      {       0, 0, 0, 0, 0, 0, 0, 0 },
-      {       0, 0, 0, 0, 0, 0, 0, 0 },
-      {       0, 0, 0, 0, 0, 0, 0, 0 },
-      {       0, 0, 0, 0, 0, 0, 0, 0 },
-      {       0, 0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F2R out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F4R out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 1 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // DOLBY out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-},
-// 3F in
-{
-    // MONO out
-    { { LVL_PLUS3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { 0,           1, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F2R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F4R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 1 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // DOLBY out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-},
-// 2F1R in
-{
-    // MONO out
-    { { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { 0,           1, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       1,       0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       1, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 0, 1,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       1,       0, 0, 0, 0, 0 },
-      { 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       1, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 1, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0,       0,       1, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 } },
-    // 3F2R out
-    { { 0, 1, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 1, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, LVL_3DB, 0, 0, 0 },
-      { 0, 0, 0, 0,       0,       1, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 } },
-    // 3F4R out
-    { { 0, 1, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 1, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, LVL_3DB, LVL_3DB, 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 1 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 } },
-    // DOLBY out
-    { { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 } },
-},
-// 3F1R in
-{
-    // MONO out
-    { { LVL_PLUS3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { 0,           1, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1,       1,       0, 0, 0, 0, 0, 0 },
-      { 1,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       1,       0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       1, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       0,       0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 1, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 1,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       1,       0, 0, 0, 0, 0 },
-      { 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       1, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       0,       0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 1, 0,       0,       0, 0, 0, 0 },
-      { 1, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 1, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0,       0,       1, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, 0,       0,       0, 0, 0, 0 } },
-    // 3F2R out
-    { { 1, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 1, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 1, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, LVL_3DB, 0, 0, 0 },
-      { 0, 0, 0, 0,       0,       1, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, 0,       0,       0, 0, 0 } },
-    // 3F4R out
-    { { 1, 0, 0, 0, 0, 0,       0      , 0 },
-      { 0, 1, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 1, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, LVL_3DB, LVL_3DB, 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 1 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 },
-      { 0, 0, 0, 0, 0, 0,       0      , 0 } },
-    // DOLBY out
-    { { LVL_3DB,  LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { LVL_3DB,  LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 } },
-},
-// 2F2R in
-{
-    // MONO out
-    { { LVL_3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { 0,       1, 0, 0, 0, 0, 0, 0 },
-      { 0,       0, 0, 0, 0, 0, 0, 0 },
-      { 0,       0, 0, 0, 0, 0, 0, 0 },
-      { 0,       0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 0, 0,       0, 0, 0, 0, 0 },
-      { 0, 1, 0,       0, 0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0, 0,       1, 0, 0, 0, 0 },
-      { 0, 0, 0,       0, 0, 0, 0, 0 },
-      { 0, 0, 0,       0, 0, 0, 0, 0 },
-      { 0, 0, 0,       0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 0, 1, 0, 0,       0, 0, 0, 0 },
-      { 0, 0, 1, 0,       0, 0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0, 0,       1, 0, 0, 0 },
-      { 0, 0, 0, 0,       0, 0, 0, 0 },
-      { 0, 0, 0, 0,       0, 0, 0, 0 },
-      { 0, 0, 0, 0,       0, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F2R out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F4R out
-    { { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 1, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 1 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // DOLBY out
-    { { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_6DB, LVL_6DB, 0, 0, 0, 0, 0, 0 },
-      { -LVL_6DB, LVL_6DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { 1,             0,             0, 0, 0, 0, 0, 0 },
-      { 0,             1,             0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_3_4, LVL_SQRT_1_4,  0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_1_4, LVL_SQRT_3_4,  0, 0, 0, 0, 0, 0 },
-      { 0,             0,             1, 0, 0, 0, 0, 0 },
-      { 0,             0,             0, 0, 0, 0, 0, 0 },
-      { 0,             0,             0, 0, 0, 0, 0, 0 },
-      { 0,             0,             0, 0, 0, 0, 0, 0 } },
-},
-// 3F2R in
-{
-    // MONO out
-    { { LVL_PLUS3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { 0,           1, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 },
-      { 0,           0, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 1, 0,       0, 0, 0, 0, 0 },
-      { 1, 0, 0,       0, 0, 0, 0, 0 },
-      { 0, 1, 0,       0, 0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0, 0,       1, 0, 0, 0, 0 },
-      { 0, 0, 0,       0, 0, 0, 0, 0 },
-      { 0, 0, 0,       0, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 1, 0, 0, 0,       0, 0, 0, 0 },
-      { 0, 1, 0, 0,       0, 0, 0, 0 },
-      { 0, 0, 1, 0,       0, 0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0, 0,       1, 0, 0, 0 },
-      { 0, 0, 0, 0,       0, 0, 0, 0 },
-      { 0, 0, 0, 0,       0, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 1, 0, 0, 0, 0, 0, 0 },
-      { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F2R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // 3F4R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 1, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 1 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 0 } },
-    // DOLBY out
-    { { LVL_3DB,  LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        0,       0, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { LVL_3DB,       LVL_3DB,       0, 0, 0, 0, 0, 0 },
-      { 1,             0,             0, 0, 0, 0, 0, 0 },
-      { 0,             1,             0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_3_4, LVL_SQRT_1_4,  0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_1_4, LVL_SQRT_3_4,  0, 0, 0, 0, 0, 0 },
-      { 0,             0,             1, 0, 0, 0, 0, 0 },
-      { 0,             0,             0, 0, 0, 0, 0, 0 },
-      { 0,             0,             0, 0, 0, 0, 0, 0 } },
-},
-// 3F4R in
-{
-    // MONO out
-    { { LVL_PLUS3DB, 0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_6DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_6DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_6DB,     0, 0, 0, 0, 0, 0, 0 },
-      { LVL_6DB,     0, 0, 0, 0, 0, 0, 0 },
-      { 0,           1, 0, 0, 0, 0, 0, 0 } },
-    // STEREO out
-    { { 1,       1,       0, 0, 0, 0, 0, 0 },
-      { 1,       0,       0, 0, 0, 0, 0, 0 },
-      { 0,       1,       0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, 0,       0, 0, 0, 0, 0, 0 },
-      { 0,       LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { LVL_3DB, 0,       0, 0, 0, 0, 0, 0 },
-      { 0,       LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,       0,       1, 0, 0, 0, 0, 0 } },
-    // 3F out
-    { { 1, 0,       0,       0, 0, 0, 0, 0 },
-      { 0, 1,       0,       0, 0, 0, 0, 0 },
-      { 0, 0,       1,       0, 0, 0, 0, 0 },
-      { 0, LVL_3DB, 0,       0, 0, 0, 0, 0 },
-      { 0, 0,       LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, LVL_3DB, 0,       0, 0, 0, 0, 0 },
-      { 0, 0,       LVL_3DB, 0, 0, 0, 0, 0 },
-      { 0, 0,       0,       1, 0, 0, 0, 0 } },
-    // 2F1R out
-    { { 1, 1, 0,       0, 0, 0, 0, 0 },
-      { 1, 0, 0,       0, 0, 0, 0, 0 },
-      { 0, 1, 0,       0, 0, 0, 0, 0 },
-      { 0, 0, LVL_6DB, 0, 0, 0, 0, 0 },
-      { 0, 0, LVL_6DB, 0, 0, 0, 0, 0 },
-      { 0, 0, LVL_6DB, 0, 0, 0, 0, 0 },
-      { 0, 0, LVL_6DB, 0, 0, 0, 0, 0 },
-      { 0, 0, 0,       1, 0, 0, 0, 0 } },
-    // 3F1R out
-    { { 1, 0, 0, 0,       0, 0, 0, 0 },
-      { 0, 1, 0, 0,       0, 0, 0, 0 },
-      { 0, 0, 1, 0,       0, 0, 0, 0 },
-      { 0, 0, 0, LVL_6DB, 0, 0, 0, 0 },
-      { 0, 0, 0, LVL_6DB, 0, 0, 0, 0 },
-      { 0, 0, 0, LVL_6DB, 0, 0, 0, 0 },
-      { 0, 0, 0, LVL_6DB, 0, 0, 0, 0 },
-      { 0, 0, 0, 0,       1, 0, 0, 0 } },
-    // 2F2R out
-    { { 1, 1, 0,       0,       0, 0, 0, 0 },
-      { 1, 0, 0,       0,       0, 0, 0, 0 },
-      { 0, 1, 0,       0,       0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, 0,       0, 0, 0, 0 },
-      { 0, 0, 0,       LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, LVL_3DB, 0,       0, 0, 0, 0 },
-      { 0, 0, 0,       LVL_3DB, 0, 0, 0, 0 },
-      { 0, 0, 0,       0,       1, 0, 0, 0 } },
-    // 3F2R out
-    { { 1, 0, 0, 0,       0,       0, 0, 0 },
-      { 0, 1, 0, 0,       0,       0, 0, 0 },
-      { 0, 0, 1, 0,       0,       0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, 0,       0, 0, 0 },
-      { 0, 0, 0, 0,       LVL_3DB, 0, 0, 0 },
-      { 0, 0, 0, LVL_3DB, 0,       0, 0, 0 },
-      { 0, 0, 0, 0,       LVL_3DB, 0, 0, 0 },
-      { 0, 0, 0, 0,       0,       1, 0, 0 } },
-    // 3F4R out
-    { { 1, 0, 0, 0, 0, 0, 0, 0 },
-      { 0, 1, 0, 0, 0, 0, 0, 0 },
-      { 0, 0, 1, 0, 0, 0, 0, 0 },
-      { 0, 0, 0, 1, 0, 0, 0, 0 },
-      { 0, 0, 0, 0, 1, 0, 0, 0 },
-      { 0, 0, 0, 0, 0, 1, 0, 0 },
-      { 0, 0, 0, 0, 0, 0, 1, 0 },
-      { 0, 0, 0, 0, 0, 0, 0, 1 } },
-    // DOLBY out
-    { { LVL_3DB,  LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 1,        0,       0, 0, 0, 0, 0, 0 },
-      { 0,        1,       0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { -LVL_3DB, LVL_3DB, 0, 0, 0, 0, 0, 0 },
-      { 0,        0,       1, 0, 0, 0, 0, 0 } },
-    // DPLII out
-    { { LVL_3DB,               LVL_3DB,               0, 0, 0, 0, 0, 0 },
-      { 1,                     0,                     0, 0, 0, 0, 0, 0 },
-      { 0,                     1,                     0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_3_4*LVL_3DB, LVL_SQRT_1_4*LVL_3DB,  0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_1_4*LVL_3DB, LVL_SQRT_3_4*LVL_3DB,  0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_3_4*LVL_3DB, LVL_SQRT_1_4*LVL_3DB,  0, 0, 0, 0, 0, 0 },
-      { -LVL_SQRT_1_4*LVL_3DB, LVL_SQRT_3_4*LVL_3DB,  0, 0, 0, 0, 0, 0 },
-      { 0,                     0,                     1, 0, 0, 0, 0, 0 } }
-},
-};
-
-static int channel_layout_map[DOWNMIX_NUM_MODES] =
-{
-    // DOWNMIX_MONO 
-    (HB_CH_FRONT_CENTER),
-    // DOWNMIX_STEREO 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT),
-    // DOWNMIX_3F 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT|HB_CH_FRONT_CENTER),
-    // DOWNMIX_2F1R 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT|HB_CH_BACK_CENTER),
-    // DOWNMIX_3F1R 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT|HB_CH_FRONT_CENTER|HB_CH_BACK_CENTER),
-    // DOWNMIX_2F2R 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT|HB_CH_BACK_LEFT|HB_CH_BACK_RIGHT),
-    // DOWNMIX_3F2R 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT|HB_CH_FRONT_CENTER|HB_CH_BACK_LEFT|HB_CH_BACK_RIGHT),
-    // DOWNMIX_3F4R 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT|HB_CH_FRONT_CENTER|HB_CH_SIDE_LEFT|
-     HB_CH_SIDE_RIGHT|HB_CH_BACK_LEFT|HB_CH_BACK_RIGHT),
-    // DOWNMIX_DOLBY 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT),
-    // DOWNMIX_DPLII 
-    (HB_CH_FRONT_LEFT|HB_CH_FRONT_RIGHT)
-};
-
-int hb_layout_to_mode(int layout)
-{
-    int mode;
-    switch (layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK)
-    {
-        case HB_INPUT_CH_LAYOUT_MONO:
-            mode = DOWNMIX_MONO;
-            break;
-        case HB_INPUT_CH_LAYOUT_STEREO:
-            mode = DOWNMIX_STEREO;
-            break;
-        case HB_INPUT_CH_LAYOUT_3F:
-            mode = DOWNMIX_3F;
-            break;
-        case HB_INPUT_CH_LAYOUT_2F1R:
-            mode = DOWNMIX_2F1R;
-            break;
-        case HB_INPUT_CH_LAYOUT_3F1R:
-            mode = DOWNMIX_3F1R;
-            break;
-        case HB_INPUT_CH_LAYOUT_2F2R:
-            mode = DOWNMIX_2F2R;
-            break;
-        case HB_INPUT_CH_LAYOUT_3F2R:
-            mode = DOWNMIX_3F2R;
-            break;
-        case HB_INPUT_CH_LAYOUT_4F2R:
-            mode = DOWNMIX_3F2R|DOWNMIX_LFE_FLAG;
-            break;
-        case HB_INPUT_CH_LAYOUT_3F4R:
-            mode = DOWNMIX_3F4R;
-            break;
-        case HB_INPUT_CH_LAYOUT_DOLBY:
-            mode = DOWNMIX_STEREO;
-            break;
-        default:
-            mode = DOWNMIX_STEREO;
-            break;
-    }
-    if (layout & HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK)
-        mode |= DOWNMIX_LFE_FLAG;
-    return mode;
-}
-
-int hb_mixdown_to_mode(uint32_t mixdown)
-{
-    switch (mixdown)
-    {
-        case HB_AMIXDOWN_MONO:
-            return DOWNMIX_MONO;
-        case HB_AMIXDOWN_STEREO:
-            return DOWNMIX_STEREO;
-        case HB_AMIXDOWN_DOLBY:
-            return DOWNMIX_DOLBY;
-        case HB_AMIXDOWN_DOLBYPLII:
-            return DOWNMIX_DPLII;
-        case HB_AMIXDOWN_6CH:
-            return DOWNMIX_3F2R|DOWNMIX_LFE_FLAG;
-        default:
-            return DOWNMIX_STEREO;
-    }
-}
-
-
-// ffmpeg gives us SMPTE channel layout
-// We could use this layout and remap channels in encfaac,
-// but VLC may have problems with remapping, so lets
-// allow remapping to the default QuickTime order which is:
-//
-// C   L   R   LS  RS  Rls Rrs LFE
-//
-// This arrangement also makes it possible to use half as
-// many downmix matrices since the matrix with and without
-// LFE are the same.
-//
-// Use hb_layout_remap to accomplish this.  For convenience
-// I've provided the necessary maps.
-//
-// SMPTE channel layout
-//
-// DUAL-MONO      L   R 
-// DUAL-MONO-LFE  L   R   LFE
-// MONO           M
-// MONO-LFE       M   LFE
-// STEREO         L   R 
-// STEREO-LFE     L   R   LFE
-// 3F             L   R   C
-// 3F-LFE         L   R   C    LFE
-// 2F1            L   R   S
-// 2F1-LFE        L   R   LFE  S
-// 3F1            L   R   C    S
-// 3F1-LFE        L   R   C    LFE S
-// 2F2            L   R   LS   RS
-// 2F2-LFE        L   R   LFE  LS   RS
-// 3F2            L   R   C    LS   RS
-// 3F2-LFE        L   R   C    LFE  LS   RS
-// 3F4            L   R   C    Rls  Rrs  LS   RS
-// 3F4-LFE        L   R   C    LFE  Rls  Rrs  LS   RS
-//
-
-#define CH_C      0
-#define CH_L      1
-#define CH_R      2
-#define CH_CS     3
-#define CH_LS     3
-#define CH_RS     4
-#define CH_Rls    5
-#define CH_Rrs    6
-#define CH_LFE    7
-
-hb_chan_map_t hb_qt_chan_map =
-{
-{
-    {{ CH_C,                                                     },
-     { CH_C, CH_LFE,                                             }}, // MONO
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R, CH_LFE,                                       }}, // STEREO
-
-    {{ CH_C, CH_L, CH_R,                                         },
-     { CH_C, CH_L, CH_R, CH_LFE,                                 }}, // 3F
-
-    {{ CH_L, CH_R, CH_CS,                                        },
-     { CH_L, CH_R, CH_CS, CH_LFE,                                }}, // 2F1R
-
-    {{ CH_C, CH_L, CH_R, CH_CS,                                  },
-     { CH_C, CH_L, CH_R, CH_CS, CH_LFE,                          }}, // 3F1R
-
-    {{ CH_L, CH_R, CH_LS, CH_RS,                                 },
-     { CH_L, CH_R, CH_LS, CH_RS, CH_LFE,                         }}, // 2F2R
-
-    {{ CH_C, CH_L, CH_R, CH_LS, CH_RS,                           },
-     { CH_C, CH_L, CH_R, CH_LS, CH_RS, CH_LFE,                   }}, // 3F2R
-
-    {{ CH_C, CH_L, CH_R, CH_LS, CH_RS,  CH_Rls,  CH_Rrs,         },
-     { CH_C, CH_L, CH_R, CH_LS, CH_RS,  CH_Rls,  CH_Rrs,  CH_LFE }}, // 3F4R
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R,                                               }}, // DOLBY
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R,                                               }}  // DPLII
-},
-{
-    // CH_C  CH_L  CH_R  CH_LS/CS  CH_RS   CH_Rls   CH_Rrs   CH_LFE 
-    {{ 0,    0,    0,    0,        0,      0,       0,       0   },
-     { 0,    0,    0,    0,        0,      0,       0,       1   }}, // MONO
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       2   }}, // STEREO
-
-    {{ 0,    1,    2,    0,        0,      0,       0,       0   },
-     { 0,    1,    2,    0,        0,      0,       0,       3   }}, // 3F
-
-    {{ 0,    0,    1,    2,        0,      0,       0,       0   },
-     { 0,    0,    1,    2,        0,      0,       0,       3   }}, // 2F1R
-
-    {{ 0,    1,    2,    3,        0,      0,       0,       0   },
-     { 0,    1,    2,    3,        0,      0,       0,       4   }}, // 3F1R
-
-    {{ 0,    0,    1,    2,        3,      0,       0,       0   },
-     { 0,    0,    1,    2,        3,      0,       0,       4   }}, // 2F2R
-
-    {{ 0,    1,    2,    3,        4,      0,       0,       0   },
-     { 0,    1,    2,    3,        4,      0,       0,       5   }}, // 3F2R
-
-    {{ 0,    1,    2,    3,        4,      5,       6,       0   },
-     { 0,    1,    2,    3,        4,      5,       6,       7   }}, // 3F4R
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       0   }}, // DOLBY
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       0   }}  // DPLII
-}
-};
-
-hb_chan_map_t hb_smpte_chan_map =
-{
-{
-    {{ CH_C,                                                     },
-     { CH_C, CH_LFE,                                             }}, // MONO
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R, CH_LFE,                                       }}, // STEREO
-
-    {{ CH_L, CH_R, CH_C,                                         },
-     { CH_L, CH_R, CH_C, CH_LFE,                                 }}, // 3F
-
-    {{ CH_L, CH_R, CH_CS,                                        },
-     { CH_L, CH_R, CH_LFE, CH_CS,                                }}, // 2F1R
-
-    {{ CH_L, CH_R, CH_C,   CH_CS,                                },
-     { CH_L, CH_R, CH_LFE, CH_CS,                                }}, // 3F1R
-
-    {{ CH_L, CH_R, CH_LS,  CH_RS,                                },
-     { CH_L, CH_R, CH_LFE, CH_LS, CH_RS,                         }}, // 2F2R
-
-    {{ CH_L, CH_R, CH_C, CH_LS,  CH_RS,                          },
-     { CH_L, CH_R, CH_C, CH_LFE, CH_LS, CH_RS,                   }}, // 3F2R
-
-    {{ CH_L, CH_R, CH_C, CH_Rls, CH_Rrs, CH_LS, CH_RS },
-     { CH_L, CH_R, CH_C, CH_LFE, CH_Rls, CH_Rrs, CH_LS, CH_RS    }}, // 3F4R
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R,                                               }}, // DOLBY
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R,                                               }}  // DPLII
-},
-{
-    // CH_C  CH_L  CH_R  CH_LS/CS  CH_RS   CH_Rls   CH_Rrs   CH_LFE 
-    {{ 0,    0,    0,    0,        0,      0,       0,       0   },
-     { 0,    0,    0,    0,        0,      0,       0,       1   }}, // MONO
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       2   }}, // STEREO
-
-    {{ 2,    0,    1,    0,        0,      0,       0,       0   },
-     { 2,    0,    1,    0,        0,      0,       0,       3   }}, // 3F
-
-    {{ 0,    0,    1,    2,        0,      0,       0,       0   },
-     { 0,    0,    1,    3,        0,      0,       0,       2   }}, // 2F1R
-
-    {{ 2,    0,    1,    3,        0,      0,       0,       0   },
-     { 2,    0,    1,    4,        0,      0,       0,       3   }}, // 3F1R
-
-    {{ 0,    0,    1,    2,        3,      0,       0,       0   },
-     { 0,    0,    1,    3,        4,      0,       0,       2   }}, // 2F2R
-
-    {{ 2,    0,    1,    3,        4,      0,       0,       0   },
-     { 2,    0,    1,    4,        5,      0,       0,       3   }}, // 3F2R
-
-    {{ 2,    0,    1,    5,        6,      3,       4,       0   },
-     { 2,    0,    1,    6,        7,      4,       5,       3   }}, // 3F4R
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       0   }}, // DOLBY
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       0   }}  // DPLII
-}
-};
-
-hb_chan_map_t hb_ac3_chan_map =
-{
-{
-    {{ CH_C,                                                     },
-     { CH_LFE, CH_C,                                             }}, // MONO
-
-    {{ CH_L, CH_R,                                               },
-     { CH_LFE, CH_L, CH_R,                                       }}, // STEREO
-
-    {{ CH_L, CH_C, CH_R,                                         },
-     { CH_LFE, CH_L, CH_C, CH_R,                                 }}, // 3F
-
-    {{ CH_L, CH_R, CH_CS,                                        },
-     { CH_LFE, CH_L, CH_R, CH_CS,                                }}, // 2F1R
-
-    {{ CH_L, CH_C, CH_R, CH_CS,                                  },
-     { CH_LFE, CH_L, CH_C, CH_R, CH_CS,                          }}, // 3F1R
-
-    {{ CH_L, CH_R, CH_LS, CH_RS,                                 },
-     { CH_LFE, CH_L, CH_R, CH_LS, CH_RS,                         }}, // 2F2R
-
-    {{ CH_L, CH_C, CH_R, CH_LS, CH_RS,                           },
-     { CH_LFE, CH_L, CH_C, CH_R, CH_LS, CH_RS,                   }}, // 3F2R
-
-    {{ CH_L, CH_C, CH_R, CH_LS, CH_RS,  CH_Rls,  CH_Rrs,         },
-     { CH_LFE, CH_L, CH_C, CH_R, CH_LS, CH_RS,  CH_Rls,  CH_Rrs  }}, // 3F4R
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R,                                               }}, // DOLBY
-
-    {{ CH_L, CH_R,                                               },
-     { CH_L, CH_R,                                               }}  // DPLII
-},
-{
-    // CH_C  CH_L  CH_R  CH_LS/CS  CH_RS   CH_Rls   CH_Rrs   CH_LFE 
-    {{ 0,    0,    0,    0,        0,      0,       0,       0   },
-     { 1,    0,    0,    0,        0,      0,       0,       0   }}, // MONO
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    1,    2,    0,        0,      0,       0,       0   }}, // STEREO
-
-    {{ 1,    0,    2,    0,        0,      0,       0,       0   },
-     { 2,    1,    3,    0,        0,      0,       0,       0   }}, // 3F
-
-    {{ 0,    0,    1,    2,        0,      0,       0,       0   },
-     { 0,    1,    2,    3,        0,      0,       0,       0   }}, // 2F1R
-
-    {{ 1,    0,    2,    3,        0,      0,       0,       0   },
-     { 2,    1,    3,    4,        0,      0,       0,       0   }}, // 3F1R
-
-    {{ 0,    0,    1,    2,        3,      0,       0,       0   },
-     { 0,    1,    2,    3,        4,      0,       0,       0   }}, // 2F2R
-
-    {{ 1,    0,    2,    3,        4,      0,       0,       0   },
-     { 2,    1,    3,    4,        5,      0,       0,       0   }}, // 3F2R
-
-    {{ 1,    0,    2,    3,        4,      5,       6,       0   },
-     { 2,    1,    3,    4,        5,      6,       7,       0   }}, // 3F4R
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       0   }}, // DOLBY
-
-    {{ 0,    0,    1,    0,        0,      0,       0,       0   },
-     { 0,    0,    1,    0,        0,      0,       0,       0   }}  // DPLII
-}
-};
-
-static const uint8_t nchans_tbl[] = {1, 2, 3, 3, 4, 4, 5, 7, 2, 2};
-
-// Takes a set of samples and remaps the channel layout
-void hb_layout_remap( 
-    hb_chan_map_t * map_in, 
-    hb_chan_map_t * map_out, 
-    int layout, 
-    hb_sample_t * samples, 
-    int nsamples )
-{
-    int nchans;
-    int ii, jj;
-    int lfe;
-    int * map;
-    int * inv_map;
-    int mode;
-    hb_sample_t tmp[8];
-
-    mode = hb_layout_to_mode(layout);
-    lfe = ((mode & DOWNMIX_LFE_FLAG) != 0);
-    mode = mode & DOWNMIX_CHANNEL_MASK;
-    nchans = nchans_tbl[mode] + lfe;
-    inv_map = map_in->inv_chan_map[mode][lfe];
-    map = map_out->chan_map[mode][lfe];
-
-    for (ii = 0; ii < nsamples; ii++)
-    {
-        for (jj = 0; jj < nchans; jj++)
-        {
-            tmp[jj] = samples[jj];
-        }
-        for (jj = 0; jj < nchans; jj++)
-        {
-            int ord = map[jj];
-            samples[jj] = tmp[inv_map[ord]];
-        }
-        samples += nchans;
-    }
-}
-
-static void matrix_mul(
-    hb_sample_t * dst, 
-    hb_sample_t * src, 
-    int nchans_out, 
-    int nchans_in, 
-    int nsamples, 
-    hb_sample_t (*matrix)[8],
-    hb_sample_t bias)
-{
-    int nn, ii, jj;
-    hb_sample_t val;
-
-    for (nn = 0; nn < nsamples; nn++)
-    {
-        for (ii = 0; ii < nchans_out; ii++)
-        {
-            val = 0;
-            for (jj = 0; jj < nchans_in; jj++)
-            {
-                val += src[jj] * matrix[jj][ii];
-            }
-            dst[ii] = val + bias;
-        }
-        src += nchans_in;
-        dst += nchans_out;
-    }
-}
-
-static void set_level( hb_downmix_t * downmix )
-{
-    int ii, jj;
-    int layout_in, layout_out;
-    int mode_in;
-    int mode_out;
-
-    mode_in = downmix->mode_in & ~DOWNMIX_FLAGS_MASK;
-    mode_out = downmix->mode_out & ~DOWNMIX_FLAGS_MASK;
-
-    for (ii = 0; ii < 8; ii++)
-    {
-        for (jj = 0; jj < 8; jj++)
-        {
-            downmix->matrix[ii][jj] *= downmix->level;
-        }
-    }
-    if (mode_out >= DOWNMIX_DOLBY)
-        return;
-
-    layout_in = channel_layout_map[mode_in];
-    layout_out = channel_layout_map[mode_out];
-
-    if (layout_in & HB_CH_FRONT_CENTER)
-    {
-        if (!(layout_out & HB_CH_FRONT_CENTER))
-        {
-            for (jj = 0; jj < 8; jj++)
-            {
-                downmix->matrix[downmix->center][jj] *= downmix->clev;
-            }
-        }
-    }
-    if (layout_in & (HB_CH_BACK_LEFT|HB_CH_BACK_RIGHT|HB_CH_BACK_CENTER|HB_CH_SIDE_LEFT|HB_CH_SIDE_RIGHT))
-    {
-        if (layout_out & (HB_CH_BACK_LEFT|HB_CH_BACK_RIGHT|HB_CH_BACK_CENTER|HB_CH_SIDE_LEFT|HB_CH_SIDE_RIGHT))
-        {
-            // Note, slev only gets set if input has surround, and output has none.
-            return;
-        }
-    }
-    for (jj = 0; jj < 8; jj++)
-    {
-        if ( downmix->left_surround >= 0 )
-            downmix->matrix[downmix->left_surround][jj] *= downmix->slev;
-        if ( downmix->right_surround >= 0 )
-            downmix->matrix[downmix->right_surround][jj] *= downmix->slev;
-        if ( downmix->rear_left_surround >= 0 )
-            downmix->matrix[downmix->rear_left_surround][jj] *= downmix->slev;
-        if ( downmix->rear_right_surround >= 0 )
-            downmix->matrix[downmix->rear_right_surround][jj] *= downmix->slev;
-    }
-}
-
-#define MIXMODE(x,y) (((x)<<4)|(y))
-// The downmix operation can result in new sample values that are
-// outside the original range of sample values.  If you wish to
-// guarantee that the levels to not exceed the original range,
-// call this function after initializing downmix and setting 
-// your initial levels.
-//
-// Note that this can result in generally lower volume levels
-// in the resulting downmixed audio.
-void hb_downmix_adjust_level( hb_downmix_t * downmix )
-{
-    int mode_in, mode_out;
-    hb_sample_t level = downmix->level;
-    hb_sample_t clev = downmix->clev;
-    hb_sample_t slev = downmix->slev;
-
-    mode_in = downmix->mode_in & DOWNMIX_CHANNEL_MASK;
-    mode_out = downmix->mode_out & DOWNMIX_CHANNEL_MASK;
-
-    switch MIXMODE(mode_in, mode_out)
-    {
-    case MIXMODE(DOWNMIX_STEREO, DOWNMIX_MONO):
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_2F1R):
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_3F1R):
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_3F1R):
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_3F1R):
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_3F2R):
-    level_3db:
-        level /= LVL_PLUS3DB;
-        break;
-
-    case MIXMODE(DOWNMIX_3F, DOWNMIX_MONO):
-        level /= LVL_PLUS3DB + clev * LVL_PLUS3DB;
-        break;
-
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_2F1R):
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_2F1R):
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_2F2R):
-        if (1 + clev < LVL_PLUS3DB)
-            goto level_3db;
-    case MIXMODE(DOWNMIX_3F, DOWNMIX_STEREO):
-    case MIXMODE(DOWNMIX_3F, DOWNMIX_2F1R):
-    case MIXMODE(DOWNMIX_3F, DOWNMIX_2F2R):
-    case MIXMODE(DOWNMIX_3F, DOWNMIX_DOLBY):
-    case MIXMODE(DOWNMIX_3F, DOWNMIX_DPLII):
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_2F1R):
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_2F2R):
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_2F2R):
-        level /= 1 + clev;
-        break;
-
-
-    case MIXMODE(DOWNMIX_2F1R, DOWNMIX_MONO):
-        level /= LVL_PLUS3DB + LVL_3DB * clev;
-        break;
-
-    case MIXMODE(DOWNMIX_2F1R, DOWNMIX_DOLBY):
-        level /= 1 + LVL_3DB;
-        break;
-
-    case MIXMODE(DOWNMIX_2F1R, DOWNMIX_STEREO):
-    case MIXMODE(DOWNMIX_2F1R, DOWNMIX_3F):
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_3F):
-        level /= 1 + LVL_3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_MONO):
-        level /= LVL_PLUS3DB + LVL_PLUS3DB * clev + LVL_3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_STEREO):
-        level /= 1 + clev + LVL_3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_DOLBY):
-    case MIXMODE(DOWNMIX_3F1R, DOWNMIX_DPLII):
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_DOLBY):
-        level /= 1 + LVL_PLUS3DB;
-        break;
-
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_MONO):
-        level /= LVL_PLUS3DB + LVL_PLUS3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_STEREO):
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_3F):
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_3F):
-        level /= 1 + slev;
-        break;
-
-    case MIXMODE(DOWNMIX_2F2R, DOWNMIX_DPLII):
-        level /= 1 + LVL_SQRT_1_4 + LVL_SQRT_3_4;
-        break;
-
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_MONO):
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_MONO):
-        level /= LVL_PLUS3DB + LVL_PLUS3DB * clev * LVL_PLUS3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_STEREO):
-        level /= 1 + clev + slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_DOLBY):
-        level /= 1 + 3 * LVL_3DB;
-        break;
-
-    case MIXMODE(DOWNMIX_3F2R, DOWNMIX_DPLII):
-        level /= 1 + LVL_3DB + LVL_SQRT_1_4 + LVL_SQRT_3_4;
-        break;
-
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_STEREO):
-        level /= 1 + clev + LVL_PLUS3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_3F):
-        level /= 1 + LVL_PLUS3DB * slev;
-        break;
-
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_DOLBY):
-        level /= 1 + 5 * LVL_3DB;
-        break;
-
-    case MIXMODE(DOWNMIX_3F4R, DOWNMIX_DPLII):
-        level /= 1 + LVL_3DB + 2 * LVL_SQRT_1_4 + 2 * LVL_SQRT_3_4;
-    }
-
-    downmix->level = level;
-    downmix->matrix_initialized = 0;
-}
-
-void hb_downmix_set_bias( hb_downmix_t * downmix, hb_sample_t bias )
-{
-    downmix->bias = bias;
-}
-
-// Changes the downmix mode if it needs changing after initialization
-static void set_mode( hb_downmix_t * downmix )
-{
-    int ii, jj;
-    int mode_in, mode_out;
-    hb_sample_t (*matrix)[8];
-
-    mode_in = downmix->mode_in & ~DOWNMIX_FLAGS_MASK;
-    mode_out = downmix->mode_out & ~DOWNMIX_FLAGS_MASK;
-
-    matrix = downmix_matrix[mode_in][mode_out];
-
-    for (ii = 0; ii < 8; ii++)
-    {
-        for (jj = 0; jj < 8; jj++)
-        {
-            downmix->matrix[ii][jj] = matrix[ii][jj];
-        }
-    }
-}
-
-// Changes the downmix mode if it needs changing after initialization
-int hb_downmix_set_mode( hb_downmix_t * downmix, int layout, int mixdown )
-{
-    int lfe_in, lfe_out;
-    int mode_in, mode_out;
-
-    if ( downmix == NULL )
-        return -1;
-
-    mode_in = hb_layout_to_mode(layout);
-    mode_out = hb_mixdown_to_mode(mixdown);
-    downmix->mode_in = mode_in;
-    downmix->mode_out = mode_out;
-
-    mode_in = downmix->mode_in & ~DOWNMIX_FLAGS_MASK;
-    mode_out = downmix->mode_out & ~DOWNMIX_FLAGS_MASK;
-
-    if (mode_in >= DOWNMIX_NUM_MODES || mode_out >= DOWNMIX_NUM_MODES)
-        return -1;
-
-    lfe_in = ((downmix->mode_in & DOWNMIX_LFE_FLAG) != 0);
-    lfe_out = ((downmix->mode_out & DOWNMIX_LFE_FLAG) != 0);
-
-    downmix->nchans_in = nchans_tbl[mode_in] + lfe_in;
-    downmix->nchans_out = nchans_tbl[mode_out] + lfe_out;
-
-    downmix->matrix_initialized = 0;
-    return 0;
-}
-
-// Changes the downmix levels if they need changing after initialization
-void hb_downmix_set_level( hb_downmix_t * downmix, hb_sample_t clev, hb_sample_t slev, hb_sample_t level )
-{
-    if ( downmix == NULL )
-        return;
-
-    downmix->clev = clev;
-    downmix->slev = slev;
-    downmix->level = level;
-    downmix->matrix_initialized = 0;
-}
-
-static void set_chan_map( hb_downmix_t * downmix )
-{
-    int nchans;
-    int ii, jj;
-    int lfe;
-    int * map;
-    int * inv_map;
-    int mode;
-    hb_sample_t matrix[8][8];
-
-    // Copy the matrix
-    for ( ii = 0; ii < 8; ii++ )
-    {
-        for ( jj = 0; jj < 8; jj++ )
-        {
-            matrix[ii][jj] = downmix->matrix[ii][jj];
-        }
-    }
-
-    // Rearrange the rows to correspond to the input channel order
-    lfe = ((downmix->mode_in & DOWNMIX_LFE_FLAG) != 0);
-    mode = downmix->mode_in & DOWNMIX_CHANNEL_MASK;
-    nchans = nchans_tbl[mode] + lfe;
-    map = downmix->map_in.chan_map[mode][lfe];
-    inv_map = hb_qt_chan_map.inv_chan_map[mode][lfe];
-
-    downmix->center = -1;
-    downmix->left_surround = -1;
-    downmix->right_surround = -1;
-    downmix->rear_left_surround = -1;
-    downmix->rear_right_surround = -1;
-    for ( ii = 0; ii < nchans; ii++ )
-    {
-        int ord = map[ii];
-        int row = inv_map[ord];
-        switch (ord)
-        {
-            case CH_C:
-                downmix->center = ii;
-                break;
-            case CH_LS:
-                downmix->left_surround = ii;
-                break;
-            case CH_RS:
-                downmix->right_surround = ii;
-                break;
-            case CH_Rls:
-                downmix->rear_right_surround = ii;
-                break;
-            case CH_Rrs:
-                downmix->rear_left_surround = ii;
-                break;
-        }
-        for ( jj = 0; jj < 8; jj++ )
-        {
-            downmix->matrix[ii][jj] = matrix[row][jj];
-        }
-    }
-
-    // Copy the matrix
-    for ( ii = 0; ii < 8; ii++ )
-    {
-        for ( jj = 0; jj < 8; jj++ )
-        {
-            matrix[ii][jj] = downmix->matrix[ii][jj];
-        }
-    }
-
-    // Rearrange the columns to correspond to the output channel order
-    lfe = ((downmix->mode_out & DOWNMIX_LFE_FLAG) != 0);
-    mode = downmix->mode_out & DOWNMIX_CHANNEL_MASK;
-    nchans = nchans_tbl[mode] + lfe;
-    map = downmix->map_out.chan_map[mode][lfe];
-    inv_map = hb_qt_chan_map.inv_chan_map[mode][lfe];
-    for ( ii = 0; ii < nchans; ii++ )
-    {
-        int ord = map[ii];
-        int col = inv_map[ord];
-        for ( jj = 0; jj < 8; jj++ )
-        {
-            downmix->matrix[jj][ii] = matrix[jj][col];
-        }
-    }
-}
-
-void hb_downmix_set_chan_map( 
-    hb_downmix_t * downmix, 
-    hb_chan_map_t * map_in, 
-    hb_chan_map_t * map_out )
-{
-    downmix->map_in = *map_in;
-    downmix->map_out = *map_out;
-    downmix->matrix_initialized = 0;
-}
-
-hb_downmix_t * hb_downmix_init(int layout, int mixdown)
-{
-    hb_downmix_t * downmix = calloc(1, sizeof(hb_downmix_t));
-    
-    if (downmix == NULL)
-        return NULL;
-    if ( hb_downmix_set_mode( downmix, layout, mixdown ) < 0 )
-    {
-        free( downmix );
-        return NULL;
-    }
-    // Set some good default values
-    hb_downmix_set_level( downmix, LVL_3DB, LVL_3DB, 1.0 );
-    downmix->bias = 0.0;
-    downmix->matrix_initialized = 0;
-    // The default input and output channel order is QT
-    hb_downmix_set_chan_map( downmix, &hb_qt_chan_map, &hb_qt_chan_map );
-    return downmix;
-}
-
-void hb_downmix_close( hb_downmix_t **downmix )
-{
-    if (*downmix != NULL)
-        free(*downmix);
-    *downmix = NULL;
-}
-
-static void init_matrix( hb_downmix_t * downmix )
-{
-    if ( !downmix->matrix_initialized )
-    {
-        set_mode( downmix );
-        set_chan_map( downmix );
-        set_level(downmix);
-        downmix->matrix_initialized = 1;
-    }
-}
-
-void hb_downmix( hb_downmix_t * downmix, hb_sample_t * dst, hb_sample_t * src, int nsamples)
-{
-    init_matrix( downmix );
-    matrix_mul( dst, src, downmix->nchans_out, downmix->nchans_in, 
-               nsamples, downmix->matrix, downmix->bias );
-}
-
-int hb_need_downmix( int layout, int mixdown )
-{
-    int mode_in, mode_out;
-
-    mode_in = hb_layout_to_mode(layout);
-    mode_out = hb_mixdown_to_mode(mixdown);
-
-    return (mode_in != mode_out);
-}

HandBrake-0.9.8.tar.bz2/libhb/downmix.h Deleted

@@ -1,66 +0,0 @@
-/* $Id: downmix.h,v 1.51 2005/11/04 13:09:40 stebbins Exp $
-
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
-#ifndef DOWNMIX_H
-#define DOWNMIX_H
-
-typedef float hb_sample_t;
-
-typedef struct
-{
-    int chan_map[10][2][8];
-    int inv_chan_map[10][2][8];
-} hb_chan_map_t;
-
-typedef struct
-{
-    int            mode_in;
-    int            mode_out;
-    int            nchans_in;
-    int            nchans_out;
-    hb_sample_t    matrix[8][8];
-    int            matrix_initialized;
-    hb_sample_t    clev;
-    hb_sample_t    slev;
-    hb_sample_t    level;
-    hb_sample_t    bias;
-    hb_chan_map_t  map_in;
-    hb_chan_map_t  map_out;
-
-    int center;
-    int left_surround;
-    int right_surround;
-    int rear_left_surround;
-    int rear_right_surround;
-} hb_downmix_t;
-
-// For convenience, a map to convert smpte channel layout
-// to QuickTime channel layout.
-// Map Indicies are mode, lfe, channel respectively
-extern hb_chan_map_t hb_smpte_chan_map;
-extern hb_chan_map_t hb_ac3_chan_map;
-extern hb_chan_map_t hb_qt_chan_map;
-
-hb_downmix_t * hb_downmix_init(int layout, int mixdown);
-void hb_downmix_close( hb_downmix_t **downmix );
-int hb_downmix_set_mode( hb_downmix_t * downmix, int layout, int mixdown );
-void hb_downmix_set_level( hb_downmix_t * downmix, hb_sample_t clev, hb_sample_t slev, hb_sample_t level );
-void hb_downmix_adjust_level( hb_downmix_t * downmix );
-void hb_downmix_set_bias( hb_downmix_t * downmix, hb_sample_t bias );
-void hb_downmix_set_chan_map( 
-    hb_downmix_t * downmix, 
-    hb_chan_map_t * map_in, 
-    hb_chan_map_t * map_out );
-void hb_downmix( hb_downmix_t * downmix, hb_sample_t * dst, hb_sample_t * src, int nsamples);
-void hb_layout_remap( 
-    hb_chan_map_t * map_in, 
-    hb_chan_map_t * map_out, 
-    int layout, 
-    hb_sample_t * samples, 
-    int nsamples );
-int hb_need_downmix( int layout, int mixdown );
-
-#endif /* DOWNMIX_H */

HandBrake-0.9.8.tar.bz2/libhb/render.c Deleted

@@ -1,952 +0,0 @@
-/* $Id: render.c,v 1.17 2005/04/14 17:37:54 titer Exp $
-
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
-#include "hb.h"
-#include "hbffmpeg.h"
-
-struct hb_work_private_s
-{
-    hb_job_t * job;
-
-    struct SwsContext  * context;
-    AVPicture            pic_tmp_in;
-    AVPicture            pic_tmp_crop;
-    AVPicture            pic_tmp_out;
-    hb_buffer_t        * buf_scale;
-    hb_fifo_t          * subtitle_queue;
-    hb_fifo_t          * delay_queue;
-    int                  dropped_frames;
-    int                  extended_frames;
-    uint64_t             last_start[4];
-    uint64_t             last_stop[4];
-    uint64_t             lost_time[4];
-    uint64_t             total_lost_time;
-    uint64_t             total_gained_time;
-    int64_t              chapter_time;
-    int                  chapter_val;
-    int                  count_frames;  // frames output so far
-    double               frame_rate;    // 90kHz ticks per frame (for CFR/PFR)
-    uint64_t             out_last_stop; // where last frame ended (for CFR/PFR)
-    int                  drops;         // frames dropped (for CFR/PFR)
-    int                  dups;          // frames duped (for CFR/PFR)
-    float                max_metric;    // highest motion metric since
-                                        // last output frame
-    float                frame_metric;  // motion metric of last frame
-    float                out_metric;    // motion metric of last output frame
-    int                  sync_parity;
-    unsigned             gamma_lut[256];
-};
-
-int  renderInit( hb_work_object_t *, hb_job_t * );
-int  renderWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-void renderClose( hb_work_object_t * );
-
-hb_work_object_t hb_render =
-{
-    WORK_RENDER,
-    "Renderer",
-    renderInit,
-    renderWork,
-    renderClose
-};
-
-// Create gamma lookup table.
-// Note that we are creating a scaled integer lookup table that will
-// not cause overflows in sse_block16() below.  This results in
-// small values being truncated to 0 which is ok for this usage.
-static void build_gamma_lut( hb_work_private_t * pv )
-{
-    int i;
-    for( i = 0; i < 256; i++ )
-    {
-        pv->gamma_lut[i] = 4095 * pow( ( (float)i / (float)255 ), 2.2f );
-    }
-}
-
-/*
- * getU() & getV()
- *
- * Utility function that finds where the U is in the YUV sub-picture
- *
- * The Y data is at the top, followed by U and V, but the U and V
- * are half the width of the Y, i.e. each chroma element covers 2x2
- * of the Y's.
- */
-static uint8_t *getU(uint8_t *data, int width, int height, int x, int y)
-{
-    return(&data[(y>>1) * ((width+1)>>1) + (x>>1) + width*height]);
-}
-
-static uint8_t *getV(uint8_t *data, int width, int height, int x, int y)
-{
-    int w2 = (width+1) >> 1, h2 = (height+1) >> 1;
-    return(&data[(y>>1) * w2 + (x>>1) + width*height + w2*h2]);
-}
-
-// Draws the specified PICTURESUB subtitle on the specified video packet.
-// Disposes the subtitle afterwards.
-static void ApplySub( hb_job_t * job, hb_buffer_t * buf,
-                      hb_buffer_t * sub )
-{
-    hb_title_t * title = job->title;
-    int i, j, offset_top, offset_left, margin_top, margin_percent;
-    uint8_t * lum, * alpha, * out, * sub_chromaU, * sub_chromaV;
-
-    /*
-     * Percent of height of picture that form a margin that subtitles
-     * should not be displayed within.
-     */
-    margin_percent = 2;
-
-    if( !sub )
-    {
-        return;
-    }
-
-    /*
-     * If necessary, move the subtitle so it is not in a cropped zone.
-     * When it won't fit, we center it so we lose as much on both ends.
-     * Otherwise we try to leave a 20px or 2% margin around it.
-     */
-    margin_top = ( ( title->height - job->crop[0] - job->crop[1] ) *
-                   margin_percent ) / 100;
-
-    if( margin_top > 20 )
-    {
-        /*
-         * A maximum margin of 20px regardless of height of the picture.
-         */
-        margin_top = 20;
-    }
-
-    if( sub->height > title->height - job->crop[0] - job->crop[1] -
-        ( margin_top * 2 ) )
-    {
-        /*
-         * The subtitle won't fit in the cropped zone, so center
-         * it vertically so we fit in as much as we can.
-         */
-        offset_top = job->crop[0] + ( title->height - job->crop[0] -
-                                      job->crop[1] - sub->height ) / 2;
-    }
-    else if( sub->y < job->crop[0] + margin_top )
-    {
-        /*
-         * The subtitle fits in the cropped zone, but is currently positioned
-         * within our top margin, so move it outside of our margin.
-         */
-        offset_top = job->crop[0] + margin_top;
-    }
-    else if( sub->y > title->height - job->crop[1] - margin_top - sub->height )
-    {
-        /*
-         * The subtitle fits in the cropped zone, and is not within the top
-         * margin but is within the bottom margin, so move it to be above
-         * the margin.
-         */
-        offset_top = title->height - job->crop[1] - margin_top - sub->height;
-    }
-    else
-    {
-        /*
-         * The subtitle is fine where it is.
-         */
-        offset_top = sub->y;
-    }
-
-    if( sub->width > title->width - job->crop[2] - job->crop[3] - 40 )
-        offset_left = job->crop[2] + ( title->width - job->crop[2] -
-                job->crop[3] - sub->width ) / 2;
-    else if( sub->x < job->crop[2] + 20 )
-        offset_left = job->crop[2] + 20;
-    else if( sub->x > title->width - job->crop[3] - 20 - sub->width )
-        offset_left = title->width - job->crop[3] - 20 - sub->width;
-    else
-        offset_left = sub->x;
-
-    lum   = sub->data;
-    alpha = lum + sub->width * sub->height;
-    sub_chromaU = alpha + sub->width * sub->height;
-    sub_chromaV = sub_chromaU + sub->width * sub->height;
-
-    out   = buf->data + offset_top * title->width + offset_left;
-
-    for( i = 0; i < sub->height; i++ )
-    {
-        if( offset_top + i >= 0 && offset_top + i < title->height )
-        {
-            for( j = 0; j < sub->width; j++ )
-            {
-                if( offset_left + j >= 0 && offset_left + j < title->width )
-                {
-                    uint8_t *chromaU, *chromaV;
-
-                    /*
-                     * Merge the luminance and alpha with the picture
-                     */
-                    out[j] = ( (uint16_t) out[j] * ( 16 - (uint16_t) alpha[j] ) +
-                               (uint16_t) lum[j] * (uint16_t) alpha[j] ) >> 4;
-                    /*
-                     * Set the chroma (colour) based on whether there is
-                     * any alpha at all. Don't try to blend with the picture.
-                     */
-                    chromaU = getU(buf->data, title->width, title->height,
-                                   offset_left+j, offset_top+i);
-
-                    chromaV = getV(buf->data, title->width, title->height,
-                                   offset_left+j, offset_top+i);
-
-                    if( alpha[j] > 0 )
-                    {
-                        /*
-                         * Add the chroma from the sub-picture, as this is
-                         * not a transparent element.
-                         */
-                        *chromaU = sub_chromaU[j];
-                        *chromaV = sub_chromaV[j];
-                    }
-                }
-            }
-        }
-
-        lum   += sub->width;
-        alpha += sub->width;
-        sub_chromaU += sub->width;
-        sub_chromaV += sub->width;
-        out   += title->width;
-    }
-}
-
-// Draws the specified PICTURESUB subtitle on the specified video packet.
-static void ApplySubs( hb_job_t * job, hb_buffer_t * buf,
-                      hb_buffer_t * sub )
-{
-    while ( sub )
-    {
-        ApplySub( job, buf, sub );
-        sub = sub->next;
-    }
-}
-
-// delete the buffer 'out' from the chain of buffers whose head is 'buf_out'.
-// out & buf_out must be non-null (checks prior to anywhere this routine
-// can be called guarantee this) and out must be on buf_out's chain
-// (all places that call this get 'out' while traversing the chain).
-// 'out' is freed and its predecessor is returned.
-static hb_buffer_t *delete_buffer_from_chain( hb_buffer_t **buf_out, hb_buffer_t *out)
-{
-    hb_buffer_t *succ = out->next;
-    hb_buffer_t *pred = *buf_out;
-    if ( pred == out )
-    {
-        // we're deleting the first buffer
-        *buf_out = succ;
-    }
-    else
-    {
-        // target isn't the first buf so search for its predecessor.
-        while ( pred->next != out )
-        {
-            pred = pred->next;
-        }
-        // found 'out' - remove it from the chain
-        pred->next = succ;
-    }
-    out->next = 0;
-    hb_buffer_close( &out );
-    return succ;
-}
-
-// insert buffer 'succ' after buffer chain element 'pred'.
-// caller must guarantee that 'pred' and 'succ' are non-null.
-static hb_buffer_t *insert_buffer_in_chain( hb_buffer_t *pred, hb_buffer_t *succ )
-{
-    succ->next = pred->next;
-    pred->next = succ;
-    return succ;
-}
-
-// Compute ths sum of squared errors for a 16x16 block
-// Gamma adjusts pixel values so that less visible diffreences
-// count less.
-static inline unsigned sse_block16( hb_work_private_t *pv, uint8_t *a, uint8_t *b, int stride )
-{
-    int x, y;
-    unsigned sum = 0;
-    int diff;
-    unsigned *g = pv->gamma_lut;
-
-    for( y = 0; y < 16; y++ )
-    {
-        for( x = 0; x < 16; x++ )
-        {
-            diff =  g[a[x]] - g[b[x]];
-            sum += diff * diff;
-        }
-        a += stride;
-        b += stride;
-    }
-    return sum;
-}
-
-// Sum of squared errors.  Computes and sums the SSEs for all
-// 16x16 blocks in the images.  Only checks the Y component.
-static float motion_metric( hb_work_private_t * pv, hb_buffer_t * a, hb_buffer_t * b )
-{
-    int bw = pv->job->width / 16;
-    int bh = pv->job->height / 16;
-    int stride = pv->job->width;
-    uint8_t * pa = a->data;
-    uint8_t * pb = b->data;
-    int x, y;
-    uint64_t sum = 0;
-
-    for( y = 0; y < bh; y++ )
-    {
-        for( x = 0; x < bw; x++ )
-        {
-            sum +=  sse_block16( pv, pa + y * 16 * stride + x * 16,
-                                 pb + y * 16 * stride + x * 16, stride );
-        }
-    }
-    return (float)sum / ( pv->job->width * pv->job->height );
-}
-
-// This section of the code implements video frame rate control.
-// Since filters are allowed to duplicate and drop frames (which
-// changes the timing), this has to be the last thing done in render.
-//
-// There are three options, selected by the value of job->cfr:
-//   0 - Variable Frame Rate (VFR) or 'same as source': frame times
-//       are left alone
-//   1 - Constant Frame Rate (CFR): Frame timings are adjusted so that all
-//       frames are exactly job->vrate_base ticks apart. Frames are dropped
-//       or duplicated if necessary to maintain this spacing.
-//   2 - Peak Frame Rate (PFR): job->vrate_base is treated as the peak
-//       average frame rate. I.e., the average frame rate (current frame
-//       end time divided by number of frames so far) is never allowed to be
-//       greater than job->vrate_base and frames are dropped if necessary
-//       to keep the average under this value. Other than those drops, frame
-//       times are left alone.
-//
-static void adjust_frame_rate( hb_work_private_t *pv, hb_buffer_t **buf_out )
-{
-    hb_buffer_t *out = *buf_out;
-
-    while ( out && out->size > 0 )
-    {
-        if ( pv->job->cfr == 0 )
-        {
-            ++pv->count_frames;
-            pv->out_last_stop = out->stop;
-            out = out->next;
-            continue;
-        }
-
-        // compute where this frame would stop if the frame rate were constant
-        // (this is our target stopping time for CFR and earliest possible
-        // stopping time for PFR).
-        double cfr_stop = pv->frame_rate * ( pv->count_frames + 1 );
-
-        hb_buffer_t * next = hb_fifo_see( pv->delay_queue );
-
-        float next_metric = 0;
-        if( next )
-            next_metric = motion_metric( pv, out, next );
-
-        if( pv->out_last_stop >= out->stop )
-        {
-            // This frame stops a frame time or more in the past - drop it
-            // but don't lose its chapter mark.
-            if ( out->new_chap )
-            {
-                pv->chapter_time = out->start;
-                pv->chapter_val = out->new_chap;
-            }
-            ++pv->drops;
-            out = delete_buffer_from_chain( buf_out, out );
-            pv->frame_metric = next_metric;
-            if( next_metric > pv->max_metric )
-                pv->max_metric = next_metric;
-            continue;
-        }
-
-        if( out->start <= pv->out_last_stop &&
-            out->stop > pv->out_last_stop &&
-            next && next->stop < cfr_stop )
-        {
-            // This frame starts before the end of the last output
-            // frame and ends after the end of the last output
-            // frame (i.e. it straddles it).  Also the next frame
-            // ends before the end of the next output frame. If the
-            // next frame is not a duplicate, and we haven't seen
-            // a changed frame since the last output frame,
-            // then drop this frame.
-            //
-            // This causes us to sync to the pattern of progressive
-            // 23.976 fps content that has been upsampled to
-            // progressive 59.94 fps.
-            if( pv->out_metric > pv->max_metric &&
-                next_metric > pv->max_metric )
-            {
-                // Pattern: N R R N
-                //          o   c n
-                // N == new frame
-                // R == repeat frame
-                // o == last output frame
-                // c == current frame
-                // n == next frame
-                // We haven't seen a frame change since the last output
-                // frame and the next frame changes. Use the next frame,
-                // drop this one.
-                if ( out->new_chap )
-                {
-                    pv->chapter_time = out->start;
-                    pv->chapter_val = out->new_chap;
-                }
-                ++pv->drops;
-                out = delete_buffer_from_chain( buf_out, out );
-                pv->frame_metric = next_metric;
-                pv->max_metric = next_metric;
-                pv->sync_parity = 1;
-                continue;
-            }
-            else if( pv->sync_parity &&
-                     pv->out_metric < pv->max_metric &&
-                     pv->max_metric > pv->frame_metric &&
-                     pv->frame_metric < next_metric )
-            {
-                // Pattern: R N R N
-                //          o   c n
-                // N == new frame
-                // R == repeat frame
-                // o == last output frame
-                // c == current frame
-                // n == next frame
-                // If we see this pattern, we must not use the next
-                // frame when straddling the current frame.
-                pv->sync_parity = 0;
-            }
-            else if( pv->sync_parity )
-            {
-                // The pattern is indeterminate.  Continue dropping
-                // frames on the same schedule
-                if ( out->new_chap )
-                {
-                    pv->chapter_time = out->start;
-                    pv->chapter_val = out->new_chap;
-                }
-                ++pv->drops;
-                out = delete_buffer_from_chain( buf_out, out );
-                pv->frame_metric = next_metric;
-                pv->max_metric = next_metric;
-                pv->sync_parity = 1;
-                continue;
-            }
-        }
-
-        // this frame has to start where the last one stopped.
-        out->start = pv->out_last_stop;
-
-        pv->out_metric = pv->frame_metric;
-        pv->frame_metric = next_metric;
-        pv->max_metric = next_metric;
-
-        // at this point we know that this frame doesn't push the average
-        // rate over the limit so we just pass it on for PFR. For CFR we're
-        // going to return it (with its start & stop times modified) and
-        // we may have to dup it.
-        ++pv->count_frames;
-        if ( pv->job->cfr > 1 )
-        {
-            // PFR - we're going to keep the frame but may need to
-            // adjust it's stop time to meet the average rate constraint.
-            if ( out->stop <= cfr_stop )
-            {
-                out->stop = cfr_stop;
-            }
-            pv->out_last_stop = out->stop;
-        }
-        else
-        {
-            // we're doing CFR so we have to either trim some time from a
-            // buffer that ends too far in the future or, if the buffer is
-            // two or more frame times long, split it into multiple pieces,
-            // each of which is a frame time long.
-            double excess_dur = (double)out->stop - cfr_stop;
-            out->stop = cfr_stop;
-            pv->out_last_stop = out->stop;
-            for ( ; excess_dur >= pv->frame_rate; excess_dur -= pv->frame_rate )
-            {
-                /* next frame too far ahead - dup current frame */
-                hb_buffer_t *dup = hb_buffer_init( out->size );
-                memcpy( dup->data, out->data, out->size );
-                hb_buffer_copy_settings( dup, out );
-                dup->new_chap = 0;
-                dup->start = cfr_stop;
-                cfr_stop += pv->frame_rate;
-                dup->stop = cfr_stop;
-                pv->out_last_stop = dup->stop;
-                out = insert_buffer_in_chain( out, dup );
-                ++pv->dups;
-                ++pv->count_frames;
-            }
-        }
-        out = out->next;
-    }
-}
-
-int renderWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
-                hb_buffer_t ** buf_out )
-{
-    hb_work_private_t * pv = w->private_data;
-    hb_job_t   * job   = pv->job;
-    hb_title_t * title = job->title;
-    hb_buffer_t * in = *buf_in, * buf_tmp_in = *buf_in;
-    hb_buffer_t * ivtc_buffer = NULL;
-
-    if( in->size <= 0 )
-    {
-        hb_buffer_t *head = NULL, *tail = NULL, *next;
-        int counter = 2;
-
-        /* If the input buffer is end of stream, send out an empty one
-         * to the next stage as well. To avoid losing the contents of
-         * the delay queue connect the buffers in the delay queue in 
-         * the correct order, and add the end of stream buffer to the
-         * end.
-         */     
-        while( ( next = hb_fifo_get( pv->delay_queue ) ) != NULL )
-        {
-            
-            /* We can't use the given time stamps. Previous frames
-               might already have been extended, throwing off the
-               raw values fed to render.c. Instead, their
-               stop and start times are stored in arrays.
-               The 4th cached frame will be the to use.
-               If it needed its duration extended to make up
-               lost time, it will have happened above. */
-            next->start = pv->last_start[counter];
-            next->stop = pv->last_stop[counter--];
-            
-            if( !head && !tail )
-            {
-                head = tail = next;
-            } else {
-                tail->next = next;
-                tail = next;
-            }
-        }
-        if( tail )
-        {
-            tail->next = in;
-            *buf_out = head;
-            adjust_frame_rate( pv, buf_out );
-        } else {
-            *buf_out = in;
-        }     
-        *buf_in = NULL;
-        return HB_WORK_DONE;
-    }
-
-    /*
-     * During the indepth_scan ditch the buffers here before applying filters or attempting to
-     * use the subtitles.
-     */
-    if( job->indepth_scan )
-    {
-        *buf_out = NULL;
-        return HB_WORK_OK;
-    }
-
-    /* Push subtitles onto queue just in case we need to delay a frame */
-    if( in->sub )
-    {
-        hb_fifo_push_list_element( pv->subtitle_queue, in->sub );
-        in->sub = NULL;
-    }
-    else
-    {
-        hb_fifo_push_list_element( pv->subtitle_queue, NULL );
-    }
-
-    /* If there's a chapter mark remember it in case we delay or drop its frame */
-    if( in->new_chap )
-    {
-        pv->chapter_time = in->start;
-        pv->chapter_val = in->new_chap;
-        in->new_chap = 0;
-    }
-
-    /* Setup render buffer */
-    hb_buffer_t * buf_render = hb_video_buffer_init( job->width, job->height );
-
-    /* Apply filters */
-    if( job->filters )
-    {
-        int filter_count = hb_list_count( job->filters );
-        int i;
-
-        for( i = 0; i < filter_count; i++ )
-        {
-            hb_filter_object_t * filter = hb_list_item( job->filters, i );
-
-            if( !filter )
-            {
-                continue;
-            }
-
-            hb_buffer_t * buf_tmp_out = NULL;
-
-            int result = filter->work( buf_tmp_in,
-                                       &buf_tmp_out,
-                                       PIX_FMT_YUV420P,
-                                       title->width,
-                                       title->height,
-                                       filter->private_data );
-
-            /*
-             * FILTER_OK:      set temp buffer to filter buffer, continue
-             * FILTER_DELAY:   set temp buffer to NULL, abort
-             * FILTER_DROP:    set temp buffer to NULL, pop subtitle, abort
-             * FILTER_FAILED:  leave temp buffer alone, continue
-             */
-            if( result == FILTER_OK )
-            {
-                buf_tmp_in = buf_tmp_out;
-            }
-            else if( result == FILTER_DELAY )
-            {
-                // Process the current frame later
-                
-                buf_tmp_in = NULL;
-                break;
-            }
-            else if( result == FILTER_DROP )
-            {
-                // Drop the current frame
-                
-                /* We need to compensate for the time lost by dropping this frame.
-                   Spread its duration out in quarters, because usually dropped frames
-                   maintain a 1-out-of-5 pattern and this spreads it out amongst the remaining ones.
-                   Store these in the lost_time array, which has 4 slots in it.
-                   Because not every frame duration divides evenly by 4, and we can't lose the
-                   remainder, we have to go through an awkward process to preserve it in the 4th array index. */
-                uint64_t temp_duration = buf_tmp_out->stop - buf_tmp_out->start;
-                pv->lost_time[0] += (temp_duration / 4);
-                pv->lost_time[1] += (temp_duration / 4);
-                pv->lost_time[2] += (temp_duration / 4);
-                pv->lost_time[3] += ( temp_duration - (temp_duration / 4) - (temp_duration / 4) - (temp_duration / 4) );
-
-                pv->total_lost_time += temp_duration;
-                pv->dropped_frames++;
-
-                /* Pop the frame's subtitle list and dispose of it. */
-                hb_buffer_t * sub = hb_fifo_get_list_element( pv->subtitle_queue );
-                if ( sub )
-                    hb_buffer_close( &sub );
-                
-                buf_tmp_in = NULL;
-                break;
-            }
-        }
-    }
-
-    if( buf_tmp_in )
-    {
-        /* Cache frame start and stop times, so we can renumber
-           time stamps if dropping frames for VFR.              */
-        int i;
-        for( i = 3; i >= 1; i-- )
-        {
-            pv->last_start[i] = pv->last_start[i-1];
-            pv->last_stop[i] = pv->last_stop[i-1];
-        }
-
-        /* In order to make sure we have continuous time stamps, store
-           the current frame's duration as starting when the last one stopped. */
-        pv->last_start[0] = pv->last_stop[1];
-        pv->last_stop[0] = pv->last_start[0] + (buf_tmp_in->stop - buf_tmp_in->start);
-    }
-
-    /* Apply subtitles and dispose them */
-    if( buf_tmp_in )
-    {
-        hb_buffer_t * sub = hb_fifo_get_list_element( pv->subtitle_queue );
-        if ( sub )
-        {
-            ApplySubs( job, buf_tmp_in, sub );
-            hb_buffer_close( &sub );
-        }
-    }
-
-    /* Apply crop/scale if specified */
-    if( buf_tmp_in && pv->context )
-    {
-        avpicture_fill( &pv->pic_tmp_in, buf_tmp_in->data,
-                        PIX_FMT_YUV420P,
-                        title->width, title->height );
-
-        avpicture_fill( &pv->pic_tmp_out, buf_render->data,
-                        PIX_FMT_YUV420P,
-                        job->width, job->height );
-
-        // Crop; this alters the pointer to the data to point to the correct place for cropped frame
-        av_picture_crop( &pv->pic_tmp_crop, &pv->pic_tmp_in, PIX_FMT_YUV420P,
-                         job->crop[0], job->crop[2] );
-
-        // Scale pic_crop into pic_render according to the context set up in renderInit
-        sws_scale(pv->context,
-                  (const uint8_t* const *)pv->pic_tmp_crop.data, 
-                  pv->pic_tmp_crop.linesize,
-                  0, title->height - (job->crop[0] + job->crop[1]),
-                  pv->pic_tmp_out.data,  pv->pic_tmp_out.linesize);
-
-        hb_buffer_copy_settings( buf_render, buf_tmp_in );
-
-        buf_tmp_in = buf_render;
-    }
-
-    /* Set output to render buffer */
-    (*buf_out) = buf_render;
-
-    if( buf_tmp_in == NULL )
-    {
-        /* Teardown and cleanup buffers if we are emitting NULL */
-        if( buf_in && *buf_in )
-        {
-            hb_buffer_close( buf_in );
-            *buf_in = NULL;
-        }
-        if( buf_out && *buf_out )
-        {
-            hb_buffer_close( buf_out );
-            *buf_out = NULL;
-        }
-    }
-    else if( buf_tmp_in != buf_render )
-    {
-        /* Copy temporary results and settings into render buffer */
-        memcpy( buf_render->data, buf_tmp_in->data, buf_render->size );
-        hb_buffer_copy_settings( buf_render, buf_tmp_in );
-    }
-
-    if (*buf_out )
-    {
-        hb_fifo_push( pv->delay_queue, *buf_out );
-        *buf_out = NULL;
-    }
-
-    /*
-     * Keep the last three frames in our queue, this ensures that we have the last
-     * two always in there should we need to rewrite the durations on them.
-     */
-
-    if( hb_fifo_size( pv->delay_queue ) >= 4 )
-    {
-        *buf_out = hb_fifo_get( pv->delay_queue );
-    }
-
-    if( *buf_out )
-    {
-        /* The current frame exists. That means it hasn't been dropped by a filter.
-           Make it accessible as ivtc_buffer so we can edit its duration if needed. */
-        ivtc_buffer = *buf_out;
-
-        if( pv->lost_time[3] > 0 )
-        {
-            /*
-             * A frame's been dropped earlier by VFR detelecine.
-             * Gotta make up the lost time. This will also
-             * slow down the video.
-             * The dropped frame's has to be accounted for, so
-             * divvy it up amongst the 4 frames left behind.
-             * This is what the delay_queue is for;
-             * telecined sequences start 2 frames before
-             * the dropped frame, so to slow down the right
-             * ones you need a 2 frame delay between
-             * reading input and writing output.
-             */
-
-            /* We want to extend the outputted frame's duration by the value
-              stored in the 4th slot of the lost_time array. Because we need
-              to adjust all the values in the array so they're contiguous,
-              extend the duration inside the array first, before applying
-              it to the current frame buffer. */
-            pv->last_stop[3] += pv->lost_time[3];
-
-            /* Log how much time has been added back in to the video. */
-            pv->total_gained_time += pv->lost_time[3];
-
-            /* We've pulled the 4th value from the lost_time array
-               and added it to the last_stop array's 4th slot. Now, rotate the
-                lost_time array so the 4th slot now holds the 3rd's value, and
-               so on down the line, and set the 0 index to a value of 0. */
-            int i;
-            for( i=2; i >=  0; i--)
-            {
-                pv->lost_time[i+1] = pv->lost_time[i];
-            }
-            pv->lost_time[0] = 0;
-
-            /* Log how many frames have had their durations extended. */
-            pv->extended_frames++;
-        }
-
-        /* We can't use the given time stamps. Previous frames
-           might already have been extended, throwing off the
-           raw values fed to render.c. Instead, their
-           stop and start times are stored in arrays.
-           The 4th cached frame will be the to use.
-           If it needed its duration extended to make up
-           lost time, it will have happened above. */
-        ivtc_buffer->start = pv->last_start[3];
-        ivtc_buffer->stop = pv->last_stop[3];
-
-        /* Set the 3rd cached frame to start when this one stops,
-           and so on down the line. If any of them need to be
-           extended as well to make up lost time, it'll be handled
-           on the next loop through the renderer.  */
-        int i;
-        for (i = 2; i >= 0; i--)
-        {
-            int temp_duration = pv->last_stop[i] - pv->last_start[i];
-            pv->last_start[i] = pv->last_stop[i+1];
-            pv->last_stop[i] = pv->last_start[i] + temp_duration;
-        }
-
-        /* If we have a pending chapter mark and this frame is at
-           or after the time of the mark, mark this frame & clear
-           our pending mark. */
-        if( pv->chapter_time && pv->chapter_time <= ivtc_buffer->start )
-        {
-            ivtc_buffer->new_chap = pv->chapter_val;
-            pv->chapter_time = 0;
-        }
-
-    }
-
-    if ( buf_out && *buf_out )
-    {
-        adjust_frame_rate( pv, buf_out );
-    }
-    return HB_WORK_OK;
-}
-
-void renderClose( hb_work_object_t * w )
-{
-    hb_work_private_t * pv = w->private_data;
-
-    if ( pv->job->cfr )
-    {
-        hb_log("render: %d frames output, %d dropped and %d duped for CFR/PFR",
-               pv->count_frames, pv->drops, pv->dups );
-    }
-
-    hb_interjob_t * interjob = hb_interjob_get( w->private_data->job->h );
-    
-    /* Preserve output frame count and time for more accurate framerates in 2nd passes. */
-    interjob->out_frame_count = pv->count_frames;
-    interjob->total_time = pv->out_last_stop;
-
-    hb_log("render: lost time: %"PRId64" (%i frames)", pv->total_lost_time, pv->dropped_frames);
-    hb_log("render: gained time: %"PRId64" (%i frames) (%"PRId64" not accounted for)", pv->total_gained_time, pv->extended_frames, pv->total_lost_time - pv->total_gained_time);
-    if (pv->dropped_frames)
-        hb_log("render: average dropped frame duration: %"PRId64, (pv->total_lost_time / pv->dropped_frames) );
-
-    /* Cleanup subtitle queue */
-    if( pv->subtitle_queue )
-    {
-        hb_fifo_close( &pv->subtitle_queue );
-    }
-
-    if( pv->delay_queue )
-    {
-        hb_fifo_close( &pv->delay_queue );
-    }
-
-    /* Cleanup render work structure */
-    free( pv );
-    w->private_data = NULL;
-}
-
-int renderInit( hb_work_object_t * w, hb_job_t * job )
-{
-    /* Allocate new private work object */
-    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
-    pv->job = job;
-    w->private_data = pv;
-    uint32_t    swsflags;
-
-    build_gamma_lut( pv );
-    swsflags = SWS_LANCZOS | SWS_ACCURATE_RND;
-
-    /* Get title and title size */
-    hb_title_t * title = job->title;
-
-    /* If crop or scale is specified, setup rescale context */
-    if( job->crop[0] || job->crop[1] || job->crop[2] || job->crop[3] ||
-        job->width != title->width || job->height != title->height )
-    {
-        pv->context = hb_sws_get_context(title->width  - (job->crop[2] + job->crop[3]),
-                                     title->height - (job->crop[0] + job->crop[1]),
-                                     PIX_FMT_YUV420P,
-                                     job->width, job->height, PIX_FMT_YUV420P,
-                                     swsflags);
-    }
-
-    /* Setup FIFO queue for subtitle cache */
-    pv->subtitle_queue = hb_fifo_init( 8, 1 );
-    pv->delay_queue = hb_fifo_init( 8, 1 );
-
-    /* VFR IVTC needs a bunch of time-keeping variables to track
-      how many frames are dropped, how many are extended, what the
-      last 4 start and stop times were (so they can be modified),
-      how much time has been lost and gained overall, how much time
-      the latest 4 frames should be extended by, and where chapter
-      markers are (so they can be saved if their frames are dropped.) */
-    pv->dropped_frames = 0;
-    pv->extended_frames = 0;
-    pv->last_start[0] = 0;
-    pv->last_stop[0] = 0;
-    pv->total_lost_time = 0;
-    pv->total_gained_time = 0;
-    pv->lost_time[0] = 0; pv->lost_time[1] = 0; pv->lost_time[2] = 0; pv->lost_time[3] = 0;
-    pv->chapter_time = 0;
-    pv->chapter_val  = 0;
-    pv->frame_metric = 1000; // Force first frame
-
-    if ( job->cfr == 2 )
-    {
-        pv->frame_rate = (double)job->pfr_vrate_base * (1./300.);
-    }
-    else
-    {
-        pv->frame_rate = (double)job->vrate_base * (1./300.);
-    }
-
-    /* Setup filters */
-    /* TODO: Move to work.c? */
-    if( job->filters )
-    {
-        int filter_count = hb_list_count( job->filters );
-        int i;
-
-        for( i = 0; i < filter_count; i++ )
-        {
-            hb_filter_object_t * filter = hb_list_item( job->filters, i );
-
-            if( !filter ) continue;
-
-            filter->private_data = filter->init( PIX_FMT_YUV420P,
-                                                 title->width,
-                                                 title->height,
-                                                 filter->settings );
-        }
-    }
-
-    return 0;
-}

HandBrake-0.9.8.tar.bz2/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h Deleted

@@ -1,780 +0,0 @@
-//
-//  GrowlApplicationBridge-Carbon.h
-//  Growl
-//
-//  Created by Peter Hosey on Wed Jun 18 2004.
-//  Based on GrowlApplicationBridge.h by Evan Schoenberg.
-//  This source code is in the public domain. You may freely link it into any
-//    program.
-//
-
-#ifndef _GROWLAPPLICATIONBRIDGE_CARBON_H_
-#define _GROWLAPPLICATIONBRIDGE_CARBON_H_
-
-#include <sys/cdefs.h>
-#include <Carbon/Carbon.h>
-
-#ifndef GROWL_EXPORT
-#define GROWL_EXPORT __attribute__((visibility("default"))) DEPRECATED_ATTRIBUTE
-#endif
-
-/*!	@header GrowlApplicationBridge-Carbon.h
- *	@abstract	Declares an API that Carbon applications can use to interact with Growl.
- *	@discussion	GrowlApplicationBridge uses a delegate to provide information //XXX
- *	 to Growl (such as your application's name and what notifications it may
- *	 post) and to provide information to your application (such as that Growl
- *	 is listening for notifications or that a notification has been clicked).
- *
- *	 You can set the Growldelegate with Growl_SetDelegate and find out the
- *	 current delegate with Growl_GetDelegate. See struct Growl_Delegate for more
- *	 information about the delegate.
- */
-
-__BEGIN_DECLS
-
-/*!	@struct Growl_Delegate
- *	@abstract Delegate to supply GrowlApplicationBridge with information and respond to events.
- *	@discussion The Growl delegate provides your interface to
- *	 GrowlApplicationBridge. When GrowlApplicationBridge needs information about
- *	 your application, it looks for it in the delegate; when Growl or the user
- *	 does something that you might be interested in, GrowlApplicationBridge
- *	 looks for a callback in the delegate and calls it if present
- *	 (meaning, if it is not <code>NULL</code>).
- *	XXX on all of that
- *  @field size The size of the delegate structure.
- * 	@field applicationName The name of your application.
- * 	@field registrationDictionary A dictionary describing your application and the notifications it can send out.
- * 	@field applicationIconData Your application's icon.
- * 	@field growlInstallationWindowTitle The title of the installation window.
- * 	@field growlInstallationInformation Text to display in the installation window.
- * 	@field growlUpdateWindowTitle The title of the update window.
- * 	@field growlUpdateInformation Text to display in the update window.
- * 	@field referenceCount A count of owners of the delegate.
- * 	@field retain Called when GrowlApplicationBridge receives this delegate.
- * 	@field release Called when GrowlApplicationBridge no longer needs this delegate.
- * 	@field growlIsReady Called when GrowlHelperApp is listening for notifications.
- * 	@field growlNotificationWasClicked Called when a Growl notification is clicked.
- *  @field growlNotificationTimedOut Called when a Growl notification timed out.
- */
-struct Growl_Delegate {
-	/*	@discussion This should be sizeof(struct Growl_Delegate).
-	 */
-	size_t size;
-
-	/*All of these attributes are optional.
-	 *Optional attributes can be NULL; required attributes that
-	 *	 are NULL cause setting the Growl delegate to fail.
-	 *XXX - move optional/required status into the discussion for each field
-	 */
-
-	/* This name is used both internally and in the Growl preferences.
-	 *
-	 *	 This should remain stable between different versions and incarnations of
-	 *	 your application.
-	 *	 For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and
-	 *	 "SurfWriter Lite" are not.
-	 *
-	 * This can be <code>NULL</code> if it is provided elsewhere, namely in an
-	 *	 auto-discoverable plist file in your app bundle
-	 *	 (XXX refer to more information on that) or in registrationDictionary.
-	 */
-	CFStringRef applicationName;
-
-	/*
-	 * Must contain at least these keys:
-	 *	GROWL_NOTIFICATIONS_ALL (CFArray):
-	 *		Contains the names of all notifications your application may post.
-	 *
-	 * Can also contain these keys:
-	 *	GROWL_NOTIFICATIONS_DEFAULT (CFArray):
-	 *		Names of notifications that should be enabled by default.
-	 *		If omitted, GROWL_NOTIFICATIONS_ALL will be used.
-	 *	GROWL_APP_NAME (CFString):
-	 *		Same as the applicationName member of this structure.
-	 *		If both are present, the applicationName member shall prevail.
-	 *		If this key is present, you may omit applicationName (set it to <code>NULL</code>).
-	 *	GROWL_APP_ICON (CFData):
-	 *		Same as the iconData member of this structure.
-	 *		If both are present, the iconData member shall prevail.
-	 *		If this key is present, you may omit iconData (set it to <code>NULL</code>).
-	 *
-	 * If you change the contents of this dictionary after setting the delegate,
-	 *	be sure to call Growl_Reregister.
-	 *
-	 * This can be <code>NULL</code> if you have an auto-discoverable plist file in your app
-	 *	 bundle. (XXX refer to more information on that)
-	 */
-	CFDictionaryRef registrationDictionary;
-
-	/* The data can be in any format supported by NSImage. As of
-	 *	 Mac OS X 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and
-	 *	 PICT formats.
-	 *
-	 *	 If this is not supplied, Growl will look up your application's icon by
-	 *	 its application name.
-	 */
-	CFDataRef applicationIconData;
-
-	/* Installer display attributes
-	 *
-	 * These four attributes are used by the Growl installer, if this framework
-	 *	supports it.
-	 * For any of these being <code>NULL</code>, a localised default will be
-	 *	supplied.
-	 */
-
-	/*	If this is <code>NULL</code>, Growl will use a default,
-	 *	 localized title.
-	 *
-	 *	 Only used if you're using Growl-WithInstaller.framework. Otherwise,
-	 *	 this member is ignored.
-	 */
-	CFStringRef growlInstallationWindowTitle;
-	/*	This information may be as long or short as desired (the
-	 *	 window will be sized to fit it).  If Growl is not installed, it will
-	 *	 be displayed to the user as an explanation of what Growl is and what
-	 *	 it can do in your application.
-	 *	 It should probably note that no download is required to install.
-	 *
-	 *	 If this is <code>NULL</code>, Growl will use a default, localized
-	 *	 explanation.
-	 *
-	 *	 Only used if you're using Growl-WithInstaller.framework. Otherwise,
-	 *	 this member is ignored.
-	 */
-	CFStringRef growlInstallationInformation;
-	/*	If this is <code>NULL</code>, Growl will use a default,
-	 *	 localized title.
-	 *
-	 *	 Only used if you're using Growl-WithInstaller.framework. Otherwise,
-	 *	 this member is ignored.
-	 */
-	CFStringRef growlUpdateWindowTitle;
-	/*	This information may be as long or short as desired (the
-	 *	 window will be sized to fit it).  If an older version of Growl is
-	 *	 installed, it will be displayed to the user as an explanation that an
-	 *	 updated version of Growl is included in your application and
-	 *	 no download is required.
-	 *
-	 *	 If this is <code>NULL</code>, Growl will use a default, localized
-	 *	 explanation.
-	 *
-	 *	 Only used if you're using Growl-WithInstaller.framework. Otherwise,
-	 *	 this member is ignored.
-	 */
-	CFStringRef growlUpdateInformation;
-
-	/*	This member is provided for use by your retain and release
-	 *	 callbacks (see below).
-	 *
-	 *	 GrowlApplicationBridge never directly uses this member. Instead, it
-	 *	 calls your retain callback (if non-<code>NULL</code>) and your release
-	 *	 callback (if non-<code>NULL</code>).
-	 */
-	unsigned referenceCount;
-
-	//Functions. Currently all of these are optional (any of them can be NULL).
-
-	/*	When you call Growl_SetDelegate(newDelegate), it will call
-	 *	 oldDelegate->release(oldDelegate), and then it will call
-	 *	 newDelegate->retain(newDelegate), and the return value from retain
-	 *	 is what will be set as the delegate.
-	 *	 (This means that this member works like CFRetain and -[NSObject retain].)
-	 *	 This member is optional (it can be <code>NULL</code>).
-	 *	 For a delegate allocated with malloc, this member would be
-	 *	 <code>NULL</code>.
-	 *	@result	A delegate to which GrowlApplicationBridge holds a reference.
-	 */
-	void *(*retain)(void *);
-	/*	When you call Growl_SetDelegate(newDelegate), it will call
-	 *	 oldDelegate->release(oldDelegate), and then it will call
-	 *	 newDelegate->retain(newDelegate), and the return value from retain
-	 *	 is what will be set as the delegate.
-	 *	 (This means that this member works like CFRelease and
-	 *	  -[NSObject release].)
-	 *	 This member is optional (it can be NULL).
-	 *	 For a delegate allocated with malloc, this member might be
-	 *	 <code>free</code>(3).
-	 */
-	void (*release)(void *);
-
-	/*	Informs the delegate that Growl (specifically, the GrowlHelperApp) was
-	 *	 launched successfully (or was already running). The application can
-	 *	 take actions with the knowledge that Growl is installed and functional.
-	 */
-	void (*growlIsReady)(void);
-
-	/*	Informs the delegate that a Growl notification was clicked. It is only
-	 *	 sent for notifications sent with a non-<code>NULL</code> clickContext,
-	 *	 so if you want to receive a message when a notification is clicked,
-	 *	 clickContext must not be <code>NULL</code> when calling
-	 *	 Growl_PostNotification or
-	 *	 Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext.
-	 */
-	void (*growlNotificationWasClicked)(CFPropertyListRef clickContext);
-
-	/*	Informs the delegate that a Growl notification timed out. It is only
-	 *	 sent for notifications sent with a non-<code>NULL</code> clickContext,
-	 *	 so if you want to receive a message when a notification is clicked,
-	 *	 clickContext must not be <code>NULL</code> when calling
-	 *	 Growl_PostNotification or
-	 *	 Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext.
-	 */
-	void (*growlNotificationTimedOut)(CFPropertyListRef clickContext);
-};
-
-/*!	@struct Growl_Notification
- *	@abstract Structure describing a Growl notification.
- *	@discussion XXX
- * 	@field size The size of the notification structure.
- * 	@field name Identifies the notification.
- * 	@field title Short synopsis of the notification.
- *  @field description Additional text.
- * 	@field iconData An icon for the notification.
- * 	@field priority An indicator of the notification's importance.
- * 	@field reserved Bits reserved for future usage.
- * 	@field isSticky Requests that a notification stay on-screen until dismissed explicitly.
- * 	@field clickContext An identifier to be passed to your click callback when a notification is clicked.
- * 	@field clickCallback A callback to call when the notification is clicked.
- */
-struct Growl_Notification {
-	/*	This should be sizeof(struct Growl_Notification).
-	 */
- 	size_t size;
-
-	/*	The notification name distinguishes one type of
-	 *	 notification from another. The name should be human-readable, as it
-	 *	 will be displayed in the Growl preference pane.
-	 *
-	 *	 The name is used in the GROWL_NOTIFICATIONS_ALL and
-	 *	 GROWL_NOTIFICATIONS_DEFAULT arrays in the registration dictionary, and
-	 *	 in this member of the Growl_Notification structure.
-	 */
-	CFStringRef name;
-
-	/*	A notification's title describes the notification briefly.
-	 *	 It should be easy to read quickly by the user.
-	 */
-	CFStringRef title;
-
-	/*	The description supplements the title with more
-	 *	 information. It is usually longer and sometimes involves a list of
-	 *	 subjects. For example, for a 'Download complete' notification, the
-	 *	 description might have one filename per line. GrowlMail in Growl 0.6
-	 *	 uses a description of '%d new mail(s)' (formatted with the number of
-	 *	 messages).
-	 */
-	CFStringRef description;
-
-	/*	The notification icon usually indicates either what
-	 *	 happened (it may have the same icon as e.g. a toolbar item that
-	 *	 started the process that led to the notification), or what it happened
-	 *	 to (e.g. a document icon).
-	 *
-	 *	 The icon data is optional, so it can be <code>NULL</code>. In that
-	 *	 case, the application icon is used alone. Not all displays support
-	 *	 icons.
-	 *
-	 *	 The data can be in any format supported by NSImage. As of Mac OS X
-	 *	 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT form
-	 *	 ats.
-	 */
-	CFDataRef iconData;
-
-	/*	Priority is new in Growl 0.6, and is represented as a
-	 *	 signed integer from -2 to +2. 0 is Normal priority, -2 is Very Low
-	 *	 priority, and +2 is Very High priority.
-	 *
-	 *	 Not all displays support priority. If you do not wish to assign a
-	 *	 priority to your notification, assign 0.
-	 */
-	signed int priority;
-
-	/*	These bits are not used in Growl 0.6. Set them to 0.
-	 */
-	unsigned reserved: 31;
-
-	/*	When the sticky bit is clear, in most displays,
-	 *	 notifications disappear after a certain amount of time. Sticky
-	 *	 notifications, however, remain on-screen until the user dismisses them
-	 *	 explicitly, usually by clicking them.
-	 *
-	 *	 Sticky notifications were introduced in Growl 0.6. Most notifications
-	 *	 should not be sticky. Not all displays support sticky notifications,
-	 *	 and the user may choose in Growl's preference pane to force the
-	 *	 notification to be sticky or non-sticky, in which case the sticky bit
-	 *	 in the notification will be ignored.
-	 */
-	unsigned isSticky: 1;
-
-	/*	If this is not <code>NULL</code>, and your click callback
-	 *	 is not <code>NULL</code> either, this will be passed to the callback
-	 *	 when your notification is clicked by the user.
-	 *
-	 *	 Click feedback was introduced in Growl 0.6, and it is optional. Not
-	 *	 all displays support click feedback.
-	 */
-	CFPropertyListRef clickContext;
-
-	/*	If this is not <code>NULL</code>, it will be called instead
-	 *	 of the Growl delegate's click callback when clickContext is
-	 *	 non-<code>NULL</code> and the notification is clicked on by the user.
-	 *
-	 *	 Click feedback was introduced in Growl 0.6, and it is optional. Not
-	 *	 all displays support click feedback.
-	 *
-	 *	 The per-notification click callback is not yet supported as of Growl
-	 *	 0.7.
-	 */
-	void (*clickCallback)(CFPropertyListRef clickContext);
-
-	CFStringRef identifier;
-};
-
-#pragma mark -
-#pragma mark Easy initialisers
-
-/*!	@defined	InitGrowlDelegate
- *	@abstract	Callable macro. Initializes a Growl delegate structure to defaults.
- *	@discussion	Call with a pointer to a struct Growl_Delegate. All of the
- *	 members of the structure will be set to 0 or <code>NULL</code>, except for
- *	 size (which will be set to <code>sizeof(struct Growl_Delegate)</code>) and
- *	 referenceCount (which will be set to 1).
- */
-#define InitGrowlDelegate(delegate) \
-	do { \
-		if (delegate) { \
-			(delegate)->size = sizeof(struct Growl_Delegate); \
-			(delegate)->applicationName = NULL; \
-			(delegate)->registrationDictionary = NULL; \
-			(delegate)->applicationIconData = NULL; \
-			(delegate)->growlInstallationWindowTitle = NULL; \
-			(delegate)->growlInstallationInformation = NULL; \
-			(delegate)->growlUpdateWindowTitle = NULL; \
-			(delegate)->growlUpdateInformation = NULL; \
-			(delegate)->referenceCount = 1U; \
-			(delegate)->retain = NULL; \
-			(delegate)->release = NULL; \
-			(delegate)->growlIsReady = NULL; \
-			(delegate)->growlNotificationWasClicked = NULL; \
-			(delegate)->growlNotificationTimedOut = NULL; \
-		} \
-	} while(0)
-
-/*!	@defined	InitGrowlNotification
- *	@abstract	Callable macro. Initializes a Growl notification structure to defaults.
- *	@discussion	Call with a pointer to a struct Growl_Notification. All of
- *	 the members of the structure will be set to 0 or <code>NULL</code>, except
- *	 for size (which will be set to
- *	<code>sizeof(struct Growl_Notification)</code>).
- */
-#define InitGrowlNotification(notification) \
-	do { \
-		if (notification) { \
-			(notification)->size = sizeof(struct Growl_Notification); \
-			(notification)->name = NULL; \
-			(notification)->title = NULL; \
-			(notification)->description = NULL; \
-			(notification)->iconData = NULL; \
-			(notification)->priority = 0; \
-			(notification)->reserved = 0U; \
-			(notification)->isSticky = false; \
-			(notification)->clickContext = NULL; \
-			(notification)->clickCallback = NULL; \
-			(notification)->identifier = NULL; \
-		} \
-	} while(0)
-
-#pragma mark -
-#pragma mark Public API
-
-//	@functiongroup	Managing the Growl delegate
-
-/*!	@function	Growl_SetDelegate
- *	@abstract	Replaces the current Growl delegate with a new one, or removes
- *	 the Growl delegate.
- *	@param	newDelegate
- *	@result	Returns false and does nothing else if a pointer that was passed in
- *	 is unsatisfactory (because it is non-<code>NULL</code>, but at least one
- *	 required member of it is <code>NULL</code>). Otherwise, sets or unsets the
- *	 delegate and returns true.
- *	@discussion	When <code>newDelegate</code> is non-<code>NULL</code>, sets
- *	 the delegate to <code>newDelegate</code>. When it is <code>NULL</code>,
- *	 the current delegate will be unset, and no delegate will be in place.
- *
- *	 It is legal for <code>newDelegate</code> to be the current delegate;
- *	 nothing will happen, and Growl_SetDelegate will return true. It is also
- *	 legal for it to be <code>NULL</code>, as described above; again, it will
- *	 return true.
- *
- *	 If there was a delegate in place before the call, Growl_SetDelegate will
- *	 call the old delegate's release member if it was non-<code>NULL</code>. If
- *	 <code>newDelegate</code> is non-<code>NULL</code>, Growl_SetDelegate will
- *	 call <code>newDelegate->retain</code>, and set the delegate to its return
- *	 value.
- *
- *	 If you are using Growl-WithInstaller.framework, and an older version of
- *	 Growl is installed on the user's system, the user will automatically be
- *	 prompted to update.
- *
- *	 GrowlApplicationBridge currently does not copy this structure, nor does it
- *	 retain any of the CF objects in the structure (it regards the structure as
- *	 a container that retains the objects when they are added and releases them
- *	 when they are removed or the structure is destroyed). Also,
- *	 GrowlApplicationBridge currently does not modify any member of the
- *	 structure, except possibly the referenceCount by calling the retain and
- *	 release members.
- */
-GROWL_EXPORT Boolean Growl_SetDelegate(struct Growl_Delegate *newDelegate);
-
-/*!	@function	Growl_GetDelegate
- *	@abstract	Returns the current Growl delegate, if any.
- *	@result	The current Growl delegate.
- *	@discussion	Returns the last pointer passed into Growl_SetDelegate, or
- *	 <code>NULL</code> if no such call has been made.
- *
- *	 This function follows standard Core Foundation reference-counting rules.
- *	 Because it is a Get function, not a Copy function, it will not retain the
- *	 delegate on your behalf. You are responsible for retaining and releasing
- *	 the delegate as needed.
- */
-GROWL_EXPORT struct Growl_Delegate *Growl_GetDelegate(void);
-
-#pragma mark -
-
-//	@functiongroup	Posting Growl notifications
-
-/*!	@function	Growl_PostNotification
- *	@abstract	Posts a Growl notification.
- *	@param	notification	The notification to post.
- *	@discussion	This is the preferred means for sending a Growl notification.
- *	 The notification name and at least one of the title and description are
- *	 required (all three are preferred). All other parameters may be
- *	 <code>NULL</code> (or 0 or false as appropriate) to accept default values.
- *
- *	 If using the Growl-WithInstaller framework, if Growl is not installed the
- *	 user will be prompted to install Growl.
- *	 If the user cancels, this function will have no effect until the next
- *	 application session, at which time when it is called the user will be
- *	 prompted again. The user is also given the option to not be prompted again.
- *	 If the user does choose to install Growl, the requested notification will
- *	 be displayed once Growl is installed and running.
- */
-GROWL_EXPORT void Growl_PostNotification(const struct Growl_Notification *notification);
-
-/*!	@function Growl_PostNotificationWithDictionary
-*	@abstract	Notifies using a userInfo dictionary suitable for passing to
-*	 CFDistributedNotificationCenter.
-*	@param	userInfo	The dictionary to notify with.
-*	@discussion	Before Growl 0.6, your application would have posted
-*	 notifications using CFDistributedNotificationCenter by creating a userInfo
-*	 dictionary with the notification data. This had the advantage of allowing
-*	 you to add other data to the dictionary for programs besides Growl that
-*	 might be listening.
-*
-*	 This function allows you to use such dictionaries without being restricted
-*	 to using CFDistributedNotificationCenter. The keys for this dictionary
- *	 can be found in GrowlDefines.h.
-*/
-GROWL_EXPORT void Growl_PostNotificationWithDictionary(CFDictionaryRef userInfo);
-
-/*!	@function	Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext
- *	@abstract	Posts a Growl notification using parameter values.
- *	@param	title	The title of the notification.
- *	@param	description	The description of the notification.
- *	@param	notificationName	The name of the notification as listed in the
- *	 registration dictionary.
- *	@param	iconData	Data representing a notification icon. Can be <code>NULL</code>.
- *	@param	priority	The priority of the notification (-2 to +2, with -2
- *	 being Very Low and +2 being Very High).
- *	@param	isSticky	If true, requests that this notification wait for a
- *	 response from the user.
- *	@param	clickContext	An object to pass to the clickCallback, if any. Can
- *	 be <code>NULL</code>, in which case the clickCallback is not called.
- *	@discussion	Creates a temporary Growl_Notification, fills it out with the
- *	 supplied information, and calls Growl_PostNotification on it.
- *	 See struct Growl_Notification and Growl_PostNotification for more
- *	 information.
- *
- *	 The icon data can be in any format supported by NSImage. As of Mac OS X
- *	 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT formats.
- */
-GROWL_EXPORT void Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext(
- /*inhale*/
-	CFStringRef title,
-	CFStringRef description,
-	CFStringRef notificationName,
-	CFDataRef iconData,
-	signed int priority,
-	Boolean isSticky,
-	CFPropertyListRef clickContext);
-
-#pragma mark -
-
-//	@functiongroup	Registering
-
-/*!	@function Growl_RegisterWithDictionary
- *	@abstract	Register your application with Growl without setting a delegate.
- *	@discussion	When you call this function with a dictionary,
- *	 GrowlApplicationBridge registers your application using that dictionary.
- *	 If you pass <code>NULL</code>, GrowlApplicationBridge will ask the delegate
- *	 (if there is one) for a dictionary, and if that doesn't work, it will look
- *	 in your application's bundle for an auto-discoverable plist.
- *	 (XXX refer to more information on that)
- *
- *	 If you pass a dictionary to this function, it must include the
- *	 <code>GROWL_APP_NAME</code> key, unless a delegate is set.
- *
- *	 This function is mainly an alternative to the delegate system introduced
- *	 with Growl 0.6. Without a delegate, you cannot receive callbacks such as
- *	 <code>growlIsReady</code> (since they are sent to the delegate). You can,
- *	 however, set a delegate after registering without one.
- *
- *	 This function was introduced in Growl.framework 0.7.
- *	@result <code>false</code> if registration failed (e.g. if Growl isn't installed).
- */
-GROWL_EXPORT Boolean Growl_RegisterWithDictionary(CFDictionaryRef regDict);
-
-/*!	@function	Growl_Reregister
- *	@abstract	Updates your registration with Growl.
- *	@discussion	If your application changes the contents of the
- *	 GROWL_NOTIFICATIONS_ALL key in the registrationDictionary member of the
- *	 Growl delegate, or if it changes the value of that member, or if it
- *	 changes the contents of its auto-discoverable plist, call this function
- *	 to have Growl update its registration information for your application.
- *
- *	 Otherwise, this function does not normally need to be called. If you're
- *	 using a delegate, your application will be registered when you set the
- *	 delegate if both the delegate and its registrationDictionary member are
- *	 non-<code>NULL</code>.
- *
- *	 This function is now implemented using
- *	 <code>Growl_RegisterWithDictionary</code>.
- */
-GROWL_EXPORT void Growl_Reregister(void);
-
-#pragma mark -
-
-/*!	@function	Growl_SetWillRegisterWhenGrowlIsReady
- *	@abstract	Tells GrowlApplicationBridge to register with Growl when Growl
- *	 launches (or not).
- *	@discussion	When Growl has started listening for notifications, it posts a
- *	 <code>GROWL_IS_READY</code> notification on the Distributed Notification
- *	 Center. GrowlApplicationBridge listens for this notification, using it to
- *	 perform various tasks (such as calling your delegate's
- *	 <code>growlIsReady</code> callback, if it has one). If this function is
- *	 called with <code>true</code>, one of those tasks will be to reregister
- *	 with Growl (in the manner of <code>Growl_Reregister</code>).
- *
- *	 This attribute is automatically set back to <code>false</code>
- *	 (the default) after every <code>GROWL_IS_READY</code> notification.
- *	@param	flag	<code>true</code> if you want GrowlApplicationBridge to register with
- *	 Growl when next it is ready; <code>false</code> if not.
- */
-GROWL_EXPORT void Growl_SetWillRegisterWhenGrowlIsReady(Boolean flag);
-/*!	@function	Growl_WillRegisterWhenGrowlIsReady
- *	@abstract	Reports whether GrowlApplicationBridge will register with Growl
- *	 when Growl next launches.
- *	@result	<code>true</code> if GrowlApplicationBridge will register with
- *	 Growl when next it posts GROWL_IS_READY; <code>false</code> if not.
- */
-GROWL_EXPORT Boolean Growl_WillRegisterWhenGrowlIsReady(void);
-
-#pragma mark -
-
-//	@functiongroup	Obtaining registration dictionaries
-
-/*!	@function	Growl_CopyRegistrationDictionaryFromDelegate
- *	@abstract	Asks the delegate for a registration dictionary.
- *	@discussion	If no delegate is set, or if the delegate's
- *	 <code>registrationDictionary</code> member is <code>NULL</code>, this
- *	 function returns <code>NULL</code>.
- *
- *	 This function does not attempt to clean up the dictionary in any way - for
- *	 example, if it is missing the <code>GROWL_APP_NAME</code> key, the result
- *	 will be missing it too. Use
- *	 <code>Growl_CreateRegistrationDictionaryByFillingInDictionary</code> or
- *	 <code>Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys</code>
- *	 to try to fill in missing keys.
- *
- *	 This function was introduced in Growl.framework 0.7.
- *	@result A registration dictionary.
- */
-GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromDelegate(void);
-
-/*!	@function	Growl_CopyRegistrationDictionaryFromBundle
- *	@abstract	Looks in a bundle for a registration dictionary.
- *	@discussion	This function looks in a bundle for an auto-discoverable
- *	 registration dictionary file using <code>CFBundleCopyResourceURL</code>.
- *	 If it finds one, it loads the file using <code>CFPropertyList</code> and
- *	 returns the result.
- *
- *	 If you pass <code>NULL</code> as the bundle, the main bundle is examined.
- *
- *	 This function does not attempt to clean up the dictionary in any way - for
- *	 example, if it is missing the <code>GROWL_APP_NAME</code> key, the result
- *	 will be missing it too. Use
- *	 <code>Growl_CreateRegistrationDictionaryByFillingInDictionary:</code> or
- *	 <code>Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys</code>
- *	 to try to fill in missing keys.
- *
- *	 This function was introduced in Growl.framework 0.7.
- *	@result A registration dictionary.
- */
-GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromBundle(CFBundleRef bundle);
-
-/*!	@function	Growl_CreateBestRegistrationDictionary
- *	@abstract	Obtains a registration dictionary, filled out to the best of
- *	 GrowlApplicationBridge's knowledge.
- *	@discussion	This function creates a registration dictionary as best
- *	 GrowlApplicationBridge knows how.
- *
- *	 First, GrowlApplicationBridge examines the Growl delegate (if there is
- *	 one) and gets the registration dictionary from that. If no such dictionary
- *	 was obtained, GrowlApplicationBridge looks in your application's main
- *	 bundle for an auto-discoverable registration dictionary file. If that
- *	 doesn't exist either, this function returns <code>NULL</code>.
- *
- *	 Second, GrowlApplicationBridge calls
- *	 <code>Growl_CreateRegistrationDictionaryByFillingInDictionary</code> with
- *	 whatever dictionary was obtained. The result of that function is the
- *	 result of this function.
- *
- *	 GrowlApplicationBridge uses this function when you call
- *	 <code>Growl_SetDelegate</code>, or when you call
- *	 <code>Growl_RegisterWithDictionary</code> with <code>NULL</code>.
- *
- *	 This function was introduced in Growl.framework 0.7.
- *	@result	A registration dictionary.
- */
-GROWL_EXPORT CFDictionaryRef Growl_CreateBestRegistrationDictionary(void);
-
-#pragma mark -
-
-//	@functiongroup	Filling in registration dictionaries
-
-/*!	@function	Growl_CreateRegistrationDictionaryByFillingInDictionary
- *	@abstract	Tries to fill in missing keys in a registration dictionary.
- *	@param	regDict	The dictionary to fill in.
- *	@result	The dictionary with the keys filled in.
- *	@discussion	This function examines the passed-in dictionary for missing keys,
- *	 and tries to work out correct values for them. As of 0.7, it uses:
- *
- *	 Key							             Value
- *	 ---							             -----
- *	 <code>GROWL_APP_NAME</code>                 <code>CFBundleExecutableName</code>
- *	 <code>GROWL_APP_ICON</code>                 The icon of the application.
- *	 <code>GROWL_APP_LOCATION</code>             The location of the application.
- *	 <code>GROWL_NOTIFICATIONS_DEFAULT</code>    <code>GROWL_NOTIFICATIONS_ALL</code>
- *
- *	 Keys are only filled in if missing; if a key is present in the dictionary,
- *	 its value will not be changed.
- *
- *	 This function was introduced in Growl.framework 0.7.
- */
-GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionary(CFDictionaryRef regDict);
-/*!	@function	Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys
- *	@abstract	Tries to fill in missing keys in a registration dictionary.
- *	@param	regDict	The dictionary to fill in.
- *	@param	keys	The keys to fill in. If <code>NULL</code>, any missing keys are filled in.
- *	@result	The dictionary with the keys filled in.
- *	@discussion	This function examines the passed-in dictionary for missing keys,
- *	 and tries to work out correct values for them. As of 0.7, it uses:
- *
- *	 Key							             Value
- *	 ---							             -----
- *	 <code>GROWL_APP_NAME</code>                 <code>CFBundleExecutableName</code>
- *	 <code>GROWL_APP_ICON</code>                 The icon of the application.
- *	 <code>GROWL_APP_LOCATION</code>             The location of the application.
- *	 <code>GROWL_NOTIFICATIONS_DEFAULT</code>    <code>GROWL_NOTIFICATIONS_ALL</code>
- *
- *	 Only those keys that are listed in <code>keys</code> will be filled in.
- *	 Other missing keys are ignored. Also, keys are only filled in if missing;
- *	 if a key is present in the dictionary, its value will not be changed.
- *
- *	 This function was introduced in Growl.framework 0.7.
- */
-GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys(CFDictionaryRef regDict, CFSetRef keys);
-
-/*!	@brief	Tries to fill in missing keys in a notification dictionary.
- *	@param	notifDict	The dictionary to fill in.
- *	@return	The dictionary with the keys filled in. This will be a separate instance from \a notifDict.
- *	@discussion	This function examines the \a notifDict for missing keys, and 
- *	 tries to get them from the last known registration dictionary. As of 1.1, 
- *	 the keys that it will look for are:
- *
- *	 \li <code>GROWL_APP_NAME</code>
- *	 \li <code>GROWL_APP_ICON</code>
- *
- *	@since Growl.framework 1.1
- */
-GROWL_EXPORT CFDictionaryRef Growl_CreateNotificationDictionaryByFillingInDictionary(CFDictionaryRef notifDict);
-
-#pragma mark -
-
-//	@functiongroup	Querying Growl's status
-
-/*!	@function	Growl_IsInstalled
- *	@abstract	Determines whether the Growl prefpane and its helper app are
- *	 installed.
- *	@result	Returns true if Growl is installed, false otherwise.
- */
-GROWL_EXPORT Boolean Growl_IsInstalled(void);
-
-/*!	@function	Growl_IsRunning
- *	@abstract	Cycles through the process list to find whether GrowlHelperApp
- *	 is running.
- *	@result	Returns true if Growl is running, false otherwise.
- */
-GROWL_EXPORT Boolean Growl_IsRunning(void);
-
-#pragma mark -
-
-//	@functiongroup	Launching Growl
-
-/*!	@typedef	GrowlLaunchCallback
- *	@abstract	Callback to notify you that Growl is running.
- *	@param	context	The context pointer passed to Growl_LaunchIfInstalled.
- *	@discussion	Growl_LaunchIfInstalled calls this callback function if Growl
- *	 was already running or if it launched Growl successfully.
- */
-typedef void (*GrowlLaunchCallback)(void *context);
-
-/*!	@function	Growl_LaunchIfInstalled
- *	@abstract	Launches GrowlHelperApp if it is not already running.
- *	@param	callback	A callback function which will be called if Growl was successfully
- *	 launched or was already running. Can be <code>NULL</code>.
- *	@param	context	The context pointer to pass to the callback. Can be <code>NULL</code>.
- *	@result	Returns true if Growl was successfully launched or was already
- *	 running; returns false and does not call the callback otherwise.
- *	@discussion	Returns true and calls the callback (if the callback is not
- *	 <code>NULL</code>) if the Growl helper app began launching or was already
- *	 running. Returns false and performs no other action if Growl could not be
- *	 launched (e.g. because the Growl preference pane is not properly installed).
- *
- *	 If <code>Growl_CreateBestRegistrationDictionary</code> returns
- *	 non-<code>NULL</code>, this function will register with Growl atomically.
- *
- *	 The callback should take a single argument; this is to allow applications
- *	 to have context-relevant information passed back. It is perfectly
- *	 acceptable for context to be <code>NULL</code>. The callback itself can be
- *	 <code>NULL</code> if you don't want one.
- */
-GROWL_EXPORT Boolean Growl_LaunchIfInstalled(GrowlLaunchCallback callback, void *context);
-
-#pragma mark -
-#pragma mark Constants
-
-/*!	@defined	GROWL_PREFPANE_BUNDLE_IDENTIFIER
- *	@abstract	The CFBundleIdentifier of the Growl preference pane bundle.
- *	@discussion	GrowlApplicationBridge uses this to determine whether Growl is
- *	 currently installed, by searching for the Growl preference pane. Your
- *	 application probably does not need to use this macro itself.
- */
-#ifndef GROWL_PREFPANE_BUNDLE_IDENTIFIER
-#define GROWL_PREFPANE_BUNDLE_IDENTIFIER	CFSTR("com.growl.prefpanel")
-#endif
-
-__END_DECLS
-
-#endif /* _GROWLAPPLICATIONBRIDGE_CARBON_H_ */

HandBrake-0.9.8.tar.bz2/macosx/HandBrake-64.icns Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/AddToQueue.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/Brushed Window.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/Pause.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/Play.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/Queue.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/Source.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/Stop.tiff Deleted

HandBrake-0.9.8.tar.bz2/macosx/icons/pref-picture.tiff Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Controls Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Controls/AdvancedEncoderOpts.Designer.cs Deleted

@@ -1,100 +0,0 @@
-/*  x264Panel.Designer.cs $
- 	
- 	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.fr>.
- 	   It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    partial class AdvancedEncoderOpts
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #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.components = new System.ComponentModel.Container();
-            this.label43 = new System.Windows.Forms.Label();
-            this.advancedQuery = new System.Windows.Forms.RichTextBox();
-            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.label64 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // label43
-            // 
-            this.label43.AutoSize = true;
-            this.label43.BackColor = System.Drawing.Color.Transparent;
-            this.label43.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label43.Location = new System.Drawing.Point(13, 13);
-            this.label43.Name = "label43";
-            this.label43.Size = new System.Drawing.Size(63, 13);
-            this.label43.TabIndex = 49;
-            this.label43.Text = "Advanced";
-            // 
-            // advancedQuery
-            // 
-            this.advancedQuery.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.advancedQuery.Location = new System.Drawing.Point(16, 53);
-            this.advancedQuery.Name = "advancedQuery";
-            this.advancedQuery.Size = new System.Drawing.Size(688, 128);
-            this.advancedQuery.TabIndex = 80;
-            this.advancedQuery.Text = "";
-            // 
-            // ToolTip
-            // 
-            this.ToolTip.Active = false;
-            this.ToolTip.AutomaticDelay = 1000;
-            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
-            // 
-            // label64
-            // 
-            this.label64.AutoSize = true;
-            this.label64.Location = new System.Drawing.Point(13, 35);
-            this.label64.Name = "label64";
-            this.label64.Size = new System.Drawing.Size(163, 13);
-            this.label64.TabIndex = 81;
-            this.label64.Text = "Encoder advanced option string:";
-            // 
-            // x264Panel
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.label64);
-            this.Controls.Add(this.advancedQuery);
-            this.Controls.Add(this.label43);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Size = new System.Drawing.Size(720, 305);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.Label label43;
-        internal System.Windows.Forms.RichTextBox advancedQuery;
-        private System.Windows.Forms.ToolTip ToolTip;
-        internal System.Windows.Forms.Label label64;
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/Controls/AdvancedEncoderOpts.cs Deleted

@@ -1,70 +0,0 @@
-/*  AdvancedEncoderOpts.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    /// <summary>
-    /// The x264 Panel
-    /// </summary>
-    public partial class AdvancedEncoderOpts : UserControl
-    {
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AdvancedEncoderOpts"/> class. 
-        /// </summary>
-        public AdvancedEncoderOpts()
-        {
-            InitializeComponent();
-
-            if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.TooltipEnable))
-                ToolTip.Active = true;
-        }
-
-        /// <summary>
-        /// Gets or sets the X264 query string
-        /// </summary>
-        public string AdavancedQuery
-        {
-            get
-            {
-                return advancedQuery.Text;
-            }
-
-            set
-            {
-                advancedQuery.Text = value;
-            }
-        }
-
-        /// <summary>
-        /// Sets a value indicating whether IsDisabled.
-        /// </summary>
-        public bool IsDisabled
-        {
-            set
-            {
-                if (value)
-                {
-                    this.advancedQuery.Enabled = false;
-                    this.advancedQuery.Text = "Advanced encoder option passthrough is not currently supported for the encoder you have chosen.";
-                }
-                else
-                {
-                    this.advancedQuery.Enabled = true;
-                    this.advancedQuery.Text = string.Empty;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/AdvancedEncoderOpts.resx Deleted

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/AudioPanel.Designer.cs Deleted

@@ -1,600 +0,0 @@
-/*  AudioPanel.Designer.cs $
- 	
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    partial class AudioPanel
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #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.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioPanel));
-            this.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.audioList_MoveToTop = new System.Windows.Forms.ToolStripMenuItem();
-            this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();
-            this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();
-            this.audioList_MoveToBottom = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.audioList_remove = new System.Windows.Forms.ToolStripMenuItem();
-            this.label68 = new System.Windows.Forms.Label();
-            this.drp_audioEncoder = new System.Windows.Forms.ComboBox();
-            this.drp_audioMix = new System.Windows.Forms.ComboBox();
-            this.drp_audioTrack = new System.Windows.Forms.ComboBox();
-            this.drp_audioBitrate = new System.Windows.Forms.ComboBox();
-            this.drp_audioSample = new System.Windows.Forms.ComboBox();
-            this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);
-            this.audioList = new System.Windows.Forms.DataGridView();
-            this.Source = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.AudioCodec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Mixdown = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Samplerate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Bitrate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DRC = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Gain = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ToolTips = new System.Windows.Forms.ToolTip(this.components);
-            this.drp_passthruFallback = new System.Windows.Forms.ComboBox();
-            this.gb_autoPassthru = new System.Windows.Forms.GroupBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.check_dtshd = new System.Windows.Forms.CheckBox();
-            this.check_dts = new System.Windows.Forms.CheckBox();
-            this.check_ac3 = new System.Windows.Forms.CheckBox();
-            this.check_aac = new System.Windows.Forms.CheckBox();
-            this.check_mp3 = new System.Windows.Forms.CheckBox();
-            this.btn_AdvancedAudio = new System.Windows.Forms.Button();
-            this.btn_addAudioTrack = new wyDay.Controls.SplitButton();
-            this.AddTrackMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_AddAll = new System.Windows.Forms.ToolStripMenuItem();
-            this.btn_RemoveTrack = new wyDay.Controls.SplitButton();
-            this.RemoveTrackMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_ClearAll = new System.Windows.Forms.ToolStripMenuItem();
-            this.audioMenu.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.audioList)).BeginInit();
-            this.gb_autoPassthru.SuspendLayout();
-            this.AddTrackMenu.SuspendLayout();
-            this.RemoveTrackMenu.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // audioMenu
-            // 
-            this.audioMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.audioList_MoveToTop,
-            this.audioList_moveup,
-            this.audioList_movedown,
-            this.audioList_MoveToBottom,
-            this.toolStripSeparator2,
-            this.audioList_remove});
-            this.audioMenu.Name = "audioMenu";
-            this.audioMenu.Size = new System.Drawing.Size(165, 120);
-            // 
-            // audioList_MoveToTop
-            // 
-            this.audioList_MoveToTop.Name = "audioList_MoveToTop";
-            this.audioList_MoveToTop.Size = new System.Drawing.Size(164, 22);
-            this.audioList_MoveToTop.Text = "Move to Top";
-            this.audioList_MoveToTop.Click += new System.EventHandler(this.audioList_MoveToTop_Click);
-            // 
-            // audioList_moveup
-            // 
-            this.audioList_moveup.Name = "audioList_moveup";
-            this.audioList_moveup.Size = new System.Drawing.Size(164, 22);
-            this.audioList_moveup.Text = "Move Up";
-            this.audioList_moveup.Click += new System.EventHandler(this.AudioList_moveup_Click);
-            // 
-            // audioList_movedown
-            // 
-            this.audioList_movedown.Name = "audioList_movedown";
-            this.audioList_movedown.Size = new System.Drawing.Size(164, 22);
-            this.audioList_movedown.Text = "Move Down";
-            this.audioList_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.audioList_movedown.Click += new System.EventHandler(this.AudioList_movedown_Click);
-            // 
-            // audioList_MoveToBottom
-            // 
-            this.audioList_MoveToBottom.Name = "audioList_MoveToBottom";
-            this.audioList_MoveToBottom.Size = new System.Drawing.Size(164, 22);
-            this.audioList_MoveToBottom.Text = "Move To Bottom";
-            this.audioList_MoveToBottom.Click += new System.EventHandler(this.audioList_MoveToBottom_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6);
-            // 
-            // audioList_remove
-            // 
-            this.audioList_remove.Name = "audioList_remove";
-            this.audioList_remove.Size = new System.Drawing.Size(164, 22);
-            this.audioList_remove.Text = "Remove";
-            this.audioList_remove.Click += new System.EventHandler(this.AudioList_remove_Click);
-            // 
-            // label68
-            // 
-            this.label68.AutoSize = true;
-            this.label68.BackColor = System.Drawing.Color.Transparent;
-            this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label68.Location = new System.Drawing.Point(13, 13);
-            this.label68.Name = "label68";
-            this.label68.Size = new System.Drawing.Size(80, 13);
-            this.label68.TabIndex = 49;
-            this.label68.Text = "Audio Tracks";
-            // 
-            // drp_audioEncoder
-            // 
-            this.drp_audioEncoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_audioEncoder.FormattingEnabled = true;
-            this.drp_audioEncoder.Items.AddRange(new object[] {
-            "AAC (faac)",
-            "AAC (ffmpeg)",
-            "MP3 (lame)",
-            "Vorbis (vorbis)",
-            "AC3 Passthru",
-            "AC3 (ffmpeg)",
-            "DTS Passthru"});
-            this.drp_audioEncoder.Location = new System.Drawing.Point(191, 66);
-            this.drp_audioEncoder.Name = "drp_audioEncoder";
-            this.drp_audioEncoder.Size = new System.Drawing.Size(111, 21);
-            this.drp_audioEncoder.TabIndex = 52;
-            this.ToolTips.SetToolTip(this.drp_audioEncoder, "Set the audio codec to encode the selected track with.");
-            this.drp_audioEncoder.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);
-            // 
-            // drp_audioMix
-            // 
-            this.drp_audioMix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_audioMix.Enabled = false;
-            this.drp_audioMix.FormattingEnabled = true;
-            this.drp_audioMix.Items.AddRange(new object[] {
-            "Automatic",
-            "None",
-            "Mono",
-            "Stereo",
-            "Dolby Surround",
-            "Dolby Pro Logic II",
-            "6-channel discrete"});
-            this.drp_audioMix.Location = new System.Drawing.Point(309, 66);
-            this.drp_audioMix.Name = "drp_audioMix";
-            this.drp_audioMix.Size = new System.Drawing.Size(147, 21);
-            this.drp_audioMix.TabIndex = 54;
-            this.ToolTips.SetToolTip(this.drp_audioMix, "Set the mixdown for the selected audio track.");
-            this.drp_audioMix.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);
-            // 
-            // drp_audioTrack
-            // 
-            this.drp_audioTrack.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_audioTrack.FormattingEnabled = true;
-            this.drp_audioTrack.Items.AddRange(new object[] {
-            "Automatic"});
-            this.drp_audioTrack.Location = new System.Drawing.Point(16, 66);
-            this.drp_audioTrack.Name = "drp_audioTrack";
-            this.drp_audioTrack.Size = new System.Drawing.Size(170, 21);
-            this.drp_audioTrack.TabIndex = 50;
-            this.ToolTips.SetToolTip(this.drp_audioTrack, "The list of audio tracks available from your source.");
-            this.drp_audioTrack.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);
-            // 
-            // drp_audioBitrate
-            // 
-            this.drp_audioBitrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_audioBitrate.Enabled = false;
-            this.drp_audioBitrate.FormattingEnabled = true;
-            this.drp_audioBitrate.Items.AddRange(new object[] {
-            "32",
-            "40",
-            "48",
-            "56",
-            "64",
-            "80",
-            "96",
-            "112",
-            "128",
-            "160"});
-            this.drp_audioBitrate.Location = new System.Drawing.Point(534, 66);
-            this.drp_audioBitrate.Name = "drp_audioBitrate";
-            this.drp_audioBitrate.Size = new System.Drawing.Size(67, 21);
-            this.drp_audioBitrate.TabIndex = 58;
-            this.ToolTips.SetToolTip(this.drp_audioBitrate, "Set the bitrate for the selected audio track.");
-            this.drp_audioBitrate.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);
-            // 
-            // drp_audioSample
-            // 
-            this.drp_audioSample.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_audioSample.Enabled = false;
-            this.drp_audioSample.FormattingEnabled = true;
-            this.drp_audioSample.Items.AddRange(new object[] {
-            "Auto",
-            "48",
-            "44.1",
-            "32",
-            "24",
-            "22.05"});
-            this.drp_audioSample.Location = new System.Drawing.Point(461, 66);
-            this.drp_audioSample.Name = "drp_audioSample";
-            this.drp_audioSample.Size = new System.Drawing.Size(67, 21);
-            this.drp_audioSample.TabIndex = 56;
-            this.ToolTips.SetToolTip(this.drp_audioSample, "Set the samplerate for the selected audio track.");
-            this.drp_audioSample.SelectedIndexChanged += new System.EventHandler(this.ControlChanged);
-            // 
-            // AudioMenuRowHeightHack
-            // 
-            this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-            this.AudioMenuRowHeightHack.ImageSize = new System.Drawing.Size(1, 18);
-            this.AudioMenuRowHeightHack.TransparentColor = System.Drawing.Color.Transparent;
-            // 
-            // audioList
-            // 
-            this.audioList.AllowUserToAddRows = false;
-            this.audioList.AllowUserToResizeColumns = false;
-            this.audioList.AllowUserToResizeRows = false;
-            this.audioList.BackgroundColor = System.Drawing.Color.White;
-            this.audioList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
-            this.audioList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.audioList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Source,
-            this.AudioCodec,
-            this.Mixdown,
-            this.Samplerate,
-            this.Bitrate,
-            this.DRC,
-            this.Gain});
-            this.audioList.ContextMenuStrip = this.audioMenu;
-            this.audioList.GridColor = System.Drawing.Color.White;
-            this.audioList.Location = new System.Drawing.Point(16, 94);
-            this.audioList.Name = "audioList";
-            this.audioList.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
-            this.audioList.RowHeadersVisible = false;
-            this.audioList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
-            this.audioList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.audioList.ShowCellErrors = false;
-            this.audioList.ShowCellToolTips = false;
-            this.audioList.ShowEditingIcon = false;
-            this.audioList.ShowRowErrors = false;
-            this.audioList.Size = new System.Drawing.Size(685, 200);
-            this.audioList.TabIndex = 67;
-            this.ToolTips.SetToolTip(this.audioList, resources.GetString("audioList.ToolTip"));
-            this.audioList.SelectionChanged += new System.EventHandler(this.audioList_SelectionChanged);
-            // 
-            // Source
-            // 
-            this.Source.DataPropertyName = "TrackDisplay";
-            this.Source.FillWeight = 49.69727F;
-            this.Source.HeaderText = "Source";
-            this.Source.Name = "Source";
-            this.Source.ReadOnly = true;
-            this.Source.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Source.Width = 170;
-            // 
-            // AudioCodec
-            // 
-            this.AudioCodec.DataPropertyName = "AudioEncoderDisplayValue";
-            this.AudioCodec.HeaderText = "Audio Codec";
-            this.AudioCodec.Name = "AudioCodec";
-            this.AudioCodec.ReadOnly = true;
-            this.AudioCodec.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.AudioCodec.Width = 120;
-            // 
-            // Mixdown
-            // 
-            this.Mixdown.DataPropertyName = "AudioMixdownDisplayValue";
-            this.Mixdown.FillWeight = 49.69727F;
-            this.Mixdown.HeaderText = "Mixdown";
-            this.Mixdown.Name = "Mixdown";
-            this.Mixdown.ReadOnly = true;
-            this.Mixdown.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Mixdown.Width = 150;
-            // 
-            // Samplerate
-            // 
-            this.Samplerate.DataPropertyName = "SampleRateDisplayValue";
-            this.Samplerate.FillWeight = 49.69727F;
-            this.Samplerate.HeaderText = "Samplerate";
-            this.Samplerate.Name = "Samplerate";
-            this.Samplerate.ReadOnly = true;
-            this.Samplerate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Samplerate.Width = 75;
-            // 
-            // Bitrate
-            // 
-            this.Bitrate.DataPropertyName = "BitRateDisplayValue";
-            this.Bitrate.FillWeight = 49.69727F;
-            this.Bitrate.HeaderText = "Bitrate";
-            this.Bitrate.Name = "Bitrate";
-            this.Bitrate.ReadOnly = true;
-            this.Bitrate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Bitrate.Width = 75;
-            // 
-            // DRC
-            // 
-            this.DRC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.DRC.DataPropertyName = "DRC";
-            this.DRC.FillWeight = 96.36334F;
-            this.DRC.HeaderText = "DRC";
-            this.DRC.Name = "DRC";
-            this.DRC.ReadOnly = true;
-            this.DRC.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.DRC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Gain
-            // 
-            this.Gain.DataPropertyName = "Gain";
-            this.Gain.HeaderText = "Gain (dB)";
-            this.Gain.Name = "Gain";
-            this.Gain.ReadOnly = true;
-            this.Gain.Width = 60;
-            // 
-            // ToolTips
-            // 
-            this.ToolTips.AutomaticDelay = 1500;
-            // 
-            // drp_passthruFallback
-            // 
-            this.drp_passthruFallback.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_passthruFallback.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.drp_passthruFallback.FormattingEnabled = true;
-            this.drp_passthruFallback.Location = new System.Drawing.Point(327, 15);
-            this.drp_passthruFallback.Name = "drp_passthruFallback";
-            this.drp_passthruFallback.Size = new System.Drawing.Size(111, 19);
-            this.drp_passthruFallback.TabIndex = 75;
-            this.ToolTips.SetToolTip(this.drp_passthruFallback, "The Audio Encoder that will be used, if there is no suitable passthru option.");
-            this.drp_passthruFallback.SelectedIndexChanged += new System.EventHandler(this.drp_passthruFallback_SelectedIndexChanged);
-            // 
-            // gb_autoPassthru
-            // 
-            this.gb_autoPassthru.Controls.Add(this.label1);
-            this.gb_autoPassthru.Controls.Add(this.drp_passthruFallback);
-            this.gb_autoPassthru.Controls.Add(this.check_dtshd);
-            this.gb_autoPassthru.Controls.Add(this.check_dts);
-            this.gb_autoPassthru.Controls.Add(this.check_ac3);
-            this.gb_autoPassthru.Controls.Add(this.check_aac);
-            this.gb_autoPassthru.Controls.Add(this.check_mp3);
-            this.gb_autoPassthru.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.gb_autoPassthru.Location = new System.Drawing.Point(256, 19);
-            this.gb_autoPassthru.Name = "gb_autoPassthru";
-            this.gb_autoPassthru.Size = new System.Drawing.Size(445, 40);
-            this.gb_autoPassthru.TabIndex = 74;
-            this.gb_autoPassthru.TabStop = false;
-            this.gb_autoPassthru.Text = "Auto Passthru";
-            this.ToolTips.SetToolTip(this.gb_autoPassthru, resources.GetString("gb_autoPassthru.ToolTip"));
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(279, 18);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(42, 11);
-            this.label1.TabIndex = 76;
-            this.label1.Text = "Fallback:";
-            // 
-            // check_dtshd
-            // 
-            this.check_dtshd.AutoSize = true;
-            this.check_dtshd.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.check_dtshd.Location = new System.Drawing.Point(214, 17);
-            this.check_dtshd.Name = "check_dtshd";
-            this.check_dtshd.Size = new System.Drawing.Size(60, 15);
-            this.check_dtshd.TabIndex = 4;
-            this.check_dtshd.Text = "DTS-HD";
-            this.ToolTips.SetToolTip(this.check_dtshd, "Allow DTS-HD Passthru");
-            this.check_dtshd.UseVisualStyleBackColor = true;
-            this.check_dtshd.CheckedChanged += new System.EventHandler(this.autoPassthru_CheckedChanged);
-            // 
-            // check_dts
-            // 
-            this.check_dts.AutoSize = true;
-            this.check_dts.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.check_dts.Location = new System.Drawing.Point(163, 17);
-            this.check_dts.Name = "check_dts";
-            this.check_dts.Size = new System.Drawing.Size(43, 15);
-            this.check_dts.TabIndex = 3;
-            this.check_dts.Text = "DTS";
-            this.ToolTips.SetToolTip(this.check_dts, "Allow DTS Passthru");
-            this.check_dts.UseVisualStyleBackColor = true;
-            this.check_dts.CheckedChanged += new System.EventHandler(this.autoPassthru_CheckedChanged);
-            // 
-            // check_ac3
-            // 
-            this.check_ac3.AutoSize = true;
-            this.check_ac3.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.check_ac3.Location = new System.Drawing.Point(111, 17);
-            this.check_ac3.Name = "check_ac3";
-            this.check_ac3.Size = new System.Drawing.Size(43, 15);
-            this.check_ac3.TabIndex = 2;
-            this.check_ac3.Text = "AC3";
-            this.ToolTips.SetToolTip(this.check_ac3, "Allow AC3 Passthru");
-            this.check_ac3.UseVisualStyleBackColor = true;
-            this.check_ac3.CheckedChanged += new System.EventHandler(this.autoPassthru_CheckedChanged);
-            // 
-            // check_aac
-            // 
-            this.check_aac.AutoSize = true;
-            this.check_aac.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.check_aac.Location = new System.Drawing.Point(58, 17);
-            this.check_aac.Name = "check_aac";
-            this.check_aac.Size = new System.Drawing.Size(45, 15);
-            this.check_aac.TabIndex = 1;
-            this.check_aac.Text = "AAC";
-            this.ToolTips.SetToolTip(this.check_aac, "Allow AAC Passthru");
-            this.check_aac.UseVisualStyleBackColor = true;
-            this.check_aac.CheckedChanged += new System.EventHandler(this.autoPassthru_CheckedChanged);
-            // 
-            // check_mp3
-            // 
-            this.check_mp3.AutoSize = true;
-            this.check_mp3.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.check_mp3.Location = new System.Drawing.Point(6, 17);
-            this.check_mp3.Name = "check_mp3";
-            this.check_mp3.Size = new System.Drawing.Size(43, 15);
-            this.check_mp3.TabIndex = 0;
-            this.check_mp3.Text = "MP3";
-            this.ToolTips.SetToolTip(this.check_mp3, "Allow MP3 Passthru");
-            this.check_mp3.UseVisualStyleBackColor = true;
-            this.check_mp3.CheckedChanged += new System.EventHandler(this.autoPassthru_CheckedChanged);
-            // 
-            // btn_AdvancedAudio
-            // 
-            this.btn_AdvancedAudio.BackColor = System.Drawing.Color.Transparent;
-            this.btn_AdvancedAudio.Enabled = false;
-            this.btn_AdvancedAudio.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_AdvancedAudio.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_AdvancedAudio.Location = new System.Drawing.Point(607, 65);
-            this.btn_AdvancedAudio.Name = "btn_AdvancedAudio";
-            this.btn_AdvancedAudio.Size = new System.Drawing.Size(94, 23);
-            this.btn_AdvancedAudio.TabIndex = 70;
-            this.btn_AdvancedAudio.Text = "Advanced";
-            this.btn_AdvancedAudio.UseVisualStyleBackColor = false;
-            this.btn_AdvancedAudio.Click += new System.EventHandler(this.btn_AdvancedAudio_Click);
-            // 
-            // btn_addAudioTrack
-            // 
-            this.btn_addAudioTrack.AutoSize = true;
-            this.btn_addAudioTrack.ContextMenuStrip = this.AddTrackMenu;
-            this.btn_addAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_addAudioTrack.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 37);
-            this.btn_addAudioTrack.Name = "btn_addAudioTrack";
-            this.btn_addAudioTrack.Size = new System.Drawing.Size(92, 23);
-            this.btn_addAudioTrack.SplitMenuStrip = this.AddTrackMenu;
-            this.btn_addAudioTrack.TabIndex = 72;
-            this.btn_addAudioTrack.Text = "Add Track";
-            this.btn_addAudioTrack.UseVisualStyleBackColor = true;
-            this.btn_addAudioTrack.Click += new System.EventHandler(this.AddAudioTrack_Click);
-            // 
-            // AddTrackMenu
-            // 
-            this.AddTrackMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_AddAll});
-            this.AddTrackMenu.Name = "audioMenu";
-            this.AddTrackMenu.Size = new System.Drawing.Size(114, 26);
-            // 
-            // mnu_AddAll
-            // 
-            this.mnu_AddAll.Name = "mnu_AddAll";
-            this.mnu_AddAll.Size = new System.Drawing.Size(113, 22);
-            this.mnu_AddAll.Text = "Add All";
-            this.mnu_AddAll.Click += new System.EventHandler(this.mnu_AddAll_Click);
-            // 
-            // btn_RemoveTrack
-            // 
-            this.btn_RemoveTrack.AutoSize = true;
-            this.btn_RemoveTrack.ContextMenuStrip = this.RemoveTrackMenu;
-            this.btn_RemoveTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_RemoveTrack.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_RemoveTrack.Location = new System.Drawing.Point(114, 37);
-            this.btn_RemoveTrack.Name = "btn_RemoveTrack";
-            this.btn_RemoveTrack.Size = new System.Drawing.Size(82, 23);
-            this.btn_RemoveTrack.SplitMenuStrip = this.RemoveTrackMenu;
-            this.btn_RemoveTrack.TabIndex = 73;
-            this.btn_RemoveTrack.Text = "Remove";
-            this.btn_RemoveTrack.UseVisualStyleBackColor = true;
-            this.btn_RemoveTrack.Click += new System.EventHandler(this.Btn_remove_track_click);
-            // 
-            // RemoveTrackMenu
-            // 
-            this.RemoveTrackMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_ClearAll});
-            this.RemoveTrackMenu.Name = "audioMenu";
-            this.RemoveTrackMenu.Size = new System.Drawing.Size(119, 26);
-            // 
-            // mnu_ClearAll
-            // 
-            this.mnu_ClearAll.Name = "mnu_ClearAll";
-            this.mnu_ClearAll.Size = new System.Drawing.Size(118, 22);
-            this.mnu_ClearAll.Text = "Clear All";
-            this.mnu_ClearAll.Click += new System.EventHandler(this.Mnu_clear_all_click);
-            // 
-            // AudioPanel
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.gb_autoPassthru);
-            this.Controls.Add(this.drp_audioTrack);
-            this.Controls.Add(this.btn_AdvancedAudio);
-            this.Controls.Add(this.drp_audioSample);
-            this.Controls.Add(this.btn_RemoveTrack);
-            this.Controls.Add(this.audioList);
-            this.Controls.Add(this.label68);
-            this.Controls.Add(this.btn_addAudioTrack);
-            this.Controls.Add(this.drp_audioBitrate);
-            this.Controls.Add(this.drp_audioMix);
-            this.Controls.Add(this.drp_audioEncoder);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Name = "AudioPanel";
-            this.Size = new System.Drawing.Size(720, 310);
-            this.audioMenu.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.audioList)).EndInit();
-            this.gb_autoPassthru.ResumeLayout(false);
-            this.gb_autoPassthru.PerformLayout();
-            this.AddTrackMenu.ResumeLayout(false);
-            this.RemoveTrackMenu.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.Label label68;
-        internal System.Windows.Forms.ComboBox drp_audioEncoder;
-        internal System.Windows.Forms.ComboBox drp_audioMix;
-        internal System.Windows.Forms.ComboBox drp_audioTrack;
-        internal System.Windows.Forms.ComboBox drp_audioSample;
-        private System.Windows.Forms.ImageList AudioMenuRowHeightHack;
-        private System.Windows.Forms.ContextMenuStrip audioMenu;
-        private System.Windows.Forms.ToolStripMenuItem audioList_moveup;
-        private System.Windows.Forms.ToolStripMenuItem audioList_movedown;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripMenuItem audioList_remove;
-        internal System.Windows.Forms.ComboBox drp_audioBitrate;
-        private System.Windows.Forms.DataGridView audioList;
-        private System.Windows.Forms.ToolTip ToolTips;
-        private System.Windows.Forms.Button btn_AdvancedAudio;
-        private System.Windows.Forms.ToolStripMenuItem audioList_MoveToTop;
-        private System.Windows.Forms.ToolStripMenuItem audioList_MoveToBottom;
-        private wyDay.Controls.SplitButton btn_addAudioTrack;
-        private System.Windows.Forms.ContextMenuStrip AddTrackMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_AddAll;
-        private wyDay.Controls.SplitButton btn_RemoveTrack;
-        private System.Windows.Forms.ContextMenuStrip RemoveTrackMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_ClearAll;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Source;
-        private System.Windows.Forms.DataGridViewTextBoxColumn AudioCodec;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Mixdown;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Samplerate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Bitrate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DRC;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Gain;
-        private System.Windows.Forms.GroupBox gb_autoPassthru;
-        private System.Windows.Forms.CheckBox check_dtshd;
-        private System.Windows.Forms.CheckBox check_dts;
-        private System.Windows.Forms.CheckBox check_ac3;
-        private System.Windows.Forms.CheckBox check_aac;
-        private System.Windows.Forms.CheckBox check_mp3;
-        private System.Windows.Forms.Label label1;
-        internal System.Windows.Forms.ComboBox drp_passthruFallback;
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/Controls/AudioPanel.cs Deleted

@@ -1,1274 +0,0 @@
-/*  AudioPanel.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Collections.Specialized;
-    using System.ComponentModel;
-    using System.Drawing;
-    using System.Globalization;
-    using System.Linq;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Functions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.ApplicationServices.Utilities;
-    using HandBrake.Interop.Model.Encoding;
-
-    using Handbrake.ToolWindows;
-
-    /// <summary>
-    /// The AudioPanel Control
-    /// </summary>
-    public partial class AudioPanel : UserControl
-    {
-        #region Private Variables
-
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Audio Tracks
-        /// </summary>
-        private readonly BindingList<AudioTrack> audioTracks = new BindingList<AudioTrack>();
-
-        /// <summary>
-        /// Mixdown
-        /// </summary>
-        private const string None = "None";
-
-        /// <summary>
-        /// The Advanced Audio Backing object
-        /// </summary>
-        private AdvancedAudio advancedAudio = new AdvancedAudio();
-
-        #endregion
-
-        #region Constructor and Events
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AudioPanel"/> class. 
-        /// </summary>
-        public AudioPanel()
-        {
-            InitializeComponent();
-
-            this.ScannedTracks = new BindingList<Audio>
-                {
-                    AudioHelper.NoneFound 
-                };
-
-            this.audioList.AutoGenerateColumns = false;
-            this.audioList.DataSource = audioTracks;
-
-            drp_audioMix.SelectedItem = "Dolby Pro Logic II";
-            drp_audioSample.SelectedIndex = 1;
-            drp_audioBitrate.SelectedItem = "160";
-            drp_audioEncoder.SelectedItem = "AAC (faac)";
-
-            drp_audioTrack.DataSource = this.ScannedTracks;
-
-            // Setup Auto-Passthru Settings
-            this.PassthruSettings = new AllowedPassthru();
-            this.SetPassthruSettings(this.PassthruSettings);
-            this.gb_autoPassthru.Visible = this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
-        }
-
-        /// <summary>
-        /// The audio list has changed
-        /// </summary>
-        public event EventHandler AudioListChanged;
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets ScannedTracks.
-        /// </summary>
-        private BindingList<Audio> ScannedTracks { get; set; }
-
-        /// <summary>
-        /// Gets the AudioTracks Collection
-        /// </summary>
-        public BindingList<AudioTrack> AudioTracks
-        {
-            get
-            {
-                return this.audioTracks;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets PassthruSettings.
-        /// </summary>
-        public AllowedPassthru PassthruSettings { get; set; }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Set the File Container. This funciton is used to limit the available options for each file container.
-        /// </summary>
-        /// <param name="path">
-        /// the file path
-        /// </param>
-        public void SetContainer(string path)
-        {
-            string oldval = drp_audioEncoder.Text;
-            string fallbackOldVal = drp_passthruFallback.Text;
-
-            drp_audioEncoder.Items.Clear();
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Faac));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.ffaac));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.AacPassthru));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Lame));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Mp3Passthru));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Ac3Passthrough));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Ac3));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.DtsPassthrough));
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.DtsHDPassthrough));
-
-            drp_passthruFallback.Items.Clear();
-            drp_passthruFallback.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Faac));
-            drp_passthruFallback.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.ffaac));
-            drp_passthruFallback.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Lame));
-            drp_passthruFallback.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Ac3));
-
-            if (path.Contains("MKV"))
-            {
-                drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Vorbis));
-                drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.ffflac));
-
-                drp_passthruFallback.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Vorbis));
-                drp_passthruFallback.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.ffflac));
-            }
-
-            drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDisplay(AudioEncoder.Passthrough));
-
-            if (!drp_audioEncoder.Items.Contains(oldval))
-                drp_audioEncoder.SelectedIndex = 0;
-            else
-                drp_audioEncoder.SelectedItem = oldval;
-
-            if (!drp_passthruFallback.Items.Contains(fallbackOldVal))
-                drp_passthruFallback.SelectedIndex = 3;
-            else
-                drp_passthruFallback.SelectedItem = fallbackOldVal;
-        }
-
-        /// <summary>
-        /// Checks if the settings used required the .m4v (rather than .mp4) extension
-        /// </summary>
-        /// <returns>True if m4v is required</returns>
-        public bool RequiresM4V()
-        {
-            return this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough || item.Encoder == AudioEncoder.Ac3);
-        }
-
-        /// <summary>
-        /// Load an arraylist of AudioTrack items into the list.
-        /// </summary>
-        /// <param name="preset">
-        /// The preset.
-        /// </param>
-        public void LoadTracks(Preset preset)
-        {
-            ClearAudioList();
-
-            ObservableCollection<AudioTrack> tracks = new ObservableCollection<AudioTrack>(preset.Task.AudioTracks);
-            this.PassthruSettings = preset.AudioPassthruSettings != null ? new AllowedPassthru(preset.AudioPassthruSettings) : new AllowedPassthru(false);
-            this.SetPassthruSettings(this.PassthruSettings);
-
-            if (this.drp_audioTrack.SelectedItem != null && this.drp_audioTrack.SelectedItem.ToString() == AudioHelper.NoneFound.Description)
-                return;
-
-            foreach (AudioTrack track in tracks)
-            {
-                AudioTrack audioTrack = new AudioTrack
-                {
-                    Encoder = track.Encoder,
-                    MixDown = track.MixDown,
-                    SampleRate = track.SampleRate,
-                    Bitrate = track.Bitrate,
-                    Gain = track.Gain,
-                    DRC = track.DRC,
-                };
-
-                if (track.Encoder == AudioEncoder.Ac3Passthrough || track.Encoder == AudioEncoder.DtsPassthrough ||
-                    track.Encoder == AudioEncoder.DtsHDPassthrough || track.Encoder == AudioEncoder.AacPassthru || track.Encoder == AudioEncoder.Mp3Passthru)
-                {
-                    audioTrack.MixDown = HandBrake.Interop.Model.Encoding.Mixdown.None;
-                    audioTrack.Bitrate = 0;
-                }
-
-                this.audioTracks.Add(audioTrack);
-            }
-
-            // It's a Preset, if the TrackNumber is 0, so allow the Automatic Track Selection to run after we've setup the presets audio settings.
-            if (tracks.Count == 0 || tracks[0].ScannedTrack.TrackNumber == 0)
-            {
-                this.AutomaticTrackSelection();
-            }
-
-            // Make sure correct audio encoder is still selected.
-            this.CheckAndFixPassthruCompatibility();
-
-            if (this.AudioListChanged != null)
-                this.AudioListChanged(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// Set the Track list dropdown from the parsed title captured during the scan
-        /// </summary>
-        /// <param name="selectedTitle">The selected title</param>
-        /// <param name="preset">A preset</param>
-        public void SetTrackListAfterTitleChange(Title selectedTitle, Preset preset)
-        {
-            // Reset
-            this.AudioTracks.Clear();
-            this.ScannedTracks.Clear();
-
-            if (selectedTitle.AudioTracks.Count == 0)
-            {    
-                this.ScannedTracks.Add(AudioHelper.NoneFound);
-                this.drp_audioTrack.Refresh();
-                drp_audioTrack.SelectedIndex = 0;
-                return;
-            }
-
-            // Setup the Audio track source dropdown with the new audio tracks.
-            this.drp_audioTrack.SelectedItem = null;
-            foreach (Audio track in selectedTitle.AudioTracks)
-            {
-                this.ScannedTracks.Add(track);
-            }
-
-            drp_audioTrack.SelectedItem = this.ScannedTracks.FirstOrDefault();
-       
-            // Add any tracks the preset has, if there is a preset and no audio tracks in the list currently
-            if (audioList.Rows.Count == 0 && preset != null)
-            {
-                EncodeTask parsed = QueryParserUtility.Parse(preset.Query);
-                foreach (AudioTrack audioTrack in parsed.AudioTracks)
-                {
-                    audioTrack.ScannedTrack = drp_audioTrack.SelectedItem as Audio;
-                    this.audioTracks.Add(audioTrack);
-                }
-            }
-
-            if (selectedTitle.AudioTracks.Count > 0)
-            {
-                this.AutomaticTrackSelection();
-            }
-
-            // Make sure correct audio encoder is still selected.
-            this.CheckAndFixPassthruCompatibility();
-        }
-
-        #endregion
-
-        #region Control and ListView
-
-        /// <summary>
-        /// one of the controls has changed. Event handler
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void ControlChanged(object sender, EventArgs e)
-        {
-            Control ctl = (Control)sender;
-
-            // Some Sanity Checking
-            if (audioList.SelectedRows.Count == 0)
-            {
-                RefreshEnabledControls();
-                return;
-            }
-
-            AudioTrack track = audioList.SelectedRows[0].DataBoundItem as AudioTrack;
-            if (track == null)
-            {
-                return;
-            }
-
-            drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;
-
-            // Handle the changed control and selected audio track.
-            switch (ctl.Name)
-            {
-                case "drp_audioTrack":
-                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0 && drp_audioTrack.SelectedItem != null)
-                    {
-                        track.ScannedTrack = drp_audioTrack.SelectedItem as Audio;
-
-                        // Correct bad passthru option
-                        if (this.IsIncompatiblePassthru(track))
-                        {
-                            AudioEncoder encoder = GetCompatiblePassthru(track, false);
-                            drp_audioEncoder.SelectedItem = EnumHelper<AudioEncoder>.GetDisplay(encoder);
-                        } 
-                    }
-                    break;
-                case "drp_audioEncoder":
-                    SetMixDown(EnumHelper<Mixdown>.GetDisplay(track.MixDown));
-
-                    // Configure the widgets with values
-                    if (drp_audioEncoder.Text.Contains("Passthru"))
-                    {
-                        track.Gain = 0;
-                        track.DRC = 0;
-                    }
-
-                    this.RefreshEnabledControls();
-
-                    if (drp_audioEncoder.Text.Contains("Flac"))
-                    {
-                        drp_audioBitrate.Enabled = false;
-                        track.Bitrate = 0;
-                    }
-
-                    // Update an item in the Audio list if required.
-                    track.Encoder = EnumHelper<AudioEncoder>.GetValue(drp_audioEncoder.Text);
-
-                    // Correct bad passthru option
-                    if (this.IsIncompatiblePassthru(track))
-                    {
-                        AudioEncoder encoder = GetCompatiblePassthru(track, false);
-                        drp_audioEncoder.SelectedItem = EnumHelper<AudioEncoder>.GetDisplay(encoder);
-                    }
-                    break;
-                case "drp_audioMix":
-                    SetBitrate(track.Bitrate);
-
-                    if (drp_audioMix.SelectedItem != null)
-                    {
-                        track.MixDown = EnumHelper<Mixdown>.GetValue(drp_audioMix.Text);
-                    }
-
-                    break;
-                case "drp_audioSample":
-
-                    double samplerate;
-                    double.TryParse(drp_audioSample.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
-                    track.SampleRate = samplerate;
-                    break;
-                case "drp_audioBitrate":
-                    // Update an item in the Audio list if required.
-                    int bitrate;
-                    int.TryParse(drp_audioBitrate.Text, out bitrate);
-
-                    track.Bitrate = bitrate;
-                    break;
-            }
-
-            audioList.Refresh();
-        }
-
-        /// <summary>
-        /// The Audio List selected index changed event handler
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void audioList_SelectionChanged(object sender, EventArgs e)
-        {
-            // Set the dropdown controls based on the selected item in the Audio List.
-            if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)
-            {
-                AudioTrack track = audioList.SelectedRows[0].DataBoundItem as AudioTrack;
-                if (track != null)
-                {
-                    drp_audioTrack.SelectedItem = track.ScannedTrack;
-                    drp_audioEncoder.SelectedItem = EnumHelper<AudioEncoder>.GetDisplay(track.Encoder);
-                    drp_audioMix.SelectedItem = EnumHelper<Mixdown>.GetDisplay(track.MixDown);
-                    drp_audioSample.SelectedItem = track.SampleRateDisplayValue;
-                    drp_audioBitrate.SelectedItem = track.BitRateDisplayValue;
-
-                    // Set the Advanced Control.
-                    if (!advancedAudio.IsDisposed)
-                        advancedAudio.Track = track;
-
-                    this.RefreshEnabledControls();
-                }
-            }
-        }
-
-        #endregion
-
-        #region Track Controls
-
-        /// <summary>
-        /// The Add Audio Track button event handler
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void AddAudioTrack_Click(object sender, EventArgs e)
-        {
-            if (drp_audioTrack.Text == "None Found")
-            {
-                MessageBox.Show(
-                    "Your source appears to have no audio tracks, or no tracks in a format that HandBrake supports.",
-                    "Warning",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Warning);
-                return;
-            }
-
-            // Get Some Values
-            int bitrate;
-            double samplerate;
-
-            int.TryParse(drp_audioBitrate.Text, out bitrate);
-            double.TryParse(drp_audioSample.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
-
-            // Create the Model
-            AudioTrack track = new AudioTrack
-                {
-                    ScannedTrack = this.drp_audioTrack.SelectedItem as Audio,
-                    Encoder = EnumHelper<AudioEncoder>.GetValue(this.drp_audioEncoder.Text),
-                    MixDown = EnumHelper<Mixdown>.GetValue(this.drp_audioMix.Text),
-                    SampleRate = samplerate,
-                    Bitrate = bitrate,
-                    Gain = 0,
-                    DRC = 0,
-                };
-
-            // Force an update of the mixdown control
-            this.SetMixDown(EnumHelper<Mixdown>.GetDisplay(track.MixDown));
-            this.SetBitrate(track.Bitrate);
-
-            this.audioTracks.Add(track);
-
-            // The Audio List has changed to raise the event.
-            if (this.AudioListChanged != null)
-                this.AudioListChanged(this, new EventArgs());
-
-            // Select the newly added track and select the control       
-            audioList.ClearSelection();
-            audioList.Rows[audioList.Rows.Count - 1].Selected = true;
-            audioList.Select();
-        }
-
-        /// <summary>
-        /// Add all the Audio Tracks that are not currently on the Lust
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void mnu_AddAll_Click(object sender, EventArgs e)
-        {
-            if (drp_audioTrack.Text == "None Found")
-            {
-                MessageBox.Show(
-                    "Your source appears to have no audio tracks, or no tracks in a format that HandBrake supports.",
-                    "Warning",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Warning);
-                return;
-            }
-
-            bool trackAdded = false;
-            foreach (Audio sourceTrack in this.ScannedTracks)
-            {
-                // Check if the Track already exists on the list. If it does, skip to the next
-                bool foundTrack = false;
-                foreach (AudioTrack currentTrack in this.AudioTracks)
-                {
-                    if (currentTrack.Track.HasValue && currentTrack.Track.Value == sourceTrack.TrackNumber)
-                    {
-                        // Set a flag to indicate we've found a track
-                        foundTrack = true;
-                        continue;
-                    }
-                }
-
-                if (foundTrack)
-                {
-                    // Skip to the nxet Source Track, We already have this one in the list.
-                    continue;
-                }
-
-                // Create the Model
-                AudioTrack track = new AudioTrack
-                {
-                    ScannedTrack = sourceTrack,
-                };
-
-                this.audioTracks.Add(track);
-                trackAdded = true;
-            }
-
-            // If we added a track, then fire the event
-            if (trackAdded)
-            {
-                // The Audio List has changed to raise the event.
-                if (this.AudioListChanged != null)
-                    this.AudioListChanged(this, new EventArgs());
-            }
-        }
-
-        /// <summary>
-        /// Remove an Audio Track
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void Btn_remove_track_click(object sender, EventArgs e)
-        {
-            RemoveTrack();
-        }
-
-        /// <summary>
-        /// Clear all audio tracks
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void Mnu_clear_all_click(object sender, EventArgs e)
-        {
-            this.ClearAudioList();
-        }
-
-        #endregion
-
-        #region Audio List Menu
-
-        /// <summary>
-        /// The Audio List Move Up menu item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void AudioList_moveup_Click(object sender, EventArgs e)
-        {
-            MoveTrack(true);
-        }
-
-        /// <summary>
-        /// The audio list move down menu item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void AudioList_movedown_Click(object sender, EventArgs e)
-        {
-            MoveTrack(false);
-        }
-
-        /// <summary>
-        /// The audio list remove menu item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void AudioList_remove_Click(object sender, EventArgs e)
-        {
-            RemoveTrack();
-        }
-
-        /// <summary>
-        /// Move to Top
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Event Args</param>
-        private void audioList_MoveToTop_Click(object sender, EventArgs e)
-        {
-            MoveTo(true);
-        }
-
-        /// <summary>
-        /// Move to Bottom
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Event Args</param>
-        private void audioList_MoveToBottom_Click(object sender, EventArgs e)
-        {
-            this.MoveTo(false);
-        }
-
-        #endregion
-
-        #region Private Functions
-
-        /// <summary>
-        /// Refresh the enabled controls
-        /// </summary>
-        private void RefreshEnabledControls()
-        {
-            // Configure the widgets with values
-            if (drp_audioEncoder.Text.Contains("Passthru"))
-            {
-                drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = false;
-            }
-            else
-            {
-                drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;
-            }
-
-            if (drp_audioEncoder.Text.Contains("Flac"))
-            {
-                drp_audioBitrate.Enabled = false;
-            }
-        }
-
-        /// <summary>
-        /// Attempt to automatically select the correct audio tracks based on the users settings.
-        /// </summary>
-        private void AutomaticTrackSelection()
-        {
-            // Sanity check that we have Audio Tracks and if not, clear the track list.
-            if (drp_audioTrack.SelectedItem != null && drp_audioTrack.SelectedItem.ToString() == AudioHelper.NoneFound.Description)
-            {
-                this.AudioTracks.Clear();
-                return;
-            }
-  
-            if (this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) == "Any")
-            {
-                // If we have Any as the preferred Language, just set the first track to all audio tracks.
-                drp_audioTrack.SelectedIndex = 0;
-                foreach (AudioTrack track in this.audioTracks)
-                {
-                    if (this.drp_audioTrack.SelectedItem != null)
-                    {
-                        track.ScannedTrack = this.drp_audioTrack.SelectedItem as Audio;
-                    }
-                }
-
-            } 
-            else
-            { 
-                // Otherwise, set all the tracks to the first track of the preferred language.
-                foreach (Audio item in drp_audioTrack.Items)
-                {
-                    if (item.Language.Contains(this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage)))
-                    {
-                        drp_audioTrack.SelectedItem = item;
-                        break;
-                    }
-                }
-                
-                foreach (AudioTrack track in this.audioTracks)
-                {
-                    if (this.drp_audioTrack.SelectedItem != null)
-                    {
-                        track.ScannedTrack = this.drp_audioTrack.SelectedItem as Audio;
-                    }
-                }
-            }
-
-            // Array with the Index numbers of the prefered and additional languages. 
-            // This allows to have for each language the order in which they appear in the DVD list.
-            Dictionary<String, ArrayList> languageIndex = new Dictionary<String, ArrayList>();
-
-            // Now add any additional Langauges tracks on top of the presets tracks.
-            int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
-            ArrayList languageOrder = new ArrayList();    // This is used to keep the Prefered Language in the front and the other languages in order. TODO this is no longer required, refactor this.
-            if (mode > 1)
-            {
-                foreach (string item in this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
-                {
-                    if (!languageIndex.ContainsKey(item))
-                    {
-                        languageIndex.Add(item, new ArrayList());
-                        languageOrder.Add(item);
-                    }
-                }
-
-                bool elementFound = false;
-                int i = 0;
-                foreach (object item in drp_audioTrack.Items)
-                {
-                    foreach (KeyValuePair<String, ArrayList> kvp in languageIndex)
-                    {
-                        if (item.ToString().Contains(kvp.Key))
-                        {
-                            // Only the first Element if the "Only One Audio"-option is chosen.
-                            if (!this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage) || kvp.Value.Count == 0)
-                            {
-                                kvp.Value.Add(i);
-                            }
-
-                            elementFound = true;
-                        }
-                    }
-
-                    i++;
-                }
-
-                // There are no additional Languages, so we don't need to continue processing.
-                if (!elementFound)
-                {
-                   // return;
-                }
-            }
-
-            switch (mode)
-            {
-                case 1: // Adding all remaining audio tracks
-                    this.mnu_AddAll_Click(this, EventArgs.Empty);
-                    break;   
-                case 2: // Add Langauges tracks for the additional languages selected, in-order.
-                    audioList.ClearSelection();
-                    foreach (string item in languageOrder)
-                    {
-                        if (languageIndex[item].Count > 0)
-                        {
-                            foreach (int i in languageIndex[item])
-                            {
-                                drp_audioTrack.SelectedIndex = i;
-                                if (drp_audioTrack.SelectedItem != null)
-                                {
-                                    Audio track = drp_audioTrack.SelectedItem as Audio;
-                                    if (track != null)
-                                    {
-                                        if (!TrackExists(track))
-                                        {
-                                            this.AddAudioTrack_Click(this, EventArgs.Empty);
-                                            audioList.ClearSelection();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Clear the audio list
-        /// </summary>
-        private void ClearAudioList()
-        {
-            this.AudioTracks.Clear();
-
-            //drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;
-
-            if (this.AudioListChanged != null)
-                this.AudioListChanged(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// Remove an audio track from the list
-        /// </summary>
-        private void RemoveTrack()
-        {
-            // Remove the Item and reselect the control if the following conditions are met.
-            if (audioList.SelectedRows.Count != 0)
-            {
-                // The Audio List is about to change so raise the event.
-                if (this.AudioListChanged != null)
-                    this.AudioListChanged(this, new EventArgs());
-
-                // Record the current selected index.
-                int currentPosition = audioList.SelectedRows[0].Index;
-
-                audioList.Rows.Remove(audioList.SelectedRows[0]);
-
-                // Now reslect the correct item and give focus to the audio list.
-                if (audioList.Rows.Count != 0)
-                {
-                    audioList.ClearSelection();
-                    if (currentPosition <= (audioList.Rows.Count - 1))
-                        audioList.Rows[currentPosition].Selected = true;
-                    else if (currentPosition > (audioList.Rows.Count - 1))
-                        audioList.Rows[audioList.Rows.Count - 1].Selected = true;
-
-                    audioList.Select();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Move an audio track up or down the audio list
-        /// </summary>
-        /// <param name="up">
-        /// The up.
-        /// </param>
-        private void MoveTrack(bool up)
-        {
-            if (audioList.SelectedRows.Count == 0) return;
-
-            DataGridViewRow item = audioList.SelectedRows[0];
-            AudioTrack track = item.DataBoundItem as AudioTrack;
-            int index = item.Index;
-
-            if (up) index--;
-            else index++;
-
-            if (index < audioList.Rows.Count || (audioList.Rows.Count > index && index >= 0))
-            {
-                this.AudioTracks.Remove(track);
-                this.audioTracks.Insert(index, track);
-                this.audioList.ClearSelection();
-                this.audioList.Rows[index].Selected = true;
-            }
-        }
-
-        /// <summary>
-        /// Move to
-        /// </summary>
-        /// <param name="top">
-        /// The top.
-        /// </param>
-        private void MoveTo(bool top)
-        {
-            if (audioList.SelectedRows.Count == 0) return;
-
-            DataGridViewRow item = audioList.SelectedRows[0];
-            AudioTrack track = item.DataBoundItem as AudioTrack;
-            int index = item.Index;
-
-            if (top) index = 0;
-            else index = this.audioList.Rows.Count - 1;
-
-            if (index < audioList.Rows.Count || (audioList.Rows.Count > index && index >= 0))
-            {
-                this.AudioTracks.Remove(track);
-                this.audioTracks.Insert(index, track);
-                this.audioList.ClearSelection();
-                this.audioList.Rows[index].Selected = true;
-            }
-        }
-
-        /// <summary>
-        /// Set the bitrate dropdown
-        /// </summary>
-        /// <param name="currentValue">
-        /// The current Value.
-        /// </param>
-        private void SetBitrate(int currentValue)
-        {
-            int max = 0;
-            string defaultRate = "160";
-
-            // Remove defaults
-            drp_audioBitrate.Items.Remove("Auto");         
-            drp_audioBitrate.Items.Remove("192");
-            drp_audioBitrate.Items.Remove("224");
-            drp_audioBitrate.Items.Remove("256");
-            drp_audioBitrate.Items.Remove("320");
-            drp_audioBitrate.Items.Remove("384");
-            drp_audioBitrate.Items.Remove("448");
-            drp_audioBitrate.Items.Remove("640");
-            drp_audioBitrate.Items.Remove("768");
-            drp_audioBitrate.Items.Remove("0");
-
-            // Find Max and Defaults based on encoders
-            switch (drp_audioEncoder.Text)
-            {
-                case "AAC (faac)":
-                case "AAC (ffmpeg)":
-                    max = drp_audioMix.Text.Contains("6-channel") ? 768 : 320;
-                    defaultRate = "160";
-                    break;
-                case "MP3 (lame)":
-                    max = 320;
-                    defaultRate = "160";
-                    break;
-                case "Vorbis (vorbis)":
-                    defaultRate = "160";
-                    max = 384;
-                    break;
-                case "AC3 (ffmpeg)":
-                    defaultRate = "640";
-                    max = 640;
-                    break;
-                case "Flac (ffmpeg)":
-                    defaultRate = "0";
-                    drp_audioBitrate.Items.Add("0");
-                    max = 0;
-                    break;
-            }
-
-            if (drp_audioEncoder.Text.Contains("Passthru"))
-            {
-                drp_audioBitrate.Items.Add("Auto");
-                defaultRate = "Auto";
-                drp_audioSample.SelectedItem = "Auto";
-            }
-
-            // Re-add appropiate options
-            if (max > 160)
-            {
-                drp_audioBitrate.Items.Add("192");
-                drp_audioBitrate.Items.Add("224");
-                drp_audioBitrate.Items.Add("256");
-                drp_audioBitrate.Items.Add("320");
-            }
-
-            if (max > 320)
-            {
-                drp_audioBitrate.Items.Add("384");
-            }
-
-            if (max >= 640)
-            {
-                drp_audioBitrate.Items.Add("448");
-                drp_audioBitrate.Items.Add("640");
-            }
-
-            if (max == 768)
-            {
-                drp_audioBitrate.Items.Add("768");
-            }
-
-            // Set the Current Value, or default value if the value is out of bounds
-
-            if (currentValue <= max && currentValue != 0)
-            {
-                drp_audioBitrate.SelectedItem = currentValue.ToString();
-            }
-            else
-            {
-                drp_audioBitrate.SelectedItem = defaultRate;
-            }
-        }
-
-        /// <summary>
-        /// Set the mixdown dropdown
-        /// </summary>
-        /// <param name="currentMixdown">
-        /// The current Mixdown.
-        /// </param>
-        private void SetMixDown(string currentMixdown)
-        {
-            drp_audioMix.Items.Clear();
-            drp_audioMix.Items.Add("Mono");
-            drp_audioMix.Items.Add("Stereo");
-            drp_audioMix.Items.Add("Dolby Surround");
-            drp_audioMix.Items.Add("Dolby Pro Logic II");
-            drp_audioMix.Items.Add("6-channel discrete");
-            drp_audioMix.Items.Add(None);
-
-            switch (drp_audioEncoder.Text)
-            {
-                case "AAC (faac)":
-                case "AAC (ffmpeg)":
-                    drp_audioMix.Items.Remove(None);
-                    drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
-                    break;
-                case "MP3 (lame)":
-                    drp_audioMix.Items.Remove("6-channel discrete");
-                    drp_audioMix.Items.Remove(None);
-                    drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
-                    break;
-                case "Vorbis (vorbis)":
-                    drp_audioMix.Items.Remove(None);
-                    drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
-                    break;
-                case "AC3 (ffmpeg)":
-                    drp_audioMix.Items.Remove(None);
-                    drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
-                    break;
-                case "AC3 Passthru":
-                case "DTS Passthru":
-                case "DTS-HD Passthru":
-                case "AAC Passthru":
-                case "MP3 Passthru":
-                case "Auto Passthru":
-                    drp_audioMix.SelectedItem = None;
-                    break;
-            }
-
-            if (drp_audioMix.SelectedItem == null)
-            {
-                drp_audioMix.SelectedItem = "Dolby Pro Logic II";
-            }
-        }
-
-        /// <summary>
-        /// Check if a track already exists
-        /// </summary>
-        /// <param name="sourceTrack">
-        /// The source track.
-        /// </param>
-        /// <returns>
-        /// True if it does
-        /// </returns>
-        private bool TrackExists(Audio sourceTrack)
-        {
-            foreach (AudioTrack currentTrack in this.AudioTracks)
-            {
-                if (currentTrack.Track.HasValue && currentTrack.Track.Value == sourceTrack.TrackNumber)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// For a given Audio Track, is the chosen Passthru option supported
-        /// </summary>
-        /// <param name="track">
-        /// The track.
-        /// </param>
-        /// <returns>
-        /// True if it is.
-        /// </returns>
-        private bool IsIncompatiblePassthru(AudioTrack track)
-        {
-            if (track.ScannedTrack == null || string.IsNullOrEmpty(track.ScannedTrack.Format))
-            {
-                return false;
-            }
-
-
-            // If the track isn't AC3, and the encoder is, change it.
-            if (track.Encoder == AudioEncoder.Ac3Passthrough && !track.ScannedTrack.Format.Contains("AC3"))
-            {
-                return true;
-            }
-
-            // If the track isn't DTS, and the encoder is, change it.
-            if (track.Encoder == AudioEncoder.DtsPassthrough || track.Encoder == AudioEncoder.DtsHDPassthrough 
-                && !track.ScannedTrack.Format.Contains("DTS"))
-            {
-                return true;
-            }
-
-            // If the track isn't AAC, and the encoder is, change it.
-            if (track.Encoder == AudioEncoder.AacPassthru && !track.ScannedTrack.Format.Contains("aac"))
-            {
-                return true;
-            }
-
-            // If the track isn't MP3, and the encoder is, change it.
-            if (track.Encoder == AudioEncoder.Mp3Passthru && !track.ScannedTrack.Format.Contains("mp3"))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Get a compatible passthru, or default to aac.
-        /// </summary>
-        /// <param name="track">
-        /// The track.
-        /// </param>
-        /// <param name="useAutoPassthruOptions">
-        /// The use Auto Passthru Options.
-        /// </param>
-        /// <returns>
-        /// AN Audio encoder.
-        /// </returns>
-        private AudioEncoder GetCompatiblePassthru(AudioTrack track, bool useAutoPassthruOptions)
-        {
-            if (useAutoPassthruOptions)
-            {
-                if (track.ScannedTrack.Format.Contains("AC3") && this.check_ac3.Checked)
-                {
-                    return AudioEncoder.Ac3Passthrough;
-                }
-
-                if (track.ScannedTrack.Format.Contains("DTS") && this.check_dts.Checked)
-                {
-                    return AudioEncoder.DtsPassthrough;
-                }
-
-                if (track.ScannedTrack.Format.Contains("DTS-HD") && this.check_dtshd.Checked)
-                {
-                    return AudioEncoder.DtsPassthrough;
-                }
-
-                if (track.ScannedTrack.Format.Contains("aac") && this.check_aac.Checked)
-                {
-                    return AudioEncoder.AacPassthru;
-                }
-
-                if (track.ScannedTrack.Format.Contains("mp3") && this.check_mp3.Checked)
-                {
-                    return AudioEncoder.Mp3Passthru;
-                }
-            }
-            else
-            {
-                if (track.ScannedTrack.Format.Contains("AC3"))
-                {
-                    return AudioEncoder.Ac3Passthrough;
-                }
-
-                if (track.ScannedTrack.Format.Contains("DTS"))
-                {
-                    return AudioEncoder.DtsPassthrough;
-                }
-
-                if (track.ScannedTrack.Format.Contains("DTS-HD"))
-                {
-                    return AudioEncoder.DtsPassthrough;
-                }
-
-                if (track.ScannedTrack.Format.Contains("aac"))
-                {
-                    return AudioEncoder.AacPassthru;
-                }
-
-                if (track.ScannedTrack.Format.Contains("mp3"))
-                {
-                    return AudioEncoder.Mp3Passthru;
-                }
-            }
-
-            return EnumHelper<AudioEncoder>.GetValue(drp_passthruFallback.SelectedItem.ToString()); 
-        }
-
-        /// <summary>
-        /// Fix any invalid passthru problems.
-        /// </summary>
-        private void CheckAndFixPassthruCompatibility()
-        {
-            // Make sure correct audio encoder is still selected.
-            foreach (AudioTrack track in this.audioTracks)
-            {
-                if (this.IsIncompatiblePassthru(track))
-                {
-                    track.Encoder = GetCompatiblePassthru(track, true);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Setup the Passthru Settings Panel
-        /// </summary>
-        /// <param name="settings">
-        /// The settings.
-        /// </param>
-        private void SetPassthruSettings(AllowedPassthru settings)
-        {
-            if (settings == null)
-            {
-                settings = this.PassthruSettings;
-            }
-
-            this.check_aac.Checked = settings.AudioAllowAACPass;
-            this.check_mp3.Checked = settings.AudioAllowMP3Pass;
-            this.check_ac3.Checked = settings.AudioAllowAC3Pass;
-            this.check_dts.Checked = settings.AudioAllowDTSPass;
-            this.check_dtshd.Checked = settings.AudioAllowDTSHDPass;
-            this.drp_passthruFallback.SelectedItem = EnumHelper<AudioEncoder>.GetDisplay(settings.AudioEncoderFallback); 
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Open the Advanced Audio Settings UI
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_AdvancedAudio_Click(object sender, EventArgs e)
-        {
-            if (audioList.SelectedRows.Count == 0)
-            {
-                MessageBox.Show(
-                    "Please select an audio track.", "No Track Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-
-            if (advancedAudio.IsDisposed)
-            {
-                advancedAudio = new AdvancedAudio { Track = this.audioList.SelectedRows[0].DataBoundItem as AudioTrack };
-            }
-
-            advancedAudio.Show();
-        }
-
-        /// <summary>
-        /// Handle changes in the Checked Passthru Options
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void autoPassthru_CheckedChanged(object sender, EventArgs e)
-        {
-            if (sender == this.check_mp3)
-            {
-                this.PassthruSettings.AudioAllowMP3Pass = this.check_mp3.Checked;
-            }
-
-            if (sender == this.check_aac)
-            {
-                this.PassthruSettings.AudioAllowAACPass = this.check_aac.Checked;
-            }
-
-            if (sender == this.check_ac3)
-            {
-                this.PassthruSettings.AudioAllowAC3Pass = this.check_ac3.Checked;
-            }
-
-            if (sender == this.check_dts)
-            {
-                this.PassthruSettings.AudioAllowDTSPass = this.check_dts.Checked;
-            }
-
-            if (sender == this.check_dtshd)
-            {
-                this.PassthruSettings.AudioAllowDTSHDPass = this.check_dtshd.Checked;
-            }
-        }
-
-        /// <summary>
-        /// Set the fallback encoder
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void drp_passthruFallback_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.PassthruSettings.AudioEncoderFallback =
-                EnumHelper<AudioEncoder>.GetValue(drp_passthruFallback.SelectedItem.ToString());
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/AudioPanel.resx Deleted

@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="audioMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>216, 16</value>
-  </metadata>
-  <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>330, 16</value>
-  </metadata>
-  <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>35, 17</value>
-  </metadata>
-  <metadata name="Source.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="AudioCodec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Mixdown.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Samplerate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Bitrate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DRC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Gain.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="audioList.ToolTip" xml:space="preserve">
-    <value>The audio tracks to be encoded into the output file.
-
-Note: When a track is selected on this grid, the dropdown controls above will alter the selected track.
-
-If you want to add multiple tracks, you can hit the add button several times, then select each track
-and alter its settings after adding them.</value>
-  </data>
-  <data name="gb_autoPassthru.ToolTip" xml:space="preserve">
-    <value>Controls the behaviour of the Audio Codec dropdown when passthru options are selected.
-
-When an incorrect passthru option is selected, it will try to fall back to the correct one if the
-format checkbox in the "Auto Passthru" section is checked.
-
-If there is no suitable passthru option, it will use the "Fallkback" encoder.
-
-These settings are global to all Audio Tracks.
-These settings are stored in the presets.</value>
-  </data>
-  <metadata name="AddTrackMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>427, 16</value>
-  </metadata>
-  <metadata name="RemoveTrackMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>561, 16</value>
-  </metadata>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/Filters.Designer.cs Deleted

@@ -1,341 +0,0 @@
-namespace Handbrake.Controls
-{
-    partial class Filters
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #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.text_customDT = new System.Windows.Forms.TextBox();
-            this.label18 = new System.Windows.Forms.Label();
-            this.drop_detelecine = new System.Windows.Forms.ComboBox();
-            this.text_customDC = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.drop_decomb = new System.Windows.Forms.ComboBox();
-            this.text_customDI = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.drop_deinterlace = new System.Windows.Forms.ComboBox();
-            this.text_customDN = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.drop_denoise = new System.Windows.Forms.ComboBox();
-            this.slider_deblock = new System.Windows.Forms.TrackBar();
-            this.check_grayscale = new System.Windows.Forms.CheckBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.lbl_deblockVal = new System.Windows.Forms.Label();
-            this.label68 = new System.Windows.Forms.Label();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // text_customDT
-            // 
-            this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.text_customDT.Location = new System.Drawing.Point(251, 3);
-            this.text_customDT.Name = "text_customDT";
-            this.text_customDT.Size = new System.Drawing.Size(115, 21);
-            this.text_customDT.TabIndex = 47;
-            this.text_customDT.Visible = false;
-            // 
-            // label18
-            // 
-            this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label18.AutoSize = true;
-            this.label18.BackColor = System.Drawing.Color.Transparent;
-            this.label18.Location = new System.Drawing.Point(0, 7);
-            this.label18.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(61, 13);
-            this.label18.TabIndex = 46;
-            this.label18.Text = "Detelecine:";
-            // 
-            // drop_detelecine
-            // 
-            this.drop_detelecine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_detelecine.FormattingEnabled = true;
-            this.drop_detelecine.Items.AddRange(new object[] {
-            "Off",
-            "Custom",
-            "Default"});
-            this.drop_detelecine.Location = new System.Drawing.Point(71, 3);
-            this.drop_detelecine.Name = "drop_detelecine";
-            this.drop_detelecine.Size = new System.Drawing.Size(174, 21);
-            this.drop_detelecine.TabIndex = 45;
-            this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.DropDetelecineSelectedIndexChanged);
-            // 
-            // text_customDC
-            // 
-            this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.text_customDC.Location = new System.Drawing.Point(251, 30);
-            this.text_customDC.Name = "text_customDC";
-            this.text_customDC.Size = new System.Drawing.Size(115, 21);
-            this.text_customDC.TabIndex = 50;
-            this.text_customDC.Visible = false;
-            // 
-            // label1
-            // 
-            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label1.AutoSize = true;
-            this.label1.BackColor = System.Drawing.Color.Transparent;
-            this.label1.Location = new System.Drawing.Point(0, 34);
-            this.label1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(49, 13);
-            this.label1.TabIndex = 49;
-            this.label1.Text = "Decomb:";
-            // 
-            // drop_decomb
-            // 
-            this.drop_decomb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_decomb.FormattingEnabled = true;
-            this.drop_decomb.Items.AddRange(new object[] {
-            "Off",
-            "Custom",
-            "Default",
-            "Fast"});
-            this.drop_decomb.Location = new System.Drawing.Point(71, 30);
-            this.drop_decomb.Name = "drop_decomb";
-            this.drop_decomb.Size = new System.Drawing.Size(174, 21);
-            this.drop_decomb.TabIndex = 48;
-            this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.DropDecombSelectedIndexChanged);
-            // 
-            // text_customDI
-            // 
-            this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.text_customDI.Location = new System.Drawing.Point(251, 57);
-            this.text_customDI.Name = "text_customDI";
-            this.text_customDI.Size = new System.Drawing.Size(115, 21);
-            this.text_customDI.TabIndex = 53;
-            this.text_customDI.Visible = false;
-            // 
-            // label2
-            // 
-            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label2.AutoSize = true;
-            this.label2.BackColor = System.Drawing.Color.Transparent;
-            this.label2.Location = new System.Drawing.Point(0, 61);
-            this.label2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(65, 13);
-            this.label2.TabIndex = 52;
-            this.label2.Text = "Deinterlace:";
-            // 
-            // drop_deinterlace
-            // 
-            this.drop_deinterlace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_deinterlace.FormattingEnabled = true;
-            this.drop_deinterlace.Items.AddRange(new object[] {
-            "Off",
-            "Custom",
-            "Fast",
-            "Slow",
-            "Slower"});
-            this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);
-            this.drop_deinterlace.Name = "drop_deinterlace";
-            this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);
-            this.drop_deinterlace.TabIndex = 51;
-            this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.DropDeinterlaceSelectedIndexChanged);
-            // 
-            // text_customDN
-            // 
-            this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.text_customDN.Location = new System.Drawing.Point(251, 84);
-            this.text_customDN.Name = "text_customDN";
-            this.text_customDN.Size = new System.Drawing.Size(115, 21);
-            this.text_customDN.TabIndex = 56;
-            this.text_customDN.Visible = false;
-            // 
-            // label3
-            // 
-            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label3.AutoSize = true;
-            this.label3.BackColor = System.Drawing.Color.Transparent;
-            this.label3.Location = new System.Drawing.Point(0, 88);
-            this.label3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(49, 13);
-            this.label3.TabIndex = 55;
-            this.label3.Text = "Denoise:";
-            // 
-            // drop_denoise
-            // 
-            this.drop_denoise.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_denoise.FormattingEnabled = true;
-            this.drop_denoise.Items.AddRange(new object[] {
-            "Off",
-            "Custom",
-            "Weak",
-            "Medium",
-            "Strong"});
-            this.drop_denoise.Location = new System.Drawing.Point(71, 84);
-            this.drop_denoise.Name = "drop_denoise";
-            this.drop_denoise.Size = new System.Drawing.Size(174, 21);
-            this.drop_denoise.TabIndex = 54;
-            this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.DropDenoiseSelectedIndexChanged);
-            // 
-            // slider_deblock
-            // 
-            this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;
-            this.slider_deblock.Location = new System.Drawing.Point(71, 111);
-            this.slider_deblock.Maximum = 15;
-            this.slider_deblock.Minimum = 4;
-            this.slider_deblock.Name = "slider_deblock";
-            this.slider_deblock.Size = new System.Drawing.Size(174, 45);
-            this.slider_deblock.TabIndex = 58;
-            this.slider_deblock.Value = 4;
-            this.slider_deblock.Scroll += new System.EventHandler(this.SliderDeblockScroll);
-            // 
-            // check_grayscale
-            // 
-            this.check_grayscale.AutoSize = true;
-            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;
-            this.check_grayscale.Location = new System.Drawing.Point(71, 162);
-            this.check_grayscale.Name = "check_grayscale";
-            this.check_grayscale.Size = new System.Drawing.Size(119, 17);
-            this.check_grayscale.TabIndex = 57;
-            this.check_grayscale.Text = "Grayscale Encoding";
-            this.check_grayscale.UseVisualStyleBackColor = false;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.BackColor = System.Drawing.Color.Transparent;
-            this.label8.Location = new System.Drawing.Point(0, 115);
-            this.label8.Margin = new System.Windows.Forms.Padding(0, 7, 3, 3);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(48, 13);
-            this.label8.TabIndex = 60;
-            this.label8.Text = "Deblock:";
-            // 
-            // lbl_deblockVal
-            // 
-            this.lbl_deblockVal.AutoSize = true;
-            this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_deblockVal.Location = new System.Drawing.Point(251, 115);
-            this.lbl_deblockVal.Margin = new System.Windows.Forms.Padding(3, 7, 3, 3);
-            this.lbl_deblockVal.Name = "lbl_deblockVal";
-            this.lbl_deblockVal.Size = new System.Drawing.Size(23, 13);
-            this.lbl_deblockVal.TabIndex = 59;
-            this.lbl_deblockVal.Text = "Off";
-            // 
-            // label68
-            // 
-            this.label68.AutoSize = true;
-            this.label68.BackColor = System.Drawing.Color.Transparent;
-            this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label68.Location = new System.Drawing.Point(13, 13);
-            this.label68.Name = "label68";
-            this.label68.Size = new System.Drawing.Size(42, 13);
-            this.label68.TabIndex = 61;
-            this.label68.Text = "Filters";
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSize = true;
-            this.tableLayoutPanel1.ColumnCount = 3;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.label18, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_deblockVal, 2, 4);
-            this.tableLayoutPanel1.Controls.Add(this.check_grayscale, 1, 5);
-            this.tableLayoutPanel1.Controls.Add(this.text_customDN, 2, 3);
-            this.tableLayoutPanel1.Controls.Add(this.slider_deblock, 1, 4);
-            this.tableLayoutPanel1.Controls.Add(this.text_customDI, 2, 2);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.text_customDC, 2, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.text_customDT, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label8, 0, 4);
-            this.tableLayoutPanel1.Controls.Add(this.drop_detelecine, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.drop_denoise, 1, 3);
-            this.tableLayoutPanel1.Controls.Add(this.drop_decomb, 1, 1);
-            this.tableLayoutPanel1.Controls.Add(this.drop_deinterlace, 1, 2);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(19, 29);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 6;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(369, 182);
-            this.tableLayoutPanel1.TabIndex = 62;
-            // 
-            // Filters
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Controls.Add(this.label68);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Name = "Filters";
-            this.Size = new System.Drawing.Size(592, 270);
-            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox text_customDT;
-        private System.Windows.Forms.Label label18;
-        internal System.Windows.Forms.ComboBox drop_detelecine;
-        private System.Windows.Forms.TextBox text_customDC;
-        internal System.Windows.Forms.Label label1;
-        internal System.Windows.Forms.ComboBox drop_decomb;
-        private System.Windows.Forms.TextBox text_customDI;
-        internal System.Windows.Forms.Label label2;
-        internal System.Windows.Forms.ComboBox drop_deinterlace;
-        private System.Windows.Forms.TextBox text_customDN;
-        internal System.Windows.Forms.Label label3;
-        internal System.Windows.Forms.ComboBox drop_denoise;
-        internal System.Windows.Forms.TrackBar slider_deblock;
-        internal System.Windows.Forms.CheckBox check_grayscale;
-        internal System.Windows.Forms.Label label8;
-        internal System.Windows.Forms.Label lbl_deblockVal;
-        internal System.Windows.Forms.Label label68;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/Controls/Filters.cs Deleted

@@ -1,458 +0,0 @@
-/*  Filters.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    using System;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices.Functions;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.Interop.Model.Encoding;
-
-    /// <summary>
-    /// The Filters Panel
-    /// </summary>
-    public partial class Filters : UserControl
-    {
-        /// <summary>
-        /// The Filter settings have changed
-        /// </summary>
-        public event EventHandler FilterSettingsChanged;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Filters"/> class. 
-        /// Creates a new instance of Filters
-        /// </summary>
-        public Filters()
-        {
-            InitializeComponent();
-            drop_decomb.SelectedIndex = 0;
-            drop_deinterlace.SelectedIndex = 0;
-            drop_denoise.SelectedIndex = 0;
-            drop_detelecine.SelectedIndex = 0;
-        }
-
-        #region Properties
-
-        /// <summary>
-        /// Gets Decomb.
-        /// </summary>
-        public Decomb Decomb
-        {
-            get
-            {
-                return EnumHelper<Decomb>.GetValue(drop_decomb.Text);
-            }
-        }
-
-        /// <summary>
-        /// Gets CustomDecombValue.
-        /// </summary>
-        public string CustomDecombValue
-        {
-            get
-            {
-                return text_customDC.Text;
-            }
-        }
-
-        /// <summary>
-        /// Gets Deinterlace.
-        /// </summary>
-        public Deinterlace Deinterlace
-        {
-            get
-            {
-                return EnumHelper<Deinterlace>.GetValue(drop_deinterlace.Text);
-            }
-        }
-
-        /// <summary>
-        /// Gets CustomDeInterlaceValue.
-        /// </summary>
-        public string CustomDeInterlaceValue
-        {
-            get
-            {
-                return text_customDI.Text;
-            }
-        }
-
-        /// <summary>
-        /// Gets Detelecine.
-        /// </summary>
-        public Detelecine Detelecine
-        {
-            get
-            {
-                return EnumHelper<Detelecine>.GetValue(drop_detelecine.Text);
-            }
-        }
-
-        /// <summary>
-        /// Gets CustomDeTelecineValue.
-        /// </summary>
-        public string CustomDeTelecineValue
-        {
-            get
-            {
-                return text_customDT.Text;
-            }
-        }
-
-        /// <summary>
-        /// Gets Denoise.
-        /// </summary>
-        public Denoise Denoise
-        {
-            get
-            {
-                return EnumHelper<Denoise>.GetValue(drop_denoise.Text);
-            }
-        }
-
-        /// <summary>
-        /// Gets CustomDenoiseValue.
-        /// </summary>
-        public string CustomDenoiseValue 
-        {
-            get
-            {
-                return text_customDN.Text;
-            }
-        }
-
-        /// <summary>
-        /// Gets Deblock.
-        /// </summary>
-        public int Deblock
-        {
-            get
-            {
-                return this.slider_deblock.Value != 4 ? this.slider_deblock.Value : 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether GrayScale.
-        /// </summary>
-        public bool GrayScale
-        {
-            get
-            {
-                return check_grayscale.Checked;
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Gets the CLI query for the query generator.
-        /// </summary>
-        public string GetCliQuery
-        {
-            get
-            {
-                string query = string.Empty;
-
-                switch (drop_detelecine.Text) // DeTelecine
-                {
-                    case "Off":
-                        query += string.Empty;
-                        break;
-                    case "Default":
-                        query += " --detelecine";
-                        break;
-                    case "Custom":
-                        query += " --detelecine=\"" + text_customDT.Text + "\"";
-                        break;
-                    default:
-                        query += string.Empty;
-                        break;
-                }
-
-                switch (drop_decomb.Text) // Decomb
-                {
-                    case "Off":
-                        query += string.Empty;
-                        break;
-                    case "Default":
-                        query += " --decomb";
-                        break;
-                    case "Custom":
-                        query += " --decomb=\"" + text_customDC.Text + "\"";
-                        break;
-                    case "Fast":
-                        query += " --decomb=\"7:2:6:9:1:80\"";
-                        break;
-                    default:
-                        query += string.Empty;
-                        break;
-                }
-
-                switch (drop_deinterlace.Text) // DeInterlace
-                {
-                    case "None":
-                        query += string.Empty;
-                        break;
-                    case "Fast":
-                        query += " --deinterlace=\"fast\"";
-                        break;
-                    case "Slow":
-                        query += " --deinterlace=\"slow\"";
-                        break;
-                    case "Slower":
-                        query += " --deinterlace=\"slower\"";
-                        break;
-                    case "Custom":
-                        query += " --deinterlace=\"" + text_customDI.Text + "\"";
-                        break;
-                    default:
-                        query += string.Empty;
-                        break;
-                }
-
-                switch (drop_denoise.Text) // Denoise
-                {
-                    case "None":
-                        query += string.Empty;
-                        break;
-                    case "Weak":
-                        query += " --denoise=\"weak\"";
-                        break;
-                    case "Medium":
-                        query += " --denoise=\"medium\"";
-                        break;
-                    case "Strong":
-                        query += " --denoise=\"strong\"";
-                        break;
-                    case "Custom":
-                        query += " --denoise=\"" + text_customDN.Text + "\"";
-                        break;
-                    default:
-                        query += string.Empty;
-                        break;
-                }
-
-                if (slider_deblock.Value != 4)
-                    query += " --deblock=" + slider_deblock.Value;
-
-                if (check_grayscale.Checked)
-                    query += " -g ";
-
-                return query;
-            }
-        }
-
-        /// <summary>
-        /// Set the Detelecine control
-        /// </summary>
-        /// <param name="value">
-        /// The value part of the CLI string
-        /// </param>
-        /// <param name="custom">
-        /// The Custom Detelecine setting
-        /// </param>
-        public void SetDeTelecine(Detelecine value, string custom)
-        {
-            text_customDT.Text = string.Empty;
-            text_customDT.Visible = false;
-            switch (value)
-            {
-                case Detelecine.Off:
-                    drop_detelecine.SelectedIndex = 0;
-                    break;
-                case Detelecine.Default:
-                    drop_detelecine.SelectedIndex = 2;
-                    break;
-                default:
-                    drop_detelecine.SelectedIndex = 1;
-                    text_customDT.Text = custom;
-                    text_customDT.Visible = true;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Set the Denoise control
-        /// </summary>
-        /// <param name="value">
-        /// The value part of the CLI string
-        /// </param>
-        /// <param name="custom">
-        /// The custom denoise setting.
-        /// </param>
-        public void SetDeNoise(Denoise value, string custom)
-        {
-            text_customDN.Text = string.Empty;
-            text_customDN.Visible = false;
-            switch (value)
-            {
-                case Denoise.Off:
-                    drop_denoise.SelectedIndex = 0;
-                    break;
-                case Denoise.Weak:
-                    drop_denoise.SelectedIndex = 2;
-                    break;
-                case Denoise.Medium:
-                    drop_denoise.SelectedIndex = 3;
-                    break;
-                case Denoise.Strong:
-                    drop_denoise.SelectedIndex = 4;
-                    break;
-                default:
-                    drop_denoise.SelectedIndex = 1;
-                    text_customDN.Text = custom;
-                    text_customDN.Visible = true;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Set the Deinterlace Control
-        /// </summary>
-        /// <param name="value">
-        /// The value part of the CLI string
-        /// </param>
-        /// <param name="custom">
-        /// The Custom Detinerlace Settings
-        /// </param>
-        public void SetDeInterlace(Deinterlace value, string custom)
-        {
-            text_customDI.Text = string.Empty;
-            text_customDI.Visible = false;
-            switch (value)
-            {
-                case Deinterlace.Off:
-                    drop_deinterlace.SelectedIndex = 0;
-                    break;
-                case Deinterlace.Fast:
-                    drop_deinterlace.SelectedIndex = 2;
-                    break;
-                case Deinterlace.Slow:
-                    drop_deinterlace.SelectedIndex = 3;
-                    break;
-                case Deinterlace.Slower:
-                    drop_deinterlace.SelectedIndex = 4;
-
-                    break;
-                default:
-                    drop_deinterlace.SelectedIndex = 1;
-                    text_customDI.Text = custom;
-                    text_customDI.Visible = true;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Set the Decomb Control
-        /// </summary>
-        /// <param name="value">
-        /// The value part of the CLI string
-        /// </param>
-        /// <param name="custom">
-        /// The custom option string
-        /// </param>
-        public void SetDecomb(Decomb value, string custom)
-        {
-            text_customDC.Text = string.Empty;
-            text_customDC.Visible = false;
-            switch (value)
-            {
-                case Decomb.Off:
-                    drop_decomb.SelectedIndex = 0;
-                    break;
-                case Decomb.Default:
-                    drop_decomb.SelectedIndex = 2;
-                    break;
-                case Decomb.Fast:
-                    drop_decomb.SelectedIndex = 3;
-                    break;
-                default:
-                    drop_decomb.SelectedIndex = 1;
-                    text_customDC.Text = custom;
-                    text_customDC.Visible = true;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Set the Deblock Control
-        /// </summary>
-        /// <param name="value">The deblock value</param>
-        public void SetDeBlock(int value)
-        {
-            if (value != 0)
-            {
-                slider_deblock.Value = value;
-                lbl_deblockVal.Text = value.ToString();
-            }
-            else
-            {
-                slider_deblock.Value = 4;
-                lbl_deblockVal.Text = "Off";
-            }
-        }
-
-        /// <summary>
-        /// Set the grayscale control
-        /// </summary>
-        /// <param name="value">Boolean value</param>
-        public void SetGrayScale(bool value)
-        {
-            check_grayscale.CheckState = value ? CheckState.Checked : CheckState.Unchecked;
-        }
-
-        // Controls
-        private void DropDetelecineSelectedIndexChanged(object sender, EventArgs e)
-        {
-            text_customDT.Visible = drop_detelecine.Text == "Custom";
-            // A Filter has changed so raise a FilterSettingsChanged event.
-            if (this.FilterSettingsChanged != null)
-                this.FilterSettingsChanged(this, new EventArgs());
-        }
-
-        private void DropDecombSelectedIndexChanged(object sender, EventArgs e)
-        {
-            text_customDC.Visible = drop_decomb.Text == "Custom";
-            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)
-                drop_deinterlace.SelectedIndex = 0;
-
-            // A Filter has changed so raise a FilterSettingsChanged event.
-            if (this.FilterSettingsChanged != null)
-                this.FilterSettingsChanged(this, new EventArgs());
-        }
-
-        private void DropDeinterlaceSelectedIndexChanged(object sender, EventArgs e)
-        {
-            text_customDI.Visible = drop_deinterlace.Text == "Custom";
-            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)
-                drop_decomb.SelectedIndex = 0;
-
-            // A Filter has changed so raise a FilterSettingsChanged event.
-            if (this.FilterSettingsChanged != null)
-                this.FilterSettingsChanged(this, new EventArgs());
-        }
-
-        private void DropDenoiseSelectedIndexChanged(object sender, EventArgs e)
-        {
-            text_customDN.Visible = drop_denoise.Text == "Custom";
-
-            // A Filter has changed so raise a FilterSettingsChanged event.
-            if (this.FilterSettingsChanged != null)
-                this.FilterSettingsChanged(this, new EventArgs());
-        }
-
-        private void SliderDeblockScroll(object sender, EventArgs e)
-        {
-            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();
-
-            // A Filter has changed so raise a FilterSettingsChanged event.
-            if (this.FilterSettingsChanged != null)
-                this.FilterSettingsChanged(this, new EventArgs());
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/Filters.resx Deleted

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/PictureSettings.Designer.cs Deleted

@@ -1,688 +0,0 @@
-namespace Handbrake.Controls
-{
-    partial class PictureSettings
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #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.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.Label15 = new System.Windows.Forms.Label();
-            this.crop_left = new System.Windows.Forms.NumericUpDown();
-            this.crop_right = new System.Windows.Forms.NumericUpDown();
-            this.check_autoCrop = new System.Windows.Forms.RadioButton();
-            this.Label51 = new System.Windows.Forms.Label();
-            this.crop_top = new System.Windows.Forms.NumericUpDown();
-            this.Label53 = new System.Windows.Forms.Label();
-            this.Label52 = new System.Windows.Forms.Label();
-            this.crop_bottom = new System.Windows.Forms.NumericUpDown();
-            this.check_customCrop = new System.Windows.Forms.RadioButton();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.label7 = new System.Windows.Forms.Label();
-            this.lbl_src_res = new System.Windows.Forms.Label();
-            this.Label55 = new System.Windows.Forms.Label();
-            this.text_width = new System.Windows.Forms.NumericUpDown();
-            this.label4 = new System.Windows.Forms.Label();
-            this.text_height = new System.Windows.Forms.NumericUpDown();
-            this.check_KeepAR = new System.Windows.Forms.CheckBox();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.updownParHeight = new System.Windows.Forms.NumericUpDown();
-            this.label6 = new System.Windows.Forms.Label();
-            this.labelDisplaySize = new System.Windows.Forms.Label();
-            this.lbl_parHeight = new System.Windows.Forms.Label();
-            this.labelStaticDisplaySize = new System.Windows.Forms.Label();
-            this.updownParWidth = new System.Windows.Forms.NumericUpDown();
-            this.drp_anamorphic = new System.Windows.Forms.ComboBox();
-            this.lbl_parWidth = new System.Windows.Forms.Label();
-            this.updownDisplayWidth = new System.Windows.Forms.NumericUpDown();
-            this.lbl_modulus = new System.Windows.Forms.Label();
-            this.lbl_displayWidth = new System.Windows.Forms.Label();
-            this.drp_modulus = new System.Windows.Forms.ComboBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label26 = new System.Windows.Forms.Label();
-            this.lbl_presetCropWarning = new System.Windows.Forms.Label();
-            this.tableLayoutPanel3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_left)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_right)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_top)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_bottom)).BeginInit();
-            this.tableLayoutPanel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.text_width)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.text_height)).BeginInit();
-            this.tableLayoutPanel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.updownParHeight)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.updownParWidth)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.updownDisplayWidth)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.AutoSize = true;
-            this.tableLayoutPanel3.ColumnCount = 5;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.Controls.Add(this.Label15, 0, 4);
-            this.tableLayoutPanel3.Controls.Add(this.crop_left, 1, 4);
-            this.tableLayoutPanel3.Controls.Add(this.crop_right, 3, 4);
-            this.tableLayoutPanel3.Controls.Add(this.check_autoCrop, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.Label51, 4, 4);
-            this.tableLayoutPanel3.Controls.Add(this.crop_top, 2, 3);
-            this.tableLayoutPanel3.Controls.Add(this.Label53, 2, 6);
-            this.tableLayoutPanel3.Controls.Add(this.Label52, 2, 2);
-            this.tableLayoutPanel3.Controls.Add(this.crop_bottom, 2, 5);
-            this.tableLayoutPanel3.Controls.Add(this.check_customCrop, 0, 1);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(419, 35);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 7;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(217, 165);
-            this.tableLayoutPanel3.TabIndex = 117;
-            // 
-            // Label15
-            // 
-            this.Label15.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.Label15.AutoSize = true;
-            this.Label15.BackColor = System.Drawing.Color.Transparent;
-            this.Label15.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.Label15.Location = new System.Drawing.Point(0, 99);
-            this.Label15.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.Label15.Name = "Label15";
-            this.Label15.Size = new System.Drawing.Size(26, 13);
-            this.Label15.TabIndex = 97;
-            this.Label15.Text = "Left";
-            // 
-            // crop_left
-            // 
-            this.crop_left.Enabled = false;
-            this.crop_left.Increment = new decimal(new int[] {
-            2,
-            0,
-            0,
-            0});
-            this.crop_left.Location = new System.Drawing.Point(32, 95);
-            this.crop_left.Maximum = new decimal(new int[] {
-            128000,
-            0,
-            0,
-            0});
-            this.crop_left.Name = "crop_left";
-            this.crop_left.Size = new System.Drawing.Size(44, 21);
-            this.crop_left.TabIndex = 98;
-            this.crop_left.ValueChanged += new System.EventHandler(this.CropValueChanged);
-            // 
-            // crop_right
-            // 
-            this.crop_right.Enabled = false;
-            this.crop_right.Increment = new decimal(new int[] {
-            2,
-            0,
-            0,
-            0});
-            this.crop_right.Location = new System.Drawing.Point(132, 95);
-            this.crop_right.Maximum = new decimal(new int[] {
-            128000,
-            0,
-            0,
-            0});
-            this.crop_right.Name = "crop_right";
-            this.crop_right.Size = new System.Drawing.Size(44, 21);
-            this.crop_right.TabIndex = 101;
-            this.crop_right.ValueChanged += new System.EventHandler(this.CropValueChanged);
-            // 
-            // check_autoCrop
-            // 
-            this.check_autoCrop.AutoSize = true;
-            this.check_autoCrop.Checked = true;
-            this.tableLayoutPanel3.SetColumnSpan(this.check_autoCrop, 5);
-            this.check_autoCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.check_autoCrop.Location = new System.Drawing.Point(0, 3);
-            this.check_autoCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.check_autoCrop.Name = "check_autoCrop";
-            this.check_autoCrop.Size = new System.Drawing.Size(73, 17);
-            this.check_autoCrop.TabIndex = 105;
-            this.check_autoCrop.TabStop = true;
-            this.check_autoCrop.Text = "Automatic";
-            this.check_autoCrop.UseVisualStyleBackColor = true;
-            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.CheckAutoCropCheckedChanged);
-            // 
-            // Label51
-            // 
-            this.Label51.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.Label51.AutoSize = true;
-            this.Label51.BackColor = System.Drawing.Color.Transparent;
-            this.Label51.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.Label51.Location = new System.Drawing.Point(182, 99);
-            this.Label51.Margin = new System.Windows.Forms.Padding(3);
-            this.Label51.Name = "Label51";
-            this.Label51.Size = new System.Drawing.Size(32, 13);
-            this.Label51.TabIndex = 102;
-            this.Label51.Text = "Right";
-            // 
-            // crop_top
-            // 
-            this.crop_top.Enabled = false;
-            this.crop_top.Increment = new decimal(new int[] {
-            2,
-            0,
-            0,
-            0});
-            this.crop_top.Location = new System.Drawing.Point(82, 68);
-            this.crop_top.Maximum = new decimal(new int[] {
-            128000,
-            0,
-            0,
-            0});
-            this.crop_top.Name = "crop_top";
-            this.crop_top.Size = new System.Drawing.Size(44, 21);
-            this.crop_top.TabIndex = 100;
-            this.crop_top.ValueChanged += new System.EventHandler(this.CropValueChanged);
-            // 
-            // Label53
-            // 
-            this.Label53.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.Label53.AutoSize = true;
-            this.Label53.BackColor = System.Drawing.Color.Transparent;
-            this.Label53.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.Label53.Location = new System.Drawing.Point(83, 149);
-            this.Label53.Margin = new System.Windows.Forms.Padding(3);
-            this.Label53.Name = "Label53";
-            this.Label53.Size = new System.Drawing.Size(41, 13);
-            this.Label53.TabIndex = 104;
-            this.Label53.Text = "Bottom";
-            // 
-            // Label52
-            // 
-            this.Label52.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.Label52.AutoSize = true;
-            this.Label52.BackColor = System.Drawing.Color.Transparent;
-            this.Label52.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.Label52.Location = new System.Drawing.Point(91, 49);
-            this.Label52.Margin = new System.Windows.Forms.Padding(3);
-            this.Label52.Name = "Label52";
-            this.Label52.Size = new System.Drawing.Size(25, 13);
-            this.Label52.TabIndex = 99;
-            this.Label52.Text = "Top";
-            // 
-            // crop_bottom
-            // 
-            this.crop_bottom.Enabled = false;
-            this.crop_bottom.Increment = new decimal(new int[] {
-            2,
-            0,
-            0,
-            0});
-            this.crop_bottom.Location = new System.Drawing.Point(82, 122);
-            this.crop_bottom.Maximum = new decimal(new int[] {
-            128000,
-            0,
-            0,
-            0});
-            this.crop_bottom.Name = "crop_bottom";
-            this.crop_bottom.Size = new System.Drawing.Size(44, 21);
-            this.crop_bottom.TabIndex = 103;
-            this.crop_bottom.ValueChanged += new System.EventHandler(this.CropValueChanged);
-            // 
-            // check_customCrop
-            // 
-            this.check_customCrop.AutoSize = true;
-            this.tableLayoutPanel3.SetColumnSpan(this.check_customCrop, 5);
-            this.check_customCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.check_customCrop.Location = new System.Drawing.Point(0, 26);
-            this.check_customCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.check_customCrop.Name = "check_customCrop";
-            this.check_customCrop.Size = new System.Drawing.Size(61, 17);
-            this.check_customCrop.TabIndex = 106;
-            this.check_customCrop.Text = "Custom";
-            this.check_customCrop.UseVisualStyleBackColor = true;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.AutoSize = true;
-            this.tableLayoutPanel2.ColumnCount = 5;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.Controls.Add(this.label7, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.lbl_src_res, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.Label55, 0, 1);
-            this.tableLayoutPanel2.Controls.Add(this.text_width, 1, 1);
-            this.tableLayoutPanel2.Controls.Add(this.label4, 2, 1);
-            this.tableLayoutPanel2.Controls.Add(this.text_height, 3, 1);
-            this.tableLayoutPanel2.Controls.Add(this.check_KeepAR, 1, 2);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(16, 35);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 3;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(376, 69);
-            this.tableLayoutPanel2.TabIndex = 116;
-            // 
-            // label7
-            // 
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label7.AutoSize = true;
-            this.label7.BackColor = System.Drawing.Color.Transparent;
-            this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label7.Location = new System.Drawing.Point(0, 3);
-            this.label7.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(44, 13);
-            this.label7.TabIndex = 76;
-            this.label7.Text = "Source:";
-            // 
-            // lbl_src_res
-            // 
-            this.lbl_src_res.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lbl_src_res.AutoSize = true;
-            this.lbl_src_res.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_src_res.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lbl_src_res.Location = new System.Drawing.Point(50, 3);
-            this.lbl_src_res.Margin = new System.Windows.Forms.Padding(3);
-            this.lbl_src_res.Name = "lbl_src_res";
-            this.lbl_src_res.Size = new System.Drawing.Size(15, 13);
-            this.lbl_src_res.TabIndex = 77;
-            this.lbl_src_res.Text = "--";
-            // 
-            // Label55
-            // 
-            this.Label55.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.Label55.AutoSize = true;
-            this.Label55.BackColor = System.Drawing.Color.Transparent;
-            this.Label55.ForeColor = System.Drawing.Color.Black;
-            this.Label55.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.Label55.Location = new System.Drawing.Point(0, 26);
-            this.Label55.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.Label55.Name = "Label55";
-            this.Label55.Size = new System.Drawing.Size(39, 13);
-            this.Label55.TabIndex = 80;
-            this.Label55.Text = "Width:";
-            // 
-            // text_width
-            // 
-            this.text_width.Location = new System.Drawing.Point(50, 22);
-            this.text_width.Maximum = new decimal(new int[] {
-            1280000,
-            0,
-            0,
-            0});
-            this.text_width.Name = "text_width";
-            this.text_width.Size = new System.Drawing.Size(64, 21);
-            this.text_width.TabIndex = 85;
-            this.text_width.ValueChanged += new System.EventHandler(this.TextWidthValueChanged);
-            // 
-            // label4
-            // 
-            this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label4.AutoSize = true;
-            this.label4.BackColor = System.Drawing.Color.Transparent;
-            this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label4.Location = new System.Drawing.Point(120, 26);
-            this.label4.Margin = new System.Windows.Forms.Padding(3);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(42, 13);
-            this.label4.TabIndex = 84;
-            this.label4.Text = "Height:";
-            // 
-            // text_height
-            // 
-            this.text_height.Location = new System.Drawing.Point(168, 22);
-            this.text_height.Maximum = new decimal(new int[] {
-            1280000,
-            0,
-            0,
-            0});
-            this.text_height.Name = "text_height";
-            this.text_height.Size = new System.Drawing.Size(64, 21);
-            this.text_height.TabIndex = 86;
-            this.text_height.ValueChanged += new System.EventHandler(this.TextHeightValueChanged);
-            // 
-            // check_KeepAR
-            // 
-            this.check_KeepAR.AutoSize = true;
-            this.check_KeepAR.Checked = true;
-            this.check_KeepAR.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.tableLayoutPanel2.SetColumnSpan(this.check_KeepAR, 3);
-            this.check_KeepAR.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.check_KeepAR.Location = new System.Drawing.Point(50, 49);
-            this.check_KeepAR.Name = "check_KeepAR";
-            this.check_KeepAR.Size = new System.Drawing.Size(114, 17);
-            this.check_KeepAR.TabIndex = 95;
-            this.check_KeepAR.Text = "Keep Aspect Ratio";
-            this.check_KeepAR.UseVisualStyleBackColor = true;
-            this.check_KeepAR.CheckedChanged += new System.EventHandler(this.CheckKeepArCheckedChanged);
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSize = true;
-            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.updownParHeight, 1, 4);
-            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.labelDisplaySize, 1, 5);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_parHeight, 0, 4);
-            this.tableLayoutPanel1.Controls.Add(this.labelStaticDisplaySize, 0, 5);
-            this.tableLayoutPanel1.Controls.Add(this.updownParWidth, 1, 3);
-            this.tableLayoutPanel1.Controls.Add(this.drp_anamorphic, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_parWidth, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.updownDisplayWidth, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_modulus, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_displayWidth, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.drp_modulus, 1, 1);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 110);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 6;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(195, 154);
-            this.tableLayoutPanel1.TabIndex = 115;
-            // 
-            // updownParHeight
-            // 
-            this.updownParHeight.Location = new System.Drawing.Point(82, 111);
-            this.updownParHeight.Maximum = new decimal(new int[] {
-            1280000,
-            0,
-            0,
-            0});
-            this.updownParHeight.Name = "updownParHeight";
-            this.updownParHeight.Size = new System.Drawing.Size(53, 21);
-            this.updownParHeight.TabIndex = 112;
-            this.updownParHeight.ValueChanged += new System.EventHandler(this.TextWidthValueChanged);
-            // 
-            // label6
-            // 
-            this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label6.AutoSize = true;
-            this.label6.BackColor = System.Drawing.Color.Transparent;
-            this.label6.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label6.Location = new System.Drawing.Point(0, 7);
-            this.label6.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(67, 13);
-            this.label6.TabIndex = 81;
-            this.label6.Text = "Anamorphic:";
-            // 
-            // labelDisplaySize
-            // 
-            this.labelDisplaySize.AutoSize = true;
-            this.labelDisplaySize.BackColor = System.Drawing.Color.Transparent;
-            this.labelDisplaySize.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.labelDisplaySize.Location = new System.Drawing.Point(82, 138);
-            this.labelDisplaySize.Margin = new System.Windows.Forms.Padding(3);
-            this.labelDisplaySize.Name = "labelDisplaySize";
-            this.labelDisplaySize.Size = new System.Drawing.Size(15, 13);
-            this.labelDisplaySize.TabIndex = 108;
-            this.labelDisplaySize.Text = "--";
-            // 
-            // lbl_parHeight
-            // 
-            this.lbl_parHeight.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lbl_parHeight.AutoSize = true;
-            this.lbl_parHeight.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_parHeight.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lbl_parHeight.Location = new System.Drawing.Point(0, 115);
-            this.lbl_parHeight.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.lbl_parHeight.Name = "lbl_parHeight";
-            this.lbl_parHeight.Size = new System.Drawing.Size(65, 13);
-            this.lbl_parHeight.TabIndex = 94;
-            this.lbl_parHeight.Text = "PAR Height:";
-            // 
-            // labelStaticDisplaySize
-            // 
-            this.labelStaticDisplaySize.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.labelStaticDisplaySize.AutoSize = true;
-            this.labelStaticDisplaySize.BackColor = System.Drawing.Color.Transparent;
-            this.labelStaticDisplaySize.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.labelStaticDisplaySize.Location = new System.Drawing.Point(0, 138);
-            this.labelStaticDisplaySize.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.labelStaticDisplaySize.Name = "labelStaticDisplaySize";
-            this.labelStaticDisplaySize.Size = new System.Drawing.Size(67, 13);
-            this.labelStaticDisplaySize.TabIndex = 107;
-            this.labelStaticDisplaySize.Text = "Display Size:";
-            // 
-            // updownParWidth
-            // 
-            this.updownParWidth.Location = new System.Drawing.Point(82, 84);
-            this.updownParWidth.Maximum = new decimal(new int[] {
-            1280000,
-            0,
-            0,
-            0});
-            this.updownParWidth.Name = "updownParWidth";
-            this.updownParWidth.Size = new System.Drawing.Size(53, 21);
-            this.updownParWidth.TabIndex = 111;
-            this.updownParWidth.ValueChanged += new System.EventHandler(this.TextWidthValueChanged);
-            // 
-            // drp_anamorphic
-            // 
-            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_anamorphic.FormattingEnabled = true;
-            this.drp_anamorphic.Items.AddRange(new object[] {
-            "None",
-            "Strict",
-            "Loose",
-            "Custom"});
-            this.drp_anamorphic.Location = new System.Drawing.Point(82, 3);
-            this.drp_anamorphic.Name = "drp_anamorphic";
-            this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);
-            this.drp_anamorphic.TabIndex = 82;
-            this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.DrpAnamorphicSelectedIndexChanged);
-            // 
-            // lbl_parWidth
-            // 
-            this.lbl_parWidth.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lbl_parWidth.AutoSize = true;
-            this.lbl_parWidth.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_parWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lbl_parWidth.Location = new System.Drawing.Point(0, 88);
-            this.lbl_parWidth.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.lbl_parWidth.Name = "lbl_parWidth";
-            this.lbl_parWidth.Size = new System.Drawing.Size(62, 13);
-            this.lbl_parWidth.TabIndex = 92;
-            this.lbl_parWidth.Text = "PAR Width:";
-            // 
-            // updownDisplayWidth
-            // 
-            this.updownDisplayWidth.Location = new System.Drawing.Point(82, 57);
-            this.updownDisplayWidth.Maximum = new decimal(new int[] {
-            1280000,
-            0,
-            0,
-            0});
-            this.updownDisplayWidth.Name = "updownDisplayWidth";
-            this.updownDisplayWidth.Size = new System.Drawing.Size(53, 21);
-            this.updownDisplayWidth.TabIndex = 110;
-            this.updownDisplayWidth.ValueChanged += new System.EventHandler(this.UpdownDisplayWidthValueChanged);
-            // 
-            // lbl_modulus
-            // 
-            this.lbl_modulus.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lbl_modulus.AutoSize = true;
-            this.lbl_modulus.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_modulus.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lbl_modulus.Location = new System.Drawing.Point(0, 34);
-            this.lbl_modulus.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.lbl_modulus.Name = "lbl_modulus";
-            this.lbl_modulus.Size = new System.Drawing.Size(50, 13);
-            this.lbl_modulus.TabIndex = 87;
-            this.lbl_modulus.Text = "Modulus:";
-            // 
-            // lbl_displayWidth
-            // 
-            this.lbl_displayWidth.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lbl_displayWidth.AutoSize = true;
-            this.lbl_displayWidth.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_displayWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lbl_displayWidth.Location = new System.Drawing.Point(0, 61);
-            this.lbl_displayWidth.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.lbl_displayWidth.Name = "lbl_displayWidth";
-            this.lbl_displayWidth.Size = new System.Drawing.Size(76, 13);
-            this.lbl_displayWidth.TabIndex = 90;
-            this.lbl_displayWidth.Text = "Display Width:";
-            // 
-            // drp_modulus
-            // 
-            this.drp_modulus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_modulus.FormattingEnabled = true;
-            this.drp_modulus.Items.AddRange(new object[] {
-            "16",
-            "8",
-            "4",
-            "2"});
-            this.drp_modulus.Location = new System.Drawing.Point(82, 30);
-            this.drp_modulus.Name = "drp_modulus";
-            this.drp_modulus.Size = new System.Drawing.Size(110, 21);
-            this.drp_modulus.TabIndex = 88;
-            this.drp_modulus.SelectedIndexChanged += new System.EventHandler(this.DrpModulusSelectedIndexChanged);
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.BackColor = System.Drawing.Color.Transparent;
-            this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label8.Location = new System.Drawing.Point(416, 13);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(57, 13);
-            this.label8.TabIndex = 114;
-            this.label8.Text = "Cropping";
-            // 
-            // label26
-            // 
-            this.label26.AutoSize = true;
-            this.label26.BackColor = System.Drawing.Color.Transparent;
-            this.label26.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label26.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label26.Location = new System.Drawing.Point(13, 13);
-            this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(30, 13);
-            this.label26.TabIndex = 113;
-            this.label26.Text = "Size";
-            // 
-            // lbl_presetCropWarning
-            // 
-            this.lbl_presetCropWarning.AutoSize = true;
-            this.lbl_presetCropWarning.ForeColor = System.Drawing.Color.Black;
-            this.lbl_presetCropWarning.Location = new System.Drawing.Point(479, 13);
-            this.lbl_presetCropWarning.Name = "lbl_presetCropWarning";
-            this.lbl_presetCropWarning.Size = new System.Drawing.Size(140, 13);
-            this.lbl_presetCropWarning.TabIndex = 118;
-            this.lbl_presetCropWarning.Text = "( Preset values are in use! )";
-            // 
-            // PictureSettings
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.lbl_presetCropWarning);
-            this.Controls.Add(this.tableLayoutPanel3);
-            this.Controls.Add(this.tableLayoutPanel2);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.label26);
-            this.Enabled = false;
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Name = "PictureSettings";
-            this.Size = new System.Drawing.Size(666, 279);
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_left)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_right)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_top)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.crop_bottom)).EndInit();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.text_width)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.text_height)).EndInit();
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.updownParHeight)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.updownParWidth)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.updownDisplayWidth)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        internal System.Windows.Forms.Label Label15;
-        internal System.Windows.Forms.NumericUpDown crop_left;
-        internal System.Windows.Forms.NumericUpDown crop_right;
-        internal System.Windows.Forms.RadioButton check_autoCrop;
-        internal System.Windows.Forms.Label Label51;
-        internal System.Windows.Forms.NumericUpDown crop_top;
-        internal System.Windows.Forms.Label Label53;
-        internal System.Windows.Forms.Label Label52;
-        internal System.Windows.Forms.NumericUpDown crop_bottom;
-        internal System.Windows.Forms.RadioButton check_customCrop;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        internal System.Windows.Forms.Label label7;
-        internal System.Windows.Forms.Label lbl_src_res;
-        internal System.Windows.Forms.Label Label55;
-        internal System.Windows.Forms.Label label4;
-        internal System.Windows.Forms.CheckBox check_KeepAR;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        internal System.Windows.Forms.NumericUpDown updownParHeight;
-        internal System.Windows.Forms.Label label6;
-        internal System.Windows.Forms.Label labelDisplaySize;
-        internal System.Windows.Forms.Label lbl_parHeight;
-        internal System.Windows.Forms.Label labelStaticDisplaySize;
-        internal System.Windows.Forms.NumericUpDown updownParWidth;
-        internal System.Windows.Forms.ComboBox drp_anamorphic;
-        internal System.Windows.Forms.Label lbl_parWidth;
-        internal System.Windows.Forms.NumericUpDown updownDisplayWidth;
-        internal System.Windows.Forms.Label lbl_modulus;
-        internal System.Windows.Forms.Label lbl_displayWidth;
-        internal System.Windows.Forms.ComboBox drp_modulus;
-        internal System.Windows.Forms.Label label8;
-        internal System.Windows.Forms.Label label26;
-        internal System.Windows.Forms.NumericUpDown text_width;
-        internal System.Windows.Forms.NumericUpDown text_height;
-        private System.Windows.Forms.Label lbl_presetCropWarning;
-
-
-
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/Controls/PictureSettings.cs Deleted

@@ -1,572 +0,0 @@
-/*  PictureSetting.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    using System;
-    using System.Drawing;
-    using System.Globalization;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Utilities;
-
-    /// <summary>
-    /// The Picture Settings Panel
-    /// </summary>
-    public partial class PictureSettings : UserControl
-    {
-        private readonly CultureInfo culture = new CultureInfo("en-US", false);
-        private bool preventChangingWidth;
-        private bool preventChangingHeight;
-        private bool preventChangingCustom;
-        private bool preventChangingDisplayWidth;
-        private double cachedDar;
-        private Title sourceTitle;
-        private Size presetMaximumResolution;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PictureSettings"/> class. 
-        /// Creates a new instance of the Picture Settings Class
-        /// </summary>
-        public PictureSettings()
-        {
-            InitializeComponent();
-
-            drp_anamorphic.SelectedIndex = 1;
-            drp_modulus.SelectedIndex = 0;
-        }
-
-        /// <summary>
-        /// Picture Settings Changed Event Handler
-        /// </summary>
-        public event EventHandler PictureSettingsChanged;
-
-        /// <summary>
-        /// Gets or sets the source media used by this control.
-        /// </summary>
-        public Title Source
-        {
-            private get
-            {
-                return sourceTitle;
-            }
-
-            set
-            {
-                sourceTitle = value;
-                Enabled = sourceTitle != null;
-                NewSourceSet();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the currently selected preset.
-        /// </summary>
-        public Preset CurrentlySelectedPreset { get; set; }
-
-        public bool SizeSet { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum allowable size for the encoded resolution. Set a value to
-        /// "0" if the maximum does not matter.
-        /// </summary>
-        public Size PresetMaximumResolution
-        {
-            get
-            {
-                return this.presetMaximumResolution;
-            }
-            set
-            {
-                this.presetMaximumResolution = value;
-                if (presetMaximumResolution == new Size(0, 0) && !SizeSet && this.sourceTitle != null)
-                {
-                    text_width.Value = this.sourceTitle.Resolution.Width;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Set the Preset Crop Warning Label
-        /// </summary>
-        /// <param name="selectedPreset">
-        /// The Selected preset
-        /// </param>
-        public void SetPresetCropWarningLabel(Preset selectedPreset)
-        {
-            if (this.check_customCrop.Checked)
-            {
-                lbl_presetCropWarning.Visible = true;
-                if (selectedPreset != null && selectedPreset.CropSettings == false) lbl_presetCropWarning.Visible = false;
-                else if (selectedPreset == null) lbl_presetCropWarning.Visible = false;
-            }
-            else
-            {
-                lbl_presetCropWarning.Visible = false;
-            }
-        }
-
-        /// <summary>
-        /// Setup the UI. The Source has just changed.
-        /// </summary>
-        private void NewSourceSet()
-        {
-            // Set the Aspect Ratio
-            lbl_src_res.Text = sourceTitle.Resolution.Width + " x " + sourceTitle.Resolution.Height;
-
-            // Set the Recommended Cropping values, but only if a preset doesn't have hard set picture settings.
-            EncodeTask presetQuery = null;
-            if (this.CurrentlySelectedPreset != null)
-                presetQuery = QueryParserUtility.Parse(CurrentlySelectedPreset.Query);
-
-            if ((CurrentlySelectedPreset != null && CurrentlySelectedPreset.CropSettings == false) || 
-                CurrentlySelectedPreset == null || 
-                (presetQuery != null && !presetQuery.HasCropping)
-                )
-            {
-                crop_top.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions.Top);
-                crop_bottom.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions.Bottom);
-                crop_left.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions.Left);
-                crop_right.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions.Right);
-            }
- 
-            SetPresetCropWarningLabel(CurrentlySelectedPreset);
-
-            // Set the Resolution Boxes
-            if (drp_anamorphic.SelectedIndex == 0)
-            {
-                int width = sourceTitle.Resolution.Width;
-
-                if (width > PresetMaximumResolution.Width && PresetMaximumResolution.Width != 0) // If the preset has a Max width set, don't use a width larger than it.
-                    width = PresetMaximumResolution.Width;
-
-                if (text_width.Value == 0 || (text_width.Value > PresetMaximumResolution.Width && PresetMaximumResolution.Width != 0)) // Only update the values if the fields don't already have values.
-                    text_width.Value = width;
-
-                check_KeepAR.Checked = true; // Forces Resolution to be correct.
-            }
-            else
-            {
-                int width = sourceTitle.Resolution.Width;
-                if (width > PresetMaximumResolution.Width && PresetMaximumResolution.Width != 0) // If the preset has a Max width set, don't use a width larger than it.
-                    width = PresetMaximumResolution.Width;
-
-                int height = sourceTitle.Resolution.Height;
-                if (height > PresetMaximumResolution.Height && PresetMaximumResolution.Height != 0) // If the preset has a Max height set, don't use a width larger than it.
-                    height = PresetMaximumResolution.Height;
-
-                text_width.Value = width;
-                text_height.Value = height - (int)crop_top.Value - (int)crop_bottom.Value;
-
-                labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;
-            }
-
-            updownParWidth.Value = sourceTitle.ParVal.Width;
-            updownParHeight.Value = sourceTitle.ParVal.Height;
-
-            Size croppedDar = CalculateAnamorphicSizes();
-            cachedDar = (double)croppedDar.Width / croppedDar.Height;
-            updownDisplayWidth.Value = croppedDar.Width;
-        }
-
-        // Picture Controls
-        private void TextWidthValueChanged(object sender, EventArgs e)
-        {
-            if (preventChangingWidth)
-                return;
-
-            // Make sure the new value doesn't exceed the maximum
-            if (Source != null)
-                if (text_width.Value > Source.Resolution.Width)
-                    text_width.Value = Source.Resolution.Width;
-
-            switch (drp_anamorphic.SelectedIndex)
-            {
-                case 0:
-                    if (check_KeepAR.Checked && Source != null)
-                    {
-                        preventChangingHeight = true;
-
-                        int width = (int)text_width.Value;
-
-                        double crop_width = Source.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;
-                        double crop_height = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;
-
-                        if (SourceAspect.Width == 0 && SourceAspect.Height == 0)
-                            break;
-
-                        double newHeight = ((double)width * Source.Resolution.Width * SourceAspect.Height * crop_height) /
-                                           (Source.Resolution.Height * SourceAspect.Width * crop_width);
-                        text_height.Value = (decimal)GetModulusValue(newHeight);
-
-                        preventChangingHeight = false;
-                    }
-                    break;
-                case 3:
-                    if (check_KeepAR.CheckState == CheckState.Unchecked && Source != null)
-                    {
-                        if (preventChangingCustom)
-                            break;
-
-                        preventChangingDisplayWidth = true;
-                        updownDisplayWidth.Value = text_width.Value * updownParWidth.Value / updownParHeight.Value;
-                        preventChangingDisplayWidth = false;
-
-                        labelDisplaySize.Text = Math.Truncate(updownDisplayWidth.Value) + "x" + text_height.Value;
-                    }
-
-                    if (check_KeepAR.CheckState == CheckState.Checked && Source != null)
-                    {
-                        updownParWidth.Value = updownDisplayWidth.Value;
-                        updownParHeight.Value = text_width.Value;
-                    }
-                    break;
-                default:
-                    labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;
-                    break;
-            }
-
-            preventChangingWidth = false;
-        }
-
-        private void TextHeightValueChanged(object sender, EventArgs e)
-        {
-            if (preventChangingHeight)
-                return;
-
-            if (Source != null)
-                if (text_height.Value > Source.Resolution.Height)
-                    text_height.Value = Source.Resolution.Height;
-
-            switch (drp_anamorphic.SelectedIndex)
-            {
-                case 0:
-                    if (check_KeepAR.Checked && Source != null)
-                    {
-                        preventChangingWidth = true;
-
-                        double crop_width = Source.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;
-                        double crop_height = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;
-
-                        double new_width = ((double)text_height.Value * Source.Resolution.Height * SourceAspect.Width *
-                                            crop_width) /
-                                           (Source.Resolution.Width * SourceAspect.Height * crop_height);
-
-                        text_width.Value = (decimal)GetModulusValue(new_width);
-
-                        preventChangingWidth = false;
-                    }
-                    break;
-                case 3:
-                    labelDisplaySize.Text = Math.Truncate(updownDisplayWidth.Value) + "x" + text_height.Value;
-
-                    if (check_KeepAR.CheckState == CheckState.Checked && Source != null)
-                    {
-                        // - Changes DISPLAY WIDTH to keep DAR
-                        // - Changes PIXEL WIDTH to new DISPLAY WIDTH
-                        // - Changes PIXEL HEIGHT to STORAGE WIDTH
-                        // DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification)
-
-                        double rawCalculatedDisplayWidth = (double)text_height.Value * cachedDar;
-
-                        preventChangingDisplayWidth = true; // Start Guards
-                        preventChangingWidth = true;
-
-                        updownDisplayWidth.Value = (decimal)rawCalculatedDisplayWidth;
-                        updownParWidth.Value = updownDisplayWidth.Value;
-                        updownParHeight.Value = text_width.Value;
-
-                        preventChangingWidth = false; // Reset Guards
-                        preventChangingDisplayWidth = false;
-                    }
-
-                    break;
-                default:
-                    labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;
-                    break;
-            }
-
-            preventChangingHeight = false;
-        }
-
-        private void CheckKeepArCheckedChanged(object sender, EventArgs e)
-        {
-            // Force TextWidth to recalc height
-            if (check_KeepAR.Checked)
-                TextWidthValueChanged(this, new EventArgs());
-
-            // Disable the Custom Anamorphic Par Controls if checked.
-            if (drp_anamorphic.SelectedIndex == 3)
-            {
-                updownParWidth.Enabled = !check_KeepAR.Checked;
-                updownParHeight.Enabled = !check_KeepAR.Checked;
-            }
-
-            // Raise the Picture Settings Changed Event
-            if (PictureSettingsChanged != null)
-                PictureSettingsChanged(this, new EventArgs());
-        }
-
-        private void UpdownDisplayWidthValueChanged(object sender, EventArgs e)
-        {
-            if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked)
-            {
-                preventChangingCustom = true;
-                updownParWidth.Value = updownDisplayWidth.Value;
-                updownParHeight.Value = text_width.Value;
-                preventChangingCustom = false;
-            }
-
-            if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Checked)
-            {
-                // - Changes HEIGHT to keep DAR
-                // - Changes PIXEL WIDTH to new DISPLAY WIDTH
-                // - Changes PIXEL HEIGHT to STORAGE WIDTH
-                // DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification)
-
-                // Calculate new Height Value
-                int modulus;
-                if (!int.TryParse(drp_modulus.SelectedItem.ToString(), out modulus))
-                    modulus = 16;
-
-                int rawCalculatedHeight = (int)((int)updownDisplayWidth.Value / cachedDar);
-                int modulusHeight = rawCalculatedHeight - (rawCalculatedHeight % modulus);
-
-                // Update value
-                preventChangingHeight = true;
-                text_height.Value = (decimal)modulusHeight;
-                updownParWidth.Value = updownDisplayWidth.Value;
-                updownParHeight.Value = text_width.Value;
-                preventChangingHeight = false;
-            }
-        }
-
-        // Anamorphic Controls
-        private void DrpAnamorphicSelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (drp_anamorphic.SelectedIndex)
-            {
-                case 0: // None
-                    text_width.Enabled = true;
-                    text_height.Enabled = true;
-                    check_KeepAR.Enabled = true;
-
-                    SetCustomAnamorphicOptionsVisible(false);
-                    labelStaticDisplaySize.Visible = false;
-                    labelDisplaySize.Visible = false;
-                    drp_modulus.Visible = true;
-                    lbl_modulus.Visible = true;
-
-                    // check_KeepAR.Checked = true;
-
-                    if (check_KeepAR.Checked)
-                        TextWidthValueChanged(this, new EventArgs());
-                    // Don't update display size if we're not using anamorphic
-                    return;
-                case 1: // Strict
-                    text_width.Enabled = false;
-                    text_height.Enabled = false;
-                    check_KeepAR.Enabled = false;
-
-                    SetCustomAnamorphicOptionsVisible(false);
-                    labelStaticDisplaySize.Visible = true;
-                    labelDisplaySize.Visible = true;
-
-                    check_KeepAR.Checked = true;
-                    break;
-                case 2: // Loose
-                    text_width.Enabled = true;
-                    text_height.Enabled = false;
-                    check_KeepAR.Enabled = false;
-
-                    SetCustomAnamorphicOptionsVisible(false);
-                    labelStaticDisplaySize.Visible = true;
-                    labelDisplaySize.Visible = true;
-                    drp_modulus.Visible = true;
-                    lbl_modulus.Visible = true;
-
-                    check_KeepAR.Checked = true;
-                    break;
-                case 3: // Custom
-                    text_width.Enabled = true;
-                    text_height.Enabled = true;
-                    check_KeepAR.Enabled = true;
-
-                    SetCustomAnamorphicOptionsVisible(true);
-                    labelStaticDisplaySize.Visible = true;
-                    labelDisplaySize.Visible = true;
-
-                    check_KeepAR.Checked = true;
-                    updownParWidth.Enabled = !check_KeepAR.Checked;
-                    updownParHeight.Enabled = !check_KeepAR.Checked;
-                    break;
-            }
-
-            labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;
-
-            if (check_KeepAR.Checked)
-                TextWidthValueChanged(this, new EventArgs());
-
-            if (PictureSettingsChanged != null)
-                PictureSettingsChanged(this, new EventArgs());
-        }
-
-        private void DrpModulusSelectedIndexChanged(object sender, EventArgs e)
-        {
-            preventChangingWidth = true;
-            preventChangingHeight = true;
-
-            text_width.Value = (decimal)GetModulusValue((double)text_width.Value);
-            text_height.Value = (decimal)GetModulusValue((double)text_height.Value);
-
-            preventChangingWidth = false;
-            preventChangingHeight = false;
-
-            text_width.Increment = int.Parse(drp_modulus.SelectedItem.ToString());
-            text_height.Increment = int.Parse(drp_modulus.SelectedItem.ToString());
-
-            if (PictureSettingsChanged != null)
-                PictureSettingsChanged(this, new EventArgs());
-        }
-
-        // Cropping Controls
-        private void CheckAutoCropCheckedChanged(object sender, EventArgs e)
-        {
-            crop_top.Enabled = check_customCrop.Checked;
-            crop_bottom.Enabled = check_customCrop.Checked;
-            crop_left.Enabled = check_customCrop.Checked;
-            crop_right.Enabled = check_customCrop.Checked;
-
-            if (Source != null)
-            {
-                crop_top.Value = Source.AutoCropDimensions.Top;
-                crop_bottom.Value = Source.AutoCropDimensions.Bottom;
-                crop_left.Value = Source.AutoCropDimensions.Left;
-                crop_right.Value = Source.AutoCropDimensions.Right;
-            }
-        }
-
-        private void CropValueChanged(object sender, EventArgs e)
-        {
-            TextWidthValueChanged(this, new EventArgs());
-        }
-
-        // GUI Functions
-        private void SetCustomAnamorphicOptionsVisible(bool visible)
-        {
-            lbl_modulus.Visible = visible;
-            lbl_displayWidth.Visible = visible;
-            lbl_parWidth.Visible = visible;
-            lbl_parHeight.Visible = visible;
-
-            drp_modulus.Visible = visible;
-            updownDisplayWidth.Visible = visible;
-            updownParWidth.Visible = visible;
-            updownParHeight.Visible = visible;
-        }
-
-        // Calculation Functions
-        private Size SourceAspect
-        {
-            get
-            {
-                if (Source != null) // display aspect = (width * par_width) / (height * par_height)
-                    return new Size((Source.ParVal.Width * Source.Resolution.Width),
-                                    (Source.ParVal.Height * Source.Resolution.Height));
-
-                return new Size(0, 0); // Fall over to 16:9 and hope for the best
-            }
-        }
-
-        private Size CalculateAnamorphicSizes()
-        {
-            if (Source != null)
-            {
-                /* Set up some variables to make the math easier to follow. */
-                int croppedWidth = Source.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;
-                int croppedHeight = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;
-                double storageAspect = (double)croppedWidth / croppedHeight;
-
-                /* Figure out what width the source would display at. */
-                double sourceDisplayWidth = (double)croppedWidth * Source.ParVal.Width / Source.ParVal.Height;
-
-                /*
-                     3 different ways of deciding output dimensions:
-                      - 1: Strict anamorphic, preserve source dimensions
-                      - 2: Loose anamorphic, round to mod16 and preserve storage aspect ratio
-                      - 3: Power user anamorphic, specify everything
-                  */
-                double width, height;
-                switch (drp_anamorphic.SelectedIndex)
-                {
-                    default:
-                    case 1:
-                        /* Strict anamorphic */
-                        double displayWidth = ((double)croppedWidth * Source.ParVal.Width / Source.ParVal.Height);
-                        displayWidth = Math.Round(displayWidth, 0);
-                        Size output = new Size((int)displayWidth, croppedHeight);
-                        return output;
-                    case 2:
-                        /* "Loose" anamorphic.
-                            - Uses mod16-compliant dimensions,
-                            - Allows users to set the width
-                        */
-                        width = (int)text_width.Value;
-                        width = GetModulusValue(width); /* Time to get picture width that divide cleanly.*/
-
-                        height = (width / storageAspect) + 0.5;
-                        height = GetModulusValue(height); /* Time to get picture height that divide cleanly.*/
-
-                        /* The film AR is the source's display width / cropped source height.
-                           The output display width is the output height * film AR.
-                           The output PAR is the output display width / output storage width. */
-                        double pixelAspectWidth = height * sourceDisplayWidth / croppedHeight;
-                        double pixelAspectHeight = width;
-
-                        double disWidthLoose = (width * pixelAspectWidth / pixelAspectHeight);
-                        if (double.IsNaN(disWidthLoose))
-                            disWidthLoose = 0;
-                        return new Size((int)disWidthLoose, (int)height);
-                    case 3:
-
-                        // Get the User Interface Values
-                        double UIdisplayWidth;
-                        double.TryParse(updownDisplayWidth.Text, out UIdisplayWidth);
-
-                        /* Anamorphic 3: Power User Jamboree - Set everything based on specified values */
-                        height = GetModulusValue((double)text_height.Value);
-
-                        if (check_KeepAR.Checked)
-                            return new Size((int)Math.Truncate(UIdisplayWidth), (int)height);
-
-                        return new Size((int)Math.Truncate(UIdisplayWidth), (int)height);
-                }
-            }
-
-            // Return a default value of 0,0 to indicate failure
-            return new Size(0, 0);
-        }
-
-        private double GetModulusValue(double value)
-        {
-            int mod = int.Parse(drp_modulus.SelectedItem.ToString());
-            double remainder = value % mod;
-
-            if (remainder == 0)
-                return value;
-
-            return remainder >= ((double)mod / 2) ? value + (mod - remainder) : value - remainder;
-        }
-
-        private static int GetCropMod2Clean(int value)
-        {
-            int remainder = value % 2;
-            if (remainder == 0) return value;
-            return (value + remainder);
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/PictureSettings.resx Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Controls/Subtitles.Designer.cs Deleted

@@ -1,442 +0,0 @@
-namespace Handbrake.Controls
-{
-    partial class Subtitles
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #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.components = new System.ComponentModel.Container();
-            this.lv_subList = new System.Windows.Forms.ListView();
-            this.col_Source = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.col_forced = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.col_burned = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.col_defaultTrack = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.col_srtLang = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.col_srtChar = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.col_srtOffset = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.subMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_moveup = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_movedown = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.mnu_remove = new System.Windows.Forms.ToolStripMenuItem();
-            this.label68 = new System.Windows.Forms.Label();
-            this.drp_subtitleTracks = new System.Windows.Forms.ComboBox();
-            this.srt_offset = new System.Windows.Forms.NumericUpDown();
-            this.srt_lang = new System.Windows.Forms.ComboBox();
-            this.srt_charcode = new System.Windows.Forms.ComboBox();
-            this.check_forced = new System.Windows.Forms.CheckBox();
-            this.check_default = new System.Windows.Forms.CheckBox();
-            this.check_burned = new System.Windows.Forms.CheckBox();
-            this.btn_srtAdd = new System.Windows.Forms.Button();
-            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.btn_addSubtitleTrack = new wyDay.Controls.SplitButton();
-            this.SubtitleTrackMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_AddAll = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_AddAllCC = new System.Windows.Forms.ToolStripMenuItem();
-            this.SubtitleRemoveButtonMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_ClearAll = new System.Windows.Forms.ToolStripMenuItem();
-            this.btn_RemoveTrack = new wyDay.Controls.SplitButton();
-            this.subMenu.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.srt_offset)).BeginInit();
-            this.SubtitleTrackMenu.SuspendLayout();
-            this.SubtitleRemoveButtonMenu.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // lv_subList
-            // 
-            this.lv_subList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.col_Source,
-            this.col_forced,
-            this.col_burned,
-            this.col_defaultTrack,
-            this.col_srtLang,
-            this.col_srtChar,
-            this.col_srtOffset});
-            this.lv_subList.ContextMenuStrip = this.subMenu;
-            this.lv_subList.FullRowSelect = true;
-            this.lv_subList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
-            this.lv_subList.HideSelection = false;
-            this.lv_subList.LabelWrap = false;
-            this.lv_subList.Location = new System.Drawing.Point(16, 96);
-            this.lv_subList.MultiSelect = false;
-            this.lv_subList.Name = "lv_subList";
-            this.lv_subList.Size = new System.Drawing.Size(688, 186);
-            this.lv_subList.TabIndex = 70;
-            this.lv_subList.UseCompatibleStateImageBehavior = false;
-            this.lv_subList.View = System.Windows.Forms.View.Details;
-            this.lv_subList.SelectedIndexChanged += new System.EventHandler(this.LbSubListSelectedIndexChanged);
-            // 
-            // col_Source
-            // 
-            this.col_Source.Text = "Track";
-            this.col_Source.Width = 160;
-            // 
-            // col_forced
-            // 
-            this.col_forced.Text = "Forced Only";
-            this.col_forced.Width = 74;
-            // 
-            // col_burned
-            // 
-            this.col_burned.Text = "Burned In";
-            this.col_burned.Width = 64;
-            // 
-            // col_defaultTrack
-            // 
-            this.col_defaultTrack.Text = "Default";
-            this.col_defaultTrack.Width = 56;
-            // 
-            // col_srtLang
-            // 
-            this.col_srtLang.Text = "Srt Lang";
-            this.col_srtLang.Width = 120;
-            // 
-            // col_srtChar
-            // 
-            this.col_srtChar.Text = "Srt CharCode";
-            this.col_srtChar.Width = 120;
-            // 
-            // col_srtOffset
-            // 
-            this.col_srtOffset.Text = "Srt Offset (ms)";
-            this.col_srtOffset.Width = 90;
-            // 
-            // subMenu
-            // 
-            this.subMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_moveup,
-            this.mnu_movedown,
-            this.toolStripSeparator2,
-            this.mnu_remove});
-            this.subMenu.Name = "audioMenu";
-            this.subMenu.Size = new System.Drawing.Size(139, 76);
-            // 
-            // mnu_moveup
-            // 
-            this.mnu_moveup.Name = "mnu_moveup";
-            this.mnu_moveup.Size = new System.Drawing.Size(138, 22);
-            this.mnu_moveup.Text = "Move Up";
-            this.mnu_moveup.Click += new System.EventHandler(this.MnuMoveupClick);
-            // 
-            // mnu_movedown
-            // 
-            this.mnu_movedown.Name = "mnu_movedown";
-            this.mnu_movedown.Size = new System.Drawing.Size(138, 22);
-            this.mnu_movedown.Text = "Move Down";
-            this.mnu_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.mnu_movedown.Click += new System.EventHandler(this.MnuMovedownClick);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(135, 6);
-            // 
-            // mnu_remove
-            // 
-            this.mnu_remove.Name = "mnu_remove";
-            this.mnu_remove.Size = new System.Drawing.Size(138, 22);
-            this.mnu_remove.Text = "Remove";
-            this.mnu_remove.Click += new System.EventHandler(this.MnuRemoveClick);
-            // 
-            // label68
-            // 
-            this.label68.AutoSize = true;
-            this.label68.BackColor = System.Drawing.Color.Transparent;
-            this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label68.Location = new System.Drawing.Point(13, 13);
-            this.label68.Name = "label68";
-            this.label68.Size = new System.Drawing.Size(57, 13);
-            this.label68.TabIndex = 67;
-            this.label68.Text = "Subtitles";
-            // 
-            // drp_subtitleTracks
-            // 
-            this.drp_subtitleTracks.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_subtitleTracks.FormattingEnabled = true;
-            this.drp_subtitleTracks.Location = new System.Drawing.Point(16, 69);
-            this.drp_subtitleTracks.Name = "drp_subtitleTracks";
-            this.drp_subtitleTracks.Size = new System.Drawing.Size(162, 21);
-            this.drp_subtitleTracks.TabIndex = 74;
-            this.drp_subtitleTracks.SelectedIndexChanged += new System.EventHandler(this.DrpSubtitleTracksSelectedIndexChanged);
-            // 
-            // srt_offset
-            // 
-            this.srt_offset.Enabled = false;
-            this.srt_offset.Increment = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-            this.srt_offset.Location = new System.Drawing.Point(620, 70);
-            this.srt_offset.Maximum = new decimal(new int[] {
-            1000000000,
-            0,
-            0,
-            0});
-            this.srt_offset.Minimum = new decimal(new int[] {
-            1000000000,
-            0,
-            0,
-            -2147483648});
-            this.srt_offset.Name = "srt_offset";
-            this.srt_offset.Size = new System.Drawing.Size(58, 21);
-            this.srt_offset.TabIndex = 79;
-            this.toolTip.SetToolTip(this.srt_offset, "Adjust the offset in milliseconds between video and srt timestamps");
-            this.srt_offset.ValueChanged += new System.EventHandler(this.SrtOffsetValueChanged);
-            // 
-            // srt_lang
-            // 
-            this.srt_lang.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.srt_lang.Enabled = false;
-            this.srt_lang.FormattingEnabled = true;
-            this.srt_lang.Location = new System.Drawing.Point(371, 69);
-            this.srt_lang.Name = "srt_lang";
-            this.srt_lang.Size = new System.Drawing.Size(114, 21);
-            this.srt_lang.TabIndex = 50;
-            this.srt_lang.SelectedIndexChanged += new System.EventHandler(this.SrtLangSelectedIndexChanged);
-            // 
-            // srt_charcode
-            // 
-            this.srt_charcode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.srt_charcode.Enabled = false;
-            this.srt_charcode.FormattingEnabled = true;
-            this.srt_charcode.Items.AddRange(new object[] {
-            "ANSI_X3.4-1968",
-            "ANSI_X3.4-1986",
-            "ANSI_X3.4",
-            "ANSI_X3.110-1983",
-            "ANSI_X3.110",
-            "ASCII",
-            "ECMA-114",
-            "ECMA-118",
-            "ECMA-128",
-            "ECMA-CYRILLIC",
-            "IEC_P27-1",
-            "ISO-8859-1",
-            "ISO-8859-2",
-            "ISO-8859-3",
-            "ISO-8859-4",
-            "ISO-8859-5",
-            "ISO-8859-6",
-            "ISO-8859-7",
-            "ISO-8859-8",
-            "ISO-8859-9",
-            "ISO-8859-9E",
-            "ISO-8859-10",
-            "ISO-8859-11",
-            "ISO-8859-13",
-            "ISO-8859-14",
-            "ISO-8859-15",
-            "ISO-8859-16",
-            "UTF-7",
-            "UTF-8",
-            "UTF-16",
-            "UTF-32"});
-            this.srt_charcode.Location = new System.Drawing.Point(495, 69);
-            this.srt_charcode.Name = "srt_charcode";
-            this.srt_charcode.Size = new System.Drawing.Size(101, 21);
-            this.srt_charcode.TabIndex = 73;
-            this.srt_charcode.SelectedIndexChanged += new System.EventHandler(this.SrtCharcodeSelectedIndexChanged);
-            // 
-            // check_forced
-            // 
-            this.check_forced.AutoSize = true;
-            this.check_forced.Location = new System.Drawing.Point(208, 72);
-            this.check_forced.Name = "check_forced";
-            this.check_forced.Size = new System.Drawing.Size(15, 14);
-            this.check_forced.TabIndex = 75;
-            this.check_forced.UseVisualStyleBackColor = true;
-            this.check_forced.CheckedChanged += new System.EventHandler(this.CheckForcedCheckedChanged);
-            // 
-            // check_default
-            // 
-            this.check_default.AutoSize = true;
-            this.check_default.Location = new System.Drawing.Point(334, 72);
-            this.check_default.Name = "check_default";
-            this.check_default.Size = new System.Drawing.Size(15, 14);
-            this.check_default.TabIndex = 77;
-            this.check_default.UseVisualStyleBackColor = true;
-            this.check_default.CheckedChanged += new System.EventHandler(this.CheckDefaultCheckedChanged);
-            // 
-            // check_burned
-            // 
-            this.check_burned.AutoSize = true;
-            this.check_burned.Location = new System.Drawing.Point(274, 72);
-            this.check_burned.Name = "check_burned";
-            this.check_burned.Size = new System.Drawing.Size(15, 14);
-            this.check_burned.TabIndex = 76;
-            this.check_burned.UseVisualStyleBackColor = true;
-            this.check_burned.CheckedChanged += new System.EventHandler(this.CheckBurnedCheckedChanged);
-            // 
-            // btn_srtAdd
-            // 
-            this.btn_srtAdd.BackColor = System.Drawing.Color.Transparent;
-            this.btn_srtAdd.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_srtAdd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_srtAdd.Location = new System.Drawing.Point(179, 38);
-            this.btn_srtAdd.Name = "btn_srtAdd";
-            this.btn_srtAdd.Size = new System.Drawing.Size(88, 23);
-            this.btn_srtAdd.TabIndex = 73;
-            this.btn_srtAdd.Text = "Import SRT";
-            this.toolTip.SetToolTip(this.btn_srtAdd, "Add a new SRT file to the \"track\" dropdown menu.");
-            this.btn_srtAdd.UseVisualStyleBackColor = false;
-            this.btn_srtAdd.Click += new System.EventHandler(this.BtnSrtAddClick);
-            // 
-            // openFileDialog
-            // 
-            this.openFileDialog.DefaultExt = "srt";
-            this.openFileDialog.Filter = "SRT Files |*.srt";
-            // 
-            // btn_addSubtitleTrack
-            // 
-            this.btn_addSubtitleTrack.AutoSize = true;
-            this.btn_addSubtitleTrack.ContextMenuStrip = this.SubtitleTrackMenu;
-            this.btn_addSubtitleTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_addSubtitleTrack.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_addSubtitleTrack.Location = new System.Drawing.Point(16, 38);
-            this.btn_addSubtitleTrack.Name = "btn_addSubtitleTrack";
-            this.btn_addSubtitleTrack.Size = new System.Drawing.Size(69, 23);
-            this.btn_addSubtitleTrack.SplitMenuStrip = this.SubtitleTrackMenu;
-            this.btn_addSubtitleTrack.TabIndex = 80;
-            this.btn_addSubtitleTrack.Text = "Add";
-            this.btn_addSubtitleTrack.UseVisualStyleBackColor = true;
-            this.btn_addSubtitleTrack.Click += new System.EventHandler(this.btn_addSubtitleTrack_Click);
-            // 
-            // SubtitleTrackMenu
-            // 
-            this.SubtitleTrackMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_AddAll,
-            this.mnu_AddAllCC});
-            this.SubtitleTrackMenu.Name = "audioMenu";
-            this.SubtitleTrackMenu.Size = new System.Drawing.Size(196, 48);
-            // 
-            // mnu_AddAll
-            // 
-            this.mnu_AddAll.Name = "mnu_AddAll";
-            this.mnu_AddAll.Size = new System.Drawing.Size(195, 22);
-            this.mnu_AddAll.Text = "Add All";
-            this.mnu_AddAll.Click += new System.EventHandler(this.mnu_AddAll_Click);
-            // 
-            // mnu_AddAllCC
-            // 
-            this.mnu_AddAllCC.Name = "mnu_AddAllCC";
-            this.mnu_AddAllCC.Size = new System.Drawing.Size(195, 22);
-            this.mnu_AddAllCC.Text = "Add all Closed Caption";
-            this.mnu_AddAllCC.Click += new System.EventHandler(this.mnu_AddAllCC_Click);
-            // 
-            // SubtitleRemoveButtonMenu
-            // 
-            this.SubtitleRemoveButtonMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_ClearAll});
-            this.SubtitleRemoveButtonMenu.Name = "audioMenu";
-            this.SubtitleRemoveButtonMenu.Size = new System.Drawing.Size(153, 48);
-            // 
-            // mnu_ClearAll
-            // 
-            this.mnu_ClearAll.Name = "mnu_ClearAll";
-            this.mnu_ClearAll.Size = new System.Drawing.Size(152, 22);
-            this.mnu_ClearAll.Text = "Clear All";
-            this.mnu_ClearAll.Click += new System.EventHandler(this.mnu_ClearAll_Click);
-            // 
-            // btn_RemoveTrack
-            // 
-            this.btn_RemoveTrack.AutoSize = true;
-            this.btn_RemoveTrack.ContextMenuStrip = this.SubtitleRemoveButtonMenu;
-            this.btn_RemoveTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_RemoveTrack.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_RemoveTrack.Location = new System.Drawing.Point(91, 38);
-            this.btn_RemoveTrack.Name = "btn_RemoveTrack";
-            this.btn_RemoveTrack.Size = new System.Drawing.Size(82, 23);
-            this.btn_RemoveTrack.SplitMenuStrip = this.SubtitleRemoveButtonMenu;
-            this.btn_RemoveTrack.TabIndex = 82;
-            this.btn_RemoveTrack.Text = "Remove";
-            this.btn_RemoveTrack.UseVisualStyleBackColor = true;
-            this.btn_RemoveTrack.Click += new System.EventHandler(this.btn_RemoveTrack_Click);
-            // 
-            // Subtitles
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.drp_subtitleTracks);
-            this.Controls.Add(this.srt_offset);
-            this.Controls.Add(this.srt_lang);
-            this.Controls.Add(this.btn_RemoveTrack);
-            this.Controls.Add(this.srt_charcode);
-            this.Controls.Add(this.btn_addSubtitleTrack);
-            this.Controls.Add(this.label68);
-            this.Controls.Add(this.lv_subList);
-            this.Controls.Add(this.check_forced);
-            this.Controls.Add(this.check_burned);
-            this.Controls.Add(this.check_default);
-            this.Controls.Add(this.btn_srtAdd);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Name = "Subtitles";
-            this.Size = new System.Drawing.Size(719, 300);
-            this.subMenu.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.srt_offset)).EndInit();
-            this.SubtitleTrackMenu.ResumeLayout(false);
-            this.SubtitleRemoveButtonMenu.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.ListView lv_subList;
-        private System.Windows.Forms.ColumnHeader col_Source;
-        private System.Windows.Forms.ColumnHeader col_forced;
-        private System.Windows.Forms.ColumnHeader col_burned;
-        internal System.Windows.Forms.Label label68;
-        private System.Windows.Forms.ColumnHeader col_defaultTrack;
-        private System.Windows.Forms.ContextMenuStrip subMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_moveup;
-        private System.Windows.Forms.ToolStripMenuItem mnu_movedown;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripMenuItem mnu_remove;
-        private System.Windows.Forms.Button btn_srtAdd;
-        private System.Windows.Forms.ColumnHeader col_srtChar;
-        private System.Windows.Forms.ColumnHeader col_srtOffset;
-        internal System.Windows.Forms.ComboBox srt_charcode;
-        internal System.Windows.Forms.ComboBox srt_lang;
-        private System.Windows.Forms.NumericUpDown srt_offset;
-        private System.Windows.Forms.OpenFileDialog openFileDialog;
-        private System.Windows.Forms.CheckBox check_default;
-        private System.Windows.Forms.CheckBox check_burned;
-        private System.Windows.Forms.CheckBox check_forced;
-        internal System.Windows.Forms.ComboBox drp_subtitleTracks;
-        private System.Windows.Forms.ColumnHeader col_srtLang;
-        private System.Windows.Forms.ToolTip toolTip;
-        private wyDay.Controls.SplitButton btn_addSubtitleTrack;
-        private System.Windows.Forms.ContextMenuStrip SubtitleTrackMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_AddAll;
-        private System.Windows.Forms.ToolStripMenuItem mnu_AddAllCC;
-        private System.Windows.Forms.ContextMenuStrip SubtitleRemoveButtonMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_ClearAll;
-        private wyDay.Controls.SplitButton btn_RemoveTrack;
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/Controls/Subtitles.cs Deleted

@@ -1,875 +0,0 @@
-/*  Subtitles.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
-    using System.ComponentModel;
-    using System.IO;
-    using System.Linq;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.ApplicationServices.Utilities;
-
-    /// <summary>
-    /// The Subtitles Tab
-    /// </summary>
-    public partial class Subtitles : UserControl
-    {
-        #region Priavate Variables and Collections
-
-        /// <summary>
-        /// Map of languages to language codes
-        /// </summary>
-        private readonly IDictionary<string, string> langMap = new Dictionary<string, string>();
-
-        /// <summary>
-        /// A List of SRT Files
-        /// </summary>
-        private readonly IDictionary<string, string> srtFiles = new Dictionary<string, string>();
-
-        /// <summary>
-        /// The Subtitle List
-        /// </summary>
-        private readonly List<SubtitleTrack> subList = new List<SubtitleTrack>();
-
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Subtitles"/> class.
-        /// </summary>
-        public Subtitles()
-        {
-            InitializeComponent();
-
-            langMap = LanguageUtilities.MapLanguages();
-            foreach (string key in langMap.Keys)
-                srt_lang.Items.Add(key);
-
-            srt_charcode.SelectedIndex = 28;
-            srt_lang.SelectedIndex = 40;
-        }
-
-        /// <summary>
-        /// Gets SubtitlesList.
-        /// </summary>
-        public List<SubtitleTrack> SubtitlesList
-        {
-            get
-            {
-                return subList;
-            }
-        }
-
-        #region Public Methods
-        /// <summary>
-        /// Gets the CLI Query for this panel
-        /// </summary>
-        /// <returns>A CliQuery string</returns>
-        public string GetCliQuery
-        {
-            get
-            {
-                string query = string.Empty;
-                if (lv_subList.Items.Count != 0) // If we have subtitle tracks
-                {
-                    // BitMap and CC's
-                    string subtitleTracks = String.Empty;
-                    string subtitleForced = String.Empty;
-                    string subtitleBurn = String.Empty;
-                    string subtitleDefault = String.Empty;
-
-                    // SRT
-                    string srtFile = String.Empty;
-                    string srtCodeset = String.Empty;
-                    string srtOffset = String.Empty;
-                    string srtLang = String.Empty;
-                    string srtDefault = String.Empty;
-                    int srtCount = 0;
-                    int subCount = 0;
-
-                    foreach (SubtitleTrack item in subList)
-                    {
-                        string itemToAdd;
-
-                        if (item.IsSrtSubtitle) // We have an SRT file
-                        {
-                            srtCount++; // SRT track id.
-
-                            srtLang += srtLang == string.Empty ? langMap[item.SrtLang] : "," + langMap[item.SrtLang];
-                            srtCodeset += srtCodeset == string.Empty ? item.SrtCharCode : "," + item.SrtCharCode;
-
-                            if (item.Default)
-                                srtDefault = srtCount.ToString();
-
-                            itemToAdd = item.SrtPath;
-                            srtFile += srtFile == string.Empty ? itemToAdd : "," + itemToAdd;
-
-                            itemToAdd = item.SrtOffset.ToString();
-                            srtOffset += srtOffset == string.Empty ? itemToAdd : "," + itemToAdd;
-                        }
-                        else // We have Bitmap or CC
-                        {
-                            subCount++;
-
-                            // Find --subtitle <string>
-                            if (item.Track.Contains("Foreign Audio Search"))
-                                itemToAdd = "scan";
-                            else
-                            {
-                                string[] tempSub = item.Track.Split(' ');
-                                itemToAdd = tempSub[0];
-                            }
-
-                            subtitleTracks += subtitleTracks == string.Empty ? itemToAdd : "," + itemToAdd;
-
-                            // Find --subtitle-forced
-                            if (item.Forced)
-                                subtitleForced += subtitleForced == string.Empty ? subCount.ToString() : "," + subCount;
-
-                            // Find --subtitle-burn
-                            if (item.Burned)
-                                subtitleBurn = subCount.ToString();
-
-                            // Find --subtitle-default
-                            if (item.Default)
-                                subtitleDefault = subCount.ToString();
-                        }
-                    }
-
-                    // Build The CLI Subtitles Query
-                    if (subtitleTracks != string.Empty)
-                    {
-                        query += " --subtitle " + subtitleTracks;
-
-                        if (subtitleForced != string.Empty)
-                            query += " --subtitle-forced=" + subtitleForced;
-                        if (subtitleBurn != string.Empty)
-                            query += " --subtitle-burn=" + subtitleBurn;
-                        if (subtitleDefault != string.Empty)
-                            query += " --subtitle-default=" + subtitleDefault;
-                    }
-
-                    if (srtFile != string.Empty) // SRTs
-                    {
-                        query += " --srt-file " + "\"" + srtFile + "\"";
-
-                        if (srtCodeset != string.Empty)
-                            query += " --srt-codeset " + srtCodeset;
-                        if (srtOffset != string.Empty)
-                            query += " --srt-offset " + srtOffset;
-                        if (srtLang != string.Empty)
-                            query += " --srt-lang " + srtLang;
-                        if (srtDefault != string.Empty)
-                            query += " --srt-default=" + srtDefault;
-                    }
-                }
-                return query;
-            }
-        }
-
-        /// <summary>
-        /// Checks of the current settings will require the m4v file extension
-        /// </summary>
-        /// <returns>True if Yes</returns>
-        public bool RequiresM4V()
-        {
-            return this.subList.Any(track => track.SubtitleType != SubtitleType.VobSub);
-        }
-
-        /// <summary>
-        /// Automatically setup the subtitle tracks.
-        /// This handles the automatic setup of subitles which the user can control from the program options
-        /// </summary>
-        /// <param name="subs">List of Subtitles</param>
-        public void SetSubtitleTrackAuto(object[] subs)
-        {
-            drp_subtitleTracks.Items.Clear();
-            drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");
-            drp_subtitleTracks.Items.AddRange(subs);
-            drp_subtitleTracks.SelectedIndex = 0;
-            Clear();
-
-            this.AutomaticSubtitleSelection();
-        }
-
-        /// <summary>
-        /// Automatic Subtitle Selection based on user preferences.
-        /// </summary>
-        public void AutomaticSubtitleSelection()
-        {
-            // Avoid trying to add elements when no subtitles are there.
-            if (drp_subtitleTracks.Items.Count < 2)
-            {
-                return;
-            }
-
-            this.Clear();
-
-            // Array with the Index numbers of the prefered and additional languages. 
-            // This allows to have for each language the order in which they appear in the DVD list.
-            Dictionary<String, ArrayList> languageIndex = new Dictionary<String, ArrayList>();
-
-            // This is used to keep the Prefered Language in the front and the other languages in order.
-            ArrayList languageOrder = new ArrayList();
-
-            // New DUB Settings
-            int mode = UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
-
-            // Native Language is not 'Any', so initialising the Language Dictionary
-            if (mode >= 3)
-            {
-                languageIndex.Add(UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles), new ArrayList());
-                languageOrder.Add(UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles));
-
-                foreach (string item in UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
-                {
-                    if (!languageIndex.ContainsKey(item))
-                    {
-                        languageIndex.Add(item, new ArrayList());
-                        languageOrder.Add(item);
-                    }
-                }
-
-                bool elementFound = false;
-                int i = 0;
-                foreach (object item in drp_subtitleTracks.Items)
-                {
-                    foreach (KeyValuePair<String, ArrayList> kvp in languageIndex)
-                    {
-                        if (item.ToString().Contains(kvp.Key))
-                        {
-                            kvp.Value.Add(i);
-                            elementFound = true;
-                        }
-                    }
-
-                    i++;
-                }
-
-                // If there are no selected languages found, the first available will be taken.
-                if (!elementFound)
-                    mode = 2;
-            }
-
-            switch (mode)
-            {
-                case 1: // Adding all audio tracks
-                    for (int i = 1; i < drp_subtitleTracks.Items.Count; i++)
-                    {
-                        drp_subtitleTracks.SelectedIndex = i;
-                        this.btn_addSubtitleTrack_Click(this, new EventArgs());
-                    }
-                    break;
-                case 2: // Adding only the first Audio Track
-                    drp_subtitleTracks.SelectedIndex = 1;
-                    if (drp_subtitleTracks.SelectedItem != null)
-                        this.btn_addSubtitleTrack_Click(this, new EventArgs());
-                    break;
-                case 3: // Selected Languages Only
-                    foreach (string item in languageOrder)
-                    {
-                        if (languageIndex[item].Count > 0)
-                        {
-                            foreach (int i in languageIndex[item])
-                            {
-                                drp_subtitleTracks.SelectedIndex = i;
-                                if (drp_subtitleTracks.SelectedItem != null)
-                                {
-                                    this.btn_addSubtitleTrack_Click(this, new EventArgs());
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case 4: // Prefered Only
-                case 5: // Prefered Only All
-                    if (languageIndex[(string)languageOrder[0]].Count > 0)
-                    {
-                        foreach (int i in languageIndex[(string)languageOrder[0]])
-                        {
-                            drp_subtitleTracks.SelectedIndex = i;
-                            if (drp_subtitleTracks.SelectedItem != null)
-                            {
-                                this.btn_addSubtitleTrack_Click(this, new EventArgs());
-                                if (mode == 4)
-                                {
-                                    // Mode 4 is First, 5 is All
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    break;
-            }
-
-            // Revert the selection back tio the first item.
-            drp_subtitleTracks.SelectedIndex = 0;
-
-            // Add Closed Captions if the user has the option enabled.
-            if (UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption))
-            {
-                foreach (object item in drp_subtitleTracks.Items)
-                {
-                    if (item.ToString().Contains("Closed"))
-                    {
-                        drp_subtitleTracks.SelectedItem = item;
-                        btn_addSubtitleTrack_Click(this, EventArgs.Empty);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Clear the Subtitle List
-        /// </summary>
-        public void Clear()
-        {
-            lv_subList.Items.Clear();
-            subList.Clear();
-            srtFiles.Clear();
-        }
-        #endregion
-
-        #region Primary Controls
-
-        /// <summary>
-        /// Add a subtitle Track
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void btn_addSubtitleTrack_Click(object sender, EventArgs e)
-        {
-            if (drp_subtitleTracks.SelectedItem == null)
-            {
-                MessageBox.Show("No Subtitle Track Selected.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            // Logic
-            string srtCode = "-", srtLangVal = "-", srtPath = "-", srtFile = "-";
-            int srtOffsetMs = 0;
-
-            // Make sure we only have 1 burned track. We'll always give the latest track added burned in.
-            if (check_burned.Checked)
-                this.SetBurnedToOffForAllTracks();
-
-            // Make sure we only have 1 default track
-            if (check_default.Checked)
-                this.SetDefaultToOffForAllTracks();
-
-            if (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))
-            {
-                srtFiles.TryGetValue(drp_subtitleTracks.SelectedItem.ToString(), out srtPath);
-                srtFile = drp_subtitleTracks.SelectedItem.ToString();
-                srtLangVal = srt_lang.SelectedItem.ToString();
-                srtCode = srt_charcode.SelectedItem.ToString();
-                srtOffsetMs = (int)srt_offset.Value;
-            }
-
-            string trackName = (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))
-                                   ? srtLangVal + " (" + srtFile + ")"
-                                   : drp_subtitleTracks.SelectedItem.ToString();
-
-            SubtitleTrack track = new SubtitleTrack
-            {
-                Track = trackName,
-                Forced = check_forced.Checked,
-                Burned = check_burned.Checked,
-                Default = check_default.Checked,
-                SrtLang = srtLangVal,
-                SrtCharCode = srtCode,
-                SrtOffset = srtOffsetMs,
-                SrtPath = srtPath,
-                SrtFileName = srtFile
-            };
-
-            lv_subList.Items.Add(track.ListView);
-            subList.Add(track);
-        }
-
-        /// <summary>
-        /// Add all audio tracks.
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void mnu_AddAll_Click(object sender, EventArgs e)
-        {
-            // TODO - Might need to be a bit more clever with this. Will wait and see if this causes any problems.
-            foreach (object item in drp_subtitleTracks.Items)
-            {
-                if (!item.ToString().Contains("Foreign Audio Search"))
-                {
-                    drp_subtitleTracks.SelectedItem = item;
-                    btn_addSubtitleTrack_Click(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Add all closed caption tracks
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void mnu_AddAllCC_Click(object sender, EventArgs e)
-        {
-            foreach (object item in drp_subtitleTracks.Items)
-            {
-                if (item.ToString().Contains("Closed"))
-                {
-                    drp_subtitleTracks.SelectedItem = item;
-                    btn_addSubtitleTrack_Click(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Clear all tracks.
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void mnu_ClearAll_Click(object sender, EventArgs e)
-        {
-            lv_subList.Items.Clear();
-            subList.Clear();
-        }
-
-        /// <summary>
-        /// Remvoe a track
-        /// </summary>
-        /// <param name="sender">
-        /// The Sender
-        /// </param>
-        /// <param name="e">
-        /// The Event Args
-        /// </param>
-        private void btn_RemoveTrack_Click(object sender, EventArgs e)
-        {
-            this.RemoveSelectedTrack();
-        }
-
-        /// <summary>
-        /// Import an SRT Subtitle Track
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnSrtAddClick(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() != DialogResult.OK)
-                return;
-
-            if (srtFiles.ContainsKey(Path.GetFileName(openFileDialog.FileName)))
-            {
-                MessageBox.Show(
-                    "A Subtitle track with the same name has already been imported.",
-                    "Warning",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Warning);
-                return;
-            }
-
-            drp_subtitleTracks.Items.Add(Path.GetFileName(openFileDialog.FileName));
-            drp_subtitleTracks.SelectedItem = Path.GetFileName(openFileDialog.FileName);
-            srtFiles.Add(Path.GetFileName(openFileDialog.FileName), openFileDialog.FileName);
-        }
-
-        /// <summary>
-        /// The Subtitle List selected index has changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void LbSubListSelectedIndexChanged(object sender, EventArgs e)
-        {
-            // Set the dropdown controls based on the selected item in the List.
-            if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)
-            {
-                SubtitleTrack track = subList[lv_subList.SelectedIndices[0]];
-
-                int c = 0;
-                if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text.ToLower().Contains(".srt"))
-                // We have an SRT
-                {
-                    foreach (var item in drp_subtitleTracks.Items)
-                    {
-                        if (item.ToString() == track.SrtFileName)
-                            drp_subtitleTracks.SelectedIndex = c;
-                        c++;
-                    }
-                    srt_lang.SelectedItem = track.SrtLang;
-                    srt_offset.Value = track.SrtOffset;
-                    srt_charcode.SelectedItem = track.SrtCharCode;
-                    check_default.CheckState = track.Default ? CheckState.Checked : CheckState.Unchecked;
-                }
-                else // We have Bitmap/CC
-                {
-                    foreach (var item in drp_subtitleTracks.Items)
-                    {
-                        if (item.ToString() == track.Track)
-                            drp_subtitleTracks.SelectedIndex = c;
-                        c++;
-                    }
-                    check_forced.CheckState = track.Forced ? CheckState.Checked : CheckState.Unchecked;
-                    check_burned.CheckState = track.Burned ? CheckState.Checked : CheckState.Unchecked;
-                    check_default.CheckState = track.Default ? CheckState.Checked : CheckState.Unchecked;
-                }
-            }
-        }
-
-        #endregion
-
-        #region Subtitle Controls
-
-        /// <summary>
-        /// Handle the Subtitle track dropdown changed event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void DrpSubtitleTracksSelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))
-            {
-                check_forced.Enabled = false;
-                check_burned.Enabled = false;
-                srt_lang.Enabled = true;
-                srt_charcode.Enabled = true;
-                srt_offset.Enabled = true;
-            }
-            else
-            {
-                check_forced.Enabled = true;
-                check_burned.Enabled = true;
-                srt_lang.Enabled = false;
-                srt_charcode.Enabled = false;
-                srt_offset.Enabled = false;
-            }
-            // Update an item in the  list if required.
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;
-
-            if (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))
-            {
-                lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text = srt_lang.SelectedItem + "(" +
-                                                                                   drp_subtitleTracks.SelectedItem + ")";
-                lv_subList.Select();
-
-                string srtPath;
-                srtFiles.TryGetValue(drp_subtitleTracks.SelectedItem.ToString(), out srtPath);
-                subList[lv_subList.SelectedIndices[0]].SrtPath = srtPath;
-            }
-            else
-            {
-                lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text =
-                    drp_subtitleTracks.SelectedItem.ToString();
-                lv_subList.Select();
-            }
-
-            subList[lv_subList.SelectedIndices[0]].Track = drp_subtitleTracks.SelectedItem.ToString();
-        }
-
-        /// <summary>
-        /// Foreced Subtitles checkbox changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void CheckForcedCheckedChanged(object sender, EventArgs e)
-        {
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;
-
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text = check_forced.Checked ? "Yes" : "No";
-            lv_subList.Select();
-
-            subList[lv_subList.SelectedIndices[0]].Forced = check_forced.Checked;
-            // Update SubList List<SubtitleInfo> 
-        }
-
-        /// <summary>
-        /// Burned in subtitles checkbox changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void CheckBurnedCheckedChanged(object sender, EventArgs e)
-        {
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;
-
-            if (check_burned.Checked) // Make sure we only have 1 burned track
-                this.SetBurnedToOffForAllTracks();
-
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[2].Text = check_burned.Checked ? "Yes" : "No";
-            lv_subList.Select();
-
-            subList[lv_subList.SelectedIndices[0]].Burned = check_burned.Checked;
-            // Update SubList List<SubtitleInfo> 
-        }
-
-        /// <summary>
-        /// Default Subitle track check changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void CheckDefaultCheckedChanged(object sender, EventArgs e)
-        {
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;
-
-            if (check_default.Checked) // Make sure we only have 1 default track
-                this.SetDefaultToOffForAllTracks();
-
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[3].Text = check_default.Checked ? "Yes" : "No";
-            lv_subList.Select();
-
-            subList[lv_subList.SelectedIndices[0]].Default = check_default.Checked;
-            // Update SubList List<SubtitleInfo>
-        }
-
-        /// <summary>
-        /// Srt Offset Numeric Control Changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void SrtOffsetValueChanged(object sender, EventArgs e)
-        {
-            // Update an item in the  list if required.
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0)
-                return;
-
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[6].Text = srt_offset.Value.ToString();
-            lv_subList.Select();
-
-            subList[lv_subList.SelectedIndices[0]].SrtOffset = (int)srt_offset.Value;
-            // Update SubList List<SubtitleInfo>
-        }
-
-        /// <summary>
-        /// The SRT Charcode changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void SrtCharcodeSelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;
-
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[5].Text = srt_charcode.SelectedItem.ToString();
-            lv_subList.Select();
-
-            subList[lv_subList.SelectedIndices[0]].SrtCharCode = srt_charcode.SelectedItem.ToString();
-            // Update SubList List<SubtitleInfo>
-        }
-
-        /// <summary>
-        /// The Srt Language code changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void SrtLangSelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;
-
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[4].Text = srt_lang.SelectedItem.ToString();
-            lv_subList.Select();
-
-            subList[lv_subList.SelectedIndices[0]].SrtLang = srt_lang.SelectedItem.ToString();
-            // Update SubList List<SubtitleInfo>
-        }
-
-        #endregion
-
-        #region Right Click Menu
-
-        /// <summary>
-        /// Move an item in the subtitle list up
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuMoveupClick(object sender, EventArgs e)
-        {
-            if (lv_subList.SelectedIndices.Count != 0)
-            {
-                ListViewItem item = lv_subList.SelectedItems[0];
-                int index = item.Index;
-                index--;
-
-                if (lv_subList.Items.Count > index && index >= 0)
-                {
-                    lv_subList.Items.Remove(item);
-                    lv_subList.Items.Insert(index, item);
-                    item.Selected = true;
-                    lv_subList.Focus();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Move an item in the subtitle list down
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuMovedownClick(object sender, EventArgs e)
-        {
-            if (lv_subList.SelectedIndices.Count != 0)
-            {
-                ListViewItem item = lv_subList.SelectedItems[0];
-                int index = item.Index;
-                index++;
-
-                if (index < lv_subList.Items.Count)
-                {
-                    lv_subList.Items.Remove(item);
-                    lv_subList.Items.Insert(index, item);
-                    item.Selected = true;
-                    lv_subList.Focus();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Remove a selected subtitle track.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuRemoveClick(object sender, EventArgs e)
-        {
-            this.RemoveSelectedTrack();
-        }
-
-        #endregion
-
-        #region Helpers
-        /// <summary>
-        /// Set all Non SRT tracks to Default = NO
-        /// </summary>
-        private void SetDefaultToOffForAllTracks()
-        {
-            int c = 0;
-            foreach (ListViewItem item in lv_subList.Items)
-            {
-                if (item.SubItems[3].Text == "Yes")
-                {
-                    item.SubItems[3].Text = "No";
-                    subList[c].Default = false;
-                }
-                c++;
-            }
-        }
-
-        /// <summary>
-        /// Set all tracks to Burned = No
-        /// </summary>
-        private void SetBurnedToOffForAllTracks()
-        {
-            int c = 0;
-            foreach (ListViewItem item in lv_subList.Items)
-            {
-                if (item.SubItems[2].Text == "Yes")
-                {
-                    item.SubItems[2].Text = "No";
-                    subList[c].Burned = false;
-                }
-                c++;
-            }
-        }
-
-        /// <summary>
-        /// Remove a selected track
-        /// </summary>
-        private void RemoveSelectedTrack()
-        {
-            // Remove the Item and reselect the control if the following conditions are met.
-            if (lv_subList.SelectedItems.Count != 0)
-            {
-                // Record the current selected index.
-                int currentPosition = lv_subList.SelectedIndices[0];
-                int selectedInd = lv_subList.SelectedIndices[0];
-
-                lv_subList.Items.RemoveAt(selectedInd);
-                subList.RemoveAt(selectedInd);
-
-                // Now reslect the correct item and give focus to the list.
-                if (lv_subList.Items.Count != 0)
-                {
-                    if (currentPosition <= (lv_subList.Items.Count - 1))
-                        lv_subList.Items[currentPosition].Selected = true;
-                    else if (currentPosition > (lv_subList.Items.Count - 1))
-                        lv_subList.Items[lv_subList.Items.Count - 1].Selected = true;
-
-                    lv_subList.Select();
-                }
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/Subtitles.resx Deleted

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="subMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>237, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>113, 17</value>
-  </metadata>
-  <metadata name="SubtitleTrackMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>317, 20</value>
-  </metadata>
-  <metadata name="SubtitleRemoveButtonMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>471, 20</value>
-  </metadata>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/x264Panel.Designer.cs Deleted

@@ -1,775 +0,0 @@
-/*  x264Panel.Designer.cs $
- 	
- 	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.fr>.
- 	   It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    partial class x264Panel
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #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.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(x264Panel));
-            this.slider_psytrellis = new System.Windows.Forms.TrackBar();
-            this.lbl_psytrellis = new System.Windows.Forms.Label();
-            this.lbl_psyrd = new System.Windows.Forms.Label();
-            this.slider_psyrd = new System.Windows.Forms.TrackBar();
-            this.lbl_adaptBFrames = new System.Windows.Forms.Label();
-            this.drop_adaptBFrames = new System.Windows.Forms.ComboBox();
-            this.label43 = new System.Windows.Forms.Label();
-            this.btn_reset = new System.Windows.Forms.Button();
-            this.rtf_x264Query = new System.Windows.Forms.RichTextBox();
-            this.check_Cabac = new System.Windows.Forms.CheckBox();
-            this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();
-            this.lbl_trellis = new System.Windows.Forms.Label();
-            this.drop_trellis = new System.Windows.Forms.ComboBox();
-            this.drop_deblockBeta = new System.Windows.Forms.ComboBox();
-            this.label41 = new System.Windows.Forms.Label();
-            this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();
-            this.check_8x8DCT = new System.Windows.Forms.CheckBox();
-            this.label45 = new System.Windows.Forms.Label();
-            this.drop_analysis = new System.Windows.Forms.ComboBox();
-            this.label48 = new System.Windows.Forms.Label();
-            this.drop_subpixelMotionEstimation = new System.Windows.Forms.ComboBox();
-            this.lbl_merange = new System.Windows.Forms.Label();
-            this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();
-            this.label54 = new System.Windows.Forms.Label();
-            this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();
-            this.lbl_direct_prediction = new System.Windows.Forms.Label();
-            this.drop_directPrediction = new System.Windows.Forms.ComboBox();
-            this.label62 = new System.Windows.Forms.Label();
-            this.drop_bFrames = new System.Windows.Forms.ComboBox();
-            this.label64 = new System.Windows.Forms.Label();
-            this.drop_refFrames = new System.Windows.Forms.ComboBox();
-            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.check_weightp = new System.Windows.Forms.CheckBox();
-            this.slider_adaptiveQuantStrength = new System.Windows.Forms.TrackBar();
-            this.combo_pyrmidalBFrames = new System.Windows.Forms.ComboBox();
-            this.lbl_adaptiveQuantStrength = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbl_prymidalBframes = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_adaptiveQuantStrength)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // slider_psytrellis
-            // 
-            this.slider_psytrellis.BackColor = System.Drawing.SystemColors.Window;
-            this.slider_psytrellis.Location = new System.Drawing.Point(427, 231);
-            this.slider_psytrellis.Maximum = 20;
-            this.slider_psytrellis.Name = "slider_psytrellis";
-            this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);
-            this.slider_psytrellis.TabIndex = 86;
-            this.ToolTip.SetToolTip(this.slider_psytrellis, "Psychovisual Trellis tries to retain more sharpness and detail, but can cause art" +
-        "ifacting. \r\nIt is considered experimental, which is why it\'s off by default. Goo" +
-        "d values are 0.1 to 0.2.");
-            this.slider_psytrellis.Scroll += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // lbl_psytrellis
-            // 
-            this.lbl_psytrellis.AutoSize = true;
-            this.lbl_psytrellis.Location = new System.Drawing.Point(309, 231);
-            this.lbl_psytrellis.Name = "lbl_psytrellis";
-            this.lbl_psytrellis.Size = new System.Drawing.Size(102, 13);
-            this.lbl_psytrellis.TabIndex = 85;
-            this.lbl_psytrellis.Text = "Psychovisual Trellis:";
-            // 
-            // lbl_psyrd
-            // 
-            this.lbl_psyrd.AutoSize = true;
-            this.lbl_psyrd.Location = new System.Drawing.Point(264, 199);
-            this.lbl_psyrd.Name = "lbl_psyrd";
-            this.lbl_psyrd.Size = new System.Drawing.Size(147, 13);
-            this.lbl_psyrd.TabIndex = 84;
-            this.lbl_psyrd.Text = "Psychovisual Rate Distortion:";
-            // 
-            // slider_psyrd
-            // 
-            this.slider_psyrd.BackColor = System.Drawing.SystemColors.Window;
-            this.slider_psyrd.Location = new System.Drawing.Point(425, 199);
-            this.slider_psyrd.Maximum = 20;
-            this.slider_psyrd.Name = "slider_psyrd";
-            this.slider_psyrd.Size = new System.Drawing.Size(131, 45);
-            this.slider_psyrd.TabIndex = 83;
-            this.ToolTip.SetToolTip(this.slider_psyrd, resources.GetString("slider_psyrd.ToolTip"));
-            this.slider_psyrd.Value = 10;
-            this.slider_psyrd.Scroll += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // lbl_adaptBFrames
-            // 
-            this.lbl_adaptBFrames.AutoSize = true;
-            this.lbl_adaptBFrames.Location = new System.Drawing.Point(309, 28);
-            this.lbl_adaptBFrames.Name = "lbl_adaptBFrames";
-            this.lbl_adaptBFrames.Size = new System.Drawing.Size(102, 13);
-            this.lbl_adaptBFrames.TabIndex = 81;
-            this.lbl_adaptBFrames.Text = "Adaptive B-Frames:";
-            // 
-            // drop_adaptBFrames
-            // 
-            this.drop_adaptBFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_adaptBFrames.FormattingEnabled = true;
-            this.drop_adaptBFrames.Items.AddRange(new object[] {
-            "Default (Fast)",
-            "Off",
-            "Fast",
-            "Optimal"});
-            this.drop_adaptBFrames.Location = new System.Drawing.Point(417, 24);
-            this.drop_adaptBFrames.Name = "drop_adaptBFrames";
-            this.drop_adaptBFrames.Size = new System.Drawing.Size(106, 21);
-            this.drop_adaptBFrames.TabIndex = 82;
-            this.ToolTip.SetToolTip(this.drop_adaptBFrames, resources.GetString("drop_adaptBFrames.ToolTip"));
-            this.drop_adaptBFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label43
-            // 
-            this.label43.AutoSize = true;
-            this.label43.BackColor = System.Drawing.Color.Transparent;
-            this.label43.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label43.Location = new System.Drawing.Point(13, 13);
-            this.label43.Name = "label43";
-            this.label43.Size = new System.Drawing.Size(60, 13);
-            this.label43.TabIndex = 49;
-            this.label43.Text = "Encoding:";
-            // 
-            // btn_reset
-            // 
-            this.btn_reset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_reset.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_reset.Location = new System.Drawing.Point(634, 230);
-            this.btn_reset.Name = "btn_reset";
-            this.btn_reset.Size = new System.Drawing.Size(75, 23);
-            this.btn_reset.TabIndex = 79;
-            this.btn_reset.Text = "Reset All";
-            this.btn_reset.UseVisualStyleBackColor = true;
-            this.btn_reset.Click += new System.EventHandler(this.btn_reset_Click);
-            // 
-            // rtf_x264Query
-            // 
-            this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.rtf_x264Query.Location = new System.Drawing.Point(16, 259);
-            this.rtf_x264Query.Name = "rtf_x264Query";
-            this.rtf_x264Query.Size = new System.Drawing.Size(698, 43);
-            this.rtf_x264Query.TabIndex = 80;
-            this.rtf_x264Query.Text = "";
-            this.rtf_x264Query.TextChanged += new System.EventHandler(this.rtf_x264Query_TextChanged);
-            // 
-            // check_Cabac
-            // 
-            this.check_Cabac.AutoSize = true;
-            this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.check_Cabac.Checked = true;
-            this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.check_Cabac.Location = new System.Drawing.Point(3, 89);
-            this.check_Cabac.Name = "check_Cabac";
-            this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.check_Cabac.Size = new System.Drawing.Size(141, 17);
-            this.check_Cabac.TabIndex = 78;
-            this.check_Cabac.Text = "CABAC Entropy Coding:";
-            this.check_Cabac.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.ToolTip.SetToolTip(this.check_Cabac, resources.GetString("check_Cabac.ToolTip"));
-            this.check_Cabac.UseVisualStyleBackColor = true;
-            this.check_Cabac.CheckedChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // check_noDCTDecimate
-            // 
-            this.check_noDCTDecimate.AutoSize = true;
-            this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.check_noDCTDecimate.Location = new System.Drawing.Point(30, 212);
-            this.check_noDCTDecimate.Name = "check_noDCTDecimate";
-            this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.check_noDCTDecimate.Size = new System.Drawing.Size(114, 17);
-            this.check_noDCTDecimate.TabIndex = 77;
-            this.check_noDCTDecimate.Text = "No DCT-Decimate:";
-            this.check_noDCTDecimate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.ToolTip.SetToolTip(this.check_noDCTDecimate, resources.GetString("check_noDCTDecimate.ToolTip"));
-            this.check_noDCTDecimate.UseVisualStyleBackColor = true;
-            this.check_noDCTDecimate.CheckedChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // lbl_trellis
-            // 
-            this.lbl_trellis.AutoSize = true;
-            this.lbl_trellis.Location = new System.Drawing.Point(563, 43);
-            this.lbl_trellis.Name = "lbl_trellis";
-            this.lbl_trellis.Size = new System.Drawing.Size(38, 13);
-            this.lbl_trellis.TabIndex = 67;
-            this.lbl_trellis.Text = "Trellis:";
-            // 
-            // drop_trellis
-            // 
-            this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_trellis.FormattingEnabled = true;
-            this.drop_trellis.Items.AddRange(new object[] {
-            "Default (Encode Only)",
-            "Off",
-            "Encode Only",
-            "Always"});
-            this.drop_trellis.Location = new System.Drawing.Point(615, 40);
-            this.drop_trellis.Name = "drop_trellis";
-            this.drop_trellis.Size = new System.Drawing.Size(94, 21);
-            this.drop_trellis.TabIndex = 75;
-            this.ToolTip.SetToolTip(this.drop_trellis, resources.GetString("drop_trellis.ToolTip"));
-            this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // drop_deblockBeta
-            // 
-            this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_deblockBeta.FormattingEnabled = true;
-            this.drop_deblockBeta.Items.AddRange(new object[] {
-            "Default (0)",
-            "-6",
-            "-5",
-            "-4",
-            "-3",
-            "-2",
-            "-1",
-            "0",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6"});
-            this.drop_deblockBeta.Location = new System.Drawing.Point(631, 175);
-            this.drop_deblockBeta.Name = "drop_deblockBeta";
-            this.drop_deblockBeta.Size = new System.Drawing.Size(78, 21);
-            this.drop_deblockBeta.TabIndex = 74;
-            this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));
-            this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label41
-            // 
-            this.label41.AutoSize = true;
-            this.label41.Location = new System.Drawing.Point(563, 152);
-            this.label41.Name = "label41";
-            this.label41.Size = new System.Drawing.Size(62, 13);
-            this.label41.TabIndex = 66;
-            this.label41.Text = "Deblocking:";
-            // 
-            // drop_deblockAlpha
-            // 
-            this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_deblockAlpha.FormattingEnabled = true;
-            this.drop_deblockAlpha.Items.AddRange(new object[] {
-            "Default (0)",
-            "-6",
-            "-5",
-            "-4",
-            "-3",
-            "-2",
-            "-1",
-            "0",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6"});
-            this.drop_deblockAlpha.Location = new System.Drawing.Point(631, 149);
-            this.drop_deblockAlpha.Name = "drop_deblockAlpha";
-            this.drop_deblockAlpha.Size = new System.Drawing.Size(78, 21);
-            this.drop_deblockAlpha.TabIndex = 73;
-            this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));
-            this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // check_8x8DCT
-            // 
-            this.check_8x8DCT.AutoSize = true;
-            this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.check_8x8DCT.Location = new System.Drawing.Point(44, 111);
-            this.check_8x8DCT.Name = "check_8x8DCT";
-            this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.check_8x8DCT.Size = new System.Drawing.Size(100, 17);
-            this.check_8x8DCT.TabIndex = 72;
-            this.check_8x8DCT.Text = "8x8 Transform:";
-            this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));
-            this.check_8x8DCT.UseVisualStyleBackColor = true;
-            this.check_8x8DCT.CheckedChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label45
-            // 
-            this.label45.AutoSize = true;
-            this.label45.Location = new System.Drawing.Point(563, 16);
-            this.label45.Name = "label45";
-            this.label45.Size = new System.Drawing.Size(78, 13);
-            this.label45.TabIndex = 64;
-            this.label45.Text = "Partition Type:";
-            // 
-            // drop_analysis
-            // 
-            this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_analysis.FormattingEnabled = true;
-            this.drop_analysis.Items.AddRange(new object[] {
-            "Default (most)",
-            "None",
-            "Some",
-            "All"});
-            this.drop_analysis.Location = new System.Drawing.Point(646, 13);
-            this.drop_analysis.Name = "drop_analysis";
-            this.drop_analysis.Size = new System.Drawing.Size(63, 21);
-            this.drop_analysis.TabIndex = 71;
-            this.ToolTip.SetToolTip(this.drop_analysis, resources.GetString("drop_analysis.ToolTip"));
-            this.drop_analysis.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label48
-            // 
-            this.label48.AutoSize = true;
-            this.label48.Location = new System.Drawing.Point(262, 110);
-            this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(149, 13);
-            this.label48.TabIndex = 62;
-            this.label48.Text = "Subpixel ME && Mode Decision:";
-            // 
-            // drop_subpixelMotionEstimation
-            // 
-            this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_subpixelMotionEstimation.FormattingEnabled = true;
-            this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {
-            "Default (7)",
-            "0: SAD, no subpel (super fast!)",
-            "1: SAD, qpel",
-            "2: SATD, qpel",
-            "3: SATD, multi-qpel",
-            "4: SATD, qpel on all",
-            "5: SATD, multi-qpel on all",
-            "6: RD in I/P-frames",
-            "7: RD in all frames",
-            "8: RD refine in I/P-frames",
-            "9: RD refine in all frames",
-            "10: QPRD in all frames",
-            "11: No early terminations in analysis"});
-            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(417, 105);
-            this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";
-            this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 21);
-            this.drop_subpixelMotionEstimation.TabIndex = 70;
-            this.ToolTip.SetToolTip(this.drop_subpixelMotionEstimation, resources.GetString("drop_subpixelMotionEstimation.ToolTip"));
-            this.drop_subpixelMotionEstimation.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // lbl_merange
-            // 
-            this.lbl_merange.AutoSize = true;
-            this.lbl_merange.Location = new System.Drawing.Point(282, 135);
-            this.lbl_merange.Name = "lbl_merange";
-            this.lbl_merange.Size = new System.Drawing.Size(129, 13);
-            this.lbl_merange.TabIndex = 61;
-            this.lbl_merange.Text = "Motion Estimation Range:";
-            // 
-            // drop_MotionEstimationRange
-            // 
-            this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_MotionEstimationRange.FormattingEnabled = true;
-            this.drop_MotionEstimationRange.Items.AddRange(new object[] {
-            "Default (16)",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15",
-            "16",
-            "17",
-            "18",
-            "19",
-            "20",
-            "21",
-            "22",
-            "23",
-            "24",
-            "25",
-            "26",
-            "27",
-            "28",
-            "29",
-            "30",
-            "31",
-            "32",
-            "33",
-            "34",
-            "35",
-            "36",
-            "37",
-            "38",
-            "39",
-            "40",
-            "41",
-            "42",
-            "43",
-            "44",
-            "45",
-            "46",
-            "47",
-            "48",
-            "49",
-            "50",
-            "51",
-            "52",
-            "53",
-            "54",
-            "55",
-            "56",
-            "57",
-            "58",
-            "59",
-            "60",
-            "61",
-            "62",
-            "63",
-            "64"});
-            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(417, 132);
-            this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";
-            this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 21);
-            this.drop_MotionEstimationRange.TabIndex = 69;
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, resources.GetString("drop_MotionEstimationRange.ToolTip"));
-            this.drop_MotionEstimationRange.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label54
-            // 
-            this.label54.AutoSize = true;
-            this.label54.Location = new System.Drawing.Point(277, 81);
-            this.label54.Name = "label54";
-            this.label54.Size = new System.Drawing.Size(134, 13);
-            this.label54.TabIndex = 60;
-            this.label54.Text = "Motion Estimation Method:";
-            // 
-            // drop_MotionEstimationMethod
-            // 
-            this.drop_MotionEstimationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_MotionEstimationMethod.FormattingEnabled = true;
-            this.drop_MotionEstimationMethod.ItemHeight = 13;
-            this.drop_MotionEstimationMethod.Items.AddRange(new object[] {
-            "Default (Hexagon)",
-            "Diamond",
-            "Hexagon",
-            "Uneven Multi-Hexagon",
-            "Exhaustive",
-            "Transformed Exhaustive"});
-            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(417, 78);
-            this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";
-            this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 21);
-            this.drop_MotionEstimationMethod.TabIndex = 68;
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));
-            this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // lbl_direct_prediction
-            // 
-            this.lbl_direct_prediction.AutoSize = true;
-            this.lbl_direct_prediction.Location = new System.Drawing.Point(297, 54);
-            this.lbl_direct_prediction.Name = "lbl_direct_prediction";
-            this.lbl_direct_prediction.Size = new System.Drawing.Size(114, 13);
-            this.lbl_direct_prediction.TabIndex = 53;
-            this.lbl_direct_prediction.Text = "Adaptive Direct Mode:";
-            // 
-            // drop_directPrediction
-            // 
-            this.drop_directPrediction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_directPrediction.FormattingEnabled = true;
-            this.drop_directPrediction.Items.AddRange(new object[] {
-            "Default (Spatial)",
-            "None",
-            "Spatial",
-            "Temporal",
-            "Automatic"});
-            this.drop_directPrediction.Location = new System.Drawing.Point(417, 51);
-            this.drop_directPrediction.Name = "drop_directPrediction";
-            this.drop_directPrediction.Size = new System.Drawing.Size(106, 21);
-            this.drop_directPrediction.TabIndex = 57;
-            this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));
-            this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label62
-            // 
-            this.label62.AutoSize = true;
-            this.label62.Location = new System.Drawing.Point(21, 64);
-            this.label62.Name = "label62";
-            this.label62.Size = new System.Drawing.Size(103, 13);
-            this.label62.TabIndex = 52;
-            this.label62.Text = "Maximum B-Frames:";
-            // 
-            // drop_bFrames
-            // 
-            this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_bFrames.FormattingEnabled = true;
-            this.drop_bFrames.Items.AddRange(new object[] {
-            "Default (3)",
-            "0",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15",
-            "16"});
-            this.drop_bFrames.Location = new System.Drawing.Point(129, 61);
-            this.drop_bFrames.Name = "drop_bFrames";
-            this.drop_bFrames.Size = new System.Drawing.Size(106, 21);
-            this.drop_bFrames.TabIndex = 56;
-            this.ToolTip.SetToolTip(this.drop_bFrames, resources.GetString("drop_bFrames.ToolTip"));
-            this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // label64
-            // 
-            this.label64.AutoSize = true;
-            this.label64.Location = new System.Drawing.Point(25, 38);
-            this.label64.Name = "label64";
-            this.label64.Size = new System.Drawing.Size(99, 13);
-            this.label64.TabIndex = 50;
-            this.label64.Text = "Reference Frames:";
-            // 
-            // drop_refFrames
-            // 
-            this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_refFrames.FormattingEnabled = true;
-            this.drop_refFrames.Items.AddRange(new object[] {
-            "Default (3)",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15",
-            "16"});
-            this.drop_refFrames.Location = new System.Drawing.Point(129, 35);
-            this.drop_refFrames.Name = "drop_refFrames";
-            this.drop_refFrames.Size = new System.Drawing.Size(106, 21);
-            this.drop_refFrames.TabIndex = 54;
-            this.ToolTip.SetToolTip(this.drop_refFrames, resources.GetString("drop_refFrames.ToolTip"));
-            this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // ToolTip
-            // 
-            this.ToolTip.Active = false;
-            this.ToolTip.AutomaticDelay = 1000;
-            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
-            // 
-            // check_weightp
-            // 
-            this.check_weightp.AutoSize = true;
-            this.check_weightp.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.check_weightp.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.check_weightp.Location = new System.Drawing.Point(20, 134);
-            this.check_weightp.Name = "check_weightp";
-            this.check_weightp.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.check_weightp.Size = new System.Drawing.Size(124, 17);
-            this.check_weightp.TabIndex = 87;
-            this.check_weightp.Text = "Weighted P-Frames:";
-            this.ToolTip.SetToolTip(this.check_weightp, resources.GetString("check_weightp.ToolTip"));
-            this.check_weightp.UseVisualStyleBackColor = true;
-            this.check_weightp.CheckedChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // slider_adaptiveQuantStrength
-            // 
-            this.slider_adaptiveQuantStrength.BackColor = System.Drawing.SystemColors.Window;
-            this.slider_adaptiveQuantStrength.Location = new System.Drawing.Point(425, 167);
-            this.slider_adaptiveQuantStrength.Maximum = 20;
-            this.slider_adaptiveQuantStrength.Name = "slider_adaptiveQuantStrength";
-            this.slider_adaptiveQuantStrength.Size = new System.Drawing.Size(131, 45);
-            this.slider_adaptiveQuantStrength.TabIndex = 88;
-            this.ToolTip.SetToolTip(this.slider_adaptiveQuantStrength, "Adaptive quantization controls how the encoder distributes bits across the frame." +
-        "  \r\nHigher values take more bits away from edges and complex areas to improve ar" +
-        "eas with finer detail");
-            this.slider_adaptiveQuantStrength.Value = 10;
-            this.slider_adaptiveQuantStrength.Scroll += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // combo_pyrmidalBFrames
-            // 
-            this.combo_pyrmidalBFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.combo_pyrmidalBFrames.FormattingEnabled = true;
-            this.combo_pyrmidalBFrames.Items.AddRange(new object[] {
-            "Default (Normal)",
-            "Off",
-            "Strict"});
-            this.combo_pyrmidalBFrames.Location = new System.Drawing.Point(129, 157);
-            this.combo_pyrmidalBFrames.Name = "combo_pyrmidalBFrames";
-            this.combo_pyrmidalBFrames.Size = new System.Drawing.Size(106, 21);
-            this.combo_pyrmidalBFrames.TabIndex = 92;
-            this.ToolTip.SetToolTip(this.combo_pyrmidalBFrames, resources.GetString("combo_pyrmidalBFrames.ToolTip"));
-            this.combo_pyrmidalBFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);
-            // 
-            // lbl_adaptiveQuantStrength
-            // 
-            this.lbl_adaptiveQuantStrength.AutoSize = true;
-            this.lbl_adaptiveQuantStrength.Location = new System.Drawing.Point(248, 171);
-            this.lbl_adaptiveQuantStrength.Name = "lbl_adaptiveQuantStrength";
-            this.lbl_adaptiveQuantStrength.Size = new System.Drawing.Size(163, 13);
-            this.lbl_adaptiveQuantStrength.TabIndex = 89;
-            this.lbl_adaptiveQuantStrength.Text = "Adaptive Quantization Strength:";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.BackColor = System.Drawing.Color.Transparent;
-            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(13, 193);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(83, 13);
-            this.label1.TabIndex = 90;
-            this.label1.Text = "Psychovisual:";
-            // 
-            // lbl_prymidalBframes
-            // 
-            this.lbl_prymidalBframes.AutoSize = true;
-            this.lbl_prymidalBframes.Location = new System.Drawing.Point(20, 160);
-            this.lbl_prymidalBframes.Name = "lbl_prymidalBframes";
-            this.lbl_prymidalBframes.Size = new System.Drawing.Size(105, 13);
-            this.lbl_prymidalBframes.TabIndex = 91;
-            this.lbl_prymidalBframes.Text = "Pyramidal B-Frames:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.BackColor = System.Drawing.Color.Transparent;
-            this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(248, 13);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(57, 13);
-            this.label3.TabIndex = 93;
-            this.label3.Text = "Analysis:";
-            // 
-            // x264Panel
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.BackColor = System.Drawing.Color.Transparent;
-            this.Controls.Add(this.rtf_x264Query);
-            this.Controls.Add(this.slider_psytrellis);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.lbl_prymidalBframes);
-            this.Controls.Add(this.combo_pyrmidalBFrames);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.slider_psyrd);
-            this.Controls.Add(this.lbl_adaptiveQuantStrength);
-            this.Controls.Add(this.slider_adaptiveQuantStrength);
-            this.Controls.Add(this.check_weightp);
-            this.Controls.Add(this.lbl_psytrellis);
-            this.Controls.Add(this.lbl_psyrd);
-            this.Controls.Add(this.lbl_adaptBFrames);
-            this.Controls.Add(this.drop_adaptBFrames);
-            this.Controls.Add(this.label43);
-            this.Controls.Add(this.btn_reset);
-            this.Controls.Add(this.check_Cabac);
-            this.Controls.Add(this.check_noDCTDecimate);
-            this.Controls.Add(this.lbl_trellis);
-            this.Controls.Add(this.drop_trellis);
-            this.Controls.Add(this.drop_deblockBeta);
-            this.Controls.Add(this.label41);
-            this.Controls.Add(this.drop_deblockAlpha);
-            this.Controls.Add(this.check_8x8DCT);
-            this.Controls.Add(this.label45);
-            this.Controls.Add(this.drop_analysis);
-            this.Controls.Add(this.label48);
-            this.Controls.Add(this.drop_subpixelMotionEstimation);
-            this.Controls.Add(this.lbl_merange);
-            this.Controls.Add(this.drop_MotionEstimationRange);
-            this.Controls.Add(this.label54);
-            this.Controls.Add(this.drop_MotionEstimationMethod);
-            this.Controls.Add(this.lbl_direct_prediction);
-            this.Controls.Add(this.drop_directPrediction);
-            this.Controls.Add(this.label62);
-            this.Controls.Add(this.drop_bFrames);
-            this.Controls.Add(this.label64);
-            this.Controls.Add(this.drop_refFrames);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Name = "x264Panel";
-            this.Size = new System.Drawing.Size(720, 305);
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_adaptiveQuantStrength)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.TrackBar slider_psytrellis;
-        internal System.Windows.Forms.Label lbl_psytrellis;
-        internal System.Windows.Forms.Label lbl_psyrd;
-        internal System.Windows.Forms.TrackBar slider_psyrd;
-        internal System.Windows.Forms.Label lbl_adaptBFrames;
-        internal System.Windows.Forms.ComboBox drop_adaptBFrames;
-        internal System.Windows.Forms.Label label43;
-        internal System.Windows.Forms.Button btn_reset;
-        internal System.Windows.Forms.RichTextBox rtf_x264Query;
-        internal System.Windows.Forms.CheckBox check_Cabac;
-        internal System.Windows.Forms.CheckBox check_noDCTDecimate;
-        internal System.Windows.Forms.Label lbl_trellis;
-        internal System.Windows.Forms.ComboBox drop_trellis;
-        internal System.Windows.Forms.ComboBox drop_deblockBeta;
-        internal System.Windows.Forms.Label label41;
-        internal System.Windows.Forms.ComboBox drop_deblockAlpha;
-        internal System.Windows.Forms.CheckBox check_8x8DCT;
-        internal System.Windows.Forms.Label label45;
-        internal System.Windows.Forms.ComboBox drop_analysis;
-        internal System.Windows.Forms.Label label48;
-        internal System.Windows.Forms.ComboBox drop_subpixelMotionEstimation;
-        internal System.Windows.Forms.Label lbl_merange;
-        internal System.Windows.Forms.ComboBox drop_MotionEstimationRange;
-        internal System.Windows.Forms.Label label54;
-        internal System.Windows.Forms.ComboBox drop_MotionEstimationMethod;
-        internal System.Windows.Forms.Label lbl_direct_prediction;
-        internal System.Windows.Forms.ComboBox drop_directPrediction;
-        internal System.Windows.Forms.Label label62;
-        internal System.Windows.Forms.ComboBox drop_bFrames;
-        internal System.Windows.Forms.Label label64;
-        internal System.Windows.Forms.ComboBox drop_refFrames;
-        private System.Windows.Forms.ToolTip ToolTip;
-        internal System.Windows.Forms.CheckBox check_weightp;
-        internal System.Windows.Forms.Label lbl_adaptiveQuantStrength;
-        internal System.Windows.Forms.TrackBar slider_adaptiveQuantStrength;
-        internal System.Windows.Forms.Label label1;
-        internal System.Windows.Forms.Label lbl_prymidalBframes;
-        internal System.Windows.Forms.ComboBox combo_pyrmidalBFrames;
-        internal System.Windows.Forms.Label label3;
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/Controls/x264Panel.cs Deleted

@@ -1,1082 +0,0 @@
-/*  x264Panel.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Controls
-{
-    using System;
-    using System.Globalization;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    /// <summary>
-    /// The x264 Panel
-    /// </summary>
-    public partial class x264Panel : UserControl
-    {
-        /* 
-         * TODO This code was ported from the obj-c MacGUI code. It's really messy and could really do with being cleaned up
-         * at some point.
-         */
-
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="x264Panel"/> class. 
-        /// Initializes a new instance of the x264 panel user control
-        /// </summary>
-        public x264Panel()
-        {
-            InitializeComponent();
-
-            if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.TooltipEnable))
-                ToolTip.Active = true;
-
-            Reset2Defaults();
-        }
-
-        /// <summary>
-        /// Gets or sets the X264 query string
-        /// </summary>
-        public string X264Query
-        {
-            get
-            {
-                return rtf_x264Query.Text;
-            }
-            set
-            {
-                rtf_x264Query.Text = value;
-            }
-        }
-
-        /// <summary>
-        /// Reset all components to defaults and clears the x264 rtf box
-        /// </summary>
-        public void Reset2Defaults()
-        {
-            check_8x8DCT.CheckState = CheckState.Checked;
-            check_Cabac.CheckState = CheckState.Checked;
-            check_weightp.CheckState = CheckState.Checked;
-            check_noDCTDecimate.CheckState = CheckState.Unchecked;
-            combo_pyrmidalBFrames.SelectedIndex = 0;
-            drop_analysis.SelectedIndex = 0;
-            drop_bFrames.SelectedIndex = 0;
-            drop_deblockAlpha.SelectedIndex = 0;
-            drop_deblockBeta.SelectedIndex = 0;
-            drop_directPrediction.SelectedIndex = 0;
-            drop_MotionEstimationMethod.SelectedIndex = 0;
-            drop_MotionEstimationRange.SelectedIndex = 0;
-            drop_refFrames.SelectedIndex = 0;
-            drop_subpixelMotionEstimation.SelectedIndex = 0;
-            drop_trellis.SelectedIndex = 0;
-            slider_psyrd.Value = 10;
-            slider_psytrellis.Value = 0;
-            drop_adaptBFrames.SelectedIndex = 0;
-            slider_adaptiveQuantStrength.Value = slider_adaptiveQuantStrength.Maximum / 2;
-
-            rtf_x264Query.Text = string.Empty;
-        }
-
-        #region Standardize Option String
-        /// <summary>
-        /// Iterate over every x264 option, standardize it, write the full string to the x264 rtf box
-        /// </summary>
-        public void StandardizeOptString()
-        {
-            /* Set widgets depending on the opt string in field */
-            string thisOpt; // The separated option such as "bframes=3"
-            string optName; // The option name such as "bframes"
-            string optValue; // The option value such as "3"
-            string changedOptString = string.Empty;
-            string[] currentOptsArray;
-
-            /*First, we get an opt string to process */
-            string currentOptString = rtf_x264Query.Text;
-
-            /*verify there is an opt string to process */
-            if (currentOptString.Contains("="))
-            {
-                /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/
-                currentOptsArray = currentOptString.Split(':');
-
-                /*iterate through the array and get <opts> and <values*/
-                int loopcounter;
-                int currentOptsArrayCount = currentOptsArray.Length;
-                for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)
-                {
-                    thisOpt = currentOptsArray[loopcounter];
-                    if (currentOptsArray[currentOptsArrayCount - 1] == string.Empty)
-                        break;
-
-                    string[] splitOptRange = thisOpt.Split('=');
-                    if (thisOpt != string.Empty)
-                    {
-                        if (thisOpt.Contains("="))
-                        {
-                            optName = splitOptRange[0];
-                            optValue = splitOptRange[1];
-
-                            /* Standardize the names here depending on whats in the string */
-                            optName = StandardizeOptName(optName);
-                            thisOpt = optName + "=" + optValue;
-                        }
-                        else // No value given so we use a default of "1"
-                        {
-                            optName = thisOpt;
-                            /* Standardize the names here depending on whats in the string */
-                            optName = StandardizeOptName(optName);
-                            thisOpt = optName + "=1";
-                        }
-                    }
-
-                    /* Construct New String for opts here */
-                    if (thisOpt == string.Empty)
-                        changedOptString = changedOptString + thisOpt;
-                    else
-                    {
-                        if (changedOptString == string.Empty)
-                            changedOptString = thisOpt;
-                        else
-                            changedOptString = changedOptString + ":" + thisOpt;
-                    }
-                }
-            }
-
-            /* Change the option string to reflect the new standardized option string */
-            if (!string.IsNullOrEmpty(changedOptString) && !rtf_x264Query.Text.Equals(changedOptString))
-                rtf_x264Query.Text = changedOptString;
-        }
-
-        /// <summary>
-        /// Take a single option and standardize it. Returns as a String
-        /// Input: String. - Single X264 Option. Name only
-        /// Output: String - Single X264 Option. Name only. Changed to standard format
-        /// </summary>
-        /// <param name="cleanOptNameString">a string of x264 options to clean</param>
-        /// <returns>A string containing standardized x264 option names</returns>
-        private static string StandardizeOptName(string cleanOptNameString)
-        {
-            string input = cleanOptNameString;
-
-            /* Reference Frames */
-            if (input.Equals("ref") || input.Equals("frameref"))
-                cleanOptNameString = "ref";
-
-            /*No Dict Decimate*/
-            if (input.Equals("no-dct-decimate") || input.Equals("no_dct_decimate") || input.Equals("nodct_decimate"))
-                cleanOptNameString = "no-dct-decimate";
-
-            /*Subme*/
-            if (input.Equals("subme"))
-                cleanOptNameString = "subq";
-
-            /*ME Range*/
-            if (input.Equals("me-range") || input.Equals("me_range"))
-                cleanOptNameString = "merange";
-
-            /*B Pyramid*/
-            if (input.Equals("b_pyramid"))
-                cleanOptNameString = "b-pyramid";
-
-            /*Direct Prediction*/
-            if (input.Equals("direct-pred") || input.Equals("direct_pred"))
-                cleanOptNameString = "direct";
-
-            /*Deblocking*/
-            if (input.Equals("filter"))
-                cleanOptNameString = "deblock";
-
-            /*Analysis*/
-            if (input.Equals("partitions"))
-                cleanOptNameString = "analyse";
-
-            return cleanOptNameString;
-        }
-        #endregion
-
-        /// <summary>
-        /// Resets the GUI widgets to the contents of the option string.
-        /// </summary>
-        public void SetCurrentSettingsInPanel()
-        {
-            /* Set widgets depending on the opt string in field */
-            string thisOpt; // The separated option such as "bframes=3"
-            string optName; // The option name such as "bframes"
-            string optValue; // The option value such as "3"
-            string[] currentOptsArray;
-
-            // Set currentOptString to the contents of the text box.
-            string currentOptString = rtf_x264Query.Text.Replace("\n", string.Empty);
-
-            /*verify there is an opt string to process */
-            if (currentOptString.Contains("="))
-            {
-                /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/
-                currentOptsArray = currentOptString.Split(':');
-
-                /*iterate through the array and get <opts> and <values*/
-                int loopcounter;
-                int currentOptsArrayCount = currentOptsArray.Length;
-
-                /*iterate through the array and get <opts> and <values*/
-                for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)
-                {
-                    thisOpt = currentOptsArray[loopcounter];
-                    string[] splitOptRange = thisOpt.Split('=');
-
-                    if (thisOpt.Contains("="))
-                    {
-                        optName = splitOptRange[0];
-                        optValue = splitOptRange[1];
-
-                        /*Run through the available widgets for x264 opts and set them, as you add widgets, 
-                            they need to be added here. This should be moved to its own method probably*/
-                        switch (optName)
-                        {
-                            case "bframes":
-                                drop_bFrames.SelectedItem = optValue;
-                                continue;
-                            case "ref":
-                                drop_refFrames.SelectedItem = optValue;
-                                continue;
-                            case "weightp":
-                                this.check_weightp.CheckState = optValue == "0" ? CheckState.Unchecked : CheckState.Checked;
-                                continue;
-                            case "no-dct-decimate":
-                                check_noDCTDecimate.CheckState = CheckState.Checked;
-                                continue;
-                            case "subq":
-                                int subqValue;
-                                if (int.TryParse(optValue, out subqValue))
-                                {
-                                    drop_subpixelMotionEstimation.SelectedIndex = subqValue + 1;
-                                }
-                                continue;
-                            case "trellis":
-                                switch (optValue)
-                                {
-                                    case "0":
-                                        drop_trellis.SelectedIndex = 1;
-                                        break;
-                                    case "1":
-                                         drop_trellis.SelectedIndex = 2;
-                                        break;
-                                    case "2":
-                                        drop_trellis.SelectedIndex = 3;
-                                        break;
-                                }
-                                continue;
-                            case "me":
-                                if (optValue.Equals("dia"))
-                                    drop_MotionEstimationMethod.SelectedItem = "Diamond";
-                                else if (optValue.Equals("hex"))
-                                    drop_MotionEstimationMethod.SelectedItem = "Hexagon";
-                                else if (optValue.Equals("umh"))
-                                    drop_MotionEstimationMethod.SelectedItem = "Uneven Multi-Hexagon";
-                                else if (optValue.Equals("esa"))
-                                    drop_MotionEstimationMethod.SelectedItem = "Exhaustive";
-                                else if (optValue.Equals("tesa"))
-                                    drop_MotionEstimationMethod.SelectedItem = "Transformed Exhaustive";
-                                continue;
-                            case "merange":
-                                drop_MotionEstimationRange.SelectedItem = optValue;
-                                continue;
-                            case "b-adapt":
-                                int badapt;
-                                int.TryParse(optValue, out badapt);
-                                drop_adaptBFrames.SelectedIndex = (badapt + 1);
-                                continue;
-                            case "b-pyramid":
-                                switch (optValue)
-                                {
-                                    case "normal":
-                                        combo_pyrmidalBFrames.SelectedIndex = 0;
-                                        break;
-                                    case "strict":
-                                        combo_pyrmidalBFrames.SelectedIndex = 2;
-                                        break;
-                                    case "none":
-                                        combo_pyrmidalBFrames.SelectedIndex = 1;
-                                        break;
-                                }
-                                continue;
-                            case "direct":
-                                if (optValue == "auto")
-                                    optValue = "Automatic";
-
-                                if (optValue != string.Empty)
-                                {
-                                    char[] letters = optValue.ToCharArray();
-                                    letters[0] = Char.ToUpper(letters[0]);
-                                    optValue = new string(letters);
-                                }
-
-                                drop_directPrediction.SelectedItem = optValue;
-                                continue;
-                            case "deblock":
-                                string[] splitDeblock = optValue.Split(',');
-                                string alphaDeblock = splitDeblock[0];
-                                string betaDeblock = splitDeblock[1];
-
-                                if (alphaDeblock.Equals("0") && betaDeblock.Replace("\n", string.Empty).Equals("0"))
-                                {
-                                    drop_deblockAlpha.SelectedItem = "Default (0)";
-                                    drop_deblockBeta.SelectedItem = "Default (0)";
-                                }
-                                else
-                                {
-                                    drop_deblockAlpha.SelectedItem = !alphaDeblock.Equals("0") ? alphaDeblock : "0";
-
-                                    drop_deblockBeta.SelectedItem = !betaDeblock.Replace("\n", string.Empty).Equals("0")
-                                                                        ? betaDeblock.Replace("\n", string.Empty)
-                                                                        : "0";
-                                }
-                                continue;
-                            case "analyse":
-                                if (optValue.Equals("p8x8,b8x8,i8x8,i4x4"))
-                                    drop_analysis.SelectedItem = "Default (most)";
-                                if (optValue.Equals("none"))
-                                    drop_analysis.SelectedItem = "None";
-                                if (optValue.Equals("i4x4,i8x8"))
-                                    drop_analysis.SelectedItem = "Some";
-                                if (optValue.Equals("all"))
-                                    drop_analysis.SelectedItem = "All";
-                                continue;
-                            case "8x8dct":
-                                check_8x8DCT.CheckState = optValue == "1" ? CheckState.Checked : CheckState.Unchecked;
-                                continue;
-                            case "aq-strength":
-                                float value;
-                                float.TryParse(optValue, NumberStyles.Float, CultureInfo.InvariantCulture, out value);
-                                int sliderValue;
-                                int.TryParse((value * 10).ToString(), out sliderValue);
-                                slider_adaptiveQuantStrength.Value = sliderValue;
-                                continue;
-                            case "cabac":
-                                check_Cabac.CheckState = CheckState.Unchecked;
-                                continue;
-                            case "psy-rd":
-                                string[] x = optValue.Split(',');
-
-                                double psyrd, psytrellis;
-                                int val, val2;
-
-                                // default psy-rd = 1 (10 for the slider)
-                                psyrd = double.TryParse(x[0], NumberStyles.Float, CultureInfo.InvariantCulture, out psyrd) ? psyrd * 10 : 10.0;
-                                // default psy-trellis = 0
-                                psytrellis = double.TryParse(x[1], NumberStyles.Float, CultureInfo.InvariantCulture, out psytrellis) ? psytrellis * 20 : 0.0;
-
-                                int.TryParse(psyrd.ToString(), out val);
-                                int.TryParse(psytrellis.ToString(), out val2);
-
-                                slider_psyrd.Value = val;
-                                slider_psytrellis.Value = val2;
-                                continue;
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This function will update the X264 Query when one of the GUI widgets changes.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        private void OnX264WidgetChange(string sender)
-        {
-            Animate(sender);
-            string optNameToChange = sender;
-            string currentOptString = rtf_x264Query.Text;
-
-            /*First, we create a pattern to check for ":"optNameToChange"=" to modify the option if the name falls after
-                the first character of the opt string (hence the ":") */
-            string checkOptNameToChange = ":" + optNameToChange + "=";
-            string checkOptNameToChangeBegin = optNameToChange + "=";
-
-            // IF the current H264 Option String Contains Multiple Items or Just 1 Item
-            if ((currentOptString.Contains(checkOptNameToChange)) || (currentOptString.StartsWith(checkOptNameToChangeBegin)))
-                HasOptions(currentOptString, optNameToChange);
-            else // IF there is no options in the rich text box!
-                HasNoOptions(optNameToChange);
-        }
-
-        /// <summary>
-        /// Called when the current x264 option string contains multiple (or a single) item(s) in it seperated by :
-        /// it updates the current option that the widget corrosponds to, if it is already in thes string.
-        /// </summary>
-        /// <param name="currentOptString">The Current Option String</param>
-        /// <param name="optNameToChange">Name of the option to change</param>
-        private void HasOptions(string currentOptString, string optNameToChange)
-        {
-            string thisOpt; // The separated option such as "bframes=3"
-            string optName; // The option name such as "bframes"
-            string[] currentOptsArray;
-
-            /* Create new empty opt string*/
-            string changedOptString = string.Empty;
-
-            /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/
-            currentOptsArray = currentOptString.Split(':');
-
-            /*iterate through the array and get <opts> and <values*/
-            for (int loopcounter = 0; loopcounter < currentOptsArray.Length; loopcounter++)
-            {
-                thisOpt = currentOptsArray[loopcounter];
-
-                if (thisOpt.Contains("="))
-                {
-                    string[] splitOptRange = thisOpt.Split('=');
-
-                    optName = splitOptRange[0]; // e.g bframes
-
-                    /* 
-                     * Run through the available widgets for x264 opts and set them, as you add widgets,
-                     * they need to be added here. This should be moved to its own method probably
-                     * If the optNameToChange is found, appropriately change the value or delete it if
-                     * "unspecified" is set.
-                     */
-                    if (optName.Equals(optNameToChange))
-                    {
-                        if (optNameToChange.Equals("deblock"))
-                        {
-                            string da = drop_deblockAlpha.SelectedItem.ToString();
-                            string db = drop_deblockBeta.SelectedItem.ToString();
-
-                            if (((da.Contains("Default")) && (db.Contains("Default"))) ||
-                                ((da.Contains("0")) && (db.Contains("0"))))
-                            {
-                                drop_deblockBeta.SelectedItem = "Default (0)";
-                                drop_deblockAlpha.SelectedItem = "Default (0)";
-                                thisOpt = string.Empty;
-                            }
-                            else if ((!da.Contains("Default")) && (db.Contains("Default")))
-                            {
-                                drop_deblockBeta.SelectedItem = "0";
-                                thisOpt = "deblock=" + da + ",0";
-                            }
-                            else if ((da.Contains("Default")) && (!db.Contains("Default")))
-                            {
-                                drop_deblockAlpha.SelectedItem = "0";
-                                thisOpt = "deblock=0," + db;
-                            }
-                            else if ((!da.Contains("Default")) && (!db.Contains("Default")))
-                                thisOpt = "deblock=" + da + "," + db;
-                        }
-                        else if (optNameToChange.Equals("aq-strength"))
-                        {
-                            if (slider_adaptiveQuantStrength.Value == 10)
-                                thisOpt = string.Empty;
-                            else
-                            {
-                                double value = slider_adaptiveQuantStrength.Value * 0.1;
-                                string aqs = value.ToString("f1", CultureInfo.InvariantCulture);
-                                thisOpt = "aq-strength=" + aqs;
-                            }
-                        }
-                        else if (optNameToChange.Equals("psy-rd"))
-                        {
-                            if (slider_psyrd.Value == 10 && slider_psytrellis.Value == 0)
-                                thisOpt = string.Empty;
-                            else
-                            {
-                                double psyrd = slider_psyrd.Value * 0.1;
-                                double psytre = slider_psytrellis.Value * 0.05;
-
-                                string rd = psyrd.ToString("f2", CultureInfo.InvariantCulture);
-                                string rt = psytre.ToString("f2", CultureInfo.InvariantCulture);
-
-                                thisOpt = "psy-rd=" + rd + "," + rt;
-                            }
-                        }
-                        else if (optNameToChange.Equals("b-pyramid"))
-                        {
-                            switch (combo_pyrmidalBFrames.SelectedIndex)
-                            {
-                                case 0: // Default
-                                    thisOpt = string.Empty;
-                                    break;
-                                case 1: // Off
-                                    thisOpt = "b-pyramid=none";
-                                    break;
-                                case 2: // Strict
-                                    thisOpt = "b-pyramid=strict";
-                                    break;
-                            }
-                        }
-                        else if (optNameToChange.Equals("no-dct-decimate"))
-                            thisOpt = check_noDCTDecimate.CheckState == CheckState.Checked ? "no-dct-decimate=1" : string.Empty;
-                        else if (optNameToChange.Equals("8x8dct"))
-                            thisOpt = check_8x8DCT.CheckState == CheckState.Unchecked ? "8x8dct=0" : string.Empty;
-                        else if (optNameToChange.Equals("cabac"))
-                            thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "cabac=0";
-                        else if (optNameToChange.Equals("weightp"))
-                            thisOpt = check_weightp.CheckState == CheckState.Checked ? string.Empty : "weightp=0";
-                        else if (optNameToChange.Equals("me"))
-                        {
-                            switch (drop_MotionEstimationMethod.SelectedIndex)
-                            {
-                                case 1:
-                                    thisOpt = "me=dia";
-                                    break;
-
-                                case 2:
-                                    thisOpt = "me=hex";
-                                    break;
-
-                                case 3:
-                                    thisOpt = "me=umh";
-                                    break;
-
-                                case 4:
-                                    thisOpt = "me=esa";
-                                    break;
-
-                                case 5:
-                                    thisOpt = "me=tesa";
-                                    break;
-
-                                default:
-                                    thisOpt = string.Empty;
-                                    break;
-                            }
-                        }
-                        else if (optNameToChange.Equals("direct"))
-                        {
-                            switch (drop_directPrediction.SelectedIndex)
-                            {
-                                case 1:
-                                    thisOpt = "direct=none";
-                                    break;
-
-                                case 2:
-                                    thisOpt = "direct=spatial";
-                                    break;
-
-                                case 3:
-                                    thisOpt = "direct=temporal";
-                                    break;
-
-                                case 4:
-                                    thisOpt = "direct=auto";
-                                    break;
-
-                                default:
-                                    thisOpt = string.Empty;
-                                    break;
-                            }
-                        }
-                        else if (optNameToChange.Equals("analyse"))
-                        {
-                            switch (drop_analysis.SelectedIndex)
-                            {
-                                case 1:
-                                    thisOpt = "analyse=none";
-                                    break;
-
-                                case 2:
-                                    thisOpt = "analyse=i4x4,i8x8";
-                                    break;
-
-                                case 3:
-                                    thisOpt = "analyse=all";
-                                    break;
-
-                                default:
-                                    thisOpt = string.Empty;
-                                    break;
-                            }
-                        }
-                        else if (optNameToChange.Equals("merange"))
-                        {
-                            thisOpt = !drop_MotionEstimationRange.SelectedItem.ToString().Contains("Default")
-                                          ? "merange=" + drop_MotionEstimationRange.SelectedItem
-                                          : string.Empty;
-                        }
-                        else if (optNameToChange.Equals("b-adapt"))
-                        {
-                            thisOpt = !drop_adaptBFrames.SelectedItem.ToString().Contains("Default")
-                                          ? "b-adapt=" + (drop_adaptBFrames.SelectedIndex - 1)
-                                          : string.Empty;
-                        }
-                        else if (optNameToChange.Equals("ref"))
-                        {
-                            thisOpt = !drop_refFrames.SelectedItem.ToString().Contains("Default")
-                                          ? "ref=" + drop_refFrames.SelectedItem
-                                          : string.Empty;
-                        }
-                        else if (optNameToChange.Equals("bframes"))
-                        {
-                            string value = drop_bFrames.SelectedItem.ToString();
-                            thisOpt = !drop_bFrames.SelectedItem.ToString().Contains("Default")
-                                          ? "bframes=" + value
-                                          : string.Empty;
-                        }
-                        else if (optNameToChange.Equals("subq"))
-                        {
-                            string value = drop_subpixelMotionEstimation.SelectedItem.ToString();
-                            string[] val = value.Split(':');
-                            thisOpt = !drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default")
-                                          ? "subq=" + val[0]
-                                          : string.Empty;
-                        }
-                        else if (optNameToChange.Equals("trellis"))
-                        {
-                            switch (drop_trellis.SelectedIndex)
-                            {
-                                case 1: // Off
-                                    thisOpt = "trellis=0";
-                                    break;
-                                case 2: // Encode Only
-                                    thisOpt = "trellis=1";
-                                    break;
-                                case 3: // Always
-                                    thisOpt = "trellis=2";
-                                    break;
-                                default:
-                                    thisOpt = string.Empty;
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                /* Construct New String for opts here */
-                if (!thisOpt.Equals(string.Empty))
-                    changedOptString = changedOptString.Equals(string.Empty) ? thisOpt : changedOptString + ":" + thisOpt;
-            }
-
-            /* Change the option string to reflect the new mod settings */
-            rtf_x264Query.Text = changedOptString;
-        }
-
-        /// <summary>
-        /// Add's an option to the x264 query string.
-        /// Handles 2 cases.  1 Where rtf_x264Query.Text is empty, and one where there is an option with no value,
-        /// e.g no-fast-pskip
-        /// </summary>
-        /// <param name="optNameToChange">The Option Name to Change</param>
-        private void HasNoOptions(IEquatable<string> optNameToChange)
-        {
-            string colon = string.Empty;
-            if (rtf_x264Query.Text != string.Empty)
-                colon = ":";
-
-            string query = rtf_x264Query.Text;
-            if (optNameToChange.Equals("me"))
-            {
-                switch (drop_MotionEstimationMethod.SelectedIndex)
-                {
-                    case 1:
-                        query = query + colon + "me=dia";
-                        break;
-
-                    case 2:
-                        query = query + colon + "me=hex";
-                        break;
-
-                    case 3:
-                        query = query + colon + "me=umh";
-                        break;
-
-                    case 4:
-                        query = query + colon + "me=esa";
-                        break;
-
-                    case 5:
-                        query = query + colon + "me=tesa";
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            else if (optNameToChange.Equals("direct"))
-            {
-                switch (drop_directPrediction.SelectedIndex)
-                {
-                    case 1:
-                        query = query + colon + "direct=none";
-                        break;
-
-                    case 2:
-                        query = query + colon + "direct=spatial";
-                        break;
-
-                    case 3:
-                        query = query + colon + "direct=temporal";
-                        break;
-
-                    case 4:
-                        query = query + colon + "direct=auto";
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            else if (optNameToChange.Equals("analyse"))
-            {
-                switch (drop_analysis.SelectedIndex)
-                {
-                    case 1:
-                        query = query + colon + "analyse=none";
-                        break;
-
-                    case 2:
-                        query = query + colon + "analyse=i4x4,i8x8";
-                        break;
-
-                    case 3:
-                        query = query + colon + "analyse=all";
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            else if (optNameToChange.Equals("merange"))
-            {
-                int value = drop_MotionEstimationRange.SelectedIndex + 3;
-                query = query + colon + "merange=" + value;
-            }
-            else if (optNameToChange.Equals("b-adapt"))
-            {
-                int value = drop_adaptBFrames.SelectedIndex - 1;
-                query = query + colon + "b-adapt=" + value;
-            }
-            else if (optNameToChange.Equals("deblock"))
-            {
-                string da = drop_deblockAlpha.SelectedItem.ToString();
-                string db = drop_deblockBeta.Text;
-
-                if (((da.Contains("Default")) && (db.Contains("Default"))) || ((da.Contains("0")) && (db.Contains("0"))))
-                {
-                    drop_deblockBeta.SelectedItem = "Default (0)";
-                    drop_deblockAlpha.SelectedItem = "Default (0)";
-                }
-                else
-                {
-                    if (db.Contains("Default"))
-                        db = "0";
-
-                    if (da.Contains("Default"))
-                        da = "0";
-
-                    query = query + colon + "deblock=" + da + "," + db;
-                }
-            }
-            else if (optNameToChange.Equals("aq-strength"))
-            {
-                if (slider_adaptiveQuantStrength.Value == 10)
-                    query = string.Empty;
-                else
-                {
-                    double value = slider_adaptiveQuantStrength.Value * 0.1;
-                    string aqs = value.ToString("f1", CultureInfo.InvariantCulture);
-                    query += colon + "aq-strength=" + aqs;
-                }
-            }
-            else if (optNameToChange.Equals("psy-rd"))
-            {
-                if (slider_psyrd.Value == 10 && slider_psytrellis.Value == 0)
-                    query += string.Empty;
-                else
-                {
-                    double psyrd = slider_psyrd.Value * 0.1;
-                    double psytre = slider_psytrellis.Value * 0.05;
-
-                    string rd = psyrd.ToString("f1", CultureInfo.InvariantCulture);
-                    string rt = psytre.ToString("f2", CultureInfo.InvariantCulture);
-
-                    query += colon + "psy-rd=" + rd + "," + rt;
-                }
-            }
-            else if (optNameToChange.Equals("b-pyramid"))
-            {
-                switch (combo_pyrmidalBFrames.SelectedIndex)
-                {
-                    case 0:
-                        break;
-                    case 1:
-                        query = query + colon + "b-pyramid=none";
-                        break;
-                    case 2:
-                        query = query + colon + "b-pyramid=strict";
-                        break;
-                }
-            }
-            else if (optNameToChange.Equals("no-dct-decimate"))
-            {
-                if (check_noDCTDecimate.CheckState == CheckState.Checked)
-                    query = query + colon + "no-dct-decimate=1";
-            }
-            else if (optNameToChange.Equals("8x8dct"))
-            {
-                if (check_8x8DCT.CheckState == CheckState.Unchecked)
-                    query = query + colon + "8x8dct=0";
-            }
-            else if (optNameToChange.Equals("cabac"))
-            {
-                if (check_Cabac.CheckState != CheckState.Checked)
-                    query = query + colon + "cabac=0";
-            }
-            else if (optNameToChange.Equals("weightp"))
-            {
-                if (check_weightp.CheckState == CheckState.Unchecked)
-                    query = query + colon + "weightp=0";
-            }
-            else if (optNameToChange.Equals("ref"))
-            {
-                if (!drop_refFrames.SelectedItem.ToString().Contains("Default"))
-                    query = query + colon + "ref=" + drop_refFrames.SelectedItem;
-            }
-            else if (optNameToChange.Equals("bframes"))
-            {
-                string value = drop_bFrames.SelectedItem.ToString();
-                if (!drop_bFrames.SelectedItem.ToString().Contains("Default"))
-                    query = query + colon + "bframes=" + value;
-            }
-            else if (optNameToChange.Equals("subq"))
-            {
-                string value = drop_subpixelMotionEstimation.SelectedItem.ToString();
-                if (!drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default"))
-                {
-                    string[] val = value.Split(':');
-                    query = query + colon + "subq=" + val[0];
-                }
-            }
-            else if (optNameToChange.Equals("trellis"))
-            {
-                switch (drop_trellis.SelectedIndex)
-                {
-                    case 1: // Off
-                        query = query + colon + "trellis=0";
-                        break;
-                    case 2: // Encode Only
-                        query = query + colon + "trellis=1";
-                        break;
-                    case 3: // Always
-                        query = query + colon + "trellis=2";
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            rtf_x264Query.Text = query;
-        }
-
-        /// <summary>
-        /// Shows and hides controls based on the values of other controls.
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        private void Animate(string sender)
-        {
-            /* Lots of situations to cover.
-               - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)
-               - CABAC (when 0 turn off trellis and psy-trel
-               - subme (if under 6, turn off psy-rd and psy-trel)
-               - trellis (if 0, turn off psy-trel)
-             */
-
-            switch (sender)
-            {
-                case "bframes":
-                    if (drop_bFrames.SelectedIndex == 1)
-                    {
-                        /* If the b-frame widget is at 1, the user has chosen
-                           not to use b-frames at all. So disable the options
-                           that can only be used when b-frames are enabled.        */
-                        combo_pyrmidalBFrames.Visible = false;
-                        lbl_prymidalBframes.Visible = false;
-                        drop_directPrediction.Visible = false;
-                        lbl_direct_prediction.Visible = false;
-
-                        combo_pyrmidalBFrames.SelectedIndex = 0;
-                        drop_directPrediction.SelectedIndex = 0;
-
-                        drop_adaptBFrames.Visible = false;
-                        lbl_adaptBFrames.Visible = false;
-                        drop_adaptBFrames.SelectedIndex = 0;
-                    }
-                    else if (drop_bFrames.SelectedIndex == 2)
-                    {
-                        /* Only 1 b-frame? Disable b-pyramid. */
-                        combo_pyrmidalBFrames.Visible = false;
-                        lbl_prymidalBframes.Visible = false;
-                        combo_pyrmidalBFrames.SelectedIndex = 0;
-
-                        drop_directPrediction.Visible = true;
-                        lbl_direct_prediction.Visible = true;
-
-                        drop_adaptBFrames.Visible = true;
-                        lbl_adaptBFrames.Visible = true;
-                    }
-                    else
-                    {
-                        combo_pyrmidalBFrames.Visible = true;
-                        lbl_prymidalBframes.Visible = true;
-                        drop_directPrediction.Visible = true;
-                        lbl_direct_prediction.Visible = true;
-
-                        drop_adaptBFrames.Visible = true;
-                        lbl_adaptBFrames.Visible = true;
-                    }
-                    break;
-                case "me": // Motion Estimation
-                    if (drop_MotionEstimationMethod.SelectedIndex < 3)
-                    {
-                        drop_MotionEstimationRange.Visible = false;
-                        lbl_merange.Visible = false;
-                        drop_MotionEstimationRange.SelectedIndex = 0;
-                    }
-                    else
-                    {
-                        drop_MotionEstimationRange.Visible = true;
-                        lbl_merange.Visible = true;
-                    }
-                    break;
-                case "subq": // subme
-                    if (drop_subpixelMotionEstimation.SelectedIndex != 0 &&
-                        drop_subpixelMotionEstimation.SelectedIndex < 7)
-                    {
-                        slider_psyrd.Visible = false;
-                        slider_psyrd.Value = 10;
-                        lbl_psyrd.Visible = false;
-
-                        slider_psytrellis.Visible = false;
-                        slider_psytrellis.Value = 0;
-                        lbl_psytrellis.Visible = false;
-                    }
-                    else
-                    {
-                        slider_psyrd.Visible = true;
-                        lbl_psyrd.Visible = true;
-
-                        if (drop_trellis.SelectedIndex >= 2 && slider_psytrellis.Visible == false)
-                        {
-                            slider_psytrellis.Visible = true;
-                            lbl_psytrellis.Visible = true;
-                        }
-                    }
-                    break;
-                case "trellis": // subme
-                    if (drop_trellis.SelectedIndex > 0 && drop_trellis.SelectedIndex < 2)
-                    {
-                        slider_psytrellis.Visible = false;
-                        slider_psytrellis.Value = 0;
-                        lbl_psytrellis.Visible = false;
-                    }
-                    else
-                    {
-                        if ((drop_subpixelMotionEstimation.SelectedIndex == 0 || drop_subpixelMotionEstimation.SelectedIndex >= 7) && slider_psytrellis.Visible == false)
-                        {
-                            slider_psytrellis.Visible = true;
-                            lbl_psytrellis.Visible = true;
-                        }
-                    }
-                    break;
-            }
-        }
-
-        /* UI Events */
-
-        private void widgetControlChanged(object sender, EventArgs e)
-        {
-            Control changedControlName = (Control) sender;
-            string controlName = string.Empty;
-
-            switch (changedControlName.Name.Trim())
-            {
-                case "drop_refFrames":
-                    controlName = "ref";
-                    break;
-                case "drop_bFrames":
-                    controlName = "bframes";
-                    break;
-                case "drop_directPrediction":
-                    controlName = "direct";
-                    break;
-                case "check_weightp":
-                    controlName = "weightp";
-                    break;
-                case "combo_pyrmidalBFrames":
-                    controlName = "b-pyramid";
-                    break;
-                case "drop_MotionEstimationMethod":
-                    controlName = "me";
-                    break;
-                case "drop_MotionEstimationRange":
-                    controlName = "merange";
-                    break;
-                case "drop_subpixelMotionEstimation":
-                    controlName = "subq";
-                    break;
-                case "drop_analysis":
-                    controlName = "analyse";
-                    break;
-                case "check_8x8DCT":
-                    controlName = "8x8dct";
-                    break;
-                case "drop_deblockAlpha":
-                    controlName = "deblock";
-                    break;
-                case "drop_deblockBeta":
-                    controlName = "deblock";
-                    break;
-                case "drop_trellis":
-                    controlName = "trellis";
-                    break;
-                case "check_noDCTDecimate":
-                    controlName = "no-dct-decimate";
-                    break;
-                case "check_Cabac":
-                    controlName = "cabac";
-                    break;
-                case "slider_psyrd":
-                    controlName = "psy-rd";
-                    break;
-                case "slider_psytrellis":
-                    controlName = "psy-rd";
-                    break;
-                case "slider_adaptiveQuantStrength":
-                    controlName = "aq-strength";
-                    break;
-                case "drop_adaptBFrames":
-                    controlName = "b-adapt";
-                    break;
-            }
-            OnX264WidgetChange(controlName);
-        }
-
-        private void rtf_x264Query_TextChanged(object sender, EventArgs e)
-        {
-            if (rtf_x264Query.Text.EndsWith("\n"))
-            {
-                string query = rtf_x264Query.Text.Replace("\n", string.Empty);
-                Reset2Defaults();
-                rtf_x264Query.Text = query;
-                this.StandardizeOptString();
-                this.SetCurrentSettingsInPanel();
-
-                if (rtf_x264Query.Text == string.Empty)
-                    Reset2Defaults();
-            }
-        }
-
-        private void btn_reset_Click(object sender, EventArgs e)
-        {
-            rtf_x264Query.Text = string.Empty;
-            Reset2Defaults();
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Controls/x264Panel.resx Deleted

@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="slider_psyrd.ToolTip" xml:space="preserve">
-    <value>Psychovisual Rate Distortion Optimization sure is a mouthful, isn't it? Basically, it means x264 tries to retain detail, for better quality to the human eye, 
-as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.</value>
-  </data>
-  <data name="drop_adaptBFrames.ToolTip" xml:space="preserve">
-    <value>x264 has a variety of algorithms to decide when to use B-frames and how many to use.
-
-Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.
-
-Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.</value>
-  </data>
-  <data name="check_Cabac.ToolTip" xml:space="preserve">
-    <value>After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR.  
-H.264 provides two options for this: CAVLC and CABAC.  CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates.  
-If you're looking to minimize CPU requirements for video playback, disable this option.
-Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</value>
-  </data>
-  <data name="check_noDCTDecimate.ToolTip" xml:space="preserve">
-    <value>x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video.  
-However, this can sometimes have slight negative effects on retention of subtle grain and dither.  
-Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.</value>
-  </data>
-  <data name="drop_trellis.ToolTip" xml:space="preserve">
-    <value>Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. 
-"Always" uses trellis not only during the main encoding process, but also during analysis, which improves compression even 
-more, albeit at great speed cost. 
-
-Trellis costs more speed at higher bitrates</value>
-  </data>
-  <data name="drop_deblockBeta.ToolTip" xml:space="preserve">
-    <value>H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. 
-The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
-
-The deblocking filter has two adjustable parameters, \"strength\" and \"threshold\". 
-The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few)  edges it applies to. 
-Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</value>
-  </data>
-  <data name="drop_deblockAlpha.ToolTip" xml:space="preserve">
-    <value>H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. 
-The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
-
-The deblocking filter has two adjustable parameters, \"strength\" and \"threshold\". 
-The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few)  edges it applies to. 
-Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</value>
-  </data>
-  <data name="check_8x8DCT.ToolTip" xml:space="preserve">
-    <value>The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.  
-It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain.  
-However, it requires High Profile, which many devices may not support.</value>
-  </data>
-  <data name="drop_analysis.ToolTip" xml:space="preserve">
-    <value>Mode decision picks from a variety of options to make its decision: this option chooses what options those are.  
-Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.</value>
-  </data>
-  <data name="drop_subpixelMotionEstimation.ToolTip" xml:space="preserve">
-    <value>This setting controls both subpixel-precision motion estimation and mode decision methods.
-
-Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
-
-Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
-
-SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
-6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
-10, the most powerful and slowest option, requires trellis=2.</value>
-  </data>
-  <data name="drop_MotionEstimationRange.ToolTip" xml:space="preserve">
-    <value>This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  
-Doesn't apply to Diamond or Hexagon search options.  
-The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.</value>
-  </data>
-  <data name="drop_MotionEstimationMethod.ToolTip" xml:space="preserve">
-    <value>Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  
-A better motion search method improves compression at the cost of speed.
-
-Diamond: performs an extremely fast and simple search using a diamond pattern.
-
-Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
-
-Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
-
-Exhaustive: performs a \"dumb\" search of every pixel in a wide area.  Significantly slower for only a small compression gain.
-
-Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</value>
-  </data>
-  <data name="drop_directPrediction.ToolTip" xml:space="preserve">
-    <value>H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
-
-Spatial, the default, is almost always better, but temporal is sometimes useful too.
-
-x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.</value>
-  </data>
-  <data name="drop_bFrames.ToolTip" xml:space="preserve">
-    <value>Sane values are ~2-5.  
-This specifies the maximum number of sequential B-frames that the encoder can use. 
- Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.  
-Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. 
-Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</value>
-  </data>
-  <data name="drop_refFrames.ToolTip" xml:space="preserve">
-    <value>Sane values are ~1-6.  
-The more you add, the better the compression, but the slower the encode.  
-Cel animation tends to benefit from more reference frames a lot more than film content. 
-Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, 
-don't touch this unless you're absolutely sure you know what you're doing!</value>
-  </data>
-  <data name="check_weightp.ToolTip" xml:space="preserve">
-    <value>Performs extra analysis to decide upon weighting parameters for each frame.  
-This improves overall compression slightly and improves the quality of fades greatly. 
-Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled.  
-Note that some devices and players, even those that support Main Profile, 
-may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</value>
-  </data>
-  <data name="combo_pyrmidalBFrames.ToolTip" xml:space="preserve">
-    <value>B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to 
-reference each other to improve compression.  
-
-Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Functions Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Functions/Main.cs Deleted

@@ -1,527 +0,0 @@
-/*  Main.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Functions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Security.Cryptography;
-    using System.Text.RegularExpressions;
-    using System.Windows.Forms;
-    using System.Xml.Serialization;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Extensions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.ApplicationServices.Utilities;
-
-    using Handbrake.ToolWindows;
-
-    /// <summary>
-    /// Useful functions which various screens can use.
-    /// </summary>
-    public static class Main
-    {
-        /// <summary>
-        /// The XML Serializer
-        /// </summary>
-        private static readonly XmlSerializer Ser = new XmlSerializer(typeof(List<QueueTask>));
-
-        /// <summary>
-        /// The User Setting Service
-        /// </summary>
-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Set's up the DataGridView on the Chapters tab (frmMain)
-        /// </summary>
-        /// <param name="title">
-        /// The currently selected title object.
-        /// This will be used to get chapter names if they exist.
-        /// </param>
-        /// <param name="dataChpt">
-        /// The DataGridView Control
-        /// </param>
-        /// <param name="chapterEnd">
-        /// The chapter End.
-        /// </param>
-        /// <returns>
-        /// The chapter naming.
-        /// </returns>
-        public static DataGridView ChapterNaming(Title title, DataGridView dataChpt, string chapterEnd)
-        {
-            int i = 0, finish = 0;
-
-            if (chapterEnd != "Auto")
-                int.TryParse(chapterEnd, out finish);
-
-            while (i < finish)
-            {
-                string chapterName = string.Empty;
-                if (title != null)
-                {
-                    if (title.Chapters.Count <= i && title.Chapters[i] != null)
-                    {
-                        chapterName = title.Chapters[i].ChapterName;
-                    }
-                }
-
-                int n = dataChpt.Rows.Add();
-                dataChpt.Rows[n].Cells[0].Value = i + 1;
-                dataChpt.Rows[n].Cells[1].Value = string.IsNullOrEmpty(chapterName) ? "Chapter " + (i + 1) : chapterName;
-                dataChpt.Rows[n].Cells[0].ValueType = typeof(int);
-                dataChpt.Rows[n].Cells[1].ValueType = typeof(string);
-                i++;
-            }
-
-            return dataChpt;
-        }
-
-        /// <summary>
-        /// Import a CSV file which contains Chapter Names
-        /// </summary>
-        /// <param name="dataChpt">
-        /// The DataGridView Control
-        /// </param>
-        /// <param name="filename">
-        /// The filepath and name
-        /// </param>
-        /// <returns>A Populated DataGridView</returns>
-        public static DataGridView ImportChapterNames(DataGridView dataChpt, string filename)
-        {
-            IDictionary<int, string> chapterMap = new Dictionary<int, string>();
-            try
-            {
-                using (StreamReader sr = new StreamReader(filename))
-                {
-                    string csv = sr.ReadLine();
-                    while (csv != null)
-                    {
-                        if (csv.Trim() != string.Empty)
-                        {
-                            csv = csv.Replace("\\,", "<!comma!>");
-                            string[] contents = csv.Split(',');
-                            int chapter;
-                            int.TryParse(contents[0], out chapter);
-                            chapterMap.Add(chapter, contents[1].Replace("<!comma!>", ","));
-                        }
-                        csv = sr.ReadLine();
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-
-            foreach (DataGridViewRow item in dataChpt.Rows)
-            {
-                string name;
-                chapterMap.TryGetValue((int)item.Cells[0].Value, out name);
-                item.Cells[1].Value = name ?? "Chapter " + item.Cells[0].Value;
-            }
-
-            return dataChpt;
-        }
-
-        /// <summary>
-        /// Create a CSV file with the data from the Main Window Chapters tab
-        /// </summary>
-        /// <param name="mainWindow">Main Window</param>
-        /// <param name="filePathName">Path to save the csv file</param>
-        /// <returns>True if successful </returns>
-        public static void SaveChapterMarkersToCsv(frmMain mainWindow, string filePathName)
-        {
-            try
-            {
-                string csv = string.Empty;
-
-                foreach (DataGridViewRow row in mainWindow.data_chpt.Rows)
-                {
-                    csv += row.Cells[0].Value.ToString();
-                    csv += ",";
-                    csv += row.Cells[1].Value.ToString().Replace(",", "\\,");
-                    csv += Environment.NewLine;
-                }
-                StreamWriter file = new StreamWriter(filePathName);
-                file.Write(csv);
-                file.Close();
-                file.Dispose();
-            }
-            catch (Exception exc)
-            {
-                throw new GeneralApplicationException("Unable to save the chapter information to csv.", "The file may already be in use by another application.", exc);
-            }
-        }
-
-        /// <summary>
-        /// Function which generates the filename and path automatically based on 
-        /// the Source Name, DVD title and DVD Chapters
-        /// </summary>
-        /// <param name="mainWindow">
-        /// The main Window.
-        /// </param>
-        /// <returns>
-        /// The Generated FileName
-        /// </returns>
-        public static string AutoName(frmMain mainWindow)
-        {
-            string autoNamePath = string.Empty;
-            if (mainWindow.drp_dvdtitle.Text != "Automatic")
-            {
-                // Get the Source Name and remove any invalid characters
-                string sourceName = Path.GetInvalidFileNameChars().Aggregate(mainWindow.SourceName, (current, character) => current.Replace(character.ToString(), string.Empty));
-
-                // Remove Underscores
-                if (UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore))
-                    sourceName = sourceName.Replace("_", " ");
-
-                // Switch to "Title Case"
-                if (UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameTitleCase))
-                    sourceName = sourceName.ToTitleCase();
-
-                // Get the Selected Title Number
-                string[] titlesplit = mainWindow.drp_dvdtitle.Text.Split(' ');
-                string dvdTitle = titlesplit[0].Replace("Automatic", string.Empty);
-
-                // Get the Chapter Start and Chapter End Numbers
-                string chapterStart = mainWindow.drop_chapterStart.Text.Replace("Auto", string.Empty);
-                string chapterFinish = mainWindow.drop_chapterFinish.Text.Replace("Auto", string.Empty);
-                string combinedChapterTag = chapterStart;
-                if (chapterFinish != chapterStart && chapterFinish != string.Empty)
-                    combinedChapterTag = chapterStart + "-" + chapterFinish;
-
-                /*
-                 * File Name
-                 */ 
-                string destinationFilename;
-                if (UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != string.Empty)
-                {
-                    destinationFilename = UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat);
-                    destinationFilename = destinationFilename.Replace("{source}", sourceName)
-                                                             .Replace("{title}", dvdTitle)
-                                                             .Replace("{chapters}", combinedChapterTag)
-                                                             .Replace("{date}", DateTime.Now.Date.ToShortDateString().Replace('/', '-'));
-                }
-                else
-                    destinationFilename = sourceName + "_T" + dvdTitle + "_C" + combinedChapterTag;
-
-                /*
-                 * File Extension
-                 */ 
-                if (mainWindow.drop_format.SelectedIndex == 0)
-                {
-                    switch (UserSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v))
-                    {
-                        case 0: // Automatic
-                            destinationFilename += mainWindow.Check_ChapterMarkers.Checked ||
-                                           mainWindow.AudioSettings.RequiresM4V() || mainWindow.Subtitles.RequiresM4V()
-                                               ? ".m4v"
-                                               : ".mp4";
-                            break;
-                        case 1: // Always MP4
-                            destinationFilename += ".mp4";
-                            break;
-                        case 2: // Always M4V
-                            destinationFilename += ".m4v";
-                            break;
-                    }
-                }
-                else if (mainWindow.drop_format.SelectedIndex == 1)
-                    destinationFilename += ".mkv";
-
-                /*
-                 * File Destination Path
-                 */ 
-
-                // If there is an auto name path, use it...
-                if (UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim().StartsWith("{source_path}") && !string.IsNullOrEmpty(mainWindow.sourcePath))
-                {
-                    string savedPath = UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim().Replace("{source_path}\\", string.Empty).Replace("{source_path}", string.Empty);
-
-                    string directory = Directory.Exists(mainWindow.sourcePath)
-                                           ? mainWindow.sourcePath
-                                           : Path.GetDirectoryName(mainWindow.sourcePath);
-                    string requestedPath = Path.Combine(directory, savedPath);
-
-                    autoNamePath = Path.Combine(requestedPath, destinationFilename);
-                    if (autoNamePath == mainWindow.sourcePath)
-                    {
-                        // Append out_ to files that already exist or is the source file
-                        autoNamePath = Path.Combine(Path.GetDirectoryName(mainWindow.sourcePath), "output_" + destinationFilename);
-                    }
-                }
-                else if (UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Contains("{source_folder_name}") && !string.IsNullOrEmpty(mainWindow.sourcePath))
-                {
-                    // Second Case: We have a Path, with "{source_folder}" in it, therefore we need to replace it with the folder name from the source.
-                    string path = Path.GetDirectoryName(mainWindow.sourcePath);
-                    if (!string.IsNullOrEmpty(path))
-                    {
-                        string[] filesArray = path.Split(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-                        string sourceFolder = filesArray[filesArray.Length - 1];
-
-                        autoNamePath = Path.Combine(UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Replace("{source_folder_name}", sourceFolder), destinationFilename);
-                    }
-                }
-                else if (!mainWindow.text_destination.Text.Contains(Path.DirectorySeparatorChar.ToString()))
-                {
-                    // Third case: If the destination box doesn't already contain a path, make one.
-                    if (UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim() != string.Empty &&
-                        UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim() != "Click 'Browse' to set the default location")
-                    {
-                        autoNamePath = Path.Combine(UserSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath), destinationFilename);
-                    }
-                    else // ...otherwise, output to the source directory
-                        autoNamePath = null;
-                }
-                else // Otherwise, use the path that is already there.
-                {
-                    // Use the path and change the file extension to match the previous destination
-                    autoNamePath = Path.Combine(Path.GetDirectoryName(mainWindow.text_destination.Text), destinationFilename);
-                }
-            }
-
-            return autoNamePath;
-        }
-
-        /// <summary>
-        /// Get's HandBrakes version data from the CLI.
-        /// </summary>
-        public static void SetCliVersionData()
-        {
-            string line;
-
-            // 0 = SVN Build / Version
-            // 1 = Build Date
-
-            // Get the SHA1 Hash of HandBrakeCLI
-            byte[] hash;
-            using (Stream stream = File.OpenRead(Path.Combine(Application.StartupPath, "HandBrakeCLI.exe")))
-            {
-                hash = SHA1.Create().ComputeHash(stream);
-            }
-            string base64Hash = Convert.ToBase64String(hash);
-
-            // Compare the hash with the last known hash. If it's the same, return.
-            if (UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeExeHash) == base64Hash)
-            {
-                return;
-            }
-
-            // It's not the same, so start the CLI to get it's version data.
-            Process cliProcess = new Process();
-            ProcessStartInfo handBrakeCli = new ProcessStartInfo("HandBrakeCLI.exe", " -u -v0")
-                {
-                    UseShellExecute = false,
-                    RedirectStandardError = true,
-                    RedirectStandardOutput = true,
-                    CreateNoWindow = true
-                };
-            cliProcess.StartInfo = handBrakeCli;
-
-            try
-            {
-                cliProcess.Start();
-
-                // Retrieve standard output and report back to parent thread until the process is complete
-                TextReader stdOutput = cliProcess.StandardError;
-
-                while (!cliProcess.HasExited)
-                {
-                    line = stdOutput.ReadLine() ?? string.Empty;
-                    Match m = Regex.Match(line, @"HandBrake ([svnM0-9.]*) $([0-9]*)$");
-                    Match platform = Regex.Match(line, @"- ([A-Za-z0-9\s ]*) -");
-
-                    if (m.Success)
-                    {
-                        string version = m.Groups[1].Success ? m.Groups[1].Value : string.Empty;
-                        string build = m.Groups[2].Success ? m.Groups[2].Value : string.Empty;
-
-                        int buildValue;
-                        int.TryParse(build, out buildValue);
-
-                        UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, buildValue);
-                        UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeVersion, version);
-                    }
-
-                    if (platform.Success)
-                    {
-                        UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakePlatform, platform.Value.Replace("-", string.Empty).Trim());
-                    }
-
-                    if (cliProcess.TotalProcessorTime.Seconds > 10) // Don't wait longer than 10 seconds.
-                    {
-                        Process cli = Process.GetProcessById(cliProcess.Id);
-                        if (!cli.HasExited)
-                        {
-                            cli.Kill();
-                        }
-                    }
-                }
-
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeExeHash, base64Hash);
-            }
-            catch (Exception e)
-            {
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, 0);
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakePlatform, string.Empty);
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeVersion, string.Empty);
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeExeHash, string.Empty);
-
-                ExceptionWindow window = new ExceptionWindow();
-                window.Setup("Unable to Initialise HandBrake \nThis error is unrecoverable. Maybe try restarting.", e.ToString());
-                window.ShowDialog();       
-
-                Application.Exit();
-            }
-        }
-
-        /// <summary>
-        /// Check if the queue recovery file contains records.
-        /// If it does, it means the last queue did not complete before HandBrake closed.
-        /// So, return a boolean if true. 
-        /// </summary>
-        /// <returns>
-        /// True if there is a queue to recover.
-        /// </returns>
-        public static List<string> CheckQueueRecovery()
-        {
-            try
-            {
-                string tempPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
-                List<string> queueFiles = new List<string>();
-                List<string> removeFiles = new List<string>();
-
-                DirectoryInfo info = new DirectoryInfo(tempPath);
-                IEnumerable<FileInfo> logFiles = info.GetFiles("*.xml").Where(f => f.Name.StartsWith("hb_queue_recovery"));
-                foreach (FileInfo file in logFiles)
-                {
-                    using (FileStream strm = new FileStream(file.FullName, FileMode.Open, FileAccess.Read))
-                    {
-                        List<QueueTask> list = Ser.Deserialize(strm) as List<QueueTask>;
-                        if (list != null && list.Count == 0)
-                        {
-                            removeFiles.Add(file.FullName);
-                        }
-                        
-                        if (list != null && list.Count != 0)
-                        {
-                            List<QueueTask> tasks = list.Where(l => l.Status != QueueItemStatus.Completed).ToList();
-                            if (tasks.Count != 0)
-                            {
-                                queueFiles.Add(file.Name);
-                            }
-                        }
-                    }
-                }
-
-                // Cleanup old/unused queue files for now.
-                if (!GeneralUtilities.IsMultiInstance)
-                {
-                    foreach (string file in removeFiles)
-                    {
-                        File.Delete(file);
-                    }
-                }
-
-                return queueFiles;
-            }
-            catch (Exception exc)
-            {
-                return new List<string>(); // Keep quiet about the error.
-            }
-        }
-
-        /// <summary>
-        /// Recover a queue from file.
-        /// </summary>
-        /// <param name="encodeQueue">
-        /// The encode Queue.
-        /// </param>
-        public static void RecoverQueue(IQueueProcessor encodeQueue)
-        {
-            string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
-
-            DialogResult result = DialogResult.None;
-            List<string> queueFiles = CheckQueueRecovery();
-            if (queueFiles.Count == 1)
-            {
-                result = MessageBox.Show(
-                        "HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?",
-                        "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-            }
-            else if (queueFiles.Count > 1)
-            {
-                result = MessageBox.Show(
-                        "HandBrake has detected multiple unfinished queue files. These will be from multiple instances of HandBrake running. Would you like to recover all unfinished jobs?",
-                        "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-            }
-
-            if (result == DialogResult.Yes)
-            {
-                foreach (string file in queueFiles)
-                {
-                    encodeQueue.QueueManager.RestoreQueue(appDataPath + file); // Start Recovery
-                }
-            }
-            else
-            {
-                if (GeneralUtilities.IsMultiInstance) return; // Don't tamper with the files if we are multi instance
-
-                foreach (string file in queueFiles)
-                {
-                    if (File.Exists(Path.Combine(appDataPath, file)))
-                        File.Delete(Path.Combine(appDataPath, file));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get The Source from the CLI Query
-        /// </summary>
-        /// <param name="query">Full CLI Query</param>
-        /// <returns>The Source Path</returns>
-        public static string GetSourceFromQuery(string query)
-        {
-            int startIndex = query.IndexOf("-i \"");
-            if (startIndex != -1)
-            {
-                string input = query.Substring(startIndex).Replace("-i \"", string.Empty).Trim();
-
-                int closeIndex = input.IndexOf('"');
-
-                return closeIndex == -1 ? "Unknown" : input.Substring(0, closeIndex);
-            }
-
-            return "Unknown";
-        }
-
-        /// <summary>
-        /// Get the Destination from the CLI Query
-        /// </summary>
-        /// <param name="query">Full CLI Query</param>
-        /// <returns>The Destination path</returns>
-        public static string GetDestinationFromQuery(string query)
-        {
-            int startIndex = query.IndexOf("-o \"");
-            if (startIndex != -1)
-            {
-                string output = query.Substring(startIndex).Replace("-o \"", string.Empty).Trim();
-
-                int closeIndex = output.IndexOf('"');
-
-                return closeIndex == -1 ? "Unknown" : output.Substring(0, closeIndex);
-            }
-
-            return "Unknown";
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Functions/PresetLoader.cs Deleted

@@ -1,349 +0,0 @@
-/*  PresetLoader.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Functions
-{
-    using System.Drawing;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.ApplicationServices.Utilities;
-    using HandBrake.Interop.Model.Encoding;
-
-    using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;
-
-    /// <summary>
-    /// Load a preset into the main Window
-    /// </summary>
-    public class PresetLoader
-    {
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Load an Encode task as a Preset
-        /// </summary>
-        /// <param name="mainWindow">
-        /// The main window.
-        /// </param>
-        /// <param name="encodeTask">
-        /// The encode task.
-        /// </param>
-        public static void LoadPreset(frmMain mainWindow, EncodeTask encodeTask)
-        {
-            Preset preset = new Preset { Name = "Unknown", Task = encodeTask };
-            LoadPreset(mainWindow, preset);
-        }
-
-        /// <summary>
-        /// This function takes in a Query which has been parsed by QueryParser and
-        /// set's all the GUI widgets correctly.
-        /// </summary>
-        /// <param name="mainWindow">
-        /// FrmMain window
-        /// </param>
-        /// <param name="preset">
-        /// The preset.
-        /// </param>
-        public static void LoadPreset(frmMain mainWindow, Preset preset)
-        {
-            // Send the query from the file to the Query Parser class
-            EncodeTask presetQuery = preset.Task ?? QueryParserUtility.Parse(preset.Query);
-            if (preset.Task == null)
-            {
-                preset.Task = presetQuery;
-            }
-
-            #region Source
-
-            // Reset some vaules to stock first to prevent errors.
-            mainWindow.check_iPodAtom.CheckState = CheckState.Unchecked;
-
-            // Now load all the new settings onto the main window
-            string destination = mainWindow.text_destination.Text;
-            destination = destination.Replace(".mp4", "." + presetQuery.OutputFormat);
-            destination = destination.Replace(".m4v", "." + presetQuery.OutputFormat);
-            destination = destination.Replace(".mkv", "." + presetQuery.OutputFormat);
-            mainWindow.text_destination.Text = destination;
-
-            #endregion
-
-            #region Destination and Output Settings
-
-            if (presetQuery.OutputFormat == OutputFormat.Mp4 || presetQuery.OutputFormat == OutputFormat.M4V)
-            {
-                if (mainWindow.drop_format.SelectedIndex == 0)
-                {
-                    mainWindow.SetExtension(".mp4");
-                }
-                else
-                {
-                    mainWindow.drop_format.SelectedIndex = 0;
-                }
-            }
-            else if (presetQuery.OutputFormat == OutputFormat.Mkv)
-            {
-                if (mainWindow.drop_format.SelectedIndex == 1)
-                {
-                    mainWindow.SetExtension(".mkv");
-                }
-                else
-                {
-                    mainWindow.drop_format.SelectedIndex = 1;
-                }
-            }
-
-            mainWindow.check_iPodAtom.CheckState = presetQuery.IPod5GSupport ? CheckState.Checked : CheckState.Unchecked;
-
-            mainWindow.check_optimiseMP4.CheckState = presetQuery.OptimizeMP4
-                                                          ? CheckState.Checked
-                                                          : CheckState.Unchecked;
-
-            mainWindow.check_largeFile.CheckState = presetQuery.LargeFile ? CheckState.Checked : CheckState.Unchecked;
-
-            mainWindow.setContainerOpts(); // select the container options according to the selected format
-
-            #endregion
-
-            #region Picture
-
-            mainWindow.PictureSettings.check_autoCrop.Checked = true;
-            if (preset.CropSettings && presetQuery.HasCropping)
-            {
-                mainWindow.PictureSettings.check_customCrop.Checked = true;
-                mainWindow.PictureSettings.crop_top.Value = presetQuery.Cropping.Top;
-                mainWindow.PictureSettings.crop_bottom.Value = presetQuery.Cropping.Bottom;
-                mainWindow.PictureSettings.crop_left.Value = presetQuery.Cropping.Left;
-                mainWindow.PictureSettings.crop_right.Value = presetQuery.Cropping.Right;
-            }
-
-            // Set the anamorphic mode 0,1,2,3
-
-            switch (presetQuery.Anamorphic)
-            {
-                case Anamorphic.None:
-                    mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = 0;
-                    break;
-                case Anamorphic.Strict:
-                    mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = 1;
-                    break;
-                case Anamorphic.Loose:
-                    mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = 2;
-                    break;
-                case Anamorphic.Custom:
-                    mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = 3;
-                    break;
-            }
-
-            // Keep Aspect Ration Anamorphic Setting.
-            mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.KeepDisplayAspect
-                                                                     ? CheckState.Checked
-                                                                     : CheckState.Unchecked;
-
-            bool sizeSet = false;
-            // Set the Width and height as Required.
-            if (presetQuery.Width.HasValue)
-            {
-                mainWindow.PictureSettings.text_width.Value = presetQuery.Width.Value;
-                sizeSet = true;
-            }
-
-            if (presetQuery.Height.HasValue)
-            {
-                mainWindow.PictureSettings.text_height.Value = presetQuery.Height.Value;
-                sizeSet = true;
-            }
-
-            // Max Width/Height override Width/Height
-            if (presetQuery.MaxWidth.HasValue)
-            {
-                mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth.Value;
-                sizeSet = true;
-            }
-
-            if (presetQuery.MaxHeight.HasValue)
-            {
-                mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight.Value;
-                sizeSet = true;
-            }
-
-            mainWindow.PictureSettings.SizeSet = sizeSet;
-            mainWindow.PictureSettings.PresetMaximumResolution = new Size(
-                     presetQuery.MaxWidth.HasValue ? presetQuery.MaxWidth.Value : 0,
-                     presetQuery.MaxHeight.HasValue ? presetQuery.MaxHeight.Value : 0);
-
-            // Case where both height and max height are 0 - For built-in presets
-            if (presetQuery.MaxHeight == 0 && presetQuery.Height == 0)
-            {
-                mainWindow.PictureSettings.text_height.Value = 0;
-            }
-
-            if (presetQuery.MaxWidth == 0 && presetQuery.Width == 0)
-            {
-                if (mainWindow.selectedTitle != null && mainWindow.selectedTitle.Resolution.Width != 0)
-                {
-                    mainWindow.PictureSettings.text_width.Value = mainWindow.selectedTitle.Resolution.Width;
-                }
-            }
-
-            // Aspect Ratio for non anamorphic sources
-            if (presetQuery.Anamorphic == Anamorphic.None)
-            {
-                mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.Height == 0
-                                                                         ? CheckState.Checked
-                                                                         : CheckState.Unchecked;
-            }
-
-            // Custom Anamorphic Controls
-            mainWindow.PictureSettings.updownDisplayWidth.Text = presetQuery.DisplayWidth.ToString();
-            mainWindow.PictureSettings.updownParHeight.Text = presetQuery.PixelAspectY.ToString();
-            mainWindow.PictureSettings.updownParWidth.Text = presetQuery.PixelAspectX.ToString();
-            mainWindow.PictureSettings.drp_modulus.SelectedItem = presetQuery.Modulus.ToString();
-
-            #endregion
-
-            #region Filters
-
-            mainWindow.Filters.SetDecomb(presetQuery.Decomb, presetQuery.CustomDecomb);
-            mainWindow.Filters.SetDeInterlace(presetQuery.Deinterlace, presetQuery.CustomDeinterlace);
-            mainWindow.Filters.SetDeNoise(presetQuery.Denoise, presetQuery.CustomDenoise);
-            mainWindow.Filters.SetDeTelecine(presetQuery.Detelecine, presetQuery.CustomDetelecine);
-            mainWindow.Filters.SetDeBlock(presetQuery.Deblock);
-            mainWindow.Filters.SetGrayScale(presetQuery.Grayscale);
-
-            #endregion
-
-            #region Video
-
-            switch (presetQuery.VideoEncoder)
-            {
-                case VideoEncoder.X264:
-                    mainWindow.drp_videoEncoder.SelectedIndex = 0;
-                    break;
-                case VideoEncoder.FFMpeg:
-                    mainWindow.drp_videoEncoder.SelectedIndex = 1;
-                    break;
-                case VideoEncoder.FFMpeg2:
-                    mainWindow.drp_videoEncoder.SelectedIndex = 2;
-                    break;
-                case VideoEncoder.Theora:
-                    mainWindow.drp_videoEncoder.SelectedIndex = 3;
-                    break;
-            }
-
-            // Quality
-            if (presetQuery.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality)
-            {
-                mainWindow.radio_cq.Checked = true;
-                mainWindow.slider_videoQuality.Value = QualityToSliderValue(presetQuery.VideoEncoder, presetQuery.Quality);
-                mainWindow.check_2PassEncode.CheckState = CheckState.Unchecked;
-                mainWindow.check_turbo.CheckState = CheckState.Unchecked;
-            }
-            else if (presetQuery.VideoEncodeRateType == VideoEncodeRateType.AverageBitrate)
-            {
-                mainWindow.radio_avgBitrate.Checked = true;
-                mainWindow.text_bitrate.Text = presetQuery.VideoBitrate.ToString();
-                mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;
-                mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;
-            }
-
-            if (presetQuery.Framerate != null)
-            {
-                mainWindow.drp_videoFramerate.Text = presetQuery.Framerate.ToString();
-            }
-            else
-            {
-                mainWindow.drp_videoFramerate.SelectedIndex = 0;
-            }
-
-
-            if (presetQuery.Framerate != null)
-            {
-                // Constant or Peak Framerate for a set framerate.
-                if (presetQuery.FramerateMode == FramerateMode.CFR)
-                    mainWindow.radio_constantFramerate.Checked = true;
-                else
-                    mainWindow.radio_peakAndVariable.Checked = true;
-            }
-            else
-            {
-                // Constant or Variable Framerate for Same as Source.
-                if (presetQuery.FramerateMode == FramerateMode.CFR)
-                    mainWindow.radio_constantFramerate.Checked = true;
-                else
-                    mainWindow.radio_peakAndVariable.Checked = true;
-            }
-
-            #endregion
-
-            #region Chapter Markers
-
-            if (presetQuery.IncludeChapterMarkers)
-            {
-                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Checked;
-                mainWindow.Check_ChapterMarkers.Enabled = true;
-            }
-            else
-            {
-                mainWindow.Check_ChapterMarkers.CheckState = CheckState.Unchecked;
-            }
-
-            #endregion
-
-            #region Audio
-
-            mainWindow.AudioSettings.LoadTracks(preset);
-
-            #endregion
-
-            #region Other
-
-            mainWindow.x264Panel.X264Query = presetQuery.AdvancedEncoderOptions;
-
-            // Set the preset name
-            mainWindow.labelPreset.Text = "Output Settings (Preset: " + preset.Name + ")";
-
-            #endregion
-        }
-
-        /// <summary>
-        /// Convert a Quality Value to a position value for the Video Quality slider
-        /// </summary>
-        /// <param name="videoEncoder">The selected video encoder</param>
-        /// <param name="value">The Quality value</param>
-        /// <returns>The position on the video quality slider</returns>
-        private static int QualityToSliderValue(VideoEncoder videoEncoder, double? value)
-        {
-            if (!value.HasValue)
-            {
-                // Default to a sensible level.
-                return 20;
-            }
-
-            int sliderValue = 0;
-            switch (videoEncoder)
-            {
-                case VideoEncoder.FFMpeg:
-                case VideoEncoder.FFMpeg2:
-                    sliderValue = 32 - (int)value;
-                    break;
-                case VideoEncoder.X264:
-                    double cqStep = UserSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-                    sliderValue = (int)((51.0 / cqStep) - (value / cqStep));
-                    break;
-                case VideoEncoder.Theora:
-                    sliderValue = (int)value;
-                    break;
-            }
-
-            return sliderValue;
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Functions/QueryGenerator.cs Deleted

@@ -1,875 +0,0 @@
-/*  QueryGenerator.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Functions
-{
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Functions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.Interop.Model;
-    using HandBrake.Interop.Model.Encoding;
-
-    using Handbrake.Model;
-
-    using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;
-
-    /// <summary>
-    /// Generate a CLI Query for HandBrakeCLI
-    /// </summary>
-    public class QueryGenerator
-    {
-        /// <summary>
-        /// Backing field for the user setting service.
-        /// </summary>
-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// The Culture
-        /// </summary>
-        private static readonly CultureInfo Culture = new CultureInfo("en-US", false);
-
-        /// <summary>
-        /// Generate a CLI Query (Usable by the preset system)
-        /// </summary>
-        /// <param name="mainWindow">
-        /// The main window.
-        /// </param>
-        /// <param name="mode">
-        /// The mode.
-        /// </param>
-        /// <param name="filters">
-        /// The filters.
-        /// </param>
-        /// <param name="width">
-        /// The width.
-        /// </param>
-        /// <param name="height">
-        /// The height.
-        /// </param>
-        /// <returns>
-        /// A CLI Query as a string.
-        /// </returns>
-        public static string GenerateQueryForPreset(frmMain mainWindow, QueryPictureSettingsMode mode, bool filters, int width, int height)
-        {
-            string query = string.Empty;
-
-            query += GenerateTabbedComponentsQuery(mainWindow, filters, mode, width, height);
-
-            return query;
-        }
-
-        /// <summary>
-        /// Generate a CLI Query for a preview.
-        /// </summary>
-        /// <param name="mainWindow">
-        /// The main window.
-        /// </param>
-        /// <param name="duration">
-        /// The duration.
-        /// </param>
-        /// <param name="preview">
-        /// The preview.
-        /// </param>
-        /// <returns>
-        /// Preview CLI Query
-        /// </returns>
-        public static string GeneratePreviewQuery(frmMain mainWindow, int duration, string preview)
-        {
-            string query = string.Empty;
-
-            query += SourceQuery(mainWindow, 3, duration, preview);
-
-            query += DestinationQuery(mainWindow, QueryEncodeMode.Preview);
-
-            query += GenerateTabbedComponentsQuery(mainWindow, true, QueryPictureSettingsMode.UserInterfaceSettings, 0, 0);
-
-            return query;
-        }
-
-        /// <summary>
-        /// Generate a QueueTask ready for Queuing. 
-        /// </summary>
-        /// <param name="mainWindow">
-        /// The main window
-        /// </param>
-        /// <returns>
-        /// A QueueTask object.
-        /// </returns>
-        public static QueueTask GenerateFullQuery(frmMain mainWindow)
-        {
-            // Create the CLI Query
-            string query = string.Empty;
-            query += SourceQuery(mainWindow, mainWindow.drop_mode.SelectedIndex, 0, null);
-            query += DestinationQuery(mainWindow, QueryEncodeMode.Standard);
-            query += GenerateTabbedComponentsQuery(mainWindow, true, QueryPictureSettingsMode.UserInterfaceSettings, 0, 0);
-
-            // Create the Queue Task and setup the EncodeTask model object.
-
-
-            Preset preset = null;
-            if (mainWindow.treeView_presets.SelectedNode != null)
-            {
-                preset = mainWindow.treeView_presets.SelectedNode.Tag as Preset;
-            }
-
-            bool isCustom = true;
-            if (preset != null && preset.IsBuildIn)
-            {
-                isCustom = false;
-            }
-
-            EncodeTask task = CreateEncodeTaskObject(mainWindow);
-            QueueTask queueTask = new QueueTask(query)
-            {
-                Source = task.Source,
-                Destination = task.Destination,
-                Title = mainWindow.GetTitle(),
-                CustomQuery = (mainWindow.rtf_query.Text != string.Empty) || isCustom,
-                Task = task,
-                Query = query,
-            };
-
-            return queueTask;
-        }
-
-        #region Individual Query Sections
-
-        private static string GenerateTabbedComponentsQuery(frmMain mainWindow, bool filters, QueryPictureSettingsMode mode, int width, int height)
-        {
-            string query = string.Empty;
-
-            // Output Settings
-            query += OutputSettingsQuery(mainWindow);
-
-            // Filters Panel
-            if (filters)
-                query += FiltersQuery(mainWindow);
-
-            // Picture Settings
-            query += PictureSettingsQuery(mainWindow, mode, width, height);
-
-            // Video Settings
-            query += VideoSettingsQuery(mainWindow);
-
-            // Audio Settings
-            query += AudioSettingsQuery(mainWindow);
-
-            // Subtitles Panel
-            query += mainWindow.Subtitles.GetCliQuery;
-
-            // Chapter Markers
-            query += ChapterMarkersQuery(mainWindow);
-
-            // X264 Panel
-            query += X264Query(mainWindow);
-
-            // Extra Settings
-            query += ExtraSettings();
-
-            return query;
-        }
-
-        private static string SourceQuery(frmMain mainWindow, int mode, int duration, string preview)
-        {
-            string query = string.Empty;
-            string sourcePath = string.Empty;
-
-            sourcePath = mainWindow.selectedTitle != null && File.Exists(mainWindow.selectedTitle.SourceName)
-                             ? mainWindow.selectedTitle.SourceName.Trim()
-                             : mainWindow.sourcePath;
-
-            if (!string.IsNullOrEmpty(mainWindow.sourcePath) && mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")
-            {
-                if (mainWindow.sourcePath.EndsWith("\\"))
-                {
-                    query = " -i " + sourcePath;
-                }
-                else
-                {
-                    query = " -i " + '"' + sourcePath + '"';
-                }
-            }
-
-            if (mainWindow.drp_dvdtitle.Text != string.Empty)
-            {
-                string[] titleInfo = mainWindow.drp_dvdtitle.Text.Split(' ');
-                query += " -t " + titleInfo[0];
-            }
-
-            if (!UserSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav) && mainWindow.drop_angle.Items.Count != 0)
-                query += " --angle " + mainWindow.drop_angle.SelectedItem;
-
-            // Decide what part of the video we want to encode.
-            switch (mode)
-            {
-                case 0: // Chapters
-                    if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text &&
-                        mainWindow.drop_chapterStart.Text != string.Empty)
-                        query += string.Format(" -c {0}", mainWindow.drop_chapterStart.Text);
-                    else if (mainWindow.drop_chapterStart.Text != string.Empty &&
-                             mainWindow.drop_chapterFinish.Text != string.Empty)
-                        query += string.Format(" -c {0}-{1}", mainWindow.drop_chapterStart.Text,
-                                               mainWindow.drop_chapterFinish.Text);
-                    break;
-                case 1: // Seconds
-                    int start, end;
-                    int.TryParse(mainWindow.drop_chapterStart.Text, out start);
-                    int.TryParse(mainWindow.drop_chapterFinish.Text, out end);
-                    int calculatedDuration = end - start;
-
-                    query += string.Format(" --start-at duration:{0} --stop-at duration:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);
-                    break;
-                case 2: // Frames
-                    int.TryParse(mainWindow.drop_chapterStart.Text, out start);
-                    int.TryParse(mainWindow.drop_chapterFinish.Text, out end);
-                    calculatedDuration = end - start;
-
-                    query += string.Format(" --start-at frame:{0} --stop-at frame:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);
-                    break;
-                case 3: // Preview
-                    query += " --start-at-preview " + preview;
-                    query += " --stop-at duration:" + duration + " ";
-                    break;
-                default:
-                    break;
-            }
-
-            return query;
-        }
-
-        private static string DestinationQuery(frmMain mainWindow, QueryEncodeMode mode)
-        {
-            string query = string.Empty;
-
-            if (string.IsNullOrEmpty(mainWindow.text_destination.Text))
-            {
-                return string.Empty;
-            }
-
-            if (mode != QueryEncodeMode.Preview)
-                query += string.Format(" -o \"{0}\" ", mainWindow.text_destination.Text);
-            else
-            {
-                if (mainWindow.text_destination.Text != string.Empty)
-                    query += string.Format(" -o \"{0}\" ", mainWindow.text_destination.Text.Replace(".m", "_sample.m"));
-            }
-
-            return query;
-        }
-
-        private static string OutputSettingsQuery(frmMain mainWindow)
-        {
-            string query = string.Empty;
-
-            query += " -f " + mainWindow.drop_format.Text.ToLower().Replace(" file", string.Empty);
-
-            // These are output settings features
-            if (mainWindow.check_largeFile.Checked)
-                query += " -4 ";
-
-            if (mainWindow.check_iPodAtom.Checked)
-                query += " -I ";
-
-            if (mainWindow.check_optimiseMP4.Checked)
-                query += " -O ";
-
-            return query;
-        }
-
-        private static string PictureSettingsQuery(frmMain mainWindow, QueryPictureSettingsMode mode, int width, int height)
-        {
-            string query = string.Empty;
-
-            if (mode == QueryPictureSettingsMode.UserInterfaceSettings)
-            {
-                if (mainWindow.PictureSettings.text_width.Value != 0)
-                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic
-                        query += " -w " + mainWindow.PictureSettings.text_width.Text;
-
-                if (mainWindow.PictureSettings.text_height.Value != 0 &&
-                    mainWindow.PictureSettings.text_height.Text != string.Empty)
-                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 ||
-                        mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic
-                        query += " -l " + mainWindow.PictureSettings.text_height.Text;
-            }
-            else if (mode == QueryPictureSettingsMode.Custom) // For Add Preset Only.
-            {
-                query += " -X " + width;
-                query += " -Y " + height;
-            }
-            else if (mode == QueryPictureSettingsMode.SourceMaximum) // For Add Preset Only.
-            {
-                if (mainWindow.PictureSettings.text_width.Value != 0)
-                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic
-                        query += " -X " + mainWindow.PictureSettings.text_width.Text;
-
-                if (mainWindow.PictureSettings.text_height.Value != 0 &&
-                    mainWindow.PictureSettings.text_height.Text != string.Empty)
-                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 ||
-                        mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic
-                        query += " -Y " + mainWindow.PictureSettings.text_height.Text;
-            }
-
-            string cropTop = mainWindow.PictureSettings.crop_top.Text;
-            string cropBottom = mainWindow.PictureSettings.crop_bottom.Text;
-            string cropLeft = mainWindow.PictureSettings.crop_left.Text;
-            string cropRight = mainWindow.PictureSettings.crop_right.Text;
-
-            if (mainWindow.PictureSettings.check_customCrop.Checked && mode != QueryPictureSettingsMode.None)
-            {
-                if (mainWindow.PictureSettings.crop_top.Text == string.Empty)
-                    cropTop = "0";
-                if (mainWindow.PictureSettings.crop_bottom.Text == string.Empty)
-                    cropBottom = "0";
-                if (mainWindow.PictureSettings.crop_left.Text == string.Empty)
-                    cropLeft = "0";
-                if (mainWindow.PictureSettings.crop_right.Text == string.Empty)
-                    cropRight = "0";
-
-                query += " --crop " + cropTop + ":" + cropBottom + ":" + cropLeft + ":" + cropRight;
-            }
-
-            switch (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex)
-            {
-                case 0:
-                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)
-                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;
-                    break;
-                case 1:
-                    query += " --strict-anamorphic ";
-                    break;
-                case 2:
-                    query += " --loose-anamorphic ";
-                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)
-                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;
-                    break;
-                case 3:
-                    query += " --custom-anamorphic ";
-
-                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)
-                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;
-
-                    if (mainWindow.PictureSettings.check_KeepAR.Checked)
-                        query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";
-
-                    if (mainWindow.PictureSettings.check_KeepAR.Checked)
-                        query += " --keep-display-aspect ";
-
-                    if (!mainWindow.PictureSettings.check_KeepAR.Checked)
-                        if (mainWindow.PictureSettings.updownParWidth.Text != string.Empty &&
-                            mainWindow.PictureSettings.updownParHeight.Text != string.Empty)
-                            query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" +
-                                     mainWindow.PictureSettings.updownParHeight.Text + " ";
-                    break;
-            }
-
-            return query;
-        }
-
-        private static string FiltersQuery(frmMain mainWindow)
-        {
-            return mainWindow.Filters.GetCliQuery;
-        }
-
-        private static string VideoSettingsQuery(frmMain mainWindow)
-        {
-            string query = string.Empty;
-
-            switch (mainWindow.drp_videoEncoder.Text)
-            {
-                case "MPEG-4 (FFmpeg)":
-                    query += " -e ffmpeg4";
-                    break;
-                case "MPEG-2 (FFmpeg)":
-                    query += " -e ffmpeg2";
-                    break;
-                case "H.264 (x264)":
-                    query += " -e x264";
-                    break;
-                case "VP3 (Theora)":
-                    query += " -e theora";
-                    break;
-                default:
-                    query += " -e x264";
-                    break;
-            }
-
-            // Video Settings
-            if (mainWindow.radio_avgBitrate.Checked)
-                query += " -b " + mainWindow.text_bitrate.Text;
-
-            // Video Quality Setting
-            if (mainWindow.radio_cq.Checked)
-            {
-                double cqStep = UserSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-                double value;
-                switch (mainWindow.drp_videoEncoder.Text)
-                {
-                    case "MPEG-4 (FFmpeg)":
-                    case "MPEG-2 (FFmpeg)":
-                        value = 31 - (mainWindow.slider_videoQuality.Value - 1);
-                        query += " -q " + value.ToString(CultureInfo.InvariantCulture);
-                        break;
-                    case "H.264 (x264)":
-                        value = 51 - (mainWindow.slider_videoQuality.Value * cqStep);
-                        value = Math.Round(value, 2);
-                        query += " -q " + value.ToString(CultureInfo.InvariantCulture);
-                        break;
-                    case "VP3 (Theora)":
-                        value = mainWindow.slider_videoQuality.Value;
-                        query += " -q " + value.ToString(CultureInfo.InvariantCulture);
-                        break;
-                }
-            }
-
-            if (mainWindow.check_2PassEncode.Checked)
-                query += " -2 ";
-
-            if (mainWindow.check_turbo.Checked)
-                query += " -T ";
-
-            if (mainWindow.drp_videoFramerate.Text != "Same as source")
-                query += " -r " + mainWindow.drp_videoFramerate.Text;
-
-            if (mainWindow.drp_videoFramerate.SelectedIndex == 0)
-            {
-                // If we use Same as Source, we can either output CFR or VFR
-                query += mainWindow.radio_constantFramerate.Checked ? " --cfr " : " --vfr ";
-            }
-            else
-            {
-                // We have a hard framerate set, so we can either be Constant or peak (VFR) framerate
-                query += mainWindow.radio_constantFramerate.Checked ? " --cfr " : " --pfr ";
-            }
-
-            return query;
-        }
-
-        private static string AudioSettingsQuery(frmMain mainWindow)
-        {
-            // Queries for each option
-            string tracks = string.Empty;
-            string encoders = string.Empty;
-            string mixdowns = string.Empty;
-            string samplerates = string.Empty;
-            string bitrates = string.Empty;
-            string drvValues = string.Empty;
-            string gainValues = string.Empty;
-            string trackNames = string.Empty;
-
-            // If we have no audio tracks, set the query to none
-            if (mainWindow.AudioSettings.AudioTracks.ToList().Count == 0)
-            {
-                return " -a none";
-            }
-
-            // Generate the sub queries
-            foreach (AudioTrack audioTrack in mainWindow.AudioSettings.AudioTracks)
-            {
-                // Audio Track (-a)
-                string track = audioTrack.Track.HasValue ? audioTrack.Track.ToString() : "1"; // Default to "1"
-                tracks += string.IsNullOrEmpty(tracks) ? track : string.Format(",{0}", track);
-
-                // Audio Encoder  (-E)
-                encoders += string.IsNullOrEmpty(encoders)
-                              ? Converters.GetCliAudioEncoder(audioTrack.Encoder)
-                              : string.Format(",{0}", Converters.GetCliAudioEncoder(audioTrack.Encoder));
-
-                // Audio Mixdowns (-6)
-                mixdowns += string.IsNullOrEmpty(mixdowns)
-                              ? Converters.GetCliMixDown(audioTrack.MixDown)
-                              : string.Format(",{0}", Converters.GetCliMixDown(audioTrack.MixDown));
-
-                // Audio Samplerates (-R)
-                string rate = audioTrack.SampleRate == 0 ? "Auto" : audioTrack.SampleRate.ToString(Culture); // Default to "Auto"
-                samplerates += string.IsNullOrEmpty(samplerates) ? rate : string.Format(",{0}", rate);
-
-                // Audio Bitrates (-B)
-                bitrates += string.IsNullOrEmpty(bitrates)
-                                ? audioTrack.Bitrate.ToString(Culture)
-                                : string.Format(",{0}", audioTrack.Bitrate);
-
-                // Audio DRC Values
-                drvValues += string.IsNullOrEmpty(drvValues) ? audioTrack.DRC.ToString(Culture) : string.Format(",{0}", audioTrack.DRC.ToString(Culture));
-
-                // Audio Gain Control
-                gainValues += string.IsNullOrEmpty(gainValues) ? audioTrack.Gain.ToString(Culture) : string.Format(",{0}", audioTrack.Gain.ToString(Culture));
-
-
-                trackNames += string.IsNullOrEmpty(trackNames)
-                                ? string.IsNullOrEmpty(audioTrack.TrackName) ? "\"\"" : string.Format("\"{0}\"", audioTrack.TrackName.Trim())
-                                : string.IsNullOrEmpty(audioTrack.TrackName) ? ",\"\"" : string.Format(",\"{0}\"", audioTrack.TrackName.Trim());
-            }
-
-            string audioQuery = string.Format(
-                " -a {0} -E {1} -B {2} -6 {3} -R {4} -D {5} --gain={6}",
-                tracks,
-                encoders,
-                bitrates,
-                mixdowns,
-                samplerates,
-                drvValues,
-                gainValues);
-
-            if (!string.IsNullOrEmpty(trackNames.Trim()) && !string.IsNullOrEmpty(trackNames.Replace("\"", string.Empty).Replace(",", string.Empty).Trim()))
-            {
-                audioQuery += string.Format(" --aname={0}", trackNames);
-            }
-
-            // Passthru Settings
-            if (mainWindow.AudioSettings.PassthruSettings != null)
-            {
-                string fallbackEncoders = string.Empty;
-
-                if (mainWindow.AudioSettings.PassthruSettings.AudioAllowAACPass)
-                {
-                    fallbackEncoders += "aac";
-                }
-
-                if (mainWindow.AudioSettings.PassthruSettings.AudioAllowAC3Pass)
-                {
-                    fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "ac3" : ",ac3";
-                }
-
-                if (mainWindow.AudioSettings.PassthruSettings.AudioAllowDTSHDPass)
-                {
-                    fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "dtshd" : ",dtshd";
-                }
-
-                if (mainWindow.AudioSettings.PassthruSettings.AudioAllowDTSPass)
-                {
-                    fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "dts" : ",dts";
-                }
-
-                if (mainWindow.AudioSettings.PassthruSettings.AudioAllowMP3Pass)
-                {
-                    fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "mp3" : ",mp3";
-                }
-
-                if (!string.IsNullOrEmpty(fallbackEncoders))
-                {
-                    audioQuery += string.Format(" --audio-copy-mask {0}", fallbackEncoders);
-                }
-                else
-                {
-                    audioQuery += " --audio-copy-mask none";
-                }
-
-                audioQuery += string.Format(" --audio-fallback {0}", Converters.GetCliAudioEncoder(mainWindow.AudioSettings.PassthruSettings.AudioEncoderFallback));
-            }
-
-            return audioQuery;
-        }
-
-        private static string ChapterMarkersQuery(frmMain mainWindow)
-        {
-            string query = string.Empty;
-
-            // Attach Source name and dvd title to the start of the chapters.csv filename.
-            // This is for the queue. It allows different chapter name files for each title.
-            string[] destNameSplit = mainWindow.text_destination.Text.Split('\\');
-            string destName = destNameSplit[destNameSplit.Length - 1];
-            destName = destName.Replace("\"", string.Empty);
-            destName = destName.Replace(".mp4", string.Empty).Replace(".m4v", string.Empty).Replace(".mkv", string.Empty);
-
-            string sourceTitle = mainWindow.drp_dvdtitle.Text;
-            string[] titlesplit = sourceTitle.Split(' ');
-            sourceTitle = titlesplit[0];
-
-            if (mainWindow.Check_ChapterMarkers.Checked && mainWindow.Check_ChapterMarkers.Enabled)
-            {
-                if (destName.Trim() != String.Empty)
-                {
-                    string path = sourceTitle != "Automatic"
-                                      ? Path.Combine(Path.GetTempPath(), destName + "-" + sourceTitle + "-chapters.csv")
-                                      : Path.Combine(Path.GetTempPath(), destName + "-chapters.csv");
-
-                    if (ChapterCsvSave(mainWindow, path) == false)
-                        query += " -m ";
-                    else
-                        query += " --markers=" + "\"" + path + "\"";
-                }
-                else
-                    query += " -m";
-            }
-
-            return query;
-        }
-
-        private static string X264Query(frmMain mainWindow)
-        {
-            string advancedOptions = string.Empty;
-            if (mainWindow.drp_videoEncoder.SelectedItem.ToString().Contains("FFmpeg"))
-            {
-                advancedOptions = string.IsNullOrEmpty(mainWindow.advancedEncoderOpts.AdavancedQuery.Trim())
-                       ? string.Empty
-                       : mainWindow.advancedEncoderOpts.AdavancedQuery;
-            }
-            else if (mainWindow.drp_videoEncoder.SelectedItem.ToString().Contains("x264"))
-            {
-                advancedOptions = string.IsNullOrEmpty(mainWindow.x264Panel.X264Query.Trim())
-                       ? string.Empty
-                       : mainWindow.x264Panel.X264Query;
-            }
-
-            return !string.IsNullOrEmpty(advancedOptions) ? " -x " + advancedOptions : string.Empty;
-        }
-
-        private static string ExtraSettings()
-        {
-            string query = string.Empty;
-
-            // Verbosity Level
-            query += " --verbose=" + UserSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
-
-            // LibDVDNav
-            if (UserSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
-                query += " --no-dvdnav";
-
-            if (UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount) != 10)
-            {
-                query += string.Format(
-                    " --previews {0} ", UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount));
-            }
-
-            return query;
-        }
-
-        #endregion
-
-        #region EncodeTask
-
-        /// <summary>
-        /// Create the EncodeTask model from the currently selected control options.
-        /// </summary>
-        /// <param name="frmMain">
-        /// The frm main.
-        /// </param>
-        /// <returns>
-        /// An EncodeTask Object
-        /// </returns>
-        private static EncodeTask CreateEncodeTaskObject(frmMain frmMain)
-        {
-            EncodeTask task = new EncodeTask();
-
-            // Source, Destination and Output Settings
-            task.Destination = frmMain.text_destination.Text;
-            string sourcePath = frmMain.selectedTitle != null && File.Exists(frmMain.selectedTitle.SourceName)
-                             ? frmMain.selectedTitle.SourceName.Trim()
-                             : frmMain.sourcePath;
-            if (!string.IsNullOrEmpty(sourcePath) && sourcePath.Trim() != "Select \"Source\" to continue")
-            {
-                task.Source = sourcePath;
-            }
-
-            if (frmMain.drp_dvdtitle.Text != string.Empty)
-            {
-                string[] titleInfo = frmMain.drp_dvdtitle.Text.Split(' ');
-                int title;
-                int.TryParse(titleInfo[0], out title);
-                task.Title = title;
-            }
-
-
-            int start, end, angle;
-            int.TryParse(frmMain.drop_chapterStart.Text, out start);
-            int.TryParse(frmMain.drop_chapterFinish.Text, out end);
-            int.TryParse(frmMain.drop_angle.Text, out angle);
-            task.StartPoint = start;
-            task.EndPoint = end;
-            task.Angle = angle;
-
-            switch (frmMain.drop_mode.SelectedIndex)
-            {
-                case 0: // Chapters
-                    task.PointToPointMode = PointToPointMode.Chapters;
-                    break;
-                case 1: // Seconds
-                    task.PointToPointMode = PointToPointMode.Seconds;
-                    break;
-                case 2: // Frames
-                    task.PointToPointMode = PointToPointMode.Frames;
-                    break;
-                default:
-                    break;
-            }
-
-            task.OutputFormat = EnumHelper<OutputFormat>.GetValue(frmMain.drop_format.Text.Replace(" File", string.Empty).Trim());
-            task.LargeFile = frmMain.check_largeFile.Checked;
-            task.IPod5GSupport = frmMain.check_largeFile.Checked;
-            task.OptimizeMP4 = frmMain.check_optimiseMP4.Checked;
-
-            // Picture Settings
-            int width, height;
-            int.TryParse(frmMain.PictureSettings.crop_top.Text, out width);
-            int.TryParse(frmMain.PictureSettings.crop_top.Text, out height);
-            task.Width = width;
-            task.Height = height;
-            int top, bottom, left, right;
-            int.TryParse(frmMain.PictureSettings.crop_top.Text, out top);
-            int.TryParse(frmMain.PictureSettings.crop_top.Text, out bottom);
-            int.TryParse(frmMain.PictureSettings.crop_top.Text, out left);
-            int.TryParse(frmMain.PictureSettings.crop_top.Text, out right);
-            task.Cropping = new Cropping(top, bottom, left, right);
-
-            int modulus, displayWidth, parX, parY;
-            int.TryParse(frmMain.PictureSettings.drp_modulus.SelectedItem.ToString(), out modulus);
-            int.TryParse(frmMain.PictureSettings.updownDisplayWidth.Text, out displayWidth);
-            int.TryParse(frmMain.PictureSettings.updownParWidth.Text, out parX);
-            int.TryParse(frmMain.PictureSettings.updownParHeight.Text, out parY);
-            switch (frmMain.PictureSettings.drp_anamorphic.SelectedIndex)
-            {
-                case 0:
-                    task.Anamorphic = Anamorphic.None;
-                    task.Modulus = modulus;
-                    break;
-                case 1:
-                    task.Anamorphic = Anamorphic.Strict;
-                    break;
-                case 2:
-                    task.Anamorphic = Anamorphic.Loose;
-                    task.Modulus = modulus;
-                    break;
-                case 3:
-                    task.Anamorphic = Anamorphic.Custom;
-                    task.Modulus = modulus;
-                    task.DisplayWidth = displayWidth;
-                    task.KeepDisplayAspect = frmMain.PictureSettings.check_KeepAR.Checked;
-                    task.PixelAspectX = parX;
-                    task.PixelAspectY = parY;
-                    break;
-            }
-
-            // Filter Settings
-            task.Deblock = frmMain.Filters.Deblock;
-            task.Decomb = frmMain.Filters.Decomb;
-            task.CustomDecomb = frmMain.Filters.CustomDecombValue;
-            task.Deinterlace = frmMain.Filters.Deinterlace;
-            task.CustomDeinterlace = frmMain.Filters.CustomDeInterlaceValue;
-            task.Deblock = frmMain.Filters.Deblock;
-            task.Denoise = frmMain.Filters.Denoise;
-            task.CustomDenoise = frmMain.Filters.CustomDenoiseValue;
-            task.Detelecine = frmMain.Filters.Detelecine;
-            task.CustomDetelecine = frmMain.Filters.CustomDeTelecineValue;
-            task.Grayscale = frmMain.Filters.GrayScale;
-
-            // Video Settings
-            task.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(frmMain.drp_videoEncoder.Text);
-            int videoBitrate;
-            int.TryParse(frmMain.text_bitrate.Text, out videoBitrate);
-            task.VideoBitrate = videoBitrate;
-            task.VideoEncodeRateType = frmMain.radio_cq.Checked
-                                           ? VideoEncodeRateType.ConstantQuality
-                                           : VideoEncodeRateType.AverageBitrate;
-            task.TwoPass = frmMain.check_2PassEncode.Checked;
-            task.TurboFirstPass = frmMain.check_turbo.Checked;
-            double framerate;
-            double.TryParse(frmMain.drp_videoFramerate.Text, out framerate);
-            task.Framerate = framerate;
-            task.FramerateMode = frmMain.drp_videoFramerate.SelectedIndex == 0
-                                     ? (frmMain.radio_constantFramerate.Checked ? FramerateMode.CFR : FramerateMode.VFR)
-                                     : (frmMain.radio_constantFramerate.Checked ? FramerateMode.CFR : FramerateMode.PFR);
-
-            if (frmMain.radio_cq.Checked)
-            {
-                double cqStep = UserSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-                switch (frmMain.drp_videoEncoder.Text)
-                {
-                    case "MPEG-4 (FFmpeg)":
-                    case "MPEG-2 (FFmpeg)":
-                        task.Quality = 31 - (frmMain.slider_videoQuality.Value - 1);
-                        break;
-                    case "H.264 (x264)":
-                        double value = 51 - (frmMain.slider_videoQuality.Value * cqStep);
-                        task.Quality = Math.Round(value, 2);
-                        break;
-                    case "VP3 (Theora)":
-                        task.Quality = frmMain.slider_videoQuality.Value;
-                        break;
-                }
-            }
-
-            // Audio
-            task.AudioTracks = new ObservableCollection<AudioTrack>(frmMain.AudioSettings.AudioTracks);
-            task.AllowedPassthruOptions = new AllowedPassthru
-                {
-                    AudioAllowAACPass = frmMain.AudioSettings.PassthruSettings.AudioAllowAACPass,
-                    AudioAllowAC3Pass = frmMain.AudioSettings.PassthruSettings.AudioAllowAC3Pass,
-                    AudioAllowDTSHDPass = frmMain.AudioSettings.PassthruSettings.AudioAllowDTSHDPass,
-                    AudioAllowDTSPass = frmMain.AudioSettings.PassthruSettings.AudioAllowDTSPass,
-                    AudioAllowMP3Pass = frmMain.AudioSettings.PassthruSettings.AudioAllowMP3Pass,
-                    AudioEncoderFallback = frmMain.AudioSettings.PassthruSettings.AudioEncoderFallback
-                };
-
-            // Subtitles
-            task.SubtitleTracks = new ObservableCollection<SubtitleTrack>(frmMain.Subtitles.SubtitlesList);
-
-            // Chapters
-            task.IncludeChapterMarkers = frmMain.Check_ChapterMarkers.Checked;
-            task.ChapterNames = new ObservableCollection<ChapterMarker>();
-            foreach (DataGridViewRow row in frmMain.data_chpt.Rows)
-            {
-                int number;
-                int.TryParse(row.Cells[0].Value.ToString(), out number);
-                task.ChapterNames.Add(new ChapterMarker(number, row.Cells[1].Value.ToString()));
-            }
-
-            // Advanced Options
-            task.AdvancedEncoderOptions = X264Query(frmMain).Replace("-x", string.Empty).Trim();
-
-            // Extra Settings
-            task.Verbosity = UserSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
-            task.DisableLibDvdNav = UserSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav);
-
-            return task;
-        }
-
-        #endregion
-
-        #region Helpers
-
-        /// <summary>
-        /// Create a CSV file with the data from the Main Window Chapters tab
-        /// </summary>
-        /// <param name="mainWindow">Main Window</param>
-        /// <param name="filePathName">Path to save the csv file</param>
-        /// <returns>True if successful </returns>
-        private static bool ChapterCsvSave(frmMain mainWindow, string filePathName)
-        {
-            try
-            {
-                string csv = string.Empty;
-
-                foreach (DataGridViewRow row in mainWindow.data_chpt.Rows)
-                {
-                    csv += row.Cells[0].Value.ToString();
-                    csv += ",";
-                    csv += row.Cells[1].Value.ToString().Replace(",", "\\,");
-                    csv += Environment.NewLine;
-                }
-                StreamWriter file = new StreamWriter(filePathName);
-                file.Write(csv);
-                file.Close();
-                file.Dispose();
-                return true;
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show("Unable to save Chapter Makrers file! \nChapter marker names will NOT be saved in your encode \n\n" + exc, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return false;
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Functions/ToolStripRenderOverride.cs Deleted

@@ -1,51 +0,0 @@
-/*  ToolStripRenderOverride.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.Functions
-{
-    using System.Windows.Forms;
-
-    public class ToolStripRenderOverride : ToolStripProfessionalRenderer
-    {
-        ToolStripSystemRenderer render = new ToolStripSystemRenderer();
-    
-        public ToolStripRenderOverride()
-        {       
-        }
-
-        /// <summary>
-        /// Fix for a bug in .NET where a white line appears at the bottom of the control.
-        /// http://connect.microsoft.com/VisualStudio/feedback/details/92862/toolstrip-always-draws-a-border-on-the-bottom-with-rendermode-system-and-docked-left-or-right
-        /// </summary>
-        /// <param name="e">
-        /// ToolStripRenderEventArgs 
-        /// </param>
-        protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
-        {
-            //base.OnRenderToolStripBorder(e);
-        }
-
-        /// <summary>
-        /// Change the Button Hover Background style to the system button style
-        /// </summary>
-        /// <param name="e">
-        /// ToolStripRenderEventArgs
-        /// </param>
-        protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)
-        {     
-            render.DrawButtonBackground(e);
-        }
-
-        protected override void OnRenderDropDownButtonBackground(ToolStripItemRenderEventArgs e)
-        {
-            render.DrawDropDownButtonBackground(e);
-        }
-
-        protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
-        {
-            //base.OnRenderToolStripBackground(e);
-        }  
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs Deleted

@@ -1,501 +0,0 @@
-/*  Converters.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-    using System.Text.RegularExpressions;
-
-    using HandBrake.Interop.Model.Encoding;
-    using HandBrake.Interop.Model.Encoding.x264;
-
-    using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;
-
-    /// <summary>
-    /// A class to convert various things to native C# objects
-    /// </summary>
-    public class Converters
-    {
-        /**
-         * TODO:
-         * - Many of these converters can be ditched at a later point. Should be able to model all this within the enums themsevles.
-         * 
-         **/ 
-
-        /// <summary>
-        /// Convert HandBrakes time remaining into a TimeSpan
-        /// </summary>
-        /// <param name="time">
-        /// The time remaining for the encode.
-        /// </param>
-        /// <returns>
-        /// A TimepSpan object
-        /// </returns>
-        public static TimeSpan EncodeToTimespan(string time)
-        {
-            TimeSpan converted = new TimeSpan(0, 0, 0, 0);
-
-            Match m = Regex.Match(time.Trim(), @"^([0-9]{2}:[0-9]{2}:[0-9]{2})");
-            if (m.Success)
-            {
-                TimeSpan.TryParse(m.Groups[0].Value, out converted);
-            }
-
-            return converted;
-        }
-
-        #region Audio
-
-        /// <summary>
-        /// Get the GUI equiv to a CLI mixdown
-        /// </summary>
-        /// <param name="mixdown">The Audio Mixdown</param>
-        /// <returns>The GUI representation of the mixdown</returns>
-        public static string GetMixDown(string mixdown)
-        {
-            switch (mixdown.Trim())
-            {
-                case "mono":
-                    return "Mono";
-                case "stereo":
-                    return "Stereo";
-                case "dpl1":
-                    return "Dolby Surround";
-                case "dpl2":
-                    return "Dolby Pro Logic II";
-                case "6ch":
-                    return "6-channel discrete";
-                default:
-                    return "Automatic";
-            }
-        }
-
-        /// <summary>
-        /// Get the GUI equiv to a CLI mixdown
-        /// </summary>
-        /// <param name="mixdown">The Audio Mixdown</param>
-        /// <returns>The GUI representation of the mixdown</returns>
-        public static Mixdown GetAudioMixDown(string mixdown)
-        {
-            switch (mixdown.Trim())
-            {
-                case "Mono":
-                    return Mixdown.Mono;
-                case "Stereo":
-                    return Mixdown.Stereo;
-                case "Dolby Surround":
-                    return Mixdown.DolbySurround;
-                case "Dolby Pro Logic II":
-                    return Mixdown.DolbyProLogicII;
-                case "6-channel discrete":
-                    return Mixdown.SixChannelDiscrete;
-                case "None":
-                case "Passthru":
-                    return Mixdown.None;
-                default:
-                    return Mixdown.Auto;
-            }
-        }
-
-        /// <summary>
-        /// Return the CLI Mixdown name
-        /// </summary>
-        /// <param name="selectedAudio">GUI mixdown name</param>
-        /// <returns>CLI mixdown name</returns>
-        public static string GetCliMixDown(Mixdown selectedAudio)
-        {
-            switch (selectedAudio)
-            {
-                case Mixdown.Auto:
-                case Mixdown.None:
-                    return "auto";
-                case Mixdown.Mono:
-                    return "mono";
-                case Mixdown.Stereo:
-                    return "stereo";
-                case Mixdown.DolbySurround:
-                    return "dpl1";
-                case Mixdown.DolbyProLogicII:
-                    return "dpl2";
-                case Mixdown.SixChannelDiscrete:
-                    return "6ch";
-                default:
-                    return "auto";
-            }
-        }
-
-        /// <summary>
-        /// Get the GUI equiv to a CLI audio encoder
-        /// </summary>
-        /// <param name="audioEnc">The Audio Encoder</param>
-        /// <returns>The GUI representation of that audio encoder</returns>
-        public static string GetGUIAudioEncoder(string audioEnc)
-        {
-            switch (audioEnc)
-            {
-                case "faac":
-                    return "AAC (faac)";
-                case "lame":
-                    return "MP3 (lame)";
-                case "vorbis":
-                    return "Vorbis (vorbis)";
-                case "ffac3":
-                    return "AC3 (ffmpeg)";
-                case "copy:ac3":
-                    return "AC3 Passthru";
-                case "copy:dts":
-                    return "DTS Passthru";
-                case "copy:dtshd":
-                    return "MP3 Passthru";
-                case "copy:mp3":
-                    return "AAC Passthru";
-                case "copy:aac":
-                    return "DTS-HD Passthru";
-                case "ffaac":
-                    return "AAC (ffmpeg)";
-                case "ffflac":
-                    return "Flac (ffmpeg)";
-                case "copy":
-                    return "Auto Passthru";
-                default:
-                    return "AAC (faac)";
-            }
-        }
-
-        /// <summary>
-        /// Get the GUI equiv to a CLI audio encoder
-        /// </summary>
-        /// <param name="audioEnc">The Audio Encoder</param>
-        /// <returns>The GUI representation of that audio encoder</returns>
-        public static AudioEncoder GetAudioEncoderFromCliString(string audioEnc)
-        {
-            switch (audioEnc)
-            {
-                case "faac":
-                    return AudioEncoder.Faac;
-                case "ffaac":
-                    return AudioEncoder.ffaac;
-                case "lame":
-                    return AudioEncoder.Lame;
-                case "vorbis":
-                    return AudioEncoder.Vorbis;
-                case "ffac3":
-                    return AudioEncoder.Ac3;
-                case "ffflac":
-                    return AudioEncoder.ffflac;
-                case "copy:ac3":
-                    return AudioEncoder.Ac3Passthrough;
-                case "copy:dts":
-                    return AudioEncoder.DtsPassthrough;
-                case "copy:dtshd":
-                    return AudioEncoder.DtsHDPassthrough;
-                case "copy:mp3":
-                    return AudioEncoder.Mp3Passthru;
-                case "copy:aac":
-                    return AudioEncoder.AacPassthru;
-                case "copy":
-                    return AudioEncoder.Passthrough;
-                default:
-                    return AudioEncoder.Faac;
-            }
-        }
-
-        /// <summary>
-        /// Get the GUI equiv to a GUI audio encoder string
-        /// </summary>
-        /// <param name="audioEnc">The Audio Encoder</param>
-        /// <returns>The GUI representation of that audio encoder</returns>
-        public static AudioEncoder GetAudioEncoder(string audioEnc)
-        {
-            switch (audioEnc)
-            {
-                case "AAC (faac)":
-                    return AudioEncoder.Faac;
-                case "AAC (ffmpeg)":
-                    return AudioEncoder.ffaac;
-                case "AAC (CoreAudio)":
-                    return AudioEncoder.Faac;
-                case "MP3 (lame)":
-                    return AudioEncoder.Lame;
-                case "Vorbis (vorbis)":
-                    return AudioEncoder.Vorbis;
-                case "AC3 (ffmpeg)":
-                    return AudioEncoder.Ac3;
-                case "AC3 Passthru":
-                    return AudioEncoder.Ac3Passthrough;
-                case "DTS Passthru":
-                    return AudioEncoder.DtsPassthrough;
-                case "DTS-HD Passthru":
-                    return AudioEncoder.DtsHDPassthrough;
-                case "AAC Passthru":
-                    return AudioEncoder.AacPassthru;
-                case "MP3 Passthru":
-                    return AudioEncoder.Mp3Passthru;
-                case "Flac (ffmpeg)":
-                    return AudioEncoder.ffflac;
-                case "Auto Passthru":
-                    return AudioEncoder.Passthrough;
-                default:
-                    return AudioEncoder.Faac;
-            }
-        }
-
-        /// <summary>
-        /// Get the CLI Audio Encoder name
-        /// </summary>
-        /// <param name="selectedEncoder">
-        /// String The GUI Encode name
-        /// </param>
-        /// <returns>
-        /// String CLI encoder name
-        /// </returns>
-        public static string GetCliAudioEncoder(AudioEncoder selectedEncoder)
-        {
-            switch (selectedEncoder)
-            {
-                case AudioEncoder.Faac:
-                    return "faac";
-                case AudioEncoder.ffaac:
-                    return "ffaac";
-                case AudioEncoder.Lame:
-                    return "lame";
-                case AudioEncoder.Vorbis:
-                    return "vorbis";
-                case AudioEncoder.Ac3Passthrough:
-                    return "copy:ac3";
-                case AudioEncoder.DtsPassthrough:
-                    return "copy:dts";
-                case AudioEncoder.DtsHDPassthrough:
-                    return "copy:dtshd";
-                case AudioEncoder.Ac3:
-                    return "ffac3";
-                case AudioEncoder.AacPassthru:
-                    return "copy:aac";
-                case AudioEncoder.Mp3Passthru:
-                    return "copy:mp3";
-                case AudioEncoder.Passthrough:
-                    return "copy";
-                case AudioEncoder.ffflac:
-                    return "ffflac";
-                default:
-                    return "faac";
-            }
-        }
-
-        #endregion
-
-        #region Video 
-
-        /// <summary>
-        /// Get the Video Encoder for a given string
-        /// </summary>
-        /// <param name="encoder">
-        /// The encoder name
-        /// </param>
-        /// <returns>
-        /// VideoEncoder enum object
-        /// </returns>
-        public static VideoEncoder GetVideoEncoder(string encoder)
-        {
-            switch (encoder)
-            {
-                case "":
-                case "ffmpeg":
-                case "ffmpeg4":
-                    return VideoEncoder.FFMpeg;
-                case "ffmpeg2":
-                    return VideoEncoder.FFMpeg2;
-                case "x264":
-                    return VideoEncoder.X264;
-                case "theora":
-                    return VideoEncoder.Theora;
-                default:
-                    return VideoEncoder.X264;
-            }
-        }
-
-        /// <summary>
-        /// Get the Video Encoder for a given string
-        /// </summary>
-        /// <param name="encoder">
-        /// The encoder name
-        /// </param>
-        /// <returns>
-        /// VideoEncoder enum object
-        /// </returns>
-        public static string GetVideoEncoder(VideoEncoder encoder)
-        {
-            switch (encoder)
-            {
-                case VideoEncoder.FFMpeg:
-                    return "ffmpeg4";
-                case VideoEncoder.FFMpeg2:
-                    return "ffmpeg2";
-                case VideoEncoder.X264:
-                    return "x264";
-                case VideoEncoder.Theora:
-                    return "theora";
-                default:
-                    return "x264";
-            }
-        }
-
-        #endregion
-
-        #region x264
-
-        /// <summary>
-        /// Get the x264Preset from a cli parameter
-        /// </summary>
-        /// <param name="preset">
-        /// The preset.
-        /// </param>
-        /// <returns>
-        /// The x264Preset enum value
-        /// </returns>
-        public static x264Preset Getx264PresetFromCli(string preset)
-        {
-            switch (preset)
-            {
-                case "ultrafast":
-                    return x264Preset.Ultrafast;
-                case "superfast":
-                    return x264Preset.Superfast;
-                case "veryfast":
-                    return x264Preset.VeryFast;
-                case "faster":
-                    return x264Preset.Faster;
-                case "fast":
-                    return x264Preset.Fast;
-                case "medium":
-                    return x264Preset.Medium;
-                case "slow":
-                    return x264Preset.Slow;
-                case "slower":
-                    return x264Preset.Slower;
-                case "veryslow":
-                    return x264Preset.VerySlow;
-                case "placebo":
-                    return x264Preset.Placebo;
-                default:
-                    return x264Preset.Faster;
-            }
-        }
-
-        /// <summary>
-        /// Get the x264 Profile from the cli
-        /// </summary>
-        /// <param name="profile">
-        /// The preset.
-        /// </param>
-        /// <returns>
-        /// The x264Profile enum value
-        /// </returns>
-        public static x264Profile Getx264ProfileFromCli(string profile)
-        {
-            switch (profile)
-            {
-                case "baseline":
-                    return x264Profile.Baseline;
-                case "main":
-                    return x264Profile.Main;
-                case "high":
-                    return x264Profile.High;
-                case "high10":
-                    return x264Profile.High10;
-                case "high422":
-                    return x264Profile.High422;
-                case "high444":
-                    return x264Profile.High444;
-                default:
-                    return x264Profile.Main;
-            }
-        }
-
-        /// <summary>
-        /// Get x264Tune enum from a cli string
-        /// </summary>
-        /// <param name="tune">
-        /// The tune.
-        /// </param>
-        /// <returns>
-        /// The x264Tune enum value
-        /// </returns>
-        public static x264Tune Getx264TuneFromCli(string tune)
-        {
-            switch (tune)
-            {
-                case "film":
-                    return x264Tune.Film;
-                case "animation":
-                    return x264Tune.Animation;
-                case "grain":
-                    return x264Tune.Grain;
-                case "stillimage":
-                    return x264Tune.Stillimage;
-                case "psnr":
-                    return x264Tune.Psnr;
-                case "ssim":
-                    return x264Tune.Ssim;
-                case "fastdecode":
-                    return x264Tune.Fastdecode;
-                case "zerolatency":
-                    return x264Tune.Zerolatency;
-                default:
-                    return x264Tune.Film;
-            }
-        }
-
-        #endregion
-
-        #region File Format
-
-        /// <summary>
-        /// Get the OutputFormat Enum for a given string
-        /// </summary>
-        /// <param name="format">
-        /// OutputFormat as a string
-        /// </param>
-        /// <returns>
-        /// An OutputFormat Enum
-        /// </returns>
-        public static OutputFormat GetFileFormat(string format)
-        {
-            switch (format.ToLower())
-            {
-                default:
-                    return OutputFormat.Mp4;
-                case "m4v":
-                    return OutputFormat.M4V;
-                case "mkv":
-                    return OutputFormat.Mkv;
-            }
-        }
-
-        /// <summary>
-        /// Get the OutputFormat Enum for a given string
-        /// </summary>
-        /// <param name="format">
-        /// OutputFormat as a string
-        /// </param>
-        /// <returns>
-        /// An OutputFormat Enum
-        /// </returns>
-        public static string GetFileFormat(OutputFormat format)
-        {
-            switch (format)
-            {
-                default:
-                    return "mp4";
-                case OutputFormat.M4V:
-                    return "m4v";
-                case OutputFormat.Mkv:
-                    return "mkv";
-            }
-        }
-
-        #endregion
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/EnumHelper.cs Deleted

@@ -1,106 +0,0 @@
-/*  EnumHelper.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.ComponentModel;
-    using System.ComponentModel.DataAnnotations;
-    using System.Linq;
-    using System.Reflection;
-
-    /// <summary>
-    /// Enum Helpers
-    /// </summary>
-    /// <typeparam name="T">
-    /// The Type Parameter
-    /// </typeparam>
-    public class EnumHelper<T>
-    {
-        /// <summary>
-        /// Get the description of an Enum
-        /// </summary>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <returns>
-        /// The Description string
-        /// </returns>
-        public static string GetDescription(T value)
-        {
-            FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
-            DescriptionAttribute[] attributes =
-                  (DescriptionAttribute[])fieldInfo.GetCustomAttributes(
-                  typeof(DescriptionAttribute), false);
-            return (attributes.Length > 0) ? attributes[0].Description : value.ToString();
-        }
-
-        /// <summary>
-        /// Get the Display Value of the Enum Model
-        /// </summary>
-        /// <param name="value">An Enum with Display Attributes</param>
-        /// <returns>A string name</returns>
-        public static string GetDisplay(T value)
-        {
-            FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
-            DisplayAttribute[] attributes = (DisplayAttribute[])fieldInfo.GetCustomAttributes(typeof(DisplayAttribute), false);
-
-            return (attributes.Length > 0) ? attributes[0].Name : value.ToString();
-        }
-
-        /// <summary>
-        /// Get the Enumeration for a given Enum Description
-        /// </summary>
-        /// <param name="description">The String description</param>
-        /// <returns>The Enum Value</returns>
-        public static T GetValue(string description)
-        {
-            foreach (T val in Enum.GetValues(typeof(T)))
-            {
-                string currDescription = GetDescription(val);
-                string currDisplay = GetDisplay(val);
-                if (currDescription == description || currDisplay == description)
-                {
-                    return val;
-                }
-            }
-
-            throw new ArgumentOutOfRangeException("The Description for the enum was not recognized.");
-        }
-
-        /// <summary>
-        /// Return a list of all the enum values.
-        /// </summary>
-        /// <returns>
-        /// An Enum Oject List
-        /// </returns>
-        public static IEnumerable<T> GetEnumList()
-        {
-            return Enum.GetValues(typeof(T)).Cast<T>().ToList();
-        }
-
-        /// <summary>
-        /// Get a list of string names for each enum value.
-        /// </summary>
-        /// <param name="enumType">
-        /// The enum type.
-        /// </param>
-        /// <typeparam name="T">
-        /// The type of the enum
-        /// </typeparam>
-        /// <returns>
-        /// A collection of strings that represent all the enum values
-        /// </returns>
-        public static IEnumerable<string> GetEnumDisplayValues(Type enumType)
-        {
-            var strings = new Collection<string>();
-            foreach (T e in Enum.GetValues(enumType))
-                strings.Add(GetDisplay(e));
-            return strings;
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/GrowlCommunicator.cs Deleted

@@ -1,120 +0,0 @@
-/*  GrowlCommunicator.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-
-    using Growl.Connector;
-
-    /// <summary>
-    /// Provides all functionality for communicating with Growl for Windows.
-    /// </summary>
-    /// <remarks>
-    /// This class is implemented as a static class because:
-    ///     1. It allows nearly all of the Growl-related code to be in one place
-    ///     2. It prevents the main form, queue handler, and any other part of Handbrake from having to declare
-    ///        or track any new instance variables
-    /// </remarks>
-    public static class GrowlCommunicator
-    {
-        /// <summary>
-        /// The <see cref="GrowlConnector"/> that actually talks to Growl
-        /// </summary>
-        private static GrowlConnector growl;
-
-        /// <summary>
-        /// The Handbrake application instance that is registered with Growl
-        /// </summary>
-        private static Application application;
-
-        /// <summary>
-        /// Notification shown upon completion of encoding
-        /// </summary>
-        private static NotificationType encodeOrQueueCompleted = new NotificationType("EncodeOrQueue", "HandBrake Status");
-
-        /// <summary>
-        /// Checks to see if Growl is currently running on the local machine.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c> if Growl is running;
-        /// <c>false</c> otherwise
-        /// </returns>
-        public static bool IsRunning()
-        {
-            Initialize();
-
-            return GrowlConnector.IsGrowlRunningLocally();
-        }
-
-        /// <summary>
-        /// Registers Handbrake with the local Growl instance
-        /// </summary>
-        /// <remarks>
-        /// This should usually be called at application start-up
-        /// </remarks>
-        public static void Register()
-        {
-            Initialize();
-            growl.Register(application, new[] {encodeOrQueueCompleted});
-        }
-
-        /// <summary>
-        /// Sends a notification to Growl. (Since Handbrake currently only supports one type of notification with
-        /// static text, this is a shortcut method).
-        /// </summary>
-        /// <param name="title">
-        /// The title.
-        /// </param>
-        /// <param name="text">
-        /// The text to display.
-        /// </param>
-        public static void Notify(string title, string text)
-        {
-            Notification notification = new Notification(application.Name, encodeOrQueueCompleted.Name, String.Empty, 
-                                                         title, text);
-            growl.Notify(notification);
-        }
-
-        /// <summary>
-        /// Sends a notification to Growl. (This is the more generic version that could be used in the future if 
-        /// more notification types are implemented)
-        /// </summary>
-        /// <param name="notificationType">The <see cref="NotificationType">type</see> of notification to send</param>
-        /// <param name="title">The notification title</param>
-        /// <param name="text">The notification text</param>
-        /// <param name="imageUrl">The notification image as a url</param>
-        public static void Notify(NotificationType notificationType, string title, string text, string imageUrl)
-        {
-            Notification notification = new Notification(application.Name, notificationType.Name, String.Empty, title, 
-                                                         text)
-                                            {
-                                                Icon = imageUrl
-                                            };
-
-            growl.Notify(notification);
-        }
-
-        /// <summary>
-        /// Initializes the GrowlCommunicator
-        /// </summary>
-        private static void Initialize()
-        {
-            if (growl == null)
-            {
-                growl = new GrowlConnector
-                    {
-                        EncryptionAlgorithm = Cryptography.SymmetricAlgorithmType.PlainText,
-                        KeyHashAlgorithm = Cryptography.HashAlgorithmType.SHA1
-                    };
-
-                application = new Application("Handbrake")
-                                  {
-                                      Icon = Properties.Resources.logo64
-                                  };
-            }
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs Deleted

@@ -1,219 +0,0 @@
-/*  InteropModelCreator.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.Interop.Model;
-    using HandBrake.Interop.Model.Encoding;
-
-    using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;
-
-    /// <summary>
-    /// A Utility Class to Convert a 
-    /// </summary>
-    public class InteropModelCreator
-    {
-        /*
-         * TODO: This conversion class needs to be finished off before libencode will work.
-         */
-
-        /// <summary>
-        /// Get an EncodeJob model for a LibHB Encode.
-        /// </summary>
-        /// <param name="task">
-        /// The task.
-        /// </param>
-        /// <returns>
-        /// An Interop.EncodeJob model.
-        /// </returns>
-        public static EncodeJob GetEncodeJob(QueueTask task)
-        {
-            // Sanity Checking
-            if (task == null || task.Task == null)
-            {
-                return null;
-            }
-
-            // The current Job Configuration
-            EncodeTask work = task.Task;
-
-            // Which will be converted to this EncodeJob Model.
-            EncodeJob job = new EncodeJob();
-
-
-
-
-
-            EncodingProfile profile = new EncodingProfile();
-            job.EncodingProfile = profile;
-
-            profile.Anamorphic = work.Anamorphic;
-
-            profile.AudioEncodings = new List<AudioEncoding>();
-            job.ChosenAudioTracks = new List<int>();
-            foreach (AudioTrack track in work.AudioTracks)
-            {
-                AudioEncoding newTrack = new AudioEncoding
-                    {
-                        Bitrate = track.Bitrate,
-                        Drc = track.DRC,
-                        Gain = track.Gain,
-                        Encoder = Converters.GetCliAudioEncoder(track.Encoder),
-                        InputNumber = track.Track.HasValue ? track.Track.Value : 0,
-                        Mixdown = Converters.GetCliMixDown(track.MixDown),
-                        SampleRateRaw = GetSampleRateRaw(track.SampleRate),         
-                    };
-
-                profile.AudioEncodings.Add(newTrack);
-                if (track.Track != null)
-                {
-                    job.ChosenAudioTracks.Add(track.Track.Value);
-                }
-            }
-            profile.Cropping = new Cropping
-                {
-                    Top = work.Cropping.Top,
-                    Bottom = work.Cropping.Bottom,
-                    Left = work.Cropping.Left,
-                    Right = work.Cropping.Right
-                };
-
-            profile.CustomCropping = true; // TODO deal with this better
-            profile.CustomDecomb = work.CustomDecomb;
-            profile.CustomDeinterlace = work.CustomDeinterlace;
-            profile.CustomDenoise = work.CustomDenoise;
-            profile.CustomDetelecine = work.CustomDetelecine;
-            profile.Deblock = work.Deblock;
-            profile.Decomb = work.Decomb;
-            profile.Deinterlace = work.Deinterlace;
-            profile.Denoise = work.Denoise;
-            profile.Detelecine = work.Detelecine;
-            profile.DisplayWidth = work.DisplayWidth.HasValue
-                                       ? int.Parse(Math.Round(work.DisplayWidth.Value, 0).ToString())
-                                       : 0;
-            profile.Framerate = work.Framerate.HasValue ? work.Framerate.Value : 0;
-            profile.Grayscale = work.Grayscale;
-            profile.Height = work.Height.HasValue ? work.Height.Value : 0;
-            profile.IPod5GSupport = work.IPod5GSupport;
-            profile.IncludeChapterMarkers = work.IncludeChapterMarkers;
-            profile.KeepDisplayAspect = work.KeepDisplayAspect;
-            profile.LargeFile = work.LargeFile;
-            profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;
-            profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;
-            profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;
-            profile.Optimize = work.OptimizeMP4;
-            switch (work.OutputFormat)
-            {
-                case OutputFormat.Mp4:
-                case OutputFormat.M4V:
-                    profile.OutputFormat = Container.Mp4;
-                    break;
-                case OutputFormat.Mkv:
-                    profile.OutputFormat = Container.Mkv;
-                    break;
-            }
-            profile.PeakFramerate = work.FramerateMode == FramerateMode.PFR;
-            profile.PixelAspectX = work.PixelAspectX;
-            profile.PixelAspectY = work.PixelAspectY;
-
-            switch (work.OutputFormat)
-            {
-                case OutputFormat.Mp4:
-                    profile.PreferredExtension = OutputExtension.Mp4;
-                    break;
-                case OutputFormat.M4V:
-                    profile.PreferredExtension = OutputExtension.M4v;
-                    break;
-            }
-            profile.Quality = work.Quality.HasValue ? work.Quality.Value : 0;
-            profile.UseDisplayWidth = true;
-            profile.VideoBitrate = work.VideoBitrate.HasValue ? work.VideoBitrate.Value : 0;
-            profile.VideoEncodeRateType = work.VideoEncodeRateType;
-            profile.VideoEncoder = Converters.GetVideoEncoder(work.VideoEncoder);
-            profile.Width = work.Width.HasValue ? work.Width.Value : 0;
-            profile.X264Options = work.AdvancedEncoderOptions;
-
-            if (work.PointToPointMode == PointToPointMode.Chapters)
-            {
-                job.ChapterStart = work.StartPoint;
-                job.ChapterEnd = work.EndPoint;
-            }
-
-            job.Angle = work.Angle;
-            job.EncodingProfile = profile;
-            if (work.PointToPointMode == PointToPointMode.Frames)
-            {
-                job.FramesEnd = work.EndPoint;
-                job.FramesStart = work.StartPoint;
-            }
-
-            job.CustomChapterNames = work.ChapterNames.Select(item => item.ChapterName).ToList();
-            job.UseDefaultChapterNames = work.IncludeChapterMarkers;
-
-            job.OutputPath = work.Destination;
-            switch (work.PointToPointMode)
-            {
-                case PointToPointMode.Chapters:
-                    job.RangeType = VideoRangeType.Chapters;
-                    break;
-                case PointToPointMode.Seconds:
-                    job.RangeType = VideoRangeType.Seconds;
-                    break;
-                case PointToPointMode.Frames:
-                    job.RangeType = VideoRangeType.Frames;
-                    break;
-            }
-
-
-            if (work.PointToPointMode == PointToPointMode.Seconds)
-            {
-                job.SecondsEnd = work.EndPoint;
-                job.SecondsStart = work.StartPoint;
-            }
-
-            job.SourcePath = work.Source;
-            // job.SourceType = work.Type;
-            job.Title = work.Title;
-
-            // TODO Setup subtitles
-            job.Subtitles = new Subtitles { SourceSubtitles = new List<SourceSubtitle>(), SrtSubtitles = new List<SrtSubtitle>() };
-            //foreach (SubtitleTrack track in work.SubtitleTracks)
-            //{
-            //    // TODO
-            //}
-
-
-            return job;
-        }
-
-        /// <summary>
-        /// Get the Raw Sample Rate
-        /// </summary>
-        /// <param name="rate">
-        /// The rate.
-        /// </param>
-        /// <returns>
-        /// The Raw sample rate as an int
-        /// </returns>
-        private static int GetSampleRateRaw(double rate)
-        {
-            if (rate == 22.05)
-                return 22050;
-            else if (rate == 24)
-                return 24000;
-            else if (rate == 44.1)
-                return 32000;
-            else if (rate == 48)
-                return 48000;
-            else return 48000;
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/PlistHelper.cs Deleted

@@ -1,126 +0,0 @@
-/*  PlistHelper.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Xml;
-
-    /// <summary>
-    /// A Plist Helper
-    /// </summary>
-    public class PlistHelper
-    {
-        /// <summary>
-        /// Get the Audio Track XML Nodes from a plist preset file
-        /// </summary>
-        /// <param name="filename">
-        /// A Plist preset file
-        /// </param>
-        /// <returns>
-        /// A List of XmlNodes which contain audio tracks
-        /// </returns>
-        public static List<XmlNode> GetAudioTracks(string filename)
-        {
-            // Data Store
-            List<XmlNode> audioTracks = new List<XmlNode>();
-
-            // Load the file and get the Root note, or return if none found
-            XmlNode root = LoadFile(filename);
-            if (root == null)
-            {
-                return null;
-            }
-
-            // Get the Audio Tracks
-            XmlNode audioListDict = root.ChildNodes[2].ChildNodes[0].FirstChild.ChildNodes[1];
-            for (int i = 0; i < audioListDict.ChildNodes.Count; i++)
-            {
-                XmlNode audioChannel = audioListDict.ChildNodes[i]; // <dict>
-                audioTracks.Add(audioChannel);
-            }
-
-            return audioTracks;
-        }
-
-        /// <summary>
-        /// Get the settings portion of a presets file
-        /// </summary>
-        /// <param name="filename">
-        /// A Plist preset file
-        /// </param>
-        /// <returns>
-        /// A Dictionary of plist key against an XML node containing the setting.
-        /// </returns>
-        public static Dictionary<string, XmlNode> GetPresetSettings(string filename)
-        {
-            // Data Store
-            Dictionary<string, XmlNode> settings = new Dictionary<string, XmlNode>();
-
-            // Load the file and get the Root note, or return if none found
-            XmlNode root = LoadFile(filename);
-            if (root == null)
-            {
-                return null;
-            }
-
-            // Get the Preset Settings, starting from the 3rd node (skipping the audio notes we've just prcessed)
-            XmlNode presetSettings = root.ChildNodes[2].ChildNodes[0].FirstChild;
-            for (int i = 2; i < presetSettings.ChildNodes.Count; i += 2)
-            {
-                string key = presetSettings.ChildNodes[i].InnerText;
-                XmlNode node = presetSettings.ChildNodes[i + 1];
-                settings.Add(key, node);
-            }
-
-            return settings;
-        }
-
-        /// <summary>
-        /// Load a Plist Preset file and return it as an XML document
-        /// </summary>
-        /// <param name="filename">
-        /// A Plist preset file
-        /// </param>
-        /// <returns>
-        /// An XML document
-        /// </returns>
-        private static XmlNode LoadFile(string filename)
-        {
-            try
-            {
-                if (!File.Exists(filename))
-                {
-                    return null;
-                }
-
-                StreamReader sr = File.OpenText(filename);
-                string fromfile = string.Empty;
-                int fileChar;
-                while ((fileChar = sr.Read()) != -1)
-                {
-                    fromfile += Convert.ToChar(fileChar);
-                }
-
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(fromfile);
-
-                XmlNode root = doc;
-                if (!root.HasChildNodes)
-                {
-                    return null;
-                }
-
-                return root;
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/System.cs Deleted

@@ -1,56 +0,0 @@
-/*  System.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System.Windows.Forms;
-
-    using Microsoft.Win32;
-
-    /// <summary>
-    /// The System Information.
-    /// </summary>
-    public class SystemInfo
-    {
-        /// <summary>
-        /// Gets the total physical ram in a system
-        /// </summary>
-        /// <returns>The total memory in the system</returns>
-        public static ulong TotalPhysicalMemory
-        {
-            get
-            {
-                Win32.MEMORYSTATUSEX memStat = new Win32.MEMORYSTATUSEX { dwLength = 64 };
-                Win32.GlobalMemoryStatusEx(ref memStat);
-
-                ulong value = memStat.ullTotalPhys / 1024 / 1024;
-                return value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of CPU Cores
-        /// </summary>
-        /// <returns>Object</returns>
-        public static object GetCpuCount
-        {
-            get
-            {
-                RegistryKey regKey = Registry.LocalMachine;
-                regKey = regKey.OpenSubKey("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");
-                return regKey == null ? 0 : regKey.GetValue("ProcessorNameString");
-            }
-        }
-
-        /// <summary>
-        /// Gets the System screen size information.
-        /// </summary>
-        /// <returns>System.Windows.Forms.Scree</returns>
-        public static Screen ScreenBounds
-        {
-            get { return Screen.PrimaryScreen; }
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/Win32.cs Deleted

@@ -1,198 +0,0 @@
-/*  win32.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-    using System.ComponentModel;
-    using System.Diagnostics;
-    using System.Runtime.InteropServices;
-    using System.Windows;
-    using System.Windows.Threading;
-
-    /// <summary>
-    /// Win32 API calls
-    /// </summary>
-    public class Win32
-    {
-        /// <summary>
-        /// Used to force UI Thread.
-        /// </summary>
-        private static Action<Action> executor = action => action();
-
-        /// <summary>
-        /// Set the Forground Window
-        /// </summary>
-        /// <param name="hWnd">
-        /// The h wnd.
-        /// </param>
-        /// <returns>
-        /// A Boolean true when complete.
-        /// </returns>
-        [DllImport("user32.dll")]
-        public static extern bool SetForegroundWindow(int hWnd);
-
-        /// <summary>
-        /// Lock the workstation
-        /// </summary>
-        [DllImport("user32.dll")]
-        public static extern void LockWorkStation();
-
-        /// <summary>
-        /// Exit Windows
-        /// </summary>
-        /// <param name="uFlags">
-        /// The u flags.
-        /// </param>
-        /// <param name="dwReason">
-        /// The dw reason.
-        /// </param>
-        /// <returns>
-        /// an integer
-        /// </returns>
-        [DllImport("user32.dll")]
-        public static extern int ExitWindowsEx(int uFlags, int dwReason);
-
-        /// <summary>
-        /// Memory Status EX Struct
-        /// </summary>
-        public struct MEMORYSTATUSEX
-        {
-            public int dwLength;
-
-            public int dwMemoryLoad;
-
-            public ulong ullTotalPhys;
-
-            public ulong ullAvailPhys;
-
-            public ulong ullTotalPageFile;
-
-            public ulong ullAvailPageFile;
-
-            public ulong ullTotalVirtual;
-
-            public ulong ullAvailVirtual;
-
-            public ulong ullAvailExtendedVirtual;
-        }
-
-        /// <summary>
-        /// Get the System Memory information
-        /// </summary>
-        /// <param name="lpBuffer">
-        /// The lp buffer.
-        /// </param>
-        /// <returns>
-        /// A boolean.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);
-
-        /// <summary>
-        /// Generate a Console Ctrl Event
-        /// </summary>
-        /// <param name="sigevent">
-        /// The sigevent.
-        /// </param>
-        /// <param name="dwProcessGroupId">
-        /// The dw process group id.
-        /// </param>
-        /// <returns>
-        /// Bool true is sucess
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool GenerateConsoleCtrlEvent(ConsoleCtrlEvent sigevent, int dwProcessGroupId);
-
-        /// <summary>
-        /// Console Ctrl Event
-        /// </summary>
-        public enum ConsoleCtrlEvent
-        {
-            /// <summary>
-            /// Ctrl - C
-            /// </summary>
-            CTRL_C = 0,
-
-            /// <summary>
-            /// Ctrl - Break
-            /// </summary>
-            CTRL_BREAK = 1,
-
-            /// <summary>
-            /// Ctrl - Close
-            /// </summary>
-            CTRL_CLOSE = 2,
-        }
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
-
-        /// <summary>
-        /// Execution State
-        /// </summary>
-        [FlagsAttribute]
-        public enum EXECUTION_STATE : uint
-        {
-            ES_SYSTEM_REQUIRED = 0x00000001,
-
-            ES_CONTINUOUS = 0x80000000,
-
-            ES_AWAYMODE_REQUIRED = 0x00000040
-        }
-
-        /// <summary>
-        /// Initializes static members of the <see cref="Win32"/> class.
-        /// </summary>
-        static Win32()
-        {
-            InitializeWithDispatcher();
-        }
-
-        /// <summary>
-        /// Prevent the system from sleeping
-        /// </summary>
-        public static void PreventSleep()
-        {
-            executor(
-                () => SetThreadExecutionState(
-                    EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED
-                    | EXECUTION_STATE.ES_AWAYMODE_REQUIRED));
-        }
-
-        /// <summary>
-        ///  Allow the system to sleep.
-        /// </summary>
-        public static void AllowSleep()
-        {
-            executor(
-                () => SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS));
-        }
-
-        /// <summary>
-        ///   Initializes the framework using the current dispatcher.
-        /// </summary>
-        public static void InitializeWithDispatcher()
-        {
-            var dispatcher = Dispatcher.CurrentDispatcher;
-
-            SetUIThreadMarshaller(action =>
-            {
-                if (dispatcher.CheckAccess())
-                    action();
-                else dispatcher.Invoke(action);
-            });
-        }
-
-        /// <summary>
-        /// Sets a custom UI thread marshaller.
-        /// </summary>
-        /// <param name="marshaller">The marshaller.</param>
-        public static void SetUIThreadMarshaller(Action<Action> marshaller)
-        {
-            executor = marshaller;
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Functions/Win7.cs Deleted

@@ -1,74 +0,0 @@
-/*  Win7.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Functions
-{
-    using System;
-    using Microsoft.WindowsAPICodePack.Taskbar;
-
-    /// <summary>
-    /// A class implimenting Windows 7 Specific features
-    /// </summary>
-    public class Win7
-    {
-        /// <summary>
-        /// The Windows Taskbar
-        /// </summary>
-        private TaskbarManager windowsTaskbar;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Win7"/> class.
-        /// </summary>
-        public Win7()
-        {
-            if (this.IsWindowsSeven)
-            {
-                this.windowsTaskbar = TaskbarManager.Instance;
-                this.windowsTaskbar.ApplicationId = "HandBrake";
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this is Windows Seven.
-        /// </summary>
-        public bool IsWindowsSeven
-        {
-            get
-            {
-                return TaskbarManager.IsPlatformSupported;
-            }
-        }
-
-        /// <summary>
-        /// Set the Task Bar Percentage.
-        /// </summary>
-        /// <param name="percentage">
-        /// The percentage.
-        /// </param>
-        public void SetTaskBarProgress(int percentage)
-        {
-            if (!this.IsWindowsSeven)
-            {
-                return;
-            }
-
-            this.windowsTaskbar.SetProgressState(TaskbarProgressBarState.Normal);
-            this.windowsTaskbar.SetProgressValue(percentage, 100);
-        }
-
-        /// <summary>
-        /// Disable Task Bar Progress
-        /// </summary>
-        public void SetTaskBarProgressToNoProgress()
-        {
-            if (!this.IsWindowsSeven)
-            {
-                return;
-            }
-
-            this.windowsTaskbar.SetProgressState(TaskbarProgressBarState.NoProgress);
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/General Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs Deleted

@@ -1,53 +0,0 @@
-/*  UpdateCheckInformation.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Model.General
-{
-    using System;
-
-    /// <summary>
-    /// Provides information about an update check.
-    /// </summary>
-    public struct UpdateCheckInformation
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether a New Version is Available.
-        /// </summary>
-        public bool NewVersionAvailable { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether an Error Occured.
-        /// </summary>
-        public bool ErrorOccured
-        {
-            get { return this.Error != null; }
-        }
-
-        /// <summary>
-        /// Gets or sets Information about an update to HandBrake
-        /// </summary>
-        public Uri DescriptionUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets HandBrake's version from the appcast.xml file.
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets HandBrake's Build from the appcast.xml file.
-        /// </summary>
-        public string Build { get; set; }
-
-        /// <summary>
-        /// Gets or sets the URL for update file.
-        /// </summary>
-        public string DownloadFile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the error that occurred, if any. This will be null if no error occured.
-        /// </summary>
-        public Exception Error { get; set; }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs Deleted

@@ -1,71 +0,0 @@
-/*  UpdateCheckResult.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Model.General
-{
-    using System;
-    using System.Threading;
-
-    /// <summary>
-    /// Used in EndUpdateCheck() for update checking and the IAsyncResult design pattern.
-    /// </summary>
-    public class UpdateCheckResult : IAsyncResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateCheckResult"/> class.
-        /// </summary>
-        /// <param name="asyncState">
-        /// The async state.
-        /// </param>
-        /// <param name="info">
-        /// The info.
-        /// </param>
-        public UpdateCheckResult(object asyncState, ApplicationServices.Model.General.UpdateCheckInformation info)
-        {
-            this.AsyncState = asyncState;
-            this.Result = info;
-        }
-
-        /// <summary>
-        /// Gets whether the check was executed in debug mode.
-        /// </summary>
-        public object AsyncState { get; private set; }
-
-        /// <summary>
-        /// Gets the result of the update check.
-        /// </summary>
-        public ApplicationServices.Model.General.UpdateCheckInformation Result { get; private set; }
-
-        /// <summary>
-        /// Gets AsyncWaitHandle.
-        /// </summary>
-        /// <exception cref="NotImplementedException">
-        /// </exception>
-        public WaitHandle AsyncWaitHandle
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether CompletedSynchronously.
-        /// </summary>
-        /// <exception cref="NotImplementedException">
-        /// </exception>
-        public bool CompletedSynchronously
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether IsCompleted.
-        /// </summary>
-        /// <exception cref="NotImplementedException">
-        /// </exception>
-        public bool IsCompleted
-        {
-            get { throw new NotImplementedException(); }
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/ModelBase.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/ServiceManager.cs Deleted

@@ -1,44 +0,0 @@
-namespace HandBrake.ApplicationServices
-{
-    using HandBrake.ApplicationServices.Services;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.Interop;
-
-    /// <summary>
-    /// Tempory Class which manages services until Windosor is added back into the project to handle it for us.
-    /// </summary>
-    public class ServiceManager
-    {
-        /// <summary>
-        /// Backing Field for the User Setting Service.
-        /// </summary>
-        private static IUserSettingService userSettingService;
-
-        /// <summary>
-        /// The Backing field for HandBrake Instance.
-        /// </summary>
-        private static HandBrakeInstance handBrakeInstance;
-
-        /// <summary>
-        /// Gets UserSettingService.
-        /// </summary>
-        public static IUserSettingService UserSettingService
-        {
-            get
-            {
-                return userSettingService ?? (userSettingService = new UserSettingService());
-            }
-        }
-
-        /// <summary>
-        /// Gets HandBrakeInstance.
-        /// </summary>
-        public static HandBrakeInstance HandBrakeInstance
-        {
-            get
-            {
-                return handBrakeInstance ?? (handBrakeInstance = new HandBrakeInstance());
-            }
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueManager.cs Deleted

@@ -1,131 +0,0 @@
-/*  IQueueManager.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Services.Interfaces
-{
-    using System;
-    using System.Collections.ObjectModel;
-
-    using HandBrake.ApplicationServices.Model;
-
-    /// <summary>
-    /// The Queue Manager Interface
-    /// </summary>
-    public interface IQueueManager
-    {
-        /// <summary>
-        /// Fires when a job is Added, Removed or Re-Ordered.
-        /// Should be used for triggering an update of the Queue Window.
-        /// </summary>
-        event EventHandler QueueChanged;
-
-        /// <summary>
-        /// Gets or sets Last Processed Job.
-        /// This is set when the job is poped of the queue by GetNextJobForProcessing();
-        /// </summary>
-        QueueTask LastProcessedJob { get; set; }
-
-        /// <summary>
-        /// Gets The current queue.
-        /// </summary>
-         ObservableCollection<QueueTask> Queue { get; }
-
-        /// <summary>
-        /// Gets the number of jobs in the queue
-        /// </summary>
-        int Count { get; }
-
-        /// <summary>
-        /// Add a job to the Queue. 
-        /// This method is Thread Safe.
-        /// </summary>
-        /// <param name="job">
-        /// The encode Job object.
-        /// </param>
-        void Add(QueueTask job);
-
-        /// <summary>
-        /// Remove a job from the Queue.
-        /// This method is Thread Safe
-        /// </summary>
-        /// <param name="job">
-        /// The job.
-        /// </param>
-        void Remove(QueueTask job);
-
-        /// <summary>
-        /// Reset a Queued Item from Error or Completed to Waiting
-        /// </summary>
-        /// <param name="job">
-        /// The job.
-        /// </param>
-        void ResetJobStatusToWaiting(QueueTask job);
-
-        /// <summary>
-        /// Clear down the Queue´s completed items
-        /// </summary>
-        void ClearCompleted();
-
-        /// <summary>
-        /// Clear down all Queue Items
-        /// </summary>
-        void Clear();
-
-        /// <summary>
-        /// Get the first job on the queue for processing.
-        /// This also removes the job from the Queue and sets the LastProcessedJob
-        /// </summary>
-        /// <returns>
-        /// An encode Job object.
-        /// </returns>
-        QueueTask GetNextJobForProcessing();
-
-        /// <summary>
-        /// Moves an item up one position in the queue.
-        /// </summary>
-        /// <param name="index">The zero-based location of the job in the queue.</param>
-        void MoveUp(int index);
-
-        /// <summary>
-        /// Moves an item down one position in the queue.
-        /// </summary>
-        /// <param name="index">The zero-based location of the job in the queue.</param>
-        void MoveDown(int index);
-
-        /// <summary>
-        /// Backup any changes to the queue file
-        /// </summary>
-        /// <param name="exportPath">
-        /// If this is not null or empty, this will be used instead of the standard backup location.
-        /// </param>
-        void BackupQueue(string exportPath);
-
-        /// <summary>
-        /// Restore a Queue from file or from the queue backup file.
-        /// </summary>
-        /// <param name="importPath">
-        /// The import path. String.Empty or null will result in the default file being loaded.
-        /// </param>
-        void RestoreQueue(string importPath);
-
-        /// <summary>
-        /// Checks the current queue for an existing instance of the specified destination.
-        /// </summary>
-        /// <param name="destination">The destination of the encode.</param>
-        /// <returns>Whether or not the supplied destination is already in the queue.</returns>
-        bool CheckForDestinationPathDuplicates(string destination);
-
-        /// <summary>
-        /// Create a batch script from the queue
-        /// </summary>
-        /// <param name="path">
-        /// The path to the location for the script to be saved.
-        /// </param>
-        /// <returns>
-        /// True if sucessful
-        /// </returns>
-        bool WriteBatchScriptToFile(string path);
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/QueueManager.cs Deleted

@@ -1,419 +0,0 @@
-/*  QueueManager.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Services
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-    using System.Linq;
-    using System.Windows.Forms;
-    using System.Xml.Serialization;
-
-    using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using EventArgs = System.EventArgs;
-
-    /// <summary>
-    /// The Queue Manager.
-    /// Thread Safe.
-    /// </summary>
-    public class QueueManager : IQueueManager
-    {
-        /*
-         * TODO
-         * - Rewrite the batch script generator. 
-         * - QueueTask, switch everything to use the Task property, which is a model of all settings.
-         */
-
-        #region Private Variables
-
-        /// <summary>
-        /// A Lock object to maintain thread safety
-        /// </summary>
-        static readonly object QueueLock = new object();
-
-        /// <summary>
-        /// The Queue of Job objects
-        /// </summary>
-        private readonly ObservableCollection<QueueTask> queue = new ObservableCollection<QueueTask>();
-
-        /// <summary>
-        /// HandBrakes Queue file with a place holder for an extra string.
-        /// </summary>
-        private readonly string queueFile;
-
-        /// <summary>
-        /// The ID of the job last added
-        /// </summary>
-        private int lastJobId;
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueueManager"/> class.
-        /// </summary>
-        /// <param name="instanceId">
-        /// The instance Id.
-        /// </param>
-        public QueueManager(int instanceId)
-        {
-            // If this is the first instance, just use the main queue file, otherwise add the instance id to the filename.
-            this.queueFile = instanceId == 0 ? "hb_queue_recovery.xml" : string.Format("hb_queue_recovery{0}.xml", instanceId);
-        }
-
-        #region Events
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueueManager"/> class.
-        /// </summary>
-        public QueueManager()
-        {
-            this.queueFile =  "hb_queue_recovery.xml"; // TODO need to support multi-instance here.
-        }
-
-        /// <summary>
-        /// Fires when a job is Added, Removed or Re-Ordered.
-        /// Should be used for triggering an update of the Queue Window.
-        /// </summary>
-        public event EventHandler QueueChanged;
-
-        /// <summary>
-        /// Invoke the Queue Changed Event
-        /// </summary>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void InvokeQueueChanged(EventArgs e)
-        {
-            try
-            {
-                this.BackupQueue(string.Empty);
-            }
-            catch (Exception)
-            {
-                // Do Nothing.
-            }
-
-            EventHandler handler = this.QueueChanged;
-            if (handler != null)
-            {
-                handler(this, e);
-            }
-        }
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// Gets or sets Last Processed Job.
-        /// This is set when the job is poped of the queue by GetNextJobForProcessing();
-        /// </summary>
-        public QueueTask LastProcessedJob { get; set; }
-
-        /// <summary>
-        /// Gets the number of jobs in the queue;
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                return this.queue.Where(item => item.Status == QueueItemStatus.Waiting).Count();
-            }
-        }
-
-        /// <summary>
-        /// Gets The current queue.
-        /// </summary>
-        public ObservableCollection<QueueTask> Queue
-        {
-            get
-            {
-                return this.queue;
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Add a job to the Queue. 
-        /// This method is Thread Safe.
-        /// </summary>
-        /// <param name="job">
-        /// The encode Job object.
-        /// </param>
-        public void Add(QueueTask job)
-        {
-            lock (QueueLock)
-            {
-                // Tag the job with an ID
-                job.Id = lastJobId++;
-                queue.Add(job);
-                InvokeQueueChanged(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Remove a job from the Queue.
-        /// This method is Thread Safe
-        /// </summary>
-        /// <param name="job">
-        /// The job.
-        /// </param>
-        public void Remove(QueueTask job)
-        {
-            lock (QueueLock)
-            {
-                queue.Remove(job);
-                InvokeQueueChanged(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Reset a Queued Item from Error or Completed to Waiting
-        /// </summary>
-        /// <param name="job">
-        /// The job.
-        /// </param>
-        public void ResetJobStatusToWaiting(QueueTask job)
-        {
-            if (job.Status != QueueItemStatus.Error && job.Status != QueueItemStatus.Completed)
-            {
-                throw new GeneralApplicationException("Job Error", "Unable to reset job status as it is not in an Error or Completed state", null);
-            }
-
-            job.Status = QueueItemStatus.Waiting;
-        }
-
-        /// <summary>
-        /// Clear down the Queue´s completed items
-        /// </summary>
-        public void ClearCompleted()
-        {
-            List<QueueTask> deleteList = this.queue.Where(task => task.Status == QueueItemStatus.Completed).ToList();
-            foreach (QueueTask item in deleteList)
-            {
-                this.queue.Remove(item);
-            }
-            this.InvokeQueueChanged(EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Clear down all Queue Items
-        /// </summary>
-        public void Clear()
-        {
-            List<QueueTask> deleteList = this.queue.ToList();
-            foreach (QueueTask item in deleteList)
-            {
-                this.queue.Remove(item);
-            }
-            this.InvokeQueueChanged(EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Get the first job on the queue for processing.
-        /// This also removes the job from the Queue and sets the LastProcessedJob
-        /// </summary>
-        /// <returns>
-        /// An encode Job object.
-        /// </returns>
-        public QueueTask GetNextJobForProcessing()
-        {
-            if (this.queue.Count > 0)
-            {
-                QueueTask job = this.queue.FirstOrDefault(q => q.Status == QueueItemStatus.Waiting);
-                if (job != null)
-                {
-                    job.Status = QueueItemStatus.InProgress;
-                    this.LastProcessedJob = job;
-                    InvokeQueueChanged(EventArgs.Empty);
-                }
-
-                this.BackupQueue(string.Empty);
-                return job;
-            }
-
-            this.BackupQueue(string.Empty);
-            return null;
-        }
-
-        /// <summary>
-        /// Moves an item up one position in the queue.
-        /// </summary>
-        /// <param name="index">The zero-based location of the job in the queue.</param>
-        public void MoveUp(int index)
-        {
-            if (index > 0)
-            {
-                QueueTask item = queue[index];
-
-                queue.RemoveAt(index);
-                queue.Insert((index - 1), item);
-            }
-
-            this.InvokeQueueChanged(EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Moves an item down one position in the queue.
-        /// </summary>
-        /// <param name="index">The zero-based location of the job in the queue.</param>
-        public void MoveDown(int index)
-        {
-            if (index < this.queue.Count - 1)
-            {
-                QueueTask item = this.queue[index];
-
-                this.queue.RemoveAt(index);
-                this.queue.Insert((index + 1), item);
-            }
-
-            this.InvokeQueueChanged(EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Backup any changes to the queue file
-        /// </summary>
-        /// <param name="exportPath">
-        /// If this is not null or empty, this will be used instead of the standard backup location.
-        /// </param>
-        public void BackupQueue(string exportPath)
-        {
-            string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
-            string tempPath = !string.IsNullOrEmpty(exportPath) ? exportPath : appDataPath + string.Format(this.queueFile, string.Empty);
-
-
-            using (FileStream strm = new FileStream(tempPath, FileMode.Create, FileAccess.Write))
-            {
-                List<QueueTask> tasks = queue.Where(item => item.Status != QueueItemStatus.Completed).ToList();
-                XmlSerializer serializer = new XmlSerializer(typeof(List<QueueTask>));
-                serializer.Serialize(strm, tasks);
-                strm.Close();
-                strm.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Restore a Queue from file or from the queue backup file.
-        /// </summary>
-        /// <param name="importPath">
-        /// The import path. String.Empty or null will result in the default file being loaded.
-        /// </param>
-        public void RestoreQueue(string importPath)
-        {
-            string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
-            string tempPath = !string.IsNullOrEmpty(importPath) ? importPath : (appDataPath + string.Format(this.queueFile, string.Empty));
-
-            if (File.Exists(tempPath))
-            {
-                bool invokeUpdate = false;
-                using (FileStream strm = new FileStream((!string.IsNullOrEmpty(importPath) ? importPath : tempPath), FileMode.Open, FileAccess.Read))
-                {
-                    if (strm.Length != 0)
-                    {
-                        XmlSerializer serializer = new XmlSerializer(typeof(List<QueueTask>));
-
-                        List<QueueTask> list;
-
-                        try
-                        {
-                            list = serializer.Deserialize(strm) as List<QueueTask>; 
-                        }
-                        catch (Exception exc)
-                        {
-                            throw new GeneralApplicationException("Unable to restore queue file.", "The file may be corrupted or from an older incompatible version of HandBrake", exc);
-                        }
-
-                        if (list != null)
-                            foreach (QueueTask item in list)
-                            {
-                                if (item.Status != QueueItemStatus.Completed)
-                                {
-                                    // Reset InProgress/Error to Waiting so it can be processed
-                                    if (item.Status == QueueItemStatus.InProgress)
-                                    {
-                                        item.Status = QueueItemStatus.Waiting;
-                                    }
-
-                                    this.queue.Add(item);
-                                }
-                            }
-
-                        invokeUpdate = true;
-                    }
-                }
-
-                if (invokeUpdate)
-                {
-                    this.InvokeQueueChanged(EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Checks the current queue for an existing instance of the specified destination.
-        /// </summary>
-        /// <param name="destination">The destination of the encode.</param>
-        /// <returns>Whether or not the supplied destination is already in the queue.</returns>
-        public bool CheckForDestinationPathDuplicates(string destination)
-        {
-            return this.queue.Any(checkItem => checkItem.Destination.Contains(destination.Replace("\\\\", "\\")));
-        }
-
-        /// <summary>
-        /// Writes the current state of the queue in the form of a batch (.bat) file.
-        /// </summary>
-        /// <param name="file">
-        /// The location of the file to write the batch file to.
-        /// </param>
-        /// <returns>
-        /// The write batch script to file.
-        /// </returns>
-        public bool WriteBatchScriptToFile(string file)
-        {
-            string queries = string.Empty;
-            foreach (QueueTask queueItem in this.queue)
-            {
-                string qItem = queueItem.Query;
-                string fullQuery = '"' + Application.StartupPath + "\\HandBrakeCLI.exe" + '"' + qItem;
-
-                if (queries == string.Empty)
-                    queries = queries + fullQuery;
-                else
-                    queries = queries + " && " + fullQuery;
-            }
-            string strCmdLine = queries;
-
-            if (file != string.Empty)
-            {
-                try
-                {
-                    // Create a StreamWriter and open the file, Write the batch file query to the file and 
-                    // Close the stream
-                    using (StreamWriter line = new StreamWriter(file))
-                    {
-                        line.WriteLine(strCmdLine);
-                    }
-
-                    return true;
-                }
-                catch (Exception exc)
-                {
-                    throw new Exception("Unable to write to the file. Please make sure that the location has the correct permissions for file writing.", exc);
-                }
-            }
-            return false;
-        }
-
-        #endregion
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs Deleted

@@ -1,103 +0,0 @@
-/*  UpdateService.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Services
-{
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Threading;
-
-    using HandBrake.ApplicationServices.Model.General;
-    using HandBrake.ApplicationServices.Utilities;
-
-    /// <summary>
-    /// The Update Service
-    /// </summary>
-    public class UpdateService
-    {
-        /*
-         * TODO: Refactor this to use Caliburn Invocation
-         */ 
-
-        /// <summary>
-        /// Begins checking for an update to HandBrake.
-        /// </summary>
-        /// <param name="callback">
-        /// The method that will be called when the check is finished.
-        /// </param>
-        /// <param name="debug">
-        /// Whether or not to execute this in debug mode.
-        /// </param>
-        /// <param name="url">
-        /// The url.
-        /// </param>
-        /// <param name="currentBuild">
-        /// The current Build.
-        /// </param>
-        /// <param name="skipBuild">
-        /// The skip Build.
-        /// </param>
-        public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild)
-        {
-            ThreadPool.QueueUserWorkItem(delegate
-                {
-                    try
-                    {
-                        // Initialize variables
-                        WebRequest request = WebRequest.Create(url);
-                        WebResponse response = request.GetResponse();
-                        AppcastReader reader = new AppcastReader();
-
-                        // Get the data, convert it to a string, and parse it into the AppcastReader
-                        reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());
-
-                        // Further parse the information
-                        string build = reader.Build;
-
-                        int latest = int.Parse(build);
-                        int current = currentBuild;
-                        int skip = skipBuild;
-
-                        // If the user wanted to skip this version, don't report the update
-                        if (latest == skip)
-                        {
-                            UpdateCheckInformation info = new UpdateCheckInformation { NewVersionAvailable = false };
-                            callback(new UpdateCheckResult(debug, info));
-                            return;
-                        }
-
-                        UpdateCheckInformation info2 = new UpdateCheckInformation
-                            {
-                                NewVersionAvailable = latest > current,
-                                DescriptionUrl = reader.DescriptionUrl,
-                                DownloadFile = reader.DownloadFile,
-                                Build = reader.Build,
-                                Version = reader.Version,
-                            };
-                        callback(new UpdateCheckResult(debug, info2));
-                    }
-                    catch (Exception exc)
-                    {
-                        callback(new UpdateCheckResult(debug, new UpdateCheckInformation { Error = exc }));
-                    }
-                });
-        }
-
-        /// <summary>
-        /// End Check for Updates
-        /// </summary>
-        /// <param name="result">
-        /// The result.
-        /// </param>
-        /// <returns>
-        /// Update Check information
-        /// </returns>
-        public static UpdateCheckInformation EndCheckForUpdates(IAsyncResult result)
-        {
-            return ((UpdateCheckResult)result).Result;
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs Deleted

@@ -1,44 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the EncodeProgressEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
-	using System;
-
-    /// <summary>
-    /// Encode Progress Event Args
-    /// </summary>
-    public class EncodeProgressEventArgs : EventArgs
-	{
-	    /// <summary>
-	    /// Gets or sets FractionComplete.
-	    /// </summary>
-	    public float FractionComplete { get; set; }
-
-	    /// <summary>
-	    /// Gets or sets CurrentFrameRate.
-	    /// </summary>
-	    public float CurrentFrameRate { get; set; }
-
-	    /// <summary>
-	    /// Gets or sets AverageFrameRate.
-	    /// </summary>
-	    public float AverageFrameRate { get; set; }
-
-	    /// <summary>
-	    /// Gets or sets EstimatedTimeLeft.
-	    /// </summary>
-	    public TimeSpan EstimatedTimeLeft { get; set; }
-
-		/// <summary>
-		/// Gets or sets the current encoding pass. (-1: subtitle scan, 1: first pass, 2: second pass)
-		/// </summary>
-		public int Pass { get; set; }
-	}
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/libgcc_s_sjlj-1.dll Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake10.5.1.ReSharper Deleted

@@ -1,388 +0,0 @@
-<Configuration>
-  <CodeStyleSettings>
-    <ExternalPath IsNull="False">
-    </ExternalPath>
-    <Sharing>SOLUTION</Sharing>
-    <CSharp>
-      <FormatSettings>
-        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>
-        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>
-        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>
-        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>
-        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>
-        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>
-        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>
-        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>
-        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>
-        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>
-        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>
-        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>
-        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>
-        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>
-        <MODIFIERS_ORDER IsNull="False">
-          <Item>public</Item>
-          <Item>protected</Item>
-          <Item>internal</Item>
-          <Item>private</Item>
-          <Item>new</Item>
-          <Item>abstract</Item>
-          <Item>virtual</Item>
-          <Item>override</Item>
-          <Item>sealed</Item>
-          <Item>static</Item>
-          <Item>readonly</Item>
-          <Item>extern</Item>
-          <Item>unsafe</Item>
-          <Item>volatile</Item>
-        </MODIFIERS_ORDER>
-        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>
-        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>
-        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>
-        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>
-        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>
-        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>
-        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>
-        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>
-        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>
-        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>
-        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>
-        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>
-        <STICK_COMMENT>False</STICK_COMMENT>
-        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>
-        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>
-        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>
-        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>
-        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>
-        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>
-      </FormatSettings>
-      <UsingsSettings>
-        <AddImportsToDeepestScope>True</AddImportsToDeepestScope>
-        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>
-      </UsingsSettings>
-      <Naming2>
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-        <ExceptionName IsNull="False">
-        </ExceptionName>
-        <OverrideDefaultSettings>True</OverrideDefaultSettings>
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
-        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
-        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="Aa_bb" ElementKind="MethodPropertyEvent" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />
-        <Abbreviation Text="SSA" />
-        <Abbreviation Text="CC" />
-        <Abbreviation Text="UTF" />
-        <Abbreviation Text="TX" />
-        <Abbreviation Text="SRT" />
-        <Abbreviation Text="CLI" />
-        <Abbreviation Text="MP" />
-        <Abbreviation Text="II" />
-        <Abbreviation Text="GUI" />
-      </Naming2>
-      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">
-
-    
-    <Pattern>
-        <Match>
-            <And Weight="2000">
-                <Kind Is="interface"/>
-                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"
-                              Inherit="true"/>
-            </And>
-        </Match>
-    </Pattern>
-
-    
-    <Pattern>
-        <Match>
-            <And Weight="2000">
-                <Or>
-                    <Kind Is="struct"/>
-                    <Kind Is="class"/>
-                </Or>
-                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"
-                              Inherit="true"/>
-            </And>
-        </Match>
-    </Pattern>
-
-    
-    <Pattern>
-        <Match>
-            <And Weight="2000">
-                <Kind Is="class"/>
-                <Name Is=".*NativeMethods" />
-            </And>
-        </Match>
-    </Pattern>
-
-    
-    <Pattern RemoveAllRegions="true">
-        <Match>
-            <Or Weight="1000" >
-                <Kind Is="class" />
-                <Kind Is="struct" />
-                <Kind Is="interface"/>
-            </Or>
-        </Match>
-
-        
-        <Entry>
-            <Match>
-                <Or>
-                    <Kind Is="constant"/>
-                    <Kind Is="field"/>
-                </Or>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private"/>
-                <Kind Order="constant field"/>
-                <Readonly/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Constants and Fields"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Or Weight="200">
-                    <Kind Is="constructor"/>
-                    <Kind Is="destructor"/>
-                </Or>
-            </Match>
-            <Sort>
-                <Static/>
-                <Kind Order="constructor destructor"/>
-                <Access Order="public internal protected-internal protected private"/>
-            </Sort>
-            <Group Region="Constructors and Destructors"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="delegate"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static />
-                <Name/>
-            </Sort>
-            <Group Region="Delegates"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="event"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static />
-                <Name/>
-            </Sort>
-            <Group Region="Events"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="enum"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-            <Group Region="Enums"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="interface" />
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-            <Group Region="Interfaces"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="property"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Properties"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="indexer"
-                      Weight="300" />
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Indexers"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="operator"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Operators"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <And>
-                    <Kind Is="method"/>
-                    <Access Is="public"/>
-                </And>
-            </Match>
-            <Sort>
-                <Access Order="public"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Public Methods"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <And Weight="500">
-                    <Kind Is="method"/>
-                    <ImplementsInterface CLRName=".*"/>
-                </And>
-            </Match>
-            <Sort>
-                <ImplementsInterface />
-                <Access Order="public internal protected-internal protected private"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Implemented Interfaces">
-                <ImplementsInterface Region="${ImplementsInterface}" />
-            </Group>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="method"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Methods"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="struct"
-                      Weight="600" />
-            </Match>
-            <Sort>
-                <Static />
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="class"
-                      Weight="700" />
-            </Match>
-            <Sort>
-                <Static />
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-        </Entry>
-
-        
-        <Entry/>
-
-    </Pattern>
-</Patterns>
-]]></CustomMemberReorderingPatterns>
-    </CSharp>
-    <VB>
-      <FormatSettings />
-      <ImportsSettings />
-      <Naming2>
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      </Naming2>
-    </VB>
-    <Web>
-      <Naming2 />
-    </Web>
-    <Xaml>
-      <Naming2 />
-    </Xaml>
-    <XML>
-      <FormatSettings />
-    </XML>
-    <GenerateMemberBody />
-    <Naming2>
-      <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-      <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      <ExceptionName IsNull="False">
-      </ExceptionName>
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
-      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
-      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />
-    </Naming2>
-  </CodeStyleSettings>
-</Configuration>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake10.6.1.ReSharper Deleted

@@ -1,396 +0,0 @@
-<Configuration>
-  <CodeStyleSettings>
-    <ExternalPath IsNull="False" />
-    <Sharing>SOLUTION</Sharing>
-    <CSS>
-      <FormatSettings />
-      <Naming2 />
-    </CSS>
-    <CSharp>
-      <FormatSettings>
-        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>
-        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>
-        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>
-        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>
-        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>
-        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>
-        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>
-        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>
-        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>
-        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>
-        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>
-        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>
-        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>
-        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>
-        <MODIFIERS_ORDER IsNull="False">
-          <Item>public</Item>
-          <Item>protected</Item>
-          <Item>internal</Item>
-          <Item>private</Item>
-          <Item>new</Item>
-          <Item>abstract</Item>
-          <Item>virtual</Item>
-          <Item>override</Item>
-          <Item>sealed</Item>
-          <Item>static</Item>
-          <Item>readonly</Item>
-          <Item>extern</Item>
-          <Item>unsafe</Item>
-          <Item>volatile</Item>
-        </MODIFIERS_ORDER>
-        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>
-        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>
-        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>
-        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>
-        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>
-        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>
-        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>
-        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>
-        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>
-        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>
-        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>
-        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>
-        <STICK_COMMENT>False</STICK_COMMENT>
-        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>
-        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>
-        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>
-        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>
-        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>
-        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>
-      </FormatSettings>
-      <UsingsSettings>
-        <AddImportsToDeepestScope>True</AddImportsToDeepestScope>
-        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>
-      </UsingsSettings>
-      <Naming2>
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-        <ExceptionName IsNull="False" />
-        <OverrideDefaultSettings>True</OverrideDefaultSettings>
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
-        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
-        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="Aa_bb" ElementKind="MethodPropertyEvent" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />
-        <Abbreviation Text="SSA" />
-        <Abbreviation Text="CC" />
-        <Abbreviation Text="UTF" />
-        <Abbreviation Text="TX" />
-        <Abbreviation Text="SRT" />
-        <Abbreviation Text="CLI" />
-        <Abbreviation Text="MP" />
-        <Abbreviation Text="II" />
-        <Abbreviation Text="GUI" />
-      </Naming2>
-      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">
-
-    
-    <Pattern>
-        <Match>
-            <And Weight="2000">
-                <Kind Is="interface"/>
-                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"
-                              Inherit="true"/>
-            </And>
-        </Match>
-    </Pattern>
-
-    
-    <Pattern>
-        <Match>
-            <And Weight="2000">
-                <Or>
-                    <Kind Is="struct"/>
-                    <Kind Is="class"/>
-                </Or>
-                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"
-                              Inherit="true"/>
-            </And>
-        </Match>
-    </Pattern>
-
-    
-    <Pattern>
-        <Match>
-            <And Weight="2000">
-                <Kind Is="class"/>
-                <Name Is=".*NativeMethods" />
-            </And>
-        </Match>
-    </Pattern>
-
-    
-    <Pattern RemoveAllRegions="true">
-        <Match>
-            <Or Weight="1000" >
-                <Kind Is="class" />
-                <Kind Is="struct" />
-                <Kind Is="interface"/>
-            </Or>
-        </Match>
-
-        
-        <Entry>
-            <Match>
-                <Or>
-                    <Kind Is="constant"/>
-                    <Kind Is="field"/>
-                </Or>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private"/>
-                <Kind Order="constant field"/>
-                <Readonly/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Constants and Fields"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Or Weight="200">
-                    <Kind Is="constructor"/>
-                    <Kind Is="destructor"/>
-                </Or>
-            </Match>
-            <Sort>
-                <Static/>
-                <Kind Order="constructor destructor"/>
-                <Access Order="public internal protected-internal protected private"/>
-            </Sort>
-            <Group Region="Constructors and Destructors"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="delegate"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static />
-                <Name/>
-            </Sort>
-            <Group Region="Delegates"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="event"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static />
-                <Name/>
-            </Sort>
-            <Group Region="Events"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="enum"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-            <Group Region="Enums"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="interface" />
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-            <Group Region="Interfaces"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="property"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Properties"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="indexer"
-                      Weight="300" />
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Indexers"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="operator"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private" />
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Operators"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <And>
-                    <Kind Is="method"/>
-                    <Access Is="public"/>
-                </And>
-            </Match>
-            <Sort>
-                <Access Order="public"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Public Methods"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <And Weight="500">
-                    <Kind Is="method"/>
-                    <ImplementsInterface CLRName=".*"/>
-                </And>
-            </Match>
-            <Sort>
-                <ImplementsInterface />
-                <Access Order="public internal protected-internal protected private"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Implemented Interfaces">
-                <ImplementsInterface Region="${ImplementsInterface}" />
-            </Group>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="method"/>
-            </Match>
-            <Sort>
-                <Access Order="public internal protected-internal protected private"/>
-                <Static/>
-                <Name/>
-            </Sort>
-            <Group Region="Methods"/>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="struct"
-                      Weight="600" />
-            </Match>
-            <Sort>
-                <Static />
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-        </Entry>
-
-        
-        <Entry>
-            <Match>
-                <Kind Is="class"
-                      Weight="700" />
-            </Match>
-            <Sort>
-                <Static />
-                <Access Order="public internal protected-internal protected private" />
-                <Name/>
-            </Sort>
-        </Entry>
-
-        
-        <Entry/>
-
-    </Pattern>
-</Patterns>
-]]></CustomMemberReorderingPatterns>
-    </CSharp>
-    <HTML>
-      <FormatSettings />
-    </HTML>
-    <JavaScript>
-      <FormatSettings />
-      <Naming2 />
-    </JavaScript>
-    <VB>
-      <FormatSettings />
-      <ImportsSettings />
-      <Naming2>
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      </Naming2>
-    </VB>
-    <Web>
-      <Naming2 />
-    </Web>
-    <XML>
-      <FormatSettings />
-    </XML>
-    <Xaml>
-      <Naming2 />
-    </Xaml>
-    <GenerateMemberBody />
-    <Naming2>
-      <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-      <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      <ExceptionName IsNull="False" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
-      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
-      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />
-    </Naming2>
-  </CodeStyleSettings>
-</Configuration>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Helpers/UpdateCheckHelper.cs Deleted

@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="UpdateCheckHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Update Check Helper
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Helpers
-{
-    using System;
-    using System.Windows;
-
-    using Caliburn.Micro;
-
-    using HandBrake.ApplicationServices.Model.General;
-    using HandBrake.ApplicationServices.Services;
-
-    using HandBrakeWPF.Services.Interfaces;
-
-    /// <summary>
-    /// Update Check Helper
-    /// </summary>
-    public class UpdateCheckHelper
-    {
-        /// <summary>
-        /// Handle the Update Check Finishing.
-        /// </summary>
-        /// <param name="result">
-        /// The result.
-        /// </param>
-        public static void UpdateCheckDoneMenu(IAsyncResult result)
-        {
-            // Make sure it's running on the calling thread
-            IErrorService errorService = IoC.Get<IErrorService>();
-            try
-            {
-                // Get the information about the new build, if any, and close the window
-                UpdateCheckInformation info = UpdateService.EndCheckForUpdates(result);
-
-                if (info.NewVersionAvailable)
-                {
-                    errorService.ShowMessageBox(
-                        "A New Update is Available", "Update available!", MessageBoxButton.OK, MessageBoxImage.Information);
-                }
-                else
-                {
-                    errorService.ShowMessageBox(
-                       "There is no new version at this time.", "No Updates", MessageBoxButton.OK, MessageBoxImage.Information);
-                }
-                return;
-            }
-            catch (Exception ex)
-            {
-                errorService.ShowError("Unable to check for updates", "Please try again later, the update service may currently be down.", ex);
-            }
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/README BEFORE WRITING CODE.txt Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IJobContextService.cs Deleted

@@ -1,30 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IJobContextService.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the IJobContextService type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services.Interfaces
-{
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Parsing;
-
-    /// <summary>
-    /// A Context service for the current Job Information
-    /// </summary>
-    public interface IJobContextService
-    {
-        /// <summary>
-        /// Gets or sets CurrentTask.
-        /// </summary>
-        EncodeTask CurrentTask { get; set; }
-
-        /// <summary>
-        /// Gets or sets CurrentSource.
-        /// </summary>
-        Source CurrentSource { get; set; }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IUpdateVersionService.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Services/JobContextService.cs Deleted

@@ -1,32 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="JobContextService.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the JobContextService type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services
-{
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Parsing;
-
-    using HandBrakeWPF.Services.Interfaces;
-
-    /// <summary>
-    /// A Context service for the current Job Information.
-    /// </summary>
-    public class JobContextService : IJobContextService
-    {
-        /// <summary>
-        /// Gets or sets CurrentTask.
-        /// </summary>
-        public EncodeTask CurrentTask { get; set; }
-
-        /// <summary>
-        /// Gets or sets CurrentSource.
-        /// </summary>
-        public Source CurrentSource { get; set; }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Services/UpdateVersionService.cs Deleted

@@ -1,146 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="UpdateVersionService.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the UpdateVersionService type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Security.Cryptography;
-    using System.Text.RegularExpressions;
-    using System.Windows;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using HandBrakeWPF.Services.Interfaces;
-
-    /// <summary>
-    /// Update Version Service - Handlers Update and Versioning.
-    /// </summary>
-    public class UpdateVersionService : IUpdateVersionService
-    {
-        /// <summary>
-        /// The Backing field for the user setting service
-        /// </summary>
-        private readonly IUserSettingService userSettingService;
-
-        /// <summary>
-        /// The Error Service Backing field.
-        /// </summary>
-        private readonly IErrorService errorService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateVersionService"/> class.
-        /// </summary>
-        /// <param name="userSettingService">
-        /// The user setting service.
-        /// </param>
-        /// <param name="errorService">
-        /// The error Service.
-        /// </param>
-        public UpdateVersionService(IUserSettingService userSettingService, IErrorService errorService)
-        {
-            this.userSettingService = userSettingService;
-            this.errorService = errorService;
-        }
-
-        /// <summary>
-        /// Get's HandBrakes version data from the CLI.
-        /// </summary>
-        public void SetCliVersionData()
-        {
-            string line;
-
-            // 0 = SVN Build / Version
-            // 1 = Build Date
-
-            // Get the SHA1 Hash of HandBrakeCLI
-            byte[] hash;
-            string starupPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
-
-            using (Stream stream = File.OpenRead(Path.Combine(starupPath, "HandBrakeCLI.exe")))
-            {
-                hash = SHA1.Create().ComputeHash(stream);
-            }
-            string base64Hash = Convert.ToBase64String(hash);
-
-            // Compare the hash with the last known hash. If it's the same, return.
-            if (userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeExeHash) == base64Hash)
-            {
-                return;
-            }
-
-            // It's not the same, so start the CLI to get it's version data.
-            Process cliProcess = new Process();
-            ProcessStartInfo handBrakeCli = new ProcessStartInfo("HandBrakeCLI.exe", " -u -v0")
-            {
-                UseShellExecute = false,
-                RedirectStandardError = true,
-                RedirectStandardOutput = true,
-                CreateNoWindow = true
-            };
-            cliProcess.StartInfo = handBrakeCli;
-
-            try
-            {
-                cliProcess.Start();
-
-                // Retrieve standard output and report back to parent thread until the process is complete
-                TextReader stdOutput = cliProcess.StandardError;
-
-                while (!cliProcess.HasExited)
-                {
-                    line = stdOutput.ReadLine() ?? string.Empty;
-                    Match m = Regex.Match(line, @"HandBrake ([svnM0-9.]*) $([0-9]*)$");
-                    Match platform = Regex.Match(line, @"- ([A-Za-z0-9\s ]*) -");
-
-                    if (m.Success)
-                    {
-                        string version = m.Groups[1].Success ? m.Groups[1].Value : string.Empty;
-                        string build = m.Groups[2].Success ? m.Groups[2].Value : string.Empty;
-
-                        int buildValue;
-                        int.TryParse(build, out buildValue);
-
-                        userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, buildValue);
-                        userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeVersion, version);
-                    }
-
-                    if (platform.Success)
-                    {
-                        userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakePlatform, platform.Value.Replace("-", string.Empty).Trim());
-                    }
-
-                    if (cliProcess.TotalProcessorTime.Seconds > 10) // Don't wait longer than 10 seconds.
-                    {
-                        Process cli = Process.GetProcessById(cliProcess.Id);
-                        if (!cli.HasExited)
-                        {
-                            cli.Kill();
-                        }
-                    }
-                }
-
-                userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeExeHash, base64Hash);
-            }
-            catch (Exception e)
-            {
-                userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, string.Empty);
-                userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakePlatform, string.Empty);
-                userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeVersion, string.Empty);
-                userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeExeHash, string.Empty);
-
-                this.errorService.ShowError("Unable to Initialise HandBrake", "This error is unrecoverable. Maybe try restarting.", e);
-
-                Application.Current.Shutdown();
-            }
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Startup/MefBootstrapper.cs Deleted

@@ -1,98 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MefBootstrapper.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The MEF Bootstrapper (Not Used)
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Startup 
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel.Composition;
-    using System.ComponentModel.Composition.Hosting;
-    using System.Linq;
-
-    using Caliburn.Micro;
-
-    using HandBrakeWPF.ViewModels.Interfaces;
-
-    /// <summary>
-    /// The MEF Bootstrapper (Not Used)
-    /// </summary>
-    public class MefBootstrapper : Bootstrapper<IMainViewModel>
-    {
-        /// <summary>
-        /// The Backing field for the container
-        /// </summary>
-        private CompositionContainer container;
-
-        /// <summary>
-        /// MEF Configure
-        /// </summary>
-        protected override void Configure()
-        {
-            container = new CompositionContainer(
-                new AggregateCatalog(AssemblySource.Instance.Select(x => new AssemblyCatalog(x)))
-                );
-
-            var batch = new CompositionBatch();
-
-            batch.AddExportedValue<IWindowManager>(new WindowManager());
-            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
-            batch.AddExportedValue(container);
-
-            container.Compose(batch);
-        }
-
-        /// <summary>
-        /// Get an Instance of a service
-        /// </summary>
-        /// <param name="serviceType">
-        /// The service.
-        /// </param>
-        /// <param name="key">
-        /// The key.
-        /// </param>
-        /// <returns>
-        /// The Service Requested
-        /// </returns>
-        protected override object GetInstance(Type serviceType, string key)
-        {
-            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
-            var exports = container.GetExportedValues<object>(contract);
-
-            if (exports.Count() > 0)
-                return exports.First();
-
-            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
-        }
-
-        /// <summary>
-        /// Get all instances of a service
-        /// </summary>
-        /// <param name="serviceType">
-        /// The service.
-        /// </param>
-        /// <returns>
-        /// A collection of instances of the requested service type.
-        /// </returns>
-        protected override IEnumerable<object> GetAllInstances(Type serviceType)
-        {
-            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
-        }
-
-        /// <summary>
-        /// Build Up
-        /// </summary>
-        /// <param name="instance">
-        /// The instance.
-        /// </param>
-        protected override void BuildUp(object instance)
-        {
-            container.SatisfyImportsOnce(instance);
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Add16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Help16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Help24.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Help32.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/arrow_down.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/arrow_left.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/arrow_right.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/arrow_up.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/download.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/hb16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/hb32.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/info16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/save.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Installer Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Installer/Installer.nsi Deleted

@@ -1,325 +0,0 @@
-/*  Resources.Designer.cs $
-
- 	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.fr/>.
- 	   It may be used under the terms of the GNU General Public License. */
-
-; Script generated by the HM NIS Edit Script Wizard.
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "0.9.8"
-!define PRODUCT_VERSION_NUMBER "0.9.8"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-;Required .NET framework
-!define MIN_FRA_MAJOR "4"
-!define MIN_FRA_MINOR "0"
-!define MIN_FRA_BUILD "*"
-
-SetCompressor lzma
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "handbrakepineapple.ico"
-!define MUI_UNICON "handbrakepineapple.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
-
-!include WordFunc.nsh
-!insertmacro VersionCompare
-!include LogicLib.nsh
-
-InstallDir "$PROGRAMFILES\Handbrake"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Var InstallDotNET
-
-Function .onInit
-
-  ; Begin Only allow one version
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
-  Pop $R0
-
-  StrCmp $R0 0 +3
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
-  Abort
-
-  ;Remove previous version
-  ReadRegStr $R0 HKLM \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
-  "UninstallString"
-  StrCmp $R0 "" done
-
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to continue." /SD IDOK \
-  IDOK uninst
-  goto done
-
- ;Run the uninstaller
-  uninst:
-   IfSilent +3
-   Exec $INSTDIR\uninst.exe
-   goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
-  done:
-FunctionEnd
-
-Section "Handbrake" SEC01
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-
-  ; Begin Check .NET version
-  StrCpy $InstallDotNET "No"
-  Call CheckFramework
-     StrCmp $0 "1" +3
-        StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
-     Pop $0
-
-  ; Get .NET if required
-  ${If} $InstallDotNET == "Yes"
-     SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
-     Pop $1
-
-     ${If} $1 != "OK"
-           Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
-     ${EndIf}
-
-     ExecWait "$INSTDIR\dotnetfx.exe"
-     Delete "$INSTDIR\dotnetfx.exe"
-
-     SetDetailsView show
-  ${EndIf}
-  
-  ; Install Files
-  File "*.exe"
-  CreateDirectory "$SMPROGRAMS\Handbrake"
-  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
-  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
-  File "*.dll"
-  File "*.config"
-  File "*.xml"
-
-  ; Copy the standard doc set into the doc folder
-  SetOutPath "$INSTDIR\doc"
-  SetOverwrite ifnewer
-  File "doc\*.*"
-
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
-SectionEnd
-
-Section -AdditionalIcons
-  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-SectionEnd
-
-
-Function un.onUninstSuccess
-  HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
-FunctionEnd
-
-Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
-  Abort
-FunctionEnd
-
-Section Uninstall
-  Delete "$INSTDIR\uninst.exe"
-  
-  Delete "$INSTDIR\*.*"
-  Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
-  RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
-  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
-  Delete "$DESKTOP\Handbrake.lnk"
-  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
-  RMDir  "$SMPROGRAMS\Handbrake"
-  RMDir  "$INSTDIR"
-
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  SetAutoClose true
-SectionEnd
-
-;Check for .NET framework
-Function CheckFrameWork
-
-   ;Save the variables in case something else is using them
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $R1
-  Push $R2
-  Push $R3
-  Push $R4
-  Push $R5
-  Push $R6
-  Push $R7
-  Push $R8
-
-  StrCpy $R5 "0"
-  StrCpy $R6 "0"
-  StrCpy $R7 "0"
-  StrCpy $R8 "0.0.0"
-  StrCpy $0 0
-
-  loop:
-
-  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
-  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
-  StrCmp $1 "" done ;jump to end if no more registry keys
-  IntOp $0 $0 + 1
-  StrCpy $2 $1 1 ;Cut off the first character
-  StrCpy $3 $1 "" 1 ;Remainder of string
-
-  ;Loop if first character is not a 'v'
-  StrCmpS $2 "v" start_parse loop
-
-  ;Parse the string
-  start_parse:
-  StrCpy $R1 ""
-  StrCpy $R2 ""
-  StrCpy $R3 ""
-  StrCpy $R4 $3
-
-  StrCpy $4 1
-
-  parse:
-  StrCmp $3 "" parse_done ;If string is empty, we are finished
-  StrCpy $2 $3 1 ;Cut off the first character
-  StrCpy $3 $3 "" 1 ;Remainder of string
-  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
-
-  is_dot:
-  IntOp $4 $4 + 1 ; Move to the next section
-  goto parse ;Carry on parsing
-
-  not_dot:
-  IntCmp $4 1 major_ver
-  IntCmp $4 2 minor_ver
-  IntCmp $4 3 build_ver
-  IntCmp $4 4 parse_done
-
-  major_ver:
-  StrCpy $R1 $R1$2
-  goto parse ;Carry on parsing
-
-  minor_ver:
-  StrCpy $R2 $R2$2
-  goto parse ;Carry on parsing
-
-  build_ver:
-  StrCpy $R3 $R3$2
-  goto parse ;Carry on parsing
-
-  parse_done:
-
-  IntCmp $R1 $R5 this_major_same loop this_major_more
-  this_major_more:
-  StrCpy $R5 $R1
-  StrCpy $R6 $R2
-  StrCpy $R7 $R3
-  StrCpy $R8 $R4
-
-  goto loop
-
-  this_major_same:
-  IntCmp $R2 $R6 this_minor_same loop this_minor_more
-  this_minor_more:
-  StrCpy $R6 $R2
-  StrCpy $R7 R3
-  StrCpy $R8 $R4
-  goto loop
-
-  this_minor_same:
-  IntCmp $R3 $R7 loop loop this_build_more
-  this_build_more:
-  StrCpy $R7 $R3
-  StrCpy $R8 $R4
-  goto loop
-
-  done:
-
-  ;Have we got the framework we need?
-  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
-  max_major_same:
-  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
-  max_minor_same:
-  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
-
-  ;Version on machine is greater than what we need
-  OK:
-  StrCpy $0 "1"
-  goto end
-
-  fail:
-  StrCmp $R8 "0.0.0" end
-
-
-  end:
-
-  ;Pop the variables we pushed earlier
-  Pop $R8
-  Pop $R7
-  Pop $R6
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Pop $R1
-  Pop $4
-  Pop $3
-  Pop $2
-  Pop $1
-FunctionEnd
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Installer/Installer64.nsi Deleted

@@ -1,328 +0,0 @@
-/*  Resources.Designer.cs $
-
- 	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.fr/>.
- 	   It may be used under the terms of the GNU General Public License. */
-
-; Script generated by the HM NIS Edit Script Wizard.
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "0.9.8"
-!define PRODUCT_VERSION_NUMBER "0.9.8"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-;Required .NET framework
-!define MIN_FRA_MAJOR "4"
-!define MIN_FRA_MINOR "0"
-!define MIN_FRA_BUILD "*"
-
-SetCompressor lzma
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "handbrakepineapple.ico"
-!define MUI_UNICON "handbrakepineapple.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
-
-!include WordFunc.nsh
-!insertmacro VersionCompare
-!include LogicLib.nsh
-
-InstallDir "$PROGRAMFILES64\Handbrake"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Var InstallDotNET
-
-Function .onInit
-
-  ; Begin Only allow one version
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
-  Pop $R0
-
-  StrCmp $R0 0 +3
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
-  Abort
-
-  ;Remove previous version
-  ReadRegStr $R0 HKLM \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
-  "UninstallString"
-  StrCmp $R0 "" done
-
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to continue." /SD IDOK \
-  IDOK uninst
-  goto done
-
- ;Run the uninstaller
-  uninst:
-   IfSilent +3
-   Exec $INSTDIR\uninst.exe
-   goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
-  done:
-FunctionEnd
-
-Section "Handbrake" SEC01
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-
-  ; Begin Check .NET version
-  StrCpy $InstallDotNET "No"
-  Call CheckFramework
-     StrCmp $0 "1" +3
-        StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
-     Pop $0
-
-  ; Get .NET if required
-  ${If} $InstallDotNET == "Yes"
-     SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
-     Pop $1
-
-     ${If} $1 != "OK"
-           Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
-     ${EndIf}
-
-     ExecWait "$INSTDIR\dotnetfx.exe"
-     Delete "$INSTDIR\dotnetfx.exe"
-
-     SetDetailsView show
-  ${EndIf}
-  
-  ; Install Files
-  File "Handbrake.exe"
-  File "HandBrakeCLI.exe"
-  CreateDirectory "$SMPROGRAMS\Handbrake"
-  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
-  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
-  File "*.dll"
-  File "*.config"
-  File "*.xml"
-
-  ; Copy the standard doc set into the doc folder
-  SetOutPath "$INSTDIR\doc"
-  SetOverwrite ifnewer
-  File "doc\*.*"
-
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
-
-  
-SectionEnd
-
-Section -AdditionalIcons
-  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-SectionEnd
-
-
-Function un.onUninstSuccess
-  HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
-FunctionEnd
-
-Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
-  Abort
-FunctionEnd
-
-Section Uninstall
-  Delete "$INSTDIR\uninst.exe"
-  
-  Delete "$INSTDIR\*.*"
-  Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
-  RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
-  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
-  Delete "$DESKTOP\Handbrake.lnk"
-  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
-  RMDir  "$SMPROGRAMS\Handbrake"
-  RMDir  "$INSTDIR"
-
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  SetAutoClose true
-SectionEnd
-
-;Check for .NET framework
-Function CheckFrameWork
-
-   ;Save the variables in case something else is using them
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $R1
-  Push $R2
-  Push $R3
-  Push $R4
-  Push $R5
-  Push $R6
-  Push $R7
-  Push $R8
-
-  StrCpy $R5 "0"
-  StrCpy $R6 "0"
-  StrCpy $R7 "0"
-  StrCpy $R8 "0.0.0"
-  StrCpy $0 0
-
-  loop:
-
-  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
-  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
-  StrCmp $1 "" done ;jump to end if no more registry keys
-  IntOp $0 $0 + 1
-  StrCpy $2 $1 1 ;Cut off the first character
-  StrCpy $3 $1 "" 1 ;Remainder of string
-
-  ;Loop if first character is not a 'v'
-  StrCmpS $2 "v" start_parse loop
-
-  ;Parse the string
-  start_parse:
-  StrCpy $R1 ""
-  StrCpy $R2 ""
-  StrCpy $R3 ""
-  StrCpy $R4 $3
-
-  StrCpy $4 1
-
-  parse:
-  StrCmp $3 "" parse_done ;If string is empty, we are finished
-  StrCpy $2 $3 1 ;Cut off the first character
-  StrCpy $3 $3 "" 1 ;Remainder of string
-  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
-
-  is_dot:
-  IntOp $4 $4 + 1 ; Move to the next section
-  goto parse ;Carry on parsing
-
-  not_dot:
-  IntCmp $4 1 major_ver
-  IntCmp $4 2 minor_ver
-  IntCmp $4 3 build_ver
-  IntCmp $4 4 parse_done
-
-  major_ver:
-  StrCpy $R1 $R1$2
-  goto parse ;Carry on parsing
-
-  minor_ver:
-  StrCpy $R2 $R2$2
-  goto parse ;Carry on parsing
-
-  build_ver:
-  StrCpy $R3 $R3$2
-  goto parse ;Carry on parsing
-
-  parse_done:
-
-  IntCmp $R1 $R5 this_major_same loop this_major_more
-  this_major_more:
-  StrCpy $R5 $R1
-  StrCpy $R6 $R2
-  StrCpy $R7 $R3
-  StrCpy $R8 $R4
-
-  goto loop
-
-  this_major_same:
-  IntCmp $R2 $R6 this_minor_same loop this_minor_more
-  this_minor_more:
-  StrCpy $R6 $R2
-  StrCpy $R7 R3
-  StrCpy $R8 $R4
-  goto loop
-
-  this_minor_same:
-  IntCmp $R3 $R7 loop loop this_build_more
-  this_build_more:
-  StrCpy $R7 $R3
-  StrCpy $R8 $R4
-  goto loop
-
-  done:
-
-  ;Have we got the framework we need?
-  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
-  max_major_same:
-  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
-  max_minor_same:
-  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
-
-  ;Version on machine is greater than what we need
-  OK:
-  StrCpy $0 "1"
-  goto end
-
-  fail:
-  StrCmp $R8 "0.0.0" end
-
-
-  end:
-
-  ;Pop the variables we pushed earlier
-  Pop $R8
-  Pop $R7
-  Pop $R6
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Pop $R1
-  Pop $4
-  Pop $3
-  Pop $2
-  Pop $1
-FunctionEnd
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Installer/MakeNightly.nsi.tmpl Deleted

@@ -1,327 +0,0 @@
-/*  Resources.Designer.cs $
-
- 	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.fr/>.
- 	   It may be used under the terms of the GNU General Public License. */
-
-; Script generated by the HM NIS Edit Script Wizard.
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "Handbrake"
-!define PRODUCT_VERSION "$WCREV$ Nightly"
-!define PRODUCT_VERSION_NUMBER "svn$WCREV$"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-;Required .NET framework
-!define MIN_FRA_MAJOR "4"
-!define MIN_FRA_MINOR "0"
-!define MIN_FRA_BUILD "*"
-
-SetCompressor lzma
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "handbrakepineapple.ico"
-!define MUI_UNICON "handbrakepineapple.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
-
-!include WordFunc.nsh
-!insertmacro VersionCompare
-!include LogicLib.nsh
-
-InstallDir "$PROGRAMFILES\Handbrake"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Var InstallDotNET
-
-Function .onInit
-
-  ; Begin Only allow one version
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
-  Pop $R0
-
-  StrCmp $R0 0 +3
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
-  Abort
-
-  ;Remove previous version
-  ReadRegStr $R0 HKLM \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
-  "UninstallString"
-  StrCmp $R0 "" done
-
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to continue." /SD IDOK \
-  IDOK uninst
-  goto done
-
- ;Run the uninstaller
-  uninst:
-   IfSilent +3
-   Exec $INSTDIR\uninst.exe
-   goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
-  done:
-FunctionEnd
-
-Section "Handbrake" SEC01
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-
-  ; Begin Check .NET version
-  StrCpy $InstallDotNET "No"
-  Call CheckFramework
-     StrCmp $0 "1" +3
-        StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
-     Pop $0
-
-  ; Get .NET if required
-  ${If} $InstallDotNET == "Yes"
-     SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
-     Pop $1
-
-     ${If} $1 != "OK"
-           Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
-     ${EndIf}
-
-     ExecWait "$INSTDIR\dotnetfx.exe"
-     Delete "$INSTDIR\dotnetfx.exe"
-
-     SetDetailsView show
-  ${EndIf}
-  
-  ; Install Files
-  ; Install Files
-  File "*.exe"
-  CreateDirectory "$SMPROGRAMS\Handbrake"
-  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
-  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
-  File "*.dll"
-  File "*.config"
-  File "*.xml"
-  File "*.pdb"
-
-  ; Copy the standard doc set into the doc folder
-  SetOutPath "$INSTDIR\doc"
-  SetOverwrite ifnewer
-  File "doc\*.*"
-  
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
-SectionEnd
-
-Section -AdditionalIcons
-  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-SectionEnd
-
-
-Function un.onUninstSuccess
-  HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
-FunctionEnd
-
-Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
-  Abort
-FunctionEnd
-
-Section Uninstall
-  Delete "$INSTDIR\uninst.exe"
-  
-  Delete "$INSTDIR\*.*"
-  Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
-  RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
-  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
-  Delete "$DESKTOP\Handbrake.lnk"
-  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
-  RMDir  "$SMPROGRAMS\Handbrake"
-  RMDir  "$INSTDIR"
-
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  SetAutoClose true
-SectionEnd
-
-;Check for .NET framework
-Function CheckFrameWork
-
-   ;Save the variables in case something else is using them
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $R1
-  Push $R2
-  Push $R3
-  Push $R4
-  Push $R5
-  Push $R6
-  Push $R7
-  Push $R8
-
-  StrCpy $R5 "0"
-  StrCpy $R6 "0"
-  StrCpy $R7 "0"
-  StrCpy $R8 "0.0.0"
-  StrCpy $0 0
-
-  loop:
-
-  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
-  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
-  StrCmp $1 "" done ;jump to end if no more registry keys
-  IntOp $0 $0 + 1
-  StrCpy $2 $1 1 ;Cut off the first character
-  StrCpy $3 $1 "" 1 ;Remainder of string
-
-  ;Loop if first character is not a 'v'
-  StrCmpS $2 "v" start_parse loop
-
-  ;Parse the string
-  start_parse:
-  StrCpy $R1 ""
-  StrCpy $R2 ""
-  StrCpy $R3 ""
-  StrCpy $R4 $3
-
-  StrCpy $4 1
-
-  parse:
-  StrCmp $3 "" parse_done ;If string is empty, we are finished
-  StrCpy $2 $3 1 ;Cut off the first character
-  StrCpy $3 $3 "" 1 ;Remainder of string
-  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
-
-  is_dot:
-  IntOp $4 $4 + 1 ; Move to the next section
-  goto parse ;Carry on parsing
-
-  not_dot:
-  IntCmp $4 1 major_ver
-  IntCmp $4 2 minor_ver
-  IntCmp $4 3 build_ver
-  IntCmp $4 4 parse_done
-
-  major_ver:
-  StrCpy $R1 $R1$2
-  goto parse ;Carry on parsing
-
-  minor_ver:
-  StrCpy $R2 $R2$2
-  goto parse ;Carry on parsing
-
-  build_ver:
-  StrCpy $R3 $R3$2
-  goto parse ;Carry on parsing
-
-  parse_done:
-
-  IntCmp $R1 $R5 this_major_same loop this_major_more
-  this_major_more:
-  StrCpy $R5 $R1
-  StrCpy $R6 $R2
-  StrCpy $R7 $R3
-  StrCpy $R8 $R4
-
-  goto loop
-
-  this_major_same:
-  IntCmp $R2 $R6 this_minor_same loop this_minor_more
-  this_minor_more:
-  StrCpy $R6 $R2
-  StrCpy $R7 R3
-  StrCpy $R8 $R4
-  goto loop
-
-  this_minor_same:
-  IntCmp $R3 $R7 loop loop this_build_more
-  this_build_more:
-  StrCpy $R7 $R3
-  StrCpy $R8 $R4
-  goto loop
-
-  done:
-
-  ;Have we got the framework we need?
-  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
-  max_major_same:
-  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
-  max_minor_same:
-  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
-
-  ;Version on machine is greater than what we need
-  OK:
-  StrCpy $0 "1"
-  goto end
-
-  fail:
-  StrCmp $R8 "0.0.0" end
-
-
-  end:
-
-  ;Pop the variables we pushed earlier
-  Pop $R8
-  Pop $R7
-  Pop $R6
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Pop $R1
-  Pop $4
-  Pop $3
-  Pop $2
-  Pop $1
-FunctionEnd
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Model Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Model/ActivityLogMode.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Model/QueryEncodeMode.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Model/QueryPictureSettingsMode.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Model/SourceType.cs Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Program.cs Deleted

@@ -1,122 +0,0 @@
-/*  Program.cs
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using Handbrake.Properties;
-    using Handbrake.ToolWindows;
-
-    /// <summary>
-    /// HandBrake Starts Here
-    /// </summary>
-    public static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        /// <param name="args">
-        /// The args.
-        /// </param>
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            InstanceId = Process.GetProcessesByName("HandBrake").Length;
-
-            // Handle any unhandled exceptions
-            AppDomain.CurrentDomain.UnhandledException += CurrentDomainUnhandledException;
-   
-            // Check that HandBrakeCLI is availabl.
-            string failedInstall = "HandBrake is not installed properly. Please reinstall HandBrake. \n\n";
-            string missingFiles = string.Empty;
-
-            // Verify HandBrakeCLI.exe exists
-            if (!File.Exists(Path.Combine(Application.StartupPath, "HandBrakeCLI.exe")))
-            {
-                missingFiles += "\"HandBrakeCLI.exe\" was not found.";
-            }
-
-            if (missingFiles != string.Empty)
-            {
-                MessageBox.Show(
-                    failedInstall + missingFiles,
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                return;
-            }
-
-            // Check were not running on a screen that's going to cause some funnies to happen.
-            Screen scr = Screen.PrimaryScreen;
-            if ((scr.Bounds.Width < 1024) || (scr.Bounds.Height < 620))
-            {
-                MessageBox.Show(
-                    "Your system does not meet the minimum requirements for HandBrake. \n" +
-                    "Your screen is running at: " + scr.Bounds.Width + "x" + scr.Bounds.Height +
-                    " \nScreen resolution is too Low. Must be 1024x620 or greater.\n\n",
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-            }
-            else
-            {
-                string logDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\logs");
-                if (!Directory.Exists(logDir))
-                    Directory.CreateDirectory(logDir);
-
-                Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
-                Application.Run(new frmMain(args));
-            }
-        }
-
-        /// <summary>
-        /// Throw up an error message for any unhandled exceptions.
-        /// </summary>
-        /// <param name="sender">The sender</param>
-        /// <param name="e">Unhandled Exception EventArgs </param>
-        private static void CurrentDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
-            try
-            {
-                ExceptionWindow window = new ExceptionWindow();
-
-                if (e.ExceptionObject.GetType() == typeof(GeneralApplicationException))
-                {
-                    GeneralApplicationException applicationException = e.ExceptionObject as GeneralApplicationException;
-                    if (applicationException != null)
-                    {
-                        window.Setup(
-                            applicationException.Error + Environment.NewLine + applicationException.Solution,
-                            e.ExceptionObject + "\n\n ---- \n\n" + applicationException.ActualException);
-                    }
-                }
-                else
-                {
-                    window.Setup("An Unknown Error has occured.", e.ExceptionObject.ToString());
-                }
-                window.ShowDialog();
-            }
-            catch (Exception)
-            {
-                MessageBox.Show(
-                    "An Unknown Error has occured. \n\n Exception:" + e.ExceptionObject,
-                    "Unhandled Exception",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-            }
-        }
-
-        public static int InstanceId;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/Resources Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/ActivityWindow.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/ActivityWindow_small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Add16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/AddToQueue_small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Close.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/ErrorX.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Help16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Help24.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Help32.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Movies_Small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Options24.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Output_Small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Play_small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Pref_Small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Queue_Small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/Restore.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/arrow_down.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/arrow_left.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/arrow_right.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/arrow_up.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/copy.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/disc_small.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/download.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/folder.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/hb16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/hb32.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/info16.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/save.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/Resources/window.png Deleted

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows Deleted

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/AdvancedAudio.Designer.cs Deleted

@@ -1,183 +0,0 @@
-namespace Handbrake.ToolWindows
-{
-    partial class AdvancedAudio
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdvancedAudio));
-            this.label1 = new System.Windows.Forms.Label();
-            this.gainTrackBar = new System.Windows.Forms.TrackBar();
-            this.lbl_GainValue = new System.Windows.Forms.Label();
-            this.btn_close = new System.Windows.Forms.Button();
-            this.label2 = new System.Windows.Forms.Label();
-            this.lbl_drc = new System.Windows.Forms.Label();
-            this.tb_drc = new System.Windows.Forms.TrackBar();
-            this.label3 = new System.Windows.Forms.Label();
-            this.audioTrackName = new System.Windows.Forms.TextBox();
-            ((System.ComponentModel.ISupportInitialize)(this.gainTrackBar)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(97, 13);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Audio Gain (dB):";
-            // 
-            // gainTrackBar
-            // 
-            this.gainTrackBar.Location = new System.Drawing.Point(12, 25);
-            this.gainTrackBar.Maximum = 41;
-            this.gainTrackBar.Name = "gainTrackBar";
-            this.gainTrackBar.Size = new System.Drawing.Size(231, 45);
-            this.gainTrackBar.TabIndex = 2;
-            this.gainTrackBar.Value = 21;
-            this.gainTrackBar.Scroll += new System.EventHandler(this.gainTrackBar_Scroll);
-            // 
-            // lbl_GainValue
-            // 
-            this.lbl_GainValue.AutoSize = true;
-            this.lbl_GainValue.Location = new System.Drawing.Point(249, 31);
-            this.lbl_GainValue.Name = "lbl_GainValue";
-            this.lbl_GainValue.Size = new System.Drawing.Size(28, 13);
-            this.lbl_GainValue.TabIndex = 3;
-            this.lbl_GainValue.Text = "0 dB";
-            // 
-            // btn_close
-            // 
-            this.btn_close.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_close.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_close.Location = new System.Drawing.Point(206, 199);
-            this.btn_close.Name = "btn_close";
-            this.btn_close.Size = new System.Drawing.Size(71, 22);
-            this.btn_close.TabIndex = 5;
-            this.btn_close.TabStop = false;
-            this.btn_close.Text = "Close";
-            this.btn_close.UseVisualStyleBackColor = true;
-            this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(12, 69);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(98, 13);
-            this.label2.TabIndex = 6;
-            this.label2.Text = "Dynamic Range:";
-            // 
-            // lbl_drc
-            // 
-            this.lbl_drc.AutoSize = true;
-            this.lbl_drc.Location = new System.Drawing.Point(249, 95);
-            this.lbl_drc.Name = "lbl_drc";
-            this.lbl_drc.Size = new System.Drawing.Size(13, 13);
-            this.lbl_drc.TabIndex = 8;
-            this.lbl_drc.Text = "0";
-            // 
-            // tb_drc
-            // 
-            this.tb_drc.LargeChange = 0;
-            this.tb_drc.Location = new System.Drawing.Point(15, 89);
-            this.tb_drc.Margin = new System.Windows.Forms.Padding(0);
-            this.tb_drc.Maximum = 31;
-            this.tb_drc.Name = "tb_drc";
-            this.tb_drc.Size = new System.Drawing.Size(228, 45);
-            this.tb_drc.TabIndex = 61;
-            this.tb_drc.Scroll += new System.EventHandler(this.tb_drc_Scroll);
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(12, 134);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(77, 13);
-            this.label3.TabIndex = 62;
-            this.label3.Text = "Track Name:";
-            // 
-            // audioTrackName
-            // 
-            this.audioTrackName.Location = new System.Drawing.Point(15, 150);
-            this.audioTrackName.Name = "audioTrackName";
-            this.audioTrackName.Size = new System.Drawing.Size(228, 21);
-            this.audioTrackName.TabIndex = 63;
-            this.audioTrackName.TextChanged += new System.EventHandler(this.audioTrackName_TextChanged);
-            // 
-            // AdvancedAudio
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(289, 233);
-            this.Controls.Add(this.audioTrackName);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.tb_drc);
-            this.Controls.Add(this.lbl_drc);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.btn_close);
-            this.Controls.Add(this.lbl_GainValue);
-            this.Controls.Add(this.gainTrackBar);
-            this.Controls.Add(this.label1);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "AdvancedAudio";
-            this.Opacity = 0.95D;
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Advanced Audio";
-            this.TopMost = true;
-            ((System.ComponentModel.ISupportInitialize)(this.gainTrackBar)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TrackBar gainTrackBar;
-        private System.Windows.Forms.Label lbl_GainValue;
-        internal System.Windows.Forms.Button btn_close;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label lbl_drc;
-        internal System.Windows.Forms.TrackBar tb_drc;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox audioTrackName;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/AdvancedAudio.cs Deleted

@@ -1,156 +0,0 @@
-/*  Advanced Audio.cs
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    using System;
-    using System.Globalization;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices.Model.Encoding;
-
-    /// <summary>
-    /// Advanced Audio Panel
-    /// </summary>
-    public partial class AdvancedAudio : Form
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AdvancedAudio"/> class. 
-        /// </summary>
-        public AdvancedAudio()
-        {
-            InitializeComponent();
-        }
-
-        private AudioTrack track;
-
-        /// <summary>
-        /// Gets or sets the Audio Track to alter.
-        /// </summary>
-        public AudioTrack Track
-        {
-            get
-            {
-                return this.track;
-            }
-
-            set
-            {
-                this.track = value;
-
-                if (this.track == null)
-                {
-                    return;
-                }
-
-                // Set the Gain Control.
-                if (track.Gain == 0)
-                {
-                    gainTrackBar.Value = 21; // The centre point
-                }
-                else if (track.Gain > 0)
-                {
-                    gainTrackBar.Value = 21 + track.Gain;
-                }
-                else if (track.Gain < 0)
-                {
-                    gainTrackBar.Value = 20 - Math.Abs(track.Gain);
-                }
-
-                lbl_GainValue.Text = string.Format("{0} dB", track.Gain);
-
-                // Set the DRC Control
-                double drcValue = 0;
-                int drcCalculated;
-                if (track.DRC != 0)
-                    drcValue = ((track.DRC * 10) + 1) - 10;
-                int.TryParse(drcValue.ToString(CultureInfo.InvariantCulture), out drcCalculated);
-                tb_drc.Value = drcCalculated;
-                lbl_drc.Text = track.DRC.ToString(CultureInfo.InvariantCulture);
-                tb_drc.Enabled = track.TrackDisplay.Contains("(AC3)");
-
-                // Se the Track Name
-                audioTrackName.Text = this.track.TrackName;
-            }
-        }
-
-        /// <summary>
-        /// Close the window
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Event Args</param>
-        private void btn_close_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.OK;
-            this.Close();
-        }
-
-        /// <summary>
-        /// Set the Gain value for the audio track.
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Event Arg</param>
-        private void gainTrackBar_Scroll(object sender, EventArgs e)
-        {
-            // Figure out the Gain.
-            int gain = 0;
-            if (gainTrackBar.Value == 21)
-            {
-                gain = 0;
-            }
-            else if (gainTrackBar.Value > 21)
-            {
-                gain = gainTrackBar.Value - 21;
-            }
-            else if (gainTrackBar.Value < 21)
-            {
-                gain = (-20 + gainTrackBar.Value);     
-            } 
-
-            lbl_GainValue.Text = string.Format("{0} dB", gain);
-
-            // Figure out the DRC Value
-            double drcValue = 0;
-            int drcCalculated;
-            if (track.DRC != 0)
-                drcValue = ((track.DRC * 10) + 1) - 10;
-            int.TryParse(drcValue.ToString(CultureInfo.InvariantCulture), out drcCalculated);
-            tb_drc.Value = drcCalculated;
-
-            // Set the model.
-            if (this.track == null)
-            {
-                return;
-            }
-            this.Track.Gain = gain;
-        }
-
-        /// <summary>
-        /// The Dynamic Range Controller
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Event Args</param>
-        private void tb_drc_Scroll(object sender, EventArgs e)
-        {
-            double value;
-            if (tb_drc.Value == 0) value = 0;
-            else
-                value = ((tb_drc.Value - 1) / 10.0) + 1;
-
-            lbl_drc.Text = value.ToString(CultureInfo.InvariantCulture);
-            track.DRC = value;
-        }
-
-        /// <summary>
-        /// Set the Audio Track Name Variable
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The event args</param>
-        private void audioTrackName_TextChanged(object sender, EventArgs e)
-        {
-            this.Track.TrackName = audioTrackName.Text;
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/AdvancedAudio.resx Deleted

@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/BatchAdd.Designer.cs Deleted

@@ -1,224 +0,0 @@
-namespace Handbrake.ToolWindows
-{
-    partial class BatchAdd
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BatchAdd));
-            this.btnAdd = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.maxDuration = new System.Windows.Forms.MaskedTextBox();
-            this.minDuration = new System.Windows.Forms.MaskedTextBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label37 = new System.Windows.Forms.Label();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.label8 = new System.Windows.Forms.Label();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.lbl_display = new System.Windows.Forms.Label();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // btnAdd
-            // 
-            this.btnAdd.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnAdd.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnAdd.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnAdd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btnAdd.Location = new System.Drawing.Point(194, 117);
-            this.btnAdd.Name = "btnAdd";
-            this.btnAdd.Size = new System.Drawing.Size(90, 22);
-            this.btnAdd.TabIndex = 4;
-            this.btnAdd.TabStop = false;
-            this.btnAdd.Text = "Add Titles";
-            this.btnAdd.UseVisualStyleBackColor = true;
-            this.btnAdd.Click += new System.EventHandler(this.BtnScanClick);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnCancel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btnCancel.Location = new System.Drawing.Point(128, 117);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(60, 22);
-            this.btnCancel.TabIndex = 5;
-            this.btnCancel.TabStop = false;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick);
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(125, 74);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(25, 13);
-            this.label3.TabIndex = 7;
-            this.label3.Text = "and";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(227, 74);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(57, 13);
-            this.label4.TabIndex = 8;
-            this.label4.Text = "(hh:mm:ss)";
-            // 
-            // maxDuration
-            // 
-            this.maxDuration.Location = new System.Drawing.Point(156, 71);
-            this.maxDuration.Mask = "00:00:00";
-            this.maxDuration.Name = "maxDuration";
-            this.maxDuration.RejectInputOnFirstFailure = true;
-            this.maxDuration.Size = new System.Drawing.Size(65, 20);
-            this.maxDuration.TabIndex = 11;
-            this.maxDuration.Text = "023000";
-            this.maxDuration.TextChanged += new System.EventHandler(this.maxDuration_TextChanged);
-            // 
-            // minDuration
-            // 
-            this.minDuration.Location = new System.Drawing.Point(54, 71);
-            this.minDuration.Mask = "00:00:00";
-            this.minDuration.Name = "minDuration";
-            this.minDuration.Size = new System.Drawing.Size(65, 20);
-            this.minDuration.TabIndex = 10;
-            this.minDuration.Text = "001800";
-            this.minDuration.TextChanged += new System.EventHandler(this.minDuration_TextChanged);
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.label37);
-            this.panel1.Controls.Add(this.panel2);
-            this.panel1.Controls.Add(this.label8);
-            this.panel1.Controls.Add(this.pictureBox2);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(299, 65);
-            this.panel1.TabIndex = 63;
-            // 
-            // label37
-            // 
-            this.label37.AutoSize = true;
-            this.label37.Location = new System.Drawing.Point(51, 27);
-            this.label37.Margin = new System.Windows.Forms.Padding(3);
-            this.label37.Name = "label37";
-            this.label37.Size = new System.Drawing.Size(166, 13);
-            this.label37.TabIndex = 105;
-            this.label37.Text = "Using the current encode settings";
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.SystemColors.Control;
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 55);
-            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);
-            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(299, 10);
-            this.panel2.TabIndex = 59;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label8.Location = new System.Drawing.Point(51, 11);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(124, 13);
-            this.label8.TabIndex = 61;
-            this.label8.Text = "Add all Titles betwen";
-            // 
-            // pictureBox2
-            // 
-            this.pictureBox2.Image = global::Handbrake.Properties.Resources.AddToQueue;
-            this.pictureBox2.Location = new System.Drawing.Point(12, 9);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(32, 32);
-            this.pictureBox2.TabIndex = 60;
-            this.pictureBox2.TabStop = false;
-            // 
-            // lbl_display
-            // 
-            this.lbl_display.AutoSize = true;
-            this.lbl_display.Location = new System.Drawing.Point(51, 96);
-            this.lbl_display.Name = "lbl_display";
-            this.lbl_display.Size = new System.Drawing.Size(112, 13);
-            this.lbl_display.TabIndex = 64;
-            this.lbl_display.Text = "This will add {0} items.";
-            // 
-            // BatchAdd
-            // 
-            this.AcceptButton = this.btnAdd;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(299, 151);
-            this.Controls.Add(this.lbl_display);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.maxDuration);
-            this.Controls.Add(this.minDuration);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnAdd);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "BatchAdd";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "*** THIS IS A CONCEPT WINDOW ***";
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.Button btnAdd;
-        internal System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.MaskedTextBox maxDuration;
-        private System.Windows.Forms.MaskedTextBox minDuration;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label label37;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.Label lbl_display;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/BatchAdd.cs Deleted

@@ -1,149 +0,0 @@
-/*  TitleSpecificScan.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    using System;
-    using System.Linq;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    /// <summary>
-    /// Title Specific Scan
-    /// </summary>
-    public partial class BatchAdd : Form
-    {
-        /// <summary>
-        /// The standard display count texts
-        /// </summary>
-        private const string DisplayAddCount = "This will add {0} items.";
-
-        /// <summary>
-        /// The Source Data (IF Available)
-        /// </summary>
-        private readonly Source sourceData;
-
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-            
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BatchAdd"/> class.
-        /// </summary>
-        /// <param name="sourceData">
-        /// The source Data.
-        /// </param>
-        public BatchAdd(Source sourceData)
-        {
-            this.sourceData = sourceData;
-            InitializeComponent();
-
-            // Get the Default values for batch encoding.
-            this.minDuration.Text = this.UserSettingService.GetUserSetting<string>(UserSettingConstants.BatchMinDuration);
-            this.maxDuration.Text = this.UserSettingService.GetUserSetting<string>(UserSettingConstants.BatchMaxDuration);
-            this.UpdateEncodeDisplay();
-        }
-
-        /// <summary>
-        /// Button Cancel Click Event Handler
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void BtnCancelClick(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-        }
-
-        /// <summary>
-        /// Button Scan Click Event Handler
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void BtnScanClick(object sender, EventArgs e)
-        {
-            this.UserSettingService.SetUserSetting(UserSettingConstants.BatchMinDuration, this.minDuration.Text);
-            this.UserSettingService.SetUserSetting(UserSettingConstants.BatchMaxDuration, this.maxDuration.Text);
-            this.DialogResult = DialogResult.OK;
-        }
-
-        /// <summary>
-        /// Gets the minimum duration that the user entered.
-        /// </summary>
-        public TimeSpan Min
-        {
-            get
-            {
-                TimeSpan title;
-                TimeSpan.TryParse(this.minDuration.Text, out title);
-
-                return title;
-            }
-        }
-
-        /// <summary>
-        /// Gets the maximum duration that the user entered.
-        /// </summary>
-        public TimeSpan Max
-        {
-            get
-            {
-                TimeSpan title;
-                TimeSpan.TryParse(this.maxDuration.Text, out title);
-
-                return title;
-            }
-        }
-
-        /// <summary>
-        /// Update the Display which shows the number of titles that will be added.
-        /// </summary>
-        private void UpdateEncodeDisplay()
-        {
-            int count = this.sourceData.Titles.Count(title => title.Duration.TotalSeconds > this.Min.TotalSeconds && title.Duration.TotalSeconds < this.Max.TotalSeconds);
-
-            if (count > 0)
-            {
-                lbl_display.Text = string.Format(DisplayAddCount, count);
-                lbl_display.Visible = true;
-            }
-            else
-            {
-                lbl_display.Visible = false;
-            }
-        }
-
-        /// <summary>
-        /// Min Duration has changed.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void minDuration_TextChanged(object sender, EventArgs e)
-        {
-            this.UpdateEncodeDisplay();
-        }
-
-        /// <summary>
-        /// Max duration was changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void maxDuration_TextChanged(object sender, EventArgs e)
-        {
-            this.UpdateEncodeDisplay();
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/BatchAdd.resx Deleted

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/DownloadUpdate.Designer.cs Deleted

@@ -1,111 +0,0 @@
-/*  frmDownload.Designer.cs 
- 	
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    partial class DownloadUpdate
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DownloadUpdate));
-            this.lblProgress = new System.Windows.Forms.Label();
-            this.progress_download = new System.Windows.Forms.ProgressBar();
-            this.btn_cancel = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.PictureBox1 = new System.Windows.Forms.PictureBox();
-            this.tableLayoutPanel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // lblProgress
-            // 
-            resources.ApplyResources(this.lblProgress, "lblProgress");
-            this.lblProgress.Name = "lblProgress";
-            // 
-            // progress_download
-            // 
-            resources.ApplyResources(this.progress_download, "progress_download");
-            this.progress_download.Name = "progress_download";
-            this.progress_download.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
-            // 
-            // btn_cancel
-            // 
-            resources.ApplyResources(this.btn_cancel, "btn_cancel");
-            this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_cancel.Name = "btn_cancel";
-            this.btn_cancel.TabStop = false;
-            this.btn_cancel.UseVisualStyleBackColor = true;
-            this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);
-            // 
-            // tableLayoutPanel1
-            // 
-            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
-            this.tableLayoutPanel1.Controls.Add(this.PictureBox1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.progress_download, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.lblProgress, 1, 1);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            // 
-            // PictureBox1
-            // 
-            this.PictureBox1.Image = global::Handbrake.Properties.Resources.Download;
-            resources.ApplyResources(this.PictureBox1, "PictureBox1");
-            this.PictureBox1.Name = "PictureBox1";
-            this.tableLayoutPanel1.SetRowSpan(this.PictureBox1, 3);
-            this.PictureBox1.TabStop = false;
-            // 
-            // DownloadUpdate
-            // 
-            resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "DownloadUpdate";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label lblProgress;
-        private System.Windows.Forms.ProgressBar progress_download;
-        internal System.Windows.Forms.Button btn_cancel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        internal System.Windows.Forms.PictureBox PictureBox1;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/DownloadUpdate.cs Deleted

@@ -1,122 +0,0 @@
-/*  DownloadUpdate.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Net;
-    using System.Threading;
-    using System.Windows.Forms;
-
-    /// <summary>
-    /// The Download Window
-    /// </summary>
-    public partial class DownloadUpdate : Form
-    {
-        private readonly Thread downloadThread;
-        private Stream responceStream;
-        private Stream localStream;
-        private HttpWebRequest webRequest;
-        private HttpWebResponse webResponse;
-        private static int progress;
-        private bool killThread;
-
-        private delegate void UpdateProgessCallback(long bytesRead, long totalBytes);
-
-        private delegate void DownloadCompleteCallback();
-
-        private delegate void DownloadFailedCallback();
-
-        public DownloadUpdate(string filename)
-        {
-            InitializeComponent();
-
-            this.downloadThread = new Thread(Download);
-            this.downloadThread.Start(filename);
-        }
-
-        private void Download(object file)
-        {
-            string tempPath = Path.Combine(Path.GetTempPath(), "handbrake-setup.exe");
-            string hbUpdate = (string)file;
-            WebClient wcDownload = new WebClient();
-
-            try
-            {
-                if (File.Exists(tempPath))
-                    File.Delete(tempPath);
-
-                this.webRequest = (HttpWebRequest)WebRequest.Create(hbUpdate);
-                this.webRequest.Credentials = CredentialCache.DefaultCredentials;
-                this.webResponse = (HttpWebResponse)this.webRequest.GetResponse();
-                long fileSize = this.webResponse.ContentLength;
-
-                this.responceStream = wcDownload.OpenRead(hbUpdate);
-                this.localStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);
-
-                int bytesSize;
-                byte[] downBuffer = new byte[2048];
-
-                long flength = 0;
-                while ((bytesSize = this.responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)
-                {
-                    if (this.killThread)
-                        return;
-                    this.localStream.Write(downBuffer, 0, bytesSize);
-                    flength = this.localStream.Length;
-                    Invoke(new UpdateProgessCallback(this.UpdateProgress), new object[] {this.localStream.Length, fileSize});
-                }
-
-                this.responceStream.Close();
-                this.localStream.Close();
-
-                if (flength != fileSize)
-                    Invoke(new DownloadFailedCallback(this.DownloadFailed));
-                else
-                    Invoke(new DownloadCompleteCallback(this.DownloadComplete));
-            }
-            catch
-            {
-                lblProgress.Text = "An Error Occured. Please try again later.";
-            }
-        }
-
-        private void UpdateProgress(long bytesRead, long totalBytes)
-        {
-            long p = (bytesRead * 100) / totalBytes;
-            int.TryParse(p.ToString(), out progress);
-            progress_download.Value = progress;
-            lblProgress.Text = (bytesRead / 1024) + "k of " + (totalBytes / 1024) + "k ";
-        }
-
-        private void DownloadComplete()
-        {
-            lblProgress.Text = "Download Complete";
-            btn_cancel.Text = "Close";
-
-            Process.Start(Path.Combine(Path.GetTempPath(), "handbrake-setup.exe"));
-            this.Close();
-            Application.Exit();
-        }
-
-        private void DownloadFailed()
-        {
-            lblProgress.Text = "Download Failed";
-            btn_cancel.Text = "Close";
-        }
-
-        private void BtnCancelClick(object sender, EventArgs e)
-        {
-            this.killThread = true;
-            lblProgress.Text = "Cancelling ...";
-            if (this.webResponse != null) this.webResponse.Close();
-            if (this.responceStream != null) this.responceStream.Close();
-            if (this.localStream != null) this.localStream.Close();
-            this.Close();
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/DownloadUpdate.resx Deleted

@@ -1,670 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="lblProgress.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="lblProgress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>73, 29</value>
-  </data>
-  <data name="lblProgress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>98, 13</value>
-  </data>
-  <data name="lblProgress.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="lblProgress.Text" xml:space="preserve">
-    <value>Awaiting Download</value>
-  </data>
-  <data name="&gt;&gt;lblProgress.Name" xml:space="preserve">
-    <value>lblProgress</value>
-  </data>
-  <data name="&gt;&gt;lblProgress.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lblProgress.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;lblProgress.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="progress_download.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Left, Right</value>
-  </data>
-  <data name="progress_download.Location" type="System.Drawing.Point, System.Drawing">
-    <value>73, 3</value>
-  </data>
-  <data name="progress_download.Size" type="System.Drawing.Size, System.Drawing">
-    <value>277, 23</value>
-  </data>
-  <data name="progress_download.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
-  </data>
-  <data name="&gt;&gt;progress_download.Name" xml:space="preserve">
-    <value>progress_download</value>
-  </data>
-  <data name="&gt;&gt;progress_download.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;progress_download.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;progress_download.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="btn_cancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="btn_cancel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt, style=Bold</value>
-  </data>
-  <data name="btn_cancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>279, 46</value>
-  </data>
-  <data name="btn_cancel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 22</value>
-  </data>
-  <data name="btn_cancel.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="btn_cancel.Text" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <data name="&gt;&gt;btn_cancel.Name" xml:space="preserve">
-    <value>btn_cancel</value>
-  </data>
-  <data name="&gt;&gt;btn_cancel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btn_cancel.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;btn_cancel.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="PictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 64</value>
-  </data>
-  <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Name" xml:space="preserve">
-    <value>PictureBox1</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 9</value>
-  </data>
-  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>353, 73</value>
-  </data>
-  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>27</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="PictureBox1" Row="0" RowSpan="3" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="btn_cancel" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="progress_download" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lblProgress" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="$this.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>371, 91</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-  <data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>9, 9, 9, 9</value>
-  </data>
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>CenterScreen</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Downloading Update</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>DownloadUpdate</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/ExceptionWindow.cs Deleted

@@ -1,81 +0,0 @@
-/*  ExceptionWindow.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    using System;
-    using System.Windows.Forms;
-
-    /// <summary>
-    /// A window to display Exceptions in a form which can be easily copied and reported by users.
-    /// </summary>
-    public partial class ExceptionWindow : Form
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExceptionWindow"/> class.
-        /// </summary>
-        public ExceptionWindow()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>
-        /// Setup the window with the error message.
-        /// </summary>
-        /// <param name="shortError">
-        /// The short error.
-        /// </param>
-        /// <param name="longError">
-        /// The long error.
-        /// </param>
-        public void Setup(string shortError, string longError)
-        {
-            lbl_shortError.Text = shortError;
-            rtf_exceptionFull.Text = shortError + Environment.NewLine + longError;
-        }
-
-        /// <summary>
-        /// Copy the Exception Information to the Clipboard.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnCopyClick(object sender, EventArgs e)
-        {
-            Clipboard.SetDataObject(rtf_exceptionFull.SelectedText != string.Empty ? rtf_exceptionFull.SelectedText : rtf_exceptionFull.Text, true);
-        }
-
-        /// <summary>
-        /// Copy from the right click menu
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuCopyLogClick(object sender, EventArgs e)
-        {
-            Clipboard.SetDataObject(rtf_exceptionFull.SelectedText != string.Empty ? rtf_exceptionFull.SelectedText : rtf_exceptionFull.Text, true);
-        } 
-
-        /// <summary>
-        /// Close the window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnCloseClick(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/ExceptionWindow.designer.cs Deleted

@@ -1,187 +0,0 @@
-namespace Handbrake.ToolWindows
-{
-    partial class ExceptionWindow
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ExceptionWindow));
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.PictureBox1 = new System.Windows.Forms.PictureBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbl_shortError = new System.Windows.Forms.Label();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.panel5 = new System.Windows.Forms.Panel();
-            this.panel4 = new System.Windows.Forms.Panel();
-            this.panel6 = new System.Windows.Forms.Panel();
-            this.btn_close = new System.Windows.Forms.Button();
-            this.btn_copy = new System.Windows.Forms.Button();
-            this.rtf_exceptionFull = new System.Windows.Forms.RichTextBox();
-            this.mnu_copy_log = new System.Windows.Forms.ToolStripMenuItem();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
-            this.panel4.SuspendLayout();
-            this.panel6.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.panel2);
-            this.panel1.Controls.Add(this.PictureBox1);
-            this.panel1.Controls.Add(this.label3);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.lbl_shortError);
-            resources.ApplyResources(this.panel1, "panel1");
-            this.panel1.Name = "panel1";
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.SystemColors.Control;
-            resources.ApplyResources(this.panel2, "panel2");
-            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);
-            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);
-            this.panel2.Name = "panel2";
-            // 
-            // PictureBox1
-            // 
-            this.PictureBox1.Image = Properties.Resources.ErrorX;
-            resources.ApplyResources(this.PictureBox1, "PictureBox1");
-            this.PictureBox1.Name = "PictureBox1";
-            this.PictureBox1.TabStop = false;
-            // 
-            // label3
-            // 
-            resources.ApplyResources(this.label3, "label3");
-            this.label3.Name = "label3";
-            // 
-            // label1
-            // 
-            resources.ApplyResources(this.label1, "label1");
-            this.label1.Name = "label1";
-            // 
-            // lbl_shortError
-            // 
-            resources.ApplyResources(this.lbl_shortError, "lbl_shortError");
-            this.lbl_shortError.Name = "lbl_shortError";
-            // 
-            // panel3
-            // 
-            resources.ApplyResources(this.panel3, "panel3");
-            this.panel3.Name = "panel3";
-            // 
-            // panel5
-            // 
-            resources.ApplyResources(this.panel5, "panel5");
-            this.panel5.Name = "panel5";
-            // 
-            // panel4
-            // 
-            this.panel4.Controls.Add(this.panel6);
-            resources.ApplyResources(this.panel4, "panel4");
-            this.panel4.Name = "panel4";
-            // 
-            // panel6
-            // 
-            this.panel6.Controls.Add(this.btn_close);
-            this.panel6.Controls.Add(this.btn_copy);
-            resources.ApplyResources(this.panel6, "panel6");
-            this.panel6.Name = "panel6";
-            // 
-            // btn_close
-            // 
-            this.btn_close.BackColor = System.Drawing.Color.Transparent;
-            this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            resources.ApplyResources(this.btn_close, "btn_close");
-            this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_close.Name = "btn_close";
-            this.btn_close.UseVisualStyleBackColor = false;
-            this.btn_close.Click += new System.EventHandler(this.BtnCloseClick);
-            // 
-            // btn_copy
-            // 
-            this.btn_copy.BackColor = System.Drawing.Color.Transparent;
-            this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            resources.ApplyResources(this.btn_copy, "btn_copy");
-            this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_copy.Image = Properties.Resources.copy;
-            this.btn_copy.Name = "btn_copy";
-            this.btn_copy.UseVisualStyleBackColor = false;
-            this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);
-            // 
-            // rtf_exceptionFull
-            // 
-            resources.ApplyResources(this.rtf_exceptionFull, "rtf_exceptionFull");
-            this.rtf_exceptionFull.Name = "rtf_exceptionFull";
-            // 
-            // mnu_copy_log
-            // 
-            this.mnu_copy_log.Image = Properties.Resources.copy;
-            this.mnu_copy_log.Name = "mnu_copy_log";
-            resources.ApplyResources(this.mnu_copy_log, "mnu_copy_log");
-            this.mnu_copy_log.Click += new System.EventHandler(this.MnuCopyLogClick);
-            // 
-            // ExceptionWindow
-            // 
-            resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.rtf_exceptionFull);
-            this.Controls.Add(this.panel3);
-            this.Controls.Add(this.panel5);
-            this.Controls.Add(this.panel4);
-            this.Controls.Add(this.panel1);
-            this.Name = "ExceptionWindow";
-            this.TopMost = true;
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
-            this.panel4.ResumeLayout(false);
-            this.panel6.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel panel2;
-        internal System.Windows.Forms.PictureBox PictureBox1;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lbl_shortError;
-        private System.Windows.Forms.Panel panel3;
-        private System.Windows.Forms.Panel panel5;
-        private System.Windows.Forms.Panel panel4;
-        private System.Windows.Forms.RichTextBox rtf_exceptionFull;
-        internal System.Windows.Forms.Button btn_close;
-        private System.Windows.Forms.Panel panel6;
-        internal System.Windows.Forms.Button btn_copy;
-        private System.Windows.Forms.ContextMenuStrip rightClickMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_copy_log;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/ExceptionWindow.resx Deleted

@@ -1,868 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 87</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>669, 10</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>59</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="PictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 12</value>
-  </data>
-  <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 64</value>
-  </data>
-  <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Name" xml:space="preserve">
-    <value>PictureBox1</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label3.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt, style=Bold</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 63</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 13</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>57</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Error Details:</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 12</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 16</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>An Error has occured.</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="lbl_shortError.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 33</value>
-  </data>
-  <data name="lbl_shortError.Size" type="System.Drawing.Size, System.Drawing">
-    <value>573, 30</value>
-  </data>
-  <data name="lbl_shortError.TabIndex" type="System.Int32, mscorlib">
-    <value>58</value>
-  </data>
-  <data name="lbl_shortError.Text" xml:space="preserve">
-    <value>An Unknown Error has occured.</value>
-  </data>
-  <data name="&gt;&gt;lbl_shortError.Name" xml:space="preserve">
-    <value>lbl_shortError</value>
-  </data>
-  <data name="&gt;&gt;lbl_shortError.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lbl_shortError.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;lbl_shortError.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>669, 97</value>
-  </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>61</value>
-  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Left</value>
-  </data>
-  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 97</value>
-  </data>
-  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 216</value>
-  </data>
-  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
-    <value>68</value>
-  </data>
-  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="panel5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>640, 97</value>
-  </data>
-  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 216</value>
-  </data>
-  <data name="panel5.TabIndex" type="System.Int32, mscorlib">
-    <value>69</value>
-  </data>
-  <data name="&gt;&gt;panel5.Name" xml:space="preserve">
-    <value>panel5</value>
-  </data>
-  <data name="&gt;&gt;panel5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel5.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel5.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="btn_close.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt, style=Bold</value>
-  </data>
-  <data name="btn_close.Location" type="System.Drawing.Point, System.Drawing">
-    <value>105, 8</value>
-  </data>
-  <data name="btn_close.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 25</value>
-  </data>
-  <data name="btn_close.TabIndex" type="System.Int32, mscorlib">
-    <value>56</value>
-  </data>
-  <data name="btn_close.Text" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="&gt;&gt;btn_close.Name" xml:space="preserve">
-    <value>btn_close</value>
-  </data>
-  <data name="&gt;&gt;btn_close.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btn_close.Parent" xml:space="preserve">
-    <value>panel6</value>
-  </data>
-  <data name="&gt;&gt;btn_close.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btn_copy.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt, style=Bold</value>
-  </data>
-  <data name="btn_copy.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="btn_copy.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 8</value>
-  </data>
-  <data name="btn_copy.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 25</value>
-  </data>
-  <data name="btn_copy.TabIndex" type="System.Int32, mscorlib">
-    <value>57</value>
-  </data>
-  <data name="btn_copy.Text" xml:space="preserve">
-    <value>Copy</value>
-  </data>
-  <data name="&gt;&gt;btn_copy.Name" xml:space="preserve">
-    <value>btn_copy</value>
-  </data>
-  <data name="&gt;&gt;btn_copy.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btn_copy.Parent" xml:space="preserve">
-    <value>panel6</value>
-  </data>
-  <data name="&gt;&gt;btn_copy.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel6.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="panel6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>491, 0</value>
-  </data>
-  <data name="panel6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>178, 42</value>
-  </data>
-  <data name="panel6.TabIndex" type="System.Int32, mscorlib">
-    <value>58</value>
-  </data>
-  <data name="&gt;&gt;panel6.Name" xml:space="preserve">
-    <value>panel6</value>
-  </data>
-  <data name="&gt;&gt;panel6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel6.Parent" xml:space="preserve">
-    <value>panel4</value>
-  </data>
-  <data name="&gt;&gt;panel6.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 313</value>
-  </data>
-  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>669, 42</value>
-  </data>
-  <data name="panel4.TabIndex" type="System.Int32, mscorlib">
-    <value>69</value>
-  </data>
-  <data name="&gt;&gt;panel4.Name" xml:space="preserve">
-    <value>panel4</value>
-  </data>
-  <data name="&gt;&gt;panel4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel4.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel4.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="rtf_exceptionFull.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="rtf_exceptionFull.Location" type="System.Drawing.Point, System.Drawing">
-    <value>76, 97</value>
-  </data>
-  <data name="rtf_exceptionFull.Size" type="System.Drawing.Size, System.Drawing">
-    <value>564, 216</value>
-  </data>
-  <data name="rtf_exceptionFull.TabIndex" type="System.Int32, mscorlib">
-    <value>70</value>
-  </data>
-  <data name="rtf_exceptionFull.Text" xml:space="preserve">
-    <value />
-  </data>
-  <data name="&gt;&gt;rtf_exceptionFull.Name" xml:space="preserve">
-    <value>rtf_exceptionFull</value>
-  </data>
-  <data name="&gt;&gt;rtf_exceptionFull.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rtf_exceptionFull.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;rtf_exceptionFull.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="mnu_copy_log.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
-  </data>
-  <data name="mnu_copy_log.Text" xml:space="preserve">
-    <value>Copy</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>669, 355</value>
-  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="&gt;&gt;mnu_copy_log.Name" xml:space="preserve">
-    <value>mnu_copy_log</value>
-  </data>
-  <data name="&gt;&gt;mnu_copy_log.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>ExceptionWindow</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/TitleSpecificScan.Designer.cs Deleted

@@ -1,121 +0,0 @@
-namespace Handbrake.ToolWindows
-{
-    partial class TitleSpecificScan
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TitleSpecificScan));
-            this.label1 = new System.Windows.Forms.Label();
-            this.titleNumber = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btnScan = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 13);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Scan title number:";
-            // 
-            // titleNumber
-            // 
-            this.titleNumber.Location = new System.Drawing.Point(110, 6);
-            this.titleNumber.Name = "titleNumber";
-            this.titleNumber.Size = new System.Drawing.Size(51, 20);
-            this.titleNumber.TabIndex = 2;
-            this.titleNumber.Text = "0";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 29);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(309, 13);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Note: (entering 0 or leaving blank will result in a full source scan)";
-            // 
-            // btnScan
-            // 
-            this.btnScan.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnScan.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnScan.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btnScan.Location = new System.Drawing.Point(231, 56);
-            this.btnScan.Name = "btnScan";
-            this.btnScan.Size = new System.Drawing.Size(90, 22);
-            this.btnScan.TabIndex = 4;
-            this.btnScan.TabStop = false;
-            this.btnScan.Text = "Open Title";
-            this.btnScan.UseVisualStyleBackColor = true;
-            this.btnScan.Click += new System.EventHandler(this.BtnScanClick);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btnCancel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btnCancel.Location = new System.Drawing.Point(15, 56);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(60, 22);
-            this.btnCancel.TabIndex = 5;
-            this.btnCancel.TabStop = false;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick);
-            // 
-            // TitleSpecificScan
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(334, 89);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnScan);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.titleNumber);
-            this.Controls.Add(this.label1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "TitleSpecificScan";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Title Scan";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox titleNumber;
-        private System.Windows.Forms.Label label2;
-        internal System.Windows.Forms.Button btnScan;
-        internal System.Windows.Forms.Button btnCancel;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/TitleSpecificScan.cs Deleted

@@ -1,55 +0,0 @@
-/*  TitleSpecificScan.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    using System;
-    using System.Windows.Forms;
-
-    /// <summary>
-    /// Title Specific Scan
-    /// </summary>
-    public partial class TitleSpecificScan : Form
-    {
-        public TitleSpecificScan()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>
-        /// Button Cancel Click Event Handler
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void BtnCancelClick(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-        }
-
-        /// <summary>
-        /// Button Scan Click Event Handler
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void BtnScanClick(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.OK;
-        }
-
-        /// <summary>
-        /// Gets the title that the user entered.
-        /// </summary>
-        public int Title
-        {
-            get
-            {
-                int title;
-                int.TryParse(this.titleNumber.Text, out title);
-
-                return title;
-            }
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/TitleSpecificScan.resx Deleted

@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/UpdateInfo.Designer.cs Deleted

@@ -1,241 +0,0 @@
-/*  frmUpdater.Designer.cs 
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    partial class UpdateInfo
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateInfo));
-            this.label1 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.btn_skip = new System.Windows.Forms.Button();
-            this.btn_installUpdate = new System.Windows.Forms.Button();
-            this.btn_remindLater = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.lbl_update_text = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.PictureBox1 = new System.Windows.Forms.PictureBox();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.panel5 = new System.Windows.Forms.Panel();
-            this.wBrowser = new System.Windows.Forms.WebBrowser();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.button_container = new System.Windows.Forms.SplitContainer();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.button_container)).BeginInit();
-            this.button_container.Panel1.SuspendLayout();
-            this.button_container.Panel2.SuspendLayout();
-            this.button_container.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            resources.ApplyResources(this.label1, "label1");
-            this.label1.Name = "label1";
-            // 
-            // label6
-            // 
-            resources.ApplyResources(this.label6, "label6");
-            this.label6.Name = "label6";
-            // 
-            // btn_skip
-            // 
-            resources.ApplyResources(this.btn_skip, "btn_skip");
-            this.btn_skip.BackColor = System.Drawing.Color.Transparent;
-            this.btn_skip.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_skip.Name = "btn_skip";
-            this.btn_skip.UseVisualStyleBackColor = false;
-            this.btn_skip.Click += new System.EventHandler(this.BtnSkipClick);
-            // 
-            // btn_installUpdate
-            // 
-            resources.ApplyResources(this.btn_installUpdate, "btn_installUpdate");
-            this.btn_installUpdate.BackColor = System.Drawing.Color.Transparent;
-            this.btn_installUpdate.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_installUpdate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_installUpdate.Name = "btn_installUpdate";
-            this.btn_installUpdate.UseVisualStyleBackColor = false;
-            this.btn_installUpdate.Click += new System.EventHandler(this.BtnInstallUpdateClick);
-            // 
-            // btn_remindLater
-            // 
-            resources.ApplyResources(this.btn_remindLater, "btn_remindLater");
-            this.btn_remindLater.BackColor = System.Drawing.Color.Transparent;
-            this.btn_remindLater.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_remindLater.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_remindLater.Name = "btn_remindLater";
-            this.btn_remindLater.UseVisualStyleBackColor = false;
-            this.btn_remindLater.Click += new System.EventHandler(this.BtnRemindLaterClick);
-            // 
-            // label3
-            // 
-            resources.ApplyResources(this.label3, "label3");
-            this.label3.Name = "label3";
-            // 
-            // lbl_update_text
-            // 
-            resources.ApplyResources(this.lbl_update_text, "lbl_update_text");
-            this.lbl_update_text.Name = "lbl_update_text";
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.panel2);
-            this.panel1.Controls.Add(this.PictureBox1);
-            this.panel1.Controls.Add(this.label3);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.lbl_update_text);
-            this.panel1.Controls.Add(this.label6);
-            resources.ApplyResources(this.panel1, "panel1");
-            this.panel1.Name = "panel1";
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.SystemColors.Control;
-            resources.ApplyResources(this.panel2, "panel2");
-            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);
-            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);
-            this.panel2.Name = "panel2";
-            // 
-            // PictureBox1
-            // 
-            this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo64;
-            resources.ApplyResources(this.PictureBox1, "PictureBox1");
-            this.PictureBox1.Name = "PictureBox1";
-            this.PictureBox1.TabStop = false;
-            // 
-            // statusStrip1
-            // 
-            resources.ApplyResources(this.statusStrip1, "statusStrip1");
-            this.statusStrip1.Name = "statusStrip1";
-            // 
-            // panel3
-            // 
-            resources.ApplyResources(this.panel3, "panel3");
-            this.panel3.Name = "panel3";
-            // 
-            // panel5
-            // 
-            resources.ApplyResources(this.panel5, "panel5");
-            this.panel5.Name = "panel5";
-            // 
-            // wBrowser
-            // 
-            resources.ApplyResources(this.wBrowser, "wBrowser");
-            this.wBrowser.MinimumSize = new System.Drawing.Size(20, 20);
-            this.wBrowser.Name = "wBrowser";
-            // 
-            // splitContainer1
-            // 
-            resources.ApplyResources(this.splitContainer1, "splitContainer1");
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer1.Name = "splitContainer1";
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.wBrowser);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.button_container);
-            // 
-            // button_container
-            // 
-            resources.ApplyResources(this.button_container, "button_container");
-            this.button_container.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.button_container.Name = "button_container";
-            // 
-            // button_container.Panel1
-            // 
-            this.button_container.Panel1.Controls.Add(this.btn_skip);
-            // 
-            // button_container.Panel2
-            // 
-            this.button_container.Panel2.Controls.Add(this.btn_remindLater);
-            this.button_container.Panel2.Controls.Add(this.btn_installUpdate);
-            // 
-            // UpdateInfo
-            // 
-            resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.splitContainer1);
-            this.Controls.Add(this.panel5);
-            this.Controls.Add(this.panel3);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.panel1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
-            this.MaximizeBox = false;
-            this.Name = "UpdateInfo";
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.button_container.Panel1.ResumeLayout(false);
-            this.button_container.Panel1.PerformLayout();
-            this.button_container.Panel2.ResumeLayout(false);
-            this.button_container.Panel2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.button_container)).EndInit();
-            this.button_container.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.PictureBox PictureBox1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label6;
-        internal System.Windows.Forms.Button btn_skip;
-        internal System.Windows.Forms.Button btn_installUpdate;
-        internal System.Windows.Forms.Button btn_remindLater;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label lbl_update_text;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.Panel panel3;
-        private System.Windows.Forms.Panel panel5;
-        private System.Windows.Forms.WebBrowser wBrowser;
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.SplitContainer button_container;
-        private System.Windows.Forms.Panel panel2;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/UpdateInfo.cs Deleted

@@ -1,125 +0,0 @@
-/*  UpdateInfo.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake.ToolWindows
-{
-    using System;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices.Model.General;
-
-    /// <summary>
-    /// A window to display update information.
-    /// </summary>
-    public partial class UpdateInfo : Form
-    {
-        /// <summary>
-        /// An instance of the Appcast Reader
-        /// </summary>
-        private readonly UpdateCheckInformation appcast;
-
-        /// <summary>
-        /// The Current Version
-        /// </summary>
-        private readonly string currentVersion;
-
-        /// <summary>
-        /// The Current Build
-        /// </summary>
-        private readonly int currentBuild;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateInfo"/> class.
-        /// </summary>
-        /// <param name="reader">
-        /// The appcast reader.
-        /// </param>
-        /// <param name="currentVersion">
-        /// The current Version.
-        /// </param>
-        /// <param name="currentBuild">
-        /// The current Build.
-        /// </param>
-        public UpdateInfo(UpdateCheckInformation reader, string currentVersion, int currentBuild)
-        {
-            InitializeComponent();
-
-            appcast = reader;
-            this.currentVersion = currentVersion;
-            this.currentBuild = currentBuild;
-            GetRss();
-            SetVersions();
-        }
-        
-        /// <summary>
-        /// Gets the SkipVersion number
-        /// </summary>
-        public int SkipVersion { get; private set; }
-
-
-        /// <summary>
-        /// Get the RSS feed
-        /// </summary>
-        private void GetRss()
-        {
-            wBrowser.Url = appcast.DescriptionUrl;
-        }
-
-        /// <summary>
-        /// Set the versions
-        /// </summary>
-        private void SetVersions()
-        {
-            string old = string.Format("(You have: {0} / {1})", this.currentVersion, this.currentBuild);
-            string newBuild = appcast.Version.Trim() + " (" + appcast.Build + ")";
-            lbl_update_text.Text = string.Format("HandBrake {0} is now available. {1}", newBuild, old);
-        }
-
-        /// <summary>
-        /// Handle the Install Update button click event.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void BtnInstallUpdateClick(object sender, EventArgs e)
-        {
-            DownloadUpdate download = new DownloadUpdate(appcast.DownloadFile);
-            download.ShowDialog();
-            this.DialogResult = DialogResult.OK;
-        }
-
-        /// <summary>
-        /// Handle the Remind Later button click event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void BtnRemindLaterClick(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-        }
-
-        /// <summary>
-        /// Handle the Skip update button click event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnSkipClick(object sender, EventArgs e)
-        {
-            this.SkipVersion = int.Parse(appcast.Build);
-            this.DialogResult = DialogResult.OK;
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/UpdateInfo.resx Deleted

@@ -1,1021 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="label1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 12</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>273, 16</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>A New Version of Handbrake is available!</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 46</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>175, 13</value>
-  </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>30</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>Would you like to download it now?</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="btn_skip.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btn_skip.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="btn_skip.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt, style=Bold</value>
-  </data>
-  <data name="btn_skip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 3</value>
-  </data>
-  <data name="btn_skip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>129, 23</value>
-  </data>
-  <data name="btn_skip.TabIndex" type="System.Int32, mscorlib">
-    <value>54</value>
-  </data>
-  <data name="btn_skip.Text" xml:space="preserve">
-    <value>Skip This Version</value>
-  </data>
-  <data name="&gt;&gt;btn_skip.Name" xml:space="preserve">
-    <value>btn_skip</value>
-  </data>
-  <data name="&gt;&gt;btn_skip.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btn_skip.Parent" xml:space="preserve">
-    <value>button_container.Panel1</value>
-  </data>
-  <data name="&gt;&gt;btn_skip.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btn_installUpdate.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="btn_installUpdate.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="btn_installUpdate.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt, style=Bold</value>
-  </data>
-  <data name="btn_installUpdate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>153, 3</value>
-  </data>
-  <data name="btn_installUpdate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>109, 23</value>
-  </data>
-  <data name="btn_installUpdate.TabIndex" type="System.Int32, mscorlib">
-    <value>55</value>
-  </data>
-  <data name="btn_installUpdate.Text" xml:space="preserve">
-    <value>Install Update</value>
-  </data>
-  <data name="&gt;&gt;btn_installUpdate.Name" xml:space="preserve">
-    <value>btn_installUpdate</value>
-  </data>
-  <data name="&gt;&gt;btn_installUpdate.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btn_installUpdate.Parent" xml:space="preserve">
-    <value>button_container.Panel2</value>
-  </data>
-  <data name="&gt;&gt;btn_installUpdate.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="btn_remindLater.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="btn_remindLater.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="btn_remindLater.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt, style=Bold</value>
-  </data>
-  <data name="btn_remindLater.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 3</value>
-  </data>
-  <data name="btn_remindLater.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 23</value>
-  </data>
-  <data name="btn_remindLater.TabIndex" type="System.Int32, mscorlib">
-    <value>56</value>
-  </data>
-  <data name="btn_remindLater.Text" xml:space="preserve">
-    <value>Remind me Later</value>
-  </data>
-  <data name="&gt;&gt;btn_remindLater.Name" xml:space="preserve">
-    <value>btn_remindLater</value>
-  </data>
-  <data name="&gt;&gt;btn_remindLater.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btn_remindLater.Parent" xml:space="preserve">
-    <value>button_container.Panel2</value>
-  </data>
-  <data name="&gt;&gt;btn_remindLater.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label3.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt, style=Bold</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 63</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>90, 13</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>57</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Release Notes:</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="lbl_update_text.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="lbl_update_text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 33</value>
-  </data>
-  <data name="lbl_update_text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>409, 13</value>
-  </data>
-  <data name="lbl_update_text.TabIndex" type="System.Int32, mscorlib">
-    <value>58</value>
-  </data>
-  <data name="lbl_update_text.Text" xml:space="preserve">
-    <value>HandBrake {0.0.0} (000000000) is now available. (You have: {0.0.0} (000000000))</value>
-  </data>
-  <data name="&gt;&gt;lbl_update_text.Name" xml:space="preserve">
-    <value>lbl_update_text</value>
-  </data>
-  <data name="&gt;&gt;lbl_update_text.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lbl_update_text.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;lbl_update_text.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 87</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>710, 10</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>59</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="PictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 12</value>
-  </data>
-  <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 64</value>
-  </data>
-  <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Name" xml:space="preserve">
-    <value>PictureBox1</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>710, 97</value>
-  </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>60</value>
-  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 346</value>
-  </data>
-  <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>710, 22</value>
-  </data>
-  <data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>65</value>
-  </data>
-  <data name="statusStrip1.Text" xml:space="preserve">
-    <value>statusStrip1</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.Name" xml:space="preserve">
-    <value>statusStrip1</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Left</value>
-  </data>
-  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 97</value>
-  </data>
-  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>87, 249</value>
-  </data>
-  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
-    <value>67</value>
-  </data>
-  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="panel5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="panel5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>681, 97</value>
-  </data>
-  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 249</value>
-  </data>
-  <data name="panel5.TabIndex" type="System.Int32, mscorlib">
-    <value>68</value>
-  </data>
-  <data name="&gt;&gt;panel5.Name" xml:space="preserve">
-    <value>panel5</value>
-  </data>
-  <data name="&gt;&gt;panel5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel5.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel5.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="wBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="wBrowser.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="wBrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>594, 203</value>
-  </data>
-  <data name="wBrowser.TabIndex" type="System.Int32, mscorlib">
-    <value>31</value>
-  </data>
-  <data name="&gt;&gt;wBrowser.Name" xml:space="preserve">
-    <value>wBrowser</value>
-  </data>
-  <data name="&gt;&gt;wBrowser.Type" xml:space="preserve">
-    <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;wBrowser.Parent" xml:space="preserve">
-    <value>splitContainer1.Panel1</value>
-  </data>
-  <data name="&gt;&gt;wBrowser.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 97</value>
-  </data>
-  <data name="splitContainer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 0</value>
-  </data>
-  <data name="splitContainer1.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
-    <value>Horizontal</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.Name" xml:space="preserve">
-    <value>splitContainer1.Panel1</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.Parent" xml:space="preserve">
-    <value>splitContainer1</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="button_container.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="button_container.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel1.Name" xml:space="preserve">
-    <value>button_container.Panel1</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel1.Parent" xml:space="preserve">
-    <value>button_container</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel2.Name" xml:space="preserve">
-    <value>button_container.Panel2</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel2.Parent" xml:space="preserve">
-    <value>button_container</value>
-  </data>
-  <data name="&gt;&gt;button_container.Panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="button_container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>594, 42</value>
-  </data>
-  <data name="button_container.SplitterDistance" type="System.Int32, mscorlib">
-    <value>318</value>
-  </data>
-  <data name="button_container.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;button_container.Name" xml:space="preserve">
-    <value>button_container</value>
-  </data>
-  <data name="&gt;&gt;button_container.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button_container.Parent" xml:space="preserve">
-    <value>splitContainer1.Panel2</value>
-  </data>
-  <data name="&gt;&gt;button_container.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.Name" xml:space="preserve">
-    <value>splitContainer1.Panel2</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.Parent" xml:space="preserve">
-    <value>splitContainer1</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>594, 249</value>
-  </data>
-  <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
-    <value>203</value>
-  </data>
-  <data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
-    <value>69</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Name" xml:space="preserve">
-    <value>splitContainer1</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;splitContainer1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>710, 368</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>540, 300</value>
-  </data>
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>CenterScreen</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Update</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>UpdateInfo</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/UserSettingConstants.cs Deleted

@@ -1,48 +0,0 @@
-/*  UserSettingConstants.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    /// <summary>
-    /// Constants for the User Settings Service
-    /// </summary>
-    public class UserSettingConstants
-    {
-        public const string UpdateStatus = "updateStatus";
-        public const string TooltipEnable = "tooltipEnable";
-        public const string Skipversion = "skipversion";
-        public const string AutoNaming = "autoNaming";
-        public const string AutoNamePath = "autoNamePath";
-        public const string Appcast_i686 = "appcast_i686";
-        public const string Appcast_x64 = "appcast_x64";
-        public const string AutoNameFormat = "autoNameFormat";
-        public const string VLC_Path = "VLC_Path";
-        public const string MainWindowMinimize = "MainWindowMinimize";
-        public const string QueryEditorTab = "QueryEditorTab";
-        public const string PresetNotification = "presetNotification";
-        public const string TrayIconAlerts = "trayIconAlerts";
-        public const string LastUpdateCheckDate = "lastUpdateCheckDate";
-        public const string DaysBetweenUpdateCheck = "daysBetweenUpdateCheck";
-        public const string UseM4v = "useM4v";
-        public const string PromptOnUnmatchingQueries = "PromptOnUnmatchingQueries";
-        public const string NativeLanguage = "NativeLanguage";
-        public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
-        public const string DubMode = "DubMode";
-        public const string ClearOldLogs = "clearOldLogs";
-        public const string AutoNameTitleCase = "AutoNameTitleCase";
-        public const string AutoNameRemoveUnderscore = "AutoNameRemoveUnderscore";
-        public const string ActivityWindowLastMode = "ActivityWindowLastMode";
-        public const string UseClosedCaption = "useClosedCaption";
-        public const string BatchMinDuration = "batchMinDuration";
-        public const string BatchMaxDuration = "batchMaxDuration";
-        public const string DefaultPlayer = "defaultPlayer";
-        public const string SelectedLanguages = "SelectedLanguages";
-        public const string DubModeAudio = "DubModeAudio";
-        public const string DubModeSubtitle = "DubModeSubtitle";
-        public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";
-        public const string MinTitleLength = "MinTitleLength";
-        public const string ShowAdvancedAudioPassthruOpts = "ShowAdvancedAudioPassthruOpts";
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/app.config Deleted

HandBrake-0.9.8.tar.bz2/win/CS/defaultsettings.xml Deleted

@@ -1,435 +0,0 @@
-<?xml version="1.0"?>
-<dictionary>
-  <item>
-    <key>
-      <string>X264Step</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:double" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0.25</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>Verbosity</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">1</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>WhenCompleteAction</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Do nothing</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>GrowlEncode</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>GrowlQueue</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>ProcessPriority</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Below Normal</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>PreventSleep</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>ShowCLI</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>SaveLogToCopyDirectory</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>SaveLogWithVideo</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>DisableLibDvdNav</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>SendFile</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>MinTitleScanDuration</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">10</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>HandBrakeBuild</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">00010101</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>HandBrakeVersion</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">NotSet</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>updateStatus</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>tooltipEnable</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>defaultPreset</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance" />
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>skipversion</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>autoNaming</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>autoNamePath</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance" />
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>appcast_i686</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast.i386.xml</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>appcast_x64</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast_unstable.x86_64.xml</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>autoNameFormat</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">{source}-{title}</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>VLC_Path</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">C:\Program Files\VideoLAN\vlc\vlc.exe</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>MainWindowMinimize</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>QueryEditorTab</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>presetNotification</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>trayIconAlerts</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>lastUpdateCheckDate</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:dateTime" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">2011-08-15T00:00:00+01:00</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>daysBetweenUpdateCheck</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">30</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>useM4v</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>PromptOnUnmatchingQueries</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>NativeLanguage</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>NativeLanguageSubtitles</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>DubMode</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">255</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>CliExeHash</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance" />
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>previewScanCount</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">10</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>clearOldLogs</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>AutoNameTitleCase</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>AutoNameRemoveUnderscore</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>ActivityWindowLastMode</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>useClosedCaption</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>batchMinDuration</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">00:18:00</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>batchMaxDuration</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">02:30:00</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>defaultPlayer</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>SelectedLanguages</string>
-    </key>
-    <value>
-      <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>DubModeAudio</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>DubModeSubtitle</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>addOnlyOneAudioPerLanguage</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>MinTitleLength</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">10</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>HandBrakeExeHash</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">RQuM6TVXbXkdih1PmGTf+h178Ho=</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>ShowAdvancedAudioPassthruOpts</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>HandBrakePlatform</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">MinGW i686</anyType>
-    </value>
-  </item>
-</dictionary>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmAbout.Designer.cs Deleted

@@ -1,165 +0,0 @@
-/*  frmAbout.Designer.cs 
- 	
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    partial class frmAbout
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAbout));
-            this.Label3 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.PictureBox1 = new System.Windows.Forms.PictureBox();
-            this.btn_close = new System.Windows.Forms.Button();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.lbl_GUIBuild = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // Label3
-            // 
-            this.Label3.AutoSize = true;
-            this.Label3.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label3.Location = new System.Drawing.Point(124, 12);
-            this.Label3.Margin = new System.Windows.Forms.Padding(3, 3, 3, 1);
-            this.Label3.Name = "Label3";
-            this.Label3.Size = new System.Drawing.Size(99, 19);
-            this.Label3.TabIndex = 25;
-            this.Label3.Text = "HandBrake";
-            this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(125, 36);
-            this.label1.Margin = new System.Windows.Forms.Padding(3);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(196, 13);
-            this.label1.TabIndex = 33;
-            this.label1.Text = "Copyright  2003-2012 HandBrake Team";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // PictureBox1
-            // 
-            this.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
-            this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo128;
-            this.PictureBox1.InitialImage = null;
-            this.PictureBox1.Location = new System.Drawing.Point(9, 9);
-            this.PictureBox1.Margin = new System.Windows.Forms.Padding(0);
-            this.PictureBox1.Name = "PictureBox1";
-            this.PictureBox1.Size = new System.Drawing.Size(96, 96);
-            this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.PictureBox1.TabIndex = 33;
-            this.PictureBox1.TabStop = false;
-            // 
-            // btn_close
-            // 
-            this.btn_close.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btn_close.Location = new System.Drawing.Point(468, 270);
-            this.btn_close.Name = "btn_close";
-            this.btn_close.Size = new System.Drawing.Size(75, 23);
-            this.btn_close.TabIndex = 35;
-            this.btn_close.Text = "OK";
-            this.btn_close.UseVisualStyleBackColor = true;
-            this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Location = new System.Drawing.Point(128, 102);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(415, 162);
-            this.richTextBox1.TabIndex = 36;
-            this.richTextBox1.Text = resources.GetString("richTextBox1.Text");
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(125, 83);
-            this.label2.Margin = new System.Windows.Forms.Padding(3);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(46, 13);
-            this.label2.TabIndex = 37;
-            this.label2.Text = "License:";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // lbl_GUIBuild
-            // 
-            this.lbl_GUIBuild.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbl_GUIBuild.Location = new System.Drawing.Point(229, 17);
-            this.lbl_GUIBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3);
-            this.lbl_GUIBuild.Name = "lbl_GUIBuild";
-            this.lbl_GUIBuild.Size = new System.Drawing.Size(224, 13);
-            this.lbl_GUIBuild.TabIndex = 38;
-            this.lbl_GUIBuild.Text = "{GUI Version}";
-            this.lbl_GUIBuild.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // frmAbout
-            // 
-            this.AcceptButton = this.btn_close;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.CancelButton = this.btn_close;
-            this.ClientSize = new System.Drawing.Size(555, 302);
-            this.Controls.Add(this.lbl_GUIBuild);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.richTextBox1);
-            this.Controls.Add(this.btn_close);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.PictureBox1);
-            this.Controls.Add(this.Label3);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "frmAbout";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "About HandBrake";
-            ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.Label label1;
-        internal System.Windows.Forms.PictureBox PictureBox1;
-        private System.Windows.Forms.Button btn_close;
-        private System.Windows.Forms.RichTextBox richTextBox1;
-        internal System.Windows.Forms.Label label2;
-        internal System.Windows.Forms.Label lbl_GUIBuild;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmAbout.cs Deleted

@@ -1,47 +0,0 @@
-/*  frmAbout.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    /// <summary>
-    /// The About Window
-    /// </summary>
-    public partial class frmAbout : Form
-    {
-        IUserSettingService userSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="frmAbout"/> class.
-        /// </summary>
-        public frmAbout()
-        {
-            InitializeComponent();
-
-            string nightly = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion).Contains("svn") ? " (SVN / Nightly Build)" : string.Empty;
-            lbl_GUIBuild.Text = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion) + " (" + userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild) + ") " + nightly;
-        }
-
-        /// <summary>
-        /// Button - Close the window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_close_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmAbout.resx Deleted

@@ -1,515 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="richTextBox1.Text" xml:space="preserve">
-    <value>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.</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmActivityWindow.Designer.cs Deleted

@@ -1,186 +0,0 @@
-/*  frmDvdInfo.Designer.cs 
- 	
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    partial class frmActivityWindow
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmActivityWindow));
-            this.rtf_actLog = new System.Windows.Forms.RichTextBox();
-            this.rightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_copy_log = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_openLogFolder = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.btn_copy = new System.Windows.Forms.ToolStripButton();
-            this.logSelector = new System.Windows.Forms.ToolStripComboBox();
-            this.btn_openLogDirectory = new System.Windows.Forms.ToolStripButton();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.rightClickMenu.SuspendLayout();
-            this.toolStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // rtf_actLog
-            // 
-            this.rtf_actLog.ContextMenuStrip = this.rightClickMenu;
-            this.rtf_actLog.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.rtf_actLog.DetectUrls = false;
-            this.rtf_actLog.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rtf_actLog.Location = new System.Drawing.Point(0, 25);
-            this.rtf_actLog.Name = "rtf_actLog";
-            this.rtf_actLog.ReadOnly = true;
-            this.rtf_actLog.Size = new System.Drawing.Size(404, 552);
-            this.rtf_actLog.TabIndex = 29;
-            this.rtf_actLog.Text = "";
-            // 
-            // rightClickMenu
-            // 
-            this.rightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_copy_log,
-            this.mnu_openLogFolder});
-            this.rightClickMenu.Name = "rightClickMenu";
-            this.rightClickMenu.Size = new System.Drawing.Size(178, 48);
-            // 
-            // mnu_copy_log
-            // 
-            this.mnu_copy_log.Image = global::Handbrake.Properties.Resources.copy;
-            this.mnu_copy_log.Name = "mnu_copy_log";
-            this.mnu_copy_log.Size = new System.Drawing.Size(177, 22);
-            this.mnu_copy_log.Text = "Copy";
-            this.mnu_copy_log.Click += new System.EventHandler(this.MnuCopyLogClick);
-            // 
-            // mnu_openLogFolder
-            // 
-            this.mnu_openLogFolder.Image = global::Handbrake.Properties.Resources.folder;
-            this.mnu_openLogFolder.Name = "mnu_openLogFolder";
-            this.mnu_openLogFolder.Size = new System.Drawing.Size(177, 22);
-            this.mnu_openLogFolder.Text = "Open Log Directory";
-            this.mnu_openLogFolder.Click += new System.EventHandler(this.MnuOpenLogFolderClick);
-            // 
-            // ToolTip
-            // 
-            this.ToolTip.Active = false;
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.btn_copy,
-            this.logSelector,
-            this.btn_openLogDirectory});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.toolStrip1.Size = new System.Drawing.Size(404, 25);
-            this.toolStrip1.TabIndex = 96;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // btn_copy
-            // 
-            this.btn_copy.Image = ((System.Drawing.Image)(resources.GetObject("btn_copy.Image")));
-            this.btn_copy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_copy.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_copy.Name = "btn_copy";
-            this.btn_copy.Size = new System.Drawing.Size(55, 22);
-            this.btn_copy.Text = "Copy";
-            this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);
-            // 
-            // logSelector
-            // 
-            this.logSelector.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.logSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.logSelector.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.logSelector.Items.AddRange(new object[] {
-            "Scan Log",
-            "Encode Log"});
-            this.logSelector.Name = "logSelector";
-            this.logSelector.Size = new System.Drawing.Size(121, 25);
-            this.logSelector.SelectedIndexChanged += new System.EventHandler(this.LogSelectorClick);
-            // 
-            // btn_openLogDirectory
-            // 
-            this.btn_openLogDirectory.Image = global::Handbrake.Properties.Resources.folder;
-            this.btn_openLogDirectory.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_openLogDirectory.Name = "btn_openLogDirectory";
-            this.btn_openLogDirectory.Size = new System.Drawing.Size(130, 22);
-            this.btn_openLogDirectory.Text = "Open Log Directory";
-            this.btn_openLogDirectory.Click += new System.EventHandler(this.btn_openLogDirectory_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(0, 25);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(404, 552);
-            this.panel1.TabIndex = 97;
-            // 
-            // frmActivityWindow
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.ControlLight;
-            this.ClientSize = new System.Drawing.Size(404, 577);
-            this.Controls.Add(this.rtf_actLog);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.toolStrip1);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "frmActivityWindow";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Activity Window";
-            this.Load += new System.EventHandler(this.ActivityWindowLoad);
-            this.rightClickMenu.ResumeLayout(false);
-            this.toolStrip1.ResumeLayout(false);
-            this.toolStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.RichTextBox rtf_actLog;
-        internal System.Windows.Forms.ToolTip ToolTip;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.ToolStripButton btn_copy;
-        private System.Windows.Forms.ContextMenuStrip rightClickMenu;
-        private System.Windows.Forms.ToolStripMenuItem mnu_copy_log;
-        private System.Windows.Forms.ToolStripMenuItem mnu_openLogFolder;
-        private System.Windows.Forms.ToolStripComboBox logSelector;
-        private System.Windows.Forms.ToolStripButton btn_openLogDirectory;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmActivityWindow.cs Deleted

@@ -1,493 +0,0 @@
-/*  frmActivityWindow.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.ComponentModel;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Text;
-    using System.Threading;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using Handbrake.Functions;
-
-    using Model;
-    using Timer = System.Threading.Timer;
-
-    /// <summary>
-    /// The Activity Log Window
-    /// </summary>
-    public partial class frmActivityWindow : Form
-    {
-        /* Private Variables */
-
-        /// <summary>
-        /// The Encode Object
-        /// </summary>
-        private readonly IEncode encode;
-
-        /// <summary>
-        /// The Scan Object
-        /// </summary>
-        private readonly IScan scan;
-
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// The current position in the log file
-        /// </summary>
-        private int position;
-
-        /// <summary>
-        /// A Timer for this window
-        /// </summary>
-        private Timer windowTimer;
-
-        /// <summary>
-        /// The Type of log that the window is currently dealing with
-        /// </summary>
-        private ActivityLogMode mode;
-
-        /* Constructor */
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="frmActivityWindow"/> class.
-        /// </summary>
-        /// <param name="encode">
-        /// The encode.
-        /// </param>
-        /// <param name="scan">
-        /// The scan.
-        /// </param>
-        public frmActivityWindow(IEncode encode, IScan scan)
-        {
-            InitializeComponent();
-
-            this.encode = encode;
-            this.scan = scan;
-            this.position = 0;
-
-            // Listen for Scan and Encode Starting Events
-            scan.ScanStared += scan_ScanStared;
-            encode.EncodeStarted += encode_EncodeStarted;
-        }
-
-        /* Delegates */
-
-        /// <summary>
-        /// A callback function for updating the ui
-        /// </summary>
-        /// <param name="text">
-        /// The text.
-        /// </param>
-        private delegate void SetTextCallback(StringBuilder text);
-
-        /// <summary>
-        /// Clear text callback
-        /// </summary>
-        private delegate void SetTextClearCallback();
-
-        /// <summary>
-        /// Set mode callback
-        /// </summary>
-        /// <param name="setMode">
-        /// The set mode.
-        /// </param>
-        private delegate void SetModeCallback(ActivityLogMode setMode);
-
-        /* Private Methods */
-
-        /// <summary>
-        /// Set the window to scan mode
-        /// </summary>
-        /// <param name="setMode">
-        /// The set Mode.
-        /// </param>
-        private void SetMode(ActivityLogMode setMode)
-        {
-            if (IsHandleCreated)
-            {
-                if (rtf_actLog.InvokeRequired)
-                {
-                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] { setMode });
-                    EndInvoke(invoked);
-                }
-                else
-                {
-                    Reset();
-                    this.mode = setMode;
-
-                    Array values = Enum.GetValues(typeof(ActivityLogMode));
-                    this.UserSettingService.SetUserSetting(UserSettingConstants.ActivityWindowLastMode, (int)values.GetValue(Convert.ToInt32(setMode)));
-
-                    this.Text = mode == ActivityLogMode.Scan
-                                    ? "Activity Window (Scan Log)"
-                                    : "Activity Window (Encode Log)";
-
-                    this.logSelector.SelectedIndex = mode == ActivityLogMode.Scan ? 0 : 1;
-
-                    if (mode == ActivityLogMode.Scan)
-                    {
-                        scan.ScanCompleted += stopWindowRefresh;
-                        encode.EncodeCompleted -= stopWindowRefresh;
-                    }
-                    else
-                    {
-                        scan.ScanCompleted -= stopWindowRefresh;
-                        encode.EncodeCompleted += stopWindowRefresh;
-                    }
-
-                    // Start a fresh window timer
-                    windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
-                }
-            }
-        }
-
-        /// <summary>
-        /// On Window load, start a new timer
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void ActivityWindowLoad(object sender, EventArgs e)
-        {
-            try
-            {
-                // Set the inital log file.
-                if (encode.IsEncoding)
-                {
-                    this.logSelector.SelectedIndex = 1;
-                }
-                else if (scan.IsScanning)
-                {
-                    this.logSelector.SelectedIndex = 0;
-                }
-                else
-                {
-                    // Otherwise, use the last mode the window was in.
-                    ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), 
-                        this.UserSettingService.GetUserSetting<int>(UserSettingConstants.ActivityWindowLastMode));
-                    this.logSelector.SelectedIndex = activitLogMode == ActivityLogMode.Scan ? 0 : 1;
-                }
-            }
-            catch (Exception exc)
-            {
-                throw new GeneralApplicationException("Error Loading the Activity Window", string.Empty, exc);
-            }
-        }
-
-        /// <summary>
-        /// Set the Log window to encode mode when an encode starts.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void encode_EncodeStarted(object sender, EventArgs e)
-        {
-            SetMode(ActivityLogMode.Encode);
-        }
-
-        /// <summary>
-        /// Set the log widow to scan mode when a scan starts
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void scan_ScanStared(object sender, EventArgs e)
-        {
-            SetMode(ActivityLogMode.Scan);
-        }
-
-        /// <summary>
-        /// Stop refreshing the window when no scanning or encoding is happening.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void stopWindowRefresh(object sender, EventArgs e)
-        {
-            windowTimer.Dispose();
-            Reset();
-            LogMonitor(null);
-        }
-
-        /// <summary>
-        /// Append new text to the window
-        /// </summary>
-        /// <param name="n">
-        /// The n.
-        /// </param>
-        private void LogMonitor(object n)
-        {
-            AppendWindowText(GetLog());
-        }
-
-        /// <summary>
-        /// New Code for getting the Activity log from the Services rather than reading a file.
-        /// </summary>
-        /// <returns>
-        /// The StringBuilder containing a log
-        /// </returns>
-        private StringBuilder GetLog()
-        {
-            StringBuilder appendText = new StringBuilder();
-
-            try
-            {
-                if (this.mode == ActivityLogMode.Scan)
-                {
-                    if (scan == null || scan.ActivityLog == string.Empty)
-                    {
-                        appendText.AppendFormat("Waiting for the log to be generated ...\n");
-                        position = 0;
-                        ClearWindowText();
-                        return appendText;
-                    }
-
-                    using (StringReader reader = new StringReader(scan.ActivityLog))
-                    {
-                        LogReader(reader, appendText);
-                    }
-                }
-                else
-                {
-                    if (encode == null || encode.ActivityLog == string.Empty)
-                    {
-                        appendText.AppendFormat("Waiting for the log to be generated ...\n");
-                        position = 0;
-                        ClearWindowText();
-                        return appendText;
-                    }
-
-                    using (StringReader reader = new StringReader(encode.ActivityLog))
-                    {
-                        LogReader(reader, appendText);
-                    }
-                }
-            }
-            catch (Exception exc)
-            {
-                windowTimer.Dispose();
-                throw new GeneralApplicationException("Failed to Get Log.", string.Empty, exc);
-            }
-
-            return appendText;
-        }
-
-        /// <summary>
-        /// Reads the log data from a Scan or Encode object
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <param name="appendText">
-        /// The append text.
-        /// </param>
-        private void LogReader(StringReader reader, StringBuilder appendText)
-        {
-            string line;
-            int i = 1;
-            while ((line = reader.ReadLine()) != null)
-            {
-                if (i > position)
-                {
-                    appendText.AppendLine(line);
-                    position++;
-                }
-                i++;
-            }
-        }
-
-        /// <summary>
-        /// Append text to the RTF box
-        /// </summary>
-        /// <param name="text">
-        /// The text.
-        /// </param>
-        private void AppendWindowText(StringBuilder text)
-        {
-            try
-            {
-                if (IsHandleCreated)
-                {
-                    if (rtf_actLog.InvokeRequired)
-                    {
-                        IAsyncResult invoked = BeginInvoke(new SetTextCallback(AppendWindowText), new object[] { text });
-                        EndInvoke(invoked);
-                    }
-                    else
-                        lock (rtf_actLog)
-                            rtf_actLog.AppendText(text.ToString());
-
-                    // Stop the refresh process if log has finished.
-                    if (text.ToString().Contains("HandBrake has Exited"))
-                    {
-                        windowTimer.Dispose();
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                return;
-            }
-        }
-
-        /// <summary>
-        /// Clear the contents of the log window
-        /// </summary>
-        private void ClearWindowText()
-        {
-            try
-            {
-                if (IsHandleCreated)
-                {
-                    if (rtf_actLog.InvokeRequired)
-                    {
-                        IAsyncResult invoked = BeginInvoke(new SetTextClearCallback(ClearWindowText));
-                        EndInvoke(invoked);
-                    }
-                    else
-                        lock (rtf_actLog)
-                            rtf_actLog.Clear();
-                }
-            }
-            catch (Exception)
-            {
-                return;
-            }
-        }
-
-        /// <summary>
-        /// Reset Everything
-        /// </summary>
-        private void Reset()
-        {
-            if (windowTimer != null)
-                windowTimer.Dispose();
-            position = 0;
-            ClearWindowText();
-            windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
-        }
-
-        /* Menus and Buttons */
-
-        /// <summary>
-        /// Copy log to clipboard
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuCopyLogClick(object sender, EventArgs e)
-        {
-            Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
-        }
-
-        /// <summary>
-        /// Open the log folder
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuOpenLogFolderClick(object sender, EventArgs e)
-        {
-            btn_openLogDirectory_Click(sender, e);
-        }
-
-        /// <summary>
-        /// Open the Log Directory
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Evennt Args</param>
-        private void btn_openLogDirectory_Click(object sender, EventArgs e)
-        {
-            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
-            string windir = Environment.GetEnvironmentVariable("WINDIR");
-            Process prc = new Process
-            {
-                StartInfo =
-                {
-                    FileName = windir + @"\explorer.exe",
-                    Arguments = logDir
-                }
-            };
-            prc.Start();
-        }
-
-        /// <summary>
-        /// Copy the log
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnCopyClick(object sender, EventArgs e)
-        {
-            Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
-        }
-
-        /// <summary>
-        /// Change the Log file in the viewer
-        /// </summary>
-        /// <param name="sender">The Sender </param>
-        /// <param name="e">The EventArgs</param>
-        private void LogSelectorClick(object sender, EventArgs e)
-        {
-            this.SetMode((string)this.logSelector.SelectedItem == "Scan Log" ? ActivityLogMode.Scan : ActivityLogMode.Encode);
-        }
-
-        /* Overrides */
-
-        /// <summary>
-        /// override onclosing
-        /// </summary>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            scan.ScanStared -= scan_ScanStared;
-            encode.EncodeStarted -= encode_EncodeStarted;
-
-            scan.ScanCompleted -= stopWindowRefresh;
-            encode.EncodeCompleted -= stopWindowRefresh;
-
-            windowTimer.Dispose();
-            e.Cancel = true;
-            this.Dispose();
-            base.OnClosing(e);
-        }
-
-        
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmActivityWindow.resx Deleted

@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="rightClickMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 18</value>
-  </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>105, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btn_copy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHlSURBVDhPpZPfT5JhGIb9U0rHXHXsH9BaWa0222oe1EFb
-        2TriQI86atlsyzVstIkhzcLSAfYhNJdSiRCIEmEi9gMX2Vawoe77lET0w67gZUnQhm4+23323tfz3O/z
-        vjU1+y2n9zMFSe6okGU0TL9ziqnge/bELpgry+wIcK39GRNe7+4Q+3i0zJ/b/k33wCtc/igXW7twT3iq
-        QyxjMwLgioH0ASJxhQfml0g+BZtXxuqReTwmox9eEXrtmy8H9jsDOxNsbuVQ1rIkUmkBqKyOwSUaWvw4
-        XKESxGTziHN9/i10owq3pJ+0PYkz8Gb5P0CrMYVzWuFIswNpZLIIMeTzFnKvZ1SW5AyLiVU+xpcxjSQF
-        oFPKCUUWVrmsS3K4+QWHzg9R3/S0CCjk3ciqO521phjXDfPcty6WTaD8Uln4sYF/bg2jFEJz9lEJoKSz
-        fPqWYuZLgkDkO+53X2nvK6735mAarSHJpXsxzt2eFTJKQTSne0qAhlNXqFSbflYA1Hy8lKwyF19nPKxg
-        f7vCw6EAdY366uu92jEtAP92/jtBj22S2uO66oALNzxkNrcxDYfptYcwPg+KzgWzweLj4LG71QGNWlf+
-        tq1C9U1mNGd6qTvZTe2Jrry5kwNH7+z+zPf0mfZ76A/LmeTprDhiYwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmAddPreset.Designer.cs Deleted

@@ -1,246 +0,0 @@
-/*  AudioTrack.cs $
- 	
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    partial class frmAddPreset
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAddPreset));
-            this.lbl_name = new System.Windows.Forms.Label();
-            this.txt_preset_name = new System.Windows.Forms.TextBox();
-            this.btn_add = new System.Windows.Forms.Button();
-            this.btn_cancel = new System.Windows.Forms.Button();
-            this.check_useFilters = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.cb_usePictureSettings = new System.Windows.Forms.ComboBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.lbl_x = new System.Windows.Forms.Label();
-            this.maxWidth = new System.Windows.Forms.NumericUpDown();
-            this.maxHeight = new System.Windows.Forms.NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)(this.maxWidth)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.maxHeight)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // lbl_name
-            // 
-            this.lbl_name.AutoSize = true;
-            this.lbl_name.Location = new System.Drawing.Point(12, 18);
-            this.lbl_name.Name = "lbl_name";
-            this.lbl_name.Size = new System.Drawing.Size(75, 13);
-            this.lbl_name.TabIndex = 1;
-            this.lbl_name.Text = "Preset Name: ";
-            // 
-            // txt_preset_name
-            // 
-            this.txt_preset_name.Location = new System.Drawing.Point(130, 15);
-            this.txt_preset_name.Name = "txt_preset_name";
-            this.txt_preset_name.Size = new System.Drawing.Size(172, 21);
-            this.txt_preset_name.TabIndex = 0;
-            // 
-            // btn_add
-            // 
-            this.btn_add.BackColor = System.Drawing.Color.Transparent;
-            this.btn_add.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_add.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_add.Location = new System.Drawing.Point(182, 157);
-            this.btn_add.Name = "btn_add";
-            this.btn_add.Size = new System.Drawing.Size(57, 22);
-            this.btn_add.TabIndex = 3;
-            this.btn_add.Text = "Add";
-            this.btn_add.UseVisualStyleBackColor = false;
-            this.btn_add.Click += new System.EventHandler(this.BtnAddClick);
-            // 
-            // btn_cancel
-            // 
-            this.btn_cancel.BackColor = System.Drawing.Color.Transparent;
-            this.btn_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_cancel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_cancel.Location = new System.Drawing.Point(245, 157);
-            this.btn_cancel.Name = "btn_cancel";
-            this.btn_cancel.Size = new System.Drawing.Size(57, 22);
-            this.btn_cancel.TabIndex = 4;
-            this.btn_cancel.Text = "Cancel";
-            this.btn_cancel.UseVisualStyleBackColor = false;
-            this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);
-            // 
-            // check_useFilters
-            // 
-            this.check_useFilters.AutoSize = true;
-            this.check_useFilters.Checked = true;
-            this.check_useFilters.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.check_useFilters.Location = new System.Drawing.Point(130, 134);
-            this.check_useFilters.Name = "check_useFilters";
-            this.check_useFilters.Size = new System.Drawing.Size(119, 17);
-            this.check_useFilters.TabIndex = 2;
-            this.check_useFilters.Text = "Save Filter Settings";
-            this.toolTip.SetToolTip(this.check_useFilters, "Save Picture Width/Height and Crop Values");
-            this.check_useFilters.UseVisualStyleBackColor = true;
-            // 
-            // cb_usePictureSettings
-            // 
-            this.cb_usePictureSettings.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_usePictureSettings.FormattingEnabled = true;
-            this.cb_usePictureSettings.Items.AddRange(new object[] {
-            "None",
-            "Custom",
-            "Source Maximum"});
-            this.cb_usePictureSettings.Location = new System.Drawing.Point(130, 79);
-            this.cb_usePictureSettings.Name = "cb_usePictureSettings";
-            this.cb_usePictureSettings.Size = new System.Drawing.Size(172, 21);
-            this.cb_usePictureSettings.TabIndex = 1;
-            this.cb_usePictureSettings.SelectedIndexChanged += new System.EventHandler(this.cb_usePictureSettings_SelectedIndexChanged);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(12, 57);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(100, 13);
-            this.label2.TabIndex = 7;
-            this.label2.Text = "Picture Settings:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(12, 82);
-            this.label3.Margin = new System.Windows.Forms.Padding(3);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(87, 13);
-            this.label3.TabIndex = 8;
-            this.label3.Text = "Use Picture Size:";
-            // 
-            // lbl_x
-            // 
-            this.lbl_x.AutoSize = true;
-            this.lbl_x.Location = new System.Drawing.Point(211, 110);
-            this.lbl_x.Name = "lbl_x";
-            this.lbl_x.Size = new System.Drawing.Size(13, 13);
-            this.lbl_x.TabIndex = 11;
-            this.lbl_x.Text = "X";
-            // 
-            // maxWidth
-            // 
-            this.maxWidth.Location = new System.Drawing.Point(130, 107);
-            this.maxWidth.Maximum = new decimal(new int[] {
-            32000,
-            0,
-            0,
-            0});
-            this.maxWidth.Name = "maxWidth";
-            this.maxWidth.Size = new System.Drawing.Size(74, 21);
-            this.maxWidth.TabIndex = 12;
-            this.maxWidth.Value = new decimal(new int[] {
-            1280,
-            0,
-            0,
-            0});
-            // 
-            // maxHeight
-            // 
-            this.maxHeight.Location = new System.Drawing.Point(229, 107);
-            this.maxHeight.Maximum = new decimal(new int[] {
-            32000,
-            0,
-            0,
-            0});
-            this.maxHeight.Name = "maxHeight";
-            this.maxHeight.Size = new System.Drawing.Size(73, 21);
-            this.maxHeight.TabIndex = 13;
-            this.maxHeight.Value = new decimal(new int[] {
-            720,
-            0,
-            0,
-            0});
-            // 
-            // frmAddPreset
-            // 
-            this.AcceptButton = this.btn_add;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.AutoSize = true;
-            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.CancelButton = this.btn_cancel;
-            this.ClientSize = new System.Drawing.Size(319, 191);
-            this.Controls.Add(this.maxHeight);
-            this.Controls.Add(this.maxWidth);
-            this.Controls.Add(this.lbl_x);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.cb_usePictureSettings);
-            this.Controls.Add(this.lbl_name);
-            this.Controls.Add(this.txt_preset_name);
-            this.Controls.Add(this.check_useFilters);
-            this.Controls.Add(this.btn_cancel);
-            this.Controls.Add(this.btn_add);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "frmAddPreset";
-            this.Padding = new System.Windows.Forms.Padding(9);
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Add New Preset";
-            this.TopMost = true;
-            ((System.ComponentModel.ISupportInitialize)(this.maxWidth)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.maxHeight)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label lbl_name;
-        private System.Windows.Forms.TextBox txt_preset_name;
-        internal System.Windows.Forms.Button btn_add;
-        internal System.Windows.Forms.Button btn_cancel;
-        private System.Windows.Forms.CheckBox check_useFilters;
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.ComboBox cb_usePictureSettings;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label lbl_x;
-        private System.Windows.Forms.NumericUpDown maxWidth;
-        private System.Windows.Forms.NumericUpDown maxHeight;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmAddPreset.cs Deleted

@@ -1,140 +0,0 @@
-/*  frmAddPreset.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Services;
-
-    using Handbrake.Functions;
-    using Handbrake.Model;
-
-    /// <summary>
-    /// The Add Preset Window
-    /// </summary>
-    public partial class frmAddPreset : Form
-    {
-        private readonly frmMain mainWindow;
-
-        /// <summary>
-        /// The Preset Handler
-        /// </summary>
-        private readonly PresetService presetCode;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="frmAddPreset"/> class.
-        /// </summary>
-        /// <param name="mainWindow">
-        /// The Main Window
-        /// </param>
-        /// <param name="presetHandler">
-        /// The preset handler.
-        /// </param>
-        public frmAddPreset(frmMain mainWindow, PresetService presetHandler)
-        {
-            InitializeComponent();
-            this.mainWindow = mainWindow;
-            presetCode = presetHandler;
-
-            cb_usePictureSettings.SelectedIndex = 0;
-        }
-
-        /// <summary>
-        /// Handle the Add button event.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnAddClick(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(txt_preset_name.Text.Trim()))
-            {
-                MessageBox.Show("You must enter a preset name!", "Warning",
-                                MessageBoxButtons.OK, MessageBoxIcon.Warning);                
-                return;
-            }
-
-            QueryPictureSettingsMode pictureSettingsMode;
-
-            switch (cb_usePictureSettings.SelectedIndex)
-            {
-                case 0:
-                    pictureSettingsMode = QueryPictureSettingsMode.None;
-                    break;
-                case 1:
-                    pictureSettingsMode = QueryPictureSettingsMode.Custom;
-                    break;
-                case 2:
-                    pictureSettingsMode = QueryPictureSettingsMode.SourceMaximum;
-                    break;
-                default:
-                    pictureSettingsMode = QueryPictureSettingsMode.None;
-                    break;
-            }
-
-            string query = QueryGenerator.GenerateQueryForPreset(mainWindow, pictureSettingsMode, check_useFilters.Checked, Convert.ToInt32(maxWidth.Value), Convert.ToInt32(maxHeight.Value));
-
-            Preset preset = new Preset
-                {
-                    Name = this.txt_preset_name.Text,
-                    Query = query,
-                    CropSettings = pictureSettingsMode != QueryPictureSettingsMode.None,
-                    Description = string.Empty,
-                    AudioPassthruSettings = mainWindow.AudioSettings.PassthruSettings          
-                };
-
-            if (presetCode.Add(preset))
-            {
-                this.DialogResult = DialogResult.OK;
-                this.Close();           
-            }
-            else
-                MessageBox.Show("Sorry, that preset name already exists. Please choose another!", "Warning", 
-                                MessageBoxButtons.OK, MessageBoxIcon.Warning);
-        }
-
-        /// <summary>
-        /// Handle the Cancel button event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void BtnCancelClick(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-            this.Close();
-        }
-
-        /// <summary>
-        /// Picutre Settings option changed.
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The Event Args</param>
-        private void cb_usePictureSettings_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (cb_usePictureSettings.SelectedItem.ToString().Contains("Custom"))
-            {
-                maxWidth.Visible = true;
-                maxHeight.Visible = true;
-                lbl_x.Visible = true;
-            } 
-            else
-            {
-                maxWidth.Visible = false;
-                maxHeight.Visible = false;
-                lbl_x.Visible = false;
-            }
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmAddPreset.resx Deleted

@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmMain.Designer.cs Deleted

@@ -1,2010 +0,0 @@
-/*  frmMain.Designer.cs 
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-using System;
-using System.Windows.Forms;
-
-namespace Handbrake
-{
-    using System.Collections.ObjectModel;
-
-    partial class frmMain
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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.components = new System.ComponentModel.Container();
-            System.Windows.Forms.ContextMenuStrip notifyIconMenu;
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            HandBrake.ApplicationServices.Model.Encoding.AllowedPassthru allowedPassthru1 = new HandBrake.ApplicationServices.Model.Encoding.AllowedPassthru();
-            this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
-            this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
-            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.text_destination = new System.Windows.Forms.TextBox();
-            this.drp_videoEncoder = new System.Windows.Forms.ComboBox();
-            this.check_largeFile = new System.Windows.Forms.CheckBox();
-            this.check_turbo = new System.Windows.Forms.CheckBox();
-            this.drp_videoFramerate = new System.Windows.Forms.ComboBox();
-            this.slider_videoQuality = new System.Windows.Forms.TrackBar();
-            this.text_bitrate = new System.Windows.Forms.TextBox();
-            this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();
-            this.check_iPodAtom = new System.Windows.Forms.CheckBox();
-            this.data_chpt = new System.Windows.Forms.DataGridView();
-            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();
-            this.drop_format = new System.Windows.Forms.ComboBox();
-            this.drop_chapterFinish = new System.Windows.Forms.ComboBox();
-            this.drop_chapterStart = new System.Windows.Forms.ComboBox();
-            this.drop_angle = new System.Windows.Forms.ComboBox();
-            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();
-            this.btn_importChapters = new System.Windows.Forms.Button();
-            this.btn_export = new System.Windows.Forms.Button();
-            this.drop_mode = new System.Windows.Forms.ComboBox();
-            this.btn_generate_Query = new System.Windows.Forms.Button();
-            this.radio_cq = new System.Windows.Forms.RadioButton();
-            this.radio_avgBitrate = new System.Windows.Forms.RadioButton();
-            this.check_2PassEncode = new System.Windows.Forms.CheckBox();
-            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();
-            this.treeView_presets = new System.Windows.Forms.TreeView();
-            this.presets_menu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.pmnu_expandAll = new System.Windows.Forms.ToolStripMenuItem();
-            this.pmnu_collapse = new System.Windows.Forms.ToolStripMenuItem();
-            this.sep1 = new System.Windows.Forms.ToolStripSeparator();
-            this.pmnu_import = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.pmnu_saveChanges = new System.Windows.Forms.ToolStripMenuItem();
-            this.pmnu_delete = new System.Windows.Forms.ToolStripMenuItem();
-            this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();
-            this.File_Open = new System.Windows.Forms.OpenFileDialog();
-            this.ISO_Open = new System.Windows.Forms.OpenFileDialog();
-            this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_killCLI = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();
-            this.frmMainMenu = new System.Windows.Forms.MenuStrip();
-            this.label5 = new System.Windows.Forms.Label();
-            this.Label47 = new System.Windows.Forms.Label();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.tab_audio = new System.Windows.Forms.TabPage();
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();
-            this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);
-            this.tab_video = new System.Windows.Forms.TabPage();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.radio_constantFramerate = new System.Windows.Forms.RadioButton();
-            this.radio_peakAndVariable = new System.Windows.Forms.RadioButton();
-            this.label25 = new System.Windows.Forms.Label();
-            this.Label2 = new System.Windows.Forms.Label();
-            this.lbl_SliderValue = new System.Windows.Forms.Label();
-            this.lbl_framerate = new System.Windows.Forms.Label();
-            this.tab_picture = new System.Windows.Forms.TabPage();
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();
-            this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();
-            this.tabs_panel = new System.Windows.Forms.TabControl();
-            this.tab_filters = new System.Windows.Forms.TabPage();
-            this.Filters = new Handbrake.Controls.Filters();
-            this.tab_subtitles = new System.Windows.Forms.TabPage();
-            this.Subtitles = new Handbrake.Controls.Subtitles();
-            this.tab_chapters = new System.Windows.Forms.TabPage();
-            this.label31 = new System.Windows.Forms.Label();
-            this.tab_advanced = new System.Windows.Forms.TabPage();
-            this.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts();
-            this.x264Panel = new Handbrake.Controls.x264Panel();
-            this.tab_query = new System.Windows.Forms.TabPage();
-            this.btn_clear = new System.Windows.Forms.Button();
-            this.label34 = new System.Windows.Forms.Label();
-            this.label33 = new System.Windows.Forms.Label();
-            this.rtf_query = new System.Windows.Forms.RichTextBox();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.presetsToolStrip = new System.Windows.Forms.ToolStrip();
-            this.BtnAddPreset = new System.Windows.Forms.ToolStripButton();
-            this.BtnRemovePreset = new System.Windows.Forms.ToolStripButton();
-            this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton();
-            this.MnuSetDefaultPreset = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.MnuImportPreset = new System.Windows.Forms.ToolStripMenuItem();
-            this.MnuExportPreset = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-            this.MnuResetBuiltInPresets = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();
-            this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();
-            this.btnTitleSpecific = new System.Windows.Forms.ToolStripMenuItem();
-            this.FileTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem();
-            this.FolderTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
-            this.btn_start = new System.Windows.Forms.ToolStripButton();
-            this.btn_add2Queue = new System.Windows.Forms.ToolStripSplitButton();
-            this.mnu_AddAllTitles = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_AddTittleRange = new System.Windows.Forms.ToolStripMenuItem();
-            this.btn_showQueue = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.tb_preview = new System.Windows.Forms.ToolStripButton();
-            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
-            this.MnuUserGuide = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-            this.MnuCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
-            this.MnuAboutHandBrake = new System.Windows.Forms.ToolStripMenuItem();
-            this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-            this.StatusStrip = new System.Windows.Forms.StatusStrip();
-            this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar();
-            this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();
-            this.lbl_updateCheck = new System.Windows.Forms.ToolStripStatusLabel();
-            this.lbl_libhb_warning = new System.Windows.Forms.ToolStripStatusLabel();
-            this.hbproc = new System.Diagnostics.Process();
-            this.File_Save = new System.Windows.Forms.SaveFileDialog();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.btn_destBrowse = new System.Windows.Forms.Button();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.Label10 = new System.Windows.Forms.Label();
-            this.lbl_angle = new System.Windows.Forms.Label();
-            this.Label13 = new System.Windows.Forms.Label();
-            this.label_duration = new System.Windows.Forms.Label();
-            this.lbl_duration = new System.Windows.Forms.Label();
-            this.labelStaticDestination = new System.Windows.Forms.Label();
-            this.labelPreset = new System.Windows.Forms.Label();
-            this.labelSource = new System.Windows.Forms.Label();
-            this.labelStaticSource = new System.Windows.Forms.Label();
-            this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
-            this.openPreset = new System.Windows.Forms.OpenFileDialog();
-            this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();
-            notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            notifyIconMenu.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();
-            this.ChaptersMenu.SuspendLayout();
-            this.presets_menu.SuspendLayout();
-            this.frmMainMenu.SuspendLayout();
-            this.tab_audio.SuspendLayout();
-            this.tab_video.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.tab_picture.SuspendLayout();
-            this.tabs_panel.SuspendLayout();
-            this.tab_filters.SuspendLayout();
-            this.tab_subtitles.SuspendLayout();
-            this.tab_chapters.SuspendLayout();
-            this.tab_advanced.SuspendLayout();
-            this.tab_query.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.presetsToolStrip.SuspendLayout();
-            this.toolStrip1.SuspendLayout();
-            this.StatusStrip.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.SourceLayoutPanel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // notifyIconMenu
-            // 
-            notifyIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.btn_restore});
-            notifyIconMenu.Name = "notifyIconMenu";
-            notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            notifyIconMenu.Size = new System.Drawing.Size(114, 26);
-            // 
-            // btn_restore
-            // 
-            this.btn_restore.Image = global::Handbrake.Properties.Resources.Restore;
-            this.btn_restore.Name = "btn_restore";
-            this.btn_restore.Size = new System.Drawing.Size(113, 22);
-            this.btn_restore.Text = "Restore";
-            this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);
-            // 
-            // DVD_Save
-            // 
-            this.DVD_Save.Filter = "mp4|*.mp4;*.m4v|mkv|*.mkv";
-            this.DVD_Save.SupportMultiDottedExtensions = true;
-            // 
-            // ToolTip
-            // 
-            this.ToolTip.Active = false;
-            this.ToolTip.AutomaticDelay = 1000;
-            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
-            this.ToolTip.ToolTipTitle = "Tooltip";
-            // 
-            // text_destination
-            // 
-            this.text_destination.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.text_destination.Location = new System.Drawing.Point(36, 3);
-            this.text_destination.Name = "text_destination";
-            this.text_destination.Size = new System.Drawing.Size(603, 21);
-            this.text_destination.TabIndex = 1;
-            this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");
-            this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);
-            // 
-            // drp_videoEncoder
-            // 
-            this.drp_videoEncoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_videoEncoder.FormattingEnabled = true;
-            this.drp_videoEncoder.Items.AddRange(new object[] {
-            "H.264 (x264)",
-            "MPEG-4 (FFmpeg)",
-            "MPEG-2 (FFmpeg)",
-            "VP3 (Theora)"});
-            this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35);
-            this.drp_videoEncoder.Name = "drp_videoEncoder";
-            this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21);
-            this.drp_videoEncoder.TabIndex = 6;
-            this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");
-            this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);
-            // 
-            // check_largeFile
-            // 
-            this.check_largeFile.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_largeFile.AutoSize = true;
-            this.check_largeFile.BackColor = System.Drawing.Color.Transparent;
-            this.check_largeFile.Location = new System.Drawing.Point(179, 5);
-            this.check_largeFile.Name = "check_largeFile";
-            this.check_largeFile.Size = new System.Drawing.Size(91, 17);
-            this.check_largeFile.TabIndex = 2;
-            this.check_largeFile.Text = "Large file size";
-            this.ToolTip.SetToolTip(this.check_largeFile, "Caution: This option will likely break device compatibility with all but the Appl" +
-        "eTV Take 2.\r\nChecking this box enables a 64bit mp4 file which can be over 4GB.");
-            this.check_largeFile.UseVisualStyleBackColor = false;
-            // 
-            // check_turbo
-            // 
-            this.check_turbo.AutoSize = true;
-            this.check_turbo.BackColor = System.Drawing.Color.Transparent;
-            this.check_turbo.Enabled = false;
-            this.check_turbo.Location = new System.Drawing.Point(495, 134);
-            this.check_turbo.Name = "check_turbo";
-            this.check_turbo.Size = new System.Drawing.Size(101, 17);
-            this.check_turbo.TabIndex = 9;
-            this.check_turbo.Text = "Turbo first Pass";
-            this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");
-            this.check_turbo.UseVisualStyleBackColor = false;
-            // 
-            // drp_videoFramerate
-            // 
-            this.drp_videoFramerate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_videoFramerate.FormattingEnabled = true;
-            this.drp_videoFramerate.Items.AddRange(new object[] {
-            "Same as source",
-            "5",
-            "10",
-            "12",
-            "15",
-            "23.976",
-            "24",
-            "25",
-            "29.97",
-            "30",
-            "50",
-            "59.94",
-            "60"});
-            this.drp_videoFramerate.Location = new System.Drawing.Point(125, 62);
-            this.drp_videoFramerate.Name = "drp_videoFramerate";
-            this.drp_videoFramerate.Size = new System.Drawing.Size(125, 21);
-            this.drp_videoFramerate.TabIndex = 2;
-            this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases.");
-            this.drp_videoFramerate.SelectedIndexChanged += new System.EventHandler(this.drp_videoFramerate_SelectedIndexChanged);
-            // 
-            // slider_videoQuality
-            // 
-            this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window;
-            this.slider_videoQuality.Enabled = false;
-            this.slider_videoQuality.Location = new System.Drawing.Point(377, 60);
-            this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0);
-            this.slider_videoQuality.Maximum = 100;
-            this.slider_videoQuality.Name = "slider_videoQuality";
-            this.slider_videoQuality.Size = new System.Drawing.Size(322, 45);
-            this.slider_videoQuality.TabIndex = 13;
-            this.slider_videoQuality.TickFrequency = 17;
-            this.ToolTip.SetToolTip(this.slider_videoQuality, resources.GetString("slider_videoQuality.ToolTip"));
-            this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll);
-            // 
-            // text_bitrate
-            // 
-            this.text_bitrate.Location = new System.Drawing.Point(489, 107);
-            this.text_bitrate.Name = "text_bitrate";
-            this.text_bitrate.Size = new System.Drawing.Size(81, 21);
-            this.text_bitrate.TabIndex = 14;
-            this.ToolTip.SetToolTip(this.text_bitrate, resources.GetString("text_bitrate.ToolTip"));
-            // 
-            // check_optimiseMP4
-            // 
-            this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_optimiseMP4.AutoSize = true;
-            this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;
-            this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5);
-            this.check_optimiseMP4.Name = "check_optimiseMP4";
-            this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17);
-            this.check_optimiseMP4.TabIndex = 3;
-            this.check_optimiseMP4.Text = "Web optimized";
-            this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" +
-        " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +
-        "ly be used with H.264 ");
-            this.check_optimiseMP4.UseVisualStyleBackColor = false;
-            // 
-            // check_iPodAtom
-            // 
-            this.check_iPodAtom.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_iPodAtom.AutoSize = true;
-            this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;
-            this.check_iPodAtom.Location = new System.Drawing.Point(378, 5);
-            this.check_iPodAtom.Name = "check_iPodAtom";
-            this.check_iPodAtom.Size = new System.Drawing.Size(102, 17);
-            this.check_iPodAtom.TabIndex = 4;
-            this.check_iPodAtom.Text = "iPod 5G support";
-            this.ToolTip.SetToolTip(this.check_iPodAtom, "Support for legacy 5th Generation iPods.\r\nEncodes will not sync if this option is" +
-        " not enabled for H.264 encodes.");
-            this.check_iPodAtom.UseVisualStyleBackColor = false;
-            // 
-            // data_chpt
-            // 
-            this.data_chpt.AllowUserToAddRows = false;
-            this.data_chpt.AllowUserToDeleteRows = false;
-            this.data_chpt.AllowUserToResizeRows = false;
-            this.data_chpt.BackgroundColor = System.Drawing.Color.White;
-            this.data_chpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
-            this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.number,
-            this.name});
-            this.data_chpt.ContextMenuStrip = this.ChaptersMenu;
-            this.data_chpt.Location = new System.Drawing.Point(16, 55);
-            this.data_chpt.MultiSelect = false;
-            this.data_chpt.Name = "data_chpt";
-            this.data_chpt.RowHeadersVisible = false;
-            this.data_chpt.Size = new System.Drawing.Size(684, 236);
-            this.data_chpt.TabIndex = 3;
-            this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));
-            // 
-            // number
-            // 
-            dataGridViewCellStyle1.Format = "N0";
-            dataGridViewCellStyle1.NullValue = null;
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;
-            this.number.Frozen = true;
-            this.number.HeaderText = "Chapter Number";
-            this.number.MaxInputLength = 3;
-            this.number.Name = "number";
-            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.number.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.number.Width = 165;
-            // 
-            // name
-            // 
-            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.name.HeaderText = "Chapter Name";
-            this.name.Name = "name";
-            this.name.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // ChaptersMenu
-            // 
-            this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_resetChapters});
-            this.ChaptersMenu.Name = "presets_menu";
-            this.ChaptersMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.ChaptersMenu.Size = new System.Drawing.Size(188, 26);
-            this.ChaptersMenu.Text = ";";
-            // 
-            // mnu_resetChapters
-            // 
-            this.mnu_resetChapters.Name = "mnu_resetChapters";
-            this.mnu_resetChapters.Size = new System.Drawing.Size(187, 22);
-            this.mnu_resetChapters.Text = "Reset Chapter Names";
-            this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);
-            // 
-            // drop_format
-            // 
-            this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_format.FormattingEnabled = true;
-            this.drop_format.Items.AddRange(new object[] {
-            "MP4 File",
-            "MKV File"});
-            this.drop_format.Location = new System.Drawing.Point(67, 3);
-            this.drop_format.Name = "drop_format";
-            this.drop_format.Size = new System.Drawing.Size(106, 21);
-            this.drop_format.TabIndex = 1;
-            this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.\r\nHandBrake supports MKV and MP4(M4v)");
-            this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);
-            // 
-            // drop_chapterFinish
-            // 
-            this.drop_chapterFinish.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_chapterFinish.FormattingEnabled = true;
-            this.drop_chapterFinish.Location = new System.Drawing.Point(509, 3);
-            this.drop_chapterFinish.Name = "drop_chapterFinish";
-            this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);
-            this.drop_chapterFinish.TabIndex = 7;
-            this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)");
-            this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);
-            // 
-            // drop_chapterStart
-            // 
-            this.drop_chapterStart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_chapterStart.FormattingEnabled = true;
-            this.drop_chapterStart.Location = new System.Drawing.Point(383, 3);
-            this.drop_chapterStart.Name = "drop_chapterStart";
-            this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);
-            this.drop_chapterStart.TabIndex = 5;
-            this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)");
-            this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);
-            // 
-            // drop_angle
-            // 
-            this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_angle.FormattingEnabled = true;
-            this.drop_angle.Location = new System.Drawing.Point(209, 3);
-            this.drop_angle.Name = "drop_angle";
-            this.drop_angle.Size = new System.Drawing.Size(45, 21);
-            this.drop_angle.TabIndex = 3;
-            this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");
-            // 
-            // drp_dvdtitle
-            // 
-            this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_dvdtitle.DropDownWidth = 180;
-            this.drp_dvdtitle.FormattingEnabled = true;
-            this.drp_dvdtitle.Items.AddRange(new object[] {
-            "Automatic"});
-            this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);
-            this.drp_dvdtitle.Name = "drp_dvdtitle";
-            this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);
-            this.drp_dvdtitle.TabIndex = 1;
-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\n\r\nWhen a DVD is in use, HandBrake will try " +
-        "to determine the \"Main Feature\" title automatically.\r\nPlease note, this is not a" +
-        "lways accurate and should be checked.");
-            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);
-            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);
-            // 
-            // btn_importChapters
-            // 
-            this.btn_importChapters.AutoSize = true;
-            this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_importChapters.Location = new System.Drawing.Point(544, 28);
-            this.btn_importChapters.Name = "btn_importChapters";
-            this.btn_importChapters.Size = new System.Drawing.Size(75, 23);
-            this.btn_importChapters.TabIndex = 1;
-            this.btn_importChapters.Text = "Import";
-            this.ToolTip.SetToolTip(this.btn_importChapters, resources.GetString("btn_importChapters.ToolTip"));
-            this.btn_importChapters.UseVisualStyleBackColor = true;
-            this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);
-            // 
-            // btn_export
-            // 
-            this.btn_export.AutoSize = true;
-            this.btn_export.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_export.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_export.Location = new System.Drawing.Point(625, 28);
-            this.btn_export.Name = "btn_export";
-            this.btn_export.Size = new System.Drawing.Size(75, 23);
-            this.btn_export.TabIndex = 0;
-            this.btn_export.Text = "Export";
-            this.ToolTip.SetToolTip(this.btn_export, resources.GetString("btn_export.ToolTip"));
-            this.btn_export.UseVisualStyleBackColor = true;
-            this.btn_export.Click += new System.EventHandler(this.btn_export_Click);
-            // 
-            // drop_mode
-            // 
-            this.drop_mode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_mode.FormattingEnabled = true;
-            this.drop_mode.Items.AddRange(new object[] {
-            "Chapters",
-            "Seconds",
-            "Frames"});
-            this.drop_mode.Location = new System.Drawing.Point(295, 3);
-            this.drop_mode.Name = "drop_mode";
-            this.drop_mode.Size = new System.Drawing.Size(77, 21);
-            this.drop_mode.TabIndex = 4;
-            this.ToolTip.SetToolTip(this.drop_mode, resources.GetString("drop_mode.ToolTip"));
-            this.drop_mode.SelectedIndexChanged += new System.EventHandler(this.drop_mode_SelectedIndexChanged);
-            // 
-            // btn_generate_Query
-            // 
-            this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_generate_Query.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_generate_Query.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_generate_Query.Location = new System.Drawing.Point(16, 104);
-            this.btn_generate_Query.Name = "btn_generate_Query";
-            this.btn_generate_Query.Size = new System.Drawing.Size(126, 22);
-            this.btn_generate_Query.TabIndex = 2;
-            this.btn_generate_Query.Text = "Generate Query";
-            this.ToolTip.SetToolTip(this.btn_generate_Query, "This will allow you to override the generated query.\r\nNote, The query in the box " +
-        "below will always override any automatically generated query, even if you change" +
-        " title or source.");
-            this.btn_generate_Query.UseVisualStyleBackColor = true;
-            this.btn_generate_Query.Click += new System.EventHandler(this.btn_generate_Query_Click);
-            // 
-            // radio_cq
-            // 
-            this.radio_cq.AutoSize = true;
-            this.radio_cq.BackColor = System.Drawing.Color.Transparent;
-            this.radio_cq.Location = new System.Drawing.Point(366, 37);
-            this.radio_cq.Name = "radio_cq";
-            this.radio_cq.Size = new System.Drawing.Size(110, 17);
-            this.radio_cq.TabIndex = 3;
-            this.radio_cq.Text = "Constant Quality:";
-            this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));
-            this.radio_cq.UseVisualStyleBackColor = false;
-            this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged);
-            // 
-            // radio_avgBitrate
-            // 
-            this.radio_avgBitrate.AutoSize = true;
-            this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent;
-            this.radio_avgBitrate.Checked = true;
-            this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);
-            this.radio_avgBitrate.Name = "radio_avgBitrate";
-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);
-            this.radio_avgBitrate.TabIndex = 4;
-            this.radio_avgBitrate.TabStop = true;
-            this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";
-            this.ToolTip.SetToolTip(this.radio_avgBitrate, resources.GetString("radio_avgBitrate.ToolTip"));
-            this.radio_avgBitrate.UseVisualStyleBackColor = false;
-            this.radio_avgBitrate.CheckedChanged += new System.EventHandler(this.radio_avgBitrate_CheckedChanged);
-            // 
-            // check_2PassEncode
-            // 
-            this.check_2PassEncode.AutoSize = true;
-            this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;
-            this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);
-            this.check_2PassEncode.Name = "check_2PassEncode";
-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);
-            this.check_2PassEncode.TabIndex = 10;
-            this.check_2PassEncode.Text = "2-Pass Encoding";
-            this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));
-            this.check_2PassEncode.UseVisualStyleBackColor = false;
-            this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);
-            // 
-            // btn_file_source
-            // 
-            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;
-            this.btn_file_source.Name = "btn_file_source";
-            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.btn_file_source.Size = new System.Drawing.Size(182, 22);
-            this.btn_file_source.Text = "Video File";
-            this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);
-            // 
-            // treeView_presets
-            // 
-            this.treeView_presets.ContextMenuStrip = this.presets_menu;
-            this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue;
-            this.treeView_presets.FullRowSelect = true;
-            this.treeView_presets.HideSelection = false;
-            this.treeView_presets.ItemHeight = 21;
-            this.treeView_presets.Location = new System.Drawing.Point(0, 0);
-            this.treeView_presets.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
-            this.treeView_presets.Name = "treeView_presets";
-            this.treeView_presets.ShowLines = false;
-            this.treeView_presets.Size = new System.Drawing.Size(240, 424);
-            this.treeView_presets.TabIndex = 0;
-            this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);
-            this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);
-            this.treeView_presets.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseDown);
-            this.treeView_presets.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TreeViewPresetsMouseMove);
-            // 
-            // presets_menu
-            // 
-            this.presets_menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.pmnu_expandAll,
-            this.pmnu_collapse,
-            this.sep1,
-            this.pmnu_import,
-            this.toolStripSeparator2,
-            this.pmnu_saveChanges,
-            this.pmnu_delete});
-            this.presets_menu.Name = "presets_menu";
-            this.presets_menu.Size = new System.Drawing.Size(148, 126);
-            this.presets_menu.Text = ";";
-            this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);
-            // 
-            // pmnu_expandAll
-            // 
-            this.pmnu_expandAll.Name = "pmnu_expandAll";
-            this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22);
-            this.pmnu_expandAll.Text = "Expand All";
-            this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);
-            // 
-            // pmnu_collapse
-            // 
-            this.pmnu_collapse.Name = "pmnu_collapse";
-            this.pmnu_collapse.Size = new System.Drawing.Size(147, 22);
-            this.pmnu_collapse.Text = "Collapse All";
-            this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);
-            // 
-            // sep1
-            // 
-            this.sep1.Name = "sep1";
-            this.sep1.Size = new System.Drawing.Size(144, 6);
-            // 
-            // pmnu_import
-            // 
-            this.pmnu_import.Name = "pmnu_import";
-            this.pmnu_import.Size = new System.Drawing.Size(147, 22);
-            this.pmnu_import.Text = "Import";
-            this.pmnu_import.Click += new System.EventHandler(this.pmnu_import_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(144, 6);
-            // 
-            // pmnu_saveChanges
-            // 
-            this.pmnu_saveChanges.Name = "pmnu_saveChanges";
-            this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22);
-            this.pmnu_saveChanges.Text = "Save Changes";
-            this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click);
-            // 
-            // pmnu_delete
-            // 
-            this.pmnu_delete.Name = "pmnu_delete";
-            this.pmnu_delete.Size = new System.Drawing.Size(147, 22);
-            this.pmnu_delete.Text = "Delete";
-            this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);
-            // 
-            // DVD_Open
-            // 
-            this.DVD_Open.Description = "Select a VIDEO_TS folder or a folder which contains a collection of video files.";
-            // 
-            // File_Open
-            // 
-            this.File_Open.DefaultExt = "hb";
-            this.File_Open.Filter = "hb|*.hb";
-            // 
-            // ISO_Open
-            // 
-            this.ISO_Open.DefaultExt = "ISO";
-            this.ISO_Open.Filter = "All Files|*.*";
-            this.ISO_Open.RestoreDirectory = true;
-            this.ISO_Open.SupportMultiDottedExtensions = true;
-            // 
-            // FileToolStripMenuItem
-            // 
-            this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_killCLI,
-            this.mnu_exit});
-            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-            this.FileToolStripMenuItem.Text = "&File";
-            // 
-            // mnu_killCLI
-            // 
-            this.mnu_killCLI.Name = "mnu_killCLI";
-            this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);
-            this.mnu_killCLI.Text = "Cancel Scan";
-            this.mnu_killCLI.Visible = false;
-            this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);
-            // 
-            // mnu_exit
-            // 
-            this.mnu_exit.Name = "mnu_exit";
-            this.mnu_exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-            this.mnu_exit.Size = new System.Drawing.Size(138, 22);
-            this.mnu_exit.Text = "E&xit";
-            this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);
-            // 
-            // mnu_open3
-            // 
-            this.mnu_open3.Name = "mnu_open3";
-            this.mnu_open3.Size = new System.Drawing.Size(32, 19);
-            // 
-            // ToolsToolStripMenuItem
-            // 
-            this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_encode,
-            this.mnu_encodeLog,
-            this.ToolStripSeparator5,
-            this.mnu_options});
-            this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";
-            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
-            this.ToolsToolStripMenuItem.Text = "&Tools";
-            // 
-            // mnu_encode
-            // 
-            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;
-            this.mnu_encode.Name = "mnu_encode";
-            this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
-            this.mnu_encode.Size = new System.Drawing.Size(201, 22);
-            this.mnu_encode.Text = "Show Queue";
-            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);
-            // 
-            // mnu_encodeLog
-            // 
-            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;
-            this.mnu_encodeLog.Name = "mnu_encodeLog";
-            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));
-            this.mnu_encodeLog.Size = new System.Drawing.Size(201, 22);
-            this.mnu_encodeLog.Text = "Activity Window";
-            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);
-            // 
-            // ToolStripSeparator5
-            // 
-            this.ToolStripSeparator5.Name = "ToolStripSeparator5";
-            this.ToolStripSeparator5.Size = new System.Drawing.Size(198, 6);
-            // 
-            // mnu_options
-            // 
-            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;
-            this.mnu_options.Name = "mnu_options";
-            this.mnu_options.Size = new System.Drawing.Size(201, 22);
-            this.mnu_options.Text = "Options";
-            this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
-            // 
-            // frmMainMenu
-            // 
-            this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FileToolStripMenuItem,
-            this.ToolsToolStripMenuItem});
-            this.frmMainMenu.Location = new System.Drawing.Point(0, 0);
-            this.frmMainMenu.Name = "frmMainMenu";
-            this.frmMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.frmMainMenu.Size = new System.Drawing.Size(1002, 24);
-            this.frmMainMenu.TabIndex = 0;
-            this.frmMainMenu.TabStop = true;
-            this.frmMainMenu.Text = "MenuStrip";
-            // 
-            // label5
-            // 
-            this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label5.AutoSize = true;
-            this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(3, 7);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(58, 13);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Container:";
-            // 
-            // Label47
-            // 
-            this.Label47.AutoSize = true;
-            this.Label47.BackColor = System.Drawing.Color.Transparent;
-            this.Label47.ForeColor = System.Drawing.Color.Black;
-            this.Label47.Location = new System.Drawing.Point(13, 39);
-            this.Label47.Name = "Label47";
-            this.Label47.Size = new System.Drawing.Size(70, 13);
-            this.Label47.TabIndex = 7;
-            this.Label47.Text = "Video Codec:";
-            // 
-            // Label3
-            // 
-            this.Label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.Label3.AutoSize = true;
-            this.Label3.ForeColor = System.Drawing.Color.Black;
-            this.Label3.Location = new System.Drawing.Point(3, 8);
-            this.Label3.Name = "Label3";
-            this.Label3.Size = new System.Drawing.Size(27, 13);
-            this.Label3.TabIndex = 0;
-            this.Label3.Text = "File:";
-            // 
-            // tab_audio
-            // 
-            this.tab_audio.BackColor = System.Drawing.Color.Transparent;
-            this.tab_audio.Controls.Add(this.AudioSettings);
-            this.tab_audio.Location = new System.Drawing.Point(4, 22);
-            this.tab_audio.Name = "tab_audio";
-            this.tab_audio.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_audio.Size = new System.Drawing.Size(724, 308);
-            this.tab_audio.TabIndex = 3;
-            this.tab_audio.Text = "Audio";
-            this.tab_audio.UseVisualStyleBackColor = true;
-            // 
-            // AudioSettings
-            // 
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);
-            this.AudioSettings.Name = "AudioSettings";
-            allowedPassthru1.AudioAllowAACPass = true;
-            allowedPassthru1.AudioAllowAC3Pass = true;
-            allowedPassthru1.AudioAllowDTSHDPass = true;
-            allowedPassthru1.AudioAllowDTSPass = true;
-            allowedPassthru1.AudioAllowMP3Pass = true;
-            allowedPassthru1.AudioEncoderFallback = HandBrake.Interop.Model.Encoding.AudioEncoder.Ac3;
-            this.AudioSettings.PassthruSettings = allowedPassthru1;
-            this.AudioSettings.Size = new System.Drawing.Size(720, 310);
-            this.AudioSettings.TabIndex = 0;
-            // 
-            // AudioMenuRowHeightHack
-            // 
-            this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-            this.AudioMenuRowHeightHack.ImageSize = new System.Drawing.Size(1, 18);
-            this.AudioMenuRowHeightHack.TransparentColor = System.Drawing.Color.Transparent;
-            // 
-            // tab_video
-            // 
-            this.tab_video.BackColor = System.Drawing.Color.Transparent;
-            this.tab_video.Controls.Add(this.panel1);
-            this.tab_video.Controls.Add(this.drp_videoFramerate);
-            this.tab_video.Controls.Add(this.radio_cq);
-            this.tab_video.Controls.Add(this.radio_avgBitrate);
-            this.tab_video.Controls.Add(this.drp_videoEncoder);
-            this.tab_video.Controls.Add(this.Label47);
-            this.tab_video.Controls.Add(this.label25);
-            this.tab_video.Controls.Add(this.check_turbo);
-            this.tab_video.Controls.Add(this.check_2PassEncode);
-            this.tab_video.Controls.Add(this.Label2);
-            this.tab_video.Controls.Add(this.slider_videoQuality);
-            this.tab_video.Controls.Add(this.text_bitrate);
-            this.tab_video.Controls.Add(this.lbl_SliderValue);
-            this.tab_video.Controls.Add(this.lbl_framerate);
-            this.tab_video.Location = new System.Drawing.Point(4, 22);
-            this.tab_video.Name = "tab_video";
-            this.tab_video.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_video.Size = new System.Drawing.Size(724, 308);
-            this.tab_video.TabIndex = 2;
-            this.tab_video.Text = "Video";
-            this.tab_video.UseVisualStyleBackColor = true;
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.radio_constantFramerate);
-            this.panel1.Controls.Add(this.radio_peakAndVariable);
-            this.panel1.Location = new System.Drawing.Point(125, 92);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(184, 59);
-            this.panel1.TabIndex = 20;
-            // 
-            // radio_constantFramerate
-            // 
-            this.radio_constantFramerate.AutoSize = true;
-            this.radio_constantFramerate.BackColor = System.Drawing.Color.Transparent;
-            this.radio_constantFramerate.Checked = true;
-            this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0);
-            this.radio_constantFramerate.Name = "radio_constantFramerate";
-            this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);
-            this.radio_constantFramerate.TabIndex = 17;
-            this.radio_constantFramerate.TabStop = true;
-            this.radio_constantFramerate.Text = "Constant Framerate";
-            this.radio_constantFramerate.UseVisualStyleBackColor = false;
-            // 
-            // radio_peakAndVariable
-            // 
-            this.radio_peakAndVariable.AutoSize = true;
-            this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;
-            this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);
-            this.radio_peakAndVariable.Name = "radio_peakAndVariable";
-            this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);
-            this.radio_peakAndVariable.TabIndex = 19;
-            this.radio_peakAndVariable.Text = "Variable Framerate";
-            this.radio_peakAndVariable.UseVisualStyleBackColor = false;
-            // 
-            // label25
-            // 
-            this.label25.AutoSize = true;
-            this.label25.BackColor = System.Drawing.Color.Transparent;
-            this.label25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label25.Location = new System.Drawing.Point(13, 13);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(38, 13);
-            this.label25.TabIndex = 8;
-            this.label25.Text = "Video";
-            // 
-            // Label2
-            // 
-            this.Label2.AutoSize = true;
-            this.Label2.BackColor = System.Drawing.Color.Transparent;
-            this.Label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label2.Location = new System.Drawing.Point(363, 13);
-            this.Label2.Name = "Label2";
-            this.Label2.Size = new System.Drawing.Size(47, 13);
-            this.Label2.TabIndex = 11;
-            this.Label2.Text = "Quality";
-            // 
-            // lbl_SliderValue
-            // 
-            this.lbl_SliderValue.AutoSize = true;
-            this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbl_SliderValue.Location = new System.Drawing.Point(487, 39);
-            this.lbl_SliderValue.Name = "lbl_SliderValue";
-            this.lbl_SliderValue.Size = new System.Drawing.Size(21, 13);
-            this.lbl_SliderValue.TabIndex = 15;
-            this.lbl_SliderValue.Text = "RF";
-            // 
-            // lbl_framerate
-            // 
-            this.lbl_framerate.AutoSize = true;
-            this.lbl_framerate.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_framerate.Location = new System.Drawing.Point(13, 65);
-            this.lbl_framerate.Name = "lbl_framerate";
-            this.lbl_framerate.Size = new System.Drawing.Size(90, 13);
-            this.lbl_framerate.TabIndex = 16;
-            this.lbl_framerate.Text = "Framerate (FPS):";
-            // 
-            // tab_picture
-            // 
-            this.tab_picture.BackColor = System.Drawing.Color.Transparent;
-            this.tab_picture.Controls.Add(this.PictureSettings);
-            this.tab_picture.Location = new System.Drawing.Point(4, 22);
-            this.tab_picture.Name = "tab_picture";
-            this.tab_picture.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_picture.Size = new System.Drawing.Size(724, 308);
-            this.tab_picture.TabIndex = 0;
-            this.tab_picture.Text = "Picture";
-            this.tab_picture.UseVisualStyleBackColor = true;
-            // 
-            // PictureSettings
-            // 
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
-            this.PictureSettings.CurrentlySelectedPreset = null;
-            this.PictureSettings.Enabled = false;
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);
-            this.PictureSettings.Name = "PictureSettings";
-            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);
-            this.PictureSettings.SizeSet = false;
-            this.PictureSettings.TabIndex = 0;
-            // 
-            // Check_ChapterMarkers
-            // 
-            this.Check_ChapterMarkers.AutoSize = true;
-            this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;
-            this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);
-            this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";
-            this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);
-            this.Check_ChapterMarkers.TabIndex = 4;
-            this.Check_ChapterMarkers.Text = "Create chapter markers";
-            this.Check_ChapterMarkers.UseVisualStyleBackColor = false;
-            this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);
-            // 
-            // tabs_panel
-            // 
-            this.tabs_panel.Controls.Add(this.tab_picture);
-            this.tabs_panel.Controls.Add(this.tab_filters);
-            this.tabs_panel.Controls.Add(this.tab_video);
-            this.tabs_panel.Controls.Add(this.tab_audio);
-            this.tabs_panel.Controls.Add(this.tab_subtitles);
-            this.tabs_panel.Controls.Add(this.tab_chapters);
-            this.tabs_panel.Controls.Add(this.tab_advanced);
-            this.tabs_panel.Controls.Add(this.tab_query);
-            this.tabs_panel.Location = new System.Drawing.Point(12, 218);
-            this.tabs_panel.Name = "tabs_panel";
-            this.tabs_panel.SelectedIndex = 0;
-            this.tabs_panel.Size = new System.Drawing.Size(732, 334);
-            this.tabs_panel.TabIndex = 6;
-            // 
-            // tab_filters
-            // 
-            this.tab_filters.Controls.Add(this.Filters);
-            this.tab_filters.Location = new System.Drawing.Point(4, 22);
-            this.tab_filters.Name = "tab_filters";
-            this.tab_filters.Size = new System.Drawing.Size(724, 308);
-            this.tab_filters.TabIndex = 1;
-            this.tab_filters.Text = "Video Filters";
-            this.tab_filters.UseVisualStyleBackColor = true;
-            // 
-            // Filters
-            // 
-            this.Filters.BackColor = System.Drawing.Color.Transparent;
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Filters.Location = new System.Drawing.Point(0, 0);
-            this.Filters.Name = "Filters";
-            this.Filters.Size = new System.Drawing.Size(713, 310);
-            this.Filters.TabIndex = 0;
-            // 
-            // tab_subtitles
-            // 
-            this.tab_subtitles.Controls.Add(this.Subtitles);
-            this.tab_subtitles.Location = new System.Drawing.Point(4, 22);
-            this.tab_subtitles.Name = "tab_subtitles";
-            this.tab_subtitles.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_subtitles.Size = new System.Drawing.Size(724, 308);
-            this.tab_subtitles.TabIndex = 4;
-            this.tab_subtitles.Text = "Subtitles";
-            this.tab_subtitles.UseVisualStyleBackColor = true;
-            // 
-            // Subtitles
-            // 
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);
-            this.Subtitles.Name = "Subtitles";
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);
-            this.Subtitles.TabIndex = 0;
-            // 
-            // tab_chapters
-            // 
-            this.tab_chapters.BackColor = System.Drawing.Color.Transparent;
-            this.tab_chapters.Controls.Add(this.btn_export);
-            this.tab_chapters.Controls.Add(this.btn_importChapters);
-            this.tab_chapters.Controls.Add(this.label31);
-            this.tab_chapters.Controls.Add(this.data_chpt);
-            this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);
-            this.tab_chapters.Location = new System.Drawing.Point(4, 22);
-            this.tab_chapters.Name = "tab_chapters";
-            this.tab_chapters.Size = new System.Drawing.Size(724, 308);
-            this.tab_chapters.TabIndex = 5;
-            this.tab_chapters.Text = "Chapters";
-            this.tab_chapters.UseVisualStyleBackColor = true;
-            // 
-            // label31
-            // 
-            this.label31.AutoSize = true;
-            this.label31.BackColor = System.Drawing.Color.Transparent;
-            this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label31.Location = new System.Drawing.Point(13, 13);
-            this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(102, 13);
-            this.label31.TabIndex = 2;
-            this.label31.Text = "Chapter Markers";
-            // 
-            // tab_advanced
-            // 
-            this.tab_advanced.BackColor = System.Drawing.Color.Transparent;
-            this.tab_advanced.Controls.Add(this.advancedEncoderOpts);
-            this.tab_advanced.Controls.Add(this.x264Panel);
-            this.tab_advanced.Location = new System.Drawing.Point(4, 22);
-            this.tab_advanced.Name = "tab_advanced";
-            this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_advanced.Size = new System.Drawing.Size(724, 308);
-            this.tab_advanced.TabIndex = 6;
-            this.tab_advanced.Text = "Advanced";
-            this.tab_advanced.UseVisualStyleBackColor = true;
-            // 
-            // advancedEncoderOpts
-            // 
-            this.advancedEncoderOpts.AdavancedQuery = "";
-            this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent;
-            this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0);
-            this.advancedEncoderOpts.Name = "advancedEncoderOpts";
-            this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209);
-            this.advancedEncoderOpts.TabIndex = 1;
-            // 
-            // x264Panel
-            // 
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);
-            this.x264Panel.Name = "x264Panel";
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);
-            this.x264Panel.TabIndex = 0;
-            this.x264Panel.X264Query = "";
-            // 
-            // tab_query
-            // 
-            this.tab_query.Controls.Add(this.btn_clear);
-            this.tab_query.Controls.Add(this.label34);
-            this.tab_query.Controls.Add(this.btn_generate_Query);
-            this.tab_query.Controls.Add(this.label33);
-            this.tab_query.Controls.Add(this.rtf_query);
-            this.tab_query.Location = new System.Drawing.Point(4, 22);
-            this.tab_query.Name = "tab_query";
-            this.tab_query.Size = new System.Drawing.Size(724, 308);
-            this.tab_query.TabIndex = 7;
-            this.tab_query.Text = "Query Editor";
-            this.tab_query.UseVisualStyleBackColor = true;
-            // 
-            // btn_clear
-            // 
-            this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_clear.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_clear.Location = new System.Drawing.Point(634, 104);
-            this.btn_clear.Name = "btn_clear";
-            this.btn_clear.Size = new System.Drawing.Size(75, 22);
-            this.btn_clear.TabIndex = 0;
-            this.btn_clear.Text = "Clear";
-            this.btn_clear.UseVisualStyleBackColor = true;
-            this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click);
-            // 
-            // label34
-            // 
-            this.label34.AutoSize = true;
-            this.label34.Location = new System.Drawing.Point(13, 35);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(631, 52);
-            this.label34.TabIndex = 1;
-            this.label34.Text = resources.GetString("label34.Text");
-            // 
-            // label33
-            // 
-            this.label33.AutoSize = true;
-            this.label33.BackColor = System.Drawing.Color.Transparent;
-            this.label33.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label33.Location = new System.Drawing.Point(13, 13);
-            this.label33.Name = "label33";
-            this.label33.Size = new System.Drawing.Size(77, 13);
-            this.label33.TabIndex = 3;
-            this.label33.Text = "Query Editor";
-            // 
-            // rtf_query
-            // 
-            this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.rtf_query.Location = new System.Drawing.Point(16, 132);
-            this.rtf_query.Name = "rtf_query";
-            this.rtf_query.Size = new System.Drawing.Size(693, 161);
-            this.rtf_query.TabIndex = 4;
-            this.rtf_query.Text = "";
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.splitContainer1);
-            this.groupBox2.ForeColor = System.Drawing.Color.Black;
-            this.groupBox2.Location = new System.Drawing.Point(750, 70);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(246, 482);
-            this.groupBox2.TabIndex = 4;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "Presets";
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(3, 17);
-            this.splitContainer1.Name = "splitContainer1";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.treeView_presets);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.presetsToolStrip);
-            this.splitContainer1.Size = new System.Drawing.Size(240, 462);
-            this.splitContainer1.SplitterDistance = 424;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // presetsToolStrip
-            // 
-            this.presetsToolStrip.CanOverflow = false;
-            this.presetsToolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.presetsToolStrip.GripMargin = new System.Windows.Forms.Padding(0);
-            this.presetsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.presetsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.BtnAddPreset,
-            this.BtnRemovePreset,
-            this.toolStripDropDownButton2});
-            this.presetsToolStrip.Location = new System.Drawing.Point(0, 0);
-            this.presetsToolStrip.Name = "presetsToolStrip";
-            this.presetsToolStrip.Padding = new System.Windows.Forms.Padding(0);
-            this.presetsToolStrip.Size = new System.Drawing.Size(240, 34);
-            this.presetsToolStrip.TabIndex = 2;
-            this.presetsToolStrip.Text = "toolStrip2";
-            // 
-            // BtnAddPreset
-            // 
-            this.BtnAddPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.BtnAddPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.BtnAddPreset.Image = global::Handbrake.Properties.Resources.Add16;
-            this.BtnAddPreset.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.BtnAddPreset.Name = "BtnAddPreset";
-            this.BtnAddPreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
-            this.BtnAddPreset.Padding = new System.Windows.Forms.Padding(8, 0, 8, 0);
-            this.BtnAddPreset.Size = new System.Drawing.Size(65, 31);
-            this.BtnAddPreset.Text = "Add";
-            this.BtnAddPreset.Click += new System.EventHandler(this.BtnAddPreset_Click);
-            // 
-            // BtnRemovePreset
-            // 
-            this.BtnRemovePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.BtnRemovePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.BtnRemovePreset.Image = global::Handbrake.Properties.Resources.Close;
-            this.BtnRemovePreset.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.BtnRemovePreset.Name = "BtnRemovePreset";
-            this.BtnRemovePreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
-            this.BtnRemovePreset.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
-            this.BtnRemovePreset.Size = new System.Drawing.Size(82, 31);
-            this.BtnRemovePreset.Text = "Remove";
-            this.BtnRemovePreset.Click += new System.EventHandler(this.BtnRemovePreset_Click);
-            // 
-            // toolStripDropDownButton2
-            // 
-            this.toolStripDropDownButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MnuSetDefaultPreset,
-            this.toolStripSeparator3,
-            this.MnuImportPreset,
-            this.MnuExportPreset,
-            this.toolStripSeparator6,
-            this.MnuResetBuiltInPresets});
-            this.toolStripDropDownButton2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.toolStripDropDownButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.toolStripDropDownButton2.Image = global::Handbrake.Properties.Resources.Options24;
-            this.toolStripDropDownButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripDropDownButton2.Name = "toolStripDropDownButton2";
-            this.toolStripDropDownButton2.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
-            this.toolStripDropDownButton2.Size = new System.Drawing.Size(79, 31);
-            this.toolStripDropDownButton2.Text = "Options";
-            // 
-            // MnuSetDefaultPreset
-            // 
-            this.MnuSetDefaultPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuSetDefaultPreset.Name = "MnuSetDefaultPreset";
-            this.MnuSetDefaultPreset.Size = new System.Drawing.Size(178, 22);
-            this.MnuSetDefaultPreset.Text = "Set Default";
-            this.MnuSetDefaultPreset.Click += new System.EventHandler(this.MnuSetDefaultPreset_Click);
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(175, 6);
-            // 
-            // MnuImportPreset
-            // 
-            this.MnuImportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuImportPreset.Name = "MnuImportPreset";
-            this.MnuImportPreset.Size = new System.Drawing.Size(178, 22);
-            this.MnuImportPreset.Text = "Import";
-            this.MnuImportPreset.Click += new System.EventHandler(this.MnuImportPreset_Click);
-            // 
-            // MnuExportPreset
-            // 
-            this.MnuExportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuExportPreset.Name = "MnuExportPreset";
-            this.MnuExportPreset.Size = new System.Drawing.Size(178, 22);
-            this.MnuExportPreset.Text = "Export";
-            this.MnuExportPreset.Click += new System.EventHandler(this.MnuExportPreset_Click);
-            // 
-            // toolStripSeparator6
-            // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6);
-            // 
-            // MnuResetBuiltInPresets
-            // 
-            this.MnuResetBuiltInPresets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuResetBuiltInPresets.Name = "MnuResetBuiltInPresets";
-            this.MnuResetBuiltInPresets.Size = new System.Drawing.Size(178, 22);
-            this.MnuResetBuiltInPresets.Text = "Reset Built-In Presets";
-            this.MnuResetBuiltInPresets.Click += new System.EventHandler(this.MnuResetBuiltInPresets_Click);
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.btn_source,
-            this.toolStripSeparator10,
-            this.btn_start,
-            this.btn_add2Queue,
-            this.btn_showQueue,
-            this.toolStripSeparator4,
-            this.tb_preview,
-            this.btn_ActivityWindow,
-            this.toolStripSeparator8,
-            this.toolStripDropDownButton1});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 24);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.toolStrip1.Size = new System.Drawing.Size(1002, 39);
-            this.toolStrip1.TabIndex = 1;
-            this.toolStrip1.TabStop = true;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // btn_source
-            // 
-            this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.btn_file_source,
-            this.btn_dvd_source,
-            this.btnTitleSpecific,
-            this.toolStripSeparator1});
-            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;
-            this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_source.Name = "btn_source";
-            this.btn_source.Size = new System.Drawing.Size(88, 36);
-            this.btn_source.Text = "Source";
-            this.btn_source.ToolTipText = "Open a new source file or folder.";
-            this.btn_source.Click += new System.EventHandler(this.btn_source_Click);
-            // 
-            // btn_dvd_source
-            // 
-            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;
-            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_dvd_source.Name = "btn_dvd_source";
-            this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.O)));
-            this.btn_dvd_source.Size = new System.Drawing.Size(182, 22);
-            this.btn_dvd_source.Text = "Folder";
-            this.btn_dvd_source.Click += new System.EventHandler(this.BtnFolderScanClicked);
-            // 
-            // btnTitleSpecific
-            // 
-            this.btnTitleSpecific.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FileTitleSpecificScan,
-            this.FolderTitleSpecificScan});
-            this.btnTitleSpecific.Name = "btnTitleSpecific";
-            this.btnTitleSpecific.Size = new System.Drawing.Size(182, 22);
-            this.btnTitleSpecific.Text = "Title Specific Scan";
-            // 
-            // FileTitleSpecificScan
-            // 
-            this.FileTitleSpecificScan.Image = global::Handbrake.Properties.Resources.Movies_Small;
-            this.FileTitleSpecificScan.Name = "FileTitleSpecificScan";
-            this.FileTitleSpecificScan.Size = new System.Drawing.Size(125, 22);
-            this.FileTitleSpecificScan.Text = "Video File";
-            this.FileTitleSpecificScan.Click += new System.EventHandler(this.VideoTitleSpecificScanClick);
-            // 
-            // FolderTitleSpecificScan
-            // 
-            this.FolderTitleSpecificScan.Image = global::Handbrake.Properties.Resources.folder;
-            this.FolderTitleSpecificScan.Name = "FolderTitleSpecificScan";
-            this.FolderTitleSpecificScan.Size = new System.Drawing.Size(125, 22);
-            this.FolderTitleSpecificScan.Text = "Folder";
-            this.FolderTitleSpecificScan.Click += new System.EventHandler(this.FolderTitleSpecificScanClick);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(179, 6);
-            // 
-            // toolStripSeparator10
-            // 
-            this.toolStripSeparator10.Name = "toolStripSeparator10";
-            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);
-            // 
-            // btn_start
-            // 
-            this.btn_start.Image = global::Handbrake.Properties.Resources.Play;
-            this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_start.Name = "btn_start";
-            this.btn_start.Size = new System.Drawing.Size(67, 36);
-            this.btn_start.Text = "Start";
-            this.btn_start.ToolTipText = "Start the encoding process";
-            this.btn_start.Click += new System.EventHandler(this.btn_start_Click);
-            // 
-            // btn_add2Queue
-            // 
-            this.btn_add2Queue.DropDownButtonWidth = 20;
-            this.btn_add2Queue.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_AddAllTitles,
-            this.mnu_AddTittleRange});
-            this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;
-            this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_add2Queue.Name = "btn_add2Queue";
-            this.btn_add2Queue.Size = new System.Drawing.Size(138, 36);
-            this.btn_add2Queue.Text = "Add to Queue";
-            this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";
-            this.btn_add2Queue.ButtonClick += new System.EventHandler(this.btn_add2Queue_Click);
-            // 
-            // mnu_AddAllTitles
-            // 
-            this.mnu_AddAllTitles.Name = "mnu_AddAllTitles";
-            this.mnu_AddAllTitles.Size = new System.Drawing.Size(192, 22);
-            this.mnu_AddAllTitles.Text = "Add All (Experimental)";
-            this.mnu_AddAllTitles.ToolTipText = "Add all titles to the queue.\r\nUse caution with this feature as incorrect usage ma" +
-    "y result in a queue of failed encodes.";
-            this.mnu_AddAllTitles.Click += new System.EventHandler(this.mnu_AddAllTitles_Click);
-            // 
-            // mnu_AddTittleRange
-            // 
-            this.mnu_AddTittleRange.Name = "mnu_AddTittleRange";
-            this.mnu_AddTittleRange.Size = new System.Drawing.Size(192, 22);
-            this.mnu_AddTittleRange.Text = "Add Range";
-            this.mnu_AddTittleRange.Visible = false;
-            this.mnu_AddTittleRange.Click += new System.EventHandler(this.mnu_AddTittleRange_Click);
-            // 
-            // btn_showQueue
-            // 
-            this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue;
-            this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_showQueue.Name = "btn_showQueue";
-            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);
-            this.btn_showQueue.Tag = "";
-            this.btn_showQueue.Text = "Show Queue";
-            this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);
-            // 
-            // tb_preview
-            // 
-            this.tb_preview.Image = global::Handbrake.Properties.Resources.window;
-            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tb_preview.Name = "tb_preview";
-            this.tb_preview.Size = new System.Drawing.Size(84, 36);
-            this.tb_preview.Text = "Preview";
-            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);
-            // 
-            // btn_ActivityWindow
-            // 
-            this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;
-            this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_ActivityWindow.Name = "btn_ActivityWindow";
-            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);
-            this.btn_ActivityWindow.Text = "Activity Window";
-            this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +
-    "ently running encode.";
-            this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);
-            // 
-            // toolStripSeparator8
-            // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
-            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);
-            // 
-            // toolStripDropDownButton1
-            // 
-            this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolStripDropDownButton1.AutoSize = false;
-            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MnuUserGuide,
-            this.toolStripSeparator9,
-            this.MnuCheckForUpdates,
-            this.toolStripSeparator11,
-            this.MnuAboutHandBrake});
-            this.toolStripDropDownButton1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Help24;
-            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripDropDownButton1.Margin = new System.Windows.Forms.Padding(0, 1, 8, 2);
-            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            this.toolStripDropDownButton1.Size = new System.Drawing.Size(69, 36);
-            this.toolStripDropDownButton1.Text = "Help";
-            // 
-            // MnuUserGuide
-            // 
-            this.MnuUserGuide.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuUserGuide.Image = global::Handbrake.Properties.Resources.info16;
-            this.MnuUserGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.MnuUserGuide.Name = "MnuUserGuide";
-            this.MnuUserGuide.Size = new System.Drawing.Size(192, 24);
-            this.MnuUserGuide.Text = "HandBrake User Guide";
-            this.MnuUserGuide.Click += new System.EventHandler(this.MnuUserGuide_Click);
-            // 
-            // toolStripSeparator9
-            // 
-            this.toolStripSeparator9.Name = "toolStripSeparator9";
-            this.toolStripSeparator9.Size = new System.Drawing.Size(189, 6);
-            // 
-            // MnuCheckForUpdates
-            // 
-            this.MnuCheckForUpdates.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuCheckForUpdates.Name = "MnuCheckForUpdates";
-            this.MnuCheckForUpdates.Size = new System.Drawing.Size(192, 24);
-            this.MnuCheckForUpdates.Text = "Check for Updates";
-            this.MnuCheckForUpdates.Click += new System.EventHandler(this.MnuCheckForUpdates_Click);
-            // 
-            // toolStripSeparator11
-            // 
-            this.toolStripSeparator11.Name = "toolStripSeparator11";
-            this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6);
-            // 
-            // MnuAboutHandBrake
-            // 
-            this.MnuAboutHandBrake.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MnuAboutHandBrake.Image = global::Handbrake.Properties.Resources.hb16;
-            this.MnuAboutHandBrake.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.MnuAboutHandBrake.Name = "MnuAboutHandBrake";
-            this.MnuAboutHandBrake.Size = new System.Drawing.Size(192, 24);
-            this.MnuAboutHandBrake.Text = "About HandBrake";
-            this.MnuAboutHandBrake.Click += new System.EventHandler(this.MnuAboutHandBrake_Click);
-            // 
-            // notifyIcon
-            // 
-            this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
-            this.notifyIcon.BalloonTipText = "HandBrake Status Here";
-            this.notifyIcon.BalloonTipTitle = "HandBrake";
-            this.notifyIcon.ContextMenuStrip = notifyIconMenu;
-            this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
-            this.notifyIcon.Text = "HandBrake";
-            this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
-            // 
-            // StatusStrip
-            // 
-            this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ProgressBarStatus,
-            this.lbl_encode,
-            this.lbl_updateCheck,
-            this.lbl_libhb_warning});
-            this.StatusStrip.Location = new System.Drawing.Point(0, 561);
-            this.StatusStrip.Name = "StatusStrip";
-            this.StatusStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.StatusStrip.Size = new System.Drawing.Size(1002, 22);
-            this.StatusStrip.SizingGrip = false;
-            this.StatusStrip.TabIndex = 7;
-            this.StatusStrip.Text = "statusStrip1";
-            // 
-            // ProgressBarStatus
-            // 
-            this.ProgressBarStatus.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.ProgressBarStatus.Name = "ProgressBarStatus";
-            this.ProgressBarStatus.Size = new System.Drawing.Size(100, 16);
-            this.ProgressBarStatus.Visible = false;
-            // 
-            // lbl_encode
-            // 
-            this.lbl_encode.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbl_encode.Name = "lbl_encode";
-            this.lbl_encode.Size = new System.Drawing.Size(28, 17);
-            this.lbl_encode.Text = "{0}";
-            // 
-            // lbl_updateCheck
-            // 
-            this.lbl_updateCheck.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_updateCheck.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.lbl_updateCheck.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbl_updateCheck.Name = "lbl_updateCheck";
-            this.lbl_updateCheck.Size = new System.Drawing.Size(139, 17);
-            this.lbl_updateCheck.Text = "Checking for Updates ...";
-            this.lbl_updateCheck.Visible = false;
-            // 
-            // lbl_libhb_warning
-            // 
-            this.lbl_libhb_warning.ForeColor = System.Drawing.Color.Red;
-            this.lbl_libhb_warning.Name = "lbl_libhb_warning";
-            this.lbl_libhb_warning.Size = new System.Drawing.Size(198, 17);
-            this.lbl_libhb_warning.Text = "Warning: Experimental LibHB in use!";
-            this.lbl_libhb_warning.Visible = false;
-            // 
-            // hbproc
-            // 
-            this.hbproc.StartInfo.Domain = "";
-            this.hbproc.StartInfo.LoadUserProfile = false;
-            this.hbproc.StartInfo.Password = null;
-            this.hbproc.StartInfo.StandardErrorEncoding = null;
-            this.hbproc.StartInfo.StandardOutputEncoding = null;
-            this.hbproc.StartInfo.UserName = "";
-            this.hbproc.SynchronizingObject = this;
-            // 
-            // File_Save
-            // 
-            this.File_Save.DefaultExt = "hb";
-            this.File_Save.Filter = "hb|*.hb";
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.AutoSize = true;
-            this.tableLayoutPanel2.ColumnCount = 3;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel2.Controls.Add(this.Label3, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.text_destination, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.btn_destBrowse, 2, 0);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(21, 132);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(723, 29);
-            this.tableLayoutPanel2.TabIndex = 3;
-            // 
-            // btn_destBrowse
-            // 
-            this.btn_destBrowse.AutoSize = true;
-            this.btn_destBrowse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_destBrowse.Location = new System.Drawing.Point(645, 3);
-            this.btn_destBrowse.Name = "btn_destBrowse";
-            this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);
-            this.btn_destBrowse.TabIndex = 2;
-            this.btn_destBrowse.Text = "Browse";
-            this.btn_destBrowse.UseVisualStyleBackColor = true;
-            this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.AutoSize = true;
-            this.tableLayoutPanel3.ColumnCount = 5;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel3.Controls.Add(this.label5, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.drop_format, 1, 0);
-            this.tableLayoutPanel3.Controls.Add(this.check_largeFile, 2, 0);
-            this.tableLayoutPanel3.Controls.Add(this.check_optimiseMP4, 3, 0);
-            this.tableLayoutPanel3.Controls.Add(this.check_iPodAtom, 4, 0);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(21, 180);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 1;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(723, 27);
-            this.tableLayoutPanel3.TabIndex = 5;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSize = true;
-            this.tableLayoutPanel1.ColumnCount = 12;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 5F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.Label10, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.drp_dvdtitle, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_angle, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.drop_angle, 3, 0);
-            this.tableLayoutPanel1.Controls.Add(this.drop_chapterStart, 7, 0);
-            this.tableLayoutPanel1.Controls.Add(this.Label13, 8, 0);
-            this.tableLayoutPanel1.Controls.Add(this.drop_chapterFinish, 9, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label_duration, 10, 0);
-            this.tableLayoutPanel1.Controls.Add(this.lbl_duration, 11, 0);
-            this.tableLayoutPanel1.Controls.Add(this.drop_mode, 5, 0);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(21, 86);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 1;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 28);
-            this.tableLayoutPanel1.TabIndex = 2;
-            // 
-            // Label10
-            // 
-            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.Label10.AutoSize = true;
-            this.Label10.ForeColor = System.Drawing.Color.Black;
-            this.Label10.Location = new System.Drawing.Point(3, 7);
-            this.Label10.Name = "Label10";
-            this.Label10.Size = new System.Drawing.Size(31, 13);
-            this.Label10.TabIndex = 0;
-            this.Label10.Text = "Title:";
-            // 
-            // lbl_angle
-            // 
-            this.lbl_angle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.lbl_angle.AutoSize = true;
-            this.lbl_angle.ForeColor = System.Drawing.Color.Black;
-            this.lbl_angle.Location = new System.Drawing.Point(165, 7);
-            this.lbl_angle.Name = "lbl_angle";
-            this.lbl_angle.Size = new System.Drawing.Size(38, 13);
-            this.lbl_angle.TabIndex = 2;
-            this.lbl_angle.Text = "Angle:";
-            // 
-            // Label13
-            // 
-            this.Label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.Label13.AutoSize = true;
-            this.Label13.Location = new System.Drawing.Point(458, 7);
-            this.Label13.Name = "Label13";
-            this.Label13.Size = new System.Drawing.Size(45, 13);
-            this.Label13.TabIndex = 6;
-            this.Label13.Text = "through";
-            // 
-            // label_duration
-            // 
-            this.label_duration.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.label_duration.AutoSize = true;
-            this.label_duration.BackColor = System.Drawing.Color.Transparent;
-            this.label_duration.Location = new System.Drawing.Point(584, 7);
-            this.label_duration.Name = "label_duration";
-            this.label_duration.Size = new System.Drawing.Size(52, 13);
-            this.label_duration.TabIndex = 8;
-            this.label_duration.Text = "Duration:";
-            // 
-            // lbl_duration
-            // 
-            this.lbl_duration.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lbl_duration.AutoSize = true;
-            this.lbl_duration.BackColor = System.Drawing.Color.Transparent;
-            this.lbl_duration.Location = new System.Drawing.Point(642, 7);
-            this.lbl_duration.Name = "lbl_duration";
-            this.lbl_duration.Size = new System.Drawing.Size(39, 13);
-            this.lbl_duration.TabIndex = 9;
-            this.lbl_duration.Text = "--:--:--";
-            // 
-            // labelStaticDestination
-            // 
-            this.labelStaticDestination.AutoSize = true;
-            this.labelStaticDestination.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelStaticDestination.Location = new System.Drawing.Point(9, 116);
-            this.labelStaticDestination.Name = "labelStaticDestination";
-            this.labelStaticDestination.Size = new System.Drawing.Size(75, 13);
-            this.labelStaticDestination.TabIndex = 3;
-            this.labelStaticDestination.Text = "Destination:";
-            // 
-            // labelPreset
-            // 
-            this.labelPreset.AutoSize = true;
-            this.labelPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelPreset.Location = new System.Drawing.Point(9, 164);
-            this.labelPreset.Name = "labelPreset";
-            this.labelPreset.Size = new System.Drawing.Size(180, 13);
-            this.labelPreset.TabIndex = 5;
-            this.labelPreset.Text = "Output Settings (Preset: None)";
-            // 
-            // labelSource
-            // 
-            this.labelSource.AutoSize = true;
-            this.labelSource.Location = new System.Drawing.Point(55, 0);
-            this.labelSource.Name = "labelSource";
-            this.labelSource.Size = new System.Drawing.Size(137, 13);
-            this.labelSource.TabIndex = 1;
-            this.labelSource.Text = "Select \"Source\" to continue";
-            // 
-            // labelStaticSource
-            // 
-            this.labelStaticSource.AutoSize = true;
-            this.labelStaticSource.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelStaticSource.Location = new System.Drawing.Point(0, 0);
-            this.labelStaticSource.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.labelStaticSource.Name = "labelStaticSource";
-            this.labelStaticSource.Size = new System.Drawing.Size(49, 13);
-            this.labelStaticSource.TabIndex = 0;
-            this.labelStaticSource.Text = "Source:";
-            // 
-            // SourceLayoutPanel
-            // 
-            this.SourceLayoutPanel.AutoSize = true;
-            this.SourceLayoutPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.SourceLayoutPanel.Controls.Add(this.labelStaticSource);
-            this.SourceLayoutPanel.Controls.Add(this.labelSource);
-            this.SourceLayoutPanel.Location = new System.Drawing.Point(9, 70);
-            this.SourceLayoutPanel.Margin = new System.Windows.Forms.Padding(0);
-            this.SourceLayoutPanel.Name = "SourceLayoutPanel";
-            this.SourceLayoutPanel.Size = new System.Drawing.Size(195, 13);
-            this.SourceLayoutPanel.TabIndex = 2;
-            // 
-            // openPreset
-            // 
-            this.openPreset.DefaultExt = "plist";
-            this.openPreset.Filter = "Plist Files|*.plist";
-            // 
-            // File_ChapterImport
-            // 
-            this.File_ChapterImport.Filter = "CSV Files|*.csv";
-            // 
-            // frmMain
-            // 
-            this.AllowDrop = true;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.AutoSize = true;
-            this.ClientSize = new System.Drawing.Size(1002, 583);
-            this.Controls.Add(this.tableLayoutPanel3);
-            this.Controls.Add(this.toolStrip1);
-            this.Controls.Add(this.SourceLayoutPanel);
-            this.Controls.Add(this.frmMainMenu);
-            this.Controls.Add(this.tableLayoutPanel2);
-            this.Controls.Add(this.labelPreset);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.StatusStrip);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Controls.Add(this.tabs_panel);
-            this.Controls.Add(this.labelStaticDestination);
-            this.DoubleBuffered = true;
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.KeyPreview = true;
-            this.MinimumSize = new System.Drawing.Size(900, 500);
-            this.Name = "frmMain";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "HandBrake";
-            notifyIconMenu.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();
-            this.ChaptersMenu.ResumeLayout(false);
-            this.presets_menu.ResumeLayout(false);
-            this.frmMainMenu.ResumeLayout(false);
-            this.frmMainMenu.PerformLayout();
-            this.tab_audio.ResumeLayout(false);
-            this.tab_video.ResumeLayout(false);
-            this.tab_video.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.tab_picture.ResumeLayout(false);
-            this.tabs_panel.ResumeLayout(false);
-            this.tab_filters.ResumeLayout(false);
-            this.tab_subtitles.ResumeLayout(false);
-            this.tab_chapters.ResumeLayout(false);
-            this.tab_chapters.PerformLayout();
-            this.tab_advanced.ResumeLayout(false);
-            this.tab_query.ResumeLayout(false);
-            this.tab_query.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            this.splitContainer1.Panel2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.presetsToolStrip.ResumeLayout(false);
-            this.presetsToolStrip.PerformLayout();
-            this.toolStrip1.ResumeLayout(false);
-            this.toolStrip1.PerformLayout();
-            this.StatusStrip.ResumeLayout(false);
-            this.StatusStrip.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.SourceLayoutPanel.ResumeLayout(false);
-            this.SourceLayoutPanel.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.ToolTip ToolTip;
-        internal System.Windows.Forms.ToolStripMenuItem FileToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem mnu_open3;
-        internal System.Windows.Forms.ToolStripMenuItem mnu_exit;
-        internal System.Windows.Forms.ToolStripMenuItem ToolsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem mnu_encode;
-        internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;
-        internal System.Windows.Forms.ToolStripMenuItem mnu_options;
-        internal System.Windows.Forms.MenuStrip frmMainMenu;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.ComboBox drp_videoEncoder;
-        internal System.Windows.Forms.Label Label47;
-        internal System.Windows.Forms.TextBox text_destination;
-        internal System.Windows.Forms.TabPage tab_audio;
-        internal System.Windows.Forms.TabPage tab_video;
-        internal System.Windows.Forms.CheckBox check_largeFile;
-        internal System.Windows.Forms.CheckBox check_turbo;
-        internal System.Windows.Forms.Label Label2;
-        internal System.Windows.Forms.Label lbl_SliderValue;
-        internal System.Windows.Forms.ComboBox drp_videoFramerate;
-        internal System.Windows.Forms.CheckBox check_2PassEncode;
-        internal System.Windows.Forms.TrackBar slider_videoQuality;
-        internal System.Windows.Forms.TextBox text_bitrate;
-        internal System.Windows.Forms.TabPage tab_picture;
-        internal System.Windows.Forms.CheckBox Check_ChapterMarkers;
-        internal System.Windows.Forms.TabControl tabs_panel;
-        internal System.Windows.Forms.Label lbl_framerate;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.SaveFileDialog DVD_Save;
-        private System.Windows.Forms.OpenFileDialog File_Open;
-        internal System.Windows.Forms.CheckBox check_iPodAtom;
-        private System.Windows.Forms.TabPage tab_chapters;
-        internal System.Windows.Forms.Label label31;
-        internal System.Windows.Forms.CheckBox check_optimiseMP4;
-        internal System.Windows.Forms.DataGridView data_chpt;
-        private System.Windows.Forms.TabPage tab_query;
-        private System.Windows.Forms.Label label34;
-        internal System.Windows.Forms.Button btn_generate_Query;
-        internal System.Windows.Forms.Label label33;
-        internal System.Windows.Forms.Button btn_clear;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ToolStripButton btn_start;
-        private System.Windows.Forms.ToolStripButton btn_showQueue;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripButton btn_ActivityWindow;
-        internal System.Windows.Forms.Label label25;
-        internal System.Windows.Forms.TabPage tab_advanced;
-        internal System.Windows.Forms.TreeView treeView_presets;
-        internal System.Windows.Forms.RichTextBox rtf_query;
-        private System.Windows.Forms.NotifyIcon notifyIcon;
-        private System.Windows.Forms.ToolStripMenuItem btn_restore;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
-        private System.Windows.Forms.ToolStripMenuItem btn_file_source;
-        private System.Windows.Forms.ToolStripDropDownButton btn_source;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem btn_dvd_source;
-        internal System.Windows.Forms.ComboBox drop_format;
-        internal System.Windows.Forms.Label label5;
-        internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;
-        private System.Windows.Forms.StatusStrip StatusStrip;
-        private System.Windows.Forms.ToolStripStatusLabel lbl_encode;
-        internal System.Windows.Forms.OpenFileDialog ISO_Open;
-        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;
-        private System.Windows.Forms.ContextMenuStrip presets_menu;
-        private System.Windows.Forms.ToolStripMenuItem pmnu_expandAll;
-        private System.Windows.Forms.ToolStripMenuItem pmnu_collapse;
-        private System.Windows.Forms.ToolStripSeparator sep1;
-        private System.Windows.Forms.ToolStripMenuItem pmnu_delete;
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.ImageList AudioMenuRowHeightHack;
-        private System.Windows.Forms.ToolStripMenuItem pmnu_saveChanges;
-        private System.Windows.Forms.ToolStripMenuItem mnu_killCLI;
-        private System.Windows.Forms.TabPage tab_filters;
-        internal System.Windows.Forms.RadioButton radio_cq;
-        internal System.Windows.Forms.RadioButton radio_avgBitrate;
-        internal Handbrake.Controls.x264Panel x264Panel;
-        private System.Windows.Forms.ToolStripButton tb_preview;
-        private System.Diagnostics.Process hbproc;
-        private TabPage tab_subtitles;
-        internal Handbrake.Controls.Subtitles Subtitles;
-        internal Handbrake.Controls.Filters Filters;
-        private ToolStripStatusLabel lbl_updateCheck;
-        internal SaveFileDialog File_Save;
-        private TableLayoutPanel tableLayoutPanel2;
-        private Button btn_destBrowse;
-        private TableLayoutPanel tableLayoutPanel3;
-        private TableLayoutPanel tableLayoutPanel1;
-        internal Label lbl_angle;
-        internal ComboBox drop_angle;
-        internal ComboBox drop_chapterStart;
-        internal Label Label13;
-        internal ComboBox drop_chapterFinish;
-        internal Label label_duration;
-        internal Label lbl_duration;
-        private Label labelStaticDestination;
-        internal Label labelPreset;
-        internal Handbrake.Controls.PictureSettings PictureSettings;
-        private Label labelSource;
-        internal ComboBox drp_dvdtitle;
-        internal Label Label10;
-        private Label labelStaticSource;
-        private FlowLayoutPanel SourceLayoutPanel;
-        private OpenFileDialog openPreset;
-        private Button btn_importChapters;
-        private OpenFileDialog File_ChapterImport;
-        private ContextMenuStrip ChaptersMenu;
-        private ToolStripMenuItem mnu_resetChapters;
-        private ToolStripMenuItem pmnu_import;
-        private ToolStripSeparator toolStripSeparator2;
-        internal ComboBox drop_mode;
-        private Button btn_export;
-        private DataGridViewTextBoxColumn number;
-        private DataGridViewTextBoxColumn name;
-        private ToolStripProgressBar ProgressBarStatus;
-        private ToolStripMenuItem btnTitleSpecific;
-        private ToolStripMenuItem FileTitleSpecificScan;
-        private ToolStripMenuItem FolderTitleSpecificScan;
-        private ToolStripSeparator toolStripSeparator8;
-        private ToolStripDropDownButton toolStripDropDownButton1;
-        private ToolStripMenuItem MnuUserGuide;
-        private ToolStripSeparator toolStripSeparator9;
-        private ToolStripMenuItem MnuCheckForUpdates;
-        private ToolStripSeparator toolStripSeparator11;
-        private ToolStripMenuItem MnuAboutHandBrake;
-        private ToolStrip presetsToolStrip;
-        private ToolStripButton BtnAddPreset;
-        private ToolStripButton BtnRemovePreset;
-        private ToolStripDropDownButton toolStripDropDownButton2;
-        private ToolStripMenuItem MnuSetDefaultPreset;
-        private ToolStripSeparator toolStripSeparator3;
-        private ToolStripMenuItem MnuImportPreset;
-        private ToolStripMenuItem MnuExportPreset;
-        private ToolStripSeparator toolStripSeparator6;
-        private ToolStripMenuItem MnuResetBuiltInPresets;
-        internal RadioButton radio_peakAndVariable;
-        internal RadioButton radio_constantFramerate;
-        private Panel panel1;
-        internal Controls.AdvancedEncoderOpts advancedEncoderOpts;
-        public Controls.AudioPanel AudioSettings;
-        private ToolStripSplitButton btn_add2Queue;
-        private ToolStripMenuItem mnu_AddAllTitles;
-        private ToolStripMenuItem mnu_AddTittleRange;
-        private ToolStripStatusLabel lbl_libhb_warning;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmMain.cs Deleted

@@ -1,2691 +0,0 @@
-/*  frmMain.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
-using HandBrake.ApplicationServices.Model.Encoding;
-
-namespace Handbrake
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Diagnostics;
-    using System.Drawing;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using System.Windows.Forms;
-
-    using Functions;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.EventArgs;
-    using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Model.General;
-    using HandBrake.ApplicationServices.Utilities;
-    using HandBrake.ApplicationServices.Functions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using Handbrake.ToolWindows;
-
-    using Model;
-
-    using Ookii.Dialogs.Wpf;
-
-    using Properties;
-
-    using Application = System.Windows.Forms.Application;
-    using DataFormats = System.Windows.Forms.DataFormats;
-    using DragDropEffects = System.Windows.Forms.DragDropEffects;
-    using DragEventArgs = System.Windows.Forms.DragEventArgs;
-    using Main = Handbrake.Functions.Main;
-    using MessageBox = System.Windows.Forms.MessageBox;
-
-    /// <summary>
-    /// The Main Window
-    /// </summary>
-    public partial class frmMain : Form
-    {
-        #region Private Varibles
-        // Objects which may be used by one or more other objects *************
-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;
-        private IQueueProcessor queueProcessor = new QueueProcessor(Program.InstanceId);
-        private PresetService presetHandler = new PresetService();
-
-        // Windows ************************************************************
-        private frmQueue queueWindow;
-        private frmPreview qtpreview;
-        private frmActivityWindow activityWindow;
-
-        // Globals: Mainly used for tracking. *********************************
-        public Title selectedTitle;
-        public string sourcePath;
-        private SourceType selectedSourceType;
-        private string dvdDrivePath;
-        private string dvdDriveLabel;
-        private Preset currentlySelectedPreset;
-        private Source currentSource;
-
-        private IScan SourceScan;
-        private List<DriveInformation> drives;
-        private QueueTask queueEdit;
-
-        // Delegates **********************************************************
-        private delegate void UpdateWindowHandler();
-
-        #endregion
-
-        // Applicaiton Startup ************************************************
-
-        #region Properties
-
-        /// <summary>
-        /// Gets SourceName.
-        /// </summary>
-        public string SourceName
-        {
-            get
-            {
-                if (this.selectedSourceType == SourceType.DvdDrive)
-                {
-                    return this.dvdDriveLabel;
-                }
-
-                if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
-                {
-                    return Path.GetFileNameWithoutExtension(selectedTitle.SourceName);
-                }
-
-                // We have a drive, selected as a folder.
-                if (this.sourcePath.EndsWith("\\"))
-                {
-                    drives = GeneralUtilities.GetDrives();
-                    foreach (DriveInformation item in drives)
-                    {
-                        if (item.RootDirectory.Contains(this.sourcePath))
-                        {
-                            return item.VolumeLabel;
-                        }
-                    }
-                }
-
-                if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
-                    return Path.GetFileNameWithoutExtension(this.sourcePath);
-
-                return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
-            }
-        }
-
-        #endregion
-
-        #region Application Startup
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="frmMain"/> class.
-        /// </summary>
-        /// <param name="args">
-        /// The arguments passed in on application startup.
-        /// </param>
-        public frmMain(string[] args)
-        {
-            InitializeComponent();
-            this.presetsToolStrip.Renderer = new ToolStripRenderOverride();
-
-            // We can use LibHB, if the library hb.dll exists.
-            this.SourceScan = File.Exists("hb.dll") ? (IScan)new LibScan() : new ScanService();
-            lbl_libhb_warning.Visible = File.Exists("hb.dll") ? true : false;
-
-            // Update the users config file with the CLI version data.
-            Main.SetCliVersionData();
-
-            if (userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion).Contains("svn"))
-            {
-                this.Text += " " + userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion);
-            }
-
-            // Check for new versions, if update checking is enabled
-            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.UpdateStatus))
-            {
-                if (DateTime.Now.Subtract(userSettingService.GetUserSetting<DateTime>(UserSettingConstants.LastUpdateCheckDate)).TotalDays
-                    > userSettingService.GetUserSetting<int>(UserSettingConstants.DaysBetweenUpdateCheck))
-                {
-                    // Set when the last update was
-                    this.userSettingService.SetUserSetting(UserSettingConstants.LastUpdateCheckDate, DateTime.Now);
-                    string url = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakePlatform).Contains("x86_64")
-                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_x64)
-                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_i686);
-                    UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false, url, userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),
-                        userSettingService.GetUserSetting<int>(UserSettingConstants.Skipversion));
-                }
-            }
-
-            // Clear the log files in the background
-            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs))
-            {
-                Thread clearLog = new Thread(() => GeneralUtilities.ClearLogFiles(30));
-                clearLog.Start();
-            }
-
-            // Setup the GUI components
-            LoadPresetPanel(); // Load the Preset Panel
-            treeView_presets.ExpandAll();
-            lbl_encode.Text = string.Empty;
-            drop_mode.SelectedIndex = 0;
-            queueWindow = new frmQueue(this.queueProcessor, this); // Prepare the Queue
-            if (!userSettingService.GetUserSetting<bool>(UserSettingConstants.QueryEditorTab))
-                tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.
-            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.TooltipEnable))
-                ToolTip.Active = true;
-
-            // Load the user's default settings or Normal Preset
-            if (this.presetHandler.DefaultPreset != null)
-            {
-                this.loadPreset(this.presetHandler.DefaultPreset.Name);
-            }
-            else
-                loadPreset("Normal");
-
-            // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)
-            GrowlCommunicator.Register();
-
-            // Event Handlers and Queue Recovery
-            events();
-            Main.RecoverQueue(this.queueProcessor);
-
-            // If have a file passed in via command arguemtents, check it's a file and try scanning it.
-            if (args.Length >= 1 && (File.Exists(args[0]) || Directory.Exists(args[0])))
-            {
-                this.StartScan(args[0], 0);
-            }
-        }
-
-        /// <summary>
-        /// When the update check is done, process the results.
-        /// </summary>
-        /// <param name="result">IAsyncResult result</param>
-        private void UpdateCheckDone(IAsyncResult result)
-        {
-            if (InvokeRequired)
-            {
-                Invoke(new MethodInvoker(() => UpdateCheckDone(result)));
-                return;
-            }
-
-            try
-            {
-                UpdateCheckInformation info = UpdateService.EndCheckForUpdates(result);
-
-                if (info.NewVersionAvailable)
-                {
-                    UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),
-                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));
-                    updateWindow.ShowDialog();
-                }
-            }
-            catch (Exception ex)
-            {
-                if ((bool)result.AsyncState)
-                    throw new GeneralApplicationException("Unable to check for updates.", "Please try again later. The service may currently be down or inaccessible. ", ex);
-            }
-        }
-
-        #endregion
-
-        #region Events
-
-        // Encoding Events for setting up the GUI
-        private void events()
-        {
-            // Handle Widget changes when preset is selected.
-            RegisterPresetEventHandler();
-
-            // Handle Window Resize
-            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize))
-                this.Resize += this.frmMain_Resize;
-
-            // Handle Encode Start / Finish / Pause
-            this.queueProcessor.EncodeService.EncodeStarted += this.encodeStarted;
-            this.queueProcessor.EncodeService.EncodeCompleted += encodeEnded;
-
-            // Scan Started and Completed Events
-            SourceScan.ScanStatusChanged += this.SourceScanScanStatusChanged;
-            SourceScan.ScanCompleted += this.SourceScanScanCompleted;
-
-            // Handle a file being draged onto the GUI.
-            this.DragEnter += frmMain_DragEnter;
-            this.DragDrop += this.frmMain_DragDrop;
-        }
-
-        // Change the preset label to custom when a user changes a setting. Don't want to give the impression that users can change settings and still be using a preset
-        private void RegisterPresetEventHandler()
-        {
-            // Output Settings
-            drop_format.SelectedIndexChanged += this.changePresetLabel;
-            check_largeFile.CheckedChanged += this.changePresetLabel;
-            check_iPodAtom.CheckedChanged += this.changePresetLabel;
-            check_optimiseMP4.CheckedChanged += this.changePresetLabel;
-
-            // Picture Settings
-            PictureSettings.PictureSettingsChanged += this.changePresetLabel;
-
-            // Filter Settings
-            Filters.FilterSettingsChanged += this.changePresetLabel;
-
-            // Video Tab
-            drp_videoEncoder.SelectedIndexChanged += this.changePresetLabel;
-            check_2PassEncode.CheckedChanged += this.changePresetLabel;
-            check_turbo.CheckedChanged += this.changePresetLabel;
-            text_bitrate.TextChanged += this.changePresetLabel;
-            slider_videoQuality.ValueChanged += this.changePresetLabel;
-
-            // Audio Panel
-            AudioSettings.AudioListChanged += this.changePresetLabel;
-
-            // Advanced Tab
-            x264Panel.rtf_x264Query.TextChanged += this.changePresetLabel;
-        }
-
-        private void UnRegisterPresetEventHandler()
-        {
-            // Output Settings 
-            drop_format.SelectedIndexChanged -= this.changePresetLabel;
-            check_largeFile.CheckedChanged -= this.changePresetLabel;
-            check_iPodAtom.CheckedChanged -= this.changePresetLabel;
-            check_optimiseMP4.CheckedChanged -= this.changePresetLabel;
-
-            // Picture Settings
-            PictureSettings.PictureSettingsChanged -= this.changePresetLabel;
-
-            // Filter Settings
-            Filters.FilterSettingsChanged -= this.changePresetLabel;
-
-            // Video Tab
-            drp_videoEncoder.SelectedIndexChanged -= this.changePresetLabel;
-            check_2PassEncode.CheckedChanged -= this.changePresetLabel;
-            check_turbo.CheckedChanged -= this.changePresetLabel;
-            text_bitrate.TextChanged -= this.changePresetLabel;
-            slider_videoQuality.ValueChanged -= this.changePresetLabel;
-
-            // Audio Panel
-            AudioSettings.AudioListChanged -= this.changePresetLabel;
-
-            // Advanced Tab
-            x264Panel.rtf_x264Query.TextChanged -= this.changePresetLabel;
-        }
-
-        private void changePresetLabel(object sender, EventArgs e)
-        {
-            labelPreset.Text = "Output Settings (Preset: Custom)";
-        }
-
-        private static void frmMain_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(DataFormats.FileDrop, false))
-                e.Effect = DragDropEffects.All;
-        }
-
-        private void frmMain_DragDrop(object sender, DragEventArgs e)
-        {
-            string[] fileList = e.Data.GetData(DataFormats.FileDrop) as string[];
-            sourcePath = string.Empty;
-
-            if (fileList != null)
-            {
-                if (!string.IsNullOrEmpty(fileList[0]))
-                {
-                    this.selectedSourceType = SourceType.VideoFile;
-                    StartScan(fileList[0], 0);
-                }
-                else
-                    UpdateSourceLabel();
-            }
-            else
-                UpdateSourceLabel();
-        }
-
-        private void encodeStarted(object sender, EventArgs e)
-        {
-            SetEncodeStarted();
-            this.queueProcessor.EncodeService.EncodeStatusChanged += EncodeQueue_EncodeStatusChanged;
-        }
-
-        private void encodeEnded(object sender, EventArgs e)
-        {
-            this.queueProcessor.EncodeService.EncodeStatusChanged -= EncodeQueue_EncodeStatusChanged;
-            SetEncodeFinished();
-        }
-        #endregion
-
-        // User Interface Menus / Tool Strips *********************************
-
-        #region File Menu
-
-        /// <summary>
-        /// Kill The scan menu Item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnu_killCLI_Click(object sender, EventArgs e)
-        {
-            KillScan();
-        }
-
-        /// <summary>
-        /// Exit the Application Menu Item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnu_exit_Click(object sender, EventArgs e)
-        {
-            Application.Exit();
-        }
-
-        #endregion
-
-        #region Tools Menu
-
-        /// <summary>
-        /// Menu - Start Button
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnu_encode_Click(object sender, EventArgs e)
-        {
-            queueWindow.Show();
-        }
-
-        /// <summary>
-        /// Menu - Display the Log Window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnu_encodeLog_Click(object sender, EventArgs e)
-        {
-            this.btn_ActivityWindow_Click(this, null);
-        }
-
-        /// <summary>
-        /// Menu - Display the Options Window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnu_options_Click(object sender, EventArgs e)
-        {
-            Form options = new frmOptions(this);
-            options.ShowDialog();
-        }
-
-        #endregion
-
-        #region Help Menu (Toolbar)
-
-        /// <summary>
-        ///  Menu - Display the User Guide Web Page
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void MnuUserGuide_Click(object sender, EventArgs e)
-        {
-            Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");
-        }
-
-        /// <summary>
-        /// Check for Updates
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void MnuCheckForUpdates_Click(object sender, EventArgs e)
-        {
-            lbl_updateCheck.Visible = true;
-            this.userSettingService.SetUserSetting(UserSettingConstants.LastUpdateCheckDate, DateTime.Now);
-            string url = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakePlatform).Contains("x86_64")
-                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_x64)
-                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_i686);
-            UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDoneMenu), false,
-                url, userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),
-                userSettingService.GetUserSetting<int>(UserSettingConstants.Skipversion));
-        }
-
-        /// <summary>
-        /// Menu - Display the About Window
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">The EventArgs</param>
-        private void MnuAboutHandBrake_Click(object sender, EventArgs e)
-        {
-            using (frmAbout About = new frmAbout())
-            {
-                About.ShowDialog();
-            }
-        }
-
-        #endregion
-
-        #region Preset Bar
-
-        /// <summary>
-        /// RMenu - Expand All
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void pmnu_expandAll_Click(object sender, EventArgs e)
-        {
-            treeView_presets.ExpandAll();
-        }
-
-        /// <summary>
-        /// RMenu - Collaspe All
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void pmnu_collapse_Click(object sender, EventArgs e)
-        {
-            treeView_presets.CollapseAll();
-        }
-
-        /// <summary>
-        /// Menu - Import Preset
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void pmnu_import_Click(object sender, EventArgs e)
-        {
-            ImportPreset();
-        }
-
-        /// <summary>
-        /// RMenu - Save Changes to Preset
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void pmnu_saveChanges_Click(object sender, EventArgs e)
-        {
-            if (this.selectedTitle == null)
-            {
-                MessageBox.Show(
-                            "Please scan a source before trying to update a preset.",
-                            "Error",
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Error);
-                return;
-            }
-
-            DialogResult result =
-                MessageBox.Show(
-                    "Do you wish to include picture settings when updating the preset: " +
-                    treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel,
-                    MessageBoxIcon.Question);
-            string query = QueryGenerator.GenerateQueryForPreset(
-                this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0);
-            Preset preset = new Preset
-                {
-                    Name = this.treeView_presets.SelectedNode.Text,
-                    Query = query,
-                    CropSettings = (result == DialogResult.Yes),
-                    AudioPassthruSettings = this.AudioSettings.PassthruSettings,
-                    Task = QueryParserUtility.Parse(query),
-                };
-
-            presetHandler.Update(preset);
-        }
-
-        /// <summary>
-        /// RMenu - Delete Preset
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void pmnu_delete_click(object sender, EventArgs e)
-        {
-            BtnRemovePreset_Click(sender, e);
-        }
-
-        /// <summary>
-        /// Preset Menu Is Opening. Setup the Menu
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void presets_menu_Opening(object sender, CancelEventArgs e)
-        {
-            // Make sure that the save menu is always disabled by default
-            pmnu_saveChanges.Enabled = false;
-
-            // Now enable the save menu if the selected preset is a user preset
-            if (treeView_presets.SelectedNode != null)
-                pmnu_saveChanges.Enabled = presetHandler.CanUpdatePreset(treeView_presets.SelectedNode.Text);
-
-            treeView_presets.Select();
-        }
-
-        // Presets Management
-
-        private void BtnAddPreset_Click(object sender, EventArgs e)
-        {
-            if (this.selectedTitle == null)
-            {
-                MessageBox.Show(
-                            "Please scan a source before trying to import a preset.",
-                            "Error",
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Error);
-                return;
-            }
-
-            Form preset = new frmAddPreset(this, presetHandler);
-            if (preset.ShowDialog() == DialogResult.OK)
-            {
-                TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black, Tag = presetHandler.LastPresetAdded };
-                treeView_presets.Nodes.Add(presetTreeview);
-                presetHandler.LastPresetAdded = null;
-            }
-        }
-
-        private void BtnRemovePreset_Click(object sender, EventArgs e)
-        {
-            if (treeView_presets.SelectedNode == null)
-            {
-                return;
-            }
-
-            DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
-                                                  MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-            if (result == DialogResult.Yes)
-            {
-                if (treeView_presets.SelectedNode.Nodes.Count > 0)
-                {
-                    // Delete the selected group category
-                    this.presetHandler.RemoveGroup(treeView_presets.SelectedNode.Text.Trim());
-                }
-                else
-                {
-                    Preset preset = treeView_presets.SelectedNode.Tag as Preset;
-                    if (preset != null && preset.IsDefault)
-                    {
-                        MessageBox.Show(
-                            "Your default preset can not be deleted. It is a required preset.",
-                            "Warning",
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Information);
-                    }
-
-                    // Delete the selected item.
-                    presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);
-                }
-
-                this.LoadPresetPanel();
-            }
-
-            treeView_presets.Select();
-            treeView_presets.ExpandAll();
-        }
-
-        private void MnuSetDefaultPreset_Click(object sender, EventArgs e)
-        {
-            if (treeView_presets.SelectedNode != null)
-            {
-                Preset preset = treeView_presets.SelectedNode.Tag as Preset;
-                if (preset != null)
-                {
-                    MessageBox.Show(
-                        "New default preset set: " + treeView_presets.SelectedNode.Text,
-                        "Alert",
-                        MessageBoxButtons.OK,
-                        MessageBoxIcon.Information);
-                    this.presetHandler.SetDefault(preset);
-                }
-            }
-            else
-                MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-        }
-
-        private void MnuImportPreset_Click(object sender, EventArgs e)
-        {
-            this.ImportPreset();
-        }
-
-        private void MnuExportPreset_Click(object sender, EventArgs e)
-        {
-            this.ExportPreset();
-        }
-
-        private void MnuResetBuiltInPresets_Click(object sender, EventArgs e)
-        {
-            presetHandler.UpdateBuiltInPresets();
-            LoadPresetPanel();
-            treeView_presets.ExpandAll();
-        }
-
-        /// <summary>
-        /// PresetBar Mouse Down event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void treeview_presets_mouseDown(object sender, MouseEventArgs e)
-        {
-            if (e.Button == MouseButtons.Right)
-                treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);
-            else if (e.Button == MouseButtons.Left)
-            {
-                if (treeView_presets.GetNodeAt(e.Location) != null)
-                {
-                    if (labelPreset.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text))
-                        selectPreset();
-                }
-            }
-
-            treeView_presets.Select();
-        }
-
-        /// <summary>
-        /// Preset Bar after selecting the preset
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)
-        {
-            selectPreset();
-        }
-
-        /// <summary>
-        /// When the mouse moves, display a preset
-        /// </summary>
-        /// <param name="sender">The Sender</param>
-        /// <param name="e">the MouseEventArgs</param>
-        private void TreeViewPresetsMouseMove(object sender, MouseEventArgs e)
-        {
-            TreeNode theNode = this.treeView_presets.GetNodeAt(e.X, e.Y);
-
-            if ((theNode != null))
-            {
-                // Change the ToolTip only if the pointer moved to a new node.
-                if (theNode.ToolTipText != this.ToolTip.GetToolTip(this.treeView_presets))
-                {
-                    this.ToolTip.SetToolTip(this.treeView_presets, theNode.ToolTipText);
-                }
-            }
-            else     // Pointer is not over a node so clear the ToolTip.
-            {
-                this.ToolTip.SetToolTip(this.treeView_presets, string.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Preset Bar - Handle the Delete Key
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void treeView_presets_deleteKey(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Delete)
-            {
-                this.BtnRemovePreset_Click(sender, e);
-            }
-        }
-
-        /// <summary>
-        /// Select the selected preset and setup the GUI
-        /// </summary>
-        private void selectPreset()
-        {
-            if (treeView_presets.SelectedNode != null)
-            {
-                // Ok, so, we've selected a preset. Now we want to load it.
-                string presetName = treeView_presets.SelectedNode.Text;
-                Preset preset = presetHandler.GetPreset(presetName);
-                if (preset != null)
-                {
-                    string query = presetHandler.GetPreset(presetName).Query;
-
-                    if (query != null)
-                    {
-                        // Ok, Reset all the H264 widgets before changing the preset
-                        x264Panel.Reset2Defaults();
-
-                        // Now load the preset
-                        PresetLoader.LoadPreset(this, preset);
-
-                        // The x264 widgets will need updated, so do this now:
-                        x264Panel.StandardizeOptString();
-                        x264Panel.SetCurrentSettingsInPanel();
-
-                        // Finally, let this window have a copy of the preset settings.
-                        this.currentlySelectedPreset = preset;
-                        PictureSettings.SetPresetCropWarningLabel(preset);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Load the Normal Preset
-        /// </summary>
-        /// <param name="presetName">
-        /// The preset name.
-        /// </param>
-        private void loadPreset(string presetName)
-        {
-            foreach (TreeNode treenode in treeView_presets.Nodes)
-            {
-                if (treenode.Tag != null && ((Preset)treenode.Tag).Name == presetName)
-                {
-                    treeView_presets.SelectedNode = treenode;
-                    return;
-                }
-
-                foreach (TreeNode node in treenode.Nodes)
-                {
-                    if (node.Text.Equals(presetName))
-                    {
-                        treeView_presets.SelectedNode = node;
-                        return;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Import a plist preset
-        /// </summary>
-        private void ImportPreset()
-        {
-            if (openPreset.ShowDialog() == DialogResult.OK)
-            {
-                EncodeTask parsed = PlistPresetHandler.Import(openPreset.FileName);
-
-                if (presetHandler.CheckIfPresetExists(parsed.PresetName))
-                {
-                    if (!presetHandler.CanUpdatePreset(parsed.PresetName))
-                    {
-                        MessageBox.Show(
-                            "You can not import a preset with the same name as a built-in preset.",
-                            "Error",
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Error);
-                        return;
-                    }
-
-                    DialogResult result =
-                        MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?",
-                                        "Overwrite preset?",
-                                        MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
-                    if (result == DialogResult.Yes)
-                    {
-                        Preset preset = new Preset
-                        {
-                            Name = parsed.PresetName,
-                            Query = QueryGeneratorUtility.GenerateQuery(parsed),
-                            CropSettings = parsed.UsesPictureSettings,
-                            Description = string.Empty,
-                            AudioPassthruSettings = parsed.AllowedPassthruOptions
-                        };
-
-                        presetHandler.Update(preset);
-                    }
-                }
-                else
-                {
-                    Preset preset = new Preset
-                    {
-                        Name = parsed.PresetName,
-                        Query = QueryGeneratorUtility.GenerateQuery(parsed),
-                        CropSettings = parsed.UsesPictureSettings,
-                        Description = string.Empty,
-                        AudioPassthruSettings = parsed.AllowedPassthruOptions
-                    };
-
-                    if (presetHandler.Add(preset))
-                    {
-                        TreeNode preset_treeview = new TreeNode(parsed.PresetName)
-                                                       {
-                                                           ForeColor = Color.Black,
-                                                           Tag = preset,
-                                                       };
-                        treeView_presets.Nodes.Add(preset_treeview);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Export a plist Preset
-        /// </summary>
-        private void ExportPreset()
-        {
-            if (this.selectedTitle == null)
-            {
-                MessageBox.Show(
-                            "Please scan a source before trying to export a preset.",
-                            "Error",
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Error);
-                return;
-            }
-
-            SaveFileDialog savefiledialog = new SaveFileDialog { Filter = "plist|*.plist" };
-
-            if (treeView_presets.SelectedNode != null)
-            {
-                if (savefiledialog.ShowDialog() == DialogResult.OK)
-                {
-                    Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text);
-                    PlistPresetHandler.Export(savefiledialog.FileName, preset);
-                }
-            }
-        }
-
-        #endregion
-
-        #region ToolStrip
-
-        /// <summary>
-        /// Toolbar - When the Source button is clicked, Clear any DVD drives and add any available DVD drives that can be used as a source.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_source_Click(object sender, EventArgs e)
-        {
-            // Remove old Drive Menu Items.
-            List<ToolStripMenuItem> itemsToRemove = new List<ToolStripMenuItem>();
-            foreach (var item in btn_source.DropDownItems)
-            {
-                if (item.GetType() == typeof(ToolStripMenuItem))
-                {
-                    ToolStripMenuItem menuItem = (ToolStripMenuItem)item;
-                    if (menuItem.Name.StartsWith("Drive"))
-                    {
-                        itemsToRemove.Add(menuItem);
-                    }
-                }
-            }
-
-            foreach (ToolStripMenuItem item in itemsToRemove)
-                btn_source.DropDownItems.Remove(item);
-
-            Thread driveInfoThread = new Thread(SetDriveSelectionMenuItem);
-            driveInfoThread.Start();
-        }
-
-        /// <summary>
-        /// Toolbar - Start The Encode
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_start_Click(object sender, EventArgs e)
-        {
-            if (btn_start.Text == "Stop")
-            {
-                DialogResult result = !userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI)
-                             ? MessageBox.Show(
-                                 "Are you sure you wish to cancel the encode?\n\nPlease note: Stopping this encode will render the file unplayable. ",
-                                 "Cancel Encode?",
-                                 MessageBoxButtons.YesNo,
-                                 MessageBoxIcon.Question)
-                             : MessageBox.Show(
-                                 "Are you sure you wish to cancel the encode?",
-                                 "Cancel Encode?",
-                                 MessageBoxButtons.YesNo,
-                                 MessageBoxIcon.Question);
-
-                if (result == DialogResult.Yes)
-                {
-                    // Pause The Queue
-                    this.queueProcessor.Pause();
-
-                    if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI))
-                        this.queueProcessor.EncodeService.SafelyStop();
-                    else
-                        this.queueProcessor.EncodeService.Stop();
-                }
-            }
-            else
-            {
-                // If we have a custom query, then we'll want to figure out what the new source and destination is, otherwise we'll just use the gui components.
-                string jobSourcePath = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetSourceFromQuery(rtf_query.Text) : sourcePath;
-                string jobDestination = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetDestinationFromQuery(rtf_query.Text) : text_destination.Text;
-                QueueTask task = QueryGenerator.GenerateFullQuery(this);
-
-                if (this.queueProcessor.QueueManager.Count != 0 || (!string.IsNullOrEmpty(jobSourcePath) && !string.IsNullOrEmpty(jobDestination)))
-                {
-                    string specifiedQuery = rtf_query.Text != string.Empty
-                                                ? rtf_query.Text
-                                                : task.Query;
-
-                    // Check to make sure the generated query matches the GUI settings
-                    if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PromptOnUnmatchingQueries) && !string.IsNullOrEmpty(specifiedQuery) &&
-                        task.Query != specifiedQuery)
-                    {
-                        DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +
-                                                              "does not match the current GUI settings.\n\nBecause the manual query takes " +
-                                                              "priority over the GUI, your recently updated settings will not be taken " +
-                                                              "into account when encoding this job." +
-                                                              Environment.NewLine + Environment.NewLine +
-                                                              "Do you want to replace the manual query with the updated GUI-generated query?",
-                                                              "Manual Query does not Match GUI",
-                                                              MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,
-                                                              MessageBoxDefaultButton.Button3);
-
-                        switch (result)
-                        {
-                            case DialogResult.Yes:
-                                // Replace the manual query with the generated one
-
-                                rtf_query.Text = task.Query;
-                                break;
-                            case DialogResult.No:
-                                // Use the manual query
-                                task.Query = specifiedQuery;
-                                break;
-                            case DialogResult.Cancel:
-                                // Don't start the encode
-                                return;
-                        }
-                    }
-                    else
-                    {
-                        task.Query = specifiedQuery;
-                    }
-
-                    DialogResult overwrite = DialogResult.Yes;
-                    if (!string.IsNullOrEmpty(jobDestination) && File.Exists(jobDestination))
-                    {
-                        overwrite = MessageBox.Show(
-                                "The destination file already exists. Are you sure you want to overwrite it?",
-                                "Overwrite File?",
-                                MessageBoxButtons.YesNo,
-                                MessageBoxIcon.Question);
-                    }
-
-                    if (overwrite == DialogResult.Yes)
-                    {
-
-
-                        if (this.queueProcessor.QueueManager.Count == 0)
-                            this.queueProcessor.QueueManager.Add(QueryGenerator.GenerateFullQuery(this));
-
-                        queueWindow.SetQueue();
-                        if (this.queueProcessor.QueueManager.Count > 1)
-                            queueWindow.Show(false);
-
-                        SetEncodeStarted(); // Encode is running, so setup the GUI appropriately
-                        this.queueProcessor.Start(); // Start The Queue Encoding Process
-                    }
-
-                    this.Focus();
-                }
-                else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
-                    MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
-                                    MessageBoxIcon.Warning);
-            }
-        }
-
-        /// <summary>
-        /// Toolbar - Add the current job to the Queue
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_add2Queue_Click(object sender, EventArgs e)
-        {
-            // Add the item to the queue.
-            AddItemToQueue(true);
-            queueWindow.Show();
-        }
-
-        /// <summary>
-        /// Add All Scanned Titles
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void mnu_AddAllTitles_Click(object sender, EventArgs e)
-        {
-            AddRangeOfTitles(false);
-        }
-
-        /// <summary>
-        /// Add a range of scanned titles
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void mnu_AddTittleRange_Click(object sender, EventArgs e)
-        {
-            AddRangeOfTitles(true);
-        }
-
-        /// <summary>
-        /// Add Multiple Items to the Queue at once.
-        /// </summary>
-        /// <param name="addRange">
-        /// The add Range.
-        /// </param>
-        private void AddRangeOfTitles(bool addRange)
-        {
-            if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
-            {
-                MessageBox.Show(
-                    "You need to enable 'Auto Naming' in options to use this feature.",
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                return;
-            }
-
-            if (this.SourceScan.SouceData == null)
-            {
-                MessageBox.Show(
-                    "You must first scan a source before you can use this feature. Select the 'Source' button on the toolbar.",
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                return;
-            }
-
-            bool errors = false;
-            if (addRange) // Add Range
-            {
-                BatchAdd batchAdd = new BatchAdd(this.SourceScan.SouceData);
-                if (batchAdd.ShowDialog() == DialogResult.OK)
-                {
-                    TimeSpan min = batchAdd.Min;
-                    TimeSpan max = batchAdd.Max;
-
-                    foreach (Title title in this.SourceScan.SouceData.Titles)
-                    {
-                        if (title.Duration.TotalSeconds > min.TotalSeconds && title.Duration.TotalSeconds < max.TotalSeconds)
-                        {
-                            // Add to Queue
-                            this.drp_dvdtitle.SelectedItem = title;
-
-                            if (!this.AddItemToQueue(false))
-                            {
-                                errors = true;
-                            }
-                        }
-                    }
-                }
-            }
-            else // Add All
-            {
-
-                string warning = string.Format(
-                    "You are about to add *ALL* titles to the queue. \nCurrent settings will be applied to *ALL {0} Titles*. \n\nAre you sure you want to do this?", this.SourceScan.SouceData.Titles.Count);
-
-                DialogResult question =
-                    MessageBox.Show(
-                        warning,
-                        "Warning",
-                        MessageBoxButtons.YesNoCancel,
-                        MessageBoxIcon.Warning);
-
-                if (question == DialogResult.Yes)
-                {
-                    foreach (Title title in this.SourceScan.SouceData.Titles)
-                    {
-                        // Add to Queue
-                        this.drp_dvdtitle.SelectedItem = title;
-
-                        if (!this.AddItemToQueue(false))
-                        {
-                            errors = true;
-                        }
-                    }
-                }
-            }
-
-            if (errors)
-            {
-                MessageBox.Show(
-                    "One or more items could not be added to the queue. You should check your queue and manually add any missing jobs.",
-                    "Warning",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Warning);
-            }
-
-        }
-
-        private bool AddItemToQueue(bool showError)
-        {
-            // If we have a custom query, then we'll want to figure out what the new source and destination is, otherwise we'll just use the gui components.
-            string jobSourcePath = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetSourceFromQuery(rtf_query.Text) : sourcePath;
-            string jobDestination = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetDestinationFromQuery(rtf_query.Text) : text_destination.Text;
-
-            // Make sure we have a Source and Destination.
-            if (string.IsNullOrEmpty(jobSourcePath) || string.IsNullOrEmpty(jobDestination))
-            {
-                if (showError)
-                    MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return false;
-            }
-
-            // Make sure we don't have a duplciate on the queue.
-            if (this.queueProcessor.QueueManager.CheckForDestinationPathDuplicates(jobDestination))
-            {
-                if (showError)
-                {
-                    DialogResult result;
-                    result =
-                        MessageBox.Show(
-                            string.Format(
-                                "There is already a queue item for this destination path.\nDestination Path: {0} \n\nIf you continue, the encode will be overwritten. Do you wish to continue?",
-                                jobDestination),
-                            "Warning",
-                            MessageBoxButtons.YesNo,
-                            MessageBoxIcon.Warning);
-
-                    if (result != DialogResult.Yes) return false;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            // Add the job.
-            QueueTask query = QueryGenerator.GenerateFullQuery(this);
-            this.queueProcessor.QueueManager.Add(query);
-
-            lbl_encode.Text = this.queueProcessor.QueueManager.Count + " encode(s) pending in the queue";
-
-            return true;
-        }
-
-        /// <summary>
-        /// Toolbar - Show the Queue
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_showQueue_Click(object sender, EventArgs e)
-        {
-            queueWindow.Show();
-            queueWindow.Activate();
-        }
-
-        /// <summary>
-        /// Toolbar - Show the Preview Window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void tb_preview_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
-                MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
-                                MessageBoxIcon.Warning);
-            else
-            {
-                if (qtpreview == null)
-                {
-                    qtpreview = new frmPreview(this);
-                    qtpreview.Show();
-                }
-                else if (qtpreview.IsDisposed)
-                {
-                    qtpreview = new frmPreview(this);
-                    qtpreview.Show();
-                }
-                else
-                    MessageBox.Show(qtpreview, "The preview window is already open!", "Warning", MessageBoxButtons.OK,
-                                    MessageBoxIcon.Warning);
-            }
-        }
-
-        /// <summary>
-        /// Toolbar - Show the Activity log Window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_ActivityWindow_Click(object sender, EventArgs e)
-        {
-            if (this.activityWindow == null || !this.activityWindow.IsHandleCreated)
-                this.activityWindow = new frmActivityWindow(this.queueProcessor.EncodeService, SourceScan);
-
-            this.activityWindow.Show();
-            this.activityWindow.Activate();
-        }
-
-        #endregion
-
-        #region System Tray Icon
-
-        /// <summary>
-        /// Handle Resizing of the main window when deaing with the Notify Icon
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void frmMain_Resize(object sender, EventArgs e)
-        {
-            if (FormWindowState.Minimized == this.WindowState)
-            {
-                notifyIcon.Visible = true;
-                this.Hide();
-            }
-            else if (FormWindowState.Normal == this.WindowState)
-                notifyIcon.Visible = false;
-        }
-
-        /// <summary>
-        /// Double Click the Tray Icon
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            this.Visible = true;
-            this.Activate();
-            this.WindowState = FormWindowState.Normal;
-            notifyIcon.Visible = false;
-        }
-
-        /// <summary>
-        /// Tray Icon - Restore Menu Item - Resture the Window
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void btn_restore_Click(object sender, EventArgs e)
-        {
-            this.Visible = true;
-            this.Activate();
-            this.WindowState = FormWindowState.Normal;
-            notifyIcon.Visible = false;
-        }
-
-        #endregion
-
-        #region Main Window and Tab Control
-
-        // Source
-        private void BtnFolderScanClicked(object sender, EventArgs e)
-        {
-            VistaFolderBrowserDialog modernFolderDialog = new VistaFolderBrowserDialog { ShowNewFolderButton = true, RootFolder = Environment.SpecialFolder.DesktopDirectory };
-            this.btn_source.HideDropDown();
-            if (modernFolderDialog.ShowDialog() == true)
-            {
-                this.selectedSourceType = SourceType.Folder;
-                SelectSource(modernFolderDialog.SelectedPath, 0);
-            }
-            else
-                UpdateSourceLabel();
-        }
-
-        private void BtnFileScanClicked(object sender, EventArgs e)
-        {
-            this.btn_source.HideDropDown();
-            if (ISO_Open.ShowDialog() == DialogResult.OK)
-            {
-                this.selectedSourceType = SourceType.VideoFile;
-                SelectSource(ISO_Open.FileName, 0);
-            }
-            else
-                UpdateSourceLabel();
-        }
-
-        private void MnuDvdDriveClick(object sender, EventArgs e)
-        {
-            ToolStripMenuItem item = sender as ToolStripMenuItem;
-            if (item != null)
-            {
-                string driveId = item.Name.Replace("Drive", string.Empty);
-                int id;
-                if (int.TryParse(driveId, out id))
-                {
-                    this.dvdDrivePath = drives[id].RootDirectory;
-                    this.dvdDriveLabel = drives[id].VolumeLabel;
-
-                    if (this.dvdDrivePath == null) return;
-                    this.selectedSourceType = SourceType.DvdDrive;
-                    SelectSource(this.dvdDrivePath, 0);
-                }
-            }
-        }
-
-        private void VideoTitleSpecificScanClick(object sender, EventArgs e)
-        {
-            this.btn_source.HideDropDown();
-            if (ISO_Open.ShowDialog() == DialogResult.OK)
-            {
-                this.selectedSourceType = SourceType.VideoFile;
-
-                int sourceTitle = 0;
-                TitleSpecificScan title = new TitleSpecificScan();
-                if (title.ShowDialog() == DialogResult.OK)
-                {
-                    sourceTitle = title.Title;
-                    SelectSource(ISO_Open.FileName, sourceTitle);
-                }
-            }
-            else
-                UpdateSourceLabel();
-        }
-
-        private void FolderTitleSpecificScanClick(object sender, EventArgs e)
-        {
-            this.btn_source.HideDropDown();
-
-            VistaFolderBrowserDialog modernFolderDialog = new VistaFolderBrowserDialog { ShowNewFolderButton = true, RootFolder = Environment.SpecialFolder.DesktopDirectory };
-            if (modernFolderDialog.ShowDialog() == true)
-            {
-                this.selectedSourceType = SourceType.Folder;
-
-                int sourceTitle;
-                TitleSpecificScan title = new TitleSpecificScan();
-                if (title.ShowDialog() == DialogResult.OK)
-                {
-                    sourceTitle = title.Title;
-                    SelectSource(modernFolderDialog.SelectedPath, sourceTitle);
-                }
-            }
-            else
-                UpdateSourceLabel();
-        }
-
-        private void SelectSource(string file, int titleSpecific)
-        {
-            Check_ChapterMarkers.Enabled = true;
-            sourcePath = string.Empty;
-
-            if (file == string.Empty) // Must have a file or path
-            {
-                UpdateSourceLabel();
-                return;
-            }
-
-            sourcePath = Path.GetFileName(file);
-            StartScan(file, titleSpecific);
-        }
-
-        private void drp_dvdtitle_Click(object sender, EventArgs e)
-        {
-            if ((drp_dvdtitle.Items.Count == 1) && (drp_dvdtitle.Items[0].ToString() == "Automatic"))
-                MessageBox.Show(
-                    "There are no titles to select. Please load a source file by clicking the 'Source' button above before trying to select a title.",
-                    "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
-        }
-
-        private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            UnRegisterPresetEventHandler();
-            drop_mode.SelectedIndex = 0;
-
-            drop_chapterStart.Items.Clear();
-            drop_chapterFinish.Items.Clear();
-
-            if (string.IsNullOrEmpty(drp_dvdtitle.Text) || drp_dvdtitle.Text == "Automatic" || this.currentSource == null)
-            {
-                return;
-            }
-
-            selectedTitle = drp_dvdtitle.SelectedItem as Title;
-            if (selectedTitle == null)
-            {
-                return;
-            }
-
-            lbl_duration.Text = selectedTitle.Duration.ToString();
-            PictureSettings.CurrentlySelectedPreset = this.currentlySelectedPreset;
-            PictureSettings.Source = selectedTitle; // Setup Picture Settings Tab Control
-
-            // Populate the Angles dropdown
-            drop_angle.Items.Clear();
-            if (!userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
-            {
-                drop_angle.Visible = true;
-                lbl_angle.Visible = true;
-
-                for (int i = 1; i <= selectedTitle.AngleCount; i++)
-                    drop_angle.Items.Add(i.ToString());
-
-                if (drop_angle.Items.Count == 0)
-                {
-                    drop_angle.Visible = false;
-                    lbl_angle.Visible = false;
-                }
-
-                if (drop_angle.Items.Count != 0)
-                    drop_angle.SelectedIndex = 0;
-            }
-            else
-            {
-                drop_angle.Visible = false;
-                lbl_angle.Visible = false;
-            }
-
-            // Populate the Start chapter Dropdown
-            drop_chapterStart.Items.Clear();
-            drop_chapterStart.Items.AddRange(selectedTitle.Chapters.ToArray());
-            if (drop_chapterStart.Items.Count > 0)
-                drop_chapterStart.Text = drop_chapterStart.Items[0].ToString();
-
-            // Populate the Final Chapter Dropdown
-            drop_chapterFinish.Items.Clear();
-            drop_chapterFinish.Items.AddRange(selectedTitle.Chapters.ToArray());
-            if (drop_chapterFinish.Items.Count > 0)
-                drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();
-
-            // Populate the Audio Channels Dropdown
-            AudioSettings.SetTrackListAfterTitleChange(selectedTitle, this.currentlySelectedPreset);
-
-            // Populate the Subtitles dropdown
-            Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());
-
-            // Update the source label if we have multiple streams
-            if (selectedTitle != null)
-                if (!string.IsNullOrEmpty(selectedTitle.SourceName))
-                    labelSource.Text = Path.GetFileName(selectedTitle.SourceName);
-
-            // Run the AutoName & ChapterNaming functions
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
-            {
-                string autoPath = Main.AutoName(this);
-                if (autoPath != null)
-                    text_destination.Text = autoPath;
-                else
-                    MessageBox.Show(
-                        "You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a valid default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'Output Files' Tab -> 'Default Path')",
-                        "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-            }
-
-            data_chpt.Rows.Clear();
-            if (selectedTitle.Chapters.Count != 1)
-            {
-                DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text);
-                if (chapterGridView != null)
-                    data_chpt = chapterGridView;
-            }
-            else
-            {
-                Check_ChapterMarkers.Checked = false;
-                Check_ChapterMarkers.Enabled = false;
-            }
-
-            // Hack to force the redraw of the scrollbars which don't resize properly when the control is disabled.
-            data_chpt.Columns[0].Width = 166;
-            data_chpt.Columns[0].Width = 165;
-
-            RegisterPresetEventHandler();
-        }
-
-        private void chapersChanged(object sender, EventArgs e)
-        {
-            if (drop_mode.SelectedIndex != 0) // Function is not used if we are not in chapters mode.
-                return;
-
-            Control ctl = (Control)sender;
-            int chapterStart, chapterEnd;
-            int.TryParse(drop_chapterStart.Text, out chapterStart);
-            int.TryParse(drop_chapterFinish.Text, out chapterEnd);
-
-            switch (ctl.Name)
-            {
-                case "drop_chapterStart":
-                    if (drop_chapterFinish.SelectedIndex == -1 && drop_chapterFinish.Items.Count != 0)
-                        drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1;
-
-                    if (chapterEnd != 0)
-                        if (chapterStart > chapterEnd)
-                            drop_chapterFinish.Text = chapterStart.ToString();
-                    break;
-                case "drop_chapterFinish":
-                    if (drop_chapterStart.Items.Count >= 1 && drop_chapterStart.SelectedIndex == -1)
-                        drop_chapterStart.SelectedIndex = 0;
-
-                    if (chapterStart != 0)
-                        if (chapterEnd < chapterStart)
-                            drop_chapterFinish.Text = chapterStart.ToString();
-
-                    // Add more rows to the Chapter menu if needed.
-                    if (Check_ChapterMarkers.Checked)
-                    {
-                        int i = data_chpt.Rows.Count, finish = 0;
-                        int.TryParse(drop_chapterFinish.Text, out finish);
-
-                        while (i < finish)
-                        {
-                            int n = data_chpt.Rows.Add();
-                            data_chpt.Rows[n].Cells[0].Value = (i + 1);
-                            data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1);
-                            data_chpt.Rows[n].Cells[0].ValueType = typeof(int);
-                            data_chpt.Rows[n].Cells[1].ValueType = typeof(string);
-                            i++;
-                        }
-                    }
-                    break;
-            }
-
-            // Update the Duration
-            lbl_duration.Text = this.selectedTitle.CalculateDuration(drop_chapterStart.SelectedIndex, drop_chapterFinish.SelectedIndex).ToString();
-
-            // Run the Autonaming function
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
-                text_destination.Text = Main.AutoName(this);
-
-            // Disable chapter markers if only 1 chapter is selected.
-            if (chapterStart == chapterEnd)
-            {
-                Check_ChapterMarkers.Enabled = false;
-                btn_importChapters.Enabled = false;
-                data_chpt.Enabled = false;
-            }
-            else
-            {
-                Check_ChapterMarkers.Enabled = true;
-                if (Check_ChapterMarkers.Checked)
-                {
-                    btn_importChapters.Enabled = true;
-                    data_chpt.Enabled = true;
-                }
-            }
-        }
-
-        private void SecondsOrFramesChanged(object sender, EventArgs e)
-        {
-            int start, end;
-            int.TryParse(drop_chapterStart.Text, out start);
-            int.TryParse(drop_chapterFinish.Text, out end);
-            double duration = end - start;
-
-            switch (drop_mode.SelectedIndex)
-            {
-                case 1:
-                    lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString();
-                    return;
-                case 2:
-                    if (selectedTitle != null)
-                    {
-                        duration = duration / selectedTitle.Fps;
-                        lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString();
-                    }
-                    else
-                        lbl_duration.Text = "--:--:--";
-
-                    return;
-            }
-        }
-
-        private void drop_mode_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            // Reset
-            this.drop_chapterFinish.TextChanged -= new EventHandler(this.SecondsOrFramesChanged);
-            this.drop_chapterStart.TextChanged -= new EventHandler(this.SecondsOrFramesChanged);
-
-            // Do Work
-            switch (drop_mode.SelectedIndex)
-            {
-                case 0:
-                    drop_chapterStart.DropDownStyle = ComboBoxStyle.DropDownList;
-                    drop_chapterFinish.DropDownStyle = ComboBoxStyle.DropDownList;
-                    if (drop_chapterStart.Items.Count != 0)
-                    {
-                        drop_chapterStart.SelectedIndex = 0;
-                        drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1;
-                    }
-                    else
-                        lbl_duration.Text = "--:--:--";
-                    return;
-                case 1:
-                    this.drop_chapterStart.TextChanged += new EventHandler(this.SecondsOrFramesChanged);
-                    this.drop_chapterFinish.TextChanged += new EventHandler(this.SecondsOrFramesChanged);
-                    drop_chapterStart.DropDownStyle = ComboBoxStyle.Simple;
-                    drop_chapterFinish.DropDownStyle = ComboBoxStyle.Simple;
-                    if (selectedTitle != null)
-                    {
-                        drop_chapterStart.Text = "0";
-                        drop_chapterFinish.Text = selectedTitle.Duration.TotalSeconds.ToString();
-                    }
-                    return;
-                case 2:
-                    this.drop_chapterStart.TextChanged += new EventHandler(this.SecondsOrFramesChanged);
-                    this.drop_chapterFinish.TextChanged += new EventHandler(this.SecondsOrFramesChanged);
-                    drop_chapterStart.DropDownStyle = ComboBoxStyle.Simple;
-                    drop_chapterFinish.DropDownStyle = ComboBoxStyle.Simple;
-                    if (selectedTitle != null)
-                    {
-                        drop_chapterStart.Text = "0";
-                        drop_chapterFinish.Text = (selectedTitle.Fps * selectedTitle.Duration.TotalSeconds).ToString();
-                    }
-                    return;
-            }
-        }
-
-        // Destination
-        private void btn_destBrowse_Click(object sender, EventArgs e)
-        {
-            // This removes the file extension from the filename box on the save file dialog.
-            // It's daft but some users don't realise that typing an extension overrides the dropdown extension selected.
-            DVD_Save.FileName = Path.GetFileNameWithoutExtension(text_destination.Text);
-
-            if (Path.IsPathRooted(text_destination.Text))
-                DVD_Save.InitialDirectory = Path.GetDirectoryName(text_destination.Text);
-
-            // Show the dialog and set the main form file path
-            if (drop_format.SelectedIndex.Equals(0))
-                DVD_Save.FilterIndex = 1;
-            else if (drop_format.SelectedIndex.Equals(1))
-                DVD_Save.FilterIndex = 2;
-
-            if (DVD_Save.ShowDialog() == DialogResult.OK)
-            {
-                // Add a file extension manually, as FileDialog.AddExtension has issues with dots in filenames
-                switch (DVD_Save.FilterIndex)
-                {
-                    case 1:
-                        if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))
-                            if (this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v) == 2 ||
-                                this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v) == 0)
-                                DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");
-                            else
-                                DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");
-                        break;
-                    case 2:
-                        if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))
-                            DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");
-                        break;
-                    default:
-                        // do nothing  
-                        break;
-                }
-                text_destination.Text = DVD_Save.FileName;
-
-                // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)
-                if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2)
-                    SetExtension(".m4v");
-            }
-        }
-
-        private void text_destination_TextChanged(object sender, EventArgs e)
-        {
-            string path = text_destination.Text;
-            if (path.EndsWith(".mp4") || path.EndsWith(".m4v"))
-                drop_format.SelectedIndex = 0;
-            else if (path.EndsWith(".mkv"))
-                drop_format.SelectedIndex = 1;
-        }
-
-        // Output Settings
-        private void drop_format_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (drop_format.SelectedIndex)
-            {
-                case 0:
-                    SetExtension(".mp4");
-                    break;
-                case 1:
-                    SetExtension(".mkv");
-                    break;
-            }
-
-            AudioSettings.SetContainer(drop_format.Text);
-
-            if (drop_format.Text.Contains("MP4") && drp_videoEncoder.Items.Contains("VP3 (Theora)"))
-            {
-                drp_videoEncoder.Items.Remove("VP3 (Theora)");
-                if (drp_videoEncoder.SelectedItem == null)
-                {
-                    drp_videoEncoder.SelectedIndex = 0;
-                }
-            }
-            else if (drop_format.Text.Contains("MKV") && !drp_videoEncoder.Items.Contains("VP3 (Theora)"))
-            {
-                drp_videoEncoder.Items.Add("VP3 (Theora)");
-            }
-        }
-
-        public void SetExtension(string newExtension)
-        {
-            setContainerOpts();
-
-            if (newExtension == ".mp4" || newExtension == ".m4v")
-                if (Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V() || this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v) == 2)
-                    newExtension = this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v) == 1 ? ".mp4" : ".m4v";
-                else
-                    newExtension = ".mp4";
-
-            if (Path.HasExtension(newExtension))
-                text_destination.Text = Path.ChangeExtension(text_destination.Text, newExtension);
-        }
-
-        // Video Tab
-        private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            // Turn off some options which are H.264 only when the user selects a non h.264 encoder
-            if (drp_videoEncoder.Text.Contains("H.264"))
-            {
-                if (check_2PassEncode.CheckState == CheckState.Checked)
-                    check_turbo.Enabled = true;
-
-                if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))
-                    check_iPodAtom.Enabled = true;
-                else
-                    check_iPodAtom.Enabled = false;
-            }
-            else
-            {
-                check_turbo.CheckState = CheckState.Unchecked;
-                check_turbo.Enabled = false;
-                x264Panel.X264Query = string.Empty;
-                check_iPodAtom.Enabled = false;
-                check_iPodAtom.Checked = false;
-            }
-
-            // Setup the CQ Slider and Advanced Panel
-            switch (drp_videoEncoder.Text)
-            {
-                case "MPEG-4 (FFmpeg)":
-                case "MPEG-2 (FFmpeg)":
-                    if (slider_videoQuality.Value > 31)
-                        slider_videoQuality.Value = 20; // Just reset to 70% QP 10 on encode change.
-                    slider_videoQuality.Minimum = 1;
-                    slider_videoQuality.Maximum = 31;
-                    this.x264Panel.Visible = false;
-                    this.advancedEncoderOpts.Visible = true;
-                    this.advancedEncoderOpts.IsDisabled = false;
-                    break;
-                case "H.264 (x264)":
-                    slider_videoQuality.Minimum = 0;
-                    slider_videoQuality.TickFrequency = 1;
-                    double cqStep = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-                    double multiplier = 1.0 / cqStep;
-                    double value = slider_videoQuality.Value * multiplier;
-
-                    slider_videoQuality.Maximum = (int)(51 / userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step));
-
-                    if (value < slider_videoQuality.Maximum)
-                        slider_videoQuality.Value = slider_videoQuality.Maximum - (int)value;
-
-                    this.x264Panel.Visible = true;
-                    this.x264Panel.BringToFront();
-                    this.advancedEncoderOpts.Visible = false;
-                    break;
-                case "VP3 (Theora)":
-                    if (slider_videoQuality.Value > 63)
-                        slider_videoQuality.Value = 45; // Just reset to 70% QP 45 on encode change.
-                    slider_videoQuality.Minimum = 0;
-                    slider_videoQuality.Maximum = 63;
-
-                    this.x264Panel.Visible = false;
-                    this.advancedEncoderOpts.Visible = true;
-                    this.advancedEncoderOpts.IsDisabled = true;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// When the FrameRate is not Same As Source, show the Max/Constant Mode dropdown
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void drp_videoFramerate_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.radio_peakAndVariable.Text = this.drp_videoFramerate.SelectedIndex == 0 ? "Variable Framerate" : "Peak Framerate (VFR)";
-        }
-
-        /// <summary>
-        /// Set the container format options
-        /// </summary>
-        public void setContainerOpts()
-        {
-            if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))
-            {
-                check_largeFile.Enabled = true;
-                check_optimiseMP4.Enabled = true;
-                check_iPodAtom.Enabled = true;
-            }
-            else
-            {
-                check_largeFile.Enabled = false;
-                check_optimiseMP4.Enabled = false;
-                check_iPodAtom.Enabled = false;
-                check_largeFile.Checked = false;
-                check_optimiseMP4.Checked = false;
-                check_iPodAtom.Checked = false;
-            }
-        }
-
-        private double cachedCqStep;
-
-        /// <summary>
-        /// Update the CQ slider for x264 for a new CQ step. This is set from option
-        /// </summary>
-        public void setQualityFromSlider()
-        {
-            if (cachedCqStep == 0)
-            {
-                cachedCqStep = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-            }
-
-            // Work out the current RF value.
-            double cqStep = this.cachedCqStep;
-            double rfValue = 51.0 - slider_videoQuality.Value * cqStep;
-
-            // Change the maximum value for the slider
-            slider_videoQuality.Maximum = (int)(51 / userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step));
-
-            // Reset the CQ slider to RF0
-            slider_videoQuality.Value = slider_videoQuality.Maximum;
-
-            // Reset the CQ slider back to the previous value as close as possible
-            double cqStepNew = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-            double rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;
-            while (rfValueCurrent < rfValue)
-            {
-                slider_videoQuality.Value--;
-                rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;
-            }
-
-            // Cache the CQ step for the next calculation
-            this.cachedCqStep = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-        }
-
-        private void slider_videoQuality_Scroll(object sender, EventArgs e)
-        {
-            double cqStep = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-            switch (drp_videoEncoder.Text)
-            {
-                case "MPEG-4 (FFmpeg)":
-                case "MPEG-2 (FFmpeg)":
-                    lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value);
-                    break;
-                case "H.264 (x264)":
-                    double rfValue = 51.0 - slider_videoQuality.Value * cqStep;
-                    rfValue = Math.Round(rfValue, 2);
-                    lbl_SliderValue.Text = "RF:" + rfValue.ToString(CultureInfo.InvariantCulture);
-
-                    if (rfValue == 0)
-                    {
-                        lbl_SliderValue.Text += " (Warning: lossless)";
-                    }
-
-                    break;
-                case "VP3 (Theora)":
-                    lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value;
-                    break;
-            }
-        }
-
-        private void radio_avgBitrate_CheckedChanged(object sender, EventArgs e)
-        {
-            if (radio_avgBitrate.Checked)
-            {
-                text_bitrate.Enabled = true;
-                if (string.IsNullOrEmpty(text_bitrate.Text))
-                {
-                    text_bitrate.Text = "1500";
-                }
-                slider_videoQuality.Enabled = false;
-
-                check_2PassEncode.Enabled = true;
-            }
-        }
-
-        private void radio_cq_CheckedChanged(object sender, EventArgs e)
-        {
-            text_bitrate.Enabled = false;
-            slider_videoQuality.Enabled = true;
-
-            check_2PassEncode.Enabled = false;
-            check_2PassEncode.CheckState = CheckState.Unchecked;
-        }
-
-        private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)
-        {
-            if (check_2PassEncode.CheckState.ToString() == "Checked")
-            {
-                if (drp_videoEncoder.Text.Contains("H.264"))
-                    check_turbo.Enabled = true;
-            }
-            else
-            {
-                check_turbo.Enabled = false;
-                check_turbo.CheckState = CheckState.Unchecked;
-            }
-        }
-
-        // Chapter Marker Tab
-        private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)
-        {
-            if (Check_ChapterMarkers.Checked)
-            {
-                if (drop_format.SelectedIndex != 1)
-                    SetExtension(".m4v");
-                data_chpt.Enabled = true;
-                btn_importChapters.Enabled = true;
-            }
-            else
-            {
-                if (drop_format.SelectedIndex != 1)
-                    SetExtension(".mp4");
-                data_chpt.Enabled = false;
-                btn_importChapters.Enabled = false;
-            }
-        }
-
-        private void btn_importChapters_Click(object sender, EventArgs e)
-        {
-            if (File_ChapterImport.ShowDialog() == DialogResult.OK)
-            {
-                string filename = File_ChapterImport.FileName;
-                DataGridView imported = Main.ImportChapterNames(data_chpt, filename);
-                if (imported != null)
-                    data_chpt = imported;
-            }
-        }
-
-        private void btn_export_Click(object sender, EventArgs e)
-        {
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Filter = "Csv File|*.csv";
-            saveFileDialog.DefaultExt = "csv";
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                string filename = saveFileDialog.FileName;
-
-                Main.SaveChapterMarkersToCsv(this, filename);
-            }
-        }
-
-        private void mnu_resetChapters_Click(object sender, EventArgs e)
-        {
-            data_chpt.Rows.Clear();
-            DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text);
-            if (chapterGridView != null)
-            {
-                data_chpt = chapterGridView;
-            }
-        }
-
-        // Query Editor Tab
-        private void btn_generate_Query_Click(object sender, EventArgs e)
-        {
-            rtf_query.Text = QueryGenerator.GenerateFullQuery(this).Query;
-        }
-
-        private void btn_clear_Click(object sender, EventArgs e)
-        {
-            rtf_query.Clear();
-        }
-
-        #endregion
-
-        // MainWindow Components, Actions and Functions ***********************
-
-        #region Source Scan
-
-        /// <summary>
-        /// Start the Scan Process
-        /// </summary>
-        /// <param name="filename">
-        /// The filename.
-        /// </param>
-        /// <param name="title">
-        /// The title.
-        /// </param>
-        private void StartScan(string filename, int title)
-        {
-            // Setup the GUI components for the scan.
-            sourcePath = filename;
-
-            this.DisableGUI();
-
-            // Start the Scan
-            try
-            {
-                SourceScan.Scan(sourcePath, title, this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount));
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show("frmMain.cs - StartScan " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        /// <summary>
-        /// Update the Status label for the scan
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void SourceScanScanStatusChanged(object sender, ScanProgressEventArgs e)
-        {
-            if (this.InvokeRequired)
-            {
-                this.BeginInvoke(new ScanProgessStatus(this.SourceScanScanStatusChanged), new[] { sender, e });
-                return;
-            }
-
-            labelSource.Text = string.Format("Processing Title: {0} of {1}", e.CurrentTitle, e.Titles);
-        }
-
-        /// <summary>
-        /// Update the UI after the scan has completed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void SourceScanScanCompleted(object sender, EventArgs e)
-        {
-            if (this.InvokeRequired)
-            {
-                this.BeginInvoke(new ScanCompletedStatus(this.SourceScanScanCompleted), new[] { sender, e });
-                return;
-            }
-
-            try
-            {
-                currentSource = SourceScan.SouceData;
-
-                // Setup some GUI components
-                drp_dvdtitle.Items.Clear();
-                if (currentSource.Titles.Count != 0)
-                    drp_dvdtitle.Items.AddRange(currentSource.Titles.ToArray());
-
-                foreach (Title title in currentSource.Titles)
-                {
-                    if (title.MainTitle)
-                    {
-                        drp_dvdtitle.SelectedItem = title;
-                    }
-                }
-
-                if (drp_dvdtitle.SelectedItem == null && drp_dvdtitle.Items.Count > 0)
-                {
-                    drp_dvdtitle.SelectedIndex = 0;
-                }
-
-                // Enable the creation of chapter markers if the file is an image of a dvd
-                if (drop_chapterStart.Items.Count > 0)
-                {
-                    int start, end;
-                    int.TryParse(drop_chapterStart.Items[0].ToString(), out start);
-                    int.TryParse(drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString(), out end);
-                    if (end > start) Check_ChapterMarkers.Enabled = true;
-                    else
-                    {
-                        Check_ChapterMarkers.Enabled = false;
-                        Check_ChapterMarkers.Checked = false;
-                        data_chpt.Rows.Clear();
-                    }
-                }
-
-                // If no titles were found, Display an error message
-                if (drp_dvdtitle.Items.Count == 0)
-                {
-                    MessageBox.Show(
-                        "No Title(s) found. \n\nYour Source may be copy protected, badly mastered or in a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).",
-                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
-                    sourcePath = string.Empty;
-                }
-                UpdateSourceLabel();
-
-                // This is a bit of a hack to fix the queue editing.
-                // If afte the scan, we find a job sitting in queueEdit, then the user has rescaned the source from the queue by clicking edit.
-                // When this occures, we want to repopulate their old settings.
-                if (queueEdit != null)
-                {
-                    // Setup UI
-                    if (queueEdit.Query != null)
-                    {
-                        Preset preset = new Preset
-                        {
-                            Name = "Loaded Back From Queue",
-                            Query = queueEdit.Query,
-                            CropSettings = true,
-                        };
-
-                        // Now load the preset
-                        PresetLoader.LoadPreset(this, preset);
-                        preset.Task = queueEdit.Task;
-                        this.AudioSettings.LoadTracks(preset);
-
-                        // Set the destination path);
-                        this.text_destination.Text = queueEdit.Destination;
-
-                        // The x264 widgets will need updated, so do this now:
-                        x264Panel.StandardizeOptString();
-                        x264Panel.SetCurrentSettingsInPanel();
-
-                        // Set the crop label
-                        PictureSettings.SetPresetCropWarningLabel(null);
-                    }
-
-                    queueEdit = null;
-                }
-
-                // Enable the GUI components and enable any disabled components
-                EnableGUI();
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show("frmMain.cs - updateUIafterScan " + exc, "Error", MessageBoxButtons.OK,
-                                MessageBoxIcon.Error);
-                EnableGUI();
-            }
-        }
-
-        /// <summary>
-        /// Enable the GUI
-        /// </summary>
-        private void EnableGUI()
-        {
-            try
-            {
-                if (InvokeRequired)
-                    BeginInvoke(new UpdateWindowHandler(EnableGUI));
-                foreach (Control ctrl in Controls)
-                    ctrl.Enabled = true;
-                btn_start.Enabled = true;
-                btn_showQueue.Enabled = true;
-                btn_add2Queue.Enabled = true;
-                tb_preview.Enabled = true;
-                btn_source.Enabled = true;
-                mnu_killCLI.Visible = false;
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show("frmMain.cs - EnableGUI() " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        /// <summary>
-        /// Disable the GUI
-        /// </summary>
-        private void DisableGUI()
-        {
-            foreach (Control ctrl in Controls)
-                if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))
-                    ctrl.Enabled = false;
-
-            labelSource.Enabled = true;
-            labelStaticSource.Enabled = true;
-            SourceLayoutPanel.Enabled = true;
-            btn_source.Enabled = false;
-            btn_start.Enabled = false;
-            btn_showQueue.Enabled = false;
-            btn_add2Queue.Enabled = false;
-            tb_preview.Enabled = false;
-            mnu_killCLI.Visible = true;
-        }
-
-        /// <summary>
-        /// Kill the Scan
-        /// </summary>
-        private void KillScan()
-        {
-            SourceScan.ScanCompleted -= this.SourceScanScanCompleted;
-            EnableGUI();
-            ResetGUI();
-
-            SourceScan.Stop();
-
-            labelSource.Text = "Scan Cancelled";
-        }
-
-        /// <summary>
-        /// Reset the GUI
-        /// </summary>
-        private void ResetGUI()
-        {
-            drp_dvdtitle.Items.Clear();
-            drop_chapterStart.Items.Clear();
-            drop_chapterFinish.Items.Clear();
-            lbl_duration.Text = "Select a Title";
-            PictureSettings.lbl_src_res.Text = "Select a Title";
-            sourcePath = String.Empty;
-            text_destination.Text = String.Empty;
-            selectedTitle = null;
-        }
-
-        /// <summary>
-        /// Update the Source Label
-        /// </summary>
-        private void UpdateSourceLabel()
-        {
-            labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;
-        }
-
-        /// <summary>
-        /// Take a job from the Queue, rescan it, and reload the GUI for that job.
-        /// </summary>
-        /// <param name="job">
-        /// The job.
-        /// </param>
-        public void RecievingJob(QueueTask job)
-        {
-            // Reset
-            this.currentlySelectedPreset = null;
-            x264Panel.Reset2Defaults();
-
-            // Scan
-            queueEdit = job; // Nasty but will do for now. TODO
-            StartScan(job.Source, job.Title);
-        }
-
-        #endregion
-
-        #region GUI Functions and Actions
-
-        /// <summary>
-        /// Set the GUI to it's finished encoding state.
-        /// </summary>
-        private void SetEncodeFinished()
-        {
-            try
-            {
-                if (InvokeRequired)
-                {
-                    BeginInvoke(new UpdateWindowHandler(SetEncodeFinished));
-                    return;
-                }
-
-                lbl_encode.Text = "Encoding Finished";
-                ProgressBarStatus.Visible = false;
-                btn_start.Text = "Start";
-                btn_start.ToolTipText = "Start the encoding process";
-                btn_start.Image = Properties.Resources.Play;
-
-                // If the window is minimized, display the notification in a popup.
-                if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TrayIconAlerts))
-                    if (FormWindowState.Minimized == this.WindowState)
-                    {
-                        notifyIcon.BalloonTipText = lbl_encode.Text;
-                        notifyIcon.ShowBalloonTip(500);
-                    }
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show(exc.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Set the GUI to it's started encoding state.
-        /// </summary>
-        private void SetEncodeStarted()
-        {
-            try
-            {
-                if (InvokeRequired)
-                {
-                    BeginInvoke(new UpdateWindowHandler(SetEncodeStarted));
-                    return;
-                }
-                lbl_encode.Visible = true;
-                ProgressBarStatus.Value = 0;
-                ProgressBarStatus.Visible = true;
-                lbl_encode.Text = "Encoding with " + this.queueProcessor.QueueManager.Count + " encode(s) pending";
-                btn_start.Text = "Stop";
-                btn_start.ToolTipText = "Stop the encoding process.";
-                btn_start.Image = Properties.Resources.stop;
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show(exc.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Display the Encode Status
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void EncodeQueue_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
-        {
-            if (this.InvokeRequired)
-            {
-                this.BeginInvoke(new EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });
-                return;
-            }
-
-
-            lbl_encode.Text =
-                string.Format(
-                "{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss},  Pending Jobs {5}",
-                e.PercentComplete,
-                e.CurrentFrameRate,
-                e.AverageFrameRate,
-                e.EstimatedTimeLeft,
-                e.ElapsedTime,
-                this.queueProcessor.QueueManager.Count);
-
-            ProgressBarStatus.Value = (int)Math.Round(e.PercentComplete);
-        }
-
-        /// <summary>
-        /// Set the DVD Drive selection in the "Source" Menu
-        /// </summary>
-        private void SetDriveSelectionMenuItem()
-        {
-            try
-            {
-                if (InvokeRequired)
-                {
-                    BeginInvoke(new UpdateWindowHandler(SetDriveSelectionMenuItem));
-                    return;
-                }
-
-                drives = GeneralUtilities.GetDrives();
-
-                List<ToolStripMenuItem> menuItems = new List<ToolStripMenuItem>();
-                foreach (DriveInformation drive in drives)
-                {
-                    ToolStripMenuItem menuItem = new ToolStripMenuItem
-                        {
-                            Name = drive.ToString(),
-                            Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")",
-                            Image = Resources.disc_small
-                        };
-                    menuItem.Click += new EventHandler(MnuDvdDriveClick);
-                    menuItems.Add(menuItem);
-                }
-
-                foreach (ToolStripMenuItem item in menuItems)
-                    btn_source.DropDownItems.Add(item);
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show("Error in SetDriveSelectionMenuItem" + exc);
-            }
-        }
-
-        /// <summary>
-        /// Access the preset Handler and setup the preset panel.
-        /// </summary>
-        private void LoadPresetPanel()
-        {
-            if (presetHandler.CheckIfPresetsAreOutOfDate())
-                if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification))
-                    MessageBox.Show(this,
-                                    "HandBrake has determined your built-in presets are out of date... These presets will now be updated.",
-                                    "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
-            // Clear the old presets
-            treeView_presets.Nodes.Clear();
-
-
-            string category = string.Empty; // The category we are currnetly processing
-            TreeNode rootNode = null;
-            foreach (Preset preset in this.presetHandler.Presets.Where(p => p.IsBuildIn))
-            {
-                // If the category of this preset doesn't match the current category we are processing
-                // Then we need to create a new root node.
-                if (preset.Category != category)
-                {
-                    rootNode = new TreeNode(preset.Category) { ForeColor = Color.DarkBlue };
-                    treeView_presets.Nodes.Add(rootNode);
-                    category = preset.Category;
-                }
-
-                if (preset.Category == category && rootNode != null)
-                    rootNode.Nodes.Add(new TreeNode(preset.Name) { ToolTipText = preset.Description, ForeColor = Color.DarkBlue, Tag = preset });
-            }
-
-            rootNode = null;
-            category = null;
-            foreach (Preset preset in this.presetHandler.Presets.Where(p => !p.IsBuildIn)) // User Presets
-            {
-                // If the category of this preset doesn't match the current category we are processing
-                // Then we need to create a new root node.
-                if (preset.Category != category && preset.Category != string.Empty)
-                {
-                    rootNode = new TreeNode(preset.Category) { ForeColor = Color.Black };
-                    treeView_presets.Nodes.Add(rootNode);
-                    category = preset.Category;
-                }
-
-                if (preset.Category == category && rootNode != null)
-                    rootNode.Nodes.Add(new TreeNode(preset.Name) { ForeColor = Color.Black, ToolTipText = preset.Description, Tag = preset });
-                else
-                    treeView_presets.Nodes.Add(new TreeNode(preset.Name) { ForeColor = Color.Black, ToolTipText = preset.Description, Tag = preset });
-            }
-
-            treeView_presets.Update();
-        }
-
-        /// <summary>
-        /// Get the title from the selected item in the title dropdown.
-        /// </summary>
-        /// <returns>
-        /// The title.
-        /// </returns>
-        public int GetTitle()
-        {
-            int title = 0;
-            if (drp_dvdtitle.SelectedItem != null)
-            {
-                string[] titleInfo = drp_dvdtitle.SelectedItem.ToString().Split(' ');
-                int.TryParse(titleInfo[0], out title);
-            }
-
-            return title;
-        }
-
-        /// <summary>
-        /// Handle the Update Check Finishing.
-        /// </summary>
-        /// <param name="result">
-        /// The result.
-        /// </param>
-        private void UpdateCheckDoneMenu(IAsyncResult result)
-        {
-            // Make sure it's running on the calling thread
-            if (InvokeRequired)
-            {
-                Invoke(new MethodInvoker(() => this.UpdateCheckDoneMenu(result)));
-                return;
-            }
-            UpdateCheckInformation info;
-            try
-            {
-                // Get the information about the new build, if any, and close the window
-                info = UpdateService.EndCheckForUpdates(result);
-
-                if (info.NewVersionAvailable)
-                {
-                    UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));
-                    updateWindow.ShowDialog();
-                }
-                else
-                    MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK,
-                                    MessageBoxIcon.Information);
-                lbl_updateCheck.Visible = false;
-                return;
-            }
-            catch (Exception ex)
-            {
-                if ((bool)result.AsyncState)
-                    MessageBox.Show(
-                        "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex,
-                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        #endregion
-
-        #region Overrides
-
-        /// <summary>
-        /// Handle GUI shortcuts
-        /// </summary>
-        /// <param name="msg">Message</param>
-        /// <param name="keyData">Keys</param>
-        /// <returns>Bool</returns>
-        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
-        {
-            if (keyData == (Keys.Control | Keys.S))
-            {
-                btn_start_Click(this, new EventArgs());
-                return true;
-            }
-
-            if (keyData == (Keys.Control | Keys.Shift | Keys.A))
-            {
-                btn_add2Queue_Click(this, new EventArgs());
-                return true;
-            }
-            return base.ProcessCmdKey(ref msg, keyData);
-        }
-
-        /// <summary>
-        /// If the queue is being processed, prompt the user to confirm application close.
-        /// </summary>
-        /// <param name="e">FormClosingEventArgs</param>
-        protected override void OnFormClosing(FormClosingEventArgs e)
-        {
-            try
-            {
-                // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.
-                if (this.queueProcessor.EncodeService.IsEncoding)
-                {
-                    DialogResult result =
-                        MessageBox.Show(
-                            "HandBrake is currently encoding. Closing HandBrake will stop the current encode and will result in an unplayable file.\n\nDo you want to close HandBrake?",
-                            "Close HandBrake?",
-                            MessageBoxButtons.YesNo,
-                            MessageBoxIcon.Question);
-
-                    if (result == DialogResult.No)
-                    {
-                        e.Cancel = true;
-                        return;
-                    }
-
-                    this.queueProcessor.Pause();
-                    this.queueProcessor.EncodeService.Stop();
-                }
-
-                if (SourceScan.IsScanning)
-                {
-                    SourceScan.Stop();
-                }
-
-                SourceScan.ScanCompleted -= this.SourceScanScanCompleted;
-                SourceScan.ScanStatusChanged -= this.SourceScanScanStatusChanged;
-            }
-            catch (Exception exc)
-            {
-                throw new GeneralApplicationException("HandBrake was not able to shutdown properly.", " You may need to forcefully quit HandBrake CLI from TaskManager if it's still running ", exc);
-            }
-            finally
-            {
-                base.OnFormClosing(e);
-            }
-        }
-
-        #endregion
-
-
-        // This is the END of the road ****************************************
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmMain.resx Deleted

@@ -1,1031 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1106, 15</value>
-  </metadata>
-  <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>556, 15</value>
-  </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>18, 15</value>
-  </metadata>
-  <data name="slider_videoQuality.ToolTip" xml:space="preserve">
-    <value>Set the desired quality factor. The encoder targets a certain quality.
-The scale used by each video encoder is different.
-
-x264's scale is logarithmic and lower values correspond to higher quality.
-So small decreases in value will result in progressively larger increases in the resulting
-file size. A value of 0 means lossless and will result in a file size that is larger than
-the original source, unless the source was also lossless
-
-FFmpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>
-  </data>
-  <data name="text_bitrate.ToolTip" xml:space="preserve">
-    <value>Set the average bitrate. The instantaneous bitrate can be
-much higher or lower at any point in time. But the average over a long
-duration will be the value set here. 
-
-If you need to limit instantaneous bitrate look into x264's vbv-bufsize and 
-vbv-maxrate settings.</value>
-  </data>
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ChaptersMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>578, 54</value>
-  </metadata>
-  <data name="data_chpt.ToolTip" xml:space="preserve">
-    <value>Here you can name each chapter that the encoded video will contain.
-Make sure you have selected a "Title" from the "Source" box above otherwise 
-the list will not be populated with the correct amount of chapters.
-Note: Do not change any of the chapter numbers!</value>
-  </data>
-  <data name="btn_importChapters.ToolTip" xml:space="preserve">
-    <value>Import a comma separated file containing the chapter information.
-The CSV should be formatted as follows:
-
-1,Chapter 1 Name
-2,Chapter 2 Name
-3,Chapter 3 Name
-
-Note: Currently, if you wish to use a , in your chapter name, you must escape it with a \
-Note2: HandBrake can NOT create chapters, only add a name to any chapters your source currently has.</value>
-  </data>
-  <data name="btn_export.ToolTip" xml:space="preserve">
-    <value>Export to a comma separated file containing the chapter information.
-The CSV is formatted as follows:
-
-1,Chapter 1 Name
-2,Chapter 2 Name
-3,Chapter 3 Name
-
-Note: Commas in names are escaped by a \</value>
-  </data>
-  <data name="drop_mode.ToolTip" xml:space="preserve">
-    <value>There are several ranges which can be encoded:
-- Encode a range of Chapters.
-
-The Following options are not 100% accurate:
-- Encode video between a start and end time, measured in seconds
-- Encode video between a start and end frame.</value>
-  </data>
-  <data name="radio_cq.ToolTip" xml:space="preserve">
-    <value>Set the desired quality factor. The encoder targets a certain quality.
-The scale used by each video encoder is different.
-
-x264's scale is logarithmic and lower values correspond to higher quality.
-So small decreases in value will result in progressively larger increases in the resulting
-file size. A value of 0 means lossless and will result in a file size that is larger than
-the original source, unless the source was also lossless
-
-FFmpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>
-  </data>
-  <data name="radio_avgBitrate.ToolTip" xml:space="preserve">
-    <value>Set the average bitrate. The instantaneous bitrate can be
-much higher or lower at any point in time. But the average over a long
-duration will be the value set here. 
-
-If you need to limit instantaneous bitrate look into x264's vbv-bufsize and 
-vbv-maxrate settings.
-</value>
-  </data>
-  <data name="check_2PassEncode.ToolTip" xml:space="preserve">
-    <value>Perform 2 Pass Encoding. The 'bitrate' option is  a
-prerequisite. During the 1st pass, statistics about the video
-are collected. Then in a second pass, those statistics are used
-to make bitrate allocation decisions.</value>
-  </data>
-  <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>984, 17</value>
-  </metadata>
-  <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>232, 15</value>
-  </metadata>
-  <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>450, 15</value>
-  </metadata>
-  <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>343, 15</value>
-  </metadata>
-  <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>106, 15</value>
-  </metadata>
-  <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 54</value>
-  </metadata>
-  <data name="label34.Text" xml:space="preserve">
-    <value>Here you can alter the query generated by this program. This feature is for one job overriding of the automatic query generation.
-Don't forget to re-generate this query if you change any GUI options.
-Note that this will also override the "Add to Queue" query as well.
-Clear the text box below to return to the internal query generation.</value>
-  </data>
-  <metadata name="presetsToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>565, 54</value>
-  </metadata>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>767, 15</value>
-  </metadata>
-  <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>871, 15</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-  <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1244, 15</value>
-  </metadata>
-  <metadata name="hbproc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>220, 54</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>98</value>
-  </metadata>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-  <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>664, 15</value>
-  </metadata>
-  <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>310, 54</value>
-  </metadata>
-  <metadata name="File_ChapterImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>423, 54</value>
-  </metadata>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmOptions.Designer.cs Deleted

@@ -1,2019 +0,0 @@
-/*  frmOptions.Designer.cs 
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    partial class frmOptions
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions));
-            this.btn_close = new System.Windows.Forms.Button();
-            this.drp_completeOption = new System.Windows.Forms.ComboBox();
-            this.tab_options = new System.Windows.Forms.TabControl();
-            this.tab_general = new System.Windows.Forms.TabPage();
-            this.label38 = new System.Windows.Forms.Label();
-            this.txt_SendFileArgs = new System.Windows.Forms.TextBox();
-            this.lbl_sendFileTo = new System.Windows.Forms.Label();
-            this.check_sendFileTo = new System.Windows.Forms.CheckBox();
-            this.btn_SendFileToPath = new System.Windows.Forms.Button();
-            this.check_growlEncode = new System.Windows.Forms.CheckBox();
-            this.check_GrowlQueue = new System.Windows.Forms.CheckBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.drop_updateCheckDays = new System.Windows.Forms.ComboBox();
-            this.check_tooltip = new System.Windows.Forms.CheckBox();
-            this.check_updateCheck = new System.Windows.Forms.CheckBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.tab_outputFiles = new System.Windows.Forms.TabPage();
-            this.txt_autoNameFormat = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.check_autoNaming = new System.Windows.Forms.CheckBox();
-            this.label35 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.cb_mp4FileMode = new System.Windows.Forms.ComboBox();
-            this.check_removeUnderscores = new System.Windows.Forms.CheckBox();
-            this.text_an_path = new System.Windows.Forms.TextBox();
-            this.btn_browse = new System.Windows.Forms.Button();
-            this.label34 = new System.Windows.Forms.Label();
-            this.check_TitleCase = new System.Windows.Forms.CheckBox();
-            this.label13 = new System.Windows.Forms.Label();
-            this.tab_picture = new System.Windows.Forms.TabPage();
-            this.btn_vlcPath = new System.Windows.Forms.Button();
-            this.label29 = new System.Windows.Forms.Label();
-            this.txt_vlcPath = new System.Windows.Forms.TextBox();
-            this.label36 = new System.Windows.Forms.Label();
-            this.tab_audio_sub = new System.Windows.Forms.TabPage();
-            this.check_advPassthruOpts = new System.Windows.Forms.CheckBox();
-            this.label49 = new System.Windows.Forms.Label();
-            this.label48 = new System.Windows.Forms.Label();
-            this.drop_preferredLangSubtitles = new System.Windows.Forms.ComboBox();
-            this.label39 = new System.Windows.Forms.Label();
-            this.audioSelectionPanel = new System.Windows.Forms.Panel();
-            this.label46 = new System.Windows.Forms.Label();
-            this.listBox_selectedLanguages = new System.Windows.Forms.ListBox();
-            this.button_moveLanguageDown = new System.Windows.Forms.Button();
-            this.listBox_availableLanguages = new System.Windows.Forms.ListBox();
-            this.button_addLanguage = new System.Windows.Forms.Button();
-            this.button_moveLanguageUp = new System.Windows.Forms.Button();
-            this.label47 = new System.Windows.Forms.Label();
-            this.button_removeLanguage = new System.Windows.Forms.Button();
-            this.button_clearLanguage = new System.Windows.Forms.Button();
-            this.label45 = new System.Windows.Forms.Label();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.label44 = new System.Windows.Forms.Label();
-            this.label41 = new System.Windows.Forms.Label();
-            this.cb_subtitleMode = new System.Windows.Forms.ComboBox();
-            this.cb_audioMode = new System.Windows.Forms.ComboBox();
-            this.label42 = new System.Windows.Forms.Label();
-            this.check_AddOnlyOneAudioPerLanguage = new System.Windows.Forms.CheckBox();
-            this.check_AddCCTracks = new System.Windows.Forms.CheckBox();
-            this.label43 = new System.Windows.Forms.Label();
-            this.label31 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.drop_preferredLangAudio = new System.Windows.Forms.ComboBox();
-            this.tab_cli = new System.Windows.Forms.TabPage();
-            this.label11 = new System.Windows.Forms.Label();
-            this.check_preventSleep = new System.Windows.Forms.CheckBox();
-            this.check_clearOldLogs = new System.Windows.Forms.CheckBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.btn_viewLogs = new System.Windows.Forms.Button();
-            this.label9 = new System.Windows.Forms.Label();
-            this.Label4 = new System.Windows.Forms.Label();
-            this.btn_clearLogs = new System.Windows.Forms.Button();
-            this.drp_Priority = new System.Windows.Forms.ComboBox();
-            this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();
-            this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.btn_saveLog = new System.Windows.Forms.Button();
-            this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();
-            this.text_logPath = new System.Windows.Forms.TextBox();
-            this.label14 = new System.Windows.Forms.Label();
-            this.tab_advanced = new System.Windows.Forms.TabPage();
-            this.ud_minTitleLength = new System.Windows.Forms.NumericUpDown();
-            this.label40 = new System.Windows.Forms.Label();
-            this.check_showCliForInGUIEncode = new System.Windows.Forms.CheckBox();
-            this.drop_previewScanCount = new System.Windows.Forms.ComboBox();
-            this.label33 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();
-            this.check_mainMinimize = new System.Windows.Forms.CheckBox();
-            this.check_promptOnUnmatchingQueries = new System.Windows.Forms.CheckBox();
-            this.check_dvdnav = new System.Windows.Forms.CheckBox();
-            this.check_queryEditorTab = new System.Windows.Forms.CheckBox();
-            this.label32 = new System.Windows.Forms.Label();
-            this.drop_x264step = new System.Windows.Forms.ComboBox();
-            this.label30 = new System.Windows.Forms.Label();
-            this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();
-            this.label28 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();
-            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.checkBox1 = new System.Windows.Forms.CheckBox();
-            this.checkBox2 = new System.Windows.Forms.CheckBox();
-            this.checkBox3 = new System.Windows.Forms.CheckBox();
-            this.checkBox4 = new System.Windows.Forms.CheckBox();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.checkBox5 = new System.Windows.Forms.CheckBox();
-            this.checkBox6 = new System.Windows.Forms.CheckBox();
-            this.checkBox7 = new System.Windows.Forms.CheckBox();
-            this.checkBox8 = new System.Windows.Forms.CheckBox();
-            this.comboBox2 = new System.Windows.Forms.ComboBox();
-            this.label16 = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label18 = new System.Windows.Forms.Label();
-            this.label19 = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
-            this.label21 = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
-            this.label23 = new System.Windows.Forms.Label();
-            this.button2 = new System.Windows.Forms.Button();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label25 = new System.Windows.Forms.Label();
-            this.label26 = new System.Windows.Forms.Label();
-            this.label27 = new System.Windows.Forms.Label();
-            this.openExecutable = new System.Windows.Forms.OpenFileDialog();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label37 = new System.Windows.Forms.Label();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.tab_options.SuspendLayout();
-            this.tab_general.SuspendLayout();
-            this.tab_outputFiles.SuspendLayout();
-            this.tab_picture.SuspendLayout();
-            this.tab_audio_sub.SuspendLayout();
-            this.audioSelectionPanel.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.tab_cli.SuspendLayout();
-            this.tab_advanced.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.ud_minTitleLength)).BeginInit();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // btn_close
-            // 
-            this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;
-            this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_close.Location = new System.Drawing.Point(527, 503);
-            this.btn_close.Name = "btn_close";
-            this.btn_close.Size = new System.Drawing.Size(72, 22);
-            this.btn_close.TabIndex = 53;
-            this.btn_close.Text = "Close";
-            this.btn_close.UseVisualStyleBackColor = true;
-            this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
-            // 
-            // drp_completeOption
-            // 
-            this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_completeOption.FormattingEnabled = true;
-            this.drp_completeOption.Items.AddRange(new object[] {
-            "Do nothing",
-            "Shutdown",
-            "Suspend",
-            "Hibernate",
-            "Lock system",
-            "Log off",
-            "Quit HandBrake"});
-            this.drp_completeOption.Location = new System.Drawing.Point(108, 99);
-            this.drp_completeOption.Name = "drp_completeOption";
-            this.drp_completeOption.Size = new System.Drawing.Size(166, 21);
-            this.drp_completeOption.TabIndex = 43;
-            this.ToolTip.SetToolTip(this.drp_completeOption, "Performs an action when an encode or queue has completed.");
-            this.drp_completeOption.SelectedIndexChanged += new System.EventHandler(this.drp_completeOption_SelectedIndexChanged);
-            // 
-            // tab_options
-            // 
-            this.tab_options.Controls.Add(this.tab_general);
-            this.tab_options.Controls.Add(this.tab_outputFiles);
-            this.tab_options.Controls.Add(this.tab_picture);
-            this.tab_options.Controls.Add(this.tab_audio_sub);
-            this.tab_options.Controls.Add(this.tab_cli);
-            this.tab_options.Controls.Add(this.tab_advanced);
-            this.tab_options.Location = new System.Drawing.Point(12, 74);
-            this.tab_options.Name = "tab_options";
-            this.tab_options.SelectedIndex = 0;
-            this.tab_options.Size = new System.Drawing.Size(588, 423);
-            this.tab_options.TabIndex = 58;
-            // 
-            // tab_general
-            // 
-            this.tab_general.Controls.Add(this.label38);
-            this.tab_general.Controls.Add(this.txt_SendFileArgs);
-            this.tab_general.Controls.Add(this.lbl_sendFileTo);
-            this.tab_general.Controls.Add(this.check_sendFileTo);
-            this.tab_general.Controls.Add(this.btn_SendFileToPath);
-            this.tab_general.Controls.Add(this.check_growlEncode);
-            this.tab_general.Controls.Add(this.check_GrowlQueue);
-            this.tab_general.Controls.Add(this.label1);
-            this.tab_general.Controls.Add(this.drp_completeOption);
-            this.tab_general.Controls.Add(this.drop_updateCheckDays);
-            this.tab_general.Controls.Add(this.check_tooltip);
-            this.tab_general.Controls.Add(this.check_updateCheck);
-            this.tab_general.Controls.Add(this.label2);
-            this.tab_general.Location = new System.Drawing.Point(4, 22);
-            this.tab_general.Name = "tab_general";
-            this.tab_general.Padding = new System.Windows.Forms.Padding(10);
-            this.tab_general.Size = new System.Drawing.Size(580, 397);
-            this.tab_general.TabIndex = 3;
-            this.tab_general.Text = "General";
-            this.tab_general.UseVisualStyleBackColor = true;
-            // 
-            // label38
-            // 
-            this.label38.AutoSize = true;
-            this.label38.Location = new System.Drawing.Point(124, 179);
-            this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(63, 13);
-            this.label38.TabIndex = 109;
-            this.label38.Text = "Arguments:";
-            // 
-            // txt_SendFileArgs
-            // 
-            this.txt_SendFileArgs.Location = new System.Drawing.Point(196, 176);
-            this.txt_SendFileArgs.Name = "txt_SendFileArgs";
-            this.txt_SendFileArgs.Size = new System.Drawing.Size(178, 21);
-            this.txt_SendFileArgs.TabIndex = 108;
-            this.ToolTip.SetToolTip(this.txt_SendFileArgs, "These are the command line arguments that will be placed before the file name.\r\ne" +
-        ".g  vlc.exe {your arguments}  output_file.mp4\r\n\r\nThis can be left blank for many" +
-        " applications.\r\n");
-            this.txt_SendFileArgs.TextChanged += new System.EventHandler(this.txt_SendFileArgs_TextChanged);
-            // 
-            // lbl_sendFileTo
-            // 
-            this.lbl_sendFileTo.AutoSize = true;
-            this.lbl_sendFileTo.Location = new System.Drawing.Point(193, 152);
-            this.lbl_sendFileTo.Name = "lbl_sendFileTo";
-            this.lbl_sendFileTo.Size = new System.Drawing.Size(32, 13);
-            this.lbl_sendFileTo.TabIndex = 107;
-            this.lbl_sendFileTo.Text = "None";
-            // 
-            // check_sendFileTo
-            // 
-            this.check_sendFileTo.AutoSize = true;
-            this.check_sendFileTo.Location = new System.Drawing.Point(108, 151);
-            this.check_sendFileTo.Name = "check_sendFileTo";
-            this.check_sendFileTo.Size = new System.Drawing.Size(86, 17);
-            this.check_sendFileTo.TabIndex = 106;
-            this.check_sendFileTo.Text = "Send File to:";
-            this.ToolTip.SetToolTip(this.check_sendFileTo, "Automatically send the output file to another application after encoding has comp" +
-        "leted.");
-            this.check_sendFileTo.UseVisualStyleBackColor = true;
-            this.check_sendFileTo.CheckedChanged += new System.EventHandler(this.check_sendFileTo_CheckedChanged);
-            // 
-            // btn_SendFileToPath
-            // 
-            this.btn_SendFileToPath.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_SendFileToPath.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_SendFileToPath.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_SendFileToPath.Location = new System.Drawing.Point(378, 147);
-            this.btn_SendFileToPath.Name = "btn_SendFileToPath";
-            this.btn_SendFileToPath.Size = new System.Drawing.Size(75, 23);
-            this.btn_SendFileToPath.TabIndex = 105;
-            this.btn_SendFileToPath.Text = "Browse";
-            this.btn_SendFileToPath.UseVisualStyleBackColor = true;
-            this.btn_SendFileToPath.Click += new System.EventHandler(this.btn_SendFileToPath_Click);
-            // 
-            // check_growlEncode
-            // 
-            this.check_growlEncode.AutoSize = true;
-            this.check_growlEncode.BackColor = System.Drawing.Color.Transparent;
-            this.check_growlEncode.Location = new System.Drawing.Point(282, 126);
-            this.check_growlEncode.Name = "check_growlEncode";
-            this.check_growlEncode.Size = new System.Drawing.Size(171, 17);
-            this.check_growlEncode.TabIndex = 99;
-            this.check_growlEncode.Text = "Growl after Encode Completes";
-            this.ToolTip.SetToolTip(this.check_growlEncode, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " +
-        "alerts on your desktop.");
-            this.check_growlEncode.UseVisualStyleBackColor = false;
-            this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged);
-            // 
-            // check_GrowlQueue
-            // 
-            this.check_GrowlQueue.AutoSize = true;
-            this.check_GrowlQueue.BackColor = System.Drawing.Color.Transparent;
-            this.check_GrowlQueue.Location = new System.Drawing.Point(108, 126);
-            this.check_GrowlQueue.Name = "check_GrowlQueue";
-            this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17);
-            this.check_GrowlQueue.TabIndex = 98;
-            this.check_GrowlQueue.Text = "Growl after Queue Completes";
-            this.ToolTip.SetToolTip(this.check_GrowlQueue, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " +
-        "alerts on your desktop.");
-            this.check_GrowlQueue.UseVisualStyleBackColor = false;
-            this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.BackColor = System.Drawing.Color.Transparent;
-            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(15, 15);
-            this.label1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(66, 13);
-            this.label1.TabIndex = 67;
-            this.label1.Text = "At Launch:";
-            // 
-            // drop_updateCheckDays
-            // 
-            this.drop_updateCheckDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_updateCheckDays.FormattingEnabled = true;
-            this.drop_updateCheckDays.Items.AddRange(new object[] {
-            "Daily",
-            "Weekly",
-            "Monthly"});
-            this.drop_updateCheckDays.Location = new System.Drawing.Point(127, 35);
-            this.drop_updateCheckDays.Name = "drop_updateCheckDays";
-            this.drop_updateCheckDays.Size = new System.Drawing.Size(97, 21);
-            this.drop_updateCheckDays.TabIndex = 97;
-            this.ToolTip.SetToolTip(this.drop_updateCheckDays, "Check for updates: Daily, Weekly or Monthly\r\nDefault: Weekly");
-            this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged);
-            // 
-            // check_tooltip
-            // 
-            this.check_tooltip.AutoSize = true;
-            this.check_tooltip.BackColor = System.Drawing.Color.Transparent;
-            this.check_tooltip.Location = new System.Drawing.Point(108, 62);
-            this.check_tooltip.Name = "check_tooltip";
-            this.check_tooltip.Size = new System.Drawing.Size(117, 17);
-            this.check_tooltip.TabIndex = 70;
-            this.check_tooltip.Text = "Enable GUI tooltips";
-            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls. (Requires Restart)");
-            this.check_tooltip.UseVisualStyleBackColor = false;
-            this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);
-            // 
-            // check_updateCheck
-            // 
-            this.check_updateCheck.AutoSize = true;
-            this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;
-            this.check_updateCheck.Location = new System.Drawing.Point(108, 14);
-            this.check_updateCheck.Name = "check_updateCheck";
-            this.check_updateCheck.Size = new System.Drawing.Size(114, 17);
-            this.check_updateCheck.TabIndex = 68;
-            this.check_updateCheck.Text = "Check for updates";
-            this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +
-        " starts.");
-            this.check_updateCheck.UseVisualStyleBackColor = false;
-            this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(7, 102);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 13);
-            this.label2.TabIndex = 54;
-            this.label2.Text = "When Done:";
-            // 
-            // tab_outputFiles
-            // 
-            this.tab_outputFiles.Controls.Add(this.txt_autoNameFormat);
-            this.tab_outputFiles.Controls.Add(this.label7);
-            this.tab_outputFiles.Controls.Add(this.check_autoNaming);
-            this.tab_outputFiles.Controls.Add(this.label35);
-            this.tab_outputFiles.Controls.Add(this.label5);
-            this.tab_outputFiles.Controls.Add(this.label10);
-            this.tab_outputFiles.Controls.Add(this.cb_mp4FileMode);
-            this.tab_outputFiles.Controls.Add(this.check_removeUnderscores);
-            this.tab_outputFiles.Controls.Add(this.text_an_path);
-            this.tab_outputFiles.Controls.Add(this.btn_browse);
-            this.tab_outputFiles.Controls.Add(this.label34);
-            this.tab_outputFiles.Controls.Add(this.check_TitleCase);
-            this.tab_outputFiles.Controls.Add(this.label13);
-            this.tab_outputFiles.Location = new System.Drawing.Point(4, 22);
-            this.tab_outputFiles.Name = "tab_outputFiles";
-            this.tab_outputFiles.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_outputFiles.Size = new System.Drawing.Size(580, 397);
-            this.tab_outputFiles.TabIndex = 7;
-            this.tab_outputFiles.Text = "Output Files";
-            this.tab_outputFiles.UseVisualStyleBackColor = true;
-            // 
-            // txt_autoNameFormat
-            // 
-            this.txt_autoNameFormat.Location = new System.Drawing.Point(185, 99);
-            this.txt_autoNameFormat.Name = "txt_autoNameFormat";
-            this.txt_autoNameFormat.Size = new System.Drawing.Size(349, 21);
-            this.txt_autoNameFormat.TabIndex = 79;
-            this.ToolTip.SetToolTip(this.txt_autoNameFormat, "Define the format of the automatically named file.\r\ne.g  {source}_{title}_some-te" +
-        "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
-        "sources values.");
-            this.txt_autoNameFormat.TextChanged += new System.EventHandler(this.txt_autoNameFormat_TextChanged);
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(182, 126);
-            this.label7.Margin = new System.Windows.Forms.Padding(3);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(260, 13);
-            this.label7.TabIndex = 81;
-            this.label7.Text = "Available Options: {source} {title} {chapters} {date}";
-            // 
-            // check_autoNaming
-            // 
-            this.check_autoNaming.AutoSize = true;
-            this.check_autoNaming.Location = new System.Drawing.Point(111, 13);
-            this.check_autoNaming.Name = "check_autoNaming";
-            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);
-            this.check_autoNaming.TabIndex = 72;
-            this.check_autoNaming.Text = "Automatically name output files";
-            this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");
-            this.check_autoNaming.UseVisualStyleBackColor = true;
-            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);
-            // 
-            // label35
-            // 
-            this.label35.AutoSize = true;
-            this.label35.Location = new System.Drawing.Point(108, 182);
-            this.label35.Name = "label35";
-            this.label35.Size = new System.Drawing.Size(100, 13);
-            this.label35.TabIndex = 104;
-            this.label35.Text = "MP4 File Extension:";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(108, 102);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(45, 13);
-            this.label5.TabIndex = 80;
-            this.label5.Text = "Format:";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(108, 48);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(71, 13);
-            this.label10.TabIndex = 77;
-            this.label10.Text = "Default Path:";
-            // 
-            // cb_mp4FileMode
-            // 
-            this.cb_mp4FileMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_mp4FileMode.FormattingEnabled = true;
-            this.cb_mp4FileMode.Items.AddRange(new object[] {
-            "Automatic",
-            "Always use MP4",
-            "Always use M4V"});
-            this.cb_mp4FileMode.Location = new System.Drawing.Point(214, 179);
-            this.cb_mp4FileMode.Name = "cb_mp4FileMode";
-            this.cb_mp4FileMode.Size = new System.Drawing.Size(150, 21);
-            this.cb_mp4FileMode.TabIndex = 103;
-            this.ToolTip.SetToolTip(this.cb_mp4FileMode, resources.GetString("cb_mp4FileMode.ToolTip"));
-            this.cb_mp4FileMode.SelectedIndexChanged += new System.EventHandler(this.cb_mp4FileMode_SelectedIndexChanged);
-            // 
-            // check_removeUnderscores
-            // 
-            this.check_removeUnderscores.AutoSize = true;
-            this.check_removeUnderscores.Location = new System.Drawing.Point(111, 154);
-            this.check_removeUnderscores.Name = "check_removeUnderscores";
-            this.check_removeUnderscores.Size = new System.Drawing.Size(183, 17);
-            this.check_removeUnderscores.TabIndex = 100;
-            this.check_removeUnderscores.Text = "Remove Underscores from Name";
-            this.ToolTip.SetToolTip(this.check_removeUnderscores, "For the {source} option:\r\nRemove any underscores from the source name.\r\n\r\n");
-            this.check_removeUnderscores.UseVisualStyleBackColor = true;
-            this.check_removeUnderscores.CheckedChanged += new System.EventHandler(this.check_removeUnderscores_CheckedChanged);
-            // 
-            // text_an_path
-            // 
-            this.text_an_path.Location = new System.Drawing.Point(185, 45);
-            this.text_an_path.Name = "text_an_path";
-            this.text_an_path.Size = new System.Drawing.Size(253, 21);
-            this.text_an_path.TabIndex = 76;
-            this.ToolTip.SetToolTip(this.text_an_path, resources.GetString("text_an_path.ToolTip"));
-            this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);
-            // 
-            // btn_browse
-            // 
-            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_browse.Location = new System.Drawing.Point(459, 43);
-            this.btn_browse.Name = "btn_browse";
-            this.btn_browse.Size = new System.Drawing.Size(75, 23);
-            this.btn_browse.TabIndex = 78;
-            this.btn_browse.Text = "Browse";
-            this.btn_browse.UseVisualStyleBackColor = true;
-            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);
-            // 
-            // label34
-            // 
-            this.label34.AutoSize = true;
-            this.label34.Location = new System.Drawing.Point(182, 72);
-            this.label34.Margin = new System.Windows.Forms.Padding(3);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(344, 13);
-            this.label34.TabIndex = 102;
-            this.label34.Text = "Available Options: {source_path} or {source_folder_name} (Not Both)";
-            this.ToolTip.SetToolTip(this.label34, resources.GetString("label34.ToolTip"));
-            // 
-            // check_TitleCase
-            // 
-            this.check_TitleCase.AutoSize = true;
-            this.check_TitleCase.Location = new System.Drawing.Point(300, 154);
-            this.check_TitleCase.Name = "check_TitleCase";
-            this.check_TitleCase.Size = new System.Drawing.Size(151, 17);
-            this.check_TitleCase.TabIndex = 101;
-            this.check_TitleCase.Text = "Change case to Title Case";
-            this.ToolTip.SetToolTip(this.check_TitleCase, "For the {source} option:.\r\nChange the source name to Title Case\r\ne.g \"MOVIE NAME\"" +
-        " to \"Movie Name\"\r\n");
-            this.check_TitleCase.UseVisualStyleBackColor = true;
-            this.check_TitleCase.CheckedChanged += new System.EventHandler(this.check_TitleCase_CheckedChanged);
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label13.Location = new System.Drawing.Point(7, 13);
-            this.label13.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(77, 13);
-            this.label13.TabIndex = 71;
-            this.label13.Text = "Output Files:";
-            // 
-            // tab_picture
-            // 
-            this.tab_picture.Controls.Add(this.btn_vlcPath);
-            this.tab_picture.Controls.Add(this.label29);
-            this.tab_picture.Controls.Add(this.txt_vlcPath);
-            this.tab_picture.Controls.Add(this.label36);
-            this.tab_picture.Location = new System.Drawing.Point(4, 22);
-            this.tab_picture.Name = "tab_picture";
-            this.tab_picture.Padding = new System.Windows.Forms.Padding(10);
-            this.tab_picture.Size = new System.Drawing.Size(580, 397);
-            this.tab_picture.TabIndex = 5;
-            this.tab_picture.Text = "Preview";
-            this.tab_picture.UseVisualStyleBackColor = true;
-            // 
-            // btn_vlcPath
-            // 
-            this.btn_vlcPath.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btn_vlcPath.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_vlcPath.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_vlcPath.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_vlcPath.Location = new System.Drawing.Point(479, 11);
-            this.btn_vlcPath.Name = "btn_vlcPath";
-            this.btn_vlcPath.Size = new System.Drawing.Size(68, 22);
-            this.btn_vlcPath.TabIndex = 83;
-            this.btn_vlcPath.Text = "Browse";
-            this.btn_vlcPath.UseVisualStyleBackColor = true;
-            this.btn_vlcPath.Click += new System.EventHandler(this.btn_vlcPath_Click);
-            // 
-            // label29
-            // 
-            this.label29.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label29.AutoSize = true;
-            this.label29.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label29.Location = new System.Drawing.Point(13, 15);
-            this.label29.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(59, 13);
-            this.label29.TabIndex = 79;
-            this.label29.Text = "VLC Path:";
-            // 
-            // txt_vlcPath
-            // 
-            this.txt_vlcPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txt_vlcPath.Location = new System.Drawing.Point(78, 12);
-            this.txt_vlcPath.Name = "txt_vlcPath";
-            this.txt_vlcPath.Size = new System.Drawing.Size(395, 21);
-            this.txt_vlcPath.TabIndex = 81;
-            this.ToolTip.SetToolTip(this.txt_vlcPath, "The path where VLC is installed on this system.\r\nThis is used for the video previ" +
-        "ew feature.");
-            this.txt_vlcPath.TextChanged += new System.EventHandler(this.txt_vlcPath_TextChanged);
-            // 
-            // label36
-            // 
-            this.label36.AutoSize = true;
-            this.label36.Location = new System.Drawing.Point(75, 36);
-            this.label36.Name = "label36";
-            this.label36.Size = new System.Drawing.Size(255, 13);
-            this.label36.TabIndex = 85;
-            this.label36.Text = "This path is used for the view preview feature only.";
-            // 
-            // tab_audio_sub
-            // 
-            this.tab_audio_sub.Controls.Add(this.check_advPassthruOpts);
-            this.tab_audio_sub.Controls.Add(this.label49);
-            this.tab_audio_sub.Controls.Add(this.label48);
-            this.tab_audio_sub.Controls.Add(this.drop_preferredLangSubtitles);
-            this.tab_audio_sub.Controls.Add(this.label39);
-            this.tab_audio_sub.Controls.Add(this.audioSelectionPanel);
-            this.tab_audio_sub.Controls.Add(this.label45);
-            this.tab_audio_sub.Controls.Add(this.groupBox2);
-            this.tab_audio_sub.Controls.Add(this.label31);
-            this.tab_audio_sub.Controls.Add(this.label15);
-            this.tab_audio_sub.Controls.Add(this.drop_preferredLangAudio);
-            this.tab_audio_sub.Location = new System.Drawing.Point(4, 22);
-            this.tab_audio_sub.Name = "tab_audio_sub";
-            this.tab_audio_sub.Padding = new System.Windows.Forms.Padding(3);
-            this.tab_audio_sub.Size = new System.Drawing.Size(580, 397);
-            this.tab_audio_sub.TabIndex = 6;
-            this.tab_audio_sub.Text = "Audio and Subtitles";
-            this.tab_audio_sub.UseVisualStyleBackColor = true;
-            // 
-            // check_advPassthruOpts
-            // 
-            this.check_advPassthruOpts.AutoSize = true;
-            this.check_advPassthruOpts.Location = new System.Drawing.Point(9, 365);
-            this.check_advPassthruOpts.Name = "check_advPassthruOpts";
-            this.check_advPassthruOpts.Size = new System.Drawing.Size(310, 17);
-            this.check_advPassthruOpts.TabIndex = 110;
-            this.check_advPassthruOpts.Text = "Show advanced audio passthru options. (Requires Restart)\r\n";
-            this.ToolTip.SetToolTip(this.check_advPassthruOpts, "Show advanced audio passthru options");
-            this.check_advPassthruOpts.UseVisualStyleBackColor = true;
-            this.check_advPassthruOpts.CheckedChanged += new System.EventHandler(this.check_advPassthruOpts_CheckedChanged);
-            // 
-            // label49
-            // 
-            this.label49.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label49.AutoSize = true;
-            this.label49.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label49.Location = new System.Drawing.Point(6, 346);
-            this.label49.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label49.Name = "label49";
-            this.label49.Size = new System.Drawing.Size(109, 13);
-            this.label49.TabIndex = 112;
-            this.label49.Text = "Audio Tab Options";
-            // 
-            // label48
-            // 
-            this.label48.AutoSize = true;
-            this.label48.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label48.Location = new System.Drawing.Point(127, 37);
-            this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(32, 11);
-            this.label48.TabIndex = 111;
-            this.label48.Text = "Audio:";
-            // 
-            // drop_preferredLangSubtitles
-            // 
-            this.drop_preferredLangSubtitles.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_preferredLangSubtitles.FormattingEnabled = true;
-            this.drop_preferredLangSubtitles.Location = new System.Drawing.Point(349, 32);
-            this.drop_preferredLangSubtitles.Name = "drop_preferredLangSubtitles";
-            this.drop_preferredLangSubtitles.Size = new System.Drawing.Size(118, 21);
-            this.drop_preferredLangSubtitles.TabIndex = 110;
-            this.ToolTip.SetToolTip(this.drop_preferredLangSubtitles, "The primary selected language. If set to \"Any\" no advance options are available.");
-            this.drop_preferredLangSubtitles.SelectedIndexChanged += new System.EventHandler(this.drop_preferredLangSubtitles_SelectedIndexChanged);
-            // 
-            // label39
-            // 
-            this.label39.AutoSize = true;
-            this.label39.Location = new System.Drawing.Point(6, 63);
-            this.label39.Name = "label39";
-            this.label39.Size = new System.Drawing.Size(92, 13);
-            this.label39.TabIndex = 109;
-            this.label39.Text = "Additional Tracks:";
-            // 
-            // audioSelectionPanel
-            // 
-            this.audioSelectionPanel.Controls.Add(this.label46);
-            this.audioSelectionPanel.Controls.Add(this.listBox_selectedLanguages);
-            this.audioSelectionPanel.Controls.Add(this.button_moveLanguageDown);
-            this.audioSelectionPanel.Controls.Add(this.listBox_availableLanguages);
-            this.audioSelectionPanel.Controls.Add(this.button_addLanguage);
-            this.audioSelectionPanel.Controls.Add(this.button_moveLanguageUp);
-            this.audioSelectionPanel.Controls.Add(this.label47);
-            this.audioSelectionPanel.Controls.Add(this.button_removeLanguage);
-            this.audioSelectionPanel.Controls.Add(this.button_clearLanguage);
-            this.audioSelectionPanel.Location = new System.Drawing.Point(125, 63);
-            this.audioSelectionPanel.Name = "audioSelectionPanel";
-            this.audioSelectionPanel.Size = new System.Drawing.Size(381, 166);
-            this.audioSelectionPanel.TabIndex = 108;
-            // 
-            // label46
-            // 
-            this.label46.AutoSize = true;
-            this.label46.Location = new System.Drawing.Point(1, 3);
-            this.label46.Name = "label46";
-            this.label46.Size = new System.Drawing.Size(105, 13);
-            this.label46.TabIndex = 99;
-            this.label46.Text = "Available Languages";
-            // 
-            // listBox_selectedLanguages
-            // 
-            this.listBox_selectedLanguages.Location = new System.Drawing.Point(202, 19);
-            this.listBox_selectedLanguages.Name = "listBox_selectedLanguages";
-            this.listBox_selectedLanguages.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-            this.listBox_selectedLanguages.Size = new System.Drawing.Size(137, 134);
-            this.listBox_selectedLanguages.TabIndex = 95;
-            this.listBox_selectedLanguages.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox_selectedLanguages_MouseDoubleClick);
-            // 
-            // button_moveLanguageDown
-            // 
-            this.button_moveLanguageDown.Image = global::Handbrake.Properties.Resources.arrow_down;
-            this.button_moveLanguageDown.Location = new System.Drawing.Point(345, 90);
-            this.button_moveLanguageDown.Name = "button_moveLanguageDown";
-            this.button_moveLanguageDown.Size = new System.Drawing.Size(25, 27);
-            this.button_moveLanguageDown.TabIndex = 102;
-            this.ToolTip.SetToolTip(this.button_moveLanguageDown, "Move selected languages down in the order.");
-            this.button_moveLanguageDown.UseVisualStyleBackColor = true;
-            this.button_moveLanguageDown.Click += new System.EventHandler(this.button_moveLanguageDown_Click);
-            // 
-            // listBox_availableLanguages
-            // 
-            this.listBox_availableLanguages.Location = new System.Drawing.Point(4, 19);
-            this.listBox_availableLanguages.Name = "listBox_availableLanguages";
-            this.listBox_availableLanguages.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-            this.listBox_availableLanguages.Size = new System.Drawing.Size(137, 134);
-            this.listBox_availableLanguages.Sorted = true;
-            this.listBox_availableLanguages.TabIndex = 94;
-            this.listBox_availableLanguages.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox_availableLanguages_MouseDoubleClick);
-            // 
-            // button_addLanguage
-            // 
-            this.button_addLanguage.Image = global::Handbrake.Properties.Resources.arrow_right;
-            this.button_addLanguage.Location = new System.Drawing.Point(147, 34);
-            this.button_addLanguage.Name = "button_addLanguage";
-            this.button_addLanguage.Size = new System.Drawing.Size(49, 28);
-            this.button_addLanguage.TabIndex = 96;
-            this.ToolTip.SetToolTip(this.button_addLanguage, "Add Language to selected languages.");
-            this.button_addLanguage.UseVisualStyleBackColor = true;
-            this.button_addLanguage.Click += new System.EventHandler(this.button_addLanguage_Click);
-            // 
-            // button_moveLanguageUp
-            // 
-            this.button_moveLanguageUp.Image = global::Handbrake.Properties.Resources.arrow_up;
-            this.button_moveLanguageUp.Location = new System.Drawing.Point(345, 57);
-            this.button_moveLanguageUp.Name = "button_moveLanguageUp";
-            this.button_moveLanguageUp.Size = new System.Drawing.Size(25, 27);
-            this.button_moveLanguageUp.TabIndex = 101;
-            this.ToolTip.SetToolTip(this.button_moveLanguageUp, "Move selected languages up in the order.");
-            this.button_moveLanguageUp.UseVisualStyleBackColor = true;
-            this.button_moveLanguageUp.Click += new System.EventHandler(this.button_moveLanguageUp_Click);
-            // 
-            // label47
-            // 
-            this.label47.AutoSize = true;
-            this.label47.Location = new System.Drawing.Point(199, 3);
-            this.label47.Name = "label47";
-            this.label47.Size = new System.Drawing.Size(103, 13);
-            this.label47.TabIndex = 100;
-            this.label47.Text = "Selected Languages";
-            // 
-            // button_removeLanguage
-            // 
-            this.button_removeLanguage.Image = global::Handbrake.Properties.Resources.arrow_left;
-            this.button_removeLanguage.Location = new System.Drawing.Point(147, 68);
-            this.button_removeLanguage.Name = "button_removeLanguage";
-            this.button_removeLanguage.Size = new System.Drawing.Size(49, 28);
-            this.button_removeLanguage.TabIndex = 97;
-            this.ToolTip.SetToolTip(this.button_removeLanguage, "Remove language from selected languages.");
-            this.button_removeLanguage.UseVisualStyleBackColor = true;
-            this.button_removeLanguage.Click += new System.EventHandler(this.button_removeLanguage_Click);
-            // 
-            // button_clearLanguage
-            // 
-            this.button_clearLanguage.Location = new System.Drawing.Point(147, 102);
-            this.button_clearLanguage.Name = "button_clearLanguage";
-            this.button_clearLanguage.Size = new System.Drawing.Size(49, 28);
-            this.button_clearLanguage.TabIndex = 98;
-            this.button_clearLanguage.Text = "Clear";
-            this.ToolTip.SetToolTip(this.button_clearLanguage, "Clear the list of selected languages.");
-            this.button_clearLanguage.UseVisualStyleBackColor = true;
-            this.button_clearLanguage.Click += new System.EventHandler(this.button_clearLanguage_Click);
-            // 
-            // label45
-            // 
-            this.label45.AutoSize = true;
-            this.label45.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label45.Location = new System.Drawing.Point(300, 37);
-            this.label45.Name = "label45";
-            this.label45.Size = new System.Drawing.Size(43, 11);
-            this.label45.TabIndex = 107;
-            this.label45.Text = "Subtitles:";
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.label44);
-            this.groupBox2.Controls.Add(this.label41);
-            this.groupBox2.Controls.Add(this.cb_subtitleMode);
-            this.groupBox2.Controls.Add(this.cb_audioMode);
-            this.groupBox2.Controls.Add(this.label42);
-            this.groupBox2.Controls.Add(this.check_AddOnlyOneAudioPerLanguage);
-            this.groupBox2.Controls.Add(this.check_AddCCTracks);
-            this.groupBox2.Controls.Add(this.label43);
-            this.groupBox2.Location = new System.Drawing.Point(19, 232);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(537, 106);
-            this.groupBox2.TabIndex = 106;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "Add Additional Tracks";
-            // 
-            // label44
-            // 
-            this.label44.AutoSize = true;
-            this.label44.Location = new System.Drawing.Point(10, 28);
-            this.label44.Name = "label44";
-            this.label44.Size = new System.Drawing.Size(38, 13);
-            this.label44.TabIndex = 109;
-            this.label44.Text = "Audio:";
-            // 
-            // label41
-            // 
-            this.label41.AutoSize = true;
-            this.label41.Location = new System.Drawing.Point(10, 55);
-            this.label41.Name = "label41";
-            this.label41.Size = new System.Drawing.Size(47, 13);
-            this.label41.TabIndex = 108;
-            this.label41.Text = "Subtitle:";
-            // 
-            // cb_subtitleMode
-            // 
-            this.cb_subtitleMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_subtitleMode.FormattingEnabled = true;
-            this.cb_subtitleMode.Items.AddRange(new object[] {
-            "None",
-            "All",
-            "First",
-            "Selected Languages Only",
-            "Prefered Only (First)",
-            "Prefered Only (All)"});
-            this.cb_subtitleMode.Location = new System.Drawing.Point(79, 52);
-            this.cb_subtitleMode.Name = "cb_subtitleMode";
-            this.cb_subtitleMode.Size = new System.Drawing.Size(147, 21);
-            this.cb_subtitleMode.TabIndex = 107;
-            this.ToolTip.SetToolTip(this.cb_subtitleMode, resources.GetString("cb_subtitleMode.ToolTip"));
-            this.cb_subtitleMode.SelectedIndexChanged += new System.EventHandler(this.cb_subtitleMode_SelectedIndexChanged);
-            // 
-            // cb_audioMode
-            // 
-            this.cb_audioMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_audioMode.FormattingEnabled = true;
-            this.cb_audioMode.Items.AddRange(new object[] {
-            "None",
-            "All Remaining Tracks",
-            "All for Selected Languages"});
-            this.cb_audioMode.Location = new System.Drawing.Point(79, 25);
-            this.cb_audioMode.Name = "cb_audioMode";
-            this.cb_audioMode.Size = new System.Drawing.Size(147, 21);
-            this.cb_audioMode.TabIndex = 106;
-            this.ToolTip.SetToolTip(this.cb_audioMode, resources.GetString("cb_audioMode.ToolTip"));
-            this.cb_audioMode.SelectedIndexChanged += new System.EventHandler(this.cb_audioMode_SelectedIndexChanged);
-            // 
-            // label42
-            // 
-            this.label42.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label42.AutoSize = true;
-            this.label42.Location = new System.Drawing.Point(142, 28);
-            this.label42.Name = "label42";
-            this.label42.Size = new System.Drawing.Size(34, 13);
-            this.label42.TabIndex = 0;
-            this.label42.Text = "Audio";
-            this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // check_AddOnlyOneAudioPerLanguage
-            // 
-            this.check_AddOnlyOneAudioPerLanguage.AutoSize = true;
-            this.check_AddOnlyOneAudioPerLanguage.Location = new System.Drawing.Point(232, 27);
-            this.check_AddOnlyOneAudioPerLanguage.Name = "check_AddOnlyOneAudioPerLanguage";
-            this.check_AddOnlyOneAudioPerLanguage.Size = new System.Drawing.Size(192, 17);
-            this.check_AddOnlyOneAudioPerLanguage.TabIndex = 93;
-            this.check_AddOnlyOneAudioPerLanguage.Text = "Add Only One Audio Per Language";
-            this.ToolTip.SetToolTip(this.check_AddOnlyOneAudioPerLanguage, "Only add one audiotrack for each selected language.");
-            this.check_AddOnlyOneAudioPerLanguage.UseVisualStyleBackColor = true;
-            this.check_AddOnlyOneAudioPerLanguage.CheckedChanged += new System.EventHandler(this.check_AddOnlyOneAudioPerLanguage_CheckedChanged);
-            // 
-            // check_AddCCTracks
-            // 
-            this.check_AddCCTracks.AutoSize = true;
-            this.check_AddCCTracks.Location = new System.Drawing.Point(79, 79);
-            this.check_AddCCTracks.Name = "check_AddCCTracks";
-            this.check_AddCCTracks.Size = new System.Drawing.Size(199, 17);
-            this.check_AddCCTracks.TabIndex = 92;
-            this.check_AddCCTracks.Text = "Add Closed Captions when available";
-            this.ToolTip.SetToolTip(this.check_AddCCTracks, "Add any CC tracks if they exist regardless of language settings");
-            this.check_AddCCTracks.UseVisualStyleBackColor = true;
-            this.check_AddCCTracks.CheckedChanged += new System.EventHandler(this.check_AddCCTracks_CheckedChanged);
-            // 
-            // label43
-            // 
-            this.label43.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.label43.AutoSize = true;
-            this.label43.Location = new System.Drawing.Point(133, 55);
-            this.label43.Name = "label43";
-            this.label43.Size = new System.Drawing.Size(43, 13);
-            this.label43.TabIndex = 1;
-            this.label43.Text = "Subtitle";
-            this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label31
-            // 
-            this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label31.AutoSize = true;
-            this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label31.Location = new System.Drawing.Point(6, 8);
-            this.label31.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(230, 13);
-            this.label31.TabIndex = 91;
-            this.label31.Text = "Automatic Audio and Subtitle Selection:";
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(6, 35);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(107, 13);
-            this.label15.TabIndex = 88;
-            this.label15.Text = "Preferred Language:";
-            // 
-            // drop_preferredLangAudio
-            // 
-            this.drop_preferredLangAudio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_preferredLangAudio.FormattingEnabled = true;
-            this.drop_preferredLangAudio.Location = new System.Drawing.Point(165, 32);
-            this.drop_preferredLangAudio.Name = "drop_preferredLangAudio";
-            this.drop_preferredLangAudio.Size = new System.Drawing.Size(118, 21);
-            this.drop_preferredLangAudio.TabIndex = 87;
-            this.ToolTip.SetToolTip(this.drop_preferredLangAudio, "The primary selected language. If set to \"Any\" no advance options are available.");
-            this.drop_preferredLangAudio.SelectedIndexChanged += new System.EventHandler(this.drop_preferredLang_SelectedIndexChanged);
-            // 
-            // tab_cli
-            // 
-            this.tab_cli.Controls.Add(this.label11);
-            this.tab_cli.Controls.Add(this.check_preventSleep);
-            this.tab_cli.Controls.Add(this.check_clearOldLogs);
-            this.tab_cli.Controls.Add(this.label12);
-            this.tab_cli.Controls.Add(this.btn_viewLogs);
-            this.tab_cli.Controls.Add(this.label9);
-            this.tab_cli.Controls.Add(this.Label4);
-            this.tab_cli.Controls.Add(this.btn_clearLogs);
-            this.tab_cli.Controls.Add(this.drp_Priority);
-            this.tab_cli.Controls.Add(this.check_logsInSpecifiedLocation);
-            this.tab_cli.Controls.Add(this.check_saveLogWithVideo);
-            this.tab_cli.Controls.Add(this.label3);
-            this.tab_cli.Controls.Add(this.btn_saveLog);
-            this.tab_cli.Controls.Add(this.cb_logVerboseLvl);
-            this.tab_cli.Controls.Add(this.text_logPath);
-            this.tab_cli.Controls.Add(this.label14);
-            this.tab_cli.Location = new System.Drawing.Point(4, 22);
-            this.tab_cli.Name = "tab_cli";
-            this.tab_cli.Padding = new System.Windows.Forms.Padding(10);
-            this.tab_cli.Size = new System.Drawing.Size(580, 397);
-            this.tab_cli.TabIndex = 2;
-            this.tab_cli.Text = "System and Logging";
-            this.tab_cli.UseVisualStyleBackColor = true;
-            // 
-            // label11
-            // 
-            this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label11.AutoSize = true;
-            this.label11.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label11.Location = new System.Drawing.Point(7, 46);
-            this.label11.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(53, 13);
-            this.label11.TabIndex = 92;
-            this.label11.Text = "System:";
-            // 
-            // check_preventSleep
-            // 
-            this.check_preventSleep.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_preventSleep.AutoSize = true;
-            this.check_preventSleep.Location = new System.Drawing.Point(73, 45);
-            this.check_preventSleep.Name = "check_preventSleep";
-            this.check_preventSleep.Size = new System.Drawing.Size(266, 17);
-            this.check_preventSleep.TabIndex = 91;
-            this.check_preventSleep.Text = "Prevent the system from sleeping when encoding.";
-            this.ToolTip.SetToolTip(this.check_preventSleep, "Prevent system from sleeping during encoding.");
-            this.check_preventSleep.UseVisualStyleBackColor = true;
-            this.check_preventSleep.CheckedChanged += new System.EventHandler(this.check_preventSleep_CheckedChanged);
-            // 
-            // check_clearOldLogs
-            // 
-            this.check_clearOldLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_clearOldLogs.AutoSize = true;
-            this.check_clearOldLogs.Location = new System.Drawing.Point(73, 234);
-            this.check_clearOldLogs.Name = "check_clearOldLogs";
-            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);
-            this.check_clearOldLogs.TabIndex = 90;
-            this.check_clearOldLogs.Text = "Clear logs older than 30 days";
-            this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +
-        "tion Data Log folder.");
-            this.check_clearOldLogs.UseVisualStyleBackColor = true;
-            this.check_clearOldLogs.CheckedChanged += new System.EventHandler(this.check_clearOldLogs_CheckedChanged);
-            // 
-            // label12
-            // 
-            this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label12.AutoSize = true;
-            this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label12.Location = new System.Drawing.Point(7, 15);
-            this.label12.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(28, 13);
-            this.label12.TabIndex = 75;
-            this.label12.Text = "CLI:";
-            // 
-            // btn_viewLogs
-            // 
-            this.btn_viewLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btn_viewLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_viewLogs.Location = new System.Drawing.Point(129, 196);
-            this.btn_viewLogs.Name = "btn_viewLogs";
-            this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);
-            this.btn_viewLogs.TabIndex = 89;
-            this.btn_viewLogs.Text = "View Log Directory";
-            this.btn_viewLogs.UseVisualStyleBackColor = true;
-            this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);
-            // 
-            // label9
-            // 
-            this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label9.Location = new System.Drawing.Point(7, 92);
-            this.label9.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(36, 13);
-            this.label9.TabIndex = 77;
-            this.label9.Text = "Logs:";
-            // 
-            // Label4
-            // 
-            this.Label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.Label4.AutoSize = true;
-            this.Label4.BackColor = System.Drawing.Color.Transparent;
-            this.Label4.Location = new System.Drawing.Point(70, 15);
-            this.Label4.Name = "Label4";
-            this.Label4.Size = new System.Drawing.Size(70, 13);
-            this.Label4.TabIndex = 42;
-            this.Label4.Text = "Priority level:";
-            // 
-            // btn_clearLogs
-            // 
-            this.btn_clearLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btn_clearLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_clearLogs.Location = new System.Drawing.Point(274, 196);
-            this.btn_clearLogs.Name = "btn_clearLogs";
-            this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);
-            this.btn_clearLogs.TabIndex = 88;
-            this.btn_clearLogs.Text = "Clear Log History";
-            this.btn_clearLogs.UseVisualStyleBackColor = true;
-            this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);
-            // 
-            // drp_Priority
-            // 
-            this.drp_Priority.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.drp_Priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_Priority.FormattingEnabled = true;
-            this.drp_Priority.Items.AddRange(new object[] {
-            "Realtime",
-            "High",
-            "Above Normal",
-            "Normal",
-            "Below Normal",
-            "Low"});
-            this.drp_Priority.Location = new System.Drawing.Point(177, 12);
-            this.drp_Priority.Name = "drp_Priority";
-            this.drp_Priority.Size = new System.Drawing.Size(111, 21);
-            this.drp_Priority.TabIndex = 43;
-            this.ToolTip.SetToolTip(this.drp_Priority, "Set the application priority level for the CLI. \r\nIt\'s best to leave this on Belo" +
-        "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n");
-            this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);
-            // 
-            // check_logsInSpecifiedLocation
-            // 
-            this.check_logsInSpecifiedLocation.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_logsInSpecifiedLocation.AutoSize = true;
-            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 139);
-            this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";
-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);
-            this.check_logsInSpecifiedLocation.TabIndex = 87;
-            this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";
-            this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");
-            this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;
-            this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);
-            // 
-            // check_saveLogWithVideo
-            // 
-            this.check_saveLogWithVideo.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_saveLogWithVideo.AutoSize = true;
-            this.check_saveLogWithVideo.Location = new System.Drawing.Point(73, 116);
-            this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";
-            this.check_saveLogWithVideo.Size = new System.Drawing.Size(382, 17);
-            this.check_saveLogWithVideo.TabIndex = 83;
-            this.check_saveLogWithVideo.Text = "Put a copy of individual encode logs in the same location as encoded video";
-            this.ToolTip.SetToolTip(this.check_saveLogWithVideo, "Place a copy of the encode log in the same folder as the encoded movie.");
-            this.check_saveLogWithVideo.UseVisualStyleBackColor = true;
-            this.check_saveLogWithVideo.CheckedChanged += new System.EventHandler(this.check_saveLogWithVideo_CheckedChanged);
-            // 
-            // label3
-            // 
-            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label3.AutoSize = true;
-            this.label3.BackColor = System.Drawing.Color.Transparent;
-            this.label3.Location = new System.Drawing.Point(70, 92);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(101, 13);
-            this.label3.TabIndex = 85;
-            this.label3.Text = "Log verbosity level:";
-            // 
-            // btn_saveLog
-            // 
-            this.btn_saveLog.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.btn_saveLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.btn_saveLog.Location = new System.Drawing.Point(437, 169);
-            this.btn_saveLog.Name = "btn_saveLog";
-            this.btn_saveLog.Size = new System.Drawing.Size(77, 22);
-            this.btn_saveLog.TabIndex = 82;
-            this.btn_saveLog.Text = "Browse";
-            this.btn_saveLog.UseVisualStyleBackColor = true;
-            this.btn_saveLog.Click += new System.EventHandler(this.btn_saveLog_Click);
-            // 
-            // cb_logVerboseLvl
-            // 
-            this.cb_logVerboseLvl.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.cb_logVerboseLvl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_logVerboseLvl.FormattingEnabled = true;
-            this.cb_logVerboseLvl.Items.AddRange(new object[] {
-            "0",
-            "1",
-            "2"});
-            this.cb_logVerboseLvl.Location = new System.Drawing.Point(177, 89);
-            this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";
-            this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);
-            this.cb_logVerboseLvl.TabIndex = 86;
-            this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level");
-            this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged);
-            // 
-            // text_logPath
-            // 
-            this.text_logPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.text_logPath.Location = new System.Drawing.Point(129, 169);
-            this.text_logPath.Name = "text_logPath";
-            this.text_logPath.Size = new System.Drawing.Size(302, 21);
-            this.text_logPath.TabIndex = 80;
-            this.ToolTip.SetToolTip(this.text_logPath, "The default location where auto named files are stored.");
-            this.text_logPath.TextChanged += new System.EventHandler(this.text_logPath_TextChanged);
-            // 
-            // label14
-            // 
-            this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(70, 172);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(53, 13);
-            this.label14.TabIndex = 81;
-            this.label14.Text = "Log Path:";
-            // 
-            // tab_advanced
-            // 
-            this.tab_advanced.Controls.Add(this.ud_minTitleLength);
-            this.tab_advanced.Controls.Add(this.label40);
-            this.tab_advanced.Controls.Add(this.check_showCliForInGUIEncode);
-            this.tab_advanced.Controls.Add(this.drop_previewScanCount);
-            this.tab_advanced.Controls.Add(this.label33);
-            this.tab_advanced.Controls.Add(this.label6);
-            this.tab_advanced.Controls.Add(this.check_trayStatusAlerts);
-            this.tab_advanced.Controls.Add(this.check_mainMinimize);
-            this.tab_advanced.Controls.Add(this.check_promptOnUnmatchingQueries);
-            this.tab_advanced.Controls.Add(this.check_dvdnav);
-            this.tab_advanced.Controls.Add(this.check_queryEditorTab);
-            this.tab_advanced.Controls.Add(this.label32);
-            this.tab_advanced.Controls.Add(this.drop_x264step);
-            this.tab_advanced.Controls.Add(this.label30);
-            this.tab_advanced.Controls.Add(this.check_disablePresetNotification);
-            this.tab_advanced.Controls.Add(this.label28);
-            this.tab_advanced.Location = new System.Drawing.Point(4, 22);
-            this.tab_advanced.Name = "tab_advanced";
-            this.tab_advanced.Padding = new System.Windows.Forms.Padding(10);
-            this.tab_advanced.Size = new System.Drawing.Size(580, 397);
-            this.tab_advanced.TabIndex = 4;
-            this.tab_advanced.Text = "Advanced";
-            this.tab_advanced.UseVisualStyleBackColor = true;
-            // 
-            // ud_minTitleLength
-            // 
-            this.ud_minTitleLength.Location = new System.Drawing.Point(292, 204);
-            this.ud_minTitleLength.Maximum = new decimal(new int[] {
-            128000,
-            0,
-            0,
-            0});
-            this.ud_minTitleLength.Name = "ud_minTitleLength";
-            this.ud_minTitleLength.Size = new System.Drawing.Size(85, 21);
-            this.ud_minTitleLength.TabIndex = 99;
-            this.ud_minTitleLength.ValueChanged += new System.EventHandler(this.ud_minTitleLength_ValueChanged);
-            // 
-            // label40
-            // 
-            this.label40.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label40.AutoSize = true;
-            this.label40.Location = new System.Drawing.Point(79, 206);
-            this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(206, 13);
-            this.label40.TabIndex = 97;
-            this.label40.Text = "Minimum length of title to scan (seconds):";
-            // 
-            // check_showCliForInGUIEncode
-            // 
-            this.check_showCliForInGUIEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_showCliForInGUIEncode.AutoSize = true;
-            this.check_showCliForInGUIEncode.BackColor = System.Drawing.Color.Transparent;
-            this.check_showCliForInGUIEncode.Location = new System.Drawing.Point(81, 129);
-            this.check_showCliForInGUIEncode.Name = "check_showCliForInGUIEncode";
-            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(330, 17);
-            this.check_showCliForInGUIEncode.TabIndex = 96;
-            this.check_showCliForInGUIEncode.Text = "Show CLI window (Allows you to cleanly exit encode with ctrl-c)";
-            this.ToolTip.SetToolTip(this.check_showCliForInGUIEncode, resources.GetString("check_showCliForInGUIEncode.ToolTip"));
-            this.check_showCliForInGUIEncode.UseVisualStyleBackColor = false;
-            this.check_showCliForInGUIEncode.CheckedChanged += new System.EventHandler(this.check_showCliForInGUIEncode_CheckedChanged);
-            // 
-            // drop_previewScanCount
-            // 
-            this.drop_previewScanCount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_previewScanCount.FormattingEnabled = true;
-            this.drop_previewScanCount.Items.AddRange(new object[] {
-            "10",
-            "15",
-            "20",
-            "25",
-            "30"});
-            this.drop_previewScanCount.Location = new System.Drawing.Point(292, 173);
-            this.drop_previewScanCount.Name = "drop_previewScanCount";
-            this.drop_previewScanCount.Size = new System.Drawing.Size(85, 21);
-            this.drop_previewScanCount.TabIndex = 95;
-            this.ToolTip.SetToolTip(this.drop_previewScanCount, "Allows a greater number of preview frames to be selectable on the \"Preview\" windo" +
-        "w.\r\n\r\nThis can in some cases improve the accuracy of the auto crop feature.");
-            this.drop_previewScanCount.SelectedIndexChanged += new System.EventHandler(this.drop_previewScanCount_SelectedIndexChanged);
-            // 
-            // label33
-            // 
-            this.label33.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(79, 176);
-            this.label33.Name = "label33";
-            this.label33.Size = new System.Drawing.Size(181, 13);
-            this.label33.TabIndex = 94;
-            this.label33.Text = "Number of picture previews to scan:";
-            // 
-            // label6
-            // 
-            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label6.Location = new System.Drawing.Point(15, 15);
-            this.label6.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(31, 13);
-            this.label6.TabIndex = 71;
-            this.label6.Text = "GUI:";
-            // 
-            // check_trayStatusAlerts
-            // 
-            this.check_trayStatusAlerts.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_trayStatusAlerts.AutoSize = true;
-            this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;
-            this.check_trayStatusAlerts.Location = new System.Drawing.Point(81, 37);
-            this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";
-            this.check_trayStatusAlerts.Size = new System.Drawing.Size(296, 17);
-            this.check_trayStatusAlerts.TabIndex = 93;
-            this.check_trayStatusAlerts.Text = "Display status messages from tray icon (balloon popups)";
-            this.ToolTip.SetToolTip(this.check_trayStatusAlerts, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +
-        " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +
-        "");
-            this.check_trayStatusAlerts.UseVisualStyleBackColor = false;
-            this.check_trayStatusAlerts.CheckedChanged += new System.EventHandler(this.check_trayStatusAlerts_CheckedChanged);
-            // 
-            // check_mainMinimize
-            // 
-            this.check_mainMinimize.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_mainMinimize.AutoSize = true;
-            this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;
-            this.check_mainMinimize.Location = new System.Drawing.Point(81, 14);
-            this.check_mainMinimize.Name = "check_mainMinimize";
-            this.check_mainMinimize.Size = new System.Drawing.Size(230, 17);
-            this.check_mainMinimize.TabIndex = 82;
-            this.check_mainMinimize.Text = "Minimize to system tray (Requires Restart)";
-            this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +
-        " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +
-        "");
-            this.check_mainMinimize.UseVisualStyleBackColor = false;
-            this.check_mainMinimize.CheckedChanged += new System.EventHandler(this.check_mainMinimize_CheckedChanged);
-            // 
-            // check_promptOnUnmatchingQueries
-            // 
-            this.check_promptOnUnmatchingQueries.AutoSize = true;
-            this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(100, 83);
-            this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";
-            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(305, 17);
-            this.check_promptOnUnmatchingQueries.TabIndex = 63;
-            this.check_promptOnUnmatchingQueries.Text = "Prompt when a manual query does not match GUI settings";
-            this.check_promptOnUnmatchingQueries.UseVisualStyleBackColor = true;
-            this.check_promptOnUnmatchingQueries.CheckedChanged += new System.EventHandler(this.check_promptOnUnmatchingQueries_CheckedChanged);
-            // 
-            // check_dvdnav
-            // 
-            this.check_dvdnav.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_dvdnav.AutoSize = true;
-            this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;
-            this.check_dvdnav.Location = new System.Drawing.Point(82, 274);
-            this.check_dvdnav.Name = "check_dvdnav";
-            this.check_dvdnav.Size = new System.Drawing.Size(276, 17);
-            this.check_dvdnav.TabIndex = 90;
-            this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)";
-            this.check_dvdnav.UseVisualStyleBackColor = false;
-            this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);
-            // 
-            // check_queryEditorTab
-            // 
-            this.check_queryEditorTab.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_queryEditorTab.AutoSize = true;
-            this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;
-            this.check_queryEditorTab.Location = new System.Drawing.Point(81, 60);
-            this.check_queryEditorTab.Name = "check_queryEditorTab";
-            this.check_queryEditorTab.Size = new System.Drawing.Size(241, 17);
-            this.check_queryEditorTab.TabIndex = 84;
-            this.check_queryEditorTab.Text = "Enable \"Query Editor\" tab (Requires Restart)";
-            this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +
-        " effect.");
-            this.check_queryEditorTab.UseVisualStyleBackColor = false;
-            this.check_queryEditorTab.CheckedChanged += new System.EventHandler(this.check_queryEditorTab_CheckedChanged);
-            // 
-            // label32
-            // 
-            this.label32.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.label32.AutoSize = true;
-            this.label32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label32.Location = new System.Drawing.Point(13, 275);
-            this.label32.Name = "label32";
-            this.label32.Size = new System.Drawing.Size(33, 13);
-            this.label32.TabIndex = 89;
-            this.label32.Text = "DVD:";
-            // 
-            // drop_x264step
-            // 
-            this.drop_x264step.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drop_x264step.FormattingEnabled = true;
-            this.drop_x264step.Items.AddRange(new object[] {
-            "1.0",
-            "0.50",
-            "0.25",
-            "0.20"});
-            this.drop_x264step.Location = new System.Drawing.Point(292, 237);
-            this.drop_x264step.Name = "drop_x264step";
-            this.drop_x264step.Size = new System.Drawing.Size(85, 21);
-            this.drop_x264step.TabIndex = 86;
-            this.ToolTip.SetToolTip(this.drop_x264step, "Quality Slider Control Granularity for x264 encoding only.");
-            this.drop_x264step.SelectedIndexChanged += new System.EventHandler(this.x264step_SelectedIndexChanged);
-            // 
-            // label30
-            // 
-            this.label30.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(78, 240);
-            this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(189, 13);
-            this.label30.TabIndex = 87;
-            this.label30.Text = "Constant quality fractional granularity";
-            // 
-            // check_disablePresetNotification
-            // 
-            this.check_disablePresetNotification.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.check_disablePresetNotification.AutoSize = true;
-            this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;
-            this.check_disablePresetNotification.Location = new System.Drawing.Point(81, 106);
-            this.check_disablePresetNotification.Name = "check_disablePresetNotification";
-            this.check_disablePresetNotification.Size = new System.Drawing.Size(222, 17);
-            this.check_disablePresetNotification.TabIndex = 91;
-            this.check_disablePresetNotification.Text = "Disable built-in preset update notification";
-            this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +
-        " of HandBrake is installed.");
-            this.check_disablePresetNotification.UseVisualStyleBackColor = false;
-            this.check_disablePresetNotification.CheckedChanged += new System.EventHandler(this.check_disablePresetNotification_CheckedChanged);
-            // 
-            // label28
-            // 
-            this.label28.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.label28.AutoSize = true;
-            this.label28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label28.Location = new System.Drawing.Point(8, 240);
-            this.label28.Name = "label28";
-            this.label28.Size = new System.Drawing.Size(38, 13);
-            this.label28.TabIndex = 85;
-            this.label28.Text = "x264:";
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label8.Location = new System.Drawing.Point(51, 11);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(50, 13);
-            this.label8.TabIndex = 61;
-            this.label8.Text = "Options";
-            // 
-            // ToolTip
-            // 
-            this.ToolTip.Active = false;
-            this.ToolTip.AutomaticDelay = 1000;
-            this.ToolTip.AutoPopDelay = 15000;
-            this.ToolTip.InitialDelay = 1000;
-            this.ToolTip.ReshowDelay = 200;
-            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
-            this.ToolTip.ToolTipTitle = "Tooltip";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(199, 198);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(255, 20);
-            this.textBox1.TabIndex = 79;
-            this.ToolTip.SetToolTip(this.textBox1, "Define the format of the automatically named file.\r\ne.g  {source}_{title}_some-te" +
-        "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
-        "sources values.");
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(199, 171);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(181, 20);
-            this.textBox2.TabIndex = 76;
-            this.ToolTip.SetToolTip(this.textBox2, "The default location where auto named files are stored.");
-            // 
-            // checkBox1
-            // 
-            this.checkBox1.AutoSize = true;
-            this.checkBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox1.Location = new System.Drawing.Point(114, 148);
-            this.checkBox1.Name = "checkBox1";
-            this.checkBox1.Size = new System.Drawing.Size(206, 17);
-            this.checkBox1.TabIndex = 72;
-            this.checkBox1.Text = "Automatically name output files";
-            this.ToolTip.SetToolTip(this.checkBox1, "Automatically name output files");
-            this.checkBox1.UseVisualStyleBackColor = true;
-            // 
-            // checkBox2
-            // 
-            this.checkBox2.AutoSize = true;
-            this.checkBox2.BackColor = System.Drawing.Color.Transparent;
-            this.checkBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox2.Location = new System.Drawing.Point(114, 41);
-            this.checkBox2.Name = "checkBox2";
-            this.checkBox2.Size = new System.Drawing.Size(135, 17);
-            this.checkBox2.TabIndex = 70;
-            this.checkBox2.Text = "Enable GUI tooltips";
-            this.ToolTip.SetToolTip(this.checkBox2, "Enable the built in tooltips for gui controls.");
-            this.checkBox2.UseVisualStyleBackColor = false;
-            // 
-            // checkBox3
-            // 
-            this.checkBox3.AutoSize = true;
-            this.checkBox3.BackColor = System.Drawing.Color.Transparent;
-            this.checkBox3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox3.Location = new System.Drawing.Point(114, 18);
-            this.checkBox3.Name = "checkBox3";
-            this.checkBox3.Size = new System.Drawing.Size(131, 17);
-            this.checkBox3.TabIndex = 68;
-            this.checkBox3.Text = "Check for updates";
-            this.ToolTip.SetToolTip(this.checkBox3, "Enables the built in update checker. This check is performed when the application" +
-        " starts.");
-            this.checkBox3.UseVisualStyleBackColor = false;
-            // 
-            // checkBox4
-            // 
-            this.checkBox4.AutoSize = true;
-            this.checkBox4.BackColor = System.Drawing.Color.Transparent;
-            this.checkBox4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox4.Location = new System.Drawing.Point(114, 64);
-            this.checkBox4.Name = "checkBox4";
-            this.checkBox4.Size = new System.Drawing.Size(166, 17);
-            this.checkBox4.TabIndex = 69;
-            this.checkBox4.Text = "Load my default settings";
-            this.ToolTip.SetToolTip(this.checkBox4, "Loads the users default settings rather than the Normal preset.");
-            this.checkBox4.UseVisualStyleBackColor = false;
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Items.AddRange(new object[] {
-            "Do Nothing",
-            "Shutdown",
-            "Suspend",
-            "Hibernate",
-            "Lock System",
-            "Log Off",
-            "Quit HandBrake"});
-            this.comboBox1.Location = new System.Drawing.Point(114, 100);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(166, 21);
-            this.comboBox1.TabIndex = 43;
-            this.ToolTip.SetToolTip(this.comboBox1, "Performs an action when an encode or queue has completed.");
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(199, 198);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(255, 20);
-            this.textBox3.TabIndex = 79;
-            this.ToolTip.SetToolTip(this.textBox3, "Define the format of the automatically named file.\r\ne.g  {source}_{title}_some-te" +
-        "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
-        "sources values.");
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(199, 171);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(181, 20);
-            this.textBox4.TabIndex = 76;
-            this.ToolTip.SetToolTip(this.textBox4, "The default location where auto named files are stored.");
-            // 
-            // checkBox5
-            // 
-            this.checkBox5.AutoSize = true;
-            this.checkBox5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox5.Location = new System.Drawing.Point(114, 148);
-            this.checkBox5.Name = "checkBox5";
-            this.checkBox5.Size = new System.Drawing.Size(206, 17);
-            this.checkBox5.TabIndex = 72;
-            this.checkBox5.Text = "Automatically name output files";
-            this.ToolTip.SetToolTip(this.checkBox5, "Automatically name output files");
-            this.checkBox5.UseVisualStyleBackColor = true;
-            // 
-            // checkBox6
-            // 
-            this.checkBox6.AutoSize = true;
-            this.checkBox6.BackColor = System.Drawing.Color.Transparent;
-            this.checkBox6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox6.Location = new System.Drawing.Point(114, 41);
-            this.checkBox6.Name = "checkBox6";
-            this.checkBox6.Size = new System.Drawing.Size(135, 17);
-            this.checkBox6.TabIndex = 70;
-            this.checkBox6.Text = "Enable GUI tooltips";
-            this.ToolTip.SetToolTip(this.checkBox6, "Enable the built in tooltips for gui controls.");
-            this.checkBox6.UseVisualStyleBackColor = false;
-            // 
-            // checkBox7
-            // 
-            this.checkBox7.AutoSize = true;
-            this.checkBox7.BackColor = System.Drawing.Color.Transparent;
-            this.checkBox7.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox7.Location = new System.Drawing.Point(114, 18);
-            this.checkBox7.Name = "checkBox7";
-            this.checkBox7.Size = new System.Drawing.Size(131, 17);
-            this.checkBox7.TabIndex = 68;
-            this.checkBox7.Text = "Check for updates";
-            this.ToolTip.SetToolTip(this.checkBox7, "Enables the built in update checker. This check is performed when the application" +
-        " starts.");
-            this.checkBox7.UseVisualStyleBackColor = false;
-            // 
-            // checkBox8
-            // 
-            this.checkBox8.AutoSize = true;
-            this.checkBox8.BackColor = System.Drawing.Color.Transparent;
-            this.checkBox8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.checkBox8.Location = new System.Drawing.Point(114, 64);
-            this.checkBox8.Name = "checkBox8";
-            this.checkBox8.Size = new System.Drawing.Size(166, 17);
-            this.checkBox8.TabIndex = 69;
-            this.checkBox8.Text = "Load my default settings";
-            this.ToolTip.SetToolTip(this.checkBox8, "Loads the users default settings rather than the Normal preset.");
-            this.checkBox8.UseVisualStyleBackColor = false;
-            // 
-            // comboBox2
-            // 
-            this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Items.AddRange(new object[] {
-            "Do Nothing",
-            "Shutdown",
-            "Suspend",
-            "Hibernate",
-            "Lock System",
-            "Log Off",
-            "Quit HandBrake"});
-            this.comboBox2.Location = new System.Drawing.Point(114, 100);
-            this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(166, 21);
-            this.comboBox2.TabIndex = 43;
-            this.ToolTip.SetToolTip(this.comboBox2, "Performs an action when an encode or queue has completed.");
-            // 
-            // label16
-            // 
-            this.label16.AutoSize = true;
-            this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label16.Location = new System.Drawing.Point(197, 222);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(242, 12);
-            this.label16.TabIndex = 81;
-            this.label16.Text = "Available Options: {source} {title} {chapters}";
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label17.Location = new System.Drawing.Point(111, 201);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(52, 13);
-            this.label17.TabIndex = 80;
-            this.label17.Text = "Format:";
-            // 
-            // button1
-            // 
-            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.button1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.button1.Location = new System.Drawing.Point(386, 171);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(68, 22);
-            this.button1.TabIndex = 78;
-            this.button1.Text = "Browse";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
-            // label18
-            // 
-            this.label18.AutoSize = true;
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label18.Location = new System.Drawing.Point(111, 174);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(82, 13);
-            this.label18.TabIndex = 77;
-            this.label18.Text = "Default Path:";
-            // 
-            // label19
-            // 
-            this.label19.AutoSize = true;
-            this.label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label19.Location = new System.Drawing.Point(10, 149);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(86, 13);
-            this.label19.TabIndex = 71;
-            this.label19.Text = "Output files:";
-            // 
-            // label20
-            // 
-            this.label20.AutoSize = true;
-            this.label20.BackColor = System.Drawing.Color.Transparent;
-            this.label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label20.Location = new System.Drawing.Point(21, 19);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(75, 13);
-            this.label20.TabIndex = 67;
-            this.label20.Text = "At Launch:";
-            // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label21.Location = new System.Drawing.Point(12, 103);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(84, 13);
-            this.label21.TabIndex = 54;
-            this.label21.Text = "When Done:";
-            // 
-            // label22
-            // 
-            this.label22.AutoSize = true;
-            this.label22.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label22.Location = new System.Drawing.Point(197, 222);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(242, 12);
-            this.label22.TabIndex = 81;
-            this.label22.Text = "Available Options: {source} {title} {chapters}";
-            // 
-            // label23
-            // 
-            this.label23.AutoSize = true;
-            this.label23.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label23.Location = new System.Drawing.Point(111, 201);
-            this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(52, 13);
-            this.label23.TabIndex = 80;
-            this.label23.Text = "Format:";
-            // 
-            // button2
-            // 
-            this.button2.FlatAppearance.BorderColor = System.Drawing.Color.Black;
-            this.button2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.button2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.button2.Location = new System.Drawing.Point(386, 171);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(68, 22);
-            this.button2.TabIndex = 78;
-            this.button2.Text = "Browse";
-            this.button2.UseVisualStyleBackColor = true;
-            // 
-            // label24
-            // 
-            this.label24.AutoSize = true;
-            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label24.Location = new System.Drawing.Point(111, 174);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(82, 13);
-            this.label24.TabIndex = 77;
-            this.label24.Text = "Default Path:";
-            // 
-            // label25
-            // 
-            this.label25.AutoSize = true;
-            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label25.Location = new System.Drawing.Point(10, 149);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(86, 13);
-            this.label25.TabIndex = 71;
-            this.label25.Text = "Output files:";
-            // 
-            // label26
-            // 
-            this.label26.AutoSize = true;
-            this.label26.BackColor = System.Drawing.Color.Transparent;
-            this.label26.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label26.Location = new System.Drawing.Point(21, 19);
-            this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(75, 13);
-            this.label26.TabIndex = 67;
-            this.label26.Text = "At Launch:";
-            // 
-            // label27
-            // 
-            this.label27.AutoSize = true;
-            this.label27.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label27.Location = new System.Drawing.Point(12, 103);
-            this.label27.Name = "label27";
-            this.label27.Size = new System.Drawing.Size(84, 13);
-            this.label27.TabIndex = 54;
-            this.label27.Text = "When Done:";
-            // 
-            // openExecutable
-            // 
-            this.openExecutable.DefaultExt = "exe";
-            this.openExecutable.Filter = "exe|*.exe|bat|*.bat";
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.label37);
-            this.panel1.Controls.Add(this.panel2);
-            this.panel1.Controls.Add(this.label8);
-            this.panel1.Controls.Add(this.pictureBox2);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(614, 65);
-            this.panel1.TabIndex = 62;
-            // 
-            // label37
-            // 
-            this.label37.AutoSize = true;
-            this.label37.Location = new System.Drawing.Point(51, 27);
-            this.label37.Margin = new System.Windows.Forms.Padding(3);
-            this.label37.Name = "label37";
-            this.label37.Size = new System.Drawing.Size(202, 13);
-            this.label37.TabIndex = 105;
-            this.label37.Text = "Configure the HandBrake user interface.";
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.SystemColors.Control;
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 55);
-            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);
-            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(614, 10);
-            this.panel2.TabIndex = 59;
-            // 
-            // pictureBox2
-            // 
-            this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;
-            this.pictureBox2.Location = new System.Drawing.Point(12, 9);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(32, 32);
-            this.pictureBox2.TabIndex = 60;
-            this.pictureBox2.TabStop = false;
-            // 
-            // frmOptions
-            // 
-            this.AcceptButton = this.btn_close;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.AutoSize = true;
-            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(614, 535);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.btn_close);
-            this.Controls.Add(this.tab_options);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "frmOptions";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Options";
-            this.tab_options.ResumeLayout(false);
-            this.tab_general.ResumeLayout(false);
-            this.tab_general.PerformLayout();
-            this.tab_outputFiles.ResumeLayout(false);
-            this.tab_outputFiles.PerformLayout();
-            this.tab_picture.ResumeLayout(false);
-            this.tab_picture.PerformLayout();
-            this.tab_audio_sub.ResumeLayout(false);
-            this.tab_audio_sub.PerformLayout();
-            this.audioSelectionPanel.ResumeLayout(false);
-            this.audioSelectionPanel.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.tab_cli.ResumeLayout(false);
-            this.tab_cli.PerformLayout();
-            this.tab_advanced.ResumeLayout(false);
-            this.tab_advanced.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.ud_minTitleLength)).EndInit();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        internal System.Windows.Forms.Button btn_close;
-        internal System.Windows.Forms.ComboBox drp_completeOption;
-        private System.Windows.Forms.TabControl tab_options;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TabPage tab_cli;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.TabPage tab_general;
-        private System.Windows.Forms.FolderBrowserDialog pathFinder;
-        internal System.Windows.Forms.Label Label4;
-        internal System.Windows.Forms.CheckBox check_tooltip;
-        internal System.Windows.Forms.CheckBox check_updateCheck;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TabPage tab_advanced;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label13;
-        internal System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox text_an_path;
-        internal System.Windows.Forms.CheckBox check_autoNaming;
-        private System.Windows.Forms.Label label12;
-        internal System.Windows.Forms.ToolTip ToolTip;
-        private System.Windows.Forms.TabPage tab_picture;
-        internal System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox txt_autoNameFormat;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label9;
-        internal System.Windows.Forms.Button btn_saveLog;
-        internal System.Windows.Forms.Label label14;
-        private System.Windows.Forms.TextBox text_logPath;
-        internal System.Windows.Forms.CheckBox check_saveLogWithVideo;
-        internal System.Windows.Forms.Button btn_vlcPath;
-        private System.Windows.Forms.TextBox txt_vlcPath;
-        private System.Windows.Forms.Label label29;
-        private System.Windows.Forms.Label label16;
-        internal System.Windows.Forms.Label label17;
-        private System.Windows.Forms.TextBox textBox1;
-        internal System.Windows.Forms.Button button1;
-        internal System.Windows.Forms.Label label18;
-        private System.Windows.Forms.TextBox textBox2;
-        internal System.Windows.Forms.CheckBox checkBox1;
-        private System.Windows.Forms.Label label19;
-        internal System.Windows.Forms.CheckBox checkBox2;
-        internal System.Windows.Forms.CheckBox checkBox3;
-        internal System.Windows.Forms.CheckBox checkBox4;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label21;
-        internal System.Windows.Forms.ComboBox comboBox1;
-        private System.Windows.Forms.Label label22;
-        internal System.Windows.Forms.Label label23;
-        private System.Windows.Forms.TextBox textBox3;
-        internal System.Windows.Forms.Button button2;
-        internal System.Windows.Forms.Label label24;
-        private System.Windows.Forms.TextBox textBox4;
-        internal System.Windows.Forms.CheckBox checkBox5;
-        private System.Windows.Forms.Label label25;
-        internal System.Windows.Forms.CheckBox checkBox6;
-        internal System.Windows.Forms.CheckBox checkBox7;
-        internal System.Windows.Forms.CheckBox checkBox8;
-        private System.Windows.Forms.Label label26;
-        private System.Windows.Forms.Label label27;
-        internal System.Windows.Forms.ComboBox comboBox2;
-        private System.Windows.Forms.OpenFileDialog openExecutable;
-        internal System.Windows.Forms.CheckBox check_mainMinimize;
-        internal System.Windows.Forms.CheckBox check_queryEditorTab;
-        private System.Windows.Forms.Label label30;
-        internal System.Windows.Forms.ComboBox drop_x264step;
-        private System.Windows.Forms.Label label28;
-        internal System.Windows.Forms.ComboBox cb_logVerboseLvl;
-        internal System.Windows.Forms.Label label3;
-        internal System.Windows.Forms.CheckBox check_dvdnav;
-        private System.Windows.Forms.Label label32;
-        internal System.Windows.Forms.CheckBox check_logsInSpecifiedLocation;
-        internal System.Windows.Forms.CheckBox check_disablePresetNotification;
-        internal System.Windows.Forms.CheckBox check_trayStatusAlerts;
-        private System.Windows.Forms.Button btn_viewLogs;
-        private System.Windows.Forms.Button btn_clearLogs;
-        internal System.Windows.Forms.ComboBox drop_updateCheckDays;
-        internal System.Windows.Forms.ComboBox drp_Priority;
-        private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries;
-        private System.Windows.Forms.TabPage tab_audio_sub;
-        internal System.Windows.Forms.ComboBox drop_preferredLangAudio;
-        private System.Windows.Forms.Label label31;
-        private System.Windows.Forms.Label label15;
-        internal System.Windows.Forms.Button btn_browse;
-        internal System.Windows.Forms.CheckBox check_growlEncode;
-        internal System.Windows.Forms.CheckBox check_GrowlQueue;
-        internal System.Windows.Forms.ComboBox drop_previewScanCount;
-        private System.Windows.Forms.Label label33;
-        internal System.Windows.Forms.CheckBox check_clearOldLogs;
-        internal System.Windows.Forms.CheckBox check_showCliForInGUIEncode;
-        internal System.Windows.Forms.CheckBox check_TitleCase;
-        internal System.Windows.Forms.CheckBox check_removeUnderscores;
-        internal System.Windows.Forms.CheckBox check_preventSleep;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Label label34;
-        internal System.Windows.Forms.Label label35;
-        internal System.Windows.Forms.ComboBox cb_mp4FileMode;
-        private System.Windows.Forms.Label label36;
-        private System.Windows.Forms.Label label37;
-        internal System.Windows.Forms.Button btn_SendFileToPath;
-        private System.Windows.Forms.Label lbl_sendFileTo;
-        internal System.Windows.Forms.CheckBox check_sendFileTo;
-        private System.Windows.Forms.TabPage tab_outputFiles;
-        private System.Windows.Forms.Label label38;
-        private System.Windows.Forms.TextBox txt_SendFileArgs;
-        private System.Windows.Forms.Button button_clearLanguage;
-        private System.Windows.Forms.Button button_removeLanguage;
-        private System.Windows.Forms.Button button_addLanguage;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.ComboBox cb_subtitleMode;
-        private System.Windows.Forms.ComboBox cb_audioMode;
-        private System.Windows.Forms.Label label42;
-        private System.Windows.Forms.CheckBox check_AddOnlyOneAudioPerLanguage;
-        private System.Windows.Forms.CheckBox check_AddCCTracks;
-        private System.Windows.Forms.Label label43;
-        private System.Windows.Forms.Label label44;
-        private System.Windows.Forms.Label label41;
-        private System.Windows.Forms.Label label45;
-        private System.Windows.Forms.Panel audioSelectionPanel;
-        private System.Windows.Forms.Label label46;
-        private System.Windows.Forms.Label label47;
-        private System.Windows.Forms.ListBox listBox_selectedLanguages;
-        private System.Windows.Forms.Button button_moveLanguageDown;
-        private System.Windows.Forms.ListBox listBox_availableLanguages;
-        private System.Windows.Forms.Button button_moveLanguageUp;
-        private System.Windows.Forms.Label label39;
-        private System.Windows.Forms.NumericUpDown ud_minTitleLength;
-        private System.Windows.Forms.Label label40;
-        private System.Windows.Forms.Label label48;
-        internal System.Windows.Forms.ComboBox drop_preferredLangSubtitles;
-        private System.Windows.Forms.CheckBox check_advPassthruOpts;
-        private System.Windows.Forms.Label label49;
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmOptions.cs Deleted

@@ -1,735 +0,0 @@
-/*  frmOptions.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.ApplicationServices.Utilities;
-
-    using Handbrake.Properties;
-
-    /// <summary>
-    /// The Options Window
-    /// </summary>
-    public partial class frmOptions : Form
-    {
-        private readonly frmMain mainWindow;
-
-        private readonly IUserSettingService userSettingService = ServiceManager.UserSettingService;
-        private bool optionsWindowLoading = true;
-
-        public frmOptions(frmMain mw)
-        {
-            InitializeComponent();
-            mainWindow = mw;
-
-            IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
-
-            foreach (string selectedItem in this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
-            {
-                // removing wrong keys when a new Language list comes out.
-                if (langList.ContainsKey(selectedItem))
-                    listBox_selectedLanguages.Items.Add(selectedItem);
-            }
-
-            foreach (string item in langList.Keys)
-            {
-                drop_preferredLangAudio.Items.Add(item);
-                drop_preferredLangSubtitles.Items.Add(item);
-
-                // In the available languages should be no "Any" and no selected language.
-                if ((item != "Any") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))
-                {
-                    listBox_availableLanguages.Items.Add(item);
-                }
-            }
-
-            // #############################
-            // General
-            // #############################
-
-            // Enable Tooltips.
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TooltipEnable))
-            {
-                check_tooltip.CheckState = CheckState.Checked;
-                ToolTip.Active = true;
-            }
-
-            // Update Check
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UpdateStatus))
-                check_updateCheck.CheckState = CheckState.Checked;
-
-            // Days between update checks
-            switch (this.userSettingService.GetUserSetting<int>(UserSettingConstants.DaysBetweenUpdateCheck))
-            {
-                case 1:
-                    drop_updateCheckDays.SelectedIndex = 0;
-                    break;
-                case 7:
-                    drop_updateCheckDays.SelectedIndex = 1;
-                    break;
-                case 30:
-                    drop_updateCheckDays.SelectedIndex = 2;
-                    break;
-            }
-
-            // On Encode Completeion Action
-            drp_completeOption.Text = userSettingService.GetUserSetting<string>("WhenCompleteAction");
-
-            // Growl.
-            if (userSettingService.GetUserSetting<bool>(HandBrake.ApplicationServices.ASUserSettingConstants.GrowlEncode))
-                check_growlEncode.CheckState = CheckState.Checked;
-
-            if (userSettingService.GetUserSetting<bool>(HandBrake.ApplicationServices.ASUserSettingConstants.GrowlQueue))
-                check_GrowlQueue.CheckState = CheckState.Checked;
-
-            check_sendFileTo.Checked = this.userSettingService.GetUserSetting<bool>(HandBrake.ApplicationServices.ASUserSettingConstants.SendFile);
-            lbl_sendFileTo.Text = Path.GetFileNameWithoutExtension(this.userSettingService.GetUserSetting<string>(HandBrake.ApplicationServices.ASUserSettingConstants.SendFileTo));
-            txt_SendFileArgs.Text = this.userSettingService.GetUserSetting<string>(HandBrake.ApplicationServices.ASUserSettingConstants.SendFileToArgs);
-
-            // #############################
-            // Output Settings
-            // #############################
-
-            // Enable auto naming feature.)
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
-                check_autoNaming.CheckState = CheckState.Checked;
-
-            // Store the auto name path
-            text_an_path.Text = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath);
-            if (text_an_path.Text == string.Empty)
-                text_an_path.Text = "Click 'Browse' to set the default location";
-
-            // Store auto name format
-            txt_autoNameFormat.Text = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat);
-
-            // Use iPod/iTunes friendly .m4v extension for MP4 files.
-            cb_mp4FileMode.SelectedIndex = this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v);
-
-            // Remove Underscores
-            check_removeUnderscores.Checked = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore);
-
-            // Title case
-            check_TitleCase.Checked = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameTitleCase);
-
-            // #############################
-            // Picture Tab
-            // #############################
-
-            // VLC Path
-            txt_vlcPath.Text = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path);
-
-            // #############################
-            // Audio and Subtitles Tab
-            // #############################
-
-            drop_preferredLangAudio.SelectedItem = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage);
-            drop_preferredLangSubtitles.SelectedItem = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
-
-            //if (this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubMode) != 255)
-            //{
-            //    switch (this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubMode))
-            //    {
-            //        case 0:
-            //            Settings.Default.DubModeAudio = 2;
-            //            Settings.Default.DubModeSubtitle = 0;
-            //            Settings.Default.DubMode = 255;
-            //            break;
-            //        case 1:
-            //            Settings.Default.DubModeAudio = 4;
-            //            Settings.Default.DubModeSubtitle = 0;
-            //            Settings.Default.DubMode = 255;
-            //            break;
-            //        case 2:
-            //            Settings.Default.DubModeAudio = 2;
-            //            Settings.Default.DubModeSubtitle = 4;
-            //            Settings.Default.DubMode = 255;
-            //            break;
-            //        case 3:
-            //            Settings.Default.DubModeAudio = 4;
-            //            Settings.Default.DubModeSubtitle = 4;
-            //            Settings.Default.DubMode = 255;
-            //            break;
-            //        default:
-            //            Settings.Default.DubMode = 255;
-            //            break;
-            //    }
-            //}
-
-            cb_audioMode.SelectedIndex = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
-            cb_subtitleMode.SelectedIndex = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
-
-            check_AddOnlyOneAudioPerLanguage.Checked =
-                this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);
-
-            check_AddCCTracks.Checked = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption);
-
-            check_advPassthruOpts.Checked =
-                this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
-
-            // #############################
-            // CLI
-            // #############################
-
-            // Priority level for encodes
-            drp_Priority.Text = userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority);
-
-            check_preventSleep.Checked = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep);
-
-            // Log Verbosity Level
-            cb_logVerboseLvl.SelectedIndex = userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
-
-            // Save logs in the same directory as encoded files
-            if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogWithVideo))
-                check_saveLogWithVideo.CheckState = CheckState.Checked;
-
-            // Save Logs in a specified path
-            if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogToCopyDirectory))
-                check_logsInSpecifiedLocation.CheckState = CheckState.Checked;
-
-            // The saved log path
-            text_logPath.Text = userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory);
-
-            check_clearOldLogs.Checked = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);
-
-            // #############################
-            // Advanced
-            // #############################
-
-            // Minimise to Tray
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TrayIconAlerts))
-                check_trayStatusAlerts.CheckState = CheckState.Checked;
-
-            // Tray Balloon popups
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize))
-                check_mainMinimize.CheckState = CheckState.Checked;
-
-            // Enable / Disable Query editor tab
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.QueryEditorTab))
-                check_queryEditorTab.CheckState = CheckState.Checked;
-            check_promptOnUnmatchingQueries.Enabled = check_queryEditorTab.Checked;
-
-            // Prompt on inconsistant queries
-            check_promptOnUnmatchingQueries.Checked = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PromptOnUnmatchingQueries);
-
-            // Preset update notification
-            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification))
-                check_disablePresetNotification.CheckState = CheckState.Checked;
-
-            // Show CLI Window
-            check_showCliForInGUIEncode.Checked = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI);
-
-            // Set the preview count
-            drop_previewScanCount.SelectedItem = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount).ToString();
-
-            // x264 step
-            string step = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step).ToString(CultureInfo.InvariantCulture);
-            switch (step)
-            {
-                case "1":
-                    drop_x264step.SelectedIndex = 0;
-                    break;
-                case "0.5":
-                    drop_x264step.SelectedIndex = 1;
-                    break;
-                case "0.25":
-                    drop_x264step.SelectedIndex = 2;
-                    break;
-                case "0.2":
-                    drop_x264step.SelectedIndex = 3;
-                    break;
-            }
-
-            // Min Title Length
-            ud_minTitleLength.Value = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.MinScanDuration); 
-
-            // Use Experimental dvdnav
-            if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
-                check_dvdnav.CheckState = CheckState.Checked;
-
-            optionsWindowLoading = false;
-        }
-
-        #region General
-
-        private void check_updateCheck_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.UpdateStatus, check_updateCheck.Checked);
-        }
-
-        private void drop_updateCheckDays_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (drop_updateCheckDays.SelectedIndex)
-            {
-                case 0:
-                    this.userSettingService.SetUserSetting(UserSettingConstants.DaysBetweenUpdateCheck, 1);
-                    break;
-                case 1:
-                    this.userSettingService.SetUserSetting(UserSettingConstants.DaysBetweenUpdateCheck, 7);
-                    break;
-                case 2:
-                    this.userSettingService.SetUserSetting(UserSettingConstants.DaysBetweenUpdateCheck, 30);
-                    break;
-            }
-        }
-
-        private void check_tooltip_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.TooltipEnable, check_tooltip.Checked);
-        }
-
-        private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.WhenCompleteAction, drp_completeOption.Text);
-        }
-
-        private void check_GrowlQueue_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.GrowlQueue, check_GrowlQueue.Checked);
-        }
-
-        private void check_growlEncode_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.GrowlEncode, check_growlEncode.Checked);
-        }
-
-        private void btn_SendFileToPath_Click(object sender, EventArgs e)
-        {
-            openExecutable.ShowDialog();
-            if (!string.IsNullOrEmpty(openExecutable.FileName))
-            {
-                this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFileTo, openExecutable.FileName);
-                lbl_sendFileTo.Text = Path.GetFileNameWithoutExtension(openExecutable.FileName);
-            }
-        }
-
-        private void check_sendFileTo_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFile, check_sendFileTo.Checked);
-        }
-
-        private void txt_SendFileArgs_TextChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFileToArgs, txt_SendFileArgs.Text);
-        }
-
-        #endregion
-
-        #region Output File
-        private void check_autoNaming_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.AutoNaming, check_autoNaming.Checked);
-        }
-
-        private void txt_autoNameFormat_TextChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.AutoNameFormat, txt_autoNameFormat.Text);
-        }
-
-        private void btn_browse_Click(object sender, EventArgs e)
-        {
-            pathFinder.ShowDialog();
-            text_an_path.Text = pathFinder.SelectedPath;
-        }
-
-        private void text_an_path_TextChanged(object sender, EventArgs e)
-        {
-            if (text_an_path.Text == string.Empty)
-            {
-                this.userSettingService.SetUserSetting(UserSettingConstants.AutoNamePath, string.Empty);
-                text_an_path.Text = "Click 'Browse' to set the default location";
-            }
-            else
-                this.userSettingService.SetUserSetting(UserSettingConstants.AutoNamePath, text_an_path.Text);
-
-            if (text_an_path.Text.ToLower() == "{source_path}" && !optionsWindowLoading)
-            {
-                MessageBox.Show(
-                    "Be careful with this feature. Make sure you can write to the same folder as the source! \n\n If you are encoding from a DVD, do not use this feature as HandBrake will not be able to write to the DVD!",
-                    "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-            }
-
-            if (text_an_path.Text.ToLower().Contains("{source_path}") && !text_an_path.Text.StartsWith("{source_path}"))
-            {
-                MessageBox.Show("Note you can not use the {source_path} within a path. {source_path} is the full source file path.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-            }
-        }
-
-        private void cb_mp4FileMode_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.UseM4v, cb_mp4FileMode.SelectedIndex);
-        }
-
-        private void check_removeUnderscores_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.AutoNameRemoveUnderscore, check_removeUnderscores.Checked);
-        }
-
-        private void check_TitleCase_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.AutoNameTitleCase, check_TitleCase.Checked);
-        }
-
-        #endregion
-
-        #region Picture
-
-        private void btn_vlcPath_Click(object sender, EventArgs e)
-        {
-            openExecutable.ShowDialog();
-            if (openExecutable.FileName != string.Empty)
-                txt_vlcPath.Text = openExecutable.FileName;
-        }
-
-        private void txt_vlcPath_TextChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.VLC_Path, txt_vlcPath.Text);
-        }
-
-        #endregion
-
-        #region Audio and Subtitles
-
-        private void drop_preferredLang_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguage, drop_preferredLangAudio.SelectedItem.ToString());
-        }
-
-        private void drop_preferredLangSubtitles_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguageForSubtitles, drop_preferredLangSubtitles.SelectedItem.ToString());
-        }
-
-        private void button_removeLanguage_Click(object sender, EventArgs e)
-        {
-            if (listBox_selectedLanguages.SelectedItems.Count > 0)
-            {
-                String[] movedItems = new String[listBox_selectedLanguages.SelectedItems.Count];
-
-                listBox_selectedLanguages.SelectedItems.CopyTo(movedItems, 0);
-
-                listBox_availableLanguages.Items.AddRange(movedItems);
-
-                listBox_selectedLanguages.SelectedItems.Clear();
-                foreach (string item in movedItems)
-                {
-                    listBox_selectedLanguages.Items.Remove(item);
-
-                    StringCollection languages = this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
-                    if (languages.Contains(item))
-                    {
-                        languages.Remove(item);
-                        this.userSettingService.SetUserSetting(UserSettingConstants.SelectedLanguages, languages);
-                    }
-                }
-            }
-        }
-
-        private void button_addLanguage_Click(object sender, EventArgs e)
-        {
-            if (listBox_availableLanguages.SelectedItems.Count > 0)
-            {
-                String[] movedItems = new String[listBox_availableLanguages.SelectedItems.Count];
-
-                listBox_availableLanguages.SelectedItems.CopyTo(movedItems, 0);
-
-                listBox_selectedLanguages.Items.AddRange(movedItems);
-
-                StringCollection languages = this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
-                languages.AddRange(movedItems);
-                this.userSettingService.SetUserSetting(UserSettingConstants.SelectedLanguages, languages);
-      
-                listBox_availableLanguages.SelectedItems.Clear();
-                foreach (string item in movedItems)
-                {
-                    listBox_availableLanguages.Items.Remove(item);
-                }
-            }
-        }
-
-        private void button_clearLanguage_Click(object sender, EventArgs e)
-        {
-            if (listBox_selectedLanguages.Items.Count > 0)
-            {
-                String[] movedItems = new String[listBox_selectedLanguages.Items.Count];
-
-                listBox_selectedLanguages.Items.CopyTo(movedItems, 0);
-
-                listBox_availableLanguages.Items.AddRange(movedItems);
-
-                foreach (string item in movedItems)
-                {
-                    listBox_selectedLanguages.Items.Remove(item);
-
-                    StringCollection languages = this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
-                    if (languages.Contains(item))
-                    {
-                        languages.Remove(item);
-                        this.userSettingService.SetUserSetting(UserSettingConstants.SelectedLanguages, languages);
-                    }
-                }
-            }
-        }
-
-        private void button_moveLanguageUp_Click(object sender, EventArgs e)
-        {
-            int ilevel = 0;
-            if (listBox_selectedLanguages.SelectedItems.Count > 0)
-            {
-                ListBox.SelectedIndexCollection selectedItems = listBox_selectedLanguages.SelectedIndices;
-                int[] index_selectedItems = new int[selectedItems.Count];
-
-                for (int i = 0; i < selectedItems.Count; i++)
-                    index_selectedItems[i] = selectedItems[i];
-
-                for (int i = 0; i < index_selectedItems.Length; i++)
-                {
-                    ilevel = index_selectedItems[i];
-
-                    if ((ilevel - 1 >= 0) && (ilevel - 1 >= i))
-                    {
-                        String lvitem = (String)listBox_selectedLanguages.Items[ilevel];
-                        listBox_selectedLanguages.Items.Remove(lvitem);
-                        listBox_selectedLanguages.Items.Insert(ilevel - 1, lvitem);
-                        listBox_selectedLanguages.SetSelected(ilevel - 1, true);
-
-                        // Do the same on the Property.
-                        StringCollection languages = this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
-                        languages.Remove(lvitem);
-                        languages.Insert(ilevel - 1, lvitem);
-                        this.userSettingService.SetUserSetting(UserSettingConstants.SelectedLanguages, languages);
-                    }
-                }
-            }
-        }
-
-        private void button_moveLanguageDown_Click(object sender, EventArgs e)
-        {
-            int ilevel = 0;
-            if (listBox_selectedLanguages.SelectedItems.Count > 0)
-            {
-                ListBox.SelectedIndexCollection selectedItems = listBox_selectedLanguages.SelectedIndices;
-                int[] index_selectedItems = new int[selectedItems.Count];
-
-                for (int i = 0; i < selectedItems.Count; i++)
-                    index_selectedItems[i] = selectedItems[i];
-
-                for (int i = index_selectedItems.Length - 1; i >= 0; i--)
-                {
-                    ilevel = index_selectedItems[i];
-
-                    if ((ilevel + 1 >= 0) && (ilevel + 1 <= listBox_selectedLanguages.Items.Count - (index_selectedItems.Length - i)))
-                    {
-                        String lvitem = (String)listBox_selectedLanguages.Items[ilevel];
-                        listBox_selectedLanguages.Items.Remove(lvitem);
-                        listBox_selectedLanguages.Items.Insert(ilevel + 1, lvitem);
-                        listBox_selectedLanguages.SetSelected(ilevel + 1, true);
-
-                        // Do the same on the Property.
-                        StringCollection languages = this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
-                        languages.Remove(lvitem);
-                        languages.Insert(ilevel + 1, lvitem);
-                        this.userSettingService.SetUserSetting(UserSettingConstants.SelectedLanguages, languages);
-                    }
-                }
-            }
-        }
-
-        private void listBox_selectedLanguages_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            this.button_removeLanguage_Click(this, new EventArgs());
-        }
-
-        private void listBox_availableLanguages_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            this.button_addLanguage_Click(this, new EventArgs());
-        }
-
-        private void check_AddOnlyOneAudioPerLanguage_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.AddOnlyOneAudioPerLanguage, check_AddOnlyOneAudioPerLanguage.Checked);
-        }
-
-        private void check_AddCCTracks_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.UseClosedCaption, check_AddCCTracks.Checked);
-        }
-
-        private void cb_audioMode_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.DubModeAudio, cb_audioMode.SelectedIndex);
-        }
-
-        private void cb_subtitleMode_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.DubModeSubtitle, cb_subtitleMode.SelectedIndex);
-        }
-
-        private void check_advPassthruOpts_CheckedChanged(object sender, EventArgs e)
-        {
-            this.userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedAudioPassthruOpts, check_advPassthruOpts.Checked);
-        }
-
-        #endregion
-
-        #region CLI
-
-        private void drp_Priority_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.ProcessPriority, drp_Priority.Text);
-        }
-
-        private void check_preventSleep_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.PreventSleep, check_preventSleep.Checked);
-        }
-
-        private void cb_logVerboseLvl_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.Verbosity, cb_logVerboseLvl.SelectedIndex);
-        }
-
-        private void check_saveLogWithVideo_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogWithVideo, check_saveLogWithVideo.Checked);
-        }
-
-        private void check_logsInSpecifiedLocation_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogToCopyDirectory, check_logsInSpecifiedLocation.Checked);
-        }
-
-        private void btn_saveLog_Click(object sender, EventArgs e)
-        {
-            pathFinder.SelectedPath = String.Empty;
-            pathFinder.ShowDialog();
-            if (pathFinder.SelectedPath != string.Empty)
-                text_logPath.Text = pathFinder.SelectedPath;
-        }
-
-        private void text_logPath_TextChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogCopyDirectory, text_logPath.Text);
-        }
-
-        private void btn_viewLogs_Click(object sender, EventArgs e)
-        {
-            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
-            string windir = Environment.GetEnvironmentVariable("WINDIR");
-            Process prc = new Process();
-            prc.StartInfo.FileName = windir + @"\explorer.exe";
-            prc.StartInfo.Arguments = logDir;
-            prc.Start();
-        }
-
-        private void btn_clearLogs_Click(object sender, EventArgs e)
-        {
-            DialogResult result = MessageBox.Show("Are you sure you wish to clear the log file directory?", "Clear Logs",
-                                                  MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
-            if (result == DialogResult.Yes)
-            {
-                GeneralUtilities.ClearLogFiles(0);
-                MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,
-                                MessageBoxIcon.Information);
-            }
-        }
-
-        private void check_clearOldLogs_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(UserSettingConstants.ClearOldLogs, check_clearOldLogs.Checked);
-        }
-
-        #endregion
-
-        #region Advanced
-
-        private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, check_mainMinimize.Checked);
-            check_trayStatusAlerts.Enabled = check_mainMinimize.Checked;
-        }
-
-        private void check_trayStatusAlerts_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(UserSettingConstants.TrayIconAlerts, check_trayStatusAlerts.Checked);
-        }
-
-        private void check_queryEditorTab_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(UserSettingConstants.QueryEditorTab, check_queryEditorTab.Checked);
-            check_promptOnUnmatchingQueries.Enabled = check_queryEditorTab.Checked;
-        }
-
-        private void check_promptOnUnmatchingQueries_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(UserSettingConstants.PromptOnUnmatchingQueries, check_promptOnUnmatchingQueries.Checked);
-        }
-
-        private void check_disablePresetNotification_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, check_disablePresetNotification.Checked);
-        }
-
-        private void check_showCliForInGUIEncode_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.ShowCLI, check_showCliForInGUIEncode.Checked);
-        }
-
-        private void drop_previewScanCount_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.PreviewScanCount, int.Parse(drop_previewScanCount.SelectedItem.ToString()));
-        }
-
-        private void x264step_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (drop_x264step.SelectedIndex)
-            {
-                case 0:
-                    userSettingService.SetUserSetting(ASUserSettingConstants.X264Step, 1.0);
-                    break;
-                case 1:
-                    userSettingService.SetUserSetting(ASUserSettingConstants.X264Step, 0.5);
-                    break;
-                case 2:
-                    userSettingService.SetUserSetting(ASUserSettingConstants.X264Step, 0.25);
-                    break;
-                case 3:
-                    userSettingService.SetUserSetting(ASUserSettingConstants.X264Step, 0.2);
-                    break;
-            }
-            mainWindow.setQualityFromSlider();
-        }
-
-        private void check_dvdnav_CheckedChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.DisableLibDvdNav, check_dvdnav.Checked);
-        }
-
-        private void ud_minTitleLength_ValueChanged(object sender, EventArgs e)
-        {
-            int value;
-            if (int.TryParse(ud_minTitleLength.Value.ToString(), out value))
-            {
-                this.userSettingService.SetUserSetting(ASUserSettingConstants.MinScanDuration, value);
-            }
-        }
-
-        #endregion
-
-        private void btn_close_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmOptions.resx Deleted

@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>132, 18</value>
-  </metadata>
-  <data name="cb_mp4FileMode.ToolTip" xml:space="preserve">
-    <value>The default file extension for MP4 Files.
-Automatic   - This will use M4v when AC3 Audio, SRT Subtitles or Chapters are present, otherwise MP4.
-Always MP4 - The MP4 extension will always be used.
-Always M4V - The M4V extension will always be used.
-
-Note, the file itself is identical. This simply changes the default extension for MP4 files.</value>
-  </data>
-  <data name="text_an_path.ToolTip" xml:space="preserve">
-    <value>This is the default location where your encoded files will be stored if "Automatically name output files" is enabled.
-
-Hover over the "Available Options" text below for a more detailed description of the available advanced options.</value>
-  </data>
-  <data name="label34.ToolTip" xml:space="preserve">
-    <value>{source_path} = Use the same directory as the source is in.
-This option has to be used on it's own and can not be used as part of a path.
-
-{source_folder_name} = Uses the folder name where the source is stored.
-You can insert this anywhere in your path. e.g.  c:\movies\{source_folder_name}
-It will substitute the name of the folder where the source is located.
-Note, this can't be used with the {source_path} option!</value>
-  </data>
-  <data name="cb_subtitleMode.ToolTip" xml:space="preserve">
-    <value>"All" - all languages available in original order; 
-"Selected" - The Preferred and the extra selected languages; 
-"Only Preferred" - Only the Preferred language; 
-"First" - The first available;
-"None" - No language selected;</value>
-  </data>
-  <data name="cb_audioMode.ToolTip" xml:space="preserve">
-    <value>"All" - all languages available in original order; 
-"Selected" - The Preferred and the extra selected languages; 
-"Only Preferred" - Only the Preferred language; 
-"First" - The first available;
-"None" - No language selected;</value>
-  </data>
-  <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">
-    <value>Shows the CLI window when encoding.
-You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c
-meaing you'll have playable files if you choose to end the encode early. 
-
-When disabled, Presseting "Stop" on the main winow will render the encode unplayable.</value>
-  </data>
-  <metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="openExecutable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>224, 18</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmPreview.Designer.cs Deleted

@@ -1,176 +0,0 @@
-namespace Handbrake
-{
-    partial class frmPreview
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPreview));
-            this.startPoint = new System.Windows.Forms.ComboBox();
-            this.endPoint = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.progressBar = new System.Windows.Forms.ProgressBar();
-            this.lbl_progress = new System.Windows.Forms.Label();
-            this.btn_play = new System.Windows.Forms.Button();
-            this.defaultPlayer = new System.Windows.Forms.CheckBox();
-            this.SuspendLayout();
-            // 
-            // startPoint
-            // 
-            this.startPoint.FormattingEnabled = true;
-            this.startPoint.Items.AddRange(new object[] {
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10"});
-            this.startPoint.Location = new System.Drawing.Point(107, 6);
-            this.startPoint.Name = "startPoint";
-            this.startPoint.Size = new System.Drawing.Size(72, 21);
-            this.startPoint.TabIndex = 38;
-            // 
-            // endPoint
-            // 
-            this.endPoint.FormattingEnabled = true;
-            this.endPoint.Items.AddRange(new object[] {
-            "10",
-            "30",
-            "45",
-            "60",
-            "75",
-            "90",
-            "105",
-            "120"});
-            this.endPoint.Location = new System.Drawing.Point(289, 6);
-            this.endPoint.Name = "endPoint";
-            this.endPoint.Size = new System.Drawing.Size(70, 21);
-            this.endPoint.TabIndex = 39;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(89, 13);
-            this.label1.TabIndex = 40;
-            this.label1.Text = "Start at Preview:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(185, 9);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(98, 13);
-            this.label2.TabIndex = 41;
-            this.label2.Text = "Duration (seconds)";
-            // 
-            // progressBar
-            // 
-            this.progressBar.Location = new System.Drawing.Point(12, 33);
-            this.progressBar.Name = "progressBar";
-            this.progressBar.Size = new System.Drawing.Size(301, 18);
-            this.progressBar.TabIndex = 42;
-            // 
-            // lbl_progress
-            // 
-            this.lbl_progress.AutoSize = true;
-            this.lbl_progress.Location = new System.Drawing.Point(319, 36);
-            this.lbl_progress.Name = "lbl_progress";
-            this.lbl_progress.Size = new System.Drawing.Size(40, 13);
-            this.lbl_progress.TabIndex = 43;
-            this.lbl_progress.Text = "0.00%";
-            // 
-            // btn_play
-            // 
-            this.btn_play.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_play.ForeColor = System.Drawing.Color.DarkOrange;
-            this.btn_play.Location = new System.Drawing.Point(302, 57);
-            this.btn_play.Name = "btn_play";
-            this.btn_play.Size = new System.Drawing.Size(57, 24);
-            this.btn_play.TabIndex = 44;
-            this.btn_play.Text = "Play";
-            this.btn_play.UseVisualStyleBackColor = true;
-            this.btn_play.Click += new System.EventHandler(this.btn_play_Click);
-            // 
-            // defaultPlayer
-            // 
-            this.defaultPlayer.AutoSize = true;
-            this.defaultPlayer.Location = new System.Drawing.Point(12, 62);
-            this.defaultPlayer.Name = "defaultPlayer";
-            this.defaultPlayer.Size = new System.Drawing.Size(151, 17);
-            this.defaultPlayer.TabIndex = 45;
-            this.defaultPlayer.Text = "Use system default player";
-            this.defaultPlayer.UseVisualStyleBackColor = true;
-            this.defaultPlayer.CheckedChanged += new System.EventHandler(this.DefaultPlayerCheckedChanged);
-            // 
-            // frmPreview
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(369, 91);
-            this.Controls.Add(this.defaultPlayer);
-            this.Controls.Add(this.btn_play);
-            this.Controls.Add(this.lbl_progress);
-            this.Controls.Add(this.progressBar);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.endPoint);
-            this.Controls.Add(this.startPoint);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "frmPreview";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Video Preview";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.ComboBox startPoint;
-        private System.Windows.Forms.ComboBox endPoint;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.ProgressBar progressBar;
-        private System.Windows.Forms.Label lbl_progress;
-        private System.Windows.Forms.Button btn_play;
-        private System.Windows.Forms.CheckBox defaultPlayer;
-
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmPreview.cs Deleted

@@ -1,303 +0,0 @@
-/*  frmPreview.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Threading;
-    using System.Windows.Forms;
-    using Functions;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Services;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using MessageBox = System.Windows.Forms.MessageBox;
-
-    /// <summary>
-    /// The Preview Window
-    /// </summary>
-    public partial class frmPreview : Form
-    {
-        #region Private Variables
-
-        /// <summary>
-        /// The Main Window
-        /// </summary>
-        private readonly frmMain mainWindow;
-
-        /// <summary>
-        /// The encode queue
-        /// </summary>
-        private readonly IEncode encodeQueue = new Encode();
-
-        /// <summary>
-        /// What is currently playing
-        /// </summary>
-        private string currentlyPlaying = string.Empty;
-
-        /// <summary>
-        /// The User Setting Service.
-        /// </summary>
-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Update UI Delegate
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private delegate void UpdateUiHandler(object sender, EventArgs e);
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="frmPreview"/> class.
-        /// </summary>
-        /// <param name="mw">
-        /// The mw.
-        /// </param>
-        public frmPreview(frmMain mw)
-        {
-            InitializeComponent();
-            this.mainWindow = mw;
-
-            startPoint.SelectedIndex = 0;
-            endPoint.SelectedIndex = 1;
-
-            startPoint.Items.Clear();
-            for (int i = 1; i <= UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount); i++)
-            {
-                startPoint.Items.Add(i.ToString());
-            }
-
-            startPoint.SelectedIndex = 0;
-
-            encodeQueue.EncodeStarted += this.EncodeQueueEncodeStarted;
-            encodeQueue.EncodeCompleted += this.EncodeQueueEncodeEnded;
-
-            defaultPlayer.Checked = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DefaultPlayer);
-        }
-
-        #region Event Handlers
-        /// <summary>
-        /// The encode has started
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void EncodeQueueEncodeStarted(object sender, EventArgs e)
-        {
-            encodeQueue.EncodeStatusChanged += this.EncodeQueueEncodeStatusChanged;
-        }
-
-        /// <summary>
-        /// The Enocde has ended
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void EncodeQueueEncodeEnded(object sender, EventArgs e)
-        {
-            encodeQueue.EncodeStatusChanged -= this.EncodeQueueEncodeStatusChanged;
-
-            try
-            {
-                if (this.InvokeRequired)
-                {
-                    this.BeginInvoke(new UpdateUiHandler(EncodeQueueEncodeEnded), new[] { sender, e });
-                    return;
-                }
-
-                btn_play.Enabled = true;
-                this.Text = this.Text.Replace(" (Encoding)", string.Empty);
-                progressBar.Value = 0;
-                lbl_progress.Text = "0.00%";
-
-                // Get the sample filename
-                if (this.mainWindow.text_destination.Text != string.Empty)
-                    this.currentlyPlaying =
-                        this.mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").
-                            Replace(".mkv", "_sample.mkv");
-
-                this.Play();
-            }
-            catch (Exception exc)
-            {
-                throw new GeneralApplicationException("An Unexpected error has occured", " Your encode may not have completed sucessfully.", exc);
-            }
-        }
-
-        /// <summary>
-        /// Encode status has changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void EncodeQueueEncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)
-        {
-            if (this.InvokeRequired)
-            {
-                this.BeginInvoke(new EncodeProgessStatus(this.EncodeQueueEncodeStatusChanged), new[] { sender, e });
-                return;
-            }
-
-            lbl_progress.Text = e.PercentComplete + "%";
-            progressBar.Value = (int)Math.Round(e.PercentComplete);
-        }
-
-        private void DefaultPlayerCheckedChanged(object sender, EventArgs e)
-        {
-            UserSettingService.SetUserSetting(UserSettingConstants.DefaultPlayer, defaultPlayer.Checked);
-        }
-        #endregion
-
-        #region Encode Sample
-
-        /// <summary>
-        /// Create the Preview.
-        /// </summary>
-        /// <param name="state">
-        /// The state.
-        /// </param>
-        private void CreatePreview(object state)
-        {
-            // Make sure we are not already encoding and if we are then display an error.
-            if (encodeQueue.IsEncoding)
-            {
-                MessageBox.Show(
-                    this,
-                    "Handbrake is already encoding a video!",
-                    "Warning",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Warning);
-
-                return;
-            }
-
-            encodeQueue.Start((QueueTask)state, false);
-        }
-
-        #endregion
-
-        #region Playback
-
-        private void btn_play_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                btn_play.Enabled = false;
-                if (File.Exists(this.currentlyPlaying))
-                    File.Delete(this.currentlyPlaying);
-            }
-            catch (Exception)
-            {
-                btn_play.Enabled = true;
-                MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.",
-                                "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-            this.Text += " (Encoding)";
-            int duration;
-            int.TryParse(endPoint.Text, out duration);
-            string query = QueryGenerator.GeneratePreviewQuery(this.mainWindow, duration, startPoint.Text);
-            QueueTask task = new QueueTask(query) { Destination = this.mainWindow.text_destination.Text };
-            ThreadPool.QueueUserWorkItem(this.CreatePreview, task);
-        }
-
-        /// <summary>
-        /// Play the video back in an external VLC Player
-        /// </summary>
-        private void Play()
-        {
-            // Launch VLC and Play video.
-            if (this.currentlyPlaying != string.Empty)
-            {
-                if (File.Exists(this.currentlyPlaying))
-                {
-                    string args = "\"" + this.currentlyPlaying + "\"";
-
-                    if (defaultPlayer.Checked)
-                    {
-                        Process.Start(args);
-                    }
-                    else
-                    {
-                        if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
-                        {
-                            // Attempt to find VLC if it doesn't exist in the default set location.
-                            string vlcPath;
-
-                            if (8 == IntPtr.Size || (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))
-                                vlcPath = Environment.GetEnvironmentVariable("ProgramFiles(x86)");
-                            else
-                                vlcPath = Environment.GetEnvironmentVariable("ProgramFiles");
-
-                            if (!string.IsNullOrEmpty(vlcPath))
-                            {
-                                vlcPath = Path.Combine(vlcPath, "VideoLAN\\VLC\\vlc.exe");
-                            }
-
-                            if (File.Exists(vlcPath))
-                            {
-                                UserSettingService.SetUserSetting(UserSettingConstants.VLC_Path, vlcPath);
-                            }
-                            else
-                            {
-                                MessageBox.Show(
-                                    this,
-                                    "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\") ",
-                                    "VLC",
-                                    MessageBoxButtons.OK,
-                                    MessageBoxIcon.Warning);
-                            }
-                        }
-
-                        if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
-                        {
-                            ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path), args);
-                            Process.Start(vlc);
-                        }
-                    }
-                }
-                else
-                    MessageBox.Show(this,
-                                    "Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.",
-                                    "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Remove any subscribed events then close.
-        /// </summary>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
-        {
-            encodeQueue.EncodeStarted -= this.EncodeQueueEncodeStarted;
-            encodeQueue.EncodeCompleted -= this.EncodeQueueEncodeEnded;
-            base.OnClosing(e);
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmPreview.resx Deleted

HandBrake-0.9.8.tar.bz2/win/CS/frmQueue.Designer.cs Deleted

@@ -1,560 +0,0 @@
-/*  frmQueue.Designer.cs 
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    partial class frmQueue
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (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.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmQueue));
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.lbl_dest = new System.Windows.Forms.Label();
-            this.lbl_source = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.btn_encode = new System.Windows.Forms.ToolStripButton();
-            this.btn_pause = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.drop_button_queue = new System.Windows.Forms.ToolStripDropDownButton();
-            this.mnu_batch = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_import = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_export = new System.Windows.Forms.ToolStripMenuItem();
-            this.drp_completeOption = new System.Windows.Forms.ToolStripComboBox();
-            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
-            this.SaveFile = new System.Windows.Forms.SaveFileDialog();
-            this.list_queue = new System.Windows.Forms.ListView();
-            this.Status = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.Title = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.Chapters = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.Source = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.Destination = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.EncoderVideo = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.Audio = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.mnu_queue = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.mnu_up = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_Down = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.mnu_edit = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnu_Retry = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.mnuClearAll = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnuClearCompleted = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.mnu_delete = new System.Windows.Forms.ToolStripMenuItem();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.lbl_encodesPending = new System.Windows.Forms.ToolStripStatusLabel();
-            this.OpenFile = new System.Windows.Forms.OpenFileDialog();
-            this.lbl_encodeStatus = new System.Windows.Forms.Label();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lbl_encodeOptions = new System.Windows.Forms.Label();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.toolStrip1.SuspendLayout();
-            this.mnu_queue.SuspendLayout();
-            this.statusStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // lbl_dest
-            // 
-            this.lbl_dest.AutoEllipsis = true;
-            this.lbl_dest.Location = new System.Drawing.Point(117, 60);
-            this.lbl_dest.Name = "lbl_dest";
-            this.lbl_dest.Size = new System.Drawing.Size(671, 13);
-            this.lbl_dest.TabIndex = 65;
-            this.lbl_dest.Text = "-";
-            this.lbl_dest.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // lbl_source
-            // 
-            this.lbl_source.AutoEllipsis = true;
-            this.lbl_source.Location = new System.Drawing.Point(117, 47);
-            this.lbl_source.Name = "lbl_source";
-            this.lbl_source.Size = new System.Drawing.Size(671, 13);
-            this.lbl_source.TabIndex = 64;
-            this.lbl_source.Text = "-";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(12, 47);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(85, 39);
-            this.label1.TabIndex = 63;
-            this.label1.Text = "Source:\r\nDestination:\r\nOptions:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(12, 9);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(82, 13);
-            this.label3.TabIndex = 62;
-            this.label3.Text = "Current Job";
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.btn_encode,
-            this.btn_pause,
-            this.toolStripSeparator1,
-            this.drop_button_queue,
-            this.drp_completeOption,
-            this.toolStripButton1});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.toolStrip1.Size = new System.Drawing.Size(789, 39);
-            this.toolStrip1.TabIndex = 71;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // btn_encode
-            // 
-            this.btn_encode.Image = global::Handbrake.Properties.Resources.Play;
-            this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_encode.Name = "btn_encode";
-            this.btn_encode.Size = new System.Drawing.Size(82, 36);
-            this.btn_encode.Text = "Encode";
-            this.btn_encode.Click += new System.EventHandler(this.BtnEncodeClick);
-            // 
-            // btn_pause
-            // 
-            this.btn_pause.Image = global::Handbrake.Properties.Resources.Pause;
-            this.btn_pause.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btn_pause.Name = "btn_pause";
-            this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
-            this.btn_pause.Size = new System.Drawing.Size(74, 36);
-            this.btn_pause.Text = "Pause";
-            this.btn_pause.Visible = false;
-            this.btn_pause.Click += new System.EventHandler(this.BtnPauseClick);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39);
-            // 
-            // drop_button_queue
-            // 
-            this.drop_button_queue.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_batch,
-            this.mnu_import,
-            this.mnu_export});
-            this.drop_button_queue.Image = global::Handbrake.Properties.Resources.ActivityWindow;
-            this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.drop_button_queue.Name = "drop_button_queue";
-            this.drop_button_queue.Size = new System.Drawing.Size(87, 36);
-            this.drop_button_queue.Text = "Queue";
-            // 
-            // mnu_batch
-            // 
-            this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;
-            this.mnu_batch.Name = "mnu_batch";
-            this.mnu_batch.Size = new System.Drawing.Size(187, 22);
-            this.mnu_batch.Text = "Generate Batch Script";
-            this.mnu_batch.Click += new System.EventHandler(this.MnuBatchClick);
-            // 
-            // mnu_import
-            // 
-            this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;
-            this.mnu_import.Name = "mnu_import";
-            this.mnu_import.Size = new System.Drawing.Size(187, 22);
-            this.mnu_import.Text = "Import Queue";
-            this.mnu_import.Click += new System.EventHandler(this.MnuImportClick);
-            // 
-            // mnu_export
-            // 
-            this.mnu_export.Image = global::Handbrake.Properties.Resources.save;
-            this.mnu_export.Name = "mnu_export";
-            this.mnu_export.Size = new System.Drawing.Size(187, 22);
-            this.mnu_export.Text = "Export Queue";
-            this.mnu_export.Click += new System.EventHandler(this.MnuExportClick);
-            // 
-            // drp_completeOption
-            // 
-            this.drp_completeOption.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.drp_completeOption.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.drp_completeOption.Items.AddRange(new object[] {
-            "Do nothing",
-            "Shutdown",
-            "Suspend",
-            "Hibernate",
-            "Lock system",
-            "Log off",
-            "Quit HandBrake"});
-            this.drp_completeOption.Margin = new System.Windows.Forms.Padding(1, 0, 15, 0);
-            this.drp_completeOption.Name = "drp_completeOption";
-            this.drp_completeOption.Size = new System.Drawing.Size(155, 39);
-            this.drp_completeOption.SelectedIndexChanged += new System.EventHandler(this.CompleteOptionChanged);
-            // 
-            // toolStripButton1
-            // 
-            this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
-            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(76, 36);
-            this.toolStripButton1.Text = "When Done:";
-            // 
-            // SaveFile
-            // 
-            this.SaveFile.Filter = "Batch|.bat";
-            // 
-            // list_queue
-            // 
-            this.list_queue.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.Status,
-            this.Title,
-            this.Chapters,
-            this.Source,
-            this.Destination,
-            this.EncoderVideo,
-            this.Audio});
-            this.list_queue.ContextMenuStrip = this.mnu_queue;
-            this.list_queue.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.list_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.list_queue.FullRowSelect = true;
-            this.list_queue.GridLines = true;
-            this.list_queue.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
-            this.list_queue.Location = new System.Drawing.Point(15, 0);
-            this.list_queue.Name = "list_queue";
-            this.list_queue.Size = new System.Drawing.Size(759, 199);
-            this.list_queue.TabIndex = 72;
-            this.list_queue.UseCompatibleStateImageBehavior = false;
-            this.list_queue.View = System.Windows.Forms.View.Details;
-            this.list_queue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.ListQueueDeleteKey);
-            // 
-            // Status
-            // 
-            this.Status.Text = "Job Status";
-            this.Status.Width = 80;
-            // 
-            // Title
-            // 
-            this.Title.Text = "Title";
-            this.Title.Width = 39;
-            // 
-            // Chapters
-            // 
-            this.Chapters.Text = "Chapters";
-            this.Chapters.Width = 71;
-            // 
-            // Source
-            // 
-            this.Source.Text = "Source";
-            this.Source.Width = 219;
-            // 
-            // Destination
-            // 
-            this.Destination.Text = "Destination";
-            this.Destination.Width = 210;
-            // 
-            // EncoderVideo
-            // 
-            this.EncoderVideo.Text = "Video Encoder";
-            this.EncoderVideo.Width = 110;
-            // 
-            // Audio
-            // 
-            this.Audio.Text = "Audio Encoder";
-            this.Audio.Width = 94;
-            // 
-            // mnu_queue
-            // 
-            this.mnu_queue.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mnu_up,
-            this.mnu_Down,
-            this.toolStripSeparator3,
-            this.mnu_edit,
-            this.mnu_Retry,
-            this.toolStripSeparator4,
-            this.mnuClearAll,
-            this.mnuClearCompleted,
-            this.toolStripSeparator5,
-            this.mnu_delete});
-            this.mnu_queue.Name = "mnu_queue";
-            this.mnu_queue.Size = new System.Drawing.Size(164, 176);
-            // 
-            // mnu_up
-            // 
-            this.mnu_up.Name = "mnu_up";
-            this.mnu_up.Size = new System.Drawing.Size(163, 22);
-            this.mnu_up.Text = "Move Up";
-            this.mnu_up.Click += new System.EventHandler(this.MnuUpClick);
-            // 
-            // mnu_Down
-            // 
-            this.mnu_Down.Name = "mnu_Down";
-            this.mnu_Down.Size = new System.Drawing.Size(163, 22);
-            this.mnu_Down.Text = "Move Down";
-            this.mnu_Down.Click += new System.EventHandler(this.MnuDownClick);
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(160, 6);
-            // 
-            // mnu_edit
-            // 
-            this.mnu_edit.Name = "mnu_edit";
-            this.mnu_edit.Size = new System.Drawing.Size(163, 22);
-            this.mnu_edit.Text = "Edit";
-            this.mnu_edit.Click += new System.EventHandler(this.MnuEditClick);
-            // 
-            // mnu_Retry
-            // 
-            this.mnu_Retry.Name = "mnu_Retry";
-            this.mnu_Retry.Size = new System.Drawing.Size(163, 22);
-            this.mnu_Retry.Text = "Retry Encode";
-            this.mnu_Retry.Click += new System.EventHandler(this.mnu_Retry_Click);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(160, 6);
-            // 
-            // mnuClearAll
-            // 
-            this.mnuClearAll.Name = "mnuClearAll";
-            this.mnuClearAll.Size = new System.Drawing.Size(163, 22);
-            this.mnuClearAll.Text = "Clear All";
-            this.mnuClearAll.Click += new System.EventHandler(this.mnuClearAll_Click);
-            // 
-            // mnuClearCompleted
-            // 
-            this.mnuClearCompleted.Name = "mnuClearCompleted";
-            this.mnuClearCompleted.Size = new System.Drawing.Size(163, 22);
-            this.mnuClearCompleted.Text = "Clear Completed";
-            this.mnuClearCompleted.Click += new System.EventHandler(this.mnuClearCompleted_Click);
-            // 
-            // toolStripSeparator5
-            // 
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(160, 6);
-            // 
-            // mnu_delete
-            // 
-            this.mnu_delete.Name = "mnu_delete";
-            this.mnu_delete.Size = new System.Drawing.Size(163, 22);
-            this.mnu_delete.Text = "Delete";
-            this.mnu_delete.Click += new System.EventHandler(this.MnuDeleteClick);
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.lbl_encodesPending});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 363);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
-            this.statusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.statusStrip1.Size = new System.Drawing.Size(789, 22);
-            this.statusStrip1.TabIndex = 73;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // lbl_encodesPending
-            // 
-            this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);
-            this.lbl_encodesPending.Name = "lbl_encodesPending";
-            this.lbl_encodesPending.Size = new System.Drawing.Size(115, 17);
-            this.lbl_encodesPending.Text = "0 encode(s) pending";
-            this.lbl_encodesPending.ToolTipText = "- Displays the number of jobs remaining to process.\r\n- Displays the time for the " +
-    "current processing session. \r\n  (Note, this is reset every time you press encode" +
-    ", including after a pause)";
-            // 
-            // OpenFile
-            // 
-            this.OpenFile.Filter = "HandBrake Queue|*.queue";
-            // 
-            // lbl_encodeStatus
-            // 
-            this.lbl_encodeStatus.AutoSize = true;
-            this.lbl_encodeStatus.Location = new System.Drawing.Point(12, 30);
-            this.lbl_encodeStatus.Name = "lbl_encodeStatus";
-            this.lbl_encodeStatus.Size = new System.Drawing.Size(38, 13);
-            this.lbl_encodeStatus.TabIndex = 73;
-            this.lbl_encodeStatus.Text = "Ready";
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.BackColor = System.Drawing.Color.Transparent;
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 39);
-            this.splitContainer1.Name = "splitContainer1";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.BackColor = System.Drawing.Color.Transparent;
-            this.splitContainer1.Panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.splitContainer1.Panel1.Controls.Add(this.lbl_encodeOptions);
-            this.splitContainer1.Panel1.Controls.Add(this.label3);
-            this.splitContainer1.Panel1.Controls.Add(this.lbl_dest);
-            this.splitContainer1.Panel1.Controls.Add(this.label1);
-            this.splitContainer1.Panel1.Controls.Add(this.lbl_encodeStatus);
-            this.splitContainer1.Panel1.Controls.Add(this.lbl_source);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.list_queue);
-            this.splitContainer1.Panel2.Controls.Add(this.panel3);
-            this.splitContainer1.Panel2.Controls.Add(this.panel2);
-            this.splitContainer1.Panel2.Controls.Add(this.panel1);
-            this.splitContainer1.Size = new System.Drawing.Size(789, 324);
-            this.splitContainer1.SplitterDistance = 106;
-            this.splitContainer1.TabIndex = 74;
-            // 
-            // lbl_encodeOptions
-            // 
-            this.lbl_encodeOptions.AutoEllipsis = true;
-            this.lbl_encodeOptions.Location = new System.Drawing.Point(117, 73);
-            this.lbl_encodeOptions.Name = "lbl_encodeOptions";
-            this.lbl_encodeOptions.Size = new System.Drawing.Size(671, 33);
-            this.lbl_encodeOptions.TabIndex = 74;
-            this.lbl_encodeOptions.Text = "-";
-            // 
-            // panel3
-            // 
-            this.panel3.BackColor = System.Drawing.Color.Transparent;
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel3.Location = new System.Drawing.Point(15, 199);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(759, 15);
-            this.panel3.TabIndex = 73;
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.Color.Transparent;
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel2.Location = new System.Drawing.Point(774, 0);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(15, 214);
-            this.panel2.TabIndex = 1;
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.Transparent;
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(15, 214);
-            this.panel1.TabIndex = 0;
-            // 
-            // frmQueue
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(789, 385);
-            this.Controls.Add(this.splitContainer1);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.toolStrip1);
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MinimumSize = new System.Drawing.Size(677, 417);
-            this.Name = "frmQueue";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Encode Queue";
-            this.toolStrip1.ResumeLayout(false);
-            this.toolStrip1.PerformLayout();
-            this.mnu_queue.ResumeLayout(false);
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel1.PerformLayout();
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.Label lbl_dest;
-        private System.Windows.Forms.Label lbl_source;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ToolStripButton btn_encode;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripButton btn_pause;
-        private System.Windows.Forms.SaveFileDialog SaveFile;
-        private System.Windows.Forms.ListView list_queue;
-        private System.Windows.Forms.ColumnHeader Title;
-        private System.Windows.Forms.ColumnHeader Chapters;
-        private System.Windows.Forms.ColumnHeader Source;
-        private System.Windows.Forms.ColumnHeader Destination;
-        private System.Windows.Forms.ColumnHeader EncoderVideo;
-        private System.Windows.Forms.ColumnHeader Audio;
-        private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.ToolStripDropDownButton drop_button_queue;
-        private System.Windows.Forms.ToolStripMenuItem mnu_batch;
-        private System.Windows.Forms.ToolStripMenuItem mnu_import;
-        private System.Windows.Forms.ToolStripMenuItem mnu_export;
-        private System.Windows.Forms.OpenFileDialog OpenFile;
-        private System.Windows.Forms.ToolStripStatusLabel lbl_encodesPending;
-        private System.Windows.Forms.ContextMenuStrip mnu_queue;
-        private System.Windows.Forms.ToolStripMenuItem mnu_up;
-        private System.Windows.Forms.ToolStripMenuItem mnu_Down;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
-        private System.Windows.Forms.ToolStripMenuItem mnu_delete;
-        private System.Windows.Forms.ToolStripMenuItem mnu_edit;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.Label lbl_encodeStatus;
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbl_encodeOptions;
-        private System.Windows.Forms.ToolStripComboBox drp_completeOption;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private System.Windows.Forms.Panel panel3;
-        private System.Windows.Forms.ColumnHeader Status;
-        private System.Windows.Forms.ToolStripMenuItem mnuClearCompleted;
-        private System.Windows.Forms.ToolStripMenuItem mnu_Retry;
-        private System.Windows.Forms.ToolStripMenuItem mnuClearAll;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
-    }
-}

HandBrake-0.9.8.tar.bz2/win/CS/frmQueue.cs Deleted

@@ -1,777 +0,0 @@
-/*  frmQueue.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-namespace Handbrake
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.ComponentModel;
-    using System.Windows.Forms;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Functions;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-    using HandBrake.ApplicationServices.Utilities;
-    using HandBrake.Interop.Model.Encoding;
-
-    /// <summary>
-    /// The Queue Window
-    /// </summary>
-    public partial class frmQueue : Form
-    {
-        /// <summary>
-        /// Update Handler Delegate
-        /// </summary>
-        private delegate void UpdateHandler();
-
-        /// <summary>
-        /// An instance of the Queue service
-        /// </summary>
-        private readonly IQueueProcessor queue;
-
-        /// <summary>
-        /// A reference to the main application window
-        /// </summary>
-        private readonly frmMain mainWindow;
-
-        /// <summary>
-        /// The User setting service
-        /// </summary>
-        private readonly IUserSettingService userSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="frmQueue"/> class.
-        /// </summary>
-        /// <param name="q">
-        /// An instance of the queue service.
-        /// </param>
-        /// <param name="mw">
-        /// The main window.
-        /// </param>
-        public frmQueue(IQueueProcessor q, frmMain mw)
-        {
-            InitializeComponent();
-
-            this.mainWindow = mw;
-
-            this.queue = q;
-            queue.EncodeService.EncodeStarted += this.QueueOnEncodeStart;
-            queue.QueueCompleted += this.QueueOnQueueFinished;
-            queue.QueuePaused += this.QueueOnPaused;
-            queue.QueueManager.QueueChanged += this.queue_QueueListChanged;
-
-            queue.EncodeService.EncodeStarted += this.queue_EncodeStarted;
-            queue.EncodeService.EncodeCompleted += this.queue_EncodeEnded;
-
-            drp_completeOption.Text = userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction);
-        }
-
-        /// <summary>
-        /// Queue Changed
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void queue_QueueListChanged(object sender, EventArgs e)
-        {
-            UpdateUiElementsOnQueueChange();
-        }
-
-        /// <summary>
-        /// Encode Ended
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void queue_EncodeEnded(object sender, EventArgs e)
-        {
-            queue.EncodeService.EncodeStatusChanged -= EncodeQueue_EncodeStatusChanged;
-            ResetEncodeText();
-        }
-
-        /// <summary>
-        /// Queue Started
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void queue_EncodeStarted(object sender, EventArgs e)
-        {
-            this.SetCurrentEncodeInformation();
-            queue.EncodeService.EncodeStatusChanged += EncodeQueue_EncodeStatusChanged;
-        }
-
-        /// <summary>
-        /// Display the Encode Status
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void EncodeQueue_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)
-        {
-            if (this.InvokeRequired)
-            {
-                this.BeginInvoke(new EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });
-                return;
-            }
-
-            lbl_encodeStatus.Text =
-                string.Format(
-                "Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:hh\\:mm\\:ss}",
-                e.Task,
-                e.TaskCount,
-                e.PercentComplete,
-                e.CurrentFrameRate,
-                e.AverageFrameRate,
-                e.EstimatedTimeLeft,
-                e.ElapsedTime);
-
-            UpdateStatusLabel();
-        }
-
-        /// <summary>
-        /// Handle the Queue Paused event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void QueueOnPaused(object sender, EventArgs e)
-        {
-            SetUiEncodeFinished();
-            UpdateUiElementsOnQueueChange();
-        }
-
-        /// <summary>
-        /// Handle the Queue Finished event.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void QueueOnQueueFinished(object sender, EventArgs e)
-        {
-            SetUiEncodeFinished();
-            ResetQueue(); // Reset the Queue Window
-        }
-
-        /// <summary>
-        /// Handle the Encode Started event
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void QueueOnEncodeStart(object sender, EventArgs e)
-        {
-            SetUiEncodeStarted(); // make sure the UI is set correctly
-            UpdateUiElementsOnQueueChange(); // Redraw the Queue, a new encode has started.
-        }
-
-        /// <summary>
-        /// Initializes the Queue list with the Arraylist from the Queue class
-        /// </summary>
-        public void SetQueue()
-        {
-            UpdateUiElementsOnQueueChange();
-        }
-
-        /// <summary>
-        /// Initializes the Queue list, then shows and activates the window
-        /// </summary>
-        public new void Show()
-        {
-            Show(true);
-        }
-
-        /// <summary>
-        /// Initializes the Queue list only if doSetQueue is true, then shows and activates the window
-        /// </summary>
-        /// <param name="doSetQueue">Indicates whether to call setQueue() before showing the window</param>
-        public void Show(bool doSetQueue)
-        {
-            if (doSetQueue) SetQueue();
-            base.Show();
-        }
-
-        /// <summary>
-        /// Handle the Encode button Click event
-        /// </summary>
-        /// <param name="sender">The sender</param>
-        /// <param name="e">the EventArgs</param>
-        private void BtnEncodeClick(object sender, EventArgs e)
-        {
-            if (!queue.IsProcessing)
-            {
-                SetUiEncodeStarted();
-            }
-
-            lbl_encodeStatus.Text = "Encoding ...";
-            queue.Start();
-        }
-
-        /// <summary>
-        /// Handle the Pause button click event.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void BtnPauseClick(object sender, EventArgs e)
-        {
-            queue.Pause();
-
-            MessageBox.Show(
-                "No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.",
-                "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-        }
-
-        // UI Work
-
-        /// <summary>
-        /// Setup the UI to show that an encode has started
-        /// </summary>
-        private void SetUiEncodeStarted()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(SetUiEncodeStarted));
-                return;
-            }
-            btn_encode.Enabled = false;
-            btn_pause.Visible = true;
-        }
-
-        /// <summary>
-        /// Setup the UI to indicate that an encode has finished.
-        /// </summary>
-        private void SetUiEncodeFinished()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(SetUiEncodeFinished));
-                return;
-            }
-            btn_pause.Visible = false;
-            btn_encode.Enabled = true;
-        }
-
-        /// <summary>
-        /// Reset the Queue Window display
-        /// </summary>
-        private void ResetQueue()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(ResetQueue));
-                return;
-            }
-            btn_pause.Visible = false;
-            btn_encode.Enabled = true;
-
-            this.RedrawQueue();
-            ResetEncodeText();
-        }
-
-        /// <summary>
-        /// Reset the current job text
-        /// </summary>
-        private void ResetEncodeText()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(ResetEncodeText));
-                return;
-            }
-            lbl_encodeStatus.Text = "Ready";
-
-            lbl_source.Text = "-";
-            lbl_dest.Text = "-";
-            lbl_encodeOptions.Text = "-";
-
-            UpdateStatusLabel();
-        }
-
-        /// <summary>
-        /// Redraw the Queue window with the latest information about HandBrakes status
-        /// </summary>
-        private void RedrawQueue()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(RedrawQueue));
-                return;
-            }
-
-            list_queue.Items.Clear();
-            ObservableCollection<QueueTask> theQueue = queue.QueueManager.Queue;
-            foreach (QueueTask queueItem in theQueue)
-            {
-                string qItem = queueItem.Query;
-                EncodeTask parsed = QueryParserUtility.Parse(qItem);
-
-                // Get the DVD Title
-                string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString();
-
-                // Get the DVD Chapters
-                string chapters;
-                if (parsed.StartPoint == 0)
-                    chapters = "Auto";
-                else
-                {
-                    chapters = parsed.StartPoint.ToString();
-                    if (parsed.EndPoint != 0)
-                        chapters = chapters + " - " + parsed.EndPoint;
-                }
-
-                ListViewItem item = new ListViewItem
-                    { Tag = queueItem, Text = EnumHelper<QueueItemStatus>.GetDescription(queueItem.Status) };
-                item.SubItems.Add(title);
-                item.SubItems.Add(chapters); // Chapters
-                item.SubItems.Add(queueItem.Source); // Source
-                item.SubItems.Add(queueItem.Destination); // Destination
-                item.SubItems.Add(EnumHelper<VideoEncoder>.GetDisplay(parsed.VideoEncoder));
-
-                // Display The Audio Track Information
-                string audio = string.Empty;
-                foreach (AudioTrack track in parsed.AudioTracks)
-                {
-                    if (audio != string.Empty)
-                        audio += ", " + EnumHelper<AudioEncoder>.GetDisplay(track.Encoder);
-                    else
-                        audio = EnumHelper<AudioEncoder>.GetDisplay(track.Encoder);
-                }
-                item.SubItems.Add(audio); // Audio
-
-                list_queue.Items.Add(item);
-            }
-        }
-
-        /// <summary>
-        /// Update the UI elements
-        /// </summary>
-        private void UpdateUiElementsOnQueueChange()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(UpdateUiElementsOnQueueChange));
-                return;
-            }
-
-            RedrawQueue();
-            UpdateStatusLabel();
-        }
-
-        /// <summary>
-        /// Update the Display
-        /// </summary>
-        private void UpdateStatusLabel()
-        {
-            if (InvokeRequired)
-            {
-                BeginInvoke(new UpdateHandler(UpdateStatusLabel));
-                return;
-            }
-
-            lbl_encodesPending.Text = string.Format("{0} encodes(s) pending", this.queue.QueueManager.Count);
-        }
-
-        /// <summary>
-        /// Set the window up with the current encode information
-        /// </summary>
-        private void SetCurrentEncodeInformation()
-        {
-            try
-            {
-                if (InvokeRequired)
-                {
-                    BeginInvoke(new UpdateHandler(SetCurrentEncodeInformation));
-                }
-
-                EncodeTask parsed = QueryParserUtility.Parse(queue.QueueManager.LastProcessedJob.Query);
-
-                // Get title and chapters
-                string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString();
-                string chapterlbl;
-                if (Equals(parsed.StartPoint, 0))
-                    chapterlbl = "Auto";
-                else
-                {
-                    string chapters = parsed.StartPoint.ToString();
-                    if (parsed.EndPoint != 0)
-                        chapters = chapters + " - " + parsed.EndPoint;
-                    chapterlbl = chapters;
-                }
-
-                // Get audio information
-                string audio = string.Empty;
-                foreach (AudioTrack track in parsed.AudioTracks)
-                {
-                    if (audio != string.Empty)
-                        audio += ", " + EnumHelper<AudioEncoder>.GetDisplay(track.Encoder);
-                    else
-                        audio = EnumHelper<AudioEncoder>.GetDisplay(track.Encoder);
-                }
-
-                // found query is a global varible        
-                lbl_encodeStatus.Text = "Encoding ...";
-                lbl_source.Text = queue.QueueManager.LastProcessedJob.Source + "(Title: " + title + " Chapters: " + chapterlbl + ")";
-                lbl_dest.Text = queue.QueueManager.LastProcessedJob.Destination;
-                lbl_encodeOptions.Text = string.Format("Video: {0},  Audio: {1}\nx264 Options: {2}",
-                    EnumHelper<VideoEncoder>.GetDisplay(parsed.VideoEncoder),
-                    audio, 
-                    parsed.AdvancedEncoderOptions);
-
-            }
-            catch (Exception)
-            {
-                // Do Nothing
-            }
-        }
-
-        /* Right Click Menu */
-
-        /// <summary>
-        /// Handle the Move Up Menu Item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuUpClick(object sender, EventArgs e)
-        {
-            MoveUp();
-        }
-
-        /// <summary>
-        /// Handle the Move down Menu Item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuDownClick(object sender, EventArgs e)
-        {
-            MoveDown();
-        }
-
-        /// <summary>
-        /// Edit a job
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuEditClick(object sender, EventArgs e)
-        {
-            if (list_queue.SelectedIndices != null && list_queue.SelectedIndices.Count != 0)
-            {
-                lock (queue)
-                {
-                    lock (list_queue)
-                    {
-                        QueueTask index = list_queue.SelectedItems[0].Tag as QueueTask;
-                        mainWindow.RecievingJob(index);
-                        queue.QueueManager.Remove(index);
-                        RedrawQueue();
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Handle the delete Menu Item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuDeleteClick(object sender, EventArgs e)
-        {
-            DeleteSelectedItems();
-        }
-
-        /// <summary>
-        /// Clear down the Queue
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void mnuClearAll_Click(object sender, EventArgs e)
-        {
-            DialogResult result = MessageBox.Show(
-                        "Are you sure you wish to clear down the queue?",
-                        "Clear the Queue", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-            if (result == DialogResult.Yes)
-            {
-                queue.QueueManager.Clear();
-            }
-        }
-
-        /* Keyboard Shortcuts */
-
-        /// <summary>
-        /// Handle the delete keyboard press
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void ListQueueDeleteKey(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Delete && e.Modifiers == Keys.None)
-                DeleteSelectedItems();
-        }
-
-        /* Queue Management */
-
-        /// <summary>
-        /// Move items up in the queue
-        /// </summary>
-        private void MoveUp()
-        {
-            // If there are selected items and the first item is not selected
-            if (list_queue.SelectedIndices.Count > 0 && !list_queue.SelectedIndices.Contains(0))
-            {
-                // Copy the selected indices to preserve them during the movement
-                List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);
-                foreach (int selectedIndex in list_queue.SelectedIndices)
-                    selectedIndices.Add(selectedIndex);
-
-                // Move up each selected item
-                foreach (int selectedIndex in selectedIndices)
-                    queue.QueueManager.MoveUp(selectedIndex);
-
-                // Keep the selected item(s) selected, now moved up one index
-                foreach (int selectedIndex in selectedIndices)
-                    if (selectedIndex - 1 > -1) // Defensive programming: ensure index is good
-                        list_queue.Items[selectedIndex - 1].Selected = true;
-            }
-
-            list_queue.Select(); // Activate the control to show the selected items
-        }
-
-        /// <summary>
-        /// Move items down in the queue
-        /// </summary>
-        private void MoveDown()
-        {
-            // If there are selected items and the last item is not selected
-            if (list_queue.SelectedIndices.Count > 0 &&
-                !list_queue.SelectedIndices.Contains(list_queue.Items[list_queue.Items.Count - 1].Index))
-            {
-                // Copy the selected indices to preserve them during the movement
-                List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);
-                foreach (int selectedIndex in list_queue.SelectedIndices)
-                    selectedIndices.Add(selectedIndex);
-
-                // Reverse the indices to move the items down from last to first (preserves indices)
-                selectedIndices.Reverse();
-
-                // Move down each selected item
-                foreach (int selectedIndex in selectedIndices)
-                    queue.QueueManager.MoveDown(selectedIndex);
-
-                // Keep the selected item(s) selected, now moved down one index
-                foreach (int selectedIndex in selectedIndices)
-                    if (selectedIndex + 1 < list_queue.Items.Count) // Defensive programming: ensure index is good
-                        list_queue.Items[selectedIndex + 1].Selected = true;
-            }
-
-            list_queue.Select(); // Activate the control to show the selected items
-        }
-
-        /// <summary>
-        /// Delete the currently selected items on the queue
-        /// </summary>
-        private void DeleteSelectedItems()
-        {
-            // If there are selected items
-            if (list_queue.SelectedIndices.Count > 0)
-            {
-                // Remove each selected item
-                foreach (ListViewItem selectedIndex in this.list_queue.SelectedItems)
-                    queue.QueueManager.Remove((QueueTask)selectedIndex.Tag);
-
-                // Select the first item after deletion.
-                if (list_queue.Items.Count > 0)
-                    list_queue.Items[0].Selected = true;
-            }
-
-            list_queue.Select(); // Activate the control to show the selected items
-        }
-
-        /* Queue Import / Export features */
-
-        /// <summary>
-        /// Create a batch script
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuBatchClick(object sender, EventArgs e)
-        {
-            SaveFile.FileName = string.Empty;
-            SaveFile.Filter = "Batch|*.bat";
-            SaveFile.ShowDialog();
-            if (SaveFile.FileName != String.Empty)
-                queue.QueueManager.WriteBatchScriptToFile(SaveFile.FileName);
-        }
-
-        /// <summary>
-        /// Export Queue
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuExportClick(object sender, EventArgs e)
-        {
-            SaveFile.FileName = string.Empty;
-            SaveFile.Filter = "HandBrake Queue|*.queue";
-            SaveFile.ShowDialog();
-            if (SaveFile.FileName != String.Empty)
-                queue.QueueManager.BackupQueue(SaveFile.FileName);
-        }
-
-        /// <summary>
-        /// Import Queue
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void MnuImportClick(object sender, EventArgs e)
-        {
-            OpenFile.FileName = string.Empty;
-            OpenFile.ShowDialog();
-            if (OpenFile.FileName != String.Empty)
-                queue.QueueManager.RestoreQueue(OpenFile.FileName);
-        }
-
-        /* Overrides */
-
-        /// <summary>
-        /// Hide's the window when the user tries to "x" out of the window instead of closing it.
-        /// </summary>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            e.Cancel = true;
-            this.Hide();
-            base.OnClosing(e);
-        }
-
-        /// <summary>
-        /// Change the OnComplete option setting.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The EventArgs.
-        /// </param>
-        private void CompleteOptionChanged(object sender, EventArgs e)
-        {
-            userSettingService.SetUserSetting(ASUserSettingConstants.WhenCompleteAction, drp_completeOption.Text);
-        }
-
-        /// <summary>
-        /// Clear all completed items
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnuClearCompleted_Click(object sender, EventArgs e)
-        {
-            this.queue.QueueManager.ClearCompleted();
-        }
-
-        /// <summary>
-        /// Retry Job Menu Item
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void mnu_Retry_Click(object sender, EventArgs e)
-        {
-            if (list_queue.SelectedIndices.Count != 0)
-            {
-                lock (queue)
-                {
-                    lock (list_queue)
-                    {
-                        QueueTask index = list_queue.SelectedItems[0].Tag as QueueTask;
-
-                        try
-                        {
-                            queue.QueueManager.ResetJobStatusToWaiting(index);
-                        } 
-                        catch (Exception)
-                        {
-                            MessageBox.Show(
-                                "Can only retry a job if it is in an Error or Completed state.",
-                                "Notice",
-                                MessageBoxButtons.OK,
-                                MessageBoxIcon.Information);
-                        }
-                        RedrawQueue();
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/frmQueue.resx Deleted

@@ -1,536 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <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" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </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>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>114, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
-        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
-        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
-        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
-        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
-        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
-        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
-        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
-        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
-        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <metadata name="SaveFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>219, 17</value>
-  </metadata>
-  <metadata name="mnu_queue.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>530, 17</value>
-  </metadata>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>414, 17</value>
-  </metadata>
-  <metadata name="OpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>314, 17</value>
-  </metadata>
-  <metadata name="splitContainer1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
-        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA
-        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA
-        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg
-        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg
-        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg
-        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg
-        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA
-        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4
-        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4
-        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA
-        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI
-        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg
-        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY
-        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ
-        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI
-        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw
-        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY
-        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg
-        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em
-        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x
-        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA
-        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA
-        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv
-        fMVucG2B4MYAAAAAAAAAAAAAAAAAAAAAAAAAAAChsqMAAAAAe3VkyHF5kW59cN3eZc/XyXutyot7AAAA
-        AAAAAAAAAAAAAAAAAAAAAACjIKEAAACgfv94gX+PituLDI0/aoBxqxqOY8PgbQAAAAAAAAAAAAAAAAAA
-        AAAAAAChkAwAAACieap4k3CVZIB/apWlxNTgepXbf4caagAAAAAAAAAAAAAAAAAAAAAAAAChkJ0AAABc
-        es1kxaLVl5eNkqnebHp6eK20amSvxlsAAAAAAAAAAAAAAAAAAAAAAACjlqMAAABcY5VurYBlfcuUgciB
-        fWSRxceHepPbgAAAAAAAAAAAAAAAAAAAAAAAAACJsqMAAACdeWOIgMeXbcN+35esZdeAedtxxYG0q54A
-        AAAAAAAAAAAAAAAAAAAAAKGyshJbAAD/ZGNp2LGUi9caennJh+DYi2Rx1J6LipMAAAAAAAAAAAAAAAAA
-        AAAAAKNvEqa9AACGccdxe3Jw1KmBioqAkm1pi5ezkofQq7BcAAAAAAAAAAAAAAAAvaUIPEI+QkI+esFc
-        asenr9X9bt6zqoDPsYeX1X7gq2SOfhrAAAAAAAAAAAAAAGJlQ+Mq4+PjKioqREOxS4aI3nJueox6eN7e
-        ktWO3WV4ybHb38NiAAAAAAAAAABcSxws4+MtZi3j4+Pj4+MNQzhszH1kjmp72Hnfen+OgHxtgXyXZXLG
-        AAAAAAAAAADNLCxYLWZmZmYtZi3jLS0UAUM4o4bYs4+BqYFjcH2Xl86UjpNqjJOtAAAAAAAAAM1DDWYt
-        U1Bm4eFmZmYtZuHaFEMpx63MiKR+25WPsX+NcNa0eLNpeZN5AAAAAAAAFWYNQ2ZmUF5m4V7hZmbhZuFe
-        a0sI/4aOampq1XIbzd0/bGVy4mVw0xtpAAAAAAAANywNZlNQ2l7a2l7aUOFT2tpeBMg7xTZyZWTXfaDV
-        l7SUfo5lZXDIZMpbAAAAAAAA2w2y2l5eXl5eXl5eXtraXl5eXl5reyw2jXHIZZFuj+J9sa/iaWWX4GwA
-        AAAAAAAAUA2WXl5eXl5ra2trXl5eXl5eBMU5Cws2aZU/2HHN4sptleKUbnIbcs4AAAAAAACDa1myBP7+
-        /v4EBAQ0///+NAQ0PQsLPWNppXqNY5eX4o+z2KWop9ulG8kAAAAAAAAA/BwNBAQ3Lh832tra0gg0NzSl
-        Cwul/ASGcM2zfXySiJTN23LLtLGNGwAAAAAAAAAAvTcNUdo0LjTa2tprNDzHBDekCxz8BP4Axty0G39x
-        sWW039gbGxvK+wAAAAAAAAAAW1umlvwnCcAENzQ3/giqNMe8pT0EXmAAAHZ8eZeK4G0blaE2ozXxYQAA
-        AAAAAAAAAAAAIG0lCWGj+gAAAMYIXF1bAMhL/FwAAAAAW9Xg4tN3menrvvf2t/EAAAAAAAAAAAAA/WkO
-        umB3vwBgAHNLYlsAAMI8QjgAAAAAAABg+Ofr6xj3vr6bmea3AAAAAAAAAAAAALUuaAANiQAAALU8xlw2
-        bFzBKkLBAAAAAADm9haa9773uZqZ7wAAAAAAAAAAAAAA/zc081uJEgBbW1zSCHYLHADBQjycAAAAAGH2
-        vru5FpoW95nnmABgAAAAAAAAAAAVUFNTN1tidQyhoAzGPAB3bcY8PsMAAAAAAObwgua5FrubEZu5F4IA
-        AAAAAAAAwJ68NzfaNwAAAAAAAABbPMgAxjg4AAAAAAAAAAAAt+e5vpuavhbp6GcAAAAAAACi2dPZ2dnR
-        hQAAAAAAAAAACM0AAAAAAAAAAAAAAAAAAOmam/K7ufbwmGdbXwAAAACk2dFt2c7Ry9NpAAAAAAAA7rjk
-        uOTuAAAAAAAAAAAA8euZ6bnpmpmCAAAAAAAAAADKLLI5DQ09xM7ZhgAAAGEj7Afs6gfquOQAAAAAAADw
-        6ZhnE5no6JmZZwAAAAAAAAAAwzlvErIFlhyiYgAAAOXqMeoxI+oHB4IAAAAAYGcTtwCY6LeY54K55QAA
-        AAAAAAAAAB8nCTYSPRzEAAAAXyMHIyO4YWEAAAAAAAAAAAAAAACYYQBnmABntwAAAAAAAAAAAAAOJQAA
-        AAAAAAAAALa4XAD/xgAAAAAAAAAAAAAAAFsAAAAAt10AAAAAAAAAAAAAAARBOgAAAAAAAAAAAAAAAAAI
-        PAAAAAAAAAAAAAAAAFsAAAAAgmEAAAAAAAAAAAAAAEFZUf4AAAAAAAAAAAAAAADCCAAAAAAAAAAAAAAA
-        AAAAAAAAWwAAAAAAAAAAAAAAADpROoMAAAAAAAAAAAAAAAAAnGIAAAAAAAAAAAAAAAAAAAAAAFsAAAAA
-        AAAAAAAAAAD+YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFxbAAAAAAD///////8AAP//
-        /////wAA//4/////AAD/wAPgA/8AAP+AAAAA/wAA/wAAAAB/AAD/gAAAAD8AAP/AAAAAPwAA//AGAAA/
-        AAD//BwAAD8AAP/+PAAAHwAA//48AAAfAAD//jgAAA8AAP/+OAAADwAA//44AAAHAAD//jgAAAcAAP/8
-        OAAABwAA//wYAAADAAD/+BgAAAMAAP/AAAAAAwAA/wAAAAADAAD8AAAAAAMAAPwAAAAAAwAA+AAAAAAD
-        AADwAAAAAAMAAPAAAAAAAwAA8AAAAAADAADwAAAAAAcAAOAAAAAABwAA8AAAAAAPAADwAAAQAA8AAPAA
-        ABgADwAA+AAAHgAHAAD8AAAfgAMAAP4QAA+ADwAA/gAADgADAAD8AAAfAAMAAPAfxD/ABwAA4B/n/+AB
-        AADgB+B/wB8AAOADgB+ADwAA8AOAHhAPAAD4BwB/8kcAAPz/gf/nLwAA+P/5/+8/AADwf/n//z8AAPh/
-        /P//vwAA+P////+fAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAP//
-        /wAAAP8AAP//AAAAgACAgIAAgAAAAACAAAAAgIAAgIAAAECg4ABAgKAAYOAgAEDgQAAAIAAAACAgACAg
-        IABgIIAAIAAAACBAAAAAYAAAIIAAAGAgIABAYGAAAACgAGCAoACgoKAA4ODgAGDAAAAAACAAYABgAIAg
-        YAAAYMAAICAAACBgAABgYAAAQKAAAKDAAAAA4AAAYOAAAABAIAAgQCAAYAAgACBAQABgYEAAIABgACAg
-        YAAgQGAAYGBgACBggABgYIAAgACgAKCAoABgIMAAQKDAAGCgwAAgwMAAAADgAIDA4ACgwOAAAODgAIDg
-        4ACA4AAAgIAgAEDgIACgACAAQABgAIAggAAgYP8AAKD/AAgIAAAICAgACAAAABhAWAAoUGAAaGhoADBg
-        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ
-        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ
-        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4
-        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY
-        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ
-        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA
-        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4
-        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI
-        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg
-        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI
-        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY
-        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE
-        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm
-        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j
-        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA
-        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI
-        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA
-        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA
-        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4
-        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2
-        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o
-        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4
-        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f
-        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A
-        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z
-        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA
-        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA
-        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA
-        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9
-        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl
-        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g
-        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S
-        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2
-        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx
-        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz
-        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl
-        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto
-        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6
-        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP
-        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//
-        /wBWAAAA/f//AFcAAAD8//8AWAAAAPz//wBZAAAA/P//AFoAAAD9//8AWwAAAP7//wBcAAAA////AF4A
-        AAABAAAAXwAAAAEAAABgAAAAAQAAAGEAAAABAAAAYgAAAAEAAAB3IFIAbWFuAAAAAAAAAAAAAAAAAAAA
-        AAC0VWMAtFVjALwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAEAAAAAADgDAACfAQAAPwAAAAEA
-        AABAAAAAAQAAAEEAAAABAAAAQgAAAAEAAABFAAAA////AEYAAAD+//8ARwAAAP3//wBIAAAA/P//AEkA
-        AAD8//8ASgAAAPz//wBLAAAA/f//AEwAAAD///8ATQAAAAMAAABOAAAABwAAAE8AAAALAAAAUAAAABAA
-        AABRAAAAFQAAAFIAAAAZAAAAUwAAABwAAABUAAAAHgAAAFUAAAAeAAAAVgAAAB0AAABXAAAAGgAAAFgA
-        AAAWAAAAWQAAABIAAABaAAAADQAAAFsAAAAIAAAAXAAAAAQAAABeAAAA/v//AF8AAAD8//8AAAAAAAAA
-        AAAAAAAAAAAAAAAAAI2Oj5CRkpOUlZYAAAAAAACCg4SFhoeIiYqLjAAAAAAAAAB6AHt8fX5/gIEAAAAA
-        AAAAcQByc3R1dnd4eQAAAAAAAGgAaWprbG1ub3AAAAAAXF1eX2BhYmNkZWZnAAAAT1BRUlNUVVZXWFla
-        WwAAQUJDREVGR0hJSktMTU4AADM0NTY3ODk6Ozw9Pj9AAAAAJygpKissLQAuLzAxMgAAABwdHh8gISIA
-        ACMkJSYAABITFAAAFRYXAAAYGRobAAAHCAkKAAsMDQAADg8QEQAAAAMAAAAEBQAAAAAABgAAAAACAAAA
-        AAAAAAAAAAAAAP//AADgBwAA4AMAAPoDAAD6AQAA+gEAAOABAADAAQAAgAEAAIABAADAQQAAwGEAAIxh
-        AACEYQAA3PsAAN//AAAoAAAAMAAAAGAAAAABACAAAAAAAIAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAGAAAACAAA
-        AAcAAAAHAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxIOAwgFBAEOAQAAEgAA
-        ABgAAAAbAAAAHQAAAB0AAAAcAQEAGQAAABYAAAAQAAAADQAAAAwAAAAKAAAACgAAAAsAAAAQAAAAFwMH
-        CRwBAgMhAAMEIwEEBSUAAgMmAQICIwEBAR8AAAAYAAAAEQAAAAkAAAADAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQICAAgBAgATAQEBIAcI
-        CCwFBgc2BQUGQAYGBkgGBgVOBAQEVQUFBVUEBARTAQICTQcHB0UGBgY+BwcHNgICAi4AAAAoAAAAJAAA
-        ACcBAgIsAAABKQAAADAAAAA7AAAARwAAAE0BAABOAAAATAAAAEgAAAJCAQUHOAEAACwAAAAeAAAAEgAA
-        AAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGRIMEgAA
-        AB8AAAAxAAAAOwAAAFUAAAB2AAAAjQAAAKgAAAC1AAAAsQAAALIAAACrAAAAmQAAAIcAAABuAAAAWgAA
-        AEoAAABAAAAAQQABAzwAAAA8AAAAfA4eJZoGDA/AEx8m2A8YHNoSFxjaEBgbxwcAAJgDAACDAAAAagAA
-        AFUAAABHAAAAMwAAACAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAQBQMCIAAAADMBAABMEA4Nkjc2Ndh9e3r4kI+P/J+fn/+IiIn/b29v/3Jycv9xcnL/Xlxb+0lK
-        SvJGRkbaUVBQzBoaGqIAAAB4AAAAUwEAAF4MCwu/G1Fw/xtTdf8iQVD/ImCB/xtXdv8YN0n/HE1s/x46
-        S/8QIy35EiUw4QoDAKMAAABwAAAAXAIAAEIAAAArAAAAGAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAIwUFBjIAAABkQ0ND/46Ojv9/gID8hoaG/YmJif1ycnL8YWJh/VVV
-        Vf1bW1v+ZGVl/nNzc/94eHj/np+f/7Ozs/9HSEn6AAECmR41QuYaP1L/KW2V+xZbh/spVm38Gi85/B1X
-        dPwpQE78H2OO/CZoj/0eSmP+Dz1a/w8oN/0AAACtAAABdgAAAGAAAABEAAAAKwAAABcAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAMAAAAGwEBAC4AAAA9Dg0LtDUzMv9nZ2b/bm5u/oWF
-        hfu7u7v9v7+//qioqP5xcXH+cnJy/nl5efuQkJD6cXFx/FBQUP8kJCLuAwAAvyJpj/8mdJ77FRsd/ipp
-        iv4sW3L+KFNs/hZLbf4kOUb/HDlJ/htae/4XKjX+KF17/DCTxf4jPEj5AQAAyQUEBHEAAABRAAAAOgAA
-        ACIAAAAPAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAACgAAABgAAAAlAAAANhMQ
-        DoYqKCfbVVNT/zIxMf+Li4v/4uPi/qurq/99fX3+fX19/2FhYf+UlZX/fHt8/zIzNNEFAQCqHjdF8yNZ
-        dvwkUGj+Hk1q/y9adP8hKi3/IERa/xhah/8kdKT/IGOG/xEwQP4lUWj/MlVo/zJmfP4hNT3+Ey88/wkV
-        G9MAAABZAAIDPAAAACYAAAATAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAJAAAAEQAAABAAAAAlAAAAUAAAAH4TExPdtbW1/qysrPx+fn7+QUBA9RUUE48AAABzSFNQRQAA
-        AEseOkvoI2iW/yArMf0TM0P/G2SS/h5VeP41XXH/J1d0/h0+UP8rYXz/NISq/zxrf/8hXH/+FFB4/ixt
-        jP8oSFn+IWKJ+w0iK/8DBAScAAMFOQAAASEAAAARAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAABMREANaW1oDDQsJAQcICAAEAwNqdHR0/8PDxPhmZmf/DAwMmHt6
-        egAiLzUAbImSABsgIZQoc5z/G0hn+iNQaP8fU27+Jm+W/zFwkP8qXXv/GUJc/y9QXv8papD/MFZq/xca
-        Gv8zfKD/KH6q/zSMtv4sUmj/G2WX+ydxlf4aPE3MAAAAHAoYHxcAAAAIMSgjAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAQEAAgIBAgAAAAMAAAArSEhI+8TE
-        xP1LTEz7AAAAMwAAAAIbLDUHJj9NABAVGK8oYHz+F0BV+xxkkv4kapr/Jkte/yA1Pv8veJv/KWmH/zRo
-        g/8TTXb/ImyW/ydVaf8ZMkP/Klx4/zFmfv8nQ07+L4ex/jap4P0WNUP1AAAAUgAAAQAAAAACfmteAAoJ
-        CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrr
-        6gD+/v4ELzAw0rS0tP8xMTHkAgECDl5eXgARBwEADwcBLiZRZ/EOGBz+H2KH/RM/W/8eYpH/LU9f/yZk
-        jf8kWHf/MlRh/zFmf/8mg7r/K43C/zZviP8VSG//G2KR/x1FV/8mU2z/LWGE/y5LV/0jWXL+K1Rm9ggA
-        AEofEA4AJx8aAQoFAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAKSlpQGvsLAAMDExqJubm/4oJya3eHp7AGRsbwUrRVEAHSYpkClqjP8KJzf6GEpk/yeB
-        r/8sdZz/OGV6/xVMbv8icKP/I1Zt/x0cHP83YHD/OpC2/zNjef8idaT/IGmP/yJcdf8kWn//FlSA/iM6
-        Rv8RKjb8Oqnb/yRCUOMnHBgMIBsYAAgBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAENDQwJFRUUALi4uh42Ojv8cHR6hRkhJAEFVXgWh3uQAHy0zuiZL
-        Xv4YVXv7F0Ri/iR6ov80aYH/MYCl/xxijP8hcqb/MXma/y5edv82hK3/MU9b/yUtMv8eZof/M6vj/x9O
-        Yv8ufqf/IXOh/y90lf4XP1T+IV+A/C1hef8AAAI7AAECAA4REQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKampgGysrIALS4uopGRkf4VFRWhNTc5ACQm
-        JwYsIBcADAQBqh9Sbf8TSGr7H16H/xsyPP8iMjn/MW+L/zCazf81ndH/OV5t/yVwnP8TUnv/MY28/yM5
-        Qf8iU23/HlFp/xhIXv8pZoH/Oa/l/zBjev8cXYX+IGaZ+Ro2RP4IBQZgCQYGAAwMCwMbEgwAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAAAAAG5ubgDIyMgIPTw83KWl
-        pv80MzPEw8TFAXt7egQBAAAACAQDZx84Rv8tfaj7JFp1/ydef/8reKf/NG2I/y9UZP83TFX/NoGj/yR9
-        sv8QOVr/K4Ox/zRVZf8eXIX/JmeR/xgyPf8UO07/Gz5O/yBQZv8hdKH/JHKj+iZ8pv4AAACbAgoOAAYT
-        GgIQCgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCgkAERAPBAAA
-        AAAAAABWZ2Zm/7Ozs/46OzvvCwsLFrq9vwEuQT8AGRscdypNX/8kOkT7J0hW/yV5qf8LME//NZ/X/yVE
-        Uf8UJzH/KWmG/zCXyf8zmNH/K2B4/ztwiv8ZYI7/J3al/yVOYv8gcp7/IWqT/w4vPv8og67+Nq/o/R1c
-        ef4JGyPuCQ4SHQYDBAAIBAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAQNEBABHSIjACAkJQovLi7YwcDA/bS0tPpeXl7/CQkJZAAAAADA9f8CCR4txhxeif8cOEX7JTpD/zdz
-        kP8lhbX/NoCj/yRWbv8bZI7/Hl6D/yJPZP8kUWT/HEda/x9BT/89q+D/NXKN/yNZc/8bXYn/HmKQ/x9l
-        if8JGB//H1lz/hlVcPwldpz/AQAAZQEAAAAECgwHAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA
-        AAH/AAEDERgdAAAAAAAKAAABAAAANwAAAKw1ODr/cnR1/F1fYf1OUVP9FRMT6wkAAEA+eaMAFCAnqyFk
-        j/8TO1L7H2OP/y1PZ/84eZb/K2V//yBliP8YUHX/Jnyx/xpTbv8ZUnD/JXyn/yVzmP8lQk7/KDY8/xxW
-        cv8wnNL/L5LH/yRxlf8XPVH/JlFv/iFadvonf6j+BQECgwYFBQAMFBoIAAAAAAAAAAAAAAAAAAAAAABs
-        ogACAAAAAAIDA/8CAgCBAAAAAAAAJBQRFGstTlnBBnOK/wCYtv8ArtX9AKLM/wCkz/8ArNX+CJa6/x5Y
-        aPwAJS6sBwICty1gff8VO1D8Fkdn/x1uof8xbIj/HSMm/yRbdf8rkMT/LZPF/xtbd/8ne6v/F0lz/yqH
-        t/8XPEz/M57V/zBui/8maIb/NKvi/x9cef8dX4f/GlmE/ytkhPsfYHz/CBslmhVIYQAMICoIAAAAAAAA
-        AAAAAAAAJNT/AABilAACAAECAgABAAQAABcADRSWPHWH9Fu00P8dxPT/BNT//RG8//wOvf//B9D//gHX
-        //4C0///BNb//SrU//5tzO//L5Kr/wNBU/8XIyr/KElb/yuOv/84eZb/J1Z0/yROZ/8lWXL/GlFq/xtL
-        Yf8qjb//K4zE/yd0mf8vb47/GViE/ymDtv81b4r/GUlg/yBEU/8rhrX/IXKh/jiVwvwbKzP/AgwRxxeB
-        tgEHGyUFAAAAAAAAAAADBgoAJ+b/AAA6VwEAAAAACAAAUwBBVuBbr8z/ddn//w66//sVnfn9JJD0/jps
-        9f4jkvT+EK/2/xan9/8Psvn+D7P4/wmm9f4luP38xOX//WnG7v8AUHb+HjVB/yFKXv8xVWX/HV2F/xZX
-        gv8yXnT/J1Jn/zNwkv8kTWD/LZjJ/yFRaP8udZn/GFmB/yZ5p/8nVWv/ID9O/y6BsP8qVmr/MZ/S/zZx
-        i/09eJP/GzZC8gAAABwJAgAAAAAAAAAAAAAAAAAABSAtAQE0TgAKAQE7AEty/2/P//+Bz//6B6D0/TCA
-        +P48cvn+O2z5/jtw+v87dvv/LIP1/ztt9/8lj/b/HJz4/i+J+P8XiPb+ZY32/vnv//9lyf/+AGeR/zI7
-        PP8bIyb/NG+N/zSUxP83aH3/KoCt/xZPev8sgbL/HThE/zJngP8yW2z/Mp3Q/zCf1P81Wmr/OYGo/xVW
-        g/8sdJ3/LWJ5/ytbcf0neqD/KmN/9QAAACIAAAAAAAAAAAYFBwAAAAAABBkqAQggKxIAS3DeUsb//s3M
-        +vsrefP/Lob8/ilE1v4ULbz/PXr//zRm8f8vXun/PnL9/zls9/82c/f/L4b6/0Bz//8uU9//ESq7/2+O
-        8v+Qo/D/IHPN/xc0Tf8nYYT/Ikpf/ypJVv8oPEX/LGuM/x5wov8tfaj/OWyD/ymFtP8vdJf/NV5u/zFl
-        fP89cIf/O7Lv/xdEX/8vk8b/KDtC/yxQX/0mdpz/KVFi6WJRShIAAAAAAAAAAAYFBgAyWHQCD0h0AAIH
-        Ioc6fOD/4ev/+3ma+f8uZ/r+RoD//xYuvf8AAJP/OXL5/yxV4P8DCZr/MWbv/z15//87cvv/MVzp/zdx
-        +P8sWOH/AACV/wAAiP8ANF3/AnSB/wUmOf8VHiv/GlyB/zBid/8yY3z/L2F5/y5xkP86epb/RYyw/xJG
-        bP8rgrb/Q5zE/x82Qf80a4f/O3mV/0G17P82cIn/LWOE/z9nffxNjan/JjtCwqHT5gBhf4oGAAAAAAYE
-        AwAvS0wAE1NlFwwsd++PrP/91dbz/Txx9P4lUd7/FCu5/wwYrf8AAJX/Bw6l/wkTqP8AAJH/Chaq/xUt
-        u/8vX+j/HT3J/wcPoP8KFqn/AACg/wIBZP8MPFr/Enyp/wEuQf9CW1T/NHaW/zxxiP8lYob/G2KQ/zFX
-        af8eJCX/MHGP/zOb0/80q+n/O4Cf/yRlif8XVn3/PG2J/ztvhP8zZoH/Ez1d/iJhh/stSFT+BgcHeAoa
-        IAAFBwcHAAAAAAkVLgIAAAAAAAAAOSNTuv/C1//9oKDd/gUNov4CBJr/AACQ/wAAlf8AAJr/AACZ/wAA
-        mP8AAJ7/AACb/wAAkv8FDKH/DRus/wAAkf8AAJT/AACY/wECp/8CAKL/CgiI/y1Ja/+V6uX/PVxf/zNd
-        cf8eZ47/EkBd/ztwiv8sao7/J1l2/zhofP9Jrtn/L1ls/yyHu/8cZpf/PrDp/yU4P/83cIr/MpzT/jqq
-        4/sgNj//AwMEZgMAAAAGBgUHAAAAAAAEJwIAAQgAAAEDQRIrof7I2f38l5rd/QAAmP8AAKP/AACd/wAA
-        oP8AAJf/AQGJ/wEBi/8AAIr/AACL/wAAlP8AAJr/AACb/wAAof8AAKX/AACc/wAAYf8XJk7/UIOF/p77
-        +P+g/Pj+OlhZ/iQ4Q/41gqb+QZ7K/jl0kf8iZpP/E0lr/0Cx6P80SlT/JT5K/zB/pP9Dwfb/OX6e/yta
-        ef87dZn+SY2r/Td3lPw1V2T8BAMDSgUFAwALDQ0FAAAAAAQCNAMFBCkACAcXVQAAhf6zuvP6rbLl/QAA
-        cv8EA1D+BwlD/xoBLf8aBDX/Dw1r/w0LZf8QDmT/FhBX/wcjO/8BFUP/CgRF/wgIV/8EA2L/CxJJ/2Og
-        lf+a+vD/q////3W3sf8iOUf+LDVB/jFTYPwhUW3/Ol5y/h45Rv4vmM//NpvR/0G79v82aYD/NZLD/zJw
-        lf8uTFj/Mltv/xdIav4hcKH/MU1a+kCJqv8aRVi+JFlxACtPXwEAAAAAAAAAAAICHgIBARMAAAAUPwIB
-        Q/52ebj72OD5/QcHdf0CAYT9BhV3/pgEAP9RDCj+FRqM/yYdkP8GB6f+GQmP/xRncv4CmIf+HQZS/xMW
-        h/4QB1r/OldT/6r///+V8/X/ME1J/gAARP8AAIT+Gxwm/zNpgP8ORG37NIrA/jJZaf8oVmv+LXKR/iVK
-        Wv83fZ7/E0Zn/x9vov85dpL/NkxT/zqs5f8zh7T9OGR1/kCMr/g/Ozk5Q0lLACAzOwIAAAAAAAAAAAAA
-        AAAHCAYAUlQJBxIPD+AeG3X/wMbw/0ZIvP8PCpr/JyBV/6EAAv4qE1P/CQuy/xUQwv8KCbL/DQiO/hYZ
-        T/8Atar/GSVS/xAJff8gF4T+LDdK/qL//v52wLn/AAA2/gEDYv8CBE37AAAATRs2Qb8weKH/Obbt/z+F
-        pfsvdJv+HGiU/zWJs/41bYX/Na3o/y+Wyv88d4//Royw/0N8nf5CfZz8L0tX+RYfI4xXVFsZRD9FAwAA
-        AAAAAAAAAAAAAAAAAAAMDAwCJCUQAAoLCHMKCQffS05etpedu9MICyrpQA8X+YoAAP4NFzH6FhB++xcT
-        c/ocF177GRlt/BwGR/sAfnr9D2Rt/x4LR/4gH17/DwcV/zRYVv9wppf+BQBc+wAAl/4AAxGxAAFhAGgA
-        ABEcGhyXK1hn6yRMXv8xmM7+F05y+jOj3/0nQ03/SYen/jyDs/4qLTL/M2dj/zlMKv1AbDf+IToL3gEH
-        AG4bXAARLGsAAAEDAgIBAAEAAAAAAAAAAAAAAAAAAAAEAQQDBAkDAwOmAAAArJWcspIoR0ueRwAA7nAA
-        AP8ABgDPRUEqxCkpGckAAADVAAIA2gAAANcAQkL5AHl4/gYAAMgECQCsCgwJrwAAAOgIS1X/AkVd+gIK
-        Nf8LAABoEQsKAB4YGwAHAAAAAAAAGggFBnwwcZD9OabY/z+y6P9BZoD+OVND/ydMGP8icQD/LJoC/y+u
-        Gv0pnBP+G24V1QoeA2gcPQZQDhIJJgEAAgABAAEDAAAAAAAAAAAAAAAABgYFAQsLCwANDQ0kAgICwiEi
-        K8EnMkLGPQAC/iEMDN0BAwWPS0pQixsbH5EAAAKWAgMGngMCA5sCCAjJAFBQ/wkND+IKCQvEAAAArAAA
-        AKIFISrbAZmv/wDH2vsDXnLyCAsKPQ8YGAAEIScFFRQQABEAAAADAAApAQMOcQ8SHakgSRD+LY8G/i6S
-        AP4zqQn/MZEN/zCZGv8ylxv/M4kO/yNSAf8WLQD/Dh0BpgAAATEBAAACAAAAAAAAAAAAAAAACAcIAAkJ
-        BAEDAwQAAwMCFwIBAMARAADKmAAA/xQMC5IAAABJ4uHgXGpqaVwAAABcAgMDXgADA1MQAQGBA5qa+wBD
-        Q9AKAQGyQWpq/yI4OOAFAADIAiAo7QDX//sAwO3/AyUsgAQ1QAAFUmQDFw4HAQ8AAAUOIggsHjEAgCZ6
-        Ddkwux/9MnwE/TGREP4wnhT/MJoP/zFjAP4udQD8I1AA/REVBKgWHQc0GicKIgAAAAYAAAAAAAAAAAwT
-        GgAHDxYABQUGAQkIEAUFAQAFDAoGKwUQOtQFGGL+GxNB/w8UErkMDAqFbm9wfGJiYmwEBARrCgoKawgL
-        DGkOAABrDmxs9gB5efUfGxvrsP///2qqqv0AAACRAyEoqgDN+/wDl7j/CRYWUgsWGAADHSQEAAAAAAAA
-        AF0DBgD4JW4U/ymvJv8tfQf/LmoA/zGvIf4weQT/MMIp/zGWE/8rWwD+GEYA/REzA/UAAAKjAQAGWggG
-        BjUKCAcAAAAAAA0VHQAIDxcAAAAAAAMPPAAEDTYAAgYbkQArw/8AOe75ADnr/gEWYv8GBgWfCgwQfBMU
-        FJwdHh+tJSYnrh4oKbAcHyCpDjc31ACdnv0BAAC+QE9O/CxJS/8AOETLAaC+/wGlx/8MLTWeF3d3ARNM
-        XAIAAAAAAAAAAAAAABURLAFbDjUIXAkQAKkYMwDyK2IA/DG2Jv4vfgn/MI8N/jDXN/4tiA7+LmEA/CRF
-        A/wIDwHVBAMBngkOAj8JBwYAAAAAAAwTGgAECQ0AAAAAHwsTKGsJDyJbDQwQmwold/0AHpD7ACCv/QAa
-        df0HAwQ1BwEAAAAAAAcAAAAHAAAACAgIBwsICgoHBQYFUQGVk/8ASkh3AG1pPwA2OaUBbYDfAWZ6yAEB
-        A2YAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAANGwAAER8AKxEkAG0XRwWpL20A/jGmHvwwhxH/MHEA/zGX
-        F/8txy3+JHoG/xxNAf0IGAKPAAADNgQACAQCAQEAAAAAARopNwASIjACIC05yVZ0kP9KZHz/UWyH/1t4
-        jf9adYr8PlVu/w8VHeMAAAAaAAAAACEaEwAAAAEABgwOAAwBAAAKAAAABwAADAJwc+0BXGXeA5moFQB4
-        hi8AAAACAAAAAAADAAAAAwIADQAAAA0AAAAAAAAACwgIAAAAAAAZPgIICRUDFAAABSAkdALsM30A/S+I
-        E/4wdwr+MYMA/jJuAP0ldA39DjgS1xExAuAHHADrCQUHvQgCC30HBQUtBAMDBQAAAAAAAAAhKjlG+Vt4
-        kfpDWG36KzxM/VNyj/89U2r+RmB3/jZKW/lJY3vgKTZEuRIQECoUFhgACg8RAyAAIAABAAMIABcASAYR
-        CeEBQgn/BSwA5ABEAP0BLAPEAhIGnwIAAh8DAAINEwAMACQCGAAAAAAAIRkXABgdDQJHcxIADAAQDhc1
-        BtYwmwD/LF0A/yZvBfwybwH+KnoA/y10AP4rVQD/CA0CpSx5AQ4teAAdBwAGPwQFADwAAAAPAwEBAzRH
-        VwA7XWAXM0VT567W9P+2xdf4XnCA/sjd7/652vv+epWr/h8oL/89Umf/YoWn/xciLI8uQ1UAJTc/BgcA
-        BAUDDAKDAWAA/wDJAP4AgwD+AMsD/wCQAv8AhwD/AJQA/gE6AfcEKgNpBjIEAAgiBQMAAAAAHhYVACxr
-        CwAAABIrFDgF0SN2AP8SPQDQCRQAuiFtAPMpWQD+GlAA/BxVAO8qVQDzIVIA/wYaAmUOMQMACBgDAAYF
-        AgAAAAAABQMCACg2QQIlODsACBIbTxoqM/RYcH7/dnR0/2daV/61ur//g4GB/6CnsvyApMT7Hys2/wkM
-        D1gLDRIADxoRAQ4ACQkFMgPgAJMA+gCrAPgAlgD8AKMA/QBeAf0AkwP/AIAD/wZxBOQDEgJRARAAAAAN
-        AAISDQ0BCQIJAAMACFkMGgTYHWQA4QgeAXwAAAAjDzUAmBlRAv8PHgCuEjsAxxRLAM8PEgBcLmkA/xAt
-        APoABQI7Ag0DAAQDAwMAAAAAAwAAAGiNrAAAAAABCxMbACIAAC1UIiyVSyco8YAAAP5MWmT7V2Bv/4ii
-        wP91mrf+ISs0yAAAABURIBcBAgIAAAkABlMEVAP8AIIA/wBWA/8AUAP/ADYA/QAMAP8BCgDnAAAAeRlj
-        EgwJPgYABgAEAAAwAABXQj8AAAAAAAAOABYAAAAUAQADBQUEAwAJFAISDzUB9wAOAIIGCwA8CRoBchA1
-        Af4AAAAYChgAYBEiAdUBAAKvAgAEMwUEAwACAQEDAAAAAENabQAAAAAAAwAAAlIIBQBvAAAlKQAA508B
-        AO0AAAAxAAAAMgAAAEIAAAAyAAAAAgQFBgAWIhkBCQAGAAAEADcAGwBzATwBjQkBAK0CAADIATA0/wQ3
-        Or0VmJwUBLCzAAAAAAAQVwoBBAQCAAAYAAAyJiQAAQABAAAAAAADAwIAEBIKAAwNBwAKCgWKBAQDqDkq
-        JwMACgARETQGIwokAf8FBwNlAgMCAAAAAFQAAgA2AAMACQAAAAAKBwcAAAAAAAAAAAABAAAAAgICAAAC
-        ACAcA23yYBTX/zcMmPsNBxFLFgkmABwKMwAAAAAAAAAAAAAAAAAVIxkACgAHAAEEAQAAKwAAAdMBABHn
-        8gAJ19YFA3Jy5wGhodMA+/kAAtXUAgAdAAAOUAkAAwQCAAAAAAAAAAAAAAAAAAAAAAATDw0CEAwLAAoH
-        ByUHBQWnVUU8BRANCwABDwACEEkDAAQNAcsCBgGhAwsBAgECAAIAAAA7AAAACQAAAAAAAAAAAAAAAAAA
-        AAAPCRECCgAWAAMAAFVfDdn/rH7/+IhI//8cAEmtRAC1AkgIpwYDAwMCAAAAAAAAAAAKCwcADQMJAAcF
-        BQEBCgEDAP8AAwZbWQUGeXgACCwrggF+f/8CAAA6AwAAAAQFBAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAAAAAAADwAAAAbBQQDAAAAAAEKCQcCBAAEAAYEBGIEBAPJAwICAAAAAAAAAAAKAAAAFAAA
-        AAAAAAAAAAAAAAAAAAAJBQoBBwQPAAQCByc7B43pfDbo/E8bp/kFAhJiDwM2ABwFQAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAEGAAAABAAAGwQaGdkEFBNWBRwcAAUNDQIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAABAQEAAAAAAAAAAAAAAAAADAoJAAAAAAAeGBQABgcEAAYFBAcGBQSpAQAAIgEB
-        AQAEAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAOCA8AGwszABcHLQABAQJ8HQBT4gAABbUAHAAAAH4AAAA4
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAAFQwJAAoAABgBAAAMAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAdFhMACQcGAwgG
-        BQAFBANhBgUEUQgGBQAKCAYDAAAAAQAAAAAAAAAA////////AAD///////8AAP/+P////wAA/8AD4AP/
-        AAD/gAAAAP8AAP8AAAAAfwAA/4AAAAA/AAD/wAAAAD8AAP/wBgAAPwAA//wcAAA/AAD//jwAAB8AAP/+
-        PAAAHwAA//44AAAPAAD//jgAAA8AAP/+OAAABwAA//44AAAHAAD//DgAAAcAAP/8GAAAAwAA//gYAAAD
-        AAD/wAAAAAMAAP8AAAAAAwAA/AAAAAADAAD8AAAAAAMAAPgAAAAAAwAA8AAAAAADAADwAAAAAAMAAPAA
-        AAAAAwAA8AAAAAAHAADgAAAAAAcAAPAAAAAADwAA8AAAEAAPAADwAAAYAA8AAPgAAB4ABwAA/AAAH4AD
-        AAD+EAAPgA8AAP4AAA4AAwAA/AAAHwADAADwH8Q/wAcAAOAf5//gAQAA4Afgf8AfAADgA4AfgA8AAPAD
-        gB4QDwAA+AcAf/JHAAD8/4H/5y8AAPj/+f/vPwAA8H/5//8/AAD4f/z//78AAPj/////nwAAKAAAACAA
-        AABAAAAAAQAgAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAQEBAAAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlDWggSKjYNDyIsDQsc
-        JAwoQlEJFB4jAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD
-        AgAMDQAGDA0OEQAAABoAAAAmAAAAMAAAADYAAAA1AAAALwsLCycYGRkfDAwMGwAAABkEDBAbAAAAHAAA
-        ACgAAAA0AAAAOAAAADMAAAAqAAYKHwABAhIAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAACCwkGEgEAACkAAABDCAYFeR0cHJ0bGxy1FxcXtxcXF7MMCwqhAAAAggAAAGEAAABCAAAANwAA
-        AEgMICqQDyAotxMrN84QHybQEBkeuAcFA5IBAABsAQAARwEAAC0AAAASAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAsHBgYkAAAASTk4ONV6eXn/lpaW/4uMjP9mZmb/ZmZm/2NjYv9iYmL4gICA60tL
-        S8gBAgSFFy453x1bgv8iT2n/H1Bp/x9GXP8iWHn/GkBW/w4nOPEBAwacAAAAWwAAADwAAAAaAAAAAwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAABgICAhsAAAAzIiAftFJRUf9oaGj/lpaW/7i4uP16enr9c3Nz/42N
-        jv+AgYH/ODEt7g8lMOAlaIv/IEVZ+ipWbfwdSWP9IEpl/RtMZ/0bQFT8LWyO/x0/TvcDBQauAAABUAAA
-        AC8GFBoQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwEBAA4AAAAaDQsJXS8tLKI7OjrixcXF/pKT
-        k/5TUlLzWlpbu0dISI0OHyqxIk1o+hw9TfwfXYT+LEtc/x9HYP4laZD+LGeE/yNSbf8pY4L9KVBk/hIw
-        Qf8DBASNBQoNLAUAABQGDBABAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAgIBAAAAAAAAAAAAAAAAAAAA
-        AD+EhIP7iYmJ/w0NDHAGAAAAAAAACyRXdPAfUnL/IFNw/SVhgf8rZIP+JVBn/ypde/8oTF7+JlNq/y6A
-        qv8tYHv7JHil/hlBU8mk//8MCjZOCFSt1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAF7e3sBjY2NB2pqauB2dnb7AAAAHAALEwEVJS1NHDpI/xlPbfweX4v+KEpd/iZdev8yYXX/ImuZ/yp7
-        pP8eRmH+IVRy/iZNYf4ydpn8I1Rq+RkqMXQzU1cAJkxeAj5vggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAO3t7QH09PQAaGhouGVlZeLd3d0DGoW6AClOYbYYQlj+GVd4+y9+pf8qYH3/G2OS/yZK
-        Wf8zY3j/N2+J/yRsk/8icZj/Il2A/x5Laf4fSFn+LnOS/yYyMTAmNz8AHSwyAwAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3NzcAuTk5ABlZWa0Xl5f1gAAAAA8j74AGSkwxRtUd/4aUXL8Kk9d/i14
-        nP8ui73/MmuI/yNpk/8qUWT/IlJo/yFlg/8lZob+M4u1/x5UdfofUnL9ERcXZw8UFAAWIycIAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQDAsAEgAAAP///wKFhoYEmJucB2dqauZsb2/mS05PCwAJFQMXHyKVJ1dw/yVc
-        evsgW4D/MW2K/y9LVP8xfqT/HGyg/zFwj/8kWn7/HlBu/xpIXf8eTWL+JHWh+yd/sP4IFx2iP3WMAA4s
-        OwgAAAAAAAAAAAAAAAABKDQAAAAAAA4JBwIAAAACSk1MABoWFgAGAABrpp2b/3xycfwAAAA8M36tABk/
-        V8EfQFP/K09f/CV3pP8veJz/GEFZ/yJkhv8rb5D/JU5g/zCAq/8rZYP/H2WP/xtbgf8aTWT9I26P/xdL
-        ZPI3PUAcBA0SAAAAAAAAAAAAAAAAAAEUGgAAvPsCGRISAAAAAABOODYfL0NFch9RWfBRgI38O2t2/hk0
-        O85JhZw1FjNIwR1TdP8dUXP8NG2L/yZVaf8hcqH/I3Kd/xlPa/8gbJb/JlZr/ylXa/8qg7D/LY6+/xhC
-        W/4hUW/+IWqM/wAAADoAAAAAAAAAAAAAAAAAPlsAAQ4TAQAQFAAAAAA8MFNfsimZs/MAr93/Bbz7/wDH
-        +v4A0P7+C8Px/zydt/8hZXfwCyw6/yJXeP4wfaT/Ij1O/yZoif8gXnr/JXag/yeAtP8kZIX/JnSj/y5x
-        kf8hW3T/I2uS/yuBs/wfQ1P+AgYJXAAAAAAMEyYAAAAAAAA2SAEAPEgAACg5hUWZuP9Oy///Hqv//y+E
-        /fwygvv+HKD3/xqm+v8Pr/z9JrH//6je//9CkrL/FENW/y5KVv8ka5f/LGWB/yhbd/8nZoj/J2uJ/y1i
-        fP8if7P/LGF7/yRVcf8qcJX+MoOn+zBmf/8XM0CSGjpJAAsSJQAZbI0DBl+EAAAtSl9PodT/grz//B1/
-        +PspQtP+PW77/zVn8f49cPv+NnT3/jSK/v8nY+/+T2LZ/pG7/v8WXJP+IDhH/ypeeP8xW2z/JGyT/yl4
-        pf8vZX//L2+P/zR3lP89e5f/K4Cw/yVsk/8uTlv7K3KT/yVKWowtVmgACw8aAlOIjgAPZW4TMl2q6rvV
-        //1Hd/r8Llnm/wMHm/4kStb/Dh2v/yNI0v84cPb/LVjj/yRF0f8AAJH/BS9s/wdieP8RJDT/KmSB/y9e
-        df8pZIP/NGN1/zB3nv8qjMT/NHCL/yZSa/9AjbH/M3WV/ihRbv07aX3+GCImUxIZGgAUKlkJAAAoAAAA
-        IE94l+P/naLn/AgctP8CBKH+AAGh/wAAmf8AAJz/AACc/wsZtP8KFrD/AACX/wAAnP8AAIH+Cih2/2uq
-        p/5Fcn3+IWGG/yVihP4rT2L/K2WE/0GXv/8saor/I4G4/zdxjv4yYHf+LpDD/yJBUP4AAAAoAAAAAAUO
-        egoBBFAAAANBYXOD2f2Lj9f6AAB4/gACe/4AAHn+BQR6/wYFeP8GBnT/AABw/wAAfP8BAY3/AwV2/zhW
-        f/+GztH/hNHL/jFDSP4tZYD9OnSP/yVslf4vkMP+OnKK/y1hfP87krb/K2B+/y5nifxChqL/Lltv4Ud7
-        hxFAk6QEAwFFCgAAKAAAAB5cQkKR/6iv4v4AAHf/Jw9L/2EGCf4VGID9Ew6V/RQWcv0Ib2L+FRRc/ggA
-        Wf1TgYT9q////kVxfP8CA1L/Hi44/iNihf8ya4z6K2N+/DGBpf4zdJL+IHCf/zNieP80cY7+LH2t+zlr
-        g/4pV25kVpy5ADlpfQcJCAADAQAAAAcIBRsTEC3ri47B7CcxnftKCy/9Ywsc/wkRp/8WEqj/Fwd7/wt3
-        f/4UQXL/GAVq/0Jgbv99x779AABM/gAAWN8/SHBHJ1dy2DKIsf8ucJX/InCd/jRzj/83ltD+N2yQ/kJy
-        i/1CbXL+HzAuxxMfEgxia2sAKCIeAg0LAwAHBwgCBwgLAAAAAGgjISC9U3F5p0gAAPMxBgfuHyo3zxIR
-        GN0KBBTgAjA38wVQT/kRBhTIAAAAxxVBQvgHPHj/BQIlpBUTZwAVOkcQPzw8YSRffN4ymdD7OGaF/Dhc
-        RP8lYQ/+Lo4W/S+PFv4VRgawBwwAYwAPABgAAAAACgkPAAcGBgADAQACBAMABwMEA3sdFRDHVgEA8wwH
-        Botna2xsCgwNeQAAAHYDEhCaAVdX9wcHBcATISHAAg4TzQCInvkBoL/0AAwCPQg1RQBLamcACQAAGRgy
-        GYondBryLooA/jCkCf4wjgr+MIoP/iZdBvQhTwCwFzQFRGqJAAAAAAAAAAAAAAQSRwAHDy8ABgwZOgYR
-        TPAwFD72BQYCjYN5YXgoIhJ4EgAAdRgAAH0FeHjyEjo75H28vf8fFQ6/AGyH1wOy3P8HKS05ADpMAExK
-        QBMJDgSqI3cS9CyND/8whAz+MJgW/zGnGv4rYgD9GDgA8RAtBIUHGAZBBgIGAwAAAAAAAAAAAB2KAwAf
-        jRYCD0SbACvE/wApx/8BDTezBhxnQwwaTGkOYGFuDmRlZwZlZcYAZ2XMJ05NrwpJVeAAiKTqBmp0eQaI
-        mQABcnkBABMAAwIQAC4HIQRjFScAyS6KEP0xjxH9MJ4X/i6vIP0nXQD/BhEAyjAsA00LGAUAi4+UBI+V
-        nQAnND+hO1Jj8TtQZu09V3j8JTtm/goRI30ABCwABAwqAAdaWwAEYGIABDpDTQFdaeMAPEo3AA8nTwAA
-        ABgIV18ABEWBAAaKZAAQGAYATWADAIGZAgwkaQHAMoMG/zCCDfozeQD+J3sR+RE/CcsWIhG8OjMFcwge
-        Ay7X4uoAi56jB0ZZa+iDnLf/XXOF/4qrwvxUaXr6MUJR9UVbatEAAAAcLDJABBYACCQFRACvAWQB/wF3
-        AP0AYwDmAkAAsBAHBEwEHwAACC4JAhtEBwAiTAgJHDwHoyJpAP8iVgDnLGwB/yVqAPsoUwD/DRwChERu
-        IAIYTwEkKGoMDUxbaAYtQVAAESw6ZlRzgvh3bHL9o52k/4+eqv99la//MURW/SsuLRcAQQAAAy0CmwCR
-        AP8ArQH9AIsA/gB0AP8AcgD/ATIAdgNjAwAHQwMDFkUEDg4lBZMXUQC6AxQASBJDAM4SMgDHET4A0RxB
-        AZcdQQD/DSIAUxIrAQAGCgMAvdz2AAAAAAFkAAAAewAALEMAAOVFBwDFSDU7o0xgbq0aIylWUENTAAUR
-        BQkDOAKkAlQA3AEWAPIAIg7+AhMNnQQLDCQDBgYAAwADABr8BQBq/xUDCRUCDgoUBAAKFgRDChwCq0Z6
-        ERQNKgG2BxgBXxdABFIAAAKIAAACCgUFAwOUrcEAQAmRAmAEjgE+AlJ6Vxuw+zEMY5xnFIcASwCEACw7
-        RwAAAAAAAP//ABT2DQAKSVkGCYaPIAJ0d+0DeXo/A4iIAAN0dQMEAAMAGv8IAAMIAABIRkgAAwACDAcE
-        BXcBAAESDBwEAAUOAlsECwGjETkGAAACACEAAgAEAAAAAQAAAABzE+QCiQ/0ADYGk7GISv//Sh2XyspG
-        +wWqLu0EJzM9AwAAAAAAAAAAAAAAAAB2dQECgYAABD8+kQJDQ5YCXFwCAm9vAwIgAgAAAAAAAAAAAA4R
-        DwAAAAAKAAAADgAAAAADAAMBBQMEDwUDBI4AAAAKAAAABgUEAwQAAAEAAAAAABABMwMNATkAEwImSyoA
-        besJABliNglYAC0JUgMAAAAAAAAAAAAAAAAAAAAAAAAAAwkAAAQDAAAXBwAAQAoAAAAaAAABAAAAAAAA
-        AAAAAAAAFxgZAAAAAAAAAAAAAAAAAwoJBgEGBQMABQQDVAYKAyQFBAMADwwKAAAAAAD///////////4B
-        wH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAAAAHgAAAB4AAAAeAA
-        AAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9/s/j/P/v8///7ygA
-        AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoJuXACEgIQBvbm4AAAAAAP//
-        /wMAAAAAyMPAABAuPwDY//8A////CQAAAAAAAAAAAAAAAKoKCgARKDMAAAAAAIJ9eAAuMTUWNzY1c1pa
-        Wqo5OTmzNzc3oDw5N28GEhlZFTVIqRYxQL8PIy+lAQIEXgAAABeOCwwCBB8uAAAAAABqaGcAGBgYFCoq
-        KZ9mZWX8kZGR/25vb/9RUlPfFjtP8CRUbv8hT2r/IVJt/xw/UfIDCg5vbQ0PDQkcJgAAAAAAAAAAABIS
-        EwBISUoAOTg4H3p6e+xXRTpCETdMfB9UdP8nV3L4KV56/CdgfvgpYoH/HUpgynTAwQk4dZICAwwQAAAA
-        AAAjIyQAtra4Bevu7wBbYGGpTSscEhhBWMMhXHv+K2uO/C1lgv4mYoD/I2GB+iZffP8hSl1gL2J9ABBS
-        aAA4bHQAKygpACwpKQBkV1MIdWZj2DwOBBkaPVO/J19+/ytohvwmaIz/KGB9/iFdfPsgY4b+GU5qryqJ
-        tQAWYnsBO3B1AC1CQwEnZWhWDmqEvCSdtP8cdIG2Hkxf3iddev8lYoL9IGaL/yZnif4ob5T9IWSI/h9W
-        ct5+vckEQXiGA1R/iAdDia+zPJj0/y2B//8imv/9K6T//12T1f8bS2T+KVp1/ipsjv8rcZT+Lm+P/itu
-        kf8tYnvuAAAAIG2MwgBAWpZgb43n/wwiwPgJD6X7Gya+/hYixvsACY79M2yB/zRofP8pYYD8M3yh/zB1
-        lvwyc5P+LFtz30jA2gR0gMUAQEaKf1Vauf8YAE/9FgZ9/wYeev8FC2n/Tnim/091kvoqTWf/LnKY/zB4
-        n/8xcZ/7NW+W/zBfd41EhKMACQIAAA0EADA8P1nFTBMb6iQSV9sKL1HoDS5C6zFMVeoBIF7WFFpuSydw
-        hrswdpD2M3ZR/TJ2NfgTJxNYSm8RAwAIPQgJFFcAAAMtbxwPN9shIQBkBxAChQ9SUNknQUjcAISf6A+o
-        0QYeRhc1JGgM3TGbBPorgwf9EykAs0JpBxM7bbwCIUiUdDNUkeIcOn7oRE1QOwxjSxsFVk2ZDE48qgpl
-        aVUZfEQDX5EmDyBaAq8xhwz/KXsL+w4nA5onaQkwiHt1AF5fWYBybWrzcH2E+kFTaoAFKQofAW0A+gBm
-        APQDPQJ5CE0AABJBAjQUPwGYF0MAxhpAAMgPIAFWFzkDCE0AUABQFFYRSQ1t0SsXOz8eEDYKAj4rFgRD
-        MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf
-        IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB
-        AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/handbrakepineapple.ico Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/Microsoft.WindowsAPICodePack.Shell.dll Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/Microsoft.WindowsAPICodePack.dll Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/ProgressBar Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/ProgressBar/License.txt Deleted

@@ -1,22 +0,0 @@
-Copyright (c) 2009, wyDay
-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.
-
-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.
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/libraries/ProgressBar/Windows7ProgressBar.XML Deleted

@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Windows7ProgressBar</name>
-    </assembly>
-    <members>
-        <member name="T:wyDay.Controls.Windows7Taskbar">
-            <summary>
-            The primary coordinator of the Windows 7 taskbar-related activities.
-            </summary>
-        </member>
-        <member name="M:wyDay.Controls.Windows7Taskbar.SetProgressState(System.IntPtr,wyDay.Controls.ThumbnailProgressState)">
-            <summary>
-            Sets the progress state of the specified window's
-            taskbar button.
-            </summary>
-            <param name="hwnd">The window handle.</param>
-            <param name="state">The progress state.</param>
-        </member>
-        <member name="M:wyDay.Controls.Windows7Taskbar.SetProgressValue(System.IntPtr,System.UInt64,System.UInt64)">
-            <summary>
-            Sets the progress value of the specified window's
-            taskbar button.
-            </summary>
-            <param name="hwnd">The window handle.</param>
-            <param name="current">The current value.</param>
-            <param name="maximum">The maximum value.</param>
-        </member>
-        
-        <member name="M:wyDay.Controls.Windows7ProgressBar.Increment(System.Int32)">
-            <summary>
-            Advances the current position of the progress bar by the specified amount.
-            </summary>
-            <param name="value">The amount by which to increment the progress bar's current position.</param>
-        </member>
-        <member name="M:wyDay.Controls.Windows7ProgressBar.PerformStep">
-            <summary>
-            Advances the current position of the progress bar by the amount of the System.Windows.Forms.ProgressBar.Step property.
-            </summary>
-        </member>
-        <member name="P:wyDay.Controls.Windows7ProgressBar.ShowInTaskbar">
-            <summary>
-            Show progress in taskbar
-            </summary>
-        </member>
-        <member name="P:wyDay.Controls.Windows7ProgressBar.Value">
-            <summary>
-            Gets or sets the current position of the progress bar.
-            </summary>
-            <returns>The position within the range of the progress bar. The default is 0.</returns>
-        </member>
-        <member name="P:wyDay.Controls.Windows7ProgressBar.Style">
-            <summary>
-            Gets or sets the manner in which progress should be indicated on the progress bar.
-            </summary>
-            <returns>One of the ProgressBarStyle values. The default is ProgressBarStyle.Blocks</returns>
-        </member>
-        
-        
-        <member name="F:wyDay.Controls.ProgressBarState.Normal">
-            <summary>
-            Indicates normal progress
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ProgressBarState.Error">
-            <summary>
-            Indicates an error in the progress
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ProgressBarState.Pause">
-            <summary>
-            Indicates paused progress
-            </summary>
-        </member>
-        <member name="T:wyDay.Controls.ThumbnailProgressState">
-            <summary>
-            Represents the thumbnail progress bar state.
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ThumbnailProgressState.NoProgress">
-            <summary>
-            No progress is displayed.
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ThumbnailProgressState.Indeterminate">
-            <summary>
-            The progress is indeterminate (marquee).
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ThumbnailProgressState.Normal">
-            <summary>
-            Normal progress is displayed.
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ThumbnailProgressState.Error">
-            <summary>
-            An error occurred (red).
-            </summary>
-        </member>
-        <member name="F:wyDay.Controls.ThumbnailProgressState.Paused">
-            <summary>
-            The operation is paused (yellow).
-            </summary>
-        </member>
-    </members>
-</doc>

HandBrake-0.9.8.tar.bz2/win/CS/libraries/ProgressBar/Windows7ProgressBar.dll Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/SplitButton Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/SplitButton/License.txt Deleted

@@ -1,22 +0,0 @@
-Copyright (c) 2010, wyDay
-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.
-
-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.
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/libraries/SplitButton/SplitButton.dll Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/SplitButton/SplitButton.pdb Deleted

HandBrake-0.9.8.tar.bz2/win/CS/libraries/caliburn/ASL - Apache Software Foundation License.txt Deleted

@@ -1,57 +0,0 @@
-Apache License, Version 2.0
-
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-   3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-   4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS

HandBrake-0.9.8.tar.bz2/CREDITS -> HandBrake-0.9.9.tar.bz2/CREDITS Changed

HandBrake-0.9.8.tar.bz2/NEWS -> HandBrake-0.9.9.tar.bz2/NEWS Changed

@@ -1,658 +1,717 @@
 NEWS file for HandBrake <http://handbrake.fr/>
 
+
+Changes betwen 0.9.8 and 0.9.9:
+
+    General
+     - Improved HandBrake pineapple icon by Matt Johnson
+     - Improved Retina-resolution icons within the application, by Nik Pawlak
+        + http://nikpawlak.com
+    Core
+     - Blu-ray (PGS) subtitle support
+        + works with Foreign Audio Search
+        + can be Burned-In
+        + can be passed through to MKV (but not MP4)
+     - Additional video framerates
+        + 30, 50, 59.94, 60 fps
+     - Double framerate ("bob") mode for the deinterlace and decomb filters
+     - Better audio remix support
+        + additional mixdowns: 6.1, 7.1, 7.1 (5F/2R/LFE)
+            CLI users should note 6ch becomes 5point1
+        + better-than-Stereo sources can be upmixed to 5.1
+        + discard one channel from Stereo sources
+            Mono (Left Only), Mono (Right Only)
+     - Allow the selection of higher audio bitrates where appropriate
+     - Allow the selection of lower audio samplerates where appropriate
+        + 8, 11.025, 12, 16 kHz
+     - Audio dithering (TPDF) when converting to 16-bit FLAC
+     - Use libavcodec for DTS audio decoding (instead of libdca)
+        + DTS-ES 6.1 Discrete support
+     - All graphical interfaces: support for x264's preset, tune and profile options
+        + alternative to the Advanced panel (which is still available)
+        + HandBrake-specific option to ensure compliance with a specific H.264 level
+     - Updated built-in presets
+        + take advantage of x264 preset/tune/profile support
+        + removed increasingly suboptimal and irrelevant Legacy presets
+     - Assorted bug fixes and improvements to the core library (libhb)
+     - Updated libraries
+        + x264 r2273-b3065e6
+        + Libav v9.6
+        + libbluray 0.2.3
+    Windows
+     - User Interface has been re-written in WPF
+        + Includes many small UI enhancements
+     - Switched to .NET 4 Client Profile
+        + smaller download for those who don't have .NET 4 Full installed
+    Mac
+     - Assorted bug fixes
+        + including better support for Retina displays
+     - Prevent sleep during encoding and scanning for Mountain Lion
+     - Drag & Drop files onto the Main window or application icon to scan
+     - Nicer progress indication on the dock icon
+     - Preview window improvements and bugfixes
+     - Updated Growl to 2.0.1
+        + Notification Center support (when Growl is not installed)
+    Linux
+     - Assorted bug fixes and improvements
+     - Use some system libraries rather than bundling
+        + fontconfig, freetype, libxml2, libass, libogg, libvorbis, libtheora and libsamplerate
+    Command Line Interface
+     - Audio option (-a) will ignore invalid input tracks and encode with only the valid ones
+     - Allow use of hh:mm:ss format when specifying p-to-p start/stop time
+     - Advanced audio options
+        + enable level normalization when downmixing (disabled by default)
+        + disable audio dithering or select a specific algorithm
+
+
+
+
 Changes betwen 0.9.7 and 0.9.8:
 
--> Corrects a few crash bugs that showed up in 0.9.7
+    - Corrects a few crash bugs that showed up in 0.9.7
 
-Changes betwen 0.9.6 and 0.9.7:
 
--> This is a bug fix release for 0.9.6.
--> Includes an AppleTV3 Preset and updated iPad Preset
 
+Changes betwen 0.9.6 and 0.9.7:
 
-Changes betwen 0.9.5 and 0.9.6:
+    - This is a bug fix release for 0.9.6.
+    - Includes an AppleTV3 Preset and updated iPad Preset
 
-Encoders:
----------
 
--> Video:
 
-   - updated libx264 (revision 2146)
-   - MPEG-2 encoder (from libavcodec)
-   - advanced options support for libavcodec encoders
-     format: option1=value1:option2=value2
-             -bf 2 -trellis 2 becomes bf=2:trellis=2
+Changes betwen 0.9.5 and 0.9.6:
 
--> Audio:
+    Encoders:
 
-   - audio gain control (increase/decrease audio volume)
+    -> Video:
 
-   - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
-   - new AAC encoder (from libavcodec) (considered experimental)
-     (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
-     (should be on par with faac in terms of quality, sometimes better)
-   - FLAC encoder (16-bit, MKV container only)
+       - updated libx264 (revision 2146)
+       - MPEG-2 encoder (from libavcodec)
+       - advanced options support for libavcodec encoders
+         format: option1=value1:option2=value2
+                 -bf 2 -trellis 2 becomes bf=2:trellis=2
 
-   - Mac OS X: HE-AAC encoding support, via Core Audio
+    -> Audio:
 
-   - quality-based variable bitrate encoding support
-     works with: Lame MP3, Vorbis, Core Audio AAC
-     only implemented in CLI and Linux GUI
+       - audio gain control (increase/decrease audio volume)
 
-   - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
+       - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
+       - new AAC encoder (from libavcodec) (considered experimental)
+         (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
+         (should be on par with faac in terms of quality, sometimes better)
+       - FLAC encoder (16-bit, MKV container only)
 
+       - Mac OS X: HE-AAC encoding support, via Core Audio
 
--> Audio Passthru:
+       - quality-based variable bitrate encoding support
+         works with: Lame MP3, Vorbis, Core Audio AAC
+         only implemented in CLI and Linux GUI
 
-   - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
-   - DTS-HD Passthru (MP4, MKV containers)
-   - MP3 Passthru (MP4, MKV containers)
-   - AAC Passthru (MP4, MKV containers)
-     (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
-      which will break playback in e.g. QuickTime Player)
-   - Auto Passthru: one encoder, multiple codecs
-     lets you define allowed codecs (from supported passthru codecs)
-     lets you pick a fallback encoder if passthru is not possible
+       - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
 
-Muxers:
--------
 
-   - start MKV clusters with a video keyframe whenever possible
-     should improve seeking and DLNA streaming
+    -> Audio Passthru:
 
-   - bug fix: use ISO 639-2 bibliographic form for MKV language codes
-   - bug fix: fix crash due to division by zero in MP4 muxer
-   - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
+       - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
+       - DTS-HD Passthru (MP4, MKV containers)
+       - MP3 Passthru (MP4, MKV containers)
+       - AAC Passthru (MP4, MKV containers)
+         (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
+          which will break playback in e.g. QuickTime Player)
+       - Auto Passthru: one encoder, multiple codecs
+         lets you define allowed codecs (from supported passthru codecs)
+         lets you pick a fallback encoder if passthru is not possible
 
-Decoders:
----------
+    Muxers:
+       - start MKV clusters with a video keyframe whenever possible
+         should improve seeking and DLNA streaming
 
--> Video:
+       - bug fix: use ISO 639-2 bibliographic form for MKV language codes
+       - bug fix: fix crash due to division by zero in MP4 muxer
+       - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
 
-   - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
-     frame-based multithreading for H.264, VP8
-     10-bit decoding support for H.264, DNxHD
-     Apple ProRes decoding support
-   - improved average framerate detection
-   - duplicate frame detection for improved frame drop decision (CFR/PFR)
-   - new Same as source, Constant Framerate option
-     for devices that don't support variable framerate
-     automatically picks a constant framerate closest to the detected average framerate
+    Decoders:
 
-   - bug fix: fix problem when resolution changes in the middle of a video stream
+    -> Video:
 
--> Audio:
+       - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
+         frame-based multithreading for H.264, VP8
+         10-bit decoding support for H.264, DNxHD
+         Apple ProRes decoding support
+       - improved average framerate detection
+       - duplicate frame detection for improved frame drop decision (CFR/PFR)
+       - new Same as source, Constant Framerate option
+         for devices that don't support variable framerate
+         automatically picks a constant framerate closest to the detected average framerate
 
-   - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
+       - bug fix: fix problem when resolution changes in the middle of a video stream
 
-   - bug fix: libavcodec-decoded streams can now be decoded multiple times
-              previously, multiple decodes of the same source tracks weren't possible
-              and audio output tracks had to be dropped
-   - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
-   - bug fix: fix DTS decoder audio volume (was too low)
-   - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
-   - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
+    -> Audio:
 
--> Subtitles:
+       - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
 
-   - updated libass (0.10.0)
-   - improved handling of subtitles with overlapping timestamps
-   - improved handling of DVD subtitles without Stop Display commands
-   - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
+       - bug fix: libavcodec-decoded streams can now be decoded multiple times
+                  previously, multiple decodes of the same source tracks weren't possible
+                  and audio output tracks had to be dropped
+       - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
+       - bug fix: fix DTS decoder audio volume (was too low)
+       - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
+       - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
 
-   - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
+    -> Subtitles:
 
-Demuxers:
----------
+       - updated libass (0.10.0)
+       - improved handling of subtitles with overlapping timestamps
+       - improved handling of DVD subtitles without Stop Display commands
+       - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
 
-   - improved MPEG Program/Transport stream support
-     support for MPEG-1 Program streams
-     support for HD-DVD EVOB streams
-     improved handling of Transport streams that have no PCR
-   - WTV container support (via libavformat)
+       - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
 
-   - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
-   - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
-   - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
+    Demuxers:
 
-Filters:
---------
+       - improved MPEG Program/Transport stream support
+         support for MPEG-1 Program streams
+         support for HD-DVD EVOB streams
+         improved handling of Transport streams that have no PCR
+       - WTV container support (via libavformat)
 
-   - new, much improved decomb filter (but slower)
-     new settings are default
-     old settings become decomb "Fast"
+       - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
+       - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
+       - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
 
-Presets:
---------
+    Filters:
 
-   - improved "Normal" preset (much faster, similar file size and quality)
-   - removed obsolete legacy presets
-   - added new device presets for Android phones/tablets
-     recent and/or powerful devices recommended
+       - new, much improved decomb filter (but slower)
+         new settings are default
+         old settings become decomb "Fast"
 
-Mac OS X:
----------
+    Presets:
 
--> DVD decryption:
+       - improved "Normal" preset (much faster, similar file size and quality)
+       - removed obsolete legacy presets
+       - added new device presets for Android phones/tablets
+         recent and/or powerful devices recommended
 
-   - VLC 2.x or later will not work for DVD decryption
-     and is therefore unsupported as of HandBrake 0.9.6
-   - libdvdcss is now the preferred method for DVD decryption
-     already works with HandBrake 0.9.5
-     a .pkg installer is available from Videolan:
-     http://download.videolan.org/libdvdcss/last/macosx/
+    Mac OS X:
 
--> Build system:
+    -> DVD decryption:
 
-   - support for Xcode 4 and Mac OS X 10.7 "Lion"
-   - Mac OS X 10.5 "Leopard" no longer supported
+       - VLC 2.x or later will not work for DVD decryption
+         and is therefore unsupported as of HandBrake 0.9.6
+       - libdvdcss is now the preferred method for DVD decryption
+         already works with HandBrake 0.9.5
+         a .pkg installer is available from Videolan:
+         http://download.videolan.org/libdvdcss/last/macosx/
 
-Mac OS X GUI:
--------------
+    -> Build system:
 
--> OS X 10.7 Lion support:
+       - support for Xcode 4 and Mac OS X 10.7 "Lion"
+       - Mac OS X 10.5 "Leopard" no longer supported
 
-   - bug fix: Live Preview window widgets updated to work under Lion
-   - bug fix: fixed positioning of widgets in the Audio panel under Lion
+    Mac OS X GUI:
 
--> Other:
+    -> OS X 10.7 Lion support:
 
-   - wider main window providing more room for various widgets
+       - bug fix: Live Preview window widgets updated to work under Lion
+       - bug fix: fixed positioning of widgets in the Audio panel under Lion
 
-Windows GUI:
-------------
+    -> Other:
 
--> Preview window:
+       - wider main window providing more room for various widgets
 
-   - complete redesign
-   - support for VLC or the system default video player
-   - dropped built-in QuickTime playback support
+    Windows GUI:
+    -> Preview window:
 
--> Other:
+       - complete redesign
+       - support for VLC or the system default video player
+       - dropped built-in QuickTime playback support
 
-   - much improved control over the default audio and subtitle tracks selected (see Options)
-   - ability to set the minimal title length that will show up during a scan (see Options)
-   - several other usability improvements
-   - installer now has a silent option for easier network installs (launch the installer with /S)
+    -> Other:
 
-Linux GUI:
-----------
+       - much improved control over the default audio and subtitle tracks selected (see Options)
+       - ability to set the minimal title length that will show up during a scan (see Options)
+       - several other usability improvements
+       - installer now has a silent option for easier network installs (launch the installer with /S)
 
--> Audio panel:
+    Linux GUI:
+    -> Audio panel:
 
-   - new advanced audio options section for gain and audio track names
-   - dynamic range compression and samplerate moved to advanced audio options
+       - new advanced audio options section for gain and audio track names
+       - dynamic range compression and samplerate moved to advanced audio options
 
--> Other:
+    -> Other:
 
-   - minor UI tweaks and usability enhancements
+       - minor UI tweaks and usability enhancements
 
-Miscellaneous:
---------------
+    Miscellaneous:
+       - Target Size is gone, and isn't coming back
+         Don't bother complaining on the forums
 
-   - Target Size is gone, and isn't coming back
-     Don't bother complaining on the forums
+       - CLI: support for x264 presets, tunes and profiles
+         new --x264-preset, --x264-tune and --x264-profile options
 
-   - CLI: support for x264 presets, tunes and profiles
-     new --x264-preset, --x264-tune and --x264-profile options
+       - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
+       - DVD: improved main feature detection
 
-   - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
-   - DVD: improved main feature detection
+       - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
 
-   - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
 
 
 Changes between 0.9.4 and 0.9.5:
 
-* Core Library
-  - BluRay disc structure support. (No decryption support) 
-  - Updated Libraries (x264, ffmpeg) 
-  - SSA Subtitle support. (Including burn-in) 
-  - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
-  - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
-  - Updated Presets for newer devices and better quality 
-  - AC3 encoding support.
-  - Many Bug fixes and other small improvements
-  - Improved DVD Main Feature detection (when using dvdnav)
-  - Universal audio downmix support (all audio types can be downmixed)
-
-*All GUIs
-  - Updated x264 Advanced Panel
-  - Video Quality Slider drops % value and only shows RF for x264
-  - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
-  - Peak framerate option (Capped VFR)
-  - Many Bug fixes
-  - Many Tweaks to improve usability.
-  - Ability to edit queue jobs
-  - Point-to-Point encoding (second or frame start and end times)
-
-* Mac GUI
-  - New Audio Panel supporting >4 Audio Tracks
-  - VLC detection in /Applications and ~/Applications
-
-* Windows GUI
-  - Encode Status in GUI. (CLI window is now always hidden)
-  - Improved Auto-Naming for Destination file name.
-  - Drag / Drop Video onto Main Window to scan.
+    * Core Library
+      - BluRay disc structure support. (No decryption support) 
+      - Updated Libraries (x264, ffmpeg) 
+      - SSA Subtitle support. (Including burn-in) 
+      - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
+      - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
+      - Updated Presets for newer devices and better quality 
+      - AC3 encoding support.
+      - Many Bug fixes and other small improvements
+      - Improved DVD Main Feature detection (when using dvdnav)
+      - Universal audio downmix support (all audio types can be downmixed)
+
+    *All GUIs
+      - Updated x264 Advanced Panel
+      - Video Quality Slider drops % value and only shows RF for x264
+      - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
+      - Peak framerate option (Capped VFR)
+      - Many Bug fixes
+      - Many Tweaks to improve usability.
+      - Ability to edit queue jobs
+      - Point-to-Point encoding (second or frame start and end times)
+
+    * Mac GUI
+      - New Audio Panel supporting >4 Audio Tracks
+      - VLC detection in /Applications and ~/Applications
+
+    * Windows GUI
+      - Encode Status in GUI. (CLI window is now always hidden)
+      - Improved Auto-Naming for Destination file name.
+      - Drag / Drop Video onto Main Window to scan.
+      
+    * Linux GUI
+      - Multiple instance support (run multiple copies of ghb at once)
+      - Many Bug fixes and UI improvements. 
   
-* Linux GUI
-  - Multiple instance support (run multiple copies of ghb at once)
-  - Many Bug fixes and UI improvements. 
-  
-Changes between 0.9.3 and 0.9.4:
 
-Core:
-
-* New build system, allowing 64-bit binaries (around 10% faster)
-* Soft subtitles and Closed Captions:
-  - DVD Closed Captions
-  - ATSC Closed Captions
-  - SRT subtitle import
-  - Text soft subtitles in MP4 and MKV output
-  - Bitmap soft subtitles in MKV output
-* Better support for DVD inputs:
-  - Uses libdvdnav
-  - DVD angles support
-  - Workaround for libdvdread malloc bomb on invalid PGC entry
-  - DVD drive region detection support in Linux
-  - Handles DVD programs with more than 16 streams
-  - No longer tries to detect and discard duplicate titles when scanning
-  - Libdvdnav patched to perform read error recovery
-  - Libdvdread patched to allow raw device access in Windows
-  - Handles poorly mastered DVDs that had the menus ripped out of them
-* Better support for non-DVD inputs:
-  - Preserves MP4 metadata
-  - TrueHD
-  - DTS-HD demuxing
-  - 8 bit audio
-  - Better handling of transport streams where audio starts first
-  - Better handling of transport streams that have been spliced together, leading to duplicate timestamps
-  - Better VC-1 frame detection
-  - Fixes bug that was causing one sec. of audio to be dropped on many ffmpeg files
-  - Looks harder for aspect ratio info from DV sources
-  - No longer truncates the last (dummy) chapter
-  - Allows specifying field parity for detelecine and decomb
-* Better AV sync
-* Support for sources with no audio
-* DTS passthrough for MKV
-* x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset). 
-* Better sample interleaving
-* Better, optional deinterlacer for decomb (EEDI2)
-* New mode structure for the decomb filter
-* Variable verbose logging levels
-* Fixed timing for first two frames coming out of filters
-* Libtheora bumped to 1.1.0
-* Improvements to our theora implementation (2 pass encoding + soft target rate control)
-* Caters to Theora's insistence on content having mod16 framing dimensions specified
-* Flushes LAME encoder's final packets
-* Fixed interjob framerate calculation
-* Fixed pthreads regression in cygwin
-* Tweaks for packaging tools
-* Solaris 10 build support
-
-All interfaces:
-
-* Live video preview
-* New subtitle tab
-* New filters and picture settings inspector
-* Custom anamorphic mode
-* Updated Sparkle
-* Custom number of preview images
-* Quality slider now works off actual rate factor/quantizer values instead of percentages
-* Partially updated advanced x264 tab
-* New built-in presets
-* Use libdvdnav by default on DVD sources
-* Removed Constant QP encoding option for x264 (use CRF)
-* Various bug fixes and UI tweaks
-* x264 turbo 1st pass mode now uses subme=2 not subme=1
-
-Mac:
-
-* Core Audio AAC encoding
-* H.264 video source decoding crash fixed
-* Queue displays varying row heights based on encode settings
-* Fixed EyeTV package scanning
-* 64bit / 32 bit VLC detection 
-* Preset import/export
-
-Windows:
-
-* New audio tab
-* AAC audio source decoding bug fixed
-* Tray minimization is now optional
-* Queue can now be started from main window
-* Growl for Windows notification support
-* General UI improvements
-* Preset import
-* Preferred language control for audio dubs and subtitles
-* Fixed file extensions resetting to m4v when enabling chapter markers in mkv
-* Faster updating of GUI elements from CLI data
-* Cleanup / Improved some of the programs options. (Growl, use m4v, drive detection)
-* Numerous fixes in the Picture Settings Panel and CLI Query Handling code.
-* Bug Fixes and Usability improvements.
-
-Linux:
-
-* General UI improvements
-* Inhibits sleep mode while encoding
-* Single title scan
-* Chapter duration display
-* Notifications when encodes complete
-* Tray minimization
-* Full screen preview
-* Preset import/export
-* Preferred language control for audio dubs and subtitles
-* Preferences rearrangement
-* Preference to auto-apply .m4v extension
-* New system tray icon behavior
-* Preference for what to do when encode completes
-* Preference for how often to delete activity logs
-* Preference to disable automatic scanning
-* New Gnome session manager support
-* Improved "auto" audio selection
-* Use .m4v as the default extension for the MPEG-4 container
-* Use .m4v when soft subs are enabled
-* Alternate angle encoding fix
-* Only strips drive letters for Windows builds
-* Show correct audio format info when it's been sanitized for incompatibilities
-* Preserve chapter list modifications made to queued jobs
-* Fixed error when navigating chapter titles with the keyboard
-* Bug Fixes.
-
-CLI:
-
-* Options to handle new subtitle, anamorphic, and preview features
-* --srt-file, --srt-codeset, --srt-offset, --srt-lang, --srt-default
-* --native-dub option lets users request dubbing instead of subs when the audio isn't in their native language
-* Allow encoding sources with no audio without explicitly stating -a none
-* Update checker on MinGW built exe should now work correctly.
-* Matches GUIs' default verbosity level of 1
+
+Changes between 0.9.3 and 0.9.4:
+    Core:
+
+    * New build system, allowing 64-bit binaries (around 10% faster)
+    * Soft subtitles and Closed Captions:
+      - DVD Closed Captions
+      - ATSC Closed Captions
+      - SRT subtitle import
+      - Text soft subtitles in MP4 and MKV output
+      - Bitmap soft subtitles in MKV output
+    * Better support for DVD inputs:
+      - Uses libdvdnav
+      - DVD angles support
+      - Workaround for libdvdread malloc bomb on invalid PGC entry
+      - DVD drive region detection support in Linux
+      - Handles DVD programs with more than 16 streams
+      - No longer tries to detect and discard duplicate titles when scanning
+      - Libdvdnav patched to perform read error recovery
+      - Libdvdread patched to allow raw device access in Windows
+      - Handles poorly mastered DVDs that had the menus ripped out of them
+    * Better support for non-DVD inputs:
+      - Preserves MP4 metadata
+      - TrueHD
+      - DTS-HD demuxing
+      - 8 bit audio
+      - Better handling of transport streams where audio starts first
+      - Better handling of transport streams that have been spliced together, leading to duplicate timestamps
+      - Better VC-1 frame detection
+      - Fixes bug that was causing one sec. of audio to be dropped on many ffmpeg files
+      - Looks harder for aspect ratio info from DV sources
+      - No longer truncates the last (dummy) chapter
+      - Allows specifying field parity for detelecine and decomb
+    * Better AV sync
+    * Support for sources with no audio
+    * DTS passthrough for MKV
+    * x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset). 
+    * Better sample interleaving
+    * Better, optional deinterlacer for decomb (EEDI2)
+    * New mode structure for the decomb filter
+    * Variable verbose logging levels
+    * Fixed timing for first two frames coming out of filters
+    * Libtheora bumped to 1.1.0
+    * Improvements to our theora implementation (2 pass encoding + soft target rate control)
+    * Caters to Theora's insistence on content having mod16 framing dimensions specified
+    * Flushes LAME encoder's final packets
+    * Fixed interjob framerate calculation
+    * Fixed pthreads regression in cygwin
+    * Tweaks for packaging tools
+    * Solaris 10 build support
+
+    All interfaces:
+
+    * Live video preview
+    * New subtitle tab
+    * New filters and picture settings inspector
+    * Custom anamorphic mode
+    * Updated Sparkle
+    * Custom number of preview images
+    * Quality slider now works off actual rate factor/quantizer values instead of percentages
+    * Partially updated advanced x264 tab
+    * New built-in presets
+    * Use libdvdnav by default on DVD sources
+    * Removed Constant QP encoding option for x264 (use CRF)
+    * Various bug fixes and UI tweaks
+    * x264 turbo 1st pass mode now uses subme=2 not subme=1
+
+    Mac:
+
+    * Core Audio AAC encoding
+    * H.264 video source decoding crash fixed
+    * Queue displays varying row heights based on encode settings
+    * Fixed EyeTV package scanning
+    * 64bit / 32 bit VLC detection 
+    * Preset import/export
+
+    Windows:
+
+    * New audio tab
+    * AAC audio source decoding bug fixed
+    * Tray minimization is now optional
+    * Queue can now be started from main window
+    * Growl for Windows notification support
+    * General UI improvements
+    * Preset import
+    * Preferred language control for audio dubs and subtitles
+    * Fixed file extensions resetting to m4v when enabling chapter markers in mkv
+    * Faster updating of GUI elements from CLI data
+    * Cleanup / Improved some of the programs options. (Growl, use m4v, drive detection)
+    * Numerous fixes in the Picture Settings Panel and CLI Query Handling code.
+    * Bug Fixes and Usability improvements.
+
+    Linux:
+
+    * General UI improvements
+    * Inhibits sleep mode while encoding
+    * Single title scan
+    * Chapter duration display
+    * Notifications when encodes complete
+    * Tray minimization
+    * Full screen preview
+    * Preset import/export
+    * Preferred language control for audio dubs and subtitles
+    * Preferences rearrangement
+    * Preference to auto-apply .m4v extension
+    * New system tray icon behavior
+    * Preference for what to do when encode completes
+    * Preference for how often to delete activity logs
+    * Preference to disable automatic scanning
+    * New Gnome session manager support
+    * Improved "auto" audio selection
+    * Use .m4v as the default extension for the MPEG-4 container
+    * Use .m4v when soft subs are enabled
+    * Alternate angle encoding fix
+    * Only strips drive letters for Windows builds
+    * Show correct audio format info when it's been sanitized for incompatibilities
+    * Preserve chapter list modifications made to queued jobs
+    * Fixed error when navigating chapter titles with the keyboard
+    * Bug Fixes.
+
+    CLI:
+
+    * Options to handle new subtitle, anamorphic, and preview features
+    * --srt-file, --srt-codeset, --srt-offset, --srt-lang, --srt-default
+    * --native-dub option lets users request dubbing instead of subs when the audio isn't in their native language
+    * Allow encoding sources with no audio without explicitly stating -a none
+    * Update checker on MinGW built exe should now work correctly.
+    * Matches GUIs' default verbosity level of 1
 
 Changes between 0.9.2 and 0.9.3:
 
 0.9.3 Snapshot 5 -> 0.9.3 Final
-- Better PMT processing
-- Basic underlying support for live previews (encode from a seek point for a set number of frames)
-- Better searching for IDR frames in H.264 streams
-- Preset changes (iPhone goes CRF, some old Apple presets resurrected as Legacy)
-- Assorted bug fixes
+    - Better PMT processing
+    - Basic underlying support for live previews (encode from a seek point for a set number of frames)
+    - Better searching for IDR frames in H.264 streams
+    - Preset changes (iPhone goes CRF, some old Apple presets resurrected as Legacy)
+    - Assorted bug fixes
 
 0.9.3 Snapshot 4 -> 0.9.3 Snapshot 5 (r1913)
-Core Library
-- VC-1 stream input
-- Newer libmp4v2, which fixes the issue with output > 2 gigs in Linux
-- Proper allocation for preview frames
-- Avoids corruption of previews of sources that use widths that aren't cleanly divisible by 8
-- Decodes DTS internally instead of using ffmpeg, to allow mixdowns
-- Better support for DTS in MKV files with implicit timestamps or large timestamp errors
-- Ensures proper chroma size by rounding up when dealing with odd dimensions
-- Ensures "auto" samplerate sends a valid value to faac (22050, 24000, 32000, 44100, or 48000)
-- Bumped Theora to 1.0 final
-- Bumped x264 to r1024, which includes Nehalem optimizations as well as speed boosts for things such as b-adapt=2
-
-Mac GUI
-- Allows multibyte characters in chapter titles
-
-Windows GUI
-- Fixes issue parsing presets that use maxWidth and maxHeight (-X and -Y)
-- DRC defaults to 1 now
-- Chapter markers disabled for non-DVD sources
-- Makes sure Normal preset gets loaded
-- Fixes arithmetic overflow crash when scanning
-
-Linux GUI
-- Update checker
-- Limits range of chapters to encode to the number of chapters on the DVD
-- Disabled entry of dimensions larger than the source
-
-CLI
-- Allows overriding of audio (tracks, bitrates, samplerates, codecs, mixdowns) and x264 options in built-in presets
-
-Documentation
-- Documentation updates have begun on the wiki, although they are not yet complete
+    Core Library
+    - VC-1 stream input
+    - Newer libmp4v2, which fixes the issue with output > 2 gigs in Linux
+    - Proper allocation for preview frames
+    - Avoids corruption of previews of sources that use widths that aren't cleanly divisible by 8
+    - Decodes DTS internally instead of using ffmpeg, to allow mixdowns
+    - Better support for DTS in MKV files with implicit timestamps or large timestamp errors
+    - Ensures proper chroma size by rounding up when dealing with odd dimensions
+    - Ensures "auto" samplerate sends a valid value to faac (22050, 24000, 32000, 44100, or 48000)
+    - Bumped Theora to 1.0 final
+    - Bumped x264 to r1024, which includes Nehalem optimizations as well as speed boosts for things such as b-adapt=2
+
+    Mac GUI
+    - Allows multibyte characters in chapter titles
+
+    Windows GUI
+    - Fixes issue parsing presets that use maxWidth and maxHeight (-X and -Y)
+    - DRC defaults to 1 now
+    - Chapter markers disabled for non-DVD sources
+    - Makes sure Normal preset gets loaded
+    - Fixes arithmetic overflow crash when scanning
+
+    Linux GUI
+    - Update checker
+    - Limits range of chapters to encode to the number of chapters on the DVD
+    - Disabled entry of dimensions larger than the source
+
+    CLI
+    - Allows overriding of audio (tracks, bitrates, samplerates, codecs, mixdowns) and x264 options in built-in presets
+
+    Documentation
+    - Documentation updates have begun on the wiki, although they are not yet complete
 
 0.9.3 Snapshot 3 -> 0.9.3 Snapshot 4 (r1896)
-Core Library
-- Converts video in other color spaces to YUV420 (this means DV support)
-- Official, standards-based AC3-in-MP4
-- Tries to base the AV timing for streams off audio when possible
-- Keeps some audio fixes for lost packets in over the air streams from interfering with other sources
-- Handles rendering of sources where the picture resolution changes mid-stream (this fixes the long-standing bug reading a particular episode of Doctor Who)
-- Wider window for clock references (AV sync)
-- Fixed a crash when closing out data for AAC encoding on aborted encodes
-- Rejiggered verbose activity log display to be more laconic by default
-- Updated x264 to r1016, which means b-rdo and bime are gone and replaced with new subme modes
-- DTS and HDMV DTS audio support in streams
-- Doesn't show the audio track button on iPhones/iPod Touches unless there's more than 1 track
-- Tries to avoid garbage data from AC3 sync by searching for two agreeing packets
-- As the MPEG4IP project is defunct, switched to an independently maintained libmp4v2 which has folded in all our cumbersome patches
-- Fixed SunOS compilation
-- Fixed conflict between maxHeight and maxWidth and loose anamorphic
-- Warn in the log when titles are being ignored during scan for lack of audio
-- Fixed bug with Slow/Slowest deinterlacing and decomb which could leave a flickering line at the top or bottom of the screen
-- Extracts audio and subtitle types from DVD sources, to do things like label commentary tracks
-- Better handling of the beginning of AVI and WMV sources that start after time 0
-- Optimize MP4 for web download works with AC3 tracks now
-
-Mac GUI
-- Nested presets
-- Individual activity logs for each encode (stored by default in ~/Application Support/HandBrake, can be co-located with encoded file destination by preference)
-- Allows reading from ZFS volumes
-- Fixed target size mode. It keeps breaking itself. Maybe it should just be put out of its misery...
-- Assorted other improvements
-
-Windows GUI
-- Nested presets
-- Individual activity logs for each encode
-- Slow and slower deinterlacing and decomb work now in Windows
-- Added resizeable update window
-- Fixed parsing of non-DVD source audio formats
-- Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
-- Fixed bug with MKV presets showing up as .m4v
-- Assorted other improvements
-
-Linux GUI (GTK)
-- Nested presets
-- Individual activity logs for each encode
-- Allows pending queue items to be removed, and reloaded in the main window for editing
-- Better handling of HD previews
-- Assorted other improvements
-
-CLI
-- Updated presets to the equivalent of the nested ones in the GUIs
-- Allows setting custom audio track names in MP4 files
-- Allows selection of the COLR atom in MP4 files, between Bt.601 and Bt.709
-- Fixed reading of device paths in OS X
-
-A special note on the new presets (they're collapsible-triangle-folder-thing-errific!)
-- Deux Six Quatre, Blind, Broke, and Bedlam are gone. They were dead weight.
-- iPod Low-Rez is now iPod Classic & iPod Nano
-- iPod High-Rez is now iPod Legacy
-- iPhone / iPod Touch is now iPhone & iPod Touch, so take care CLI users
-- Animation and Television now use the decomb and detelecine (VFR) filters
-- High Profile presets now use psy-trellis and the new subme 9 mode with B-frame RD refinement
-- AppleTV is now CRF, so sizes will vary with content
-- PS3 preset should be fixed
-- Constant Quality Rate still needs its quality % lowered, probably
-
-The keen reader is already asking "iPod Legacy? WTF is iPod High-Rez called iPod Legacy now?"
-
-The answer is Universal.
-
-The Universal preset is designed to play on all modern iPods (anything newer than the iPod 5.5G). It also plays on iPhones. It also plays on AppleTVs. It should also play just about anywhere else, hence the name. It is full anamorphic DVD resolution--no tricks with downscaling like stuff from the iTunes Store. It includes chapters, and has the first audio track in both AAC (DPL2 downmixed) and AC3 pass-thru, just like the AppleTV preset. In fact, it should give the same quality as the AppleTV preset, but faster...and at a larger file size. Like the AppleTV preset, it used CRF, so sizes will vary.
+    Core Library
+    - Converts video in other color spaces to YUV420 (this means DV support)
+    - Official, standards-based AC3-in-MP4
+    - Tries to base the AV timing for streams off audio when possible
+    - Keeps some audio fixes for lost packets in over the air streams from interfering with other sources
+    - Handles rendering of sources where the picture resolution changes mid-stream (this fixes the long-standing bug reading a particular episode of Doctor Who)
+    - Wider window for clock references (AV sync)
+    - Fixed a crash when closing out data for AAC encoding on aborted encodes
+    - Rejiggered verbose activity log display to be more laconic by default
+    - Updated x264 to r1016, which means b-rdo and bime are gone and replaced with new subme modes
+    - DTS and HDMV DTS audio support in streams
+    - Doesn't show the audio track button on iPhones/iPod Touches unless there's more than 1 track
+    - Tries to avoid garbage data from AC3 sync by searching for two agreeing packets
+    - As the MPEG4IP project is defunct, switched to an independently maintained libmp4v2 which has folded in all our cumbersome patches
+    - Fixed SunOS compilation
+    - Fixed conflict between maxHeight and maxWidth and loose anamorphic
+    - Warn in the log when titles are being ignored during scan for lack of audio
+    - Fixed bug with Slow/Slowest deinterlacing and decomb which could leave a flickering line at the top or bottom of the screen
+    - Extracts audio and subtitle types from DVD sources, to do things like label commentary tracks
+    - Better handling of the beginning of AVI and WMV sources that start after time 0
+    - Optimize MP4 for web download works with AC3 tracks now
+
+    Mac GUI
+    - Nested presets
+    - Individual activity logs for each encode (stored by default in ~/Application Support/HandBrake, can be co-located with encoded file destination by preference)
+    - Allows reading from ZFS volumes
+    - Fixed target size mode. It keeps breaking itself. Maybe it should just be put out of its misery...
+    - Assorted other improvements
+
+    Windows GUI
+    - Nested presets
+    - Individual activity logs for each encode
+    - Slow and slower deinterlacing and decomb work now in Windows
+    - Added resizeable update window
+    - Fixed parsing of non-DVD source audio formats
+    - Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
+    - Fixed bug with MKV presets showing up as .m4v
+    - Assorted other improvements
+
+    Linux GUI (GTK)
+    - Nested presets
+    - Individual activity logs for each encode
+    - Allows pending queue items to be removed, and reloaded in the main window for editing
+    - Better handling of HD previews
+    - Assorted other improvements
+
+    CLI
+    - Updated presets to the equivalent of the nested ones in the GUIs
+    - Allows setting custom audio track names in MP4 files
+    - Allows selection of the COLR atom in MP4 files, between Bt.601 and Bt.709
+    - Fixed reading of device paths in OS X
+
+    A special note on the new presets (they're collapsible-triangle-folder-thing-errific!)
+    - Deux Six Quatre, Blind, Broke, and Bedlam are gone. They were dead weight.
+    - iPod Low-Rez is now iPod Classic & iPod Nano
+    - iPod High-Rez is now iPod Legacy
+    - iPhone / iPod Touch is now iPhone & iPod Touch, so take care CLI users
+    - Animation and Television now use the decomb and detelecine (VFR) filters
+    - High Profile presets now use psy-trellis and the new subme 9 mode with B-frame RD refinement
+    - AppleTV is now CRF, so sizes will vary with content
+    - PS3 preset should be fixed
+    - Constant Quality Rate still needs its quality % lowered, probably
+
+    The keen reader is already asking "iPod Legacy? WTF is iPod High-Rez called iPod Legacy now?"
+
+    The answer is Universal.
+
+    The Universal preset is designed to play on all modern iPods (anything newer than the iPod 5.5G). It also plays on iPhones. It also plays on AppleTVs. It should also play just about anywhere else, hence the name. It is full anamorphic DVD resolution--no tricks with downscaling like stuff from the iTunes Store. It includes chapters, and has the first audio track in both AAC (DPL2 downmixed) and AC3 pass-thru, just like the AppleTV preset. In fact, it should give the same quality as the AppleTV preset, but faster...and at a larger file size. Like the AppleTV preset, it used CRF, so sizes will vary.
 
 0.9.3 Snapshot2 -> 0.9.3 Snapshot 3 (r1797)
-Core Library:
-- Universal input support, utilizing libavcodec from the FFmpeg project for decoding non-MPEG-2 video
-- Newer, faster, better version of the x264 codec, including psychovisual optimizations
-- Better AV sync through full compliance with the MPEG Standard Target Decoder timing model
-- More accurate auto-cropping
-- Support for New Zealand and Norwegian HDTV broadcasts (H.264 and AAC-LATM in MPEG-TS)
-- Detelecine is now "VFR detelecine" by default, dropping some frames and extending others to make up lost time, old behavior of keeping duplicate frames is enabled by selecting a framerate besides "Same as source"
-- Threaded deinterlacing in Slow and Slower modes
-- Threaded and entirely rewritten decomb filter
-- Better audio resampling interpolator
-- Better gamma in QuickTime through the use of the COLR MP4 atom
-- Better constant quality encoding when using FFmpeg
-- Hopefully better cache and virtual memory performance by recycling buffers that were most recently used instead of least
-- Fix for MP4s with "negative duration" errors.
-- Set the detelecine filter to work better with PAL by using "loose" breaks
-- Fix for missing initial H.264 NAL units, improves reliability of 8x8dct
-- Fix for subtitle-scan with XviD encoding
-- Fix for crash at the end of 2nd pass using x264
-- Deblock filter works now
-- Rewritten update system, so the core library can read a portion of Sparkle appcasts.
-- Updates for libsamplerate, libogg, xvidcore, libtheora, libmpeg2, lame, faac, and of course ffmpeg and x264.
-
-Mac GUI
-- Entirely rewritten and far more flexible queue that can be saved between sessions, capable of preserving queued items after a crash
-- Now requires vlc 0.9.xx to read protected dvd's in the users /Applications folder
-- Fix for 4x3 loose anamorphic to keep it from downscaling
-- Countless other improvements
-
-Windows GUI
-- Resolution calculation
-- Better preset bar
-- Better queue (including queue recovery feature)
-- Better activity log window
-- Improved UI (layout changes, animated x264 options, DVD drive detection, duration displayed)
-- More options - includes support for custom auto name format & starting the CLI minimized
-- Countless other improvements
-
-Linux GUI (GTK)
-- It's alive!
-
-Known Issues in Snapshot 3
-- Possibility of a flickering line at the top or bottom of the frame after Slow or Slower deinterlacing or decombing
-- Input bitrate display may be off by a factor of 100 for H.264-in-TS sources
-- Constant Quality Rate preset probably needs a lower quality level (60% - 55%)
-- With non-DVD sources that don't have AC3 audio, you can't encode 1 input audio track to multiple output audio tracks
-- Slow and Slower deinterlacing and decombing are BROKEN in Windows
-- QuickTime won't read Xvid-in-MP4 output, although VLC will
-- Windows GUI does not detect all audio tracks from non-DVD sources
+    Core Library:
+    - Universal input support, utilizing libavcodec from the FFmpeg project for decoding non-MPEG-2 video
+    - Newer, faster, better version of the x264 codec, including psychovisual optimizations
+    - Better AV sync through full compliance with the MPEG Standard Target Decoder timing model
+    - More accurate auto-cropping
+    - Support for New Zealand and Norwegian HDTV broadcasts (H.264 and AAC-LATM in MPEG-TS)
+    - Detelecine is now "VFR detelecine" by default, dropping some frames and extending others to make up lost time, old behavior of keeping duplicate frames is enabled by selecting a framerate besides "Same as source"
+    - Threaded deinterlacing in Slow and Slower modes
+    - Threaded and entirely rewritten decomb filter
+    - Better audio resampling interpolator
+    - Better gamma in QuickTime through the use of the COLR MP4 atom
+    - Better constant quality encoding when using FFmpeg
+    - Hopefully better cache and virtual memory performance by recycling buffers that were most recently used instead of least
+    - Fix for MP4s with "negative duration" errors.
+    - Set the detelecine filter to work better with PAL by using "loose" breaks
+    - Fix for missing initial H.264 NAL units, improves reliability of 8x8dct
+    - Fix for subtitle-scan with XviD encoding
+    - Fix for crash at the end of 2nd pass using x264
+    - Deblock filter works now
+    - Rewritten update system, so the core library can read a portion of Sparkle appcasts.
+    - Updates for libsamplerate, libogg, xvidcore, libtheora, libmpeg2, lame, faac, and of course ffmpeg and x264.
+
+    Mac GUI
+    - Entirely rewritten and far more flexible queue that can be saved between sessions, capable of preserving queued items after a crash
+    - Now requires vlc 0.9.xx to read protected dvd's in the users /Applications folder
+    - Fix for 4x3 loose anamorphic to keep it from downscaling
+    - Countless other improvements
+
+    Windows GUI
+    - Resolution calculation
+    - Better preset bar
+    - Better queue (including queue recovery feature)
+    - Better activity log window
+    - Improved UI (layout changes, animated x264 options, DVD drive detection, duration displayed)
+    - More options - includes support for custom auto name format & starting the CLI minimized
+    - Countless other improvements
+
+    Linux GUI (GTK)
+    - It's alive!
+
+    Known Issues in Snapshot 3
+    - Possibility of a flickering line at the top or bottom of the frame after Slow or Slower deinterlacing or decombing
+    - Input bitrate display may be off by a factor of 100 for H.264-in-TS sources
+    - Constant Quality Rate preset probably needs a lower quality level (60% - 55%)
+    - With non-DVD sources that don't have AC3 audio, you can't encode 1 input audio track to multiple output audio tracks
+    - Slow and Slower deinterlacing and decombing are BROKEN in Windows
+    - QuickTime won't read Xvid-in-MP4 output, although VLC will
+    - Windows GUI does not detect all audio tracks from non-DVD sources
 
 0.9.3 Snapshot 1 -> 0.9.3 Snapshot 2 (r1477)
-Core Library:
-- Anamorphic PAR for the AVI container
-- Allow constant frame rates when they different from the source's frame rate (otherwise pass through the variable MPEG-2 frame durations )
-- Decomb filter (selectively deinterlaces when it sees interlacing in the frame)
-- Filter bug fixed, that would skip any filters after detelecine, if VFR wasn't enabled
-- Loose anamorphic + FFmpeg video bug fixed
+    Core Library:
+    - Anamorphic PAR for the AVI container
+    - Allow constant frame rates when they different from the source's frame rate (otherwise pass through the variable MPEG-2 frame durations )
+    - Decomb filter (selectively deinterlaces when it sees interlacing in the frame)
+    - Filter bug fixed, that would skip any filters after detelecine, if VFR wasn't enabled
+    - Loose anamorphic + FFmpeg video bug fixed
 
-Windows GUI:
-- Title dropdown list bug fixed
-- Missing log file bug fixed
+    Windows GUI:
+    - Title dropdown list bug fixed
+    - Missing log file bug fixed
 
-CLI:
-- Default audio samplerate changed to 48kHz, audio bitrate changed to 160kbps.
-- Samplerate entry bug fixed
+    CLI:
+    - Default audio samplerate changed to 48kHz, audio bitrate changed to 160kbps.
+    - Samplerate entry bug fixed
 
 0.9.2 -> 0.9.3 Snapshot 1 (r1457)
-Core Library:
-- New audio subsystem (no more AAC+AC3, control each track's codec and settings individually)
-- Removed libdvdcss (HandBrake no longer decrypts DVDs on its own, will use VLC to do so if it's available)
-- Added Theora encoder
-- Fixed x264-in-avi and ffmpeg-in-avi
-- Fixed xvid
-- More accurate scaling
-- Major sync improvements
-- Major stream improvements
-- AAC+AC3 support in MKV
-- MKV seeking fixes
-- Make sure subtitles get displayed long enough to read them
-- Updated VBV 2-pass and VBV 1-pass patch for x264
-- Adaptive Quantization for x264
-- Recover from bad preview scans
-- Recover from invalid PGNs
-- Fixed vorbis bitrate control
-- Snapshot builds
-
-Mac:
-- New audio interface
-- Loads libdvdcss from VLC at runtime if it's present on the user's system
-- No more general-purpose "Codecs" menu -- set video and audio codecs individually
-- More robust preset system, in preparation for nested presets
-- Made 64-bit MP4 file widget more prominent
-- Only allow useful x264 options in the advanced tab
-- Various fixes and improvements
-
-Windows:
-- New x264 tab
-- New audio interface
-- Various fixes and improvements
-
-CLI:
-- New audio interface
+    Core Library:
+    - New audio subsystem (no more AAC+AC3, control each track's codec and settings individually)
+    - Removed libdvdcss (HandBrake no longer decrypts DVDs on its own, will use VLC to do so if it's available)
+    - Added Theora encoder
+    - Fixed x264-in-avi and ffmpeg-in-avi
+    - Fixed xvid
+    - More accurate scaling
+    - Major sync improvements
+    - Major stream improvements
+    - AAC+AC3 support in MKV
+    - MKV seeking fixes
+    - Make sure subtitles get displayed long enough to read them
+    - Updated VBV 2-pass and VBV 1-pass patch for x264
+    - Adaptive Quantization for x264
+    - Recover from bad preview scans
+    - Recover from invalid PGNs
+    - Fixed vorbis bitrate control
+    - Snapshot builds
+
+    Mac:
+    - New audio interface
+    - Loads libdvdcss from VLC at runtime if it's present on the user's system
+    - No more general-purpose "Codecs" menu -- set video and audio codecs individually
+    - More robust preset system, in preparation for nested presets
+    - Made 64-bit MP4 file widget more prominent
+    - Only allow useful x264 options in the advanced tab
+    - Various fixes and improvements
+
+    Windows:
+    - New x264 tab
+    - New audio interface
+    - Various fixes and improvements
+
+    CLI:
+    - New audio interface
+
+
 
 Changes between 0.9.1 and 0.9.2:
+    CORE
+
+    - AC3 in MP4 support
+    - Multi-track audio support for Apple devices
+    - Better handling of audio discontinuities
+    - More flexible, "loose" anamorphic
+    - Variable frame rate encoding
+    - MP4 optimization for progressive downloads
+    - Dynamic range compression for encoding from AC3 audio
+    - Ability to encode an audio stream and pass it through at the same time
+    - iPhone-compatible anamorphic (pasp atom)
+    - Robust program and transport stream support
+    - Better handling of DVD read errors from invalid VOB units
+    - Detects and works around missing end of cell markers
+    - Recovers from loss of signal in a stream
+    - Drops subtitles less often
+    - Keeps chapter markers in better sync and prevents duplicates
+    - Better handling of B-Frames
+    - Tunes FIFO sizes by CPU count
+    - Finally squashes the bug that cut off the end of movies
+    - Preset changes
+    - Standardizes on standard out for progress and standard error for everything else.
+    - Correct channel counts when passing AC3 audio to Matroska
+    - Tag MP4 files as encoded with HandBrake
+    - No more merging short chapters
+    - Newer copies of x264,
+    - VBV 2-pass patch for x264
+    - Sets keyframes for x264 by frame rate.
+    - Support for >2GB MKV files in Linux
+    - Code audio languages in a way QuickTime understands
+    - Better subtitle positioning
+    - Fewer crashes in 2-pass encoding
+
+    MAC
+
+    - Leopard Only
+    - Sparkle
+    - Reads .eyetv files as well as .dvdmedia files
+    - Much better queue
+    - More white space
+    - Code restructuring
+    - Activity window logging, complete with a "black box recorder" for crashes
+    - Ability to open a single title for a DVD instead of scanning the whole thing
+    - Warns people when they try to queue up two files with the same name
+    - Maintains picture filter states between jobs
+    - .xib Interface Builder files SVN can track
+    - Switches to NSImageView for previews, so no more useless OpenGL effects
+    - Temporary loss of localizations for foreign languages (the old system was broken anyway)
+    - Separate filter settings for every queued job
+
+    WIN
+
+    - Revamped preset system
+    - Sparkle-compatible update checker
+    - Activity log window
+    - CLI built-in preset parsing
+    - No more admin rights required in Vista
+    - Handles more display resolutions
+
+    CLI
+
+    - Built-in presets
+    - Short names for denoising (weak, medium, strong) and deinterlacing (fast, slow, slower) 
+    - Solaris port
+    - No more x264b30 (use -e x264 -I -x level=30:cabac=0 instead or better yet an iPod preset)
+    - Chapter marker .csv input fixed
+    - CRF as default quality mode for x264, now -q is CRF and if you want CQP add -Q to it
+
 
-CORE
-
-- AC3 in MP4 support
-- Multi-track audio support for Apple devices
-- Better handling of audio discontinuities
-- More flexible, "loose" anamorphic
-- Variable frame rate encoding
-- MP4 optimization for progressive downloads
-- Dynamic range compression for encoding from AC3 audio
-- Ability to encode an audio stream and pass it through at the same time
-- iPhone-compatible anamorphic (pasp atom)
-- Robust program and transport stream support
-- Better handling of DVD read errors from invalid VOB units
-- Detects and works around missing end of cell markers
-- Recovers from loss of signal in a stream
-- Drops subtitles less often
-- Keeps chapter markers in better sync and prevents duplicates
-- Better handling of B-Frames
-- Tunes FIFO sizes by CPU count
-- Finally squashes the bug that cut off the end of movies
-- Preset changes
-- Standardizes on standard out for progress and standard error for everything else.
-- Correct channel counts when passing AC3 audio to Matroska
-- Tag MP4 files as encoded with HandBrake
-- No more merging short chapters
-- Newer copies of x264,
-- VBV 2-pass patch for x264
-- Sets keyframes for x264 by frame rate.
-- Support for >2GB MKV files in Linux
-- Code audio languages in a way QuickTime understands
-- Better subtitle positioning
-- Fewer crashes in 2-pass encoding
-
-MAC
-
-- Leopard Only
-- Sparkle
-- Reads .eyetv files as well as .dvdmedia files
-- Much better queue
-- More white space
-- Code restructuring
-- Activity window logging, complete with a "black box recorder" for crashes
-- Ability to open a single title for a DVD instead of scanning the whole thing
-- Warns people when they try to queue up two files with the same name
-- Maintains picture filter states between jobs
-- .xib Interface Builder files SVN can track
-- Switches to NSImageView for previews, so no more useless OpenGL effects
-- Temporary loss of localizations for foreign languages (the old system was broken anyway)
-- Separate filter settings for every queued job
-
-WIN
-
-- Revamped preset system
-- Sparkle-compatible update checker
-- Activity log window
-- CLI built-in preset parsing
-- No more admin rights required in Vista
-- Handles more display resolutions
-
-CLI
-
-- Built-in presets
-- Short names for denoising (weak, medium, strong) and deinterlacing (fast, slow, slower) 
-- Solaris port
-- No more x264b30 (use -e x264 -I -x level=30:cabac=0 instead or better yet an iPod preset)
-- Chapter marker .csv input fixed
-- CRF as default quality mode for x264, now -q is CRF and if you want CQP add -Q to it
 
 Changes between 0.9.0 and 0.9.1:
 
@@ -694,7 +753,9 @@
 	+ Fixed: Add-to-queue issues
 	+ Fixed: Foreign language issues
 	Assorted other changes
-	
+
+
+
 Changes between 0.8.5b1 and 0.9.0:
 
 	Core HandBrake Changes
@@ -739,6 +800,8 @@
 	+ Changed: DVD information parser
 	Assorted other changes
 
+
+
 Changes between 0.8.0b1 and 0.8.5b1
 
 	Core HandBrake Changes
@@ -818,6 +881,7 @@
 	+ Removed: The Help and Support window. Been replaced with a few Web Links.
 
 
+    
 Changes between 0.7.1 and 0.8.0
  + MediaFork project forked from HandBrake source <http://handbrake.m0k.org/>
  + Updated libraries (meaning better quality, hopefully fewer bugs, and increased speeds)
@@ -833,10 +897,14 @@
  + New preference item to select the default audio language (Mac OS X)
  + Bugfix for reading straight from a DVD
 
+ 
+ 
 Changes between 0.7.0 and 0.7.1
  + Universal Binary for PPC and Intel
  + Bugfixes for missing subtitles, audio glitches with LPCM tracks and more
 
+ 
+ 
 Changes between 0.7.0-beta3 and 0.7.0
  + Multithreaded H.264 encoding with x264
  + Added option for H.264 Baseline (suitable for iPods)
@@ -844,6 +912,8 @@
  + Fixes for some DVD titles HandBrake would not recognize
  + Fixes audio gliches when encoding from LPCM tracks
 
+ 
+ 
 Changes between 0.6.2 and 0.7.0-beta3
  + Chapters selection
  + Custom framerate
@@ -860,6 +930,8 @@
  + Grayscale encoding
  + Up-to-date BeOS UI
 
+ 
+ 
 Changes between 0.6.1 and 0.6.2
  + Support for DVDs with MPEG audio tracks
  + Rewrote the DVD navigation code
@@ -869,9 +941,13 @@
  + Internal improvements
  + Bugfixes
 
+ 
+ 
 Changes between 0.6.0 and 0.6.1
  + Fixed LPCM endianness issue
 
+ 
+ 
 Changes between 0.5.2 and 0.6.0
  + MP4 and OGM output
  + AAC and Vorbis encoding
@@ -881,37 +957,53 @@
  + GTK2 linux interface
  + OS X interface localization
 
+ 
+ 
 Changes between 0.5.1 and 0.5.2
  + Bugfixes
 
+ 
+ 
 Changes between 0.5 and 0.5.1
  + 2-pass XviD encoding
  + Bugfixes
 
+ 
+ 
 Changes between 0.4 and 0.5
  + Bugfixes, rewrite of large parts of the core
  + XviD encoding (1-pass only)
 
+ 
+ 
 Changes between 0.3 and 0.4
  + Better multithreading
  + Allow the user to specify a target size instead of bitrate
  + Misc GUI enhancements
  + Use low-priority threads on OS X
 
+ 
+ 
 Changes between 0.2 and 0.3
  + OSX & Linux ports
  + Allow 2-pass encoding
  + Many internal changes & fixes
 
+ 
+ 
 Changes between 0.1.1 and 0.2
  + Fixed a major bug that made HandBrake probably crash after ~ 15
    minutes encoded
  + Fixed a few minor memory leaks
 
+ 
+ 
 Changes between 0.1 and 0.1.1
  + Fixed a stupid bug that prevented to scan volumes correctly if
    FAT/NTFS/etc volumes were mounted
 
+   
+   
 Changes between 0.1-alpha2 and 0.1 :
  + Automatically detect ripped DVDs on BFS volumes
  + Allow picture cropping and resizing
@@ -920,9 +1012,13 @@
    and BSPlayer)
  + Better A/V sync with some DVDs
 
+ 
+ 
 Changes between 0.1-alpha and 0.1-alpha2 :
  + Show length for each title
  + Fixed the screwed-audio bug
  + Many bugfixes...
 
+ 
+ 
 First version is 0.1-alpha.

HandBrake-0.9.8.tar.bz2/THANKS -> HandBrake-0.9.9.tar.bz2/THANKS Changed

HandBrake-0.9.9.tar.bz2/contrib/a52dec/A00-a52-state-t-public.patch Added

@@ -0,0 +1,152 @@
+diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
+--- a52dec.old/include/a52.h	2002-01-28 06:37:54.000000000 +0100
++++ a52dec.new/include/a52.h	2012-07-16 14:13:35.000000000 +0200
+@@ -30,7 +30,71 @@
+ typedef double sample_t;
+ #endif
+ 
+-typedef struct a52_state_s a52_state_t;
++typedef struct {
++    uint8_t bai;              /* fine SNR offset, fast gain */
++    uint8_t deltbae;          /* delta bit allocation exists */
++    int8_t deltba[50];        /* per-band delta bit allocation */
++} ba_t;
++
++typedef struct {
++    uint8_t exp[256];         /* decoded channel exponents */
++    int8_t bap[256];          /* derived channel bit allocation */
++} expbap_t;
++
++typedef struct {
++    uint8_t fscod;            /* sample rate */
++    uint8_t halfrate;         /* halfrate factor */
++    uint8_t acmod;            /* coded channels */
++    uint8_t lfeon;            /* coded lfe channel */
++    sample_t clev;            /* centre channel mix level */
++    sample_t slev;            /* surround channels mix level */
++
++    int output;               /* type of output */
++    sample_t level;           /* output level */
++    sample_t bias;            /* output bias */
++
++    int dynrnge;              /* apply dynamic range */
++    sample_t dynrng;          /* dynamic range */
++    void * dynrngdata;        /* dynamic range callback funtion and data */
++    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
++
++    uint8_t chincpl;          /* channel coupled */
++    uint8_t phsflginu;        /* phase flags in use (stereo only) */
++    uint8_t cplstrtmant;      /* coupling channel start mantissa */
++    uint8_t cplendmant;       /* coupling channel end mantissa */
++    uint32_t cplbndstrc;      /* coupling band structure */
++    sample_t cplco[5][18];    /* coupling coordinates */
++
++    /* derived information */
++    uint8_t cplstrtbnd;       /* coupling start band (for bit allocation) */
++    uint8_t ncplbnd;          /* number of coupling bands */
++
++    uint8_t rematflg;         /* stereo rematrixing */
++
++    uint8_t endmant[5];       /* channel end mantissa */
++
++    uint16_t bai;             /* bit allocation information */
++
++    uint32_t * buffer_start;
++    uint16_t lfsr_state;      /* dither state */
++    uint32_t bits_left;
++    uint32_t current_word;
++
++    uint8_t csnroffst;        /* coarse SNR offset */
++    ba_t cplba;               /* coupling bit allocation parameters */
++    ba_t ba[5];               /* channel bit allocation parameters */
++    ba_t lfeba;               /* lfe bit allocation parameters */
++
++    uint8_t cplfleak;         /* coupling fast leak init */
++    uint8_t cplsleak;         /* coupling slow leak init */
++
++    expbap_t cpl_expbap;
++    expbap_t fbw_expbap[5];
++    expbap_t lfe_expbap;
++
++    sample_t * samples;
++    int downmixed;
++} a52_state_t;
+ 
+ #define A52_CHANNEL 0
+ #define A52_MONO 1
+diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
+--- a52dec.old/liba52/a52_internal.h	2002-07-28 03:52:06.000000000 +0200
++++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:11:47.000000000 +0200
+@@ -21,72 +21,6 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-typedef struct {
+-    uint8_t bai;		/* fine SNR offset, fast gain */
+-    uint8_t deltbae;		/* delta bit allocation exists */
+-    int8_t deltba[50];		/* per-band delta bit allocation */
+-} ba_t;
+-
+-typedef struct {
+-    uint8_t exp[256];		/* decoded channel exponents */
+-    int8_t bap[256];		/* derived channel bit allocation */
+-} expbap_t;
+-
+-struct a52_state_s {
+-    uint8_t fscod;		/* sample rate */
+-    uint8_t halfrate;		/* halfrate factor */
+-    uint8_t acmod;		/* coded channels */
+-    uint8_t lfeon;		/* coded lfe channel */
+-    sample_t clev;		/* centre channel mix level */
+-    sample_t slev;		/* surround channels mix level */
+-
+-    int output;			/* type of output */
+-    sample_t level;		/* output level */
+-    sample_t bias;		/* output bias */
+-
+-    int dynrnge;		/* apply dynamic range */
+-    sample_t dynrng;		/* dynamic range */
+-    void * dynrngdata;		/* dynamic range callback funtion and data */
+-    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
+-
+-    uint8_t chincpl;		/* channel coupled */
+-    uint8_t phsflginu;		/* phase flags in use (stereo only) */
+-    uint8_t cplstrtmant;	/* coupling channel start mantissa */
+-    uint8_t cplendmant;		/* coupling channel end mantissa */
+-    uint32_t cplbndstrc;	/* coupling band structure */
+-    sample_t cplco[5][18];	/* coupling coordinates */
+-
+-    /* derived information */
+-    uint8_t cplstrtbnd;		/* coupling start band (for bit allocation) */
+-    uint8_t ncplbnd;		/* number of coupling bands */
+-
+-    uint8_t rematflg;		/* stereo rematrixing */
+-
+-    uint8_t endmant[5];		/* channel end mantissa */
+-
+-    uint16_t bai;		/* bit allocation information */
+-
+-    uint32_t * buffer_start;
+-    uint16_t lfsr_state;	/* dither state */
+-    uint32_t bits_left;
+-    uint32_t current_word;
+-
+-    uint8_t csnroffst;		/* coarse SNR offset */
+-    ba_t cplba;			/* coupling bit allocation parameters */
+-    ba_t ba[5];			/* channel bit allocation parameters */
+-    ba_t lfeba;			/* lfe bit allocation parameters */
+-
+-    uint8_t cplfleak;		/* coupling fast leak init */
+-    uint8_t cplsleak;		/* coupling slow leak init */
+-
+-    expbap_t cpl_expbap;
+-    expbap_t fbw_expbap[5];
+-    expbap_t lfe_expbap;
+-
+-    sample_t * samples;
+-    int downmixed;
+-};
+-
+ #define LEVEL_PLUS6DB 2.0
+ #define LEVEL_PLUS3DB 1.4142135623730951
+ #define LEVEL_3DB 0.7071067811865476

HandBrake-0.9.8.tar.bz2/contrib/a52dec/A01-thread-safe.patch -> HandBrake-0.9.9.tar.bz2/contrib/a52dec/A01-thread-safe.patch Changed

@@ -1,19 +1,19 @@
-diff -Naur -x '*.o' -x '*.lo' -x '*.a' -x '*.la' a52dec/liba52/a52_internal.h ../a52dec.new/liba52/a52_internal.h
---- a52dec/liba52/a52_internal.h	2011-04-28 07:54:05.499052327 -0700
-+++ ../a52dec.new/liba52/a52_internal.h	2011-04-28 07:50:30.998845068 -0700
-@@ -32,6 +32,11 @@
-     int8_t bap[256];		/* derived channel bit allocation */
+diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
+--- a52dec.old/include/a52.h	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/include/a52.h	2012-07-16 14:31:37.000000000 +0200
+@@ -42,6 +42,11 @@
  } expbap_t;
  
-+typedef struct complex_s {
+ typedef struct {
 +    sample_t real;
 +    sample_t imag;
 +} complex_t;
 +
- struct a52_state_s {
-     uint8_t fscod;		/* sample rate */
-     uint8_t halfrate;		/* halfrate factor */
-@@ -85,6 +90,20 @@
++typedef struct {
+     uint8_t fscod;            /* sample rate */
+     uint8_t halfrate;         /* halfrate factor */
+     uint8_t acmod;            /* coded channels */
+@@ -94,6 +99,20 @@
  
      sample_t * samples;
      int downmixed;
@@ -31,10 +31,13 @@
 +    complex_t * post2;            // size 32
 +
 +    sample_t * a52_imdct_window;  // size 256
- };
+ } a52_state_t;
  
- #define LEVEL_PLUS6DB 2.0
-@@ -119,6 +138,6 @@
+ #define A52_CHANNEL 0
+diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
+--- a52dec.old/liba52/a52_internal.h	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:28:33.000000000 +0200
+@@ -49,6 +49,6 @@
  		  sample_t clev, sample_t slev);
  void a52_upmix (sample_t * samples, int acmod, int output);
  
@@ -44,9 +47,9 @@
 +void a52_imdct_init (a52_state_t * state, uint32_t mm_accel);
 +void a52_imdct_256 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
 +void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-diff -Naur -x '*.o' -x '*.lo' -x '*.a' -x '*.la' a52dec/liba52/imdct.c ../a52dec.new/liba52/imdct.c
---- a52dec/liba52/imdct.c	2002-07-27 18:52:07.000000000 -0700
-+++ ../a52dec.new/liba52/imdct.c	2011-04-28 07:51:00.398624376 -0700
+diff -Naur a52dec.old/liba52/imdct.c a52dec.new/liba52/imdct.c
+--- a52dec.old/liba52/imdct.c	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/liba52/imdct.c	2012-07-16 14:33:00.000000000 +0200
 @@ -40,11 +40,6 @@
  #include "a52_internal.h"
  #include "mm_accel.h"
@@ -316,9 +319,9 @@
      }
  
  #ifdef LIBA52_DJBFFT
-diff -Naur -x '*.o' -x '*.lo' -x '*.a' -x '*.la' a52dec/liba52/parse.c ../a52dec.new/liba52/parse.c
---- a52dec/liba52/parse.c	2002-07-27 18:52:07.000000000 -0700
-+++ ../a52dec.new/liba52/parse.c	2011-04-28 07:40:48.030435061 -0700
+diff -Naur a52dec.old/liba52/parse.c a52dec.new/liba52/parse.c
+--- a52dec.old/liba52/parse.c	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/liba52/parse.c	2012-07-16 14:33:00.000000000 +0200
 @@ -56,16 +56,53 @@
      a52_state_t * state;
      int i;

HandBrake-0.9.8.tar.bz2/contrib/a52dec/A02-imdct-shutup.patch -> HandBrake-0.9.9.tar.bz2/contrib/a52dec/A02-imdct-shutup.patch Changed

HandBrake-0.9.9.tar.bz2/contrib/a52dec/A03-automake.patch Added

HandBrake-0.9.9.tar.bz2/contrib/autoconf Added

HandBrake-0.9.9.tar.bz2/contrib/autoconf/module.defs Added

HandBrake-0.9.9.tar.bz2/contrib/autoconf/module.rules Added

HandBrake-0.9.9.tar.bz2/contrib/automake Added

HandBrake-0.9.9.tar.bz2/contrib/automake/module.defs Added

HandBrake-0.9.9.tar.bz2/contrib/automake/module.rules Added

HandBrake-0.9.8.tar.bz2/contrib/bzip2/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/bzip2/module.defs Changed

HandBrake-0.9.8.tar.bz2/contrib/faac/A00-bitrates.patch -> HandBrake-0.9.9.tar.bz2/contrib/faac/A00-bitrates.patch Changed

HandBrake-0.9.9.tar.bz2/contrib/faac/A01-multichannel-improvements.patch Added

@@ -0,0 +1,752 @@
+diff -Naur faac-1.28.old/frontend/main.c faac-1.28.new/frontend/main.c
+--- faac-1.28.old/frontend/main.c	2009-01-24 02:10:20.000000000 +0100
++++ faac-1.28.new/frontend/main.c	2012-08-06 21:15:34.000000000 +0200
+@@ -858,7 +858,7 @@
+       break;
+     }
+     if (infile->channels >= 6)
+-        myFormat->useLfe = 1;
++        myFormat->numLFEChannels = 1;
+     myFormat->allowMidside = useMidSide;
+     if (bitRate)
+         myFormat->bitRate = bitRate / infile->channels;
+diff -Naur faac-1.28.old/include/faaccfg.h faac-1.28.new/include/faaccfg.h
+--- faac-1.28.old/include/faaccfg.h	2004-07-04 14:12:05.000000000 +0200
++++ faac-1.28.new/include/faaccfg.h	2012-08-06 21:15:34.000000000 +0200
+@@ -66,8 +66,14 @@
+     /* Allow mid/side coding */
+     unsigned int allowMidside;
+ 
+-    /* Use one of the channels as LFE channel */
+-    unsigned int useLfe;
++    /* Channel configuration */
++    unsigned int channelConfiguration;
++
++    /* Number of front, side, back & LFE channels */
++    unsigned int numFrontChannels;
++    unsigned int numSideChannels;
++    unsigned int numBackChannels;
++    unsigned int numLFEChannels;
+ 
+     /* Use Temporal Noise Shaping */
+     unsigned int useTns;
+diff -Naur faac-1.28.old/libfaac/bitstream.c faac-1.28.new/libfaac/bitstream.c
+--- faac-1.28.old/libfaac/bitstream.c	2007-06-05 20:59:47.000000000 +0200
++++ faac-1.28.new/libfaac/bitstream.c	2012-08-06 21:15:34.000000000 +0200
+@@ -1032,6 +1032,219 @@
+     return j;
+ }
+ 
++/* write a program_config_element() */
++int WritePCE(faacEncHandle hEncoder,
++             BitStream *bitStream,
++             int byte_alignment,
++             int instance_tag,
++             int writeFlag)
++{
++    int i;
++    int bits = 0;
++
++    /* we can have up to 29 full-bandwidth channels of each type:
++     * 4 bits -> 0 - 15 elements, 14 CPEs (28 channels) and 1 SCE (1 channel)
++     * we can have up to 3 LFE channels:
++     * 2 bits -> 0 - 3 elements, 3 LFEs (1 channel) */
++    if (hEncoder->config.numFrontChannels > 29) {
++        fprintf(stderr, "WritePCE: too many front channels (%u)\n",
++                hEncoder->config.numFrontChannels);
++        return 0;
++    }
++    if (hEncoder->config.numSideChannels  > 29) {
++        fprintf(stderr, "WritePCE: too many side channels (%u)\n",
++                hEncoder->config.numSideChannels);
++        return 0;
++    }
++    if (hEncoder->config.numBackChannels  > 29) {
++        fprintf(stderr, "WritePCE: too many back channels (%u)\n",
++                hEncoder->config.numBackChannels);
++        return 0;
++    }
++    if (hEncoder->config.numLFEChannels   >  3) {
++        fprintf(stderr, "WritePCE: too many LFE channels (%u)\n",
++                hEncoder->config.numLFEChannels);
++        return 0;
++    }
++    /* program_config_element() shall be used only for the audio object types:
++     * AAC main, AAC SSR, AAC LC and AAC LTP */
++    if (hEncoder->config.aacObjectType > 4) {
++        fprintf(stderr, "WritePCE: unsupported AudioObjectType %u",
++                hEncoder->config.aacObjectType);
++        return 0;
++    }
++
++    /* Determine the channel configuration (see GetChannelInfo) */
++    int sceTag                       = 0;
++    int cpeTag                       = 0;
++    int lfeTag                       = 0;
++    int num_front_channel_elements   = 0;
++    int front_element_is_cpe[15]     = { 0 };
++    int front_element_tag_select[15] = { 0 };
++    int num_side_channel_elements    = 0;
++    int side_element_is_cpe[15]      = { 0 };
++    int side_element_tag_select[15]  = { 0 };
++    int num_back_channel_elements    = 0;
++    int back_element_is_cpe[15]      = { 0 };
++    int back_element_tag_select[15]  = { 0 };
++    int num_lfe_channel_elements     = 0;
++    int lfe_element_tag_select[3]    = { 0 };
++    // Front channels
++    i = hEncoder->config.numFrontChannels;
++    if (i % 2) {
++        front_element_is_cpe[num_front_channel_elements]     = 0;
++        front_element_tag_select[num_front_channel_elements] = sceTag;
++        num_front_channel_elements++;
++        sceTag++;
++        i--;
++    }
++    while (i) {
++        front_element_is_cpe[num_front_channel_elements]     = 1;
++        front_element_tag_select[num_front_channel_elements] = cpeTag;
++        num_front_channel_elements++;
++        cpeTag++;
++        i -= 2;
++    }
++    // Side channels
++    i = hEncoder->config.numSideChannels;
++    while (i > 1) {
++        side_element_is_cpe[num_side_channel_elements]       = 1;
++        side_element_tag_select[num_side_channel_elements]   = cpeTag;
++        num_side_channel_elements++;
++        cpeTag++;
++        i -= 2;
++    }
++    if (i) {
++        side_element_is_cpe[num_side_channel_elements]       = 0;
++        side_element_tag_select[num_side_channel_elements]   = sceTag;
++        num_side_channel_elements++;
++        sceTag++;
++        i--;
++    }
++    // Back channels
++    i = hEncoder->config.numBackChannels;
++    while (i > 1) {
++        back_element_is_cpe[num_back_channel_elements]       = 1;
++        back_element_tag_select[num_back_channel_elements]   = cpeTag;
++        num_back_channel_elements++;
++        cpeTag++;
++        i -= 2;
++    }
++    if (i) {
++        back_element_is_cpe[num_back_channel_elements]       = 0;
++        back_element_tag_select[num_back_channel_elements]   = sceTag;
++        num_back_channel_elements++;
++        sceTag++;
++        i--;
++    }
++    // LFE channels
++    i = hEncoder->config.numLFEChannels;
++    while (i) {
++        lfe_element_tag_select[num_lfe_channel_elements]     = lfeTag;
++        num_lfe_channel_elements++;
++        lfeTag++;
++        i--;
++    }
++
++    /* element_instance_tag */
++    if (writeFlag)
++        PutBit(bitStream, instance_tag, 4);
++    bits =+ 4;
++
++    /* object_type */
++    if (writeFlag)
++        PutBit(bitStream, hEncoder->config.aacObjectType - 1, 2);
++    bits += 2;
++
++    /* sampling_frequency_index */
++    if (writeFlag)
++        PutBit(bitStream, hEncoder->sampleRateIdx, 4);
++    bits += 4;
++
++    /* num_front_channel_elements */
++    if (writeFlag)
++        PutBit(bitStream, num_front_channel_elements, 4);
++    bits += 4;
++
++    /* num_side_channel_elements */
++    if (writeFlag)
++        PutBit(bitStream, num_side_channel_elements, 4);
++    bits += 4;
++
++    /* num_back_channel_elements */
++    if (writeFlag)
++        PutBit(bitStream, num_back_channel_elements, 4);
++    bits += 4;
++
++    /* num_lfe_channel_elements */
++    if (writeFlag)
++        PutBit(bitStream, num_lfe_channel_elements, 2);
++    bits += 2;
++
++    /* num_assoc_data_elements */
++    if (writeFlag)
++        PutBit(bitStream, 0, 3);
++    bits += 3;
++
++    /* num_valid_cc_elements */
++    if (writeFlag)
++        PutBit(bitStream, 0, 4);
++    bits += 4;
++
++    /* mono_mixdown_present */
++    if (writeFlag)
++        PutBit(bitStream, 0, 1);
++    bits++;
++
++    /* stereo_mixdown_present */
++    if (writeFlag)
++        PutBit(bitStream, 0, 1);
++    bits++;
++
++    /* matrix_mixdown_idx_present */
++    if (writeFlag)
++        PutBit(bitStream, 0, 1);
++    bits++;
++
++    /* describe the channel configuration */
++    for (i = 0; i < num_front_channel_elements; i++) {
++        if (writeFlag) {
++            PutBit(bitStream, front_element_is_cpe[i], 1);
++            PutBit(bitStream, front_element_tag_select[i], 4);
++        }
++        bits += 5;
++    }
++    for (i = 0; i < num_side_channel_elements; i++) {
++        if (writeFlag) {
++            PutBit(bitStream, side_element_is_cpe[i], 1);
++            PutBit(bitStream, side_element_tag_select[i], 4);
++        }
++        bits += 5;
++    }
++    for (i = 0; i < num_back_channel_elements; i++) {
++        if (writeFlag) {
++            PutBit(bitStream, back_element_is_cpe[i], 1);
++            PutBit(bitStream, back_element_tag_select[i], 4);
++        }
++        bits += 5;
++    }
++    for (i = 0; i < num_lfe_channel_elements; i++) {
++        if (writeFlag)
++            PutBit(bitStream, lfe_element_tag_select[i], 4);
++        bits += 4;
++    }
++
++    /* byte_alignment() */
++    bits += ByteAlign(bitStream, writeFlag, bits + byte_alignment);
++
++    /* comment_field_bytes */
++    if (writeFlag)
++        PutBit(bitStream, 0, 8);
++    bits += 8;
++
++    return bits;
++}
++
+ #ifdef DRM
+ /*
+     ****************************************************************************
+diff -Naur faac-1.28.old/libfaac/bitstream.h faac-1.28.new/libfaac/bitstream.h
+--- faac-1.28.old/libfaac/bitstream.h	2004-07-04 14:10:52.000000000 +0200
++++ faac-1.28.new/libfaac/bitstream.h	2012-08-06 21:15:34.000000000 +0200
+@@ -164,6 +164,13 @@
+            unsigned long data,
+            int numBit);
+ 
++/* write a program_config_element() */
++int WritePCE(faacEncHandle hEncoder,
++             BitStream *bitStream,
++             int byte_alignment,
++             int instance_tag,
++             int writeFlag);
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+diff -Naur faac-1.28.old/libfaac/channels.c faac-1.28.new/libfaac/channels.c
+--- faac-1.28.old/libfaac/channels.c	2001-09-04 20:39:35.000000000 +0200
++++ faac-1.28.new/libfaac/channels.c	2012-08-06 21:15:34.000000000 +0200
+@@ -28,83 +28,112 @@
+ #include "coder.h"
+ #include "util.h"
+ 
+-/* If LFE present                                                       */
+-/*  Num channels       # of SCE's       # of CPE's       #of LFE's      */
+-/*  ============       ==========       ==========       =========      */
+-/*      1                  1                0               0           */
+-/*      2                  0                1               0           */
+-/*      3                  1                1               0           */
+-/*      4                  1                1               1           */
+-/*      5                  1                2               0           */
+-/* For more than 5 channels, use the following elements:                */
+-/*      2*N                1                2*(N-1)         1           */
+-/*      2*N+1              1                2*N             0           */
+-/*                                                                      */
+-/* Else:                                                                */
+-/*                                                                      */
+-/*  Num channels       # of SCE's       # of CPE's       #of LFE's      */
+-/*  ============       ==========       ==========       =========      */
+-/*      1                  1                0               0           */
+-/*      2                  0                1               0           */
+-/*      3                  1                1               0           */
+-/*      4                  2                1               0           */
+-/*      5                  1                2               0           */
+-/* For more than 5 channels, use the following elements:                */
+-/*      2*N                2                2*(N-1)         0           */
+-/*      2*N+1              1                2*N             0           */
+-
+-void GetChannelInfo(ChannelInfo *channelInfo, int numChannels, int useLfe)
+-{
+-    int sceTag = 0;
+-    int lfeTag = 0;
+-    int cpeTag = 0;
+-    int numChannelsLeft = numChannels;
++static void addSCE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag);
++static void addCPE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag);
++static void addLFE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag);
+ 
+ 
+-    /* First element is sce, except for 2 channel case */
+-    if (numChannelsLeft != 2) {
+-        channelInfo[numChannels-numChannelsLeft].present = 1;
+-        channelInfo[numChannels-numChannelsLeft].tag = sceTag++;
+-        channelInfo[numChannels-numChannelsLeft].cpe = 0;
+-        channelInfo[numChannels-numChannelsLeft].lfe = 0;
++void GetChannelInfo(ChannelInfo *channelInfo, int numFrontChannels, int numSideChannels, int numBackChannels, int numLFEChannels)
++{
++    int i;
++    int sceTag           = 0;
++    int cpeTag           = 0;
++    int lfeTag           = 0;
++    int numChannels      = (numFrontChannels +
++                            numSideChannels  +
++                            numBackChannels  +
++                            numLFEChannels);
++    int numChannelsLeft  = numChannels;
++
++    /* Front channels */
++    i = numFrontChannels;
++    if (i % 2) {
++        // Front Center
++        addSCE(channelInfo, numChannels, numChannelsLeft, sceTag);
+         numChannelsLeft--;
++        sceTag++;
++        i--;
++    }
++    while (i) {
++        // Front Left/Right, Front Left/Right of Center, ???
++        addCPE(channelInfo, numChannels, numChannelsLeft, cpeTag);
++        numChannelsLeft -= 2;
++        cpeTag++;
++        i -= 2;
+     }
+ 
+-    /* Next elements are cpe's */
+-    while (numChannelsLeft > 1) {
+-        /* Left channel info */
+-        channelInfo[numChannels-numChannelsLeft].present = 1;
+-        channelInfo[numChannels-numChannelsLeft].tag = cpeTag++;
+-        channelInfo[numChannels-numChannelsLeft].cpe = 1;
+-        channelInfo[numChannels-numChannelsLeft].common_window = 0;
+-        channelInfo[numChannels-numChannelsLeft].ch_is_left = 1;
+-        channelInfo[numChannels-numChannelsLeft].paired_ch = numChannels-numChannelsLeft+1;
+-        channelInfo[numChannels-numChannelsLeft].lfe = 0;
++    /* Side channels */
++    i = numSideChannels;
++    while (i > 1) {
++        // Surround Left/Right (if rear surrounds present), ???
++        addCPE(channelInfo, numChannels, numChannelsLeft, cpeTag);
++        numChannelsLeft -= 2;
++        cpeTag++;
++        i -= 2;
++    }
++    if (i) {
++        // ???
++        addSCE(channelInfo, numChannels, numChannelsLeft, sceTag);
+         numChannelsLeft--;
++        sceTag++;
++        i--;
++    }
+ 
+-        /* Right channel info */
+-        channelInfo[numChannels-numChannelsLeft].present = 1;
+-        channelInfo[numChannels-numChannelsLeft].cpe = 1;
+-        channelInfo[numChannels-numChannelsLeft].common_window = 0;
+-        channelInfo[numChannels-numChannelsLeft].ch_is_left = 0;
+-        channelInfo[numChannels-numChannelsLeft].paired_ch = numChannels-numChannelsLeft-1;
+-        channelInfo[numChannels-numChannelsLeft].lfe = 0;
++    /* Back channels */
++    i = numBackChannels;
++    while (i > 1) {
++        // Surround Left/Right (if rear surrounds absent), Rear Surround Left/Right, ???
++        addCPE(channelInfo, numChannels, numChannelsLeft, cpeTag);
++        numChannelsLeft -= 2;
++        cpeTag++;
++        i -= 2;
++    }
++    if (i) {
++        // Surround Center
++        addSCE(channelInfo, numChannels, numChannelsLeft, sceTag);
+         numChannelsLeft--;
++        sceTag++;
++        i--;
+     }
+ 
+-    /* Is there another channel left ? */
+-    if (numChannelsLeft) {
+-        if (useLfe) {
+-            channelInfo[numChannels-numChannelsLeft].present = 1;
+-            channelInfo[numChannels-numChannelsLeft].tag = lfeTag++;
+-            channelInfo[numChannels-numChannelsLeft].cpe = 0;
+-            channelInfo[numChannels-numChannelsLeft].lfe = 1;
+-        } else {
+-            channelInfo[numChannels-numChannelsLeft].present = 1;
+-            channelInfo[numChannels-numChannelsLeft].tag = sceTag++;
+-            channelInfo[numChannels-numChannelsLeft].cpe = 0;
+-            channelInfo[numChannels-numChannelsLeft].lfe = 0;
+-        }
++    /* LFE channel */
++    i = numLFEChannels;
++    while (i) {
++        addLFE(channelInfo, numChannels, numChannelsLeft, lfeTag);
+         numChannelsLeft--;
++        lfeTag++;
++        i--;
+     }
+ }
++
++static void addSCE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag) {
++    channelInfo[numChannels-numChannelsLeft].present         = 1;
++    channelInfo[numChannels-numChannelsLeft].cpe             = 0;
++    channelInfo[numChannels-numChannelsLeft].lfe             = 0;
++    channelInfo[numChannels-numChannelsLeft].tag             = tag;
++}
++
++static void addCPE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag) {
++    /* Left channel info */
++    channelInfo[numChannels-numChannelsLeft].present         = 1;
++    channelInfo[numChannels-numChannelsLeft].cpe             = 1;
++    channelInfo[numChannels-numChannelsLeft].lfe             = 0;
++    channelInfo[numChannels-numChannelsLeft].tag             = tag;
++    channelInfo[numChannels-numChannelsLeft].ch_is_left      = 1;
++    channelInfo[numChannels-numChannelsLeft].common_window   = 0;
++    channelInfo[numChannels-numChannelsLeft].paired_ch       = numChannels-numChannelsLeft+1;
++    /* Right channel info */
++    channelInfo[numChannels-numChannelsLeft+1].present       = 1;
++    channelInfo[numChannels-numChannelsLeft+1].cpe           = 1;
++    channelInfo[numChannels-numChannelsLeft+1].lfe           = 0;
++    channelInfo[numChannels-numChannelsLeft+1].ch_is_left    = 0;
++    channelInfo[numChannels-numChannelsLeft+1].common_window = 0;
++    channelInfo[numChannels-numChannelsLeft+1].paired_ch     = numChannels-numChannelsLeft;
++}
++
++static void addLFE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag) {
++    channelInfo[numChannels-numChannelsLeft].present         = 1;
++    channelInfo[numChannels-numChannelsLeft].cpe             = 0;
++    channelInfo[numChannels-numChannelsLeft].lfe             = 1;
++    channelInfo[numChannels-numChannelsLeft].tag             = tag;
++}
+diff -Naur faac-1.28.old/libfaac/channels.h faac-1.28.new/libfaac/channels.h
+--- faac-1.28.old/libfaac/channels.h	2003-06-26 21:19:41.000000000 +0200
++++ faac-1.28.new/libfaac/channels.h	2012-08-06 21:15:34.000000000 +0200
+@@ -45,7 +45,7 @@
+     MSInfo msInfo;
+ } ChannelInfo;
+ 
+-void GetChannelInfo(ChannelInfo *channelInfo, int numChannels, int useLfe);
++void GetChannelInfo(ChannelInfo *channelInfo, int numFrontChannels, int numSideChannels, int numBackChannels, int numLFEChannels);
+ 
+ #ifdef __cplusplus
+ }
+diff -Naur faac-1.28.old/libfaac/frame.c faac-1.28.new/libfaac/frame.c
+--- faac-1.28.old/libfaac/frame.c	2004-11-17 15:26:06.000000000 +0100
++++ faac-1.28.new/libfaac/frame.c	2012-08-06 21:15:34.000000000 +0200
+@@ -99,21 +99,47 @@
+         return -2; /* not supported */
+     }
+ 
+-    *pSizeOfDecoderSpecificInfo = 2;
+-    *ppBuffer = malloc(2);
++    if (hEncoder->config.channelConfiguration > 7) {
++        fprintf(stderr, "faacEncGetDecoderSpecificInfo: "
++                "invalid channel configuration %u\n",
++                hEncoder->config.channelConfiguration);
++        return -2;
++    } else if (hEncoder->config.channelConfiguration) {
++        // 16 bits
++        *pSizeOfDecoderSpecificInfo = 2;
++    } else {
++        // 16 bits + size of the program_config_element()
++        *pSizeOfDecoderSpecificInfo = 2 + (WritePCE(hEncoder, NULL, 0, 0, 0) / 8);
++    }
+ 
+-    if(*ppBuffer != NULL){
++    *ppBuffer = malloc(*pSizeOfDecoderSpecificInfo);
+ 
++    if (*ppBuffer != NULL) {
+         memset(*ppBuffer,0,*pSizeOfDecoderSpecificInfo);
+         pBitStream = OpenBitStream(*pSizeOfDecoderSpecificInfo, *ppBuffer);
+         PutBit(pBitStream, hEncoder->config.aacObjectType, 5);
+         PutBit(pBitStream, hEncoder->sampleRateIdx, 4);
+-        PutBit(pBitStream, hEncoder->numChannels, 4);
++        PutBit(pBitStream, hEncoder->config.channelConfiguration, 4);
++        PutBit(pBitStream, 0, 1); // frameLengthFlag
++        PutBit(pBitStream, 0, 1); // dependsOnCoreCoder
++        PutBit(pBitStream, 0, 1); // extensionFlag
++        if (!hEncoder->config.channelConfiguration) {
++            /* a program_config_element() must be written */
++            if (WritePCE(hEncoder, pBitStream, 0, 0, 1) <= 0) {
++                fprintf(stderr,
++                        "faacEncGetDecoderSpecificInfo: WritePCE() failed!\n");
++                *pSizeOfDecoderSpecificInfo = 0;
++                CloseBitStream(pBitStream);
++                free(*ppBuffer);
++                *ppBuffer = NULL;
++                return -3;
++            }
++        }
+         CloseBitStream(pBitStream);
+-
+         return 0;
+     } else {
+-        return -3;
++        *pSizeOfDecoderSpecificInfo = 0;
++        return -4;
+     }
+ }
+ 
+@@ -131,7 +157,6 @@
+ 	int i;
+ 
+     hEncoder->config.allowMidside = config->allowMidside;
+-    hEncoder->config.useLfe = config->useLfe;
+     hEncoder->config.useTns = config->useTns;
+     hEncoder->config.aacObjectType = config->aacObjectType;
+     hEncoder->config.mpegVersion = config->mpegVersion;
+@@ -139,6 +164,77 @@
+     hEncoder->config.inputFormat = config->inputFormat;
+     hEncoder->config.shortctl = config->shortctl;
+ 
++    if (!config->channelConfiguration) {
++        if (hEncoder->numChannels != (config->numFrontChannels +
++                                      config->numSideChannels +
++                                      config->numBackChannels +
++                                      config->numLFEChannels)) {
++            fprintf(stderr, "faacEncSetConfiguration: "
++                    "numChannels doesn't match the custom channel configuration\n");
++            return 0;
++        }
++        hEncoder->config.numFrontChannels = config->numFrontChannels;
++        hEncoder->config.numSideChannels  = config->numSideChannels;
++        hEncoder->config.numBackChannels  = config->numBackChannels;
++        hEncoder->config.numLFEChannels   = config->numLFEChannels;
++    } else if (config->channelConfiguration > 7) {
++        fprintf(stderr, "faacEncSetConfiguration: "
++                "invalid channel configuration %u\n",
++                config->channelConfiguration);
++        return 0;
++    } else {
++        if ((config->channelConfiguration == 7 && hEncoder->numChannels != 8) ||
++            (config->channelConfiguration != 7 && hEncoder->numChannels != config->channelConfiguration)) {
++            fprintf(stderr, "faacEncSetConfiguration: "
++                    "numChannels doesn't match the channel configuration\n");
++            return 0;
++        }
++        switch (config->channelConfiguration) {
++            case 7:
++                hEncoder->config.numFrontChannels = 5;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 2;
++                hEncoder->config.numLFEChannels   = 1;
++                break;
++            case 6:
++                hEncoder->config.numFrontChannels = 3;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 2;
++                hEncoder->config.numLFEChannels   = 1;
++                break;
++            case 5:
++                hEncoder->config.numFrontChannels = 3;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 2;
++                hEncoder->config.numLFEChannels   = 0;
++                break;
++            case 4:
++                hEncoder->config.numFrontChannels = 3;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 1;
++                hEncoder->config.numLFEChannels   = 0;
++                break;
++            case 3:
++                hEncoder->config.numFrontChannels = 3;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 0;
++                hEncoder->config.numLFEChannels   = 0;
++                break;
++            case 2:
++                hEncoder->config.numFrontChannels = 2;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 0;
++                hEncoder->config.numLFEChannels   = 0;
++                break;
++            case 1:
++                hEncoder->config.numFrontChannels = 1;
++                hEncoder->config.numSideChannels  = 0;
++                hEncoder->config.numBackChannels  = 0;
++                hEncoder->config.numLFEChannels   = 0;
++                break;
++        }
++    }
++
+     assert((hEncoder->config.outputFormat == 0) || (hEncoder->config.outputFormat == 1));
+ 
+     switch( hEncoder->config.inputFormat )
+@@ -306,6 +402,12 @@
+     *maxOutputBytes += 1; /* for CRC */
+ #endif
+ 
++    if (!numChannels || numChannels > 64) {
++        fprintf(stderr, "faacEncOpen: invalid number of channels %u\n",
++                numChannels);
++        return NULL;
++    }
++
+     hEncoder = (faacEncStruct*)AllocMemory(sizeof(faacEncStruct));
+     SetMemory(hEncoder, 0, sizeof(faacEncStruct));
+ 
+@@ -324,7 +426,6 @@
+     hEncoder->config.mpegVersion = MPEG4;
+     hEncoder->config.aacObjectType = LTP;
+     hEncoder->config.allowMidside = 1;
+-    hEncoder->config.useLfe = 1;
+     hEncoder->config.useTns = 0;
+     hEncoder->config.bitRate = 0; /* default bitrate / channel */
+     hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate;
+@@ -340,6 +441,91 @@
+ 	/* default channel map is straight-through */
+ 	for( channel = 0; channel < 64; channel++ )
+ 		hEncoder->config.channel_map[channel] = channel;
++
++    /* Define a sensible default channel configuration */
++    if (numChannels <= 6 || numChannels == 8) {
++        switch (numChannels) {
++            case 8:
++                hEncoder->config.channelConfiguration = 7;
++                hEncoder->config.numFrontChannels     = 5;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 2;
++                hEncoder->config.numLFEChannels       = 1;
++                break;
++            case 6:
++                hEncoder->config.channelConfiguration = 6;
++                hEncoder->config.numFrontChannels     = 3;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 2;
++                hEncoder->config.numLFEChannels       = 1;
++                break;
++            case 5:
++                hEncoder->config.channelConfiguration = 5;
++                hEncoder->config.numFrontChannels     = 3;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 2;
++                hEncoder->config.numLFEChannels       = 0;
++                break;
++            case 4:
++                hEncoder->config.channelConfiguration = 4;
++                hEncoder->config.numFrontChannels     = 3;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 1;
++                hEncoder->config.numLFEChannels       = 0;
++                break;
++            case 3:
++                hEncoder->config.channelConfiguration = 3;
++                hEncoder->config.numFrontChannels     = 3;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 0;
++                hEncoder->config.numLFEChannels       = 0;
++                break;
++            case 2:
++                hEncoder->config.channelConfiguration = 2;
++                hEncoder->config.numFrontChannels     = 2;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 0;
++                hEncoder->config.numLFEChannels       = 0;
++                break;
++            case 1:
++                hEncoder->config.channelConfiguration = 1;
++                hEncoder->config.numFrontChannels     = 1;
++                hEncoder->config.numSideChannels      = 0;
++                hEncoder->config.numBackChannels      = 0;
++                hEncoder->config.numLFEChannels       = 0;
++                break;
++        }
++    } else {
++        hEncoder->config.channelConfiguration = 0;
++        hEncoder->config.numFrontChannels     = 0;
++        hEncoder->config.numSideChannels      = 0;
++        hEncoder->config.numBackChannels      = 0;
++        hEncoder->config.numLFEChannels       = 0;
++        for (channel = numChannels; channel > 0; channel--) {
++            // 7 channels:   7.0 (C   L   R   Ls  Rs  Rls Rrs)
++            // 9 channels:   9.0 (Lc  Rc  L   R   Ls  Rs  Rls Rrs Cs)
++            // 10 channels: 10.0 (C   Lc  Rc  L   R   Ls  Rs  Rls Rrs Cs)
++            // for more than 10 channels, use faacEncSetConfiguration()
++            if (hEncoder->config.numFrontChannels        < 3) {
++                // C, L, R
++                hEncoder->config.numFrontChannels++;
++            } else if (hEncoder->config.numBackChannels  < 2) {
++                // Ls or Rls, Rs or Rrs
++                hEncoder->config.numBackChannels++;
++            } else if (hEncoder->config.numSideChannels  < 2) {
++                // Ls, Rs
++                hEncoder->config.numSideChannels++;
++            } else if (hEncoder->config.numBackChannels  < 3) {
++                // Cs
++                hEncoder->config.numBackChannels++;
++            } else if (hEncoder->config.numFrontChannels < 5) {
++                // Lc, Rc
++                hEncoder->config.numFrontChannels++;
++            } else {
++                break;
++            }
++        }
++    }
+ 	
+     /*
+         by default we have to be compatible with all previous software
+@@ -459,14 +645,13 @@
+     double fix;
+ #endif
+ 
+-    /* local copy's of parameters */
++    /* local copies of parameters */
+     ChannelInfo *channelInfo = hEncoder->channelInfo;
+     CoderInfo *coderInfo = hEncoder->coderInfo;
+     unsigned int numChannels = hEncoder->numChannels;
+     unsigned int sampleRate = hEncoder->sampleRate;
+     unsigned int aacObjectType = hEncoder->config.aacObjectType;
+     unsigned int mpegVersion = hEncoder->config.mpegVersion;
+-    unsigned int useLfe = hEncoder->config.useLfe;
+     unsigned int useTns = hEncoder->config.useTns;
+     unsigned int allowMidside = hEncoder->config.allowMidside;
+     unsigned int bandWidth = hEncoder->config.bandWidth;
+@@ -484,7 +669,11 @@
+         return 0;
+ 
+     /* Determine the channel configuration */
+-    GetChannelInfo(channelInfo, numChannels, useLfe);
++    GetChannelInfo(channelInfo,
++                   hEncoder->config.numFrontChannels,
++                   hEncoder->config.numSideChannels,
++                   hEncoder->config.numBackChannels,
++                   hEncoder->config.numLFEChannels);
+ 
+     /* Update current sample buffers */
+     for (channel = 0; channel < numChannels; channel++)

HandBrake-0.9.8.tar.bz2/contrib/faac/P00-cygwin.patch -> HandBrake-0.9.9.tar.bz2/contrib/faac/P00-cygwin.patch Changed

HandBrake-0.9.9.tar.bz2/contrib/fdk-aac Added

HandBrake-0.9.9.tar.bz2/contrib/fdk-aac/module.defs Added

HandBrake-0.9.9.tar.bz2/contrib/fdk-aac/module.rules Added

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/A01-h264-recovery-point.patch Added

@@ -0,0 +1,63 @@
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c
+index 8625b0f..e862701 100644
+--- a/libavcodec/h264.c
++++ b/libavcodec/h264.c
+@@ -2164,6 +2164,7 @@ static void flush_dpb(AVCodecContext *avctx)
+ 
+     flush_change(h);
+     ff_mpeg_flush(avctx);
++    h->recovery_frame= -1;
+ }
+ 
+ static int init_poc(H264Context *h)
+@@ -4001,9 +4002,18 @@ again:
+                 if ((err = decode_slice_header(hx, h)))
+                     break;
+ 
++                if (h->sei_recovery_frame_cnt >= 0 && h->recovery_frame < 0) {
++                    h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) %
++                                        (1 << h->sps.log2_max_frame_num);
++                }
++
+                 s->current_picture_ptr->f.key_frame |=
+-                    (hx->nal_unit_type == NAL_IDR_SLICE) ||
+-                    (h->sei_recovery_frame_cnt >= 0);
++                        (hx->nal_unit_type == NAL_IDR_SLICE);
++
++                if (h->recovery_frame == h->frame_num) {
++                    s->current_picture_ptr->f.key_frame |= 1;
++                    h->recovery_frame = -1;
++                }
+ 
+                 if (h->current_slice == 1) {
+                     if (!(s->flags2 & CODEC_FLAG2_CHUNKS))
+diff --git a/libavcodec/h264.h b/libavcodec/h264.h
+index 898ebf7..42aaa6f 100644
+--- a/libavcodec/h264.h
++++ b/libavcodec/h264.h
+@@ -568,6 +568,13 @@ typedef struct H264Context {
+      * frames.
+      */
+     int sei_recovery_frame_cnt;
++    /**
++     * recovery_frame is the frame_num at which the next frame should
++     * be fully constructed.
++     *
++     * Set to -1 when not expecting a recovery point.
++     */
++    int recovery_frame;
+ 
+     int luma_weight_flag[2];    ///< 7.4.3.2 luma_weight_lX_flag
+     int chroma_weight_flag[2];  ///< 7.4.3.2 chroma_weight_lX_flag
+diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
+index 2e5fb65..ea33a18 100644
+--- a/libavcodec/h264_sei.c
++++ b/libavcodec/h264_sei.c
+@@ -38,6 +38,7 @@ static const uint8_t sei_num_clock_ts_table[9]={
+ };
+ 
+ void ff_h264_reset_sei(H264Context *h) {
++    h->recovery_frame               = -1;
+     h->sei_recovery_frame_cnt       = -1;
+     h->sei_dpb_output_delay         =  0;
+     h->sei_cpb_removal_delay        = -1;

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/A02-dca-resync.patch Added

@@ -0,0 +1,73 @@
+From 9922584ba3b5b02d913e629ea74d72e994870873 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Thu, 17 Jan 2013 19:57:26 +0100
+Subject: [PATCH] dca_parser: Handle changes in dca frame size
+
+A change in framesize caused a perpetual loss of synchronization.
+So read (and use) the frame size from the frame header instead of
+setting it only once.
+---
+ libavcodec/dca_parser.c |   15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
+index ab235cf..12180f3 100644
+--- a/libavcodec/dca_parser.c
++++ b/libavcodec/dca_parser.c
+@@ -62,10 +62,12 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
+             if (IS_MARKER(state, i, buf, buf_size)) {
+                 if (pc1->lastmarker && state == pc1->lastmarker) {
+                     start_found = 1;
++                    i++;
+                     break;
+                 } else if (!pc1->lastmarker) {
+                     start_found = 1;
+                     pc1->lastmarker = state;
++                    i++;
+                     break;
+                 }
+             }
+@@ -80,9 +82,6 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
+             if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
+                 if(pc1->framesize > pc1->size)
+                     continue;
+-                if(!pc1->framesize){
+-                    pc1->framesize = pc1->hd_pos ? pc1->hd_pos : pc1->size;
+-                }
+                 pc->frame_start_found = 0;
+                 pc->state = -1;
+                 pc1->size = 0;
+@@ -139,7 +138,7 @@ int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
+ }
+ 
+ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
+-                            int *sample_rate)
++                            int *sample_rate, int *framesize)
+ {
+     GetBitContext gb;
+     uint8_t hdr[12 + FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
+@@ -159,7 +158,11 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
+         return AVERROR_INVALIDDATA;
+     *duration = 256 * (sample_blocks / 8);
+ 
+-    skip_bits(&gb, 20);
++    *framesize = get_bits(&gb, 14) + 1;
++    if (*framesize < 95)
++        return AVERROR_INVALIDDATA;
++
++    skip_bits(&gb, 6);
+     sr_code = get_bits(&gb, 4);
+     *sample_rate = avpriv_dca_sample_rates[sr_code];
+     if (*sample_rate == 0)
+@@ -190,7 +193,7 @@ static int dca_parse(AVCodecParserContext * s,
+     }
+ 
+     /* read the duration and sample rate from the frame header */
+-    if (!dca_parse_params(buf, buf_size, &duration, &sample_rate)) {
++    if (!dca_parse_params(buf, buf_size, &duration, &sample_rate, &pc1->framesize)) {
+         s->duration = duration;
+         avctx->sample_rate = sample_rate;
+     } else
+-- 
+1.7.10.4
+

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/A03-truehd-downmix.patch Added

@@ -0,0 +1,33 @@
+diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
+index 0eaf2e3..ef1812d 100644
+--- a/libavcodec/mlpdec.c
++++ b/libavcodec/mlpdec.c
+@@ -445,14 +445,24 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
+         return AVERROR_INVALIDDATA;
+     }
+ 
+-    if (m->avctx->request_channels > 0
+-        && s->max_channel + 1 >= m->avctx->request_channels
+-        && substr < m->max_decoded_substream) {
++#if FF_API_REQUEST_CHANNELS
++    if (m->avctx->request_channels > 0 &&
++        m->avctx->request_channels <= s->max_channel + 1 &&
++        m->max_decoded_substream > substr) {
+         av_log(m->avctx, AV_LOG_DEBUG,
+-               "Extracting %d channel downmix from substream %d. "
++               "Extracting %d-channel downmix from substream %d. "
+                "Further substreams will be skipped.\n",
+                s->max_channel + 1, substr);
+         m->max_decoded_substream = substr;
++    } else
++#endif
++    if (m->avctx->request_channel_layout == s->ch_layout &&
++        m->max_decoded_substream > substr) {
++        av_log(m->avctx, AV_LOG_DEBUG,
++               "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. "
++               "Further substreams will be skipped.\n",
++               s->max_channel + 1, s->ch_layout, substr);
++        m->max_decoded_substream = substr;
+     }
+ 
+     s->noise_shift   = get_bits(gbp,  4);

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/P01-solaris.patch -> HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/P01-solaris.patch Changed

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/P02-darwin-pic.patch -> HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/P02-darwin-pic.patch Changed

@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index e01d9fd..d5d6aec 100755
+index 6ab04ae..fa9f980 100755
 --- a/configure
 +++ b/configure
-@@ -2413,6 +2413,7 @@ case $target_os in
+@@ -2893,6 +2893,7 @@ case $target_os in
          AVSERVERLDFLAGS=-Wl,-bind_at_load
          objformat="macho"
          enabled x86_64 && objformat="macho64"
@@ -10,12 +10,12 @@
          enabled_any pic shared ||
              { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
          ;;
-@@ -2530,7 +2531,7 @@ esac
+@@ -3095,7 +3096,7 @@ esc(){
  
- echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$LIBAV_CONFIGURATION" >config.fate
+ echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
  
 -check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
 +#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
  
  set_default $PATHS_LIST
- 
+ set_default nm

HandBrake-0.9.8.tar.bz2/contrib/ffmpeg/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/module.defs Changed

@@ -1,42 +1,48 @@
-$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB))
+$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2
+FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
 
 FFMPEG.CONFIGURE.deps =
 FFMPEG.CONFIGURE.env  =
 FFMPEG.CONFIGURE.host =
 
 FFMPEG.CONFIGURE.extra = \
+    --enable-gpl \
     --disable-doc \
     --disable-bsfs \
-    --disable-encoders \
-    --disable-ffmpeg \
     --disable-avconv \
     --disable-avplay \
     --disable-avprobe \
+    --disable-avdevice \
+    --disable-avfilter \
     --disable-avserver \
     --disable-muxers \
     --disable-network \
-    --disable-vaapi \
-    --disable-dxva2 \
-    --enable-bzlib \
-    --enable-encoder=flac \
-    --enable-encoder=ac3 \
+    --disable-hwaccels \
+    --disable-encoders \
     --enable-encoder=aac \
-    --enable-encoder=mpeg4 \
+    --enable-encoder=ac3 \
+    --enable-encoder=flac \
     --enable-encoder=mpeg2video \
+    --enable-encoder=mpeg4 \
     --enable-encoder=snow \
-    --enable-gpl \
     --enable-zlib \
+    --enable-bzlib \
     --cc="$(FFMPEG.GCC.gcc)" \
-    --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include)" \
     --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
 
+ifeq (1,$(FEATURE.fdk_aac))
+FFMPEG.CONFIGURE.extra += \
+    --enable-nonfree \
+    --enable-libfdk-aac \
+    --enable-encoder=libfdk_aac
+endif
+
 ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag
 ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack
-    FFMPEG.GCC.args.extra = -fno-common
+    FFMPEG.GCC.args.extra += -fno-common
 else ifeq (darwin,$(BUILD.system))
     ## section for darwin-archs
     FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine) --target-os=darwin
@@ -54,8 +60,16 @@
 
 ifneq (none,$(FFMPEG.GCC.g))
 	FFMPEG.CONFIGURE.extra += --enable-debug
+
+ifeq (max,$(FFMPEG.GCC.g))
+    FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DDEBUG"
+else
+    FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DNDEBUG"
+endif
+
 else
 	FFMPEG.CONFIGURE.extra += --disable-debug
+    FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DNDEBUG"
 endif
 
 ifeq (none,$(FFMPEG.GCC.O))
@@ -81,8 +95,13 @@
     endif
 endif
 
-## MPC8 Doesn't compile on SPARC
+## For POSIX.1-2001
 ifeq (solaris,$(BUILD.system))
+    FFMPEG.CONFIGURE.extra += --extra-libs=/usr/lib/values-xpg6.o
+endif
+
+## MPC8 Doesn't compile on SPARC
+ifeq (solaris-sparc,$(BUILD.system)-$(BUILD.machine))
     FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
 endif

HandBrake-0.9.8.tar.bz2/contrib/fontconfig/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/fontconfig/module.defs Changed

@@ -1,4 +1,4 @@
-__deps__ := FREETYPE LIBXML2
+__deps__ := FREETYPE LIBXML2 LIBICONV
 $(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FONTCONFIG))
 
@@ -19,6 +19,8 @@
     FONTCONFIG.config_archoption  = --with-arch=i386
 else ifeq ($(BUILD.system),linux)
     FONTCONFIG.cc_archoption      = 
+else ifeq ($(BUILD.system),solaris)
+    FONTCONFIG.cc_archoption      =
 else
     FONTCONFIG.cc_archoption      = -arch $(FONTCONFIG.GCC.archs)
     FONTCONFIG.config_archoption  = --with-arch=$(FONTCONFIG.GCC.archs)
@@ -51,19 +53,19 @@
 # 
 ifeq (max,$(FONTCONFIG.GCC.g))
     ifeq (none,$(FONTCONFIG.GCC.O))
-        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
-        FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
+        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
+        FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
     else
-        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
-        FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
+        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
+        FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
     endif
 else
-    FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
-    FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+    FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+    FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
 endif
 
-FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
-FONTCONFIG.CONFIGURE.env.LDFLAGS  = LDFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)"
+FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+FONTCONFIG.CONFIGURE.env.LDFLAGS  = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)"
 
 # 
 # Force use of libxml2 instead of expat with --enable-libxml2.
@@ -77,11 +79,12 @@
 FONTCONFIG.CONFIGURE.extra = \
     --enable-libxml2 \
     --with-freetype-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/freetype-config) \
-    LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
-    LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
-    $(FONTCONFIG.config_archoption)
+    $(FONTCONFIG.config_archoption) --disable-silent-rules
+
 ifeq (darwin,$(BUILD.system))
 FONTCONFIG.CONFIGURE.extra += \
+    LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
+    LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
     --with-fcpath=/usr/X11/lib/X11/fontconfig \
     --with-cache-dir=/usr/X11/var/cache/fontconfig
 else ifeq (linux,$(BUILD.system))

HandBrake-0.9.9.tar.bz2/contrib/freetype/P01-solaris-use-gmake.patch Added

HandBrake-0.9.8.tar.bz2/contrib/freetype/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/freetype/module.defs Changed

HandBrake-0.9.8.tar.bz2/contrib/libass/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libass/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/libbluray/A00-automake.patch Added

HandBrake-0.9.9.tar.bz2/contrib/libbluray/A01-filter-dup.patch Added

@@ -0,0 +1,80 @@
+diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
+index c8dc307..26d0000 100644
+--- a/src/libbluray/bdnav/navigation.c
++++ b/src/libbluray/bdnav/navigation.c
+@@ -32,9 +32,25 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b)
++{
++    if (a->stream_type == b->stream_type &&
++        a->coding_type == b->coding_type &&
++        a->pid         == b->pid         &&
++        a->subpath_id  == b->subpath_id  &&
++        a->subclip_id  == b->subclip_id  &&
++        a->format      == b->format      &&
++        a->rate        == b->rate        &&
++        a->char_code   == b->char_code   &&
++        memcmp(a->lang, b->lang, 4) == 0) {
++        return 1;
++    }
++    return 0;
++}
++
+ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
+ {
+-    unsigned ii, jj;
++    unsigned ii, jj, kk;
+ 
+     for (ii = 0; ii < count; ii++) {
+         if (pl->list_count != pl_list[ii]->list_count) {
+@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
+                 pi1->out_time != pi2->out_time) {
+                 break;
+             }
++            if (pi1->stn.num_video           != pi2->stn.num_video           ||
++                pi1->stn.num_audio           != pi2->stn.num_audio           ||
++                pi1->stn.num_pg              != pi2->stn.num_pg              || 
++                pi1->stn.num_ig              != pi2->stn.num_ig              ||
++                pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio ||
++                pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) {
++                break;
++            }
++            for (kk = 0; kk < pi1->stn.num_video; kk++) {
++                if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_audio; kk++) {
++                if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_pg; kk++) {
++                if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_ig; kk++) {
++                if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) {
++                if (!_stream_cmp(&pi1->stn.secondary_audio[kk],
++                                 &pi2->stn.secondary_audio[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) {
++                if (!_stream_cmp(&pi1->stn.secondary_video[kk],
++                                 &pi2->stn.secondary_video[kk])) {
++                    goto next;
++                }
++            }
+         }
++next:
+         if (jj != pl->list_count) {
+             continue;
+         }

HandBrake-0.9.8.tar.bz2/contrib/libbluray/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libbluray/module.defs Changed

HandBrake-0.9.8.tar.bz2/contrib/libdvdnav/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/P01-mingw-bitfields.patch Added

HandBrake-0.9.9.tar.bz2/contrib/libiconv/A00-do-not-build-preloadable-iconv-shared-library.patch Added

@@ -0,0 +1,106 @@
+From 766e19dd36c57330cf5985677a5af09e3165253b Mon Sep 17 00:00:00 2001
+From: Sean McGovern <gseanmcg@gmail.com>
+Date: Wed, 31 Oct 2012 23:33:41 -0400
+Subject: [PATCH] do not build preloadable iconv shared library
+
+---
+ Makefile.in | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8168cad..b27cbea 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -31,7 +31,7 @@ SHELL = /bin/sh
+ 
+ all : lib/localcharset.h force
+ 	cd lib && $(MAKE) all
+-	cd preload && $(MAKE) all
++#	cd preload && $(MAKE) all
+ 	cd srclib && $(MAKE) all
+ 	cd src && $(MAKE) all
+ 	cd po && $(MAKE) all
+@@ -51,7 +51,7 @@ install-lib : all force
+ install : lib/localcharset.h force
+ 	cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+-	cd preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
++#	cd preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd src && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
+@@ -62,7 +62,7 @@ install : lib/localcharset.h force
+ install-strip : lib/localcharset.h force
+ 	cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd lib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+-	cd preload && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
++#	cd preload && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd srclib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd src && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
+@@ -73,7 +73,7 @@ install-strip : lib/localcharset.h force
+ installdirs : force
+ 	cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd lib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+-	cd preload && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
++#	cd preload && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd srclib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd src && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
+@@ -83,7 +83,7 @@ installdirs : force
+ uninstall : force
+ 	cd libcharset && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd lib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+-	cd preload && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
++#	cd preload && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd srclib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	$(RM) $(DESTDIR)$(includedir)/iconv.h
+@@ -93,7 +93,7 @@ uninstall : force
+ check : all force
+ 	cd libcharset && $(MAKE) check
+ 	cd lib && $(MAKE) check
+-	cd preload && $(MAKE) check
++#	cd preload && $(MAKE) check
+ 	cd srclib && $(MAKE) check
+ 	cd src && $(MAKE) check
+ 	cd po && $(MAKE) check
+@@ -104,7 +104,7 @@ mostlyclean : force
+ 	cd libcharset && $(MAKE) mostlyclean
+ 	$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
+ 	cd lib && $(MAKE) mostlyclean
+-	cd preload && $(MAKE) mostlyclean
++#	cd preload && $(MAKE) mostlyclean
+ 	cd srclib && $(MAKE) mostlyclean
+ 	cd src && $(MAKE) mostlyclean
+ 	cd po && $(MAKE) mostlyclean
+@@ -116,7 +116,7 @@ clean : force
+ 	cd libcharset && $(MAKE) clean
+ 	$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
+ 	cd lib && $(MAKE) clean
+-	cd preload && $(MAKE) clean
++#	cd preload && $(MAKE) clean
+ 	cd srclib && $(MAKE) clean
+ 	cd src && $(MAKE) clean
+ 	cd po && $(MAKE) clean
+@@ -128,7 +128,7 @@ distclean : force
+ 	cd libcharset && if test -f Makefile; then $(MAKE) distclean; fi
+ 	$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
+ 	cd lib && if test -f Makefile; then $(MAKE) distclean; fi
+-	cd preload && if test -f Makefile; then $(MAKE) distclean; fi
++#	cd preload && if test -f Makefile; then $(MAKE) distclean; fi
+ 	cd srclib && if test -f Makefile; then $(MAKE) distclean; fi
+ 	cd src && if test -f Makefile; then $(MAKE) distclean; fi
+ 	cd po && if test -f Makefile; then $(MAKE) distclean; fi
+@@ -143,7 +143,7 @@ maintainer-clean : force
+ 	cd libcharset && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ 	$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
+ 	cd lib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+-	cd preload && if test -f Makefile; then $(MAKE) maintainer-clean; fi
++#	cd preload && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ 	cd srclib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ 	cd src && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ 	cd po && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+-- 
+1.7.12
+

HandBrake-0.9.9.tar.bz2/contrib/libmkv/A01-hbmv-pgs.patch Added

HandBrake-0.9.8.tar.bz2/contrib/libmkv/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libmkv/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/libogg/A00-automake.patch Added

HandBrake-0.9.8.tar.bz2/contrib/libsamplerate/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libsamplerate/module.defs Changed

HandBrake-0.9.8.tar.bz2/contrib/libtheora/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libtheora/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/libtool Added

HandBrake-0.9.9.tar.bz2/contrib/libtool/module.defs Added

HandBrake-0.9.9.tar.bz2/contrib/libtool/module.rules Added

HandBrake-0.9.9.tar.bz2/contrib/libvorbis/A00-automake.patch Added

HandBrake-0.9.8.tar.bz2/contrib/libxml2/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/libxml2/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/m4 Added

HandBrake-0.9.9.tar.bz2/contrib/m4/module.defs Added

HandBrake-0.9.9.tar.bz2/contrib/m4/module.rules Added

HandBrake-0.9.8.tar.bz2/contrib/mp4v2/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/mp4v2/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/A02-gwluserdata.patch Added

@@ -0,0 +1,39 @@
+diff -ru mpeg2dec.orig/libvo/video_out_dx.c mpeg2dec/libvo/video_out_dx.c
+--- mpeg2dec.orig/libvo/video_out_dx.c	2008-07-09 11:28:24.000000000 -0700
++++ mpeg2dec/libvo/video_out_dx.c	2012-09-08 05:31:39.304849824 -0700
+@@ -92,9 +92,9 @@
+     switch (message) {
+ 
+     case WM_WINDOWPOSCHANGED:
+-	instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA);
++	/*instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA);
+ 
+-	/* update the window position and size */
++	// update the window position and size
+ 	point_window.x = 0;
+ 	point_window.y = 0;
+ 	ClientToScreen (hwnd, &point_window);
+@@ -104,9 +104,9 @@
+ 	instance->window_coords.right = rect_window.right + point_window.x;
+ 	instance->window_coords.bottom = rect_window.bottom + point_window.y;
+ 
+-	/* update the overlay */
++	// update the overlay 
+ 	if (instance->overlay && instance->display)
+-	    update_overlay (instance);
++	    update_overlay (instance);*/
+ 
+ 	return 0;
+ 
+@@ -173,7 +173,10 @@
+     /* store a directx_instance pointer into the window local storage
+      * (for later use in event_handler).
+      * We need to use SetWindowLongPtr when it is available in mingw */
+-    SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance);
++
++    // Current version of MINGW-W64 does not have this!
++    // Since we are not outputting to a display, this is not a problem.
++    //SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance);
+ 
+     ShowWindow (instance->window, SW_SHOW);
+ 
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/contrib/x264/A00-version-string.patch Added

HandBrake-0.9.8.tar.bz2/contrib/x264/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/x264/module.defs Changed

HandBrake-0.9.8.tar.bz2/contrib/yasm/module.defs -> HandBrake-0.9.9.tar.bz2/contrib/yasm/module.defs Changed

HandBrake-0.9.8.tar.bz2/doc/BUILD-Linux -> HandBrake-0.9.9.tar.bz2/doc/BUILD-Linux Changed

@@ -1,4 +1,4 @@
-Guide to Building HandBrake svn4394 (2012010401) on Linux
+Guide to Building HandBrake svn5208 (2013012701) on Linux
 *********************************************************
 
 Table of Contents
@@ -38,11 +38,11 @@
 
    * Intel 32-bit or 64-bit kernel
 
-   * Ubuntu 10.04, gcc 4.4.3, yasm 0.8.0
+   * Ubuntu 12.04, gcc 4.5, yasm 1.2.x
 
-   * Fedora 14, gcc 4.5.1, yasm 1.0.1
+   * Fedora 17 and 18, gcc 4.5, yasm 1.2.x
 
-   * gcc 4.0.0 or higher is reported to work
+   * gcc 4.5 or higher is reported to work
 
      Note: It is recommended to use the platform distribution's
      standard compiler for maximum C++ compatibility. If you build with
@@ -75,7 +75,7 @@
 intend to disable building the GUI with `configure --disable-gtk' you
 will not need many of these packages installed:
 
-Ubuntu 10.04 - 10.10 packages:
+Ubuntu 12+ packages:
    * subversion (cli/gui)
 
    * yasm (cli/gui)
@@ -90,8 +90,24 @@
 
    * libbz2-dev (cli/gui)
 
+   * libxml2-dev (cli/gui)
+
+   * libogg-dev (cli/gui)
+
+   * libtheora-dev (cli/gui)
+
+   * libvorbis-dev (cli/gui)
+
+   * libsamplerate-dev (cli/gui)
+
    * libfribidi-dev (cli/gui)
 
+   * libfreetype6-dev (cli/gui)
+
+   * libfontconfig1-dev (cli/gui)
+
+   * libass-dev (cli/gui)
+
    * intltool (gui)
 
    * libglib2.0-dev (gui)
@@ -110,17 +126,18 @@
 
    * libgstreamer-plugins-base0.10-dev (gui)
 
-Ubuntu 11.04 - 11.10 packages:
+Ubuntu 12+ packages:
    * libappindicator-dev (gui)
 
 To install these packages:
-     sudo apt-get install subversion yasm build-essential \
-     autoconf libtool zlib1g-dev libbz2-dev libfribidi-dev \
-     intltool libglib2.0-dev libdbus-glib-1-dev libgtk2.0-dev \
-     libgudev-1.0-dev libwebkit-dev libnotify-dev libgstreamer0.10-dev \
-     libgstreamer-plugins-base0.10-dev libappindicator-dev
-
-Fedora 12 - 13 package groups:
+     sudo apt-get install subversion yasm build-essential autoconf libtool \
+     zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \
+     libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \
+     libfontconfig1-dev libass-dev intltool libglib2.0-dev libdbus-glib-1-dev \
+     libgtk2.0-dev libgudev-1.0-dev libwebkit-dev libnotify-dev \
+     libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libappindicator-dev
+
+Fedora 17+ package groups:
    * Development Tools
 
    * Development Libraries
@@ -140,8 +157,24 @@
 
    * bzip2-devel (cli/gui)
 
+   * libogg-devel (cli/gui)
+
+   * libtheora-devel (cli/gui)
+
+   * libvorbis-devel (cli/gui)
+
+   * libsamplerate-devel (cli/gui)
+
+   * libxml2-devel (cli/gui)
+
    * fribidi-devel (cli/gui)
 
+   * freetype-devel (cli/gui)
+
+   * fontconfig-devel (cli/gui)
+
+   * libass-devel (cli/gui)
+
    * dbus-glib-devel (gui)
 
    * libgudev1-devel (gui)
@@ -155,8 +188,10 @@
    * gstreamer-plugins-base-devel (gui)
 
 To install these packages:
-     sudo yum install yasm zlib-devel bzip2-devel fribidi-devel \
-     dbus-glib-devel libgudev1-devel webkitgtk-devel libnotify-devel \
+     sudo yum install yasm zlib-devel bzip2-devel libogg-devel libtheora-devel \
+     libvorbis-devel libsamplerate-devel libxml2-devel fribidi-devel \
+     freetype-devel fontconfig-devel libass-devel dbus-glib-devel \
+     libgudev1-devel webkitgtk-devel libnotify-devel \
      gstreamer-devel gstreamer-plugins-base-devel
 
 3 QuickStart
@@ -165,7 +200,7 @@
 This chapter is for building from a terminal/shell environment in as
 few commands as possible. Upon completion of the following commands you
 should have a fresh build of HandBrake. Further instructions are
-available beginning with *note overview:: which describes procedures
+available beginning with *Note overview:: which describes procedures
 suitable for repeating builds. This chapter should be skipped by those
 seeking more than a minimalist build.
 
@@ -555,7 +590,7 @@
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    4394
-     date:   2011-12-30 17:21:44 -0500
+     rev:    5208
+     date:   2013-01-26 18:47:13 +0000
      type:   developer

HandBrake-0.9.8.tar.bz2/doc/BUILD-Mac -> HandBrake-0.9.9.tar.bz2/doc/BUILD-Mac Changed

@@ -1,4 +1,4 @@
-Build Guide for HandBrake 4394svn on Mac OS X
+Build Guide for HandBrake 5388svn on Mac OS X
 *********************************************
 
 Table of Contents
@@ -23,11 +23,10 @@
 6 Building via Xcode.app
   6.1 Checkout Sources
   6.2 Build
-  6.3 Note: Debugging
-  6.4 Note: Finding Built Products
-  6.5 Note: Workspace Log Behaviors
-  6.6 External Target
-  6.7 User-Defined Settings
+  6.3 Note: Finding Built Products
+  6.4 Note: Workspace Log Behaviors
+  6.5 External Target
+  6.6 User-Defined Settings
 7 Troubleshooting
 Appendix A Project Repository Details
 
@@ -49,13 +48,28 @@
 
    * Mac Intel hardware
 
-   * Mac OS X 10.7.2
+   * Mac OS X 10.7.5 or Mac OS X 10.8.3
 
-   * Xcode 4.2.1 (Build version 4D502)
+   * Xcode 4.6.1 (4H512)
 
-   * llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658)
+   * llvm-gcc-4.2 version 4.2.1 (Based on Apple Inc. build 5658) (LLVM
+     build 2336.11.00)
 
-   * yasm 1.1.0.2352
+   * Xcode command-line tools (installed via Preferences > Downloads >
+     Components)
+
+   * XQuartz (http://xquartz.macosforge.org/landing/)
+
+The following tools are compiled during the build process if necessary,
+but you can speed up your build by installing them:
+
+   * yasm 1.2.0 or later
+
+   * autoconf
+
+   * automake
+
+   * libtool
 
      Note: It is recommended to use the platform distribution's
      standard compiler for maximum C++ compatibility. If you build with
@@ -90,7 +104,7 @@
 This chapter is for building from a terminal/shell environment in as
 few commands as possible. Upon completion of the following commands you
 should have a fresh build of HandBrake. Further instructions are
-available beginning with *note overview:: which describes procedures
+available beginning with *Note overview:: which describes procedures
 suitable for repeating builds. This chapter should be skipped by those
 seeking more than a minimalist build.
 
@@ -517,17 +531,7 @@
 
    * Xcode workspace Log navigator - select top Build item
 
-6.3 Note: Debugging
-===================
-
-When debugging, Xcode launches the application under the gdb debugger.
-gdb will encounter a trap when starting the program. This trap is
-harmless and you should just 'continue'. For the curious, the trap
-occurs because we add some values to the environment with setenv, then
-do a brain transplant with execv. Restarting the application with execv
-triggers the trap.
-
-6.4 Note: Finding Built Products
+6.3 Note: Finding Built Products
 ================================
 
 Under default Xcode.app options the products from a build are managed
@@ -550,7 +554,7 @@
      greyed-out. Workaround glitch by selecting any other tab and then
      reselecting Projects tab.
 
-6.5 Note: Workspace Log Behaviors
+6.4 Note: Workspace Log Behaviors
 =================================
 
 The default Workspace behavior does not display latest Build log in the
@@ -578,7 +582,7 @@
      are ignored by the external build system. Ultimately, look to the
      workspace status indicator for Build Succeeded.
 
-6.6 External Target
+6.5 External Target
 ===================
 
 The external target mechanism is used to launch a full terminal-based
@@ -631,7 +635,7 @@
      make ffmpeg.clean
      make BUILD.jobs=1 ffmpeg
 
-6.7 User-Defined Settings
+6.6 User-Defined Settings
 =========================
 
 The following user defined settings are visible in Xcode project and
@@ -688,10 +692,6 @@
      Environment (variables) dump as seen when Xcode forks `make'.
      Mac OS X only.
 
-A note about gdb: We perform an extra execv when starting the
-application.  This triggers a trap in gdb.  It is harmless.  You should
-just 'continue' from the trap.
-
 Appendix A Project Repository Details
 *************************************
 
@@ -699,7 +699,7 @@
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    4394
-     date:   2011-12-30 17:21:44 -0500
+     rev:    5388
+     date:   2013-04-09 14:21:38 +0200
      type:   developer

HandBrake-0.9.9.tar.bz2/doc/BUILD-MinGW Added

@@ -0,0 +1,485 @@
+Guide to Building HandBrake svn5208 (2013012701) on MinGW
+*********************************************************
+
+Table of Contents
+*****************
+
+1 Introduction
+2 Prerequisites
+3 QuickStart
+4 Overview
+5 Building via Terminal
+  5.1 Checkout Sources
+  5.2 Configure
+  5.3 Build
+  5.4 Make Targets
+    5.4.1 Global
+    5.4.2 General Modules
+    5.4.3 Contrib Modules
+    5.4.4 Contrib Touch and Untouch
+    5.4.5 Contrib Aggregates
+  5.5 Customizing Make
+6 Troubleshooting
+Appendix A Project Repository Details
+
+
+1 Introduction
+**************
+
+This guide documents the recommended process to build HandBrake on
+MinGW hosts from the official source-code repository. Building from any
+other source is not supported.
+
+2 Prerequisites
+***************
+
+The following are the recommended specifications for building on
+MinGW; but is not necessarily the only configuration that is possible:
+
+   * Intel 32-bit or 64-bit hardware
+
+   * MinGW on Fedora 17+, Ubuntu 12+ or Debian, gcc 4.5+
+
+   * yasm 1.2.x (for i386 or x86_64 architectures)
+
+     Note: It is recommended to use the platform distribution's
+     standard compiler for maximum C++ compatibility. If you build with
+     a custom compiler it will likely introduce non-standard runtime
+     requirements and have new/delete, exception and RTTI
+     incompatibilities. There are of course many valid reasons to build
+     with unbundled compilers, but be aware it is generally unsupported
+     and left as an exercise to the reader.
+
+     Note: You must set the -cross flag with configure to cross compile
+     with windows.  See the Example below. Note that the cross compiler
+     name varies between distributions.
+
+     As of this writing, MinGW has available to it several versions of
+     gcc; only one of which may be found and used in the path as `gcc'
+     and `g++'. Configure will thus find what is probably the older
+     version of gcc in a typical MinGW environment. If you desire to
+     build with the newer gcc, it is found in the path as `gcc-4' and
+     `g++-4' respectively and you must indicate to configure the
+     desired versions. The following syntax should do the trick:
+
+     ../configure --cross=i686-w64-mingw32 --gcc=gcc-4
+
+The following general tools are used on various platforms and it is
+recommended you use these versions or similar:
+
+   * subversion - 1.6.16
+
+   * python - Python 2.7.1
+
+   * curl - curl 7.21.4 (or wget)
+
+   * m4 - GNU M4 1.4.6
+
+   * make - GNU Make 3.81
+
+   * patch - Patch 2.5.8
+
+   * tar - GNU tar 1.26
+
+   * wget - GNU Wget 1.13.4 (or curl)
+
+3 QuickStart
+************
+
+This chapter is for building from a terminal/shell environment in as
+few commands as possible. Upon completion of the following commands you
+should have a fresh build of HandBrake. Further instructions are
+available beginning with *Note overview:: which describes procedures
+suitable for repeating builds. This chapter should be skipped by those
+seeking more than a minimalist build.
+
+     svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
+     cd hb-trunk
+     ./configure --launch
+
+The special option `--launch' selects launch mode and performs the
+following steps:
+
+   * assert scratch directory `build/' does not exist
+
+   * create scratch directory `build/'
+
+   * change to directory `build/'
+
+   * launch `make'
+
+   * capture build output to `build/log/build.txt'
+
+   * echo build output
+
+   * print elapsed time
+
+   * indicate if build ultimately succeeded or failed
+
+4 Overview
+**********
+
+MinGW builds are performed from a terminal. There is no support for
+building from any IDEs.
+
+5 Building via Terminal
+***********************
+
+5.1 Checkout Sources
+====================
+
+Checkout HandBrake from the official source-code repository.
+
+     svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
+     cd hb-trunk
+
+Sources are checked out from the `trunk' branch. This document was
+generated from that very branch, and for example purposes, we will use
+exactly the same branch.
+
+If you have write-access to the repository, then you may add the
+appropriate login/password information as needed. It is recommended to
+use Subversion 1.6.0 or higher. Lower versions should also work.
+
+5.2 Configure
+=============
+
+Configure the build system.
+
+     ./configure
+
+Configure will automatically create a scratch build directory `build'
+unless you use GNU-style build procedures and first `cd' to a directory
+other than top-level source. Additionally you may use `--build' to
+specify the directory. The name of the directory is arbitrary but it is
+recommended to use something which indicates transient files which are
+not checked into the repository.
+
+The `configure' utility accepts many options. It is recommended that
+you specify `--help' for the complete list of options. The following
+options are also documented here:
+
+`--help'
+     List available options.
+
+`--src=DIR'
+     Specify top-level source directory for HandBrake sources.
+
+`--build=DIR'
+     Specify destination directory for final product install. The
+     default is to use either `build' if in the top-level source
+     directory, otherwise `.'
+
+`--prefix=DIR'
+     Specify destination directory for final product install.  This
+     defaults to a reasonable platform-specific value.
+
+`--launch'
+     All-in-one option which launches the build and logs output
+     automatically.  Useful for novices and quick-start procedures.
+
+`--disable-gtk'
+     Disable building the GTK GUI on applicable platforms such as
+     Linux.
+
+`--debug=MODE'
+     Select debug mode. Must be one of `none', `min', `std', `max'.
+     This generally maps to gcc options `-g0', `-g1', `-g2', `-g3'.
+
+`--optimize=MODE'
+     Select optimize mode. Must be one of `none', `speed', `size'.
+     This generally maps to gcc options `-g0', `-O0', `-O3', `-Os'.
+
+`--arch=MODE'
+     Select build architecture. The available architectures vary by
+     platform. Most platforms support exactly one architecture except
+     Mac OS X which has support for various universal binary
+     architectures. The available choices are hard-coded per platform
+     and no sanity checks for the required tools are performed.
+
+`--disable-xcode'
+     Disable shunting the build through `xcodebuild'. If this option is
+     applied, `HandBrakeCLI' will be produced in a similar fashion as
+     it is on other platforms; sans Xcode and the Cocoa application
+     will not be produced. Mac OS X only.
+
+`--xcconfig=MODE'
+     Select Xcode project configuration file. The available modes are
+     the basenames of files located in `macosx/xcconfig/*.xcconfig'
+     which direct Xcode to build using various architecture and Mac OS
+     X deployment options. Mac OS X only.
+
+Clean-room procedures dictate that when certain factors change, old
+builds should be scrapped and new builds configured. This is the main
+reason for requiring a scratch directory; to promote consistent,
+reliable and clean software builds. The following is a short list of
+some of the reasons why someone may choose to scrap an existing build:
+
+   * configure with different options
+
+   * subversion working dir is updated and you want configure to
+     re-evaluate working dir metadata.
+
+   * build corruption is suspected
+
+There are generally two methods for scrapping a build. The `build'
+directory can be recursively removed which has the effect of loosing
+your existing configuration but does guarantee no residuals are left
+behind. The other method is to ask the build system to perform an `make
+xclean'. This is known to work well but will leave empty directories
+behind. However, the configuration is left intact.
+
+5.3 Build
+=========
+
+Build main product. All necessary dependencies are also built if
+required.
+
+     make
+
+Parallel builds may optionally be enabled. Be aware that while a
+parallel build may save time on systems with additional cores, the
+output is often mixed, overlapped and sometimes even corrupted with
+binary characters. Thus if you experience a build issue, you should
+clean and redo the build in default serial mode to produce a readable
+log. The following command allows for up to 4 concurrent jobs via make:
+
+     make -j4
+
+5.4 Make Targets
+================
+
+The build system supports passing many kinds of targets some of which
+become very useful in normal development cycles. The targets by
+convention are lower-case words passed to `make'. Global targets are
+one-word targets. Scoped targets are usually two-words separated by a
+period.
+
+5.4.1 Global
+------------
+
+`make'
+     Alias for `make build'.
+
+`make build'
+     Build main product. All necessary dependencies are also built if
+     required.
+
+`make clean'
+     Clean all build output excluding contrib modules. Configuration is
+     retained.
+
+`make install'
+     Perform final product(s) install.  This will install build
+     products to a standard directory or one specified via `configure
+     --prefix' option.
+
+`make uninstall'
+     Perform final product(s) uninstall.  This will uninstall any
+     products which may have been previously installed.
+
+`make xclean'
+     Clean all build output including contrib modules. Configuration is
+     retained.
+
+`make doc'
+     Build auto-generated project documentation. Various articles are
+     produced and may be found in `build/doc/articles'.
+
+`make doc.post'
+     Build auto-generated project documentation and post produced
+     articles directly to source tree.
+
+`make report.help'
+     Print list of available makefile vars report targets.  These
+     reports detail var definitions and expanded values used by the
+     build system.  For experts only.
+
+`make report.all'
+     Convenience target which aggregates all reports.  For experts only.
+
+5.4.2 General Modules
+---------------------
+
+General modules such as `libhb', `test' and `gtk' have the following
+scoped targets:
+
+`make MODULE.build'
+     Build MODULE.
+
+`make MODULE.clean'
+     Clean build output for MODULE.
+
+5.4.3 Contrib Modules
+---------------------
+
+Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg',
+`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray',
+`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv',
+`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis',
+`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the
+following scoped targets:
+
+`make MODULE.fetch'
+     Download source tarball from the Internet and save to
+     `TOP/downloads' directory. No check-summing is performed.
+
+`make MODULE.extract'
+     Extract source tarball into `build' tree.
+
+`make MODULE.patch'
+     Apply appropriate patches (if any) to module sources.
+
+`make MODULE.configure'
+     Configure module sources.  This usually invokes autotool configure.
+
+`make MODULE.build'
+     Build module.  This usually invokes autotool build.
+
+`make MODULE.install'
+     Install module products such as headers and libraries into `build'
+     tree.  This usually invokes autotool install.
+
+`make MODULE.uninstall'
+     Uninstall module products; generally the reverse of install.  This
+     usually invokes autotool uninstall.
+
+`make MODULE.clean'
+     Clean module; generally the reverse of build.  This usually
+     invokes autotool clean.
+
+`make MODULE.xclean'
+     Extra clean module; first invokes uninstall then recursively
+     removes the module build directory.
+
+5.4.4 Contrib Touch and Untouch
+-------------------------------
+
+Also available are some very granular targets which help force builds
+from specific cycle points. The following targets are available to
+touch and untouch the respective module target; this will force the
+build system to treat the target as satisfied after a touch or
+unsatisfied after an untouch:
+
+   * make MODULE.extract.touch
+
+   * make MODULE.extract.untouch
+
+   * make MODULE.patch.touch
+
+   * make MODULE.patch.untouch
+
+   * make MODULE.configure.touch
+
+   * make MODULE.configure.untouch
+
+   * make MODULE.build.touch
+
+   * make MODULE.build.untouch
+
+   * make MODULE.install.touch
+
+   * make MODULE.install.untouch
+
+5.4.5 Contrib Aggregates
+------------------------
+
+For convenience, the following targets aggregate the all contrib
+modules' respective targets together:
+
+   * make contrib.fetch
+
+   * make contrib.extract
+
+   * make contrib.patch
+
+   * make contrib.configure
+
+   * make contrib.build
+
+   * make contrib.install
+
+   * make contrib.uninstall
+
+   * make contrib.clean
+
+   * make contrib.xclean
+
+5.5 Customizing Make
+====================
+
+If the need arises to override settings in the build system
+(essentially gnu-make variables) the recommended method is to create
+optional include files which are automatically included if present and
+follow this naming convention; Do not check these files into the
+repository:
+
+`_SRC_/custom.defs'
+     Custom makevar definitions outside `build'. Suitable for settings
+     which apply across all builds for a particular checkout; or which
+     survives manual removal of `build'.
+
+`_SRC_/custom.rules'
+     Custom make rules outside `build'. Suitable for rules which apply
+     across all builds for a particular checkout; or which survives
+     manual removal of `build'.
+
+`_BUILD_/GNUmakefile.custom.defs'
+     Custom makevar definitions specific to a `build' directory.
+
+`_BUILD_/GNUmakefile.custom.rules'
+     Custom makevar rules specific to a `build' directory.
+
+
+The purpose is to allow a place to store local build settings for
+testing, tweaking, and experimenting with build configuration without
+losing your settings if `configure' is invoked; ie: `configure' would
+overwrite `GNUmakefile' and any customizations contained therein would
+be lost. Here is a short example of what the contents of
+`_SRC_/custom.defs' might contain:
+
+     ## bump to gcc-4.6 in current path
+     GCC.gcc = /usr/bin/gcc-4.6
+
+     ## replace optimize for 'speed' with more aggressive settings
+     GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2
+
+See also `make report.help' which displays a set of reports used to
+dump makefile vars.
+
+6 Troubleshooting
+*****************
+
+When troubleshooting build issues, the following files relative to the
+`build/' directory may be especially useful:
+
+`GNUmakefile'
+     Top-level makefile which contains build settings generated via
+     configure.
+
+`log/config.info.txt'
+     Record of output from configure.
+
+`log/config.verbose.txt'
+     Record of verbose output from configure.
+
+`log/build.txt'
+     Record of output from `configure --launch'. Similar output may be
+     recorded using `make' depending on which shell is in use, eg:
+     `make >& log/build.txt' or `make > log/build.txt 2>&1'.
+
+`log/xcodemake.env.txt'
+     Environment (variables) dump as seen when Xcode forks `make'.
+     Mac OS X only.
+
+Appendix A Project Repository Details
+*************************************
+
+     url:    svn://svn.handbrake.fr/HandBrake/trunk
+     root:   svn://svn.handbrake.fr/HandBrake
+     branch: trunk
+     uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
+     rev:    5208
+     date:   2013-01-26 18:47:13 +0000
+     type:   developer
+

HandBrake-0.9.8.tar.bz2/doc/module.rules -> HandBrake-0.9.9.tar.bz2/doc/module.rules Changed

HandBrake-0.9.8.tar.bz2/doc/texi/Building.linux.texi -> HandBrake-0.9.9.tar.bz2/doc/texi/Building.linux.texi Changed

@@ -19,9 +19,9 @@
 
 @itemize @bullet
 @item Intel 32-bit or 64-bit kernel
-@item Ubuntu 10.04, gcc 4.4.3, yasm 0.8.0
-@item Fedora 14, gcc 4.5.1, yasm 1.0.1
-@item gcc 4.0.0 or higher is reported to work
+@item Ubuntu 12.04, gcc 4.5, yasm 1.2.x
+@item Fedora 17 and 18, gcc 4.5, yasm 1.2.x
+@item gcc 4.5 or higher is reported to work
 @end itemize
 
 @include building/prerequisites.bundled.texi
@@ -30,7 +30,7 @@
 
 The @b{GTK UI} introduces some significant extra build requirements. If you intend to disable building the GUI with @command{configure --disable-gtk} you will not need many of these packages installed:
 
-Ubuntu 10.04 - 10.10 packages:
+Ubuntu 12+ packages:
 @itemize @bullet
 @item subversion (cli/gui)
 @item yasm (cli/gui)
@@ -39,7 +39,15 @@
 @item libtool (cli/gui)
 @item zlib1g-dev (cli/gui)
 @item libbz2-dev (cli/gui)
+@item libxml2-dev (cli/gui)
+@item libogg-dev (cli/gui)
+@item libtheora-dev (cli/gui)
+@item libvorbis-dev (cli/gui)
+@item libsamplerate-dev (cli/gui)
 @item libfribidi-dev (cli/gui)
+@item libfreetype6-dev (cli/gui)
+@item libfontconfig1-dev (cli/gui)
+@item libass-dev (cli/gui)
 @item intltool (gui)
 @item libglib2.0-dev (gui)
 @item libdbus-glib-1-dev (gui)
@@ -51,21 +59,22 @@
 @item libgstreamer-plugins-base0.10-dev (gui)
 @end itemize
 
-Ubuntu 11.04 - 11.10 packages:
+Ubuntu 12+ packages:
 @itemize @bullet
 @item libappindicator-dev (gui)
 @end itemize
 
 To install these packages:
 @example
-sudo apt-get install subversion yasm build-essential \
-autoconf libtool zlib1g-dev libbz2-dev libfribidi-dev \
-intltool libglib2.0-dev libdbus-glib-1-dev libgtk2.0-dev \
-libgudev-1.0-dev libwebkit-dev libnotify-dev libgstreamer0.10-dev \
-libgstreamer-plugins-base0.10-dev libappindicator-dev
+sudo apt-get install subversion yasm build-essential autoconf libtool \
+zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \
+libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \
+libfontconfig1-dev libass-dev intltool libglib2.0-dev libdbus-glib-1-dev \
+libgtk2.0-dev libgudev-1.0-dev libwebkit-dev libnotify-dev \
+libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libappindicator-dev
 @end example
 
-Fedora 12 - 13 package groups:
+Fedora 17+ package groups:
 @itemize @bullet
 @item Development Tools
 @item Development Libraries
@@ -84,7 +93,15 @@
 @item yasm (cli/gui)
 @item zlib-devel (cli/gui)
 @item bzip2-devel (cli/gui)
+@item libogg-devel (cli/gui)
+@item libtheora-devel (cli/gui)
+@item libvorbis-devel (cli/gui)
+@item libsamplerate-devel (cli/gui)
+@item libxml2-devel (cli/gui)
 @item fribidi-devel (cli/gui)
+@item freetype-devel (cli/gui)
+@item fontconfig-devel (cli/gui)
+@item libass-devel (cli/gui)
 @item dbus-glib-devel (gui)
 @item libgudev1-devel (gui)
 @item webkitgtk-devel (gui)
@@ -95,8 +112,10 @@
 
 To install these packages:
 @example
-sudo yum install yasm zlib-devel bzip2-devel fribidi-devel \
-dbus-glib-devel libgudev1-devel webkitgtk-devel libnotify-devel \
+sudo yum install yasm zlib-devel bzip2-devel libogg-devel libtheora-devel \
+libvorbis-devel libsamplerate-devel libxml2-devel fribidi-devel \
+freetype-devel fontconfig-devel libass-devel dbus-glib-devel \
+libgudev1-devel webkitgtk-devel libnotify-devel \
 gstreamer-devel gstreamer-plugins-base-devel
 @end example

HandBrake-0.9.9.tar.bz2/doc/texi/Building.mingw.texi Added

@@ -0,0 +1,51 @@
+@input texinfo @c -*- Texinfo -*-
+@c %**start of header
+@setfilename Building.mingw.info
+@include base/article.texi
+@include building/command.texi
+@paragraphindent none
+
+@set BG.platform mingw
+@c %**end of header
+
+@majorheading Guide to Building @value{HB.title} on @value{OS.@value{BG.platform}}
+@contents
+@include building/chapter.introduction.texi
+
+@c %**-------------------------------------------------------------------------
+@anchor{prerequisites}
+@chapter Prerequisites
+The following are the recommended specifications for building on @value{OS.mingw}; but is not necessarily the only configuration that is possible:
+
+@itemize @bullet
+@item Intel 32-bit or 64-bit hardware
+@item @value{OS.mingw} on Fedora 17+, Ubuntu 12+ or Debian, gcc 4.6+
+@item yasm 1.2.x (for i386 or x86_64 architectures)
+@end itemize
+
+@include building/prerequisites.bundled.texi
+
+@quotation Note
+You must set the --cross flag with configure to cross compile with windows.
+See the Example below. Note that the cross compiler name varies between distributions.
+
+As of this writing, @value{OS.mingw} has available to it several versions of gcc; only one of which may be found and used in the path as @code{gcc} and @code{g++}. Configure will thus find what is probably the older version of gcc in a typical @value{OS.mingw} environment. If you desire to build with the newer gcc, it is found in the path as @command{gcc-4} and @command{g++-4} respectively and you must indicate to configure the desired versions. The following syntax should do the trick:
+@end quotation
+
+@example
+../configure --cross=i686-w64-mingw32 --gcc=gcc-4
+@end example
+
+@include building/prerequisites.common.texi
+
+@c %**-------------------------------------------------------------------------
+@include building/chapter.quickstart.texi
+
+@anchor{overview}
+@chapter Overview
+@value{OS.mingw} builds are performed from a @b{terminal}. There is no support for building from any IDEs.
+
+@c %**-------------------------------------------------------------------------
+@include building/chapter.via.terminal.texi
+@include building/chapter.troubleshooting.texi
+@include building/appendix.repo.texi

HandBrake-0.9.8.tar.bz2/doc/texi/Building.osx.texi -> HandBrake-0.9.9.tar.bz2/doc/texi/Building.osx.texi Changed

@@ -20,10 +20,20 @@
 
 @itemize @bullet
 @item Mac Intel hardware
-@item @value{OS.osx} 10.7.2
-@item Xcode 4.2.1 (Build version 4D502)
-@item llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658)
-@item yasm 1.1.0.2352
+@item @value{OS.osx} 10.7.5 or @value{OS.osx} 10.8.3
+@item Xcode 4.6.1 (4H512)
+@item llvm-gcc-4.2 version 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)
+@item Xcode command-line tools (installed via Preferences > Downloads > Components)
+@item XQuartz (http://xquartz.macosforge.org/landing/)
+@end itemize
+
+The following tools are compiled during the build process if necessary, but you can speed up your build by installing them:
+
+@itemize @bullet
+@item yasm 1.2.0 or later
+@item autoconf
+@item automake
+@item libtool
 @end itemize
 
 @include building/prerequisites.bundled.texi
@@ -70,6 +80,4 @@
 @c %**-------------------------------------------------------------------------
 @include building/chapter.via.xcode.texi
 @include building/chapter.troubleshooting.texi
-
-A note about gdb: We perform an extra execv when starting the application.  This triggers a trap in gdb.  It is harmless.  You should just 'continue' from the trap.
 @include building/appendix.repo.texi

HandBrake-0.9.8.tar.bz2/doc/texi/base/glossary.texi -> HandBrake-0.9.9.tar.bz2/doc/texi/base/glossary.texi Changed

HandBrake-0.9.8.tar.bz2/doc/texi/building/chapter.via.xcode.texi -> HandBrake-0.9.9.tar.bz2/doc/texi/building/chapter.via.xcode.texi Changed

HandBrake-0.9.9.tar.bz2/gfx Added

HandBrake-0.9.9.tar.bz2/gfx/hbFull.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons Added

HandBrake-0.9.9.tar.bz2/gfx/icons/-Credits.md Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Activity.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Activity@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Encode.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Encode@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Pause.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Pause@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/PauseEncode.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/PauseEncode@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Presets.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Presets@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Preview.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Preview@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Source.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Source@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Start.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Start@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Stop.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/Stop@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/add.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/add@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/addPreset.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/addPreset@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/addqueue.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/addqueue@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/advanced.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/advanced@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/audio.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/audio@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/delete.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/delete@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/disc.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/disc2.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/disc2@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/disc@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/information.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/information@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/minimise.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/minimise@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/new.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/new@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/ActivityWindow.tiff Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/AddToQueue.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Brushed_Window.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Delete.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/DeleteHighlight.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/DeleteHighlightPressed.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/DeletePressed.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Drawer.tiff Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeCanceled.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeComplete.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeWorking0.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeWorking1.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeWorking2.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeWorking3.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeWorking4.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/EncodeWorking5.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Info.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobLarge.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobPassFirstSmall.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobPassLarge.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobPassSecondSmall.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobPassSmall.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobPassSubtitleSmall.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobPassUnknownSmall.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/JobSmall.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Movies.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Pause.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Play.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Preferences.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Queue.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/Reveal.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/RevealHighlight.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/RevealHighlightPressed.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/RevealPressed.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/old/picture.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/pref-audio.tiff Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/old/stop.png Changed

HandBrake-0.9.9.tar.bz2/gfx/icons/pause2.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/pause2@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/picturesettings.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/picturesettings@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/play2.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/play2@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/problem.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/problem@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/psd.zip Added

HandBrake-0.9.9.tar.bz2/gfx/icons/question.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/question@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/remove.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/remove@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/removePreset.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/removePreset@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/settings.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/settings@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/showqueue.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/showqueue@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/stop2.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/stop2@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/stopEncode.png Added

HandBrake-0.9.9.tar.bz2/gfx/icons/stopEncode@2x.png Added

HandBrake-0.9.9.tar.bz2/gfx/old_logo.png Changed

HandBrake-0.9.8.tar.bz2/gtk/configure.ac -> HandBrake-0.9.9.tar.bz2/gtk/configure.ac Changed

@@ -36,21 +36,18 @@
 if test  $hb_PATHSET = 1 ; then
     case ${with_hb} in
     /*)
-		CXXFLAGS="$CXXFLAGS -I$with_hb/libhb"
-		CFLAGS="$CFLAGS -I$with_hb/libhb"
+		HBINC="-I$with_hb/libhb -I$with_hb/contrib/include"
 		LDFLAGS="$LDFLAGS -L$with_hb/libhb -L$with_hb/contrib/lib"
 		AC_SUBST(HB_DIR, "$with_hb")
         ;;
     *)
-		CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb"
-		CFLAGS="$CFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb"
+		HBINC='-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include"
 		LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"$with_hb/libhb "'-L$(top_srcdir)/'"$with_hb/contrib/lib"
 		AC_SUBST(HB_DIR, '$(top_srcdir)/'"$with_hb")
         ;;
     esac
 else
-	CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"../libhb"
-	CFLAGS="$CFLAGS "'-I$(top_srcdir)/'"../libhb"
+	HBINC='-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include"
 	LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"../libhb "'-L$(top_srcdir)/'"../contrib/lib"
 	AC_SUBST(HB_DIR, '$(top_srcdir)/'"..")
 fi
@@ -59,6 +56,10 @@
 	AS_HELP_STRING([--enable-dl], [enable libdl]),
 	use_libdl=yes, use_libdl=no)
 
+AC_ARG_ENABLE(fdk-aac,
+	AS_HELP_STRING([--enable-fdk-aac], [enable fdk aac encoder]),
+	use_fdk_aac=yes, use_fdk_aac=no)
+
 AC_ARG_ENABLE(gst,
 	AS_HELP_STRING([--disable-gst], [disable gstreamer (live preview)]),
 	gst_disable=yes, gst_disable=no)
@@ -86,11 +87,7 @@
 
 case $host in
   *-*-mingw*)
-    if test "x$gst_disable" = "xyes" ; then
-        GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0"
-	else
-		GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0"
-	fi
+    GHB_PACKAGES="gthread-2.0 gio-2.0"
 	mingw_flag=yes
     ;;
   *)
@@ -99,48 +96,97 @@
 	  pkg_gudev="gudev-1.0"
 	  ;;
     esac
-    if test "x$gst_disable" = "xyes" ; then
-	    GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
-    else
-	    GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
-    fi
+    GHB_PACKAGES="gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
 	mingw_flag=no
     ;;
 esac
 
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES(Gtk3, [gtk+-3.0], use_gtk3=yes, use_gtk3=no)
+if test "x$use_gtk3" = "xyes" ; then
+    GHB_PACKAGES="gtk+-3.0 $GHB_PACKAGES"
+else
+    GHB_PACKAGES="gtk+-2.0 >= 2.10 $GHB_PACKAGES"
+fi
+
+GST1_MODULES="gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-pbutils-1.0"
+GST0_MODULES="gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-audio-0.10 gstreamer-pbutils-0.10"
+
+if test "x$gst_disable" = "xno" ; then
+    PKG_CHECK_MODULES(GStreamer1, [$GST1_MODULES], use_gst1=yes, use_gst1=no)
+    if test "x$use_gst1" = "xyes" ; then
+        GHB_PACKAGES="$GHB_PACKAGES $GST1_MODULES"
+    else
+        PKG_CHECK_MODULES(GStreamer0, [$GST0_MODULES], use_gst0=yes, use_gst0=no)
+        if test "x$use_gst0" = "xyes" ; then
+            GHB_PACKAGES="$GHB_PACKAGES $GST0_MODULES"
+        else
+            gst_disable="yes"
+        fi
+    fi
+fi
+
 if test "x$gst_disable" = "xno" ; then
 	CXXFLAGS="$CXXFLAGS -D_ENABLE_GST"
 	CFLAGS="$CFLAGS -D_ENABLE_GST"
 fi
 
-PKG_PROG_PKG_CONFIG
 if test "x$update_checks" = "xyes" ; then
-	PKG_CHECK_MODULES(OldWebKitGtk, WebKitGtk, old_webkit=yes, old_webkit=no)
-	if test "x$old_webkit" = "xyes" ; then
-		if test "x$mingw_flag" = "xno" ; then
-			GHB_PACKAGES="$GHB_PACKAGES WebKitGtk"
-			CXXFLAGS="$CXXFLAGS -D_OLD_WEBKIT"
-			CFLAGS="$CFLAGS -D_OLD_WEBKIT"
-		fi
-	else
-		if test "x$mingw_flag" = "xno" ; then
-			GHB_PACKAGES="$GHB_PACKAGES webkit-1.0"
-		fi
-	fi
+    if test "x$use_gtk3" = "xyes" ; then
+        PKG_CHECK_MODULES(WebKitGtk3, webkitgtk-3.0, use_webkitgtk3=yes, use_webkitgtk3=no)
+        if test "x$use_webkitgtk3" = "xyes" ; then
+            GHB_PACKAGES="$GHB_PACKAGES webkitgtk-3.0"
+        else
+            update_checks="no"
+	        CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
+        fi
+    else
+        PKG_CHECK_MODULES(OldWebKitGtk1, WebKitGtk, old_webkit=yes, old_webkit=no)
+        if test "x$old_webkit" = "xyes" ; then
+            if test "x$mingw_flag" = "xno" ; then
+                GHB_PACKAGES="$GHB_PACKAGES WebKitGtk"
+                CXXFLAGS="$CXXFLAGS -D_OLD_WEBKIT"
+                CFLAGS="$CFLAGS -D_OLD_WEBKIT"
+            else
+                update_checks="no"
+                CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
+            fi
+        else
+            PKG_CHECK_MODULES(WebKitGtk1, webkit-1.0, use_webkit1=yes, use_webkit1=no)
+            if test "x$use_webkit1" = "xyes" ; then
+                GHB_PACKAGES="$GHB_PACKAGES webkit-1.0"
+            else
+                update_checks="no"
+                CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
+            fi
+        fi
+    fi
 else
 	CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
 fi
 
+if test "x$use_gtk3" = "xyes" ; then
+    PKG_CHECK_MODULES(libappindicator3, appindicator3-0.1, have_appind=yes, have_appind=no)
+    if test "x$have_appind" = "xyes" ; then
+        GHB_PACKAGES="$GHB_PACKAGES appindicator3-0.1"
+        CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
+        CFLAGS="$CFLAGS -D_USE_APP_IND"
+    fi
+else
+    PKG_CHECK_MODULES(libappindicator, appindicator-0.1, have_appind=yes, have_appind=no)
+    if test "x$have_appind" = "xyes" ; then
+        GHB_PACKAGES="$GHB_PACKAGES appindicator-0.1"
+        CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
+        CFLAGS="$CFLAGS -D_USE_APP_IND"
+    fi
+fi
+
 AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
 
-PKG_CHECK_MODULES(libappindicator, appindicator-0.1, have_appind=yes, have_appind=no)
-if test "x$have_appind" = "xyes" ; then
-    GHB_PACKAGES="$GHB_PACKAGES appindicator-0.1"
-    CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
-    CFLAGS="$CFLAGS -D_USE_APP_IND"
-fi
 PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
 
+GHB_CFLAGS="$HBINC $GHB_CFLAGS"
+
 AC_PATH_PROG(BUILD_PKG_CONFIG, pkg-config, no)
 if test x"$BUILD_PKG_CONFIG" = x"no"; then
 	AC_MSG_ERROR([You need to install pkg-config])
@@ -157,6 +203,13 @@
     ;;
 esac
 
+HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
+
+if test "x$use_fdk_aac" = "xyes" ; then
+    HB_LIBS+=" -lfdk-aac"
+fi
+
+AC_SUBST(HB_LIBS)
 AC_SUBST(GHB_TOOLS_CFLAGS)
 AC_SUBST(GHB_TOOLS_LIBS)
 AC_SUBST(GHB_CFLAGS)

HandBrake-0.9.8.tar.bz2/gtk/module.defs -> HandBrake-0.9.9.tar.bz2/gtk/module.defs Changed

HandBrake-0.9.8.tar.bz2/gtk/src/Makefile.am -> HandBrake-0.9.9.tar.bz2/gtk/src/Makefile.am Changed

@@ -1,44 +1,43 @@
 ## Process this file with automake to produce Makefile.in
 
-if MINGW
-HB_LIBS= \
-	-lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
-	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-	-lx264 -lmp4v2 -lswscale -ltheora -lz \
-	-lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
-else
-HB_LIBS= \
-	-lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
-	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-	-lx264 -lmp4v2 -lswscale -ltheora -lz \
-	-lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
-endif
-
 icons =	\
-	hb-icon.128.png 
+	hb-icon.256.png \
+	hb-icon.128.png \
+	hb-icon.64.png \
+	hb-icon.48.png \
+	hb-icon.32.png \
+	hb-icon.24.png \
+	hb-icon.22.png \
+	hb-icon.16.png
 
 icons_dep =	\
 	hb-activity.32.png \
+	hb-activity.64.png \
 	hb-add-queue.32.png \
+	hb-add-queue.64.png \
 	hb-canceled.16.png \
 	hb-complete.16.png \
-	hb-drawer.32.png \
 	hb-status.32.png \
 	hb-status-empty.32.png \
 	hb-icon.128.png \
 	hb-icon.64.png \
 	hb-pause.32.png \
-	hb-play.32.png \
+	hb-pause.64.png \
+	hb-start.32.png \
+	hb-start.64.png \
 	hb-pref.32.png \
-	hb-queue.32.png \
-	hb-queue-delete.16.png \
+	hb-showqueue.32.png \
+	hb-showqueue.64.png \
+	hb-remove.24.png \
+	hb-remove.48.png \
 	hb-queue-job.16.png \
 	hb-queue-pass1.16.png \
 	hb-queue-pass2.16.png \
 	hb-queue-subtitle.16.png \
-	hb-remove.32.png \
 	hb-source.32.png \
+	hb-source.64.png \
 	hb-stop.32.png \
+	hb-stop.64.png \
 	hb-working0.16.png \
 	hb-working1.16.png \
 	hb-working2.16.png \
@@ -96,8 +95,8 @@
 	renderer_button.c \
 	ghbcellrenderertext.c \
 	ghbcellrenderertext.h \
-    ghbcompositor.c \
-    ghbcompositor.h \
+	ghbcompositor.c \
+	ghbcompositor.h \
 	ghb-dvd.c \
 	ghb-dvd.h \
 	marshalers.c \

HandBrake-0.9.8.tar.bz2/gtk/src/appcast.c -> HandBrake-0.9.9.tar.bz2/gtk/src/appcast.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * appcast.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * appcast.c is free software.
  * 
@@ -21,251 +21,251 @@
 
 enum
 {
-	A_NONE = 0,
-	A_DESCRIPTION,
-	A_ENCLOSURE,
-	A_ITEM,
+    A_NONE = 0,
+    A_DESCRIPTION,
+    A_ENCLOSURE,
+    A_ITEM,
 };
 
 typedef struct
 {
-	gchar *tag;
-	gint id;
+    gchar *tag;
+    gint id;
 } tag_map_t;
 
 static tag_map_t tag_map[] =
 {
-	{"sparkle:releaseNotesLink", A_DESCRIPTION},
-	{"enclosure", A_ENCLOSURE},
-	{"item", A_ITEM},
+    {"sparkle:releaseNotesLink", A_DESCRIPTION},
+    {"enclosure", A_ENCLOSURE},
+    {"item", A_ITEM},
 };
-#define TAG_MAP_SZ	(sizeof(tag_map)/sizeof(tag_map_t))
+#define TAG_MAP_SZ  (sizeof(tag_map)/sizeof(tag_map_t))
 
 typedef struct
 {
-	gchar *key;
-	gchar *value;
-	GQueue *stack;
-	GQueue *tag_stack;
-	GString *description;
-	gchar *build;
-	gchar *version;
-	gboolean item;
+    gchar *key;
+    gchar *value;
+    GQueue *stack;
+    GQueue *tag_stack;
+    GString *description;
+    gchar *build;
+    gchar *version;
+    gboolean item;
 } parse_data_t;
 
 static const gchar*
 lookup_attr_value(
-	const gchar *name, 
-	const gchar **attr_names, 
-	const gchar **attr_values)
+    const gchar *name, 
+    const gchar **attr_names, 
+    const gchar **attr_values)
 {
-	gint ii;
+    gint ii;
 
-	if (attr_names == NULL) return NULL;
-	for (ii = 0; attr_names[ii] != NULL; ii++)
-	{
-		if (strcmp(name, attr_names[ii]) == 0)
-			return attr_values[ii];
-	}
-	return NULL;
+    if (attr_names == NULL) return NULL;
+    for (ii = 0; attr_names[ii] != NULL; ii++)
+    {
+        if (strcmp(name, attr_names[ii]) == 0)
+            return attr_values[ii];
+    }
+    return NULL;
 }
  
 static void
 start_element(
-	GMarkupParseContext *ctx, 
-	const gchar *tag, 
-	const gchar **attr_names,
-	const gchar **attr_values,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *tag, 
+    const gchar **attr_names,
+    const gchar **attr_values,
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} id;
-	gint ii;
+    parse_data_t *pd = (parse_data_t*)ud;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } id;
+    gint ii;
 
-	for (ii = 0; ii < TAG_MAP_SZ; ii++)
-	{
-		if (strcmp(tag, tag_map[ii].tag) == 0)
-		{
-			id.id = tag_map[ii].id;
-			break;
-		}
-	}
-	if (ii == TAG_MAP_SZ)
-	{
-		g_debug("Unrecognized start tag (%s)", tag);
-		id.id = A_NONE;
-	}
-	g_queue_push_head(pd->tag_stack, id.pid);
-	switch (id.id)
-	{
-		case A_ITEM:
-		{
-			pd->item = TRUE;
-		} break;
-		case A_ENCLOSURE:
-		{
-			const gchar *build, *version;
-			build = lookup_attr_value(
-						"sparkle:version", attr_names, attr_values);
-			version = lookup_attr_value(
-						"sparkle:shortVersionString", attr_names, attr_values);
-			if (build)
-				pd->build = g_strdup(build);
-			if (version)
-				pd->version = g_strdup(version);
-		} break;
-	}
+    for (ii = 0; ii < TAG_MAP_SZ; ii++)
+    {
+        if (strcmp(tag, tag_map[ii].tag) == 0)
+        {
+            id.id = tag_map[ii].id;
+            break;
+        }
+    }
+    if (ii == TAG_MAP_SZ)
+    {
+        g_debug("Unrecognized start tag (%s)", tag);
+        id.id = A_NONE;
+    }
+    g_queue_push_head(pd->tag_stack, id.pid);
+    switch (id.id)
+    {
+        case A_ITEM:
+        {
+            pd->item = TRUE;
+        } break;
+        case A_ENCLOSURE:
+        {
+            const gchar *build, *version;
+            build = lookup_attr_value(
+                        "sparkle:version", attr_names, attr_values);
+            version = lookup_attr_value(
+                        "sparkle:shortVersionString", attr_names, attr_values);
+            if (build)
+                pd->build = g_strdup(build);
+            if (version)
+                pd->version = g_strdup(version);
+        } break;
+    }
 }
 
 static void
 end_element(
-	GMarkupParseContext *ctx, 
-	const gchar *tag, 
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *tag, 
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	gint id;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} start_id;
-	gint ii;
+    parse_data_t *pd = (parse_data_t*)ud;
+    gint id;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } start_id;
+    gint ii;
 
-	for (ii = 0; ii < TAG_MAP_SZ; ii++)
-	{
-		if (strcmp(tag, tag_map[ii].tag) == 0)
-		{
-			id = tag_map[ii].id;
-			break;
-		}
-	}
-	if (ii == TAG_MAP_SZ)
-	{
-		g_debug("Unrecognized end tag (%s)", tag);
-		id = A_NONE;
-	}
-	start_id.pid = g_queue_pop_head(pd->tag_stack);
-	if (start_id.id != id)
-		g_warning("start tag != end tag: (%s %d) %d", tag, start_id.id, id);
-	switch (id)
-	{
-		case A_ITEM:
-		{
-			pd->item = FALSE;
-		} break;
-		default:
-		{
-		} break;
-	}
+    for (ii = 0; ii < TAG_MAP_SZ; ii++)
+    {
+        if (strcmp(tag, tag_map[ii].tag) == 0)
+        {
+            id = tag_map[ii].id;
+            break;
+        }
+    }
+    if (ii == TAG_MAP_SZ)
+    {
+        g_debug("Unrecognized end tag (%s)", tag);
+        id = A_NONE;
+    }
+    start_id.pid = g_queue_pop_head(pd->tag_stack);
+    if (start_id.id != id)
+        g_warning("start tag != end tag: (%s %d) %d", tag, start_id.id, id);
+    switch (id)
+    {
+        case A_ITEM:
+        {
+            pd->item = FALSE;
+        } break;
+        default:
+        {
+        } break;
+    }
 
 }
 
 static void
 text_data(
-	GMarkupParseContext *ctx, 
-	const gchar *text, 
-	gsize len,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *text, 
+    gsize len,
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} start_id;
+    parse_data_t *pd = (parse_data_t*)ud;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } start_id;
 
-	start_id.pid = g_queue_peek_head(pd->tag_stack);
-	switch (start_id.id)
-	{
-		case A_DESCRIPTION:
-		{
-			if (pd->item)
-			{
-				g_string_append(pd->description, text);
-			}
-		} break;
-		default:
-		{
-			if (pd->value) g_free(pd->value);
-			pd->value = g_strdup(text);
-		} break;
-	}
+    start_id.pid = g_queue_peek_head(pd->tag_stack);
+    switch (start_id.id)
+    {
+        case A_DESCRIPTION:
+        {
+            if (pd->item)
+            {
+                g_string_append(pd->description, text);
+            }
+        } break;
+        default:
+        {
+            if (pd->value) g_free(pd->value);
+            pd->value = g_strdup(text);
+        } break;
+    }
 }
 
 static void
 passthrough(
-	GMarkupParseContext *ctx, 
-	const gchar *text, 
-	gsize len,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *text, 
+    gsize len,
+    gpointer ud,
+    GError **error)
 {
-	//parse_data_t *pd = (parse_data_t*)ud;
+    //parse_data_t *pd = (parse_data_t*)ud;
 
-	//g_debug("passthrough %s", text);
+    //g_debug("passthrough %s", text);
 }
 
 static void
 parse_error(GMarkupParseContext *ctx, GError *error, gpointer ud)
 {
-	g_warning("Resource parse error: %s", error->message);
+    g_warning("Resource parse error: %s", error->message);
 }
 
 // This is required or the parser crashes
 static void 
 destroy_notify(gpointer data)
 { // Do nothing
-	//g_debug("destroy parser");
+    //g_debug("destroy parser");
 }
 
 void
 ghb_appcast_parse(gchar *buf, gchar **desc, gchar **build, gchar **version)
 {
-	GMarkupParseContext *ctx;
-	GMarkupParser parser;
-	parse_data_t pd;
-	GError *err = NULL;
-	gint len;
-	gchar *start;
-	//gchar tmp[4096]
+    GMarkupParseContext *ctx;
+    GMarkupParser parser;
+    parse_data_t pd;
+    GError *err = NULL;
+    gint len;
+    gchar *start;
+    //gchar tmp[4096]
 
-	// Skip junk at beginning of buffer
-	start = strstr(buf, "<?xml ");
-	pd.description = g_string_new("");
-	pd.item = FALSE;
-	pd.build = NULL;
-	pd.version = NULL;
-	len = strlen(start);
-	pd.tag_stack = g_queue_new();
-	pd.key = NULL;
-	pd.value = NULL;
+    // Skip junk at beginning of buffer
+    start = strstr(buf, "<?xml ");
+    pd.description = g_string_new("");
+    pd.item = FALSE;
+    pd.build = NULL;
+    pd.version = NULL;
+    len = strlen(start);
+    pd.tag_stack = g_queue_new();
+    pd.key = NULL;
+    pd.value = NULL;
 
-	parser.start_element = start_element;
-	parser.end_element = end_element;
-	parser.text = text_data;
-	parser.passthrough = passthrough;
-	parser.error = parse_error;
-	ctx = g_markup_parse_context_new(
-			&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, &pd, destroy_notify);
+    parser.start_element = start_element;
+    parser.end_element = end_element;
+    parser.text = text_data;
+    parser.passthrough = passthrough;
+    parser.error = parse_error;
+    ctx = g_markup_parse_context_new(
+            &parser, G_MARKUP_TREAT_CDATA_AS_TEXT, &pd, destroy_notify);
 
-	g_markup_parse_context_parse(ctx, start, len, &err);
-	g_markup_parse_context_end_parse(ctx, &err);
-	g_markup_parse_context_free(ctx);
-	g_queue_free(pd.tag_stack);
-	*desc = g_string_free(pd.description, FALSE);
-	// work around a bug to leaves the CDATA closing brakets on the string
-	gchar *glitch;
-	glitch = g_strrstr(*desc, "]]>");
-	if (glitch)
-		*glitch = 0;
-	*build = pd.build;
-	*version = pd.version;
+    g_markup_parse_context_parse(ctx, start, len, &err);
+    g_markup_parse_context_end_parse(ctx, &err);
+    g_markup_parse_context_free(ctx);
+    g_queue_free(pd.tag_stack);
+    *desc = g_string_free(pd.description, FALSE);
+    // work around a bug to leaves the CDATA closing brakets on the string
+    gchar *glitch;
+    glitch = g_strrstr(*desc, "]]>");
+    if (glitch)
+        *glitch = 0;
+    *build = pd.build;
+    *version = pd.version;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/appcast.h -> HandBrake-0.9.9.tar.bz2/gtk/src/appcast.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/audiohandler.c -> HandBrake-0.9.9.tar.bz2/gtk/src/audiohandler.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * audiohandler.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * audiohandler.c is free software.
  * 
@@ -31,1287 +31,1259 @@
 void
 ghb_show_hide_advanced_audio( signal_user_data_t *ud )
 {
-	GtkWidget *widget;
-
-	g_debug("audio_advanced_clicked_cb ()");
-	widget = GHB_WIDGET(ud->builder, "AdvancedAudioPassTable");
-	if (!ghb_settings_get_boolean(ud->settings, "AdvancedAutoPassthru"))
-		gtk_widget_hide(widget);
-	else
-		gtk_widget_show(widget);
+    GtkWidget *widget;
+
+    g_debug("audio_advanced_clicked_cb ()");
+    widget = GHB_WIDGET(ud->builder, "AdvancedAudioPassTable");
+    if (!ghb_settings_get_boolean(ud->settings, "AdvancedAutoPassthru"))
+        gtk_widget_hide(widget);
+    else
+        gtk_widget_show(widget);
 }
 
 void
 check_list_full(signal_user_data_t *ud)
 {
-	GValue *audio_list;
-	gint count;
+    GValue *audio_list;
+    gint count;
 
-	audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-	count = ghb_array_len(audio_list);
-	GtkWidget * widget = GHB_WIDGET(ud->builder, "audio_add");
-	gtk_widget_set_sensitive(widget, count != 99);
+    audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+    count = ghb_array_len(audio_list);
+    GtkWidget * widget = GHB_WIDGET(ud->builder, "audio_add");
+    gtk_widget_set_sensitive(widget, count != 99);
 }
 
 gint
 ghb_select_audio_codec(gint mux, hb_audio_config_t *aconfig, gint acodec, gint fallback, gint copy_mask)
 {
-	guint32 in_codec = aconfig ? aconfig->in.codec : HB_ACODEC_MASK;
-	if (acodec == HB_ACODEC_AUTO_PASS)
-	{
-		return hb_autopassthru_get_encoder(in_codec, copy_mask, fallback, mux);
-	}
-
-	gint ii;
-	// Sanitize fallback
-	for (ii = 0; ii < hb_audio_encoders_count; ii++)
-	{
-		if (hb_audio_encoders[ii].encoder == fallback &&
-			!(hb_audio_encoders[ii].muxers & mux))
-		{
-			if ( mux == HB_MUX_MKV )
-				fallback = HB_ACODEC_LAME;
-			else
-				fallback = HB_ACODEC_FAAC;
-			break;
-		}
-	}
-	if ((acodec & HB_ACODEC_PASS_FLAG) &&
-		!(acodec & in_codec & HB_ACODEC_PASS_MASK))
-	{
-		return fallback;
-	}
-	for (ii = 0; ii < hb_audio_encoders_count; ii++)
-	{
-		if (hb_audio_encoders[ii].encoder == acodec &&
-			!(hb_audio_encoders[ii].muxers & mux))
-		{
-			return fallback;
-		}
-	}
-	return acodec;
+    guint32 in_codec = aconfig != NULL ? aconfig->in.codec : 0;
+
+    if (acodec == HB_ACODEC_AUTO_PASS)
+    {
+        return hb_autopassthru_get_encoder(in_codec, copy_mask, fallback, mux);
+    }
+
+    gint ii;
+    // Sanitize fallback
+    for (ii = 0; ii < hb_audio_encoders_count; ii++)
+    {
+        if (hb_audio_encoders[ii].encoder == fallback &&
+            !(hb_audio_encoders[ii].muxers & mux))
+        {
+            if ( mux == HB_MUX_MKV )
+                fallback = HB_ACODEC_LAME;
+            else
+                fallback = HB_ACODEC_FAAC;
+            break;
+        }
+    }
+    if ((acodec & HB_ACODEC_PASS_FLAG) &&
+        !(acodec & in_codec & HB_ACODEC_PASS_MASK))
+    {
+        return fallback;
+    }
+    for (ii = 0; ii < hb_audio_encoders_count; ii++)
+    {
+        if (hb_audio_encoders[ii].encoder == acodec &&
+            !(hb_audio_encoders[ii].muxers & mux))
+        {
+            return fallback;
+        }
+    }
+    return acodec;
 }
 
 int ghb_get_copy_mask(GValue *settings)
 {
-	gint mask = 0;
-
-	if (ghb_settings_get_boolean(settings, "AudioAllowMP3Pass"))
-	{
-		mask |= HB_ACODEC_MP3;
-	}
-	if (ghb_settings_get_boolean(settings, "AudioAllowAACPass"))
-	{
-		mask |= HB_ACODEC_FFAAC;
-	}
-	if (ghb_settings_get_boolean(settings, "AudioAllowAC3Pass"))
-	{
-		mask |= HB_ACODEC_AC3;
-	}
-	if (ghb_settings_get_boolean(settings, "AudioAllowDTSPass"))
-	{
-		mask |= HB_ACODEC_DCA;
-	}
-	if (ghb_settings_get_boolean(settings, "AudioAllowDTSHDPass"))
-	{
-		mask |= HB_ACODEC_DCA_HD;
-	}
-	return mask;
+    gint mask = 0;
+
+    if (ghb_settings_get_boolean(settings, "AudioAllowMP3Pass"))
+    {
+        mask |= HB_ACODEC_MP3;
+    }
+    if (ghb_settings_get_boolean(settings, "AudioAllowAACPass"))
+    {
+        mask |= HB_ACODEC_FFAAC;
+    }
+    if (ghb_settings_get_boolean(settings, "AudioAllowAC3Pass"))
+    {
+        mask |= HB_ACODEC_AC3;
+    }
+    if (ghb_settings_get_boolean(settings, "AudioAllowDTSPass"))
+    {
+        mask |= HB_ACODEC_DCA;
+    }
+    if (ghb_settings_get_boolean(settings, "AudioAllowDTSHDPass"))
+    {
+        mask |= HB_ACODEC_DCA_HD;
+    }
+    return mask;
 }
 
-static int ghb_select_fallback( GValue *settings, int mux, int acodec )
+int ghb_select_fallback( GValue *settings, int mux, int acodec )
 {
-	gint mask;
-	gint fallback = 0;
-
-	switch ( acodec )
-	{
-		case HB_ACODEC_MP3_PASS:
-			return HB_ACODEC_LAME;
-
-		case HB_ACODEC_AAC_PASS:
-			return HB_ACODEC_FAAC;
-
-		case HB_ACODEC_AC3_PASS:
-			return HB_ACODEC_AC3;
-
-		default:
-		{
-			fallback = ghb_settings_combo_int(settings, "AudioEncoderFallback");
-		}
-	}
-	if ( mux == HB_MUX_MP4 )
-	{
-		mask = 	HB_ACODEC_LAME |
-				HB_ACODEC_FFAAC |
-				HB_ACODEC_FAAC |
-				HB_ACODEC_AC3;
-	}
-	if ( mux == HB_MUX_MKV )
-	{
-		mask =	
-				HB_ACODEC_FAAC |
-				HB_ACODEC_LAME |
-				HB_ACODEC_VORBIS |
-				HB_ACODEC_AC3 |
-				HB_ACODEC_FFAAC |
-				HB_ACODEC_FFFLAC;
-	}
-	if (!(fallback & mask ))
-	{
-		fallback = HB_ACODEC_LAME;
-	}
-	return fallback;
+    gint fallback = 0;
+
+    switch ( acodec )
+    {
+        case HB_ACODEC_MP3_PASS:
+            return HB_ACODEC_LAME;
+
+        case HB_ACODEC_AAC_PASS:
+            return HB_ACODEC_FAAC;
+
+        case HB_ACODEC_AC3_PASS:
+            return HB_ACODEC_AC3;
+
+        default:
+        {
+            fallback = ghb_settings_combo_int(settings, "AudioEncoderFallback");
+            return hb_autopassthru_get_encoder(acodec, 0, fallback, mux);
+        }
+    }
 }
 
 void
 ghb_sanitize_audio(GValue *settings, GValue *asettings)
 {
-	gint titleindex, track, acodec, select_acodec, mix;
-	hb_audio_config_t *aconfig;
-	gint mux;
-	gint bitrate;
-	gint sr;
-	
-	g_debug("ghb_santiize_audio ()");
-	mux = ghb_settings_combo_int(settings, "FileFormat");
-	titleindex = ghb_settings_get_int(settings, "title_no");
-	track = ghb_settings_combo_int(asettings, "AudioTrack");
-	acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
-	mix = ghb_settings_combo_int(asettings, "AudioMixdown");
-	bitrate = ghb_settings_combo_int(asettings, "AudioBitrate");
-	sr = ghb_settings_combo_int(asettings, "AudioSamplerate");
-
-	aconfig = ghb_get_scan_audio_info(titleindex, track);
-	if (sr == 0)
-	{
-		sr = aconfig ? aconfig->in.samplerate : 48000;
-	}
-	gint fallback = ghb_select_fallback(settings, mux, acodec);
-	gint copy_mask = ghb_get_copy_mask(settings);
-	select_acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
-	gboolean codec_defined_bitrate = FALSE;
-	if (ghb_audio_is_passthru (select_acodec))
-	{
-		if (aconfig)
-		{
-			bitrate = aconfig->in.bitrate / 1000;
-
-			// Set the values for bitrate and samplerate to the input rates
-			mix = 0;
-			ghb_settings_set_string(asettings, "AudioMixdown",
-				ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
-			select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
-			codec_defined_bitrate = TRUE;
-			ghb_settings_set_string(asettings, "AudioSamplerate",
-				ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(0)));
-		}
-		else
-		{
-			mix = 0;
-			ghb_settings_set_string(asettings, "AudioMixdown",
-				ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
-			ghb_settings_set_string(asettings, "AudioSamplerate",
-				ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(0)));
-			bitrate = 448;
-		}
-		ghb_settings_set_double(asettings, "AudioTrackDRCSlider", 0.0);
-	}
-	else
-	{
-		if (mix == 0)
-			mix = ghb_get_best_mix( aconfig, select_acodec, 0);
-		bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate, sr, mix);
-		ghb_settings_set_string(asettings, "AudioMixdown",
-			ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
-	}
-	ghb_settings_set_string(asettings, "AudioBitrate",
-		ghb_lookup_combo_string("AudioBitrate", ghb_int_value(bitrate)));
-
-	ghb_settings_take_value(asettings, "AudioEncoderActual", 
-							ghb_lookup_acodec_value(select_acodec));
+    gint titleindex, track, acodec, select_acodec, mix;
+    hb_audio_config_t *aconfig;
+    gint mux;
+    gint bitrate;
+    gint sr;
+    
+    g_debug("ghb_santiize_audio ()");
+    mux = ghb_settings_combo_int(settings, "FileFormat");
+    titleindex = ghb_settings_get_int(settings, "title_no");
+    track = ghb_settings_combo_int(asettings, "AudioTrack");
+    acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
+    mix = ghb_settings_combo_int(asettings, "AudioMixdown");
+    bitrate = ghb_settings_combo_int(asettings, "AudioBitrate");
+    sr = ghb_settings_combo_int(asettings, "AudioSamplerate");
+
+    aconfig = ghb_get_scan_audio_info(titleindex, track);
+    if (sr == 0)
+    {
+        sr = aconfig ? aconfig->in.samplerate : 48000;
+    }
+    gint fallback = ghb_select_fallback(settings, mux, acodec);
+    gint copy_mask = ghb_get_copy_mask(settings);
+    select_acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
+    if (ghb_audio_is_passthru (select_acodec))
+    {
+        if (aconfig)
+        {
+            bitrate = aconfig->in.bitrate / 1000;
+
+            // Set the values for bitrate and samplerate to the input rates
+            mix = 0;
+            ghb_settings_set_string(asettings, "AudioMixdown",
+                ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+            select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
+            ghb_settings_set_string(asettings, "AudioSamplerate",
+                ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(0)));
+        }
+        else
+        {
+            mix = 0;
+            ghb_settings_set_string(asettings, "AudioMixdown",
+                ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+            ghb_settings_set_string(asettings, "AudioSamplerate",
+                ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(0)));
+            bitrate = 448;
+        }
+        ghb_settings_set_double(asettings, "AudioTrackDRCSlider", 0.0);
+    }
+    else
+    {
+        if (mix == 0)
+            mix = ghb_get_best_mix( aconfig, select_acodec, 0);
+        bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate, sr, mix);
+        ghb_settings_set_string(asettings, "AudioMixdown",
+            ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+    }
+    ghb_settings_set_string(asettings, "AudioBitrate",
+        ghb_lookup_combo_string("AudioBitrate", ghb_int_value(bitrate)));
+
+    ghb_settings_take_value(asettings, "AudioEncoderActual", 
+                            ghb_lookup_acodec_value(select_acodec));
 }
 
 void
 ghb_adjust_audio_rate_combos(signal_user_data_t *ud)
 {
-	gint titleindex, track, acodec, select_acodec, mix;
-	hb_audio_config_t *aconfig;
-	GtkWidget *widget;
-	GValue *gval;
-	gint mux;
-	gint bitrate;
-	gint sr = 48000;
-	
-	g_debug("ghb_adjust_audio_rate_combos ()");
-	mux = ghb_settings_combo_int(ud->settings, "FileFormat");
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-
-	widget = GHB_WIDGET(ud->builder, "AudioTrack");
-	gval = ghb_widget_value(widget);
-	track = ghb_lookup_combo_int("AudioTrack", gval);
-	ghb_value_free(gval);
-
-	widget = GHB_WIDGET(ud->builder, "AudioEncoder");
-	gval = ghb_widget_value(widget);
-	acodec = ghb_lookup_combo_int("AudioEncoder", gval);
-	ghb_value_free(gval);
-	widget = GHB_WIDGET(ud->builder, "AudioMixdown");
-	gval = ghb_widget_value(widget);
-	mix = ghb_lookup_combo_int("AudioMixdown", gval);
-	ghb_value_free(gval);
-
-	widget = GHB_WIDGET(ud->builder, "AudioBitrate");
-	gval = ghb_widget_value(widget);
-	bitrate = ghb_lookup_combo_int("AudioBitrate", gval);
-
-	widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
-	gval = ghb_widget_value(widget);
-	sr = ghb_lookup_combo_int("AudioSamplerate", gval);
-
-
-	aconfig = ghb_get_scan_audio_info(titleindex, track);
-	if (sr == 0)
-	{
-		sr = aconfig ? aconfig->in.samplerate : 48000;
-	}
-	gint fallback = ghb_select_fallback( ud->settings, mux, acodec );
-	gint copy_mask = ghb_get_copy_mask(ud->settings);
-	select_acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
-	gboolean codec_defined_bitrate = FALSE;
-	if (ghb_audio_is_passthru (select_acodec))
-	{
-		if (aconfig)
-		{
-			bitrate = aconfig->in.bitrate / 1000;
-
-			// Set the values for bitrate and samplerate to the input rates
-			ghb_set_bitrate_opts (ud->builder, bitrate, bitrate, bitrate);
-			mix = 0;
-			ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
-			select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
-			codec_defined_bitrate = TRUE;
-			ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
-		}
-		else
-		{
-			ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
-			mix = 0;
-			ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
-			bitrate = 448;
-		}
-		ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_double_value(0));
-	}
-	else
-	{
-		if (mix == 0)
-			mix = ghb_get_best_mix( aconfig, select_acodec, 0);
-		bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate, sr, mix);
-		ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
-	}
-	if (!codec_defined_bitrate)
-	{
-		int low, high;
-		mix = ghb_get_best_mix( aconfig, select_acodec, mix);
-		hb_get_audio_bitrate_limits(select_acodec, sr, mix, &low, &high);
-		ghb_set_bitrate_opts (ud->builder, low, high, -1);
-	}
-	ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(bitrate));
-
-	ghb_settings_take_value(ud->settings, "AudioEncoderActual", 
-							ghb_lookup_acodec_value(select_acodec));
-	GValue *asettings = get_selected_asettings(ud);
-	if (asettings)
-	{
-		ghb_settings_take_value(asettings, "AudioEncoderActual", 
-							ghb_lookup_acodec_value(select_acodec));
-	}
-	ghb_audio_list_refresh_selected(ud);
-	ghb_check_dependency(ud, NULL, "AudioEncoderActual");
+    gint titleindex, track, acodec, select_acodec, mix;
+    hb_audio_config_t *aconfig;
+    GtkWidget *widget;
+    GValue *gval;
+    gint mux;
+    gint bitrate;
+    gint sr = 48000;
+    
+    g_debug("ghb_adjust_audio_rate_combos ()");
+    mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+
+    widget = GHB_WIDGET(ud->builder, "AudioTrack");
+    gval = ghb_widget_value(widget);
+    track = ghb_lookup_combo_int("AudioTrack", gval);
+    ghb_value_free(gval);
+
+    widget = GHB_WIDGET(ud->builder, "AudioEncoder");
+    gval = ghb_widget_value(widget);
+    acodec = ghb_lookup_combo_int("AudioEncoder", gval);
+    ghb_value_free(gval);
+    widget = GHB_WIDGET(ud->builder, "AudioMixdown");
+    gval = ghb_widget_value(widget);
+    mix = ghb_lookup_combo_int("AudioMixdown", gval);
+    ghb_value_free(gval);
+
+    widget = GHB_WIDGET(ud->builder, "AudioBitrate");
+    gval = ghb_widget_value(widget);
+    bitrate = ghb_lookup_combo_int("AudioBitrate", gval);
+
+    widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
+    gval = ghb_widget_value(widget);
+    sr = ghb_lookup_combo_int("AudioSamplerate", gval);
+
+
+    aconfig = ghb_get_scan_audio_info(titleindex, track);
+    if (sr == 0)
+    {
+        sr = aconfig ? aconfig->in.samplerate : 48000;
+    }
+    gint fallback = ghb_select_fallback( ud->settings, mux, acodec );
+    gint copy_mask = ghb_get_copy_mask(ud->settings);
+    select_acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
+    gboolean codec_defined_bitrate = FALSE;
+    if (ghb_audio_is_passthru (select_acodec))
+    {
+        if (aconfig)
+        {
+            bitrate = aconfig->in.bitrate / 1000;
+
+            // Set the values for bitrate and samplerate to the input rates
+            ghb_set_bitrate_opts (ud->builder, bitrate, bitrate, bitrate);
+            mix = 0;
+            ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
+            select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
+            codec_defined_bitrate = TRUE;
+            ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
+        }
+        else
+        {
+            ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
+            mix = 0;
+            ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
+            bitrate = 448;
+        }
+        ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_double_value(0));
+    }
+    else
+    {
+        if (mix == 0)
+            mix = ghb_get_best_mix( aconfig, select_acodec, 0);
+        bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate, sr, mix);
+        ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
+    }
+    if (!codec_defined_bitrate)
+    {
+        int low, high;
+        mix = ghb_get_best_mix( aconfig, select_acodec, mix);
+        hb_get_audio_bitrate_limits(select_acodec, sr, mix, &low, &high);
+        ghb_set_bitrate_opts (ud->builder, low, high, -1);
+    }
+    ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(bitrate));
+
+    ghb_settings_take_value(ud->settings, "AudioEncoderActual", 
+                            ghb_lookup_acodec_value(select_acodec));
+    GValue *asettings = get_selected_asettings(ud);
+    if (asettings)
+    {
+        ghb_settings_take_value(asettings, "AudioEncoderActual", 
+                            ghb_lookup_acodec_value(select_acodec));
+    }
+    ghb_audio_list_refresh_selected(ud);
+    ghb_check_dependency(ud, NULL, "AudioEncoderActual");
 }
 
 static void
 free_audio_hash_key_value(gpointer data)
 {
-	g_free(data);
+    g_free(data);
 }
 
-gchar*
+const gchar*
 ghb_get_user_audio_lang(GValue *settings, gint titleindex, gint track)
 {
-	GValue *audio_list, *asettings;
-	gchar *lang = NULL;
-
-	audio_list = ghb_settings_get_value(settings, "audio_list");
-	if (ghb_array_len(audio_list) <= track)
-		return NULL;
-	asettings = ghb_array_get_nth(audio_list, track);
-	track = ghb_settings_get_int(asettings, "AudioTrack");
-	lang = ghb_get_source_audio_lang(titleindex, track);
-	return lang;
+    GValue *audio_list, *asettings;
+    const gchar *lang;
+
+    audio_list = ghb_settings_get_value(settings, "audio_list");
+    if (ghb_array_len(audio_list) <= track)
+        return "und";
+    asettings = ghb_array_get_nth(audio_list, track);
+    track = ghb_settings_get_int(asettings, "AudioTrack");
+    lang = ghb_get_source_audio_lang(titleindex, track);
+    return lang;
 }
 
 void
 ghb_set_pref_audio_settings(gint titleindex, GValue *settings)
 {
-	gint track;
-	gchar *source_lang = NULL;
-	hb_audio_config_t *aconfig;
-	GHashTable *track_indices;
-	gint mux;
-
-	const GValue *pref_audio;
-	const GValue *audio, *drc, *gain, *enable_qual;
-	gint acodec, bitrate, mix;
-	gdouble rate, quality;
-	gint count, ii, list_count;
-	
-	g_debug("set_pref_audio");
-	mux = ghb_settings_combo_int(settings, "FileFormat");
-	track_indices = g_hash_table_new_full(g_int_hash, g_int_equal, 
-						free_audio_hash_key_value, free_audio_hash_key_value);
-	// Clear the audio list
-	ghb_clear_audio_list_settings(settings);
-
-	// Find "best" audio based on audio preferences
-	if (!ghb_settings_get_boolean(settings, "AudioDUB"))
-	{
-		source_lang = ghb_get_source_audio_lang(titleindex, 0);
-	}
-	if (source_lang == NULL)
-		source_lang = ghb_settings_get_string(settings, "PreferredLanguage");
-
-	pref_audio = ghb_settings_get_value(settings, "AudioList");
-
-	list_count = 0;
-	count = ghb_array_len(pref_audio);
-	for (ii = 0; ii < count; ii++)
-	{
-		gint select_acodec;
-		gint fallback;
-
-		audio = ghb_array_get_nth(pref_audio, ii);
-		acodec = ghb_settings_combo_int(audio, "AudioEncoder");
-		fallback = ghb_select_fallback(settings, mux, acodec);
-		gint copy_mask = ghb_get_copy_mask(settings);
-		select_acodec = ghb_select_audio_codec(mux, NULL, acodec, fallback, copy_mask);
-		bitrate = ghb_settings_combo_int(audio, "AudioBitrate");
-		rate = ghb_settings_combo_double(audio, "AudioSamplerate");
-		mix = ghb_settings_combo_int(audio, "AudioMixdown");
-		drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider");
-		gain = ghb_settings_get_value(audio, "AudioTrackGain");
-		enable_qual = ghb_settings_get_value(audio, "AudioTrackQualityEnable");
-		quality = ghb_settings_get_double(audio, "AudioTrackQuality");
-		// If there are multiple audios using the same codec, then
-		// select sequential tracks for each.  The hash keeps track 
-		// of the tracks used for each codec.
-		track = ghb_find_audio_track(titleindex, source_lang, 
-								select_acodec, fallback, track_indices);
-		// Check to see if:
-		// 1. pref codec is passthru
-		// 2. source codec is not passthru
-		// 3. next pref is enabled
-		aconfig = ghb_get_scan_audio_info(titleindex, track);
-		if (aconfig && ghb_audio_is_passthru (acodec))
-		{
-			// HB_ACODEC_* are bit fields.  Treat acodec as mask
-			if (!(aconfig->in.codec & select_acodec & HB_ACODEC_PASS_MASK))
-			{
-				if (acodec != HB_ACODEC_AUTO_PASS)
-					acodec = fallback;
-				// If we can't substitute the passthru with a suitable
-				// encoder and
-				// If there's more audio to process, or we've already
-				// placed one in the list, then we can skip this one
-				if (!(select_acodec & fallback) && 
-					((ii + 1 < count) || (list_count != 0)))
-				{
-					// Skip this audio
-					acodec = 0;
-				}
-				else
-				{
-					int channels;
-					select_acodec = fallback;
-					mix = ghb_get_best_mix(aconfig, select_acodec, mix);
-					channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(mix);
-					bitrate = aconfig->in.bitrate / 1000;
-					bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate,
-							aconfig->in.samplerate, mix);
-					rate = 0;
-				}
-			}
-			else
-			{
-				select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
-			}
-		}
-		if (titleindex >= 0 && track < 0)
-			acodec = 0;
-		if (acodec != 0)
-		{
-			GValue *asettings = ghb_dict_value_new();
-			ghb_settings_set_int(asettings, "AudioTrack", track);
-			ghb_settings_set_string(asettings, "AudioEncoder", 
-				ghb_lookup_combo_string("AudioEncoder", ghb_int_value(acodec)));
-			ghb_settings_set_value(asettings, "AudioEncoderActual", 
-									ghb_lookup_acodec_value(select_acodec));
-			ghb_settings_set_value(asettings, "AudioTrackQualityEnable", enable_qual);
-			ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
-
-			// This gets set autimatically if the codec is passthru
-			ghb_settings_set_string(asettings, "AudioBitrate",
-				ghb_lookup_combo_string("AudioBitrate", ghb_int_value(bitrate)));
-			ghb_settings_set_string(asettings, "AudioSamplerate",
-				ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(rate)));
-			mix = ghb_get_best_mix( aconfig, select_acodec, mix);
-			ghb_settings_set_string(asettings, "AudioMixdown",
-				ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
-			ghb_settings_set_value(asettings, "AudioTrackDRCSlider", drc);
-			ghb_settings_set_value(asettings, "AudioTrackGain", gain);
-			ghb_sanitize_audio(settings, asettings);
-			ghb_add_audio_to_settings(settings, asettings);
-		}
-	}
-	g_free(source_lang);
-	g_hash_table_destroy(track_indices);
+    gint track;
+    gchar *source_lang;
+    hb_audio_config_t *aconfig;
+    GHashTable *track_indices;
+    gint mux;
+
+    const GValue *pref_audio;
+    const GValue *audio, *drc, *gain, *enable_qual;
+    gint acodec, bitrate, mix;
+    gdouble rate, quality;
+    gint count, ii, list_count;
+    
+    g_debug("set_pref_audio");
+    mux = ghb_settings_combo_int(settings, "FileFormat");
+    track_indices = g_hash_table_new_full(g_int_hash, g_int_equal, 
+                        free_audio_hash_key_value, free_audio_hash_key_value);
+    // Clear the audio list
+    ghb_clear_audio_list_settings(settings);
+
+    // Find "best" audio based on audio preferences
+    if (!ghb_settings_get_boolean(settings, "AudioDUB"))
+    {
+        source_lang = g_strdup(ghb_get_source_audio_lang(titleindex, 0));
+    }
+    else
+    {
+        source_lang = ghb_settings_get_string(settings, "PreferredLanguage");
+    }
+
+    pref_audio = ghb_settings_get_value(settings, "AudioList");
+
+    list_count = 0;
+    count = ghb_array_len(pref_audio);
+    for (ii = 0; ii < count; ii++)
+    {
+        gint select_acodec;
+        gint fallback;
+
+        audio = ghb_array_get_nth(pref_audio, ii);
+        acodec = ghb_settings_combo_int(audio, "AudioEncoder");
+        fallback = ghb_select_fallback(settings, mux, acodec);
+        gint copy_mask = ghb_get_copy_mask(settings);
+        select_acodec = ghb_select_audio_codec(mux, NULL, acodec, fallback, copy_mask);
+        bitrate = ghb_settings_combo_int(audio, "AudioBitrate");
+        rate = ghb_settings_combo_double(audio, "AudioSamplerate");
+        mix = ghb_settings_combo_int(audio, "AudioMixdown");
+        drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider");
+        gain = ghb_settings_get_value(audio, "AudioTrackGain");
+        enable_qual = ghb_settings_get_value(audio, "AudioTrackQualityEnable");
+        quality = ghb_settings_get_double(audio, "AudioTrackQuality");
+        // If there are multiple audios using the same codec, then
+        // select sequential tracks for each.  The hash keeps track 
+        // of the tracks used for each codec.
+        track = ghb_find_audio_track(titleindex, source_lang, 
+                                select_acodec, fallback, track_indices);
+        // Check to see if:
+        // 1. pref codec is passthru
+        // 2. source codec is not passthru
+        // 3. next pref is enabled
+        aconfig = ghb_get_scan_audio_info(titleindex, track);
+        if (aconfig && ghb_audio_is_passthru (acodec))
+        {
+            // HB_ACODEC_* are bit fields.  Treat acodec as mask
+            if (!(aconfig->in.codec & select_acodec & HB_ACODEC_PASS_MASK))
+            {
+                if (acodec != HB_ACODEC_AUTO_PASS)
+                    acodec = fallback;
+                // If we can't substitute the passthru with a suitable
+                // encoder and
+                // If there's more audio to process, or we've already
+                // placed one in the list, then we can skip this one
+                if (!(select_acodec & fallback) && 
+                    ((ii + 1 < count) || (list_count != 0)))
+                {
+                    // Skip this audio
+                    acodec = 0;
+                }
+            }
+            else
+            {
+                select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
+            }
+        }
+        if (titleindex >= 0 && track < 0)
+            acodec = 0;
+        if (acodec != 0)
+        {
+            GValue *asettings = ghb_dict_value_new();
+            ghb_settings_set_int(asettings, "AudioTrack", track);
+            ghb_settings_set_string(asettings, "AudioEncoder", 
+                ghb_lookup_combo_string("AudioEncoder", ghb_int_value(acodec)));
+            ghb_settings_set_value(asettings, "AudioEncoderActual", 
+                                    ghb_lookup_acodec_value(select_acodec));
+            ghb_settings_set_value(asettings, "AudioTrackQualityEnable", enable_qual);
+            ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
+
+            // This gets set autimatically if the codec is passthru
+            ghb_settings_set_string(asettings, "AudioBitrate",
+                ghb_lookup_combo_string("AudioBitrate", ghb_int_value(bitrate)));
+            ghb_settings_set_string(asettings, "AudioSamplerate",
+                ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(rate)));
+            mix = ghb_get_best_mix( aconfig, select_acodec, mix);
+            ghb_settings_set_string(asettings, "AudioMixdown",
+                ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+            ghb_settings_set_value(asettings, "AudioTrackDRCSlider", drc);
+            ghb_settings_set_value(asettings, "AudioTrackGain", gain);
+            ghb_sanitize_audio(settings, asettings);
+            ghb_add_audio_to_settings(settings, asettings);
+        }
+    }
+    g_free(source_lang);
+    g_hash_table_destroy(track_indices);
 }
 
 void
 ghb_set_pref_audio_from_settings(signal_user_data_t *ud, GValue *settings)
 {
-	const GValue *audio_list, *audio;
-	gint count, ii;
-
-	// Clear the audio list
-	ghb_clear_audio_list_ui(ud->builder);
-
-	audio_list = ghb_settings_get_value(settings, "audio_list");
-	count = ghb_array_len(audio_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		audio = ghb_array_get_nth(audio_list, ii);
-		ghb_add_audio_to_ui(ud->builder, audio);
-		ghb_adjust_audio_rate_combos(ud);
-	}
-	check_list_full(ud);
+    const GValue *audio_list, *audio;
+    gint count, ii;
+
+    // Clear the audio list
+    ghb_clear_audio_list_ui(ud->builder);
+
+    audio_list = ghb_settings_get_value(settings, "audio_list");
+    count = ghb_array_len(audio_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        audio = ghb_array_get_nth(audio_list, ii);
+        ghb_add_audio_to_ui(ud->builder, audio);
+        ghb_adjust_audio_rate_combos(ud);
+    }
+    check_list_full(ud);
 }
 
 static GValue*
 get_selected_asettings(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gint *indices;
-	gint row;
-	GValue *asettings = NULL;
-	const GValue *audio_list;
-	
-	g_debug("get_selected_asettings ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		// find audio settings
-		if (row < 0) return NULL;
-		audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-		if (row >= ghb_array_len(audio_list))
-			return NULL;
-		asettings = ghb_array_get_nth(audio_list, row);
-	}
-	return asettings;
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gint *indices;
+    gint row;
+    GValue *asettings = NULL;
+    const GValue *audio_list;
+    
+    g_debug("get_selected_asettings ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        // find audio settings
+        if (row < 0) return NULL;
+        audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+        if (row >= ghb_array_len(audio_list))
+            return NULL;
+        asettings = ghb_array_get_nth(audio_list, row);
+    }
+    return asettings;
 }
 
 void
 ghb_audio_list_refresh_selected(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gint *indices;
-	gint row;
-	GValue *asettings = NULL;
-	const GValue *audio_list;
-	
-	g_debug("ghb_audio_list_refresh_selected ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		const gchar *track, *codec, *br, *sr, *mix;
-		gchar *s_drc, *s_gain, *s_quality = NULL;
-		gint itrack;
-		gdouble drc, gain;
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		// find audio settings
-		if (row < 0) return;
-		audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-		if (row >= ghb_array_len(audio_list))
-			return;
-		asettings = ghb_array_get_nth(audio_list, row);
-
-		track = ghb_settings_combo_option(asettings, "AudioTrack");
-		itrack = ghb_settings_combo_int(asettings, "AudioTrack");
-		codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
-		double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
-		if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
-			quality != HB_INVALID_AUDIO_QUALITY)
-		{
-			int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual");
-			s_quality = ghb_format_quality("Q/", codec, quality);
-		}
-		else
-		{
-			br = ghb_settings_combo_option(asettings, "AudioBitrate");
-		}
-		sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
-		mix = ghb_settings_combo_option(asettings, "AudioMixdown");
-		gain = ghb_settings_get_double(asettings, "AudioTrackGain");
-		s_gain = g_strdup_printf("%ddB", (int)gain);
-
-		drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
-		if (drc < 1.0)
-			s_drc = g_strdup("Off");
-		else
-			s_drc = g_strdup_printf("%.1f", drc);
-
-		gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-			// These are displayed in list
-			0, track,
-			1, codec,
-			2, s_quality ? s_quality : br,
-			3, sr,
-			4, mix,
-			5, s_gain,
-			6, s_drc,
-			-1);
-		g_free(s_drc);
-		g_free(s_gain);
-		g_free(s_quality);
-	}
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gint *indices;
+    gint row;
+    GValue *asettings = NULL;
+    const GValue *audio_list;
+    
+    g_debug("ghb_audio_list_refresh_selected ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        const gchar *track, *codec, *br = NULL, *sr, *mix;
+        gchar *s_drc, *s_gain, *s_quality = NULL;
+        gdouble drc, gain;
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        // find audio settings
+        if (row < 0) return;
+        audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+        if (row >= ghb_array_len(audio_list))
+            return;
+        asettings = ghb_array_get_nth(audio_list, row);
+
+        track = ghb_settings_combo_option(asettings, "AudioTrack");
+        codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
+        double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
+        if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
+            quality != HB_INVALID_AUDIO_QUALITY)
+        {
+            int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual");
+            s_quality = ghb_format_quality("Q/", codec, quality);
+        }
+        else
+        {
+            br = ghb_settings_combo_option(asettings, "AudioBitrate");
+        }
+        sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
+        mix = ghb_settings_combo_option(asettings, "AudioMixdown");
+        gain = ghb_settings_get_double(asettings, "AudioTrackGain");
+        s_gain = g_strdup_printf("%ddB", (int)gain);
+
+        drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
+        if (drc < 1.0)
+            s_drc = g_strdup("Off");
+        else
+            s_drc = g_strdup_printf("%.1f", drc);
+
+        gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
+            // These are displayed in list
+            0, track,
+            1, codec,
+            2, s_quality ? s_quality : br,
+            3, sr,
+            4, mix,
+            5, s_gain,
+            6, s_drc,
+            -1);
+        g_free(s_drc);
+        g_free(s_gain);
+        g_free(s_quality);
+    }
 }
 
 void
 ghb_audio_list_refresh(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gboolean done;
-	gint row = 0;
-	const GValue *audio_list;
-
-	g_debug("ghb_audio_list_refresh ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
-	{
-		do
-		{
-			const gchar *track, *codec, *br, *sr, *mix;
-			gchar *s_drc, *s_gain, *s_quality = NULL;
-			gint itrack;
-			gdouble drc, gain;
-			GValue *asettings;
-
-			audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-			if (row >= ghb_array_len(audio_list))
-				return;
-			asettings = ghb_array_get_nth(audio_list, row);
-
-			track = ghb_settings_combo_option(asettings, "AudioTrack");
-			itrack = ghb_settings_combo_int(asettings, "AudioTrack");
-			codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
-			double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
-			if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
-				quality != HB_INVALID_AUDIO_QUALITY)
-			{
-				int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual");
-				s_quality = ghb_format_quality("Q/", codec, quality);
-			}
-			else
-			{
-				br = ghb_settings_get_string(asettings, "AudioBitrate");
-			}
-			sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
-			mix = ghb_settings_combo_option(asettings, "AudioMixdown");
-			gain = ghb_settings_get_double(asettings, "AudioTrackGain");
-			s_gain = g_strdup_printf("%.fdB", gain);
-
-			drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
-			if (drc < 1.0)
-				s_drc = g_strdup("Off");
-			else
-				s_drc = g_strdup_printf("%.1f", drc);
-
-			gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-				// These are displayed in list
-				0, track,
-				1, codec,
-				2, s_quality ? s_quality : br,
-				3, sr,
-				4, mix,
-				5, s_gain,
-				6, s_drc,
-				-1);
-			g_free(s_drc);
-			g_free(s_gain);
-			done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-			row++;
-		} while (!done);
-	}
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gboolean done;
+    gint row = 0;
+    const GValue *audio_list;
+
+    g_debug("ghb_audio_list_refresh ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+    {
+        do
+        {
+            const gchar *track, *codec, *br = NULL, *sr, *mix;
+            gchar *s_drc, *s_gain, *s_quality = NULL;
+            gdouble drc, gain;
+            GValue *asettings;
+
+            audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+            if (row >= ghb_array_len(audio_list))
+                return;
+            asettings = ghb_array_get_nth(audio_list, row);
+
+            track = ghb_settings_combo_option(asettings, "AudioTrack");
+            codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
+            double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
+            if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
+                quality != HB_INVALID_AUDIO_QUALITY)
+            {
+                int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual");
+                s_quality = ghb_format_quality("Q/", codec, quality);
+            }
+            else
+            {
+                br = ghb_settings_get_string(asettings, "AudioBitrate");
+            }
+            sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
+            mix = ghb_settings_combo_option(asettings, "AudioMixdown");
+            gain = ghb_settings_get_double(asettings, "AudioTrackGain");
+            s_gain = g_strdup_printf("%.fdB", gain);
+
+            drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
+            if (drc < 1.0)
+                s_drc = g_strdup("Off");
+            else
+                s_drc = g_strdup_printf("%.1f", drc);
+
+            gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
+                // These are displayed in list
+                0, track,
+                1, codec,
+                2, s_quality ? s_quality : br,
+                3, sr,
+                4, mix,
+                5, s_gain,
+                6, s_drc,
+                -1);
+            g_free(s_drc);
+            g_free(s_gain);
+            done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+            row++;
+        } while (!done);
+    }
 }
 
 G_MODULE_EXPORT void
 audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	static gint prev_acodec = 0;
-	gint acodec_code;
-	GValue *asettings, *gval;
-	
-	g_debug("audio_codec_changed_cb ()");
-	gval = ghb_widget_value(widget);
-	acodec_code = ghb_lookup_combo_int("AudioEncoder", gval);
-	ghb_value_free(gval);
-
-	if (block_updates)
-	{
-		prev_acodec = acodec_code;
-		ghb_grey_combo_options (ud);
-		ghb_check_dependency(ud, widget, NULL);
-		return;
-	}
-
-	asettings = get_selected_asettings(ud);
-	if (ghb_audio_is_passthru (prev_acodec) && 
-		!ghb_audio_is_passthru (acodec_code))
-	{
-		// Transition from passthru to not, put some audio settings back to 
-		// pref settings
-		gint titleindex;
-		gint track;
-		gint br, sr, mix_code;
-
-		if (asettings != NULL)
-		{
-			br = ghb_settings_get_int(asettings, "AudioBitrate");
-			sr = ghb_settings_combo_int(asettings, "AudioSamplerate");
-			mix_code = ghb_settings_combo_int(asettings, "AudioMixdown");
-		}
-		else
-		{
-			br = 160;
-			sr = 0;
-			mix_code = 0;
-		}
-
-		titleindex = ghb_settings_combo_int(ud->settings, "title");
-		track = ghb_settings_combo_int(ud->settings, "AudioTrack");
-		if (sr)
-		{
-			sr = ghb_find_closest_audio_rate(sr);
-		}
-		ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(sr));
-
-		hb_audio_config_t *aconfig;
-		aconfig = ghb_get_scan_audio_info(titleindex, track);
-		if (sr == 0)
-		{
-			sr = aconfig ? aconfig->in.samplerate : 48000;
-		}
-		mix_code = ghb_get_best_mix( aconfig, acodec_code, mix_code);
-		br = hb_get_best_audio_bitrate(acodec_code, br, sr, mix_code);
-		ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(br));
-
-		ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix_code));
-	}
-	ghb_adjust_audio_rate_combos(ud);
-	ghb_grey_combo_options (ud);
-	ghb_check_dependency(ud, widget, NULL);
-	prev_acodec = acodec_code;
-	if (asettings != NULL)
-	{
-		ghb_widget_to_setting(asettings, widget);
-		ghb_settings_set_value(asettings, "AudioEncoderActual", ghb_settings_get_value(ud->settings, "AudioEncoderActual"));
-		ghb_audio_list_refresh_selected(ud);
-	}
-	ghb_live_reset(ud);
-
-	float low, high, gran, defval;
-	int dir;
-	hb_get_audio_quality_limits(acodec_code, &low, &high, &gran, &dir);
-	defval = hb_get_default_audio_quality(acodec_code);
-	GtkScaleButton *sb;
-	GtkAdjustment *adj;
-	sb = GTK_SCALE_BUTTON(GHB_WIDGET(ud->builder, "AudioTrackQuality"));
-	adj = gtk_scale_button_get_adjustment(sb);
-	if (dir)
-	{
-		// Quality values are inverted
-		defval = high - defval + low;
-	}
-	gtk_adjustment_configure (adj, defval, low, high, gran, gran * 10, 0);
+    static gint prev_acodec = 0;
+    gint acodec_code;
+    GValue *asettings, *gval;
+    
+    g_debug("audio_codec_changed_cb ()");
+    gval = ghb_widget_value(widget);
+    acodec_code = ghb_lookup_combo_int("AudioEncoder", gval);
+    ghb_value_free(gval);
+
+    if (block_updates)
+    {
+        prev_acodec = acodec_code;
+        ghb_grey_combo_options (ud);
+        ghb_check_dependency(ud, widget, NULL);
+        return;
+    }
+
+    asettings = get_selected_asettings(ud);
+    if (ghb_audio_is_passthru (prev_acodec) && 
+        !ghb_audio_is_passthru (acodec_code))
+    {
+        // Transition from passthru to not, put some audio settings back to 
+        // pref settings
+        gint titleindex;
+        gint track;
+        gint br, sr, mix_code;
+
+        if (asettings != NULL)
+        {
+            br = ghb_settings_get_int(asettings, "AudioBitrate");
+            sr = ghb_settings_combo_int(asettings, "AudioSamplerate");
+            mix_code = ghb_settings_combo_int(asettings, "AudioMixdown");
+        }
+        else
+        {
+            br = 160;
+            sr = 0;
+            mix_code = 0;
+        }
+
+        titleindex = ghb_settings_combo_int(ud->settings, "title");
+        track = ghb_settings_combo_int(ud->settings, "AudioTrack");
+        if (sr)
+        {
+            sr = ghb_find_closest_audio_rate(sr);
+        }
+        ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(sr));
+
+        hb_audio_config_t *aconfig;
+        aconfig = ghb_get_scan_audio_info(titleindex, track);
+        if (sr == 0)
+        {
+            sr = aconfig ? aconfig->in.samplerate : 48000;
+        }
+        mix_code = ghb_get_best_mix( aconfig, acodec_code, mix_code);
+        br = hb_get_best_audio_bitrate(acodec_code, br, sr, mix_code);
+        ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(br));
+
+        ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix_code));
+    }
+    ghb_adjust_audio_rate_combos(ud);
+    ghb_grey_combo_options (ud);
+    ghb_check_dependency(ud, widget, NULL);
+    prev_acodec = acodec_code;
+    if (asettings != NULL)
+    {
+        ghb_widget_to_setting(asettings, widget);
+        ghb_settings_set_value(asettings, "AudioEncoderActual", ghb_settings_get_value(ud->settings, "AudioEncoderActual"));
+        ghb_audio_list_refresh_selected(ud);
+    }
+    ghb_live_reset(ud);
+
+    float low, high, gran, defval;
+    int dir;
+    hb_get_audio_quality_limits(acodec_code, &low, &high, &gran, &dir);
+    defval = hb_get_default_audio_quality(acodec_code);
+    GtkScaleButton *sb;
+    GtkAdjustment *adj;
+    sb = GTK_SCALE_BUTTON(GHB_WIDGET(ud->builder, "AudioTrackQuality"));
+    adj = gtk_scale_button_get_adjustment(sb);
+    if (dir)
+    {
+        // Quality values are inverted
+        defval = high - defval + low;
+    }
+    gtk_adjustment_configure (adj, defval, low, high, gran, gran * 10, 0);
 }
 
 G_MODULE_EXPORT void
 audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *asettings;
-
-	g_debug("audio_track_changed_cb ()");
-	if (block_updates)
-	{
-		ghb_check_dependency(ud, widget, NULL);
-		ghb_grey_combo_options (ud);
-		return;
-	}
-
-	ghb_adjust_audio_rate_combos(ud);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_grey_combo_options(ud);
-	asettings = get_selected_asettings(ud);
-	if (asettings != NULL)
-	{
-		const gchar *track;
-
-		ghb_widget_to_setting(asettings, widget);
-		ghb_audio_list_refresh_selected(ud);
-		track = ghb_settings_combo_option(asettings, "AudioTrack");
-		ghb_settings_set_string(asettings, "AudioTrackDescription", track);
-	}
-	ghb_live_reset(ud);
+    GValue *asettings;
+
+    g_debug("audio_track_changed_cb ()");
+    if (block_updates)
+    {
+        ghb_check_dependency(ud, widget, NULL);
+        ghb_grey_combo_options (ud);
+        return;
+    }
+
+    ghb_adjust_audio_rate_combos(ud);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_grey_combo_options(ud);
+    asettings = get_selected_asettings(ud);
+    if (asettings != NULL)
+    {
+        const gchar *track;
+
+        ghb_widget_to_setting(asettings, widget);
+        ghb_audio_list_refresh_selected(ud);
+        track = ghb_settings_combo_option(asettings, "AudioTrack");
+        ghb_settings_set_string(asettings, "AudioTrackDescription", track);
+    }
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 audio_mix_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *asettings;
-
-	g_debug("audio_mix_changed_cb ()");
-	if (block_updates)
-	{
-		ghb_check_dependency(ud, widget, NULL);
-		return;
-	}
-
-	ghb_adjust_audio_rate_combos(ud);
-	ghb_check_dependency(ud, widget, NULL);
-	asettings = get_selected_asettings(ud);
-	if (asettings != NULL)
-	{
-		ghb_widget_to_setting(asettings, widget);
-		ghb_audio_list_refresh_selected(ud);
-	}
-	ghb_live_reset(ud);
+    GValue *asettings;
+
+    g_debug("audio_mix_changed_cb ()");
+    if (block_updates)
+    {
+        ghb_check_dependency(ud, widget, NULL);
+        return;
+    }
+
+    ghb_adjust_audio_rate_combos(ud);
+    ghb_check_dependency(ud, widget, NULL);
+    asettings = get_selected_asettings(ud);
+    if (asettings != NULL)
+    {
+        ghb_widget_to_setting(asettings, widget);
+        ghb_audio_list_refresh_selected(ud);
+    }
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *asettings;
-
-	g_debug("audio_widget_changed_cb ()");
-	if (block_updates)
-	{
-		ghb_check_dependency(ud, widget, NULL);
-		return;
-	}
-
-	ghb_adjust_audio_rate_combos(ud);
-	asettings = get_selected_asettings(ud);
-	if (asettings != NULL)
-	{
-		ghb_widget_to_setting(asettings, widget);
-		ghb_audio_list_refresh_selected(ud);
-	}
-	ghb_live_reset(ud);
+    GValue *asettings;
+
+    g_debug("audio_widget_changed_cb ()");
+    if (block_updates)
+    {
+        ghb_check_dependency(ud, widget, NULL);
+        return;
+    }
+
+    ghb_adjust_audio_rate_combos(ud);
+    asettings = get_selected_asettings(ud);
+    if (asettings != NULL)
+    {
+        ghb_widget_to_setting(asettings, widget);
+        ghb_audio_list_refresh_selected(ud);
+    }
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 global_audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("global_audio_widget_changed_cb ()");
-	if (block_updates)
-	{
-		ghb_check_dependency(ud, widget, NULL);
-		return;
-	}
-
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_adjust_audio_rate_combos(ud);
-	ghb_audio_list_refresh_selected(ud);
-	ghb_live_reset(ud);
+    g_debug("global_audio_widget_changed_cb ()");
+    if (block_updates)
+    {
+        ghb_check_dependency(ud, widget, NULL);
+        return;
+    }
+
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_adjust_audio_rate_combos(ud);
+    ghb_grey_combo_options (ud);
+    ghb_audio_list_refresh_selected(ud);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT gchar*
 format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-	if (val < 1.0)
-		return g_strdup_printf("%-7s", "Off");
-	else
-		return g_strdup_printf("%-7.1f", val);
+    if (val < 1.0)
+        return g_strdup_printf("%-7s", "Off");
+    else
+        return g_strdup_printf("%-7.1f", val);
 }
 
 static inline int is_close(float a, float b, float metric)
 {
-	float diff = a - b;
-	diff = (diff > 0) ? diff : -diff;
-	return diff < metric;
+    float diff = a - b;
+    diff = (diff > 0) ? diff : -diff;
+    return diff < metric;
 }
 
 char * ghb_format_quality( const char *prefix, int codec, double quality )
 {
-	float low, high, gran;
-	int dir;
-	hb_get_audio_quality_limits(codec, &low, &high, &gran, &dir);
-
-	int digits = 0;
-	float tmp = gran;
-	while (1)
-	{
-		if (is_close(tmp, (int)tmp, gran / 10))
-			break;
-		digits++;
-		tmp *= 10;
-	}
-	return g_strdup_printf("%s%.*f", prefix, digits, quality);
+    float low, high, gran;
+    int dir;
+    hb_get_audio_quality_limits(codec, &low, &high, &gran, &dir);
+
+    int digits = 0;
+    float tmp = gran;
+    while (1)
+    {
+        if (is_close(tmp, (int)tmp, gran / 10))
+            break;
+        digits++;
+        tmp *= 10;
+    }
+    return g_strdup_printf("%s%.*f", prefix, digits, quality);
 }
 
 G_MODULE_EXPORT void
 quality_widget_changed_cb(GtkWidget *widget, gdouble quality, signal_user_data_t *ud)
 {
-	GValue *asettings;
-
-	g_debug("quality_widget_changed_cb ()");
-
-	ghb_check_dependency(ud, widget, NULL);
-	float low, high, gran;
-	int dir;
-	int codec = ghb_settings_combo_int(ud->settings, "AudioEncoderActual");
-	hb_get_audio_quality_limits(codec, &low, &high, &gran, &dir);
-	if (dir)
-	{
-		// Quality values are inverted
-		quality = high - quality + low;
-	}
-	char *s_quality = ghb_format_quality("", codec, quality);
-	ghb_ui_update( ud, "AudioTrackQualityValue", ghb_string_value(s_quality));
-	g_free(s_quality);
-
-	if (block_updates) return;
-
-	asettings = get_selected_asettings(ud);
-	if (asettings != NULL)
-	{
-		ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
-		ghb_audio_list_refresh_selected(ud);
-	}
-	ghb_live_reset(ud);
+    GValue *asettings;
+
+    g_debug("quality_widget_changed_cb ()");
+
+    ghb_check_dependency(ud, widget, NULL);
+    float low, high, gran;
+    int dir;
+    int codec = ghb_settings_combo_int(ud->settings, "AudioEncoderActual");
+    hb_get_audio_quality_limits(codec, &low, &high, &gran, &dir);
+    if (dir)
+    {
+        // Quality values are inverted
+        quality = high - quality + low;
+    }
+    char *s_quality = ghb_format_quality("", codec, quality);
+    ghb_ui_update( ud, "AudioTrackQualityValue", ghb_string_value(s_quality));
+    g_free(s_quality);
+
+    if (block_updates) return;
+
+    asettings = get_selected_asettings(ud);
+    if (asettings != NULL)
+    {
+        ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
+        ghb_audio_list_refresh_selected(ud);
+    }
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 drc_widget_changed_cb(GtkWidget *widget, gdouble drc, signal_user_data_t *ud)
 {
-	GValue *asettings;
-
-	g_debug("drc_widget_changed_cb ()");
-
-	ghb_check_dependency(ud, widget, NULL);
-	if (block_updates) return;
-
-	char *s_drc;
-	if (drc < 0.99)
-		s_drc = g_strdup("Off");
-	else
-		s_drc = g_strdup_printf("%.1f", drc);
-	ghb_ui_update( ud, "AudioTrackDRCValue", ghb_string_value(s_drc));
-	g_free(s_drc);
-
-	asettings = get_selected_asettings(ud);
-	if (asettings != NULL)
-	{
-		ghb_widget_to_setting(asettings, widget);
-		ghb_audio_list_refresh_selected(ud);
-	}
-	ghb_live_reset(ud);
+    GValue *asettings;
+
+    g_debug("drc_widget_changed_cb ()");
+
+    ghb_check_dependency(ud, widget, NULL);
+    if (block_updates) return;
+
+    char *s_drc;
+    if (drc < 0.99)
+        s_drc = g_strdup("Off");
+    else
+        s_drc = g_strdup_printf("%.1f", drc);
+    ghb_ui_update( ud, "AudioTrackDRCValue", ghb_string_value(s_drc));
+    g_free(s_drc);
+
+    asettings = get_selected_asettings(ud);
+    if (asettings != NULL)
+    {
+        ghb_widget_to_setting(asettings, widget);
+        ghb_audio_list_refresh_selected(ud);
+    }
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT gchar*
 format_gain_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-	if ( val >= 21.0 )
-		return g_strdup_printf("*11*");
-	return g_strdup_printf("%ddB", (int)val);
+    if ( val >= 21.0 )
+        return g_strdup_printf("*11*");
+    return g_strdup_printf("%ddB", (int)val);
 }
 
 G_MODULE_EXPORT void
 gain_widget_changed_cb(GtkWidget *widget, gdouble gain, signal_user_data_t *ud)
 {
-	GValue *asettings;
-
-	g_debug("gain_widget_changed_cb ()");
-
-	ghb_check_dependency(ud, widget, NULL);
-	if (block_updates) return;
-	asettings = get_selected_asettings(ud);
-
-	char *s_gain;
-	if ( gain >= 21.0 )
-		s_gain = g_strdup_printf("*11*");
-	else
-		s_gain = g_strdup_printf("%ddB", (int)gain);
-	ghb_ui_update( ud, "AudioTrackGainValue", ghb_string_value(s_gain));
-	g_free(s_gain);
-
-	if (asettings != NULL)
-	{
-		ghb_widget_to_setting(asettings, widget);
-		ghb_audio_list_refresh_selected(ud);
-	}
-	ghb_live_reset(ud);
+    GValue *asettings;
+
+    g_debug("gain_widget_changed_cb ()");
+
+    ghb_check_dependency(ud, widget, NULL);
+    if (block_updates) return;
+    asettings = get_selected_asettings(ud);
+
+    char *s_gain;
+    if ( gain >= 21.0 )
+        s_gain = g_strdup_printf("*11*");
+    else
+        s_gain = g_strdup_printf("%ddB", (int)gain);
+    ghb_ui_update( ud, "AudioTrackGainValue", ghb_string_value(s_gain));
+    g_free(s_gain);
+
+    if (asettings != NULL)
+    {
+        ghb_widget_to_setting(asettings, widget);
+        ghb_audio_list_refresh_selected(ud);
+    }
+    ghb_live_reset(ud);
 }
 
 void
 ghb_clear_audio_list_settings(GValue *settings)
 {
-	GValue *audio_list;
-	
-	g_debug("clear_audio_list_settings ()");
-	audio_list = ghb_settings_get_value(settings, "audio_list");
-	if (audio_list == NULL)
-	{
-		audio_list = ghb_array_value_new(8);
-		ghb_settings_set_value(settings, "audio_list", audio_list);
-	}
-	else
-		ghb_array_value_reset(audio_list, 8);
+    GValue *audio_list;
+    
+    g_debug("clear_audio_list_settings ()");
+    audio_list = ghb_settings_get_value(settings, "audio_list");
+    if (audio_list == NULL)
+    {
+        audio_list = ghb_array_value_new(8);
+        ghb_settings_set_value(settings, "audio_list", audio_list);
+    }
+    else
+        ghb_array_value_reset(audio_list, 8);
 }
 
 void
 ghb_clear_audio_list_ui(GtkBuilder *builder)
 {
-	GtkTreeView *treeview;
-	GtkListStore *store;
-	
-	g_debug("clear_audio_list_ui ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-	gtk_list_store_clear (store);
+    GtkTreeView *treeview;
+    GtkListStore *store;
+    
+    g_debug("clear_audio_list_ui ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+    gtk_list_store_clear (store);
 }
 
 static void
 ghb_add_audio_to_ui(GtkBuilder *builder, const GValue *settings)
 {
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	GtkTreeSelection *selection;
-	const gchar *track, *codec, *br, *sr, *mix;
-	gchar *s_drc, *s_gain, *s_quality = NULL;
-	gint itrack;
-	gdouble drc;
-	gdouble gain;
-	
-	g_debug("ghb_add_audio_to_ui ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
-	track = ghb_settings_combo_option(settings, "AudioTrack");
-	itrack = ghb_settings_combo_int(settings, "AudioTrack");
-	codec = ghb_settings_combo_option(settings, "AudioEncoderActual");
-	double quality = ghb_settings_get_double(settings, "AudioTrackQuality");
-	if (ghb_settings_get_boolean(settings, "AudioTrackQualityEnable") &&
-		quality != HB_INVALID_AUDIO_QUALITY)
-	{
-		int codec = ghb_settings_combo_int(settings, "AudioEncoderActual");
-		s_quality = ghb_format_quality("Q/", codec, quality);
-	}
-	else
-	{
-		br = ghb_settings_combo_option(settings, "AudioBitrate");
-	}
-	sr = ghb_settings_combo_option(settings, "AudioSamplerate");
-	mix = ghb_settings_combo_option(settings, "AudioMixdown");
-	gain = ghb_settings_get_double(settings, "AudioTrackGain");
-	s_gain = g_strdup_printf("%ddB", (int)gain);
-
-	drc = ghb_settings_get_double(settings, "AudioTrackDRCSlider");
-	if (drc < 1.0)
-		s_drc = g_strdup("Off");
-	else
-		s_drc = g_strdup_printf("%.1f", drc);
-
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 
-		// These are displayed in list
-		0, track,
-		1, codec,
-		2, s_quality ? s_quality : br,
-		3, sr,
-		4, mix,
-		5, s_gain,
-		6, s_drc,
-		-1);
-	gtk_tree_selection_select_iter(selection, &iter);
-	g_free(s_drc);
-	g_free(s_gain);
-	g_free(s_quality);
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    GtkTreeSelection *selection;
+    const gchar *track, *codec, *br = NULL, *sr, *mix;
+    gchar *s_drc, *s_gain, *s_quality = NULL;
+    gdouble drc;
+    gdouble gain;
+    
+    g_debug("ghb_add_audio_to_ui ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+
+    track = ghb_settings_combo_option(settings, "AudioTrack");
+    codec = ghb_settings_combo_option(settings, "AudioEncoderActual");
+    double quality = ghb_settings_get_double(settings, "AudioTrackQuality");
+    if (ghb_settings_get_boolean(settings, "AudioTrackQualityEnable") &&
+        quality != HB_INVALID_AUDIO_QUALITY)
+    {
+        int codec = ghb_settings_combo_int(settings, "AudioEncoderActual");
+        s_quality = ghb_format_quality("Q/", codec, quality);
+    }
+    else
+    {
+        br = ghb_settings_combo_option(settings, "AudioBitrate");
+    }
+    sr = ghb_settings_combo_option(settings, "AudioSamplerate");
+    mix = ghb_settings_combo_option(settings, "AudioMixdown");
+    gain = ghb_settings_get_double(settings, "AudioTrackGain");
+    s_gain = g_strdup_printf("%ddB", (int)gain);
+
+    drc = ghb_settings_get_double(settings, "AudioTrackDRCSlider");
+    if (drc < 1.0)
+        s_drc = g_strdup("Off");
+    else
+        s_drc = g_strdup_printf("%.1f", drc);
+
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+        // These are displayed in list
+        0, track,
+        1, codec,
+        2, s_quality ? s_quality : br,
+        3, sr,
+        4, mix,
+        5, s_gain,
+        6, s_drc,
+        -1);
+    gtk_tree_selection_select_iter(selection, &iter);
+    g_free(s_drc);
+    g_free(s_gain);
+    g_free(s_quality);
 }
 
 G_MODULE_EXPORT void
 audio_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
 {
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	GtkWidget *widget;
-	
-	GtkTreePath *treepath;
-	gint *indices;
-	gint row;
-	GValue *asettings = NULL;
-
-	const GValue *audio_list;
-	g_debug("audio_list_selection_changed_cb ()");
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		//const gchar *actual_codec, *track, *codec, *bitrate, *sample_rate, *mix;
-		//gdouble drc;
-
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		// find audio settings
-		if (row < 0) return;
-		audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-		if (row >= ghb_array_len(audio_list))
-			return;
-		asettings = ghb_array_get_nth(audio_list, row);
-
-		block_updates = TRUE;
-		ghb_ui_update(ud, "AudioTrack", ghb_settings_get_value(asettings, "AudioTrack"));
-		ghb_ui_update(ud, "AudioEncoder", ghb_settings_get_value(asettings, "AudioEncoder"));
-		ghb_settings_set_value(ud->settings, "AudioEncoderActual", ghb_settings_get_value(asettings, "AudioEncoderActual"));
-		ghb_check_dependency(ud, NULL, "AudioEncoderActual");
-		ghb_ui_update(ud, "AudioBitrate", ghb_settings_get_value(asettings, "AudioBitrate"));
-		ghb_ui_update(ud, "AudioTrackName", ghb_settings_get_value(asettings, "AudioTrackName"));
-		ghb_ui_update(ud, "AudioSamplerate", ghb_settings_get_value(asettings, "AudioSamplerate"));
-		ghb_ui_update(ud, "AudioMixdown", ghb_settings_get_value(asettings, "AudioMixdown"));
-		ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_settings_get_value(asettings, "AudioTrackDRCSlider"));
-		ghb_ui_update(ud, "AudioTrackGain", ghb_settings_get_value(asettings, "AudioTrackGain"));
-		ghb_ui_update(ud, "AudioTrackQuality", ghb_settings_get_value(asettings, "AudioTrackQuality"));
-		ghb_ui_update(ud, "AudioTrackQualityEnable", ghb_settings_get_value(asettings, "AudioTrackQualityEnable"));
-		block_updates = FALSE;
-		widget = GHB_WIDGET (ud->builder, "audio_remove");
-		gtk_widget_set_sensitive(widget, TRUE);
-	}
-	else
-	{
-		widget = GHB_WIDGET (ud->builder, "audio_remove");
-		gtk_widget_set_sensitive(widget, FALSE);
-	}
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    GtkWidget *widget;
+    
+    GtkTreePath *treepath;
+    gint *indices;
+    gint row;
+    GValue *asettings = NULL;
+
+    const GValue *audio_list;
+    g_debug("audio_list_selection_changed_cb ()");
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        //const gchar *actual_codec, *track, *codec, *bitrate, *sample_rate, *mix;
+        //gdouble drc;
+
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        // find audio settings
+        if (row < 0) return;
+        audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+        if (row >= ghb_array_len(audio_list))
+            return;
+        asettings = ghb_array_get_nth(audio_list, row);
+
+        block_updates = TRUE;
+        ghb_ui_update(ud, "AudioTrack", ghb_settings_get_value(asettings, "AudioTrack"));
+        ghb_ui_update(ud, "AudioEncoder", ghb_settings_get_value(asettings, "AudioEncoder"));
+        ghb_settings_set_value(ud->settings, "AudioEncoderActual", ghb_settings_get_value(asettings, "AudioEncoderActual"));
+        ghb_check_dependency(ud, NULL, "AudioEncoderActual");
+        ghb_ui_update(ud, "AudioBitrate", ghb_settings_get_value(asettings, "AudioBitrate"));
+        ghb_ui_update(ud, "AudioTrackName", ghb_settings_get_value(asettings, "AudioTrackName"));
+        ghb_ui_update(ud, "AudioSamplerate", ghb_settings_get_value(asettings, "AudioSamplerate"));
+        ghb_ui_update(ud, "AudioMixdown", ghb_settings_get_value(asettings, "AudioMixdown"));
+        ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_settings_get_value(asettings, "AudioTrackDRCSlider"));
+        ghb_ui_update(ud, "AudioTrackGain", ghb_settings_get_value(asettings, "AudioTrackGain"));
+        ghb_ui_update(ud, "AudioTrackQuality", ghb_settings_get_value(asettings, "AudioTrackQuality"));
+        ghb_ui_update(ud, "AudioTrackQualityEnable", ghb_settings_get_value(asettings, "AudioTrackQualityEnable"));
+        block_updates = FALSE;
+        widget = GHB_WIDGET (ud->builder, "audio_remove");
+        gtk_widget_set_sensitive(widget, TRUE);
+
+        ghb_adjust_audio_rate_combos(ud);
+    }
+    else
+    {
+        widget = GHB_WIDGET (ud->builder, "audio_remove");
+        gtk_widget_set_sensitive(widget, FALSE);
+    }
 }
 
 static gboolean
 ghb_add_audio_to_settings(GValue *settings, GValue *asettings)
 {
-	GValue *audio_list;
-	const gchar * track;
-	int count;
-
-	audio_list = ghb_settings_get_value(settings, "audio_list");
-	if (audio_list == NULL)
-	{
-		audio_list = ghb_array_value_new(8);
-		ghb_settings_set_value(settings, "audio_list", audio_list);
-	}
-	count = ghb_array_len(audio_list);
-	// Don't allow more than 99
-	// This is a hard limit imposed by libhb/reader.c:GetFifoForId()
-	if (count >= 99)
-	{
-		ghb_value_free(asettings);
-		return FALSE;
-	}
-
-	int title_no = ghb_settings_get_int(settings, "title_no");
-	int track_no = ghb_settings_get_int(asettings, "AudioTrack");
-	track = ghb_audio_track_description(track_no, title_no);
-	ghb_settings_set_string(asettings, "AudioTrackDescription", track);
-
-	GValue *aname;
-	aname = ghb_dict_lookup(asettings, "AudioTrackName");
-	if (aname == NULL)
-	{
-		ghb_settings_set_string(asettings, "AudioTrackName", "");
-	}
-	if (ghb_array_len(audio_list) >= 99)
-	{
-		ghb_value_free(asettings);
-		return FALSE;
-	}
-	ghb_array_append(audio_list, asettings);
-	return TRUE;
+    GValue *audio_list;
+    const gchar * track;
+    int count;
+
+    audio_list = ghb_settings_get_value(settings, "audio_list");
+    if (audio_list == NULL)
+    {
+        audio_list = ghb_array_value_new(8);
+        ghb_settings_set_value(settings, "audio_list", audio_list);
+    }
+    count = ghb_array_len(audio_list);
+    // Don't allow more than 99
+    // This is a hard limit imposed by libhb/reader.c:GetFifoForId()
+    if (count >= 99)
+    {
+        ghb_value_free(asettings);
+        return FALSE;
+    }
+
+    int title_no = ghb_settings_get_int(settings, "title_no");
+    int track_no = ghb_settings_get_int(asettings, "AudioTrack");
+    track = ghb_audio_track_description(track_no, title_no);
+    ghb_settings_set_string(asettings, "AudioTrackDescription", track);
+
+    GValue *aname;
+    aname = ghb_dict_lookup(asettings, "AudioTrackName");
+    if (aname == NULL)
+    {
+        ghb_settings_set_string(asettings, "AudioTrackName", "");
+    }
+    if (ghb_array_len(audio_list) >= 99)
+    {
+        ghb_value_free(asettings);
+        return FALSE;
+    }
+    ghb_array_append(audio_list, asettings);
+    return TRUE;
 }
 
 G_MODULE_EXPORT void
 audio_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	// Add the current audio settings to the list.
-	GValue *asettings;
-	GtkWidget *widget;
-	
-	g_debug("audio_add_clicked_cb ()");
-	asettings = ghb_dict_value_new();
-	widget = GHB_WIDGET(ud->builder, "AudioTrack");
-	ghb_settings_take_value(asettings, "AudioTrack", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioEncoder");
-	ghb_settings_take_value(asettings, "AudioEncoder", ghb_widget_value(widget));
-	ghb_settings_set_value(asettings, "AudioEncoderActual", 
-		ghb_settings_get_value(ud->settings, "AudioEncoderActual"));
-	widget = GHB_WIDGET(ud->builder, "AudioTrackQualityEnable");
-	ghb_settings_take_value(asettings, "AudioTrackQualityEnable", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioTrackQuality");
-	ghb_settings_take_value(asettings, "AudioTrackQuality", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioBitrate");
-	ghb_settings_take_value(asettings, "AudioBitrate", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
-	ghb_settings_take_value(asettings, "AudioSamplerate", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioMixdown");
-	ghb_settings_take_value(asettings, "AudioMixdown", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioTrackGain");
-	ghb_settings_take_value(asettings, "AudioTrackGain", ghb_widget_value(widget));
-	widget = GHB_WIDGET(ud->builder, "AudioTrackDRCSlider");
-	ghb_settings_take_value(asettings, "AudioTrackDRCSlider", ghb_widget_value(widget));
-
-	if (!ghb_add_audio_to_settings(ud->settings, asettings))
-		return;
-
-	ghb_add_audio_to_ui(ud->builder, asettings);
-	check_list_full(ud);
+    // Add the current audio settings to the list.
+    GValue *asettings;
+    GtkWidget *widget;
+    
+    g_debug("audio_add_clicked_cb ()");
+    asettings = ghb_dict_value_new();
+    widget = GHB_WIDGET(ud->builder, "AudioTrack");
+    ghb_settings_take_value(asettings, "AudioTrack", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioEncoder");
+    ghb_settings_take_value(asettings, "AudioEncoder", ghb_widget_value(widget));
+    ghb_settings_set_value(asettings, "AudioEncoderActual", 
+        ghb_settings_get_value(ud->settings, "AudioEncoderActual"));
+    widget = GHB_WIDGET(ud->builder, "AudioTrackQualityEnable");
+    ghb_settings_take_value(asettings, "AudioTrackQualityEnable", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioTrackQuality");
+    ghb_settings_take_value(asettings, "AudioTrackQuality", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioBitrate");
+    ghb_settings_take_value(asettings, "AudioBitrate", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
+    ghb_settings_take_value(asettings, "AudioSamplerate", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioMixdown");
+    ghb_settings_take_value(asettings, "AudioMixdown", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioTrackGain");
+    ghb_settings_take_value(asettings, "AudioTrackGain", ghb_widget_value(widget));
+    widget = GHB_WIDGET(ud->builder, "AudioTrackDRCSlider");
+    ghb_settings_take_value(asettings, "AudioTrackDRCSlider", ghb_widget_value(widget));
+
+    if (!ghb_add_audio_to_settings(ud->settings, asettings))
+        return;
+
+    ghb_add_audio_to_ui(ud->builder, asettings);
+    check_list_full(ud);
 }
 
 G_MODULE_EXPORT void
 audio_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter, nextIter;
-	gint *indices;
-	gint row;
-	GValue *audio_list;
-
-	g_debug("audio_remove_clicked_cb ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		nextIter = iter;
-		if (!gtk_tree_model_iter_next(store, &nextIter))
-		{
-			nextIter = iter;
-			if (gtk_tree_model_get_iter_first(store, &nextIter))
-			{
-				gtk_tree_selection_select_iter (selection, &nextIter);
-			}
-		}
-		else
-		{
-			gtk_tree_selection_select_iter (selection, &nextIter);
-		}
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		// Remove the selected item
-		gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
-		// remove from audio settings list
-		if (row < 0) return;
-		widget = GHB_WIDGET (ud->builder, "audio_add");
-		gtk_widget_set_sensitive(widget, TRUE);
-		audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-		if (row >= ghb_array_len(audio_list))
-			return;
-		GValue *old = ghb_array_get_nth(audio_list, row);
-		ghb_value_free(old);
-		ghb_array_remove(audio_list, row);
-	}
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter, nextIter;
+    gint *indices;
+    gint row;
+    GValue *audio_list;
+
+    g_debug("audio_remove_clicked_cb ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        nextIter = iter;
+        if (!gtk_tree_model_iter_next(store, &nextIter))
+        {
+            nextIter = iter;
+            if (gtk_tree_model_get_iter_first(store, &nextIter))
+            {
+                gtk_tree_selection_select_iter (selection, &nextIter);
+            }
+        }
+        else
+        {
+            gtk_tree_selection_select_iter (selection, &nextIter);
+        }
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        if (row < 0) return;
+
+        audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+        if (row >= ghb_array_len(audio_list))
+            return;
+
+        // Update our settings list before removing the row from the
+        // treeview.  Removing from the treeview sometimes provokes an
+        // immediate selection change, so the list needs to be up to date
+        // when this happens.
+        GValue *old = ghb_array_get_nth(audio_list, row);
+        ghb_value_free(old);
+        ghb_array_remove(audio_list, row);
+
+        // Remove the selected item
+        gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
+        // remove from audio settings list
+        widget = GHB_WIDGET (ud->builder, "audio_add");
+        gtk_widget_set_sensitive(widget, TRUE);
+    }
 }
 
 void
 ghb_set_audio(signal_user_data_t *ud, GValue *settings)
 {
-	gint acodec_code;
-
-	GValue *alist;
-	GValue *track, *audio, *acodec, *acodec_actual, *bitrate, *rate, 
-			*mix, *drc, *gain, *quality, *enable_quality;
-	gint count, ii;
-	
-	g_debug("set_audio");
-	// Clear the audio list
-	ghb_clear_audio_list_settings(ud->settings);
-	ghb_clear_audio_list_ui(ud->builder);
-	alist = ghb_settings_get_value(settings, "audio_list");
-
-	count = ghb_array_len(alist);
-	for (ii = 0; ii < count; ii++)
-	{
-		audio = ghb_array_get_nth(alist, ii);
-		track = ghb_settings_get_value(audio, "AudioTrack");
-		acodec = ghb_settings_get_value(audio, "AudioEncoder");
-		acodec_actual = ghb_settings_get_value(audio, "AudioEncoderActual");
-		enable_quality = ghb_settings_get_value(audio, "AudioTrackQualityEnable");
-		quality = ghb_settings_get_value(audio, "AudioTrackQuality");
-		bitrate = ghb_settings_get_value(audio, "AudioBitrate");
-		rate = ghb_settings_get_value(audio, "AudioSamplerate");
-		mix = ghb_settings_get_value(audio, "AudioMixdown");
-		gain = ghb_settings_get_value(audio, "AudioTrackGain");
-		drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider");
-		acodec_code = ghb_lookup_combo_int("AudioEncoder", acodec);
-
-		if (acodec_code != 0)
-		{
-			GValue *asettings = ghb_dict_value_new();
-			ghb_settings_set_value(asettings, "AudioTrack", track);
-			ghb_settings_set_value(asettings, "AudioEncoder", acodec);
-			ghb_settings_set_value(asettings, "AudioEncoderActual", acodec_actual);
-			ghb_settings_set_value(asettings, "AudioTrackQualityEnable", enable_quality);
-			ghb_settings_set_value(asettings, "AudioTrackQuality", quality);
-
-			// This gets set autimatically if the codec is passthru
-			ghb_settings_set_value(asettings, "AudioBitrate", bitrate);
-			ghb_settings_set_value(asettings, "AudioSamplerate", rate);
-			ghb_settings_set_value(asettings, "AudioMixdown", mix);
-			ghb_settings_set_value(asettings, "AudioTrackGain", gain);
-			ghb_settings_set_value(asettings, "AudioTrackDRCSlider", drc);
-
-			ghb_add_audio_to_settings(ud->settings, asettings);
-
-			ghb_add_audio_to_ui(ud->builder, asettings);
-			ghb_adjust_audio_rate_combos(ud);
-		}
-	}
-	check_list_full(ud);
+    gint acodec_code;
+
+    GValue *alist;
+    GValue *track, *audio, *acodec, *acodec_actual, *bitrate, *rate, 
+            *mix, *drc, *gain, *quality, *enable_quality;
+    gint count, ii;
+    
+    g_debug("set_audio");
+    // Clear the audio list
+    ghb_clear_audio_list_settings(ud->settings);
+    ghb_clear_audio_list_ui(ud->builder);
+    alist = ghb_settings_get_value(settings, "audio_list");
+
+    count = ghb_array_len(alist);
+    for (ii = 0; ii < count; ii++)
+    {
+        audio = ghb_array_get_nth(alist, ii);
+        track = ghb_settings_get_value(audio, "AudioTrack");
+        acodec = ghb_settings_get_value(audio, "AudioEncoder");
+        acodec_actual = ghb_settings_get_value(audio, "AudioEncoderActual");
+        enable_quality = ghb_settings_get_value(audio, "AudioTrackQualityEnable");
+        quality = ghb_settings_get_value(audio, "AudioTrackQuality");
+        bitrate = ghb_settings_get_value(audio, "AudioBitrate");
+        rate = ghb_settings_get_value(audio, "AudioSamplerate");
+        mix = ghb_settings_get_value(audio, "AudioMixdown");
+        gain = ghb_settings_get_value(audio, "AudioTrackGain");
+        drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider");
+        acodec_code = ghb_lookup_combo_int("AudioEncoder", acodec);
+
+        if (acodec_code != 0)
+        {
+            GValue *asettings = ghb_dict_value_new();
+            ghb_settings_set_value(asettings, "AudioTrack", track);
+            ghb_settings_set_value(asettings, "AudioEncoder", acodec);
+            ghb_settings_set_value(asettings, "AudioEncoderActual", acodec_actual);
+            ghb_settings_set_value(asettings, "AudioTrackQualityEnable", enable_quality);
+            ghb_settings_set_value(asettings, "AudioTrackQuality", quality);
+
+            // This gets set autimatically if the codec is passthru
+            ghb_settings_set_value(asettings, "AudioBitrate", bitrate);
+            ghb_settings_set_value(asettings, "AudioSamplerate", rate);
+            ghb_settings_set_value(asettings, "AudioMixdown", mix);
+            ghb_settings_set_value(asettings, "AudioTrackGain", gain);
+            ghb_settings_set_value(asettings, "AudioTrackDRCSlider", drc);
+
+            ghb_add_audio_to_settings(ud->settings, asettings);
+
+            ghb_add_audio_to_ui(ud->builder, asettings);
+            ghb_adjust_audio_rate_combos(ud);
+        }
+    }
+    check_list_full(ud);
 }

HandBrake-0.9.8.tar.bz2/gtk/src/audiohandler.h -> HandBrake-0.9.9.tar.bz2/gtk/src/audiohandler.h Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * audiohandler.h
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * audiohandler.h is free software.
  * 
@@ -17,9 +17,9 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with callbacks.h.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #if !defined(_AUDIOHANDLER_H_)
@@ -31,9 +31,10 @@
 void ghb_set_pref_audio_settings(gint titleindex, GValue *settings);
 void ghb_set_pref_audio_from_settings(signal_user_data_t *ud, GValue *settings);
 void ghb_set_audio(signal_user_data_t *ud, GValue *settings);
-gchar* ghb_get_user_audio_lang(GValue *settings, gint titleindex, gint track);
+const gchar* ghb_get_user_audio_lang(GValue *settings, gint titleindex, gint track);
 void ghb_audio_list_refresh_selected(signal_user_data_t *ud);
 gint ghb_select_audio_codec(gint mux, hb_audio_config_t *aconfig, gint acodec, gint fallback_acodec, gint copy_mask);
+int ghb_select_fallback( GValue *settings, int mux, int acodec );
 int ghb_get_copy_mask(GValue *settings);
 void ghb_audio_list_refresh(signal_user_data_t *ud);
 char * ghb_format_quality( const char *prefix, int codec, double quality );

HandBrake-0.9.8.tar.bz2/gtk/src/callbacks.c -> HandBrake-0.9.9.tar.bz2/gtk/src/callbacks.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * callbacks.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * callbacks.c is free software.
  * 
@@ -79,6 +79,7 @@
 #include "hb-backend.h"
 #include "ghb-dvd.h"
 #include "ghbcellrenderertext.h"
+#include "x264handler.h"
 
 static void reset_chapter_list(signal_user_data_t *ud, GValue *settings);
 static void update_chapter_list_from_settings(GtkBuilder *builder, GValue *settings);
@@ -106,757 +107,770 @@
 void
 ghb_init_dep_map()
 {
-	dep_map = ghb_resource_get("widget-deps");
-	rev_map = ghb_resource_get("widget-reverse-deps");
+    dep_map = ghb_resource_get("widget-deps");
+    rev_map = ghb_resource_get("widget-reverse-deps");
 }
 
 static gboolean
 dep_check(signal_user_data_t *ud, const gchar *name, gboolean *out_hide)
 {
-	GtkWidget *widget;
-	GObject *dep_object;
-	gint ii;
-	gint count;
-	gboolean result = TRUE;
-	GValue *array, *data;
-	gchar *widget_name;
-	
-	g_debug("dep_check () %s", name);
-
-	if (rev_map == NULL) return TRUE;
-	array = ghb_dict_lookup(rev_map, name);
-	count = ghb_array_len(array);
-	*out_hide = FALSE;
-	for (ii = 0; ii < count; ii++)
-	{
-		data = ghb_array_get_nth(array, ii);
-		widget_name = ghb_value_string(ghb_array_get_nth(data, 0));
-		widget = GHB_WIDGET(ud->builder, widget_name);
-		dep_object = gtk_builder_get_object(ud->builder, name);
-		if (widget != NULL && !gtk_widget_is_sensitive(widget))
-			continue;
-		if (dep_object == NULL)
-		{
-			g_message("Failed to find widget");
-		}
-		else
-		{
-			gchar *value;
-			gint jj = 0;
-			gchar **values;
-			gboolean sensitive = FALSE;
-			gboolean die, hide;
-
-			die = ghb_value_boolean(ghb_array_get_nth(data, 2));
-			hide = ghb_value_boolean(ghb_array_get_nth(data, 3));
-			value = ghb_value_string(ghb_array_get_nth(data, 1));
-			values = g_strsplit(value, "|", 10);
-			g_free(value);
-
-			if (widget)
-				value = ghb_widget_string(widget);
-			else
-				value = ghb_settings_get_string(ud->settings, widget_name);
-			while (values && values[jj])
-			{
-				if (values[jj][0] == '>')
-				{
-					gdouble dbl = g_strtod (&values[jj][1], NULL);
-					gdouble dvalue = ghb_widget_double(widget);
-					if (dvalue > dbl)
-					{
-						sensitive = TRUE;
-						break;
-					}
-				}
-				else if (values[jj][0] == '<')
-				{
-					gdouble dbl = g_strtod (&values[jj][1], NULL);
-					gdouble dvalue = ghb_widget_double(widget);
-					if (dvalue < dbl)
-					{
-						sensitive = TRUE;
-						break;
-					}
-				}
-				if (strcmp(values[jj], value) == 0)
-				{
-					sensitive = TRUE;
-					break;
-				}
-				jj++;
-			}
-			sensitive = die ^ sensitive;
-			if (!sensitive)
-			{
-				result = FALSE;
-				*out_hide |= hide;
-			}
-			g_strfreev (values);
-			g_free(value);
-		}
-		g_free(widget_name);
-	}
-	return result;
+    GtkWidget *widget;
+    GObject *dep_object;
+    gint ii;
+    gint count;
+    gboolean result = TRUE;
+    GValue *array, *data;
+    gchar *widget_name;
+    
+    g_debug("dep_check () %s", name);
+
+    if (rev_map == NULL) return TRUE;
+    array = ghb_dict_lookup(rev_map, name);
+    count = ghb_array_len(array);
+    *out_hide = FALSE;
+    for (ii = 0; ii < count; ii++)
+    {
+        data = ghb_array_get_nth(array, ii);
+        widget_name = ghb_value_string(ghb_array_get_nth(data, 0));
+        widget = GHB_WIDGET(ud->builder, widget_name);
+        dep_object = gtk_builder_get_object(ud->builder, name);
+        if (widget != NULL && !gtk_widget_is_sensitive(widget))
+            continue;
+        if (dep_object == NULL)
+        {
+            g_message("Failed to find widget");
+        }
+        else
+        {
+            gchar *value;
+            gint jj = 0;
+            gchar **values;
+            gboolean sensitive = FALSE;
+            gboolean die, hide;
+
+            die = ghb_value_boolean(ghb_array_get_nth(data, 2));
+            hide = ghb_value_boolean(ghb_array_get_nth(data, 3));
+            value = ghb_value_string(ghb_array_get_nth(data, 1));
+            values = g_strsplit(value, "|", 10);
+            g_free(value);
+
+            if (widget)
+                value = ghb_widget_string(widget);
+            else
+                value = ghb_settings_get_string(ud->settings, widget_name);
+            while (values && values[jj])
+            {
+                if (values[jj][0] == '>')
+                {
+                    gdouble dbl = g_strtod (&values[jj][1], NULL);
+                    gdouble dvalue = ghb_widget_double(widget);
+                    if (dvalue > dbl)
+                    {
+                        sensitive = TRUE;
+                        break;
+                    }
+                }
+                else if (values[jj][0] == '<')
+                {
+                    gdouble dbl = g_strtod (&values[jj][1], NULL);
+                    gdouble dvalue = ghb_widget_double(widget);
+                    if (dvalue < dbl)
+                    {
+                        sensitive = TRUE;
+                        break;
+                    }
+                }
+                if (strcmp(values[jj], value) == 0)
+                {
+                    sensitive = TRUE;
+                    break;
+                }
+                jj++;
+            }
+            sensitive = die ^ sensitive;
+            if (!sensitive)
+            {
+                result = FALSE;
+                *out_hide |= hide;
+            }
+            g_strfreev (values);
+            g_free(value);
+        }
+        g_free(widget_name);
+    }
+    return result;
 }
 
 void
 ghb_check_dependency(
-	signal_user_data_t *ud, 
-	GtkWidget *widget, 
-	const char *alt_name)
-{
-	GObject *dep_object;
-	const gchar *name;
-	GValue *array, *data;
-	gint count, ii;
-	gchar *dep_name;
-	GType type;
-
-	if (widget != NULL)
-	{
-		type = G_OBJECT_TYPE(widget);
-		if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY)
-			if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
-		name = ghb_get_setting_key(widget);
-	}
-	else
-		name = alt_name;
-
-	g_debug("ghb_check_dependency () %s", name);
-
-	if (dep_map == NULL) return;
-	array = ghb_dict_lookup(dep_map, name);
-	count = ghb_array_len(array);
-	for (ii = 0; ii < count; ii++)
-	{
-		gboolean sensitive;
-		gboolean hide;
-
-		data = ghb_array_get_nth(array, ii);
-		dep_name = ghb_value_string(data);
-		dep_object = gtk_builder_get_object(ud->builder, dep_name);
-		if (dep_object == NULL)
-		{
-			g_message("Failed to find dependent widget %s", dep_name);
-			g_free(dep_name);
-			continue;
-		}
-		sensitive = dep_check(ud, dep_name, &hide);
-		if (GTK_IS_ACTION(dep_object))
-		{
-			gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
-			gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
-		}
-		else
-		{
-			gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
-			if (!sensitive && hide)
-			{
-				if (gtk_widget_get_visible(GTK_WIDGET(dep_object)))
-				{
-					gtk_widget_hide(GTK_WIDGET(dep_object));
-				}
-			}
-			else
-			{
-				if (!gtk_widget_get_visible(GTK_WIDGET(dep_object)))
-				{
-					gtk_widget_show_now(GTK_WIDGET(dep_object));
-				}
-			}
-		}
-		g_free(dep_name);
-	}
+    signal_user_data_t *ud, 
+    GtkWidget *widget, 
+    const char *alt_name)
+{
+    GObject *dep_object;
+    const gchar *name;
+    GValue *array, *data;
+    gint count, ii;
+    gchar *dep_name;
+    GType type;
+
+    if (widget != NULL)
+    {
+        type = G_OBJECT_TYPE(widget);
+        if (type == GTK_TYPE_COMBO_BOX)
+            if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
+        name = ghb_get_setting_key(widget);
+    }
+    else
+        name = alt_name;
+
+    g_debug("ghb_check_dependency () %s", name);
+
+    if (dep_map == NULL) return;
+    array = ghb_dict_lookup(dep_map, name);
+    count = ghb_array_len(array);
+    for (ii = 0; ii < count; ii++)
+    {
+        gboolean sensitive;
+        gboolean hide;
+
+        data = ghb_array_get_nth(array, ii);
+        dep_name = ghb_value_string(data);
+        dep_object = gtk_builder_get_object(ud->builder, dep_name);
+        if (dep_object == NULL)
+        {
+            g_message("Failed to find dependent widget %s", dep_name);
+            g_free(dep_name);
+            continue;
+        }
+        sensitive = dep_check(ud, dep_name, &hide);
+        if (GTK_IS_ACTION(dep_object))
+        {
+            gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
+            gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
+        }
+        else
+        {
+            gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+            if (!sensitive && hide)
+            {
+                if (gtk_widget_get_visible(GTK_WIDGET(dep_object)))
+                {
+                    gtk_widget_hide(GTK_WIDGET(dep_object));
+                }
+            }
+            else
+            {
+                if (!gtk_widget_get_visible(GTK_WIDGET(dep_object)))
+                {
+                    gtk_widget_show_now(GTK_WIDGET(dep_object));
+                }
+            }
+        }
+        g_free(dep_name);
+    }
 }
 
 void
 ghb_check_all_depencencies(signal_user_data_t *ud)
 {
-	GHashTableIter iter;
-	gchar *dep_name;
-	GValue *value;
-	GObject *dep_object;
-
-	g_debug("ghb_check_all_depencencies ()");
-	if (rev_map == NULL) return;
-	ghb_dict_iter_init(&iter, rev_map);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&dep_name, (gpointer*)(void*)&value))
-	{
-		gboolean sensitive;
-		gboolean hide;
-
-		dep_object = gtk_builder_get_object (ud->builder, dep_name);
-		if (dep_object == NULL)
-		{
-			g_message("Failed to find dependent widget %s", dep_name);
-			continue;
-		}
-		sensitive = dep_check(ud, dep_name, &hide);
-		if (GTK_IS_ACTION(dep_object))
-		{
-			gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
-			gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
-		}
-		else
-		{
-			gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
-			if (!sensitive && hide)
-			{
-				gtk_widget_hide(GTK_WIDGET(dep_object));
-			}
-			else
-			{
-				gtk_widget_show_now(GTK_WIDGET(dep_object));
-			}
-		}
-	}
+    GHashTableIter iter;
+    gchar *dep_name;
+    GValue *value;
+    GObject *dep_object;
+
+    g_debug("ghb_check_all_depencencies ()");
+    if (rev_map == NULL) return;
+    ghb_dict_iter_init(&iter, rev_map);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&dep_name, (gpointer*)(void*)&value))
+    {
+        gboolean sensitive;
+        gboolean hide;
+
+        dep_object = gtk_builder_get_object (ud->builder, dep_name);
+        if (dep_object == NULL)
+        {
+            g_message("Failed to find dependent widget %s", dep_name);
+            continue;
+        }
+        sensitive = dep_check(ud, dep_name, &hide);
+        if (GTK_IS_ACTION(dep_object))
+        {
+            gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
+            gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
+        }
+        else
+        {
+            gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+            if (!sensitive && hide)
+            {
+                gtk_widget_hide(GTK_WIDGET(dep_object));
+            }
+            else
+            {
+                gtk_widget_show_now(GTK_WIDGET(dep_object));
+            }
+        }
+    }
 }
 
 G_MODULE_EXPORT void
 on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
 {
-	gint state = ghb_get_queue_state();
-	g_debug("on_quit1_activate ()");
-	if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
-	{
-		if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
-		{
-			ghb_hb_cleanup(FALSE);
-			prune_logs(ud);
-			gtk_main_quit();
-			return;
-		}
-		return;
-	}
-	ghb_hb_cleanup(FALSE);
-	prune_logs(ud);
-	gtk_main_quit();
+    gint state = ghb_get_queue_state();
+    g_debug("on_quit1_activate ()");
+    if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
+    {
+        if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
+        {
+            ghb_hb_cleanup(FALSE);
+            prune_logs(ud);
+            gtk_main_quit();
+            return;
+        }
+        return;
+    }
+    ghb_hb_cleanup(FALSE);
+    prune_logs(ud);
+    gtk_main_quit();
 }
 
 gboolean
 uppers_and_unders(gchar *str)
 {
-	if (str == NULL) return FALSE;
-	str = g_strchomp(g_strchug(str));
-	while (*str)
-	{
-		if (*str == ' ')
-		{
-			return FALSE;
-		}
-		if (*str >= 'a' && *str <= 'z')
-		{
-			return FALSE;
-		}
-		str++;
-	}
-	return TRUE;
+    if (str == NULL) return FALSE;
+    str = g_strchomp(g_strchug(str));
+    while (*str)
+    {
+        if (*str == ' ')
+        {
+            return FALSE;
+        }
+        if (*str >= 'a' && *str <= 'z')
+        {
+            return FALSE;
+        }
+        str++;
+    }
+    return TRUE;
 }
 
 enum
 {
-	CAMEL_FIRST_UPPER,
-	CAMEL_OTHER
+    CAMEL_FIRST_UPPER,
+    CAMEL_OTHER
 };
 
 void
 camel_convert(gchar *str)
 {
-	gint state = CAMEL_OTHER;
-	
-	if (str == NULL) return;
-	while (*str)
-	{
-		if (*str == '_') *str = ' ';
-		switch (state)
-		{
-			case CAMEL_OTHER:
-			{
-				if (*str >= 'A' && *str <= 'Z')
-					state = CAMEL_FIRST_UPPER;
-				else
-					state = CAMEL_OTHER;
-				
-			} break;
-			case CAMEL_FIRST_UPPER:
-			{
-				if (*str >= 'A' && *str <= 'Z')
-					*str = *str - 'A' + 'a';
-				else
-					state = CAMEL_OTHER;
-			} break;
-		}
-		str++;
-	}
+    gint state = CAMEL_OTHER;
+    
+    if (str == NULL) return;
+    while (*str)
+    {
+        if (*str == '_') *str = ' ';
+        switch (state)
+        {
+            case CAMEL_OTHER:
+            {
+                if (*str >= 'A' && *str <= 'Z')
+                    state = CAMEL_FIRST_UPPER;
+                else
+                    state = CAMEL_OTHER;
+                
+            } break;
+            case CAMEL_FIRST_UPPER:
+            {
+                if (*str >= 'A' && *str <= 'Z')
+                    *str = *str - 'A' + 'a';
+                else
+                    state = CAMEL_OTHER;
+            } break;
+        }
+        str++;
+    }
 }
 
 #if defined(_WIN32)
 static gchar*
 get_dvd_device_name(gchar *device)
 {
-	return g_strdup(device);
+    return g_strdup(device);
 }
 #else
 static gchar*
 get_dvd_device_name(GDrive *gd)
 {
-	return g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+    return g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
 }
 #endif
 
 static GHashTable *volname_hash = NULL;
-static GMutex     *volname_mutex = NULL;
+#if GLIB_CHECK_VERSION(2, 32, 0)
+static GMutex     volname_mutex_static;
+#endif
+static GMutex     *volname_mutex;
 
 static void
 free_volname_key(gpointer data)
 {
-	if (data != NULL)
-		g_free(data);
+    if (data != NULL)
+        g_free(data);
 }
 
 static void
 free_volname_value(gpointer data)
 {
-	if (data != NULL)
-		g_free(data);
+    if (data != NULL)
+        g_free(data);
 }
 
 #if defined(_WIN32)
 static gchar*
 get_direct_dvd_volume_name(const gchar *drive)
 {
-	gchar *result = NULL;
-	gchar vname[51], fsname[51];
+    gchar *result = NULL;
+    gchar vname[51], fsname[51];
 
-	if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 50))
-	{
-		result = g_strdup_printf("%s", vname);
-	}
-	return result;
+    if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 50))
+    {
+        result = g_strdup_printf("%s", vname);
+    }
+    return result;
 }
 #else
 static gchar*
 get_direct_dvd_volume_name(const gchar *drive)
 {
-	gchar *result;
+    gchar *result;
 
-	result = ghb_dvd_volname (drive);
-	return result;
+    result = ghb_dvd_volname (drive);
+    return result;
 }
 #endif
 
 static gchar*
 get_dvd_volume_name(gpointer gd)
 {
-	gchar *label = NULL;
-	gchar *result;
-	gchar *drive;
-
-	drive = get_dvd_device_name(gd);
-	g_mutex_lock(volname_mutex);
-	label = g_strdup(g_hash_table_lookup(volname_hash, drive));
-	g_mutex_unlock(volname_mutex);
-	if (label != NULL)
-	{
-		if (uppers_and_unders(label))
-		{
-			camel_convert(label);
-		}
+    gchar *label = NULL;
+    gchar *result;
+    gchar *drive;
+
+    drive = get_dvd_device_name(gd);
+    g_mutex_lock(volname_mutex);
+    label = g_strdup(g_hash_table_lookup(volname_hash, drive));
+    g_mutex_unlock(volname_mutex);
+    if (label != NULL)
+    {
+        if (uppers_and_unders(label))
+        {
+            camel_convert(label);
+        }
 #if defined(_WIN32)
-		result = g_strdup_printf("%s (%s)", label, drive);
+        result = g_strdup_printf("%s (%s)", label, drive);
 #else
-		result = g_strdup_printf("%s - %s", drive, label);
+        result = g_strdup_printf("%s - %s", drive, label);
 #endif
-		g_free(label);
-	}
-	else
-	{
-		result = g_strdup_printf("%s", drive);
-	}
-	g_free(drive);
-	return result;
+        g_free(label);
+    }
+    else
+    {
+        result = g_strdup_printf("%s", drive);
+    }
+    g_free(drive);
+    return result;
 }
 
 void
 ghb_volname_cache_init(void)
 {
-	volname_mutex = g_mutex_new();
-	volname_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-										free_volname_key, free_volname_value);
+#if GLIB_CHECK_VERSION(2, 32, 0)
+    g_mutex_init(&volname_mutex_static);
+    volname_mutex = &volname_mutex_static;
+#else
+    volname_mutex = g_mutex_new();
+#endif
+    volname_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+                                        free_volname_key, free_volname_value);
 }
 
 static void
 free_drive(gpointer drive)
 {
 #if defined(_WIN32)
-		g_free(drive);
+        g_free(drive);
 #else
-		g_object_unref(drive);
+        g_object_unref(drive);
 #endif
 }
 
 gpointer
 ghb_cache_volnames(signal_user_data_t *ud)
 {
-	GList *link, *drives;
+    GList *link, *drives;
 
-	g_debug("ghb_cache_volnames()");
-	link = drives = dvd_device_list();
-	if (drives == NULL)
-		return NULL;
-
-	g_mutex_lock(volname_mutex);
-	g_hash_table_remove_all(volname_hash);
-	while (link != NULL)
-	{
-		gchar *name, *drive;
+    g_debug("ghb_cache_volnames()");
+    link = drives = dvd_device_list();
+    if (drives == NULL)
+        return NULL;
+
+    g_mutex_lock(volname_mutex);
+    g_hash_table_remove_all(volname_hash);
+    while (link != NULL)
+    {
+        gchar *name, *drive;
 
 #if !defined(_WIN32)
-		if (!g_drive_has_media (link->data))
-		{
-			g_object_unref(link->data);
-			link = link->next;
-			continue;
-		}
-#endif
-		drive = get_dvd_device_name(link->data);
-		name = get_direct_dvd_volume_name(drive);
-
-		if (drive != NULL && name != NULL)
-		{
-			g_hash_table_insert(volname_hash, drive, name);
-		}
-		else
-		{
-			if (drive != NULL)
-				g_free(drive);
-			if (name != NULL)
-				g_free(name);
-		}
-	
-		free_drive(link->data);
-		link = link->next;
-	}
-	g_mutex_unlock(volname_mutex);
+        if (!g_drive_has_media (link->data))
+        {
+            g_object_unref(link->data);
+            link = link->next;
+            continue;
+        }
+#endif
+        drive = get_dvd_device_name(link->data);
+        name = get_direct_dvd_volume_name(drive);
+
+        if (drive != NULL && name != NULL)
+        {
+            g_hash_table_insert(volname_hash, drive, name);
+        }
+        else
+        {
+            if (drive != NULL)
+                g_free(drive);
+            if (name != NULL)
+                g_free(name);
+        }
+    
+        free_drive(link->data);
+        link = link->next;
+    }
+    g_mutex_unlock(volname_mutex);
 
-	g_list_free(drives);
+    g_list_free(drives);
 
-	g_idle_add((GSourceFunc)ghb_file_menu_add_dvd, ud);
+    g_idle_add((GSourceFunc)ghb_file_menu_add_dvd, ud);
 
-	return NULL;
+    return NULL;
 }
 
 static const gchar*
 get_extension(GValue *settings)
 {
-	int container;
-	const gchar *extension = "error";
+    int container;
+    const gchar *extension = "error";
 
-	container = ghb_settings_combo_int(settings, "FileFormat");
-	if (container == HB_MUX_MP4)
-	{
-		extension = "mp4";
-		if (ghb_settings_get_boolean(settings, "UseM4v"))
-		{
-			extension = "m4v";
-		}
-	}
-	else if (container == HB_MUX_MKV)
-	{
-		extension = "mkv";
-	}
-	return extension;
+    container = ghb_settings_combo_int(settings, "FileFormat");
+    if (container == HB_MUX_MP4)
+    {
+        extension = "mp4";
+        if (ghb_settings_get_boolean(settings, "UseM4v"))
+        {
+            extension = "m4v";
+        }
+    }
+    else if (container == HB_MUX_MKV)
+    {
+        extension = "mkv";
+    }
+    return extension;
 }
 
 static void
 set_destination_settings(GValue *settings)
 {
-	g_debug("set_destination_settings");
-	if (ghb_settings_get_boolean(settings, "use_source_name"))
-	{
-		GString *str = g_string_new("");
-		gchar *vol_name;
-		const gchar *extension;
-		gchar *new_name;
-		gint title;
-		
-		extension = get_extension(settings);
-		vol_name = ghb_settings_get_string(settings, "volume_label");
-		g_string_append_printf(str, "%s", vol_name);
-		title = ghb_settings_get_int(settings, "title_no");
-		if (title >= 0)
-		{
-			if (ghb_settings_get_boolean(settings, "title_no_in_destination"))
-			{
-
-				g_string_append_printf(str, " - %d", title+1);
-			}
-			if (ghb_settings_combo_int(settings, "PtoPType") == 0 && 
-				ghb_settings_get_boolean(
-					settings, "chapters_in_destination"))
-			{
-				gint start, end;
-
-				if (!ghb_settings_get_boolean(
-						settings, "title_no_in_destination"))
-				{
-					g_string_append_printf(str, " -");
-				}
-				start = ghb_settings_get_int(settings, "start_point");
-				end = ghb_settings_get_int(settings, "end_point");
-				if (start == end)
-					g_string_append_printf(str, " Ch %d", start);
-				else
-					g_string_append_printf(str, " Ch %d-%d", start, end);
-			}
-		}
-		g_string_append_printf(str, ".%s", extension);
-		new_name = g_string_free(str, FALSE);
-		ghb_settings_set_string(settings, "dest_file", new_name);
-		g_free(vol_name);
-		g_free(new_name);
-	}
+    g_debug("set_destination_settings");
+    if (ghb_settings_get_boolean(settings, "use_source_name"))
+    {
+        GString *str = g_string_new("");
+        gchar *vol_name;
+        const gchar *extension;
+        gchar *new_name;
+        gint title;
+        
+        extension = get_extension(settings);
+        vol_name = ghb_settings_get_string(settings, "volume_label");
+        g_string_append_printf(str, "%s", vol_name);
+        title = ghb_settings_get_int(settings, "title_no");
+        if (title >= 0)
+        {
+            if (ghb_settings_get_boolean(settings, "title_no_in_destination"))
+            {
+
+                g_string_append_printf(str, " - %d", title+1);
+            }
+            if (ghb_settings_combo_int(settings, "PtoPType") == 0 && 
+                ghb_settings_get_boolean(
+                    settings, "chapters_in_destination"))
+            {
+                gint start, end;
+
+                if (!ghb_settings_get_boolean(
+                        settings, "title_no_in_destination"))
+                {
+                    g_string_append_printf(str, " -");
+                }
+                start = ghb_settings_get_int(settings, "start_point");
+                end = ghb_settings_get_int(settings, "end_point");
+                if (start == end)
+                    g_string_append_printf(str, " Ch %d", start);
+                else
+                    g_string_append_printf(str, " Ch %d-%d", start, end);
+            }
+        }
+        g_string_append_printf(str, ".%s", extension);
+        new_name = g_string_free(str, FALSE);
+        ghb_settings_set_string(settings, "dest_file", new_name);
+        g_free(vol_name);
+        g_free(new_name);
+    }
 }
 
 static void
 set_destination(signal_user_data_t *ud)
 {
-	set_destination_settings(ud->settings);
-	ghb_ui_update(ud, "dest_file", 
-		ghb_settings_get_value(ud->settings, "dest_file"));
+    set_destination_settings(ud->settings);
+    ghb_ui_update(ud, "dest_file", 
+        ghb_settings_get_value(ud->settings, "dest_file"));
 }
 
 static gchar*
 get_file_label(const gchar *filename)
 {
-	gchar *base, *pos, *end;
+    gchar *base, *pos, *end;
 
-	base = g_path_get_basename(filename);
-	pos = strrchr(base, '.');
-	if (pos != NULL)
-	{
-		// If the last '.' is within 4 chars of end of name, assume
-		// there is an extension we want to strip.
-		end = &base[strlen(base) - 1];
-		if (end - pos <= 4)
-			*pos = 0;
-	}
-	return base;
+    base = g_path_get_basename(filename);
+    pos = strrchr(base, '.');
+    if (pos != NULL)
+    {
+        // If the last '.' is within 4 chars of end of name, assume
+        // there is an extension we want to strip.
+        end = &base[strlen(base) - 1];
+        if (end - pos <= 4)
+            *pos = 0;
+    }
+    return base;
 }
 
 static gchar*
 resolve_drive_name(gchar *filename)
 {
 #if defined(_WIN32)
-	if (filename[1] == ':')
-	{
-		gchar drive[4];
-		gchar *name;
-		gint dtype;
-
-		g_strlcpy(drive, filename, 4);
-		dtype = GetDriveType(drive);
-		if (dtype == DRIVE_CDROM)
-		{
-			gchar vname[51], fsname[51];
-			GetVolumeInformation(drive, vname, 50, NULL, 
-								NULL, NULL, fsname, 50);
-			name = g_strdup(vname);
-			return name;
-		}
-	}
-	return NULL;
+    if (filename[1] == ':')
+    {
+        gchar drive[4];
+        gchar *name;
+        gint dtype;
+
+        g_strlcpy(drive, filename, 4);
+        dtype = GetDriveType(drive);
+        if (dtype == DRIVE_CDROM)
+        {
+            gchar vname[51], fsname[51];
+            GetVolumeInformation(drive, vname, 50, NULL, 
+                                NULL, NULL, fsname, 50);
+            name = g_strdup(vname);
+            return name;
+        }
+    }
+    return NULL;
 #else
-	return NULL;
+    return NULL;
 #endif
 }
 
 static gboolean
 update_source_label(signal_user_data_t *ud, const gchar *source, gboolean update_dest)
 {
-	gchar *label = NULL;
-	gint len;
-	gchar **path;
-	gchar *start;
-	gchar *filename = g_strdup(source);
-	
-	g_debug("update_source_label()");
-	len = strlen(filename);
-	if (g_file_test(filename, G_FILE_TEST_IS_DIR))
-	{
-		// Skip dos drive letters
+    gchar *label = NULL;
+    gint len;
+    gchar **path;
+    gchar *start;
+    gchar *filename = g_strdup(source);
+    
+    g_debug("update_source_label()");
+    len = strlen(filename);
+    if (g_file_test(filename, G_FILE_TEST_IS_DIR))
+    {
+        // Skip dos drive letters
 #if defined(_WIN32)
-		start = strchr(filename, ':');
+        start = strchr(filename, ':');
 #else
-		start = filename;
+        start = filename;
 #endif
-		label = resolve_drive_name(filename);
-		if (label != NULL)
-		{
-			if (uppers_and_unders(label))
-			{
-				camel_convert(label);
-			}
-		}
-		else
-		{
-			if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
-			if (start != NULL)
-				start++;
-			else
-				start = filename;
-			
-			path = g_strsplit(start, G_DIR_SEPARATOR_S, -1);
-			len = g_strv_length (path);
-			if ((len > 1) && (strcmp("VIDEO_TS", path[len-1]) == 0))
-			{
-				label = g_strdup(path[len-2]);
-				if (uppers_and_unders(label))
-				{
-					camel_convert(label);
-				}
-			}
-			else if (len > 0)
-			{
-				if (path[len-1][0] != 0)
-				{
-					label = g_strdup(path[len-1]);
-					if (uppers_and_unders(label))
-					{
-						camel_convert(label);
-					}
-				}
-				else
-					label = g_strdup("new_video");
-			}
-			else
-				label = g_strdup("new_video");
-			g_strfreev (path);
-		}
-	}
-	else
-	{
-		// Is regular file or block dev.
-		// Check to see if it is a dvd image
-		label = ghb_dvd_volname (filename);
-		if (label == NULL)
-		{
-			label = get_file_label(filename);
-		}
-		else
-		{
-			if (uppers_and_unders(label))
-			{
-				camel_convert(label);
-			}
-		}
-	}
-	g_free(filename);
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
-	if (label != NULL)
-	{
-		gtk_label_set_text (GTK_LABEL(widget), label);
-		ghb_settings_set_string(ud->settings, "volume_label", label);
-		g_free(label);
-		if (update_dest)
-			set_destination(ud);
-	}
-	else
-	{
-		label = "No Title Found";
-		gtk_label_set_text (GTK_LABEL(widget), label);
-		ghb_settings_set_string(ud->settings, "volume_label", label);
-		return FALSE;
-	}
-	return TRUE;
+        label = resolve_drive_name(filename);
+        if (label != NULL)
+        {
+            if (uppers_and_unders(label))
+            {
+                camel_convert(label);
+            }
+        }
+        else
+        {
+            if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
+            if (start != NULL)
+                start++;
+            else
+                start = filename;
+            
+            path = g_strsplit(start, G_DIR_SEPARATOR_S, -1);
+            len = g_strv_length (path);
+            if ((len > 1) && (strcmp("VIDEO_TS", path[len-1]) == 0))
+            {
+                label = g_strdup(path[len-2]);
+                if (uppers_and_unders(label))
+                {
+                    camel_convert(label);
+                }
+            }
+            else if (len > 0)
+            {
+                if (path[len-1][0] != 0)
+                {
+                    label = g_strdup(path[len-1]);
+                    if (uppers_and_unders(label))
+                    {
+                        camel_convert(label);
+                    }
+                }
+                else
+                    label = g_strdup("new_video");
+            }
+            else
+                label = g_strdup("new_video");
+            g_strfreev (path);
+        }
+    }
+    else
+    {
+        // Is regular file or block dev.
+        // Check to see if it is a dvd image
+        label = ghb_dvd_volname (filename);
+        if (label == NULL)
+        {
+            label = get_file_label(filename);
+        }
+        else
+        {
+            if (uppers_and_unders(label))
+            {
+                camel_convert(label);
+            }
+        }
+    }
+    g_free(filename);
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
+    if (label != NULL)
+    {
+        gtk_label_set_text (GTK_LABEL(widget), label);
+        ghb_settings_set_string(ud->settings, "volume_label", label);
+        g_free(label);
+        if (update_dest)
+            set_destination(ud);
+    }
+    else
+    {
+        label = "No Title Found";
+        gtk_label_set_text (GTK_LABEL(widget), label);
+        ghb_settings_set_string(ud->settings, "volume_label", label);
+        return FALSE;
+    }
+    return TRUE;
 }
 
 G_MODULE_EXPORT void
 chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
 {
-	gchar *name = gtk_file_chooser_get_filename (dialog);
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	const gchar *device;
-	gboolean foundit = FALSE;
-	GtkComboBox *combo;
-	
-	g_debug("chooser_file_selected_cb ()");
-
-	if (name == NULL) return;
-	combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
-	store = gtk_combo_box_get_model(combo);
-	if (gtk_tree_model_get_iter_first(store, &iter))
-	{
-		do
-		{
-			gtk_tree_model_get(store, &iter, 0, &device, -1);
-			if (strcmp(name, device) == 0)
-			{
-				foundit = TRUE;
-				break;
-			}
-		} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
-	}
-	if (foundit)
-		gtk_combo_box_set_active_iter (combo, &iter);
-	else
-		gtk_combo_box_set_active (combo, 0);
-
-	g_free(name);
+    gchar *name = gtk_file_chooser_get_filename (dialog);
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    const gchar *device;
+    gboolean foundit = FALSE;
+    GtkComboBox *combo;
+    
+    g_debug("chooser_file_selected_cb ()");
+
+    if (name == NULL) return;
+    combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
+    store = gtk_combo_box_get_model(combo);
+    if (gtk_tree_model_get_iter_first(store, &iter))
+    {
+        do
+        {
+            gtk_tree_model_get(store, &iter, 0, &device, -1);
+            if (strcmp(name, device) == 0)
+            {
+                foundit = TRUE;
+                break;
+            }
+        } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
+    }
+    if (foundit)
+        gtk_combo_box_set_active_iter (combo, &iter);
+    else
+        gtk_combo_box_set_active (combo, 0);
+
+    g_free(name);
 }
 
 G_MODULE_EXPORT void
-dvd_device_changed_cb(GtkComboBox *combo, signal_user_data_t *ud)
-{
-	GtkWidget *dialog;
-	gint ii;
-
-	g_debug("dvd_device_changed_cb ()");
-	ii = gtk_combo_box_get_active (combo);
-	if (ii > 0)
-	{
-		const gchar *device;
-		gchar *name;
-
-		dialog = GHB_WIDGET(ud->builder, "source_dialog");
-		device = gtk_combo_box_get_active_text (combo);
-		name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
-		if (name == NULL || strcmp(name, device) != 0)
-			gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(dialog), device);
-		if (name != NULL)
-			g_free(name);
-	}
+dvd_device_changed_cb(GtkComboBoxText *combo, signal_user_data_t *ud)
+{
+    GtkWidget *dialog;
+    gint ii;
+
+    g_debug("dvd_device_changed_cb ()");
+    ii = gtk_combo_box_get_active (GTK_COMBO_BOX(combo));
+    if (ii > 0)
+    {
+        const gchar *device;
+        gchar *name;
+
+        dialog = GHB_WIDGET(ud->builder, "source_dialog");
+        device = gtk_combo_box_text_get_active_text(combo);
+        // Protext against unexpected NULL return value
+        if (device != NULL)
+        {
+            name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
+            if (name == NULL || strcmp(name, device) != 0)
+                gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(dialog), device);
+            if (name != NULL)
+                g_free(name);
+        }
+    }
 }
 
 static void
 source_dialog_extra_widgets(
-	signal_user_data_t *ud,
-	GtkWidget *dialog)
+    signal_user_data_t *ud,
+    GtkWidget *dialog)
 {
-	GtkComboBox *combo;
-	GList *drives, *link;
-	
-	g_debug("source_dialog_extra_widgets ()");
-	combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
-	gtk_list_store_clear(GTK_LIST_STORE(gtk_combo_box_get_model(combo)));
-
-	link = drives = dvd_device_list();
-	gtk_combo_box_append_text (combo, "Not Selected");
-	while (link != NULL)
-	{
-		gchar *name = get_dvd_device_name(link->data);
-		gtk_combo_box_append_text(combo, name);
-		g_free(name);
-		free_drive(link->data);
-		link = link->next;
-	}
-	g_list_free(drives);
-	gtk_combo_box_set_active (combo, 0);
+    GtkComboBoxText *combo;
+    GList *drives, *link;
+    
+    g_debug("source_dialog_extra_widgets ()");
+    combo = GTK_COMBO_BOX_TEXT(GHB_WIDGET(ud->builder, "source_device"));
+    gtk_list_store_clear(GTK_LIST_STORE(
+                gtk_combo_box_get_model(GTK_COMBO_BOX(combo))));
+
+    link = drives = dvd_device_list();
+    gtk_combo_box_text_append_text (combo, "Not Selected");
+    while (link != NULL)
+    {
+        gchar *name = get_dvd_device_name(link->data);
+        gtk_combo_box_text_append_text(combo, name);
+        g_free(name);
+        free_drive(link->data);
+        link = link->next;
+    }
+    g_list_free(drives);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 }
 
 extern GValue *ghb_queue_edit_settings;
@@ -865,277 +879,291 @@
 static void 
 show_scan_progress(signal_user_data_t *ud)
 {
-	GtkProgressBar *progress;
-	GtkLabel *label;
+    GtkProgressBar *progress;
+    GtkLabel *label;
 
-	progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "scan_prog"));
-	gtk_progress_bar_set_fraction (progress, 0);
-	gtk_widget_show(GTK_WIDGET(progress));
+    progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "scan_prog"));
+    gtk_progress_bar_set_fraction (progress, 0);
+    gtk_widget_show(GTK_WIDGET(progress));
 
-	label = GTK_LABEL(GHB_WIDGET(ud->builder, "source_title"));
-	gtk_label_set_text( label, "Scanning ..." );
+    label = GTK_LABEL(GHB_WIDGET(ud->builder, "source_title"));
+    gtk_label_set_text( label, "Scanning ..." );
 }
 
 static void
 start_scan(
-	signal_user_data_t *ud, 
-	const gchar *path, 
-	gint titlenum, 
-	gint preview_count)
-{
-	GtkWidget *widget;
-	GtkAction *action;
-	ghb_status_t status;
-
-	ghb_get_status(&status);
-	if (status.scan.state != GHB_STATE_IDLE)
-		return;
-
-	widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop");
-	gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Stop Scan");
-	gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Stop Scan");
-	//gtk_widget_set_sensitive(widget, FALSE);
-
-	action = GHB_ACTION(ud->builder, "source_action");
-	gtk_action_set_sensitive(action, FALSE);
-	action = GHB_ACTION(ud->builder, "source_single_action");
-	gtk_action_set_sensitive(action, FALSE);
-	ghb_backend_scan(path, titlenum, preview_count, 
-			90000L * ghb_settings_get_int64(ud->settings, "MinTitleDuration"));
+    signal_user_data_t *ud, 
+    const gchar *path, 
+    gint titlenum, 
+    gint preview_count)
+{
+    GtkWidget *widget;
+    GtkAction *action;
+    ghb_status_t status;
+
+    ghb_get_status(&status);
+    if (status.scan.state != GHB_STATE_IDLE)
+        return;
+
+    widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
+    gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Stop Scan");
+    gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Stop Scan");
+    //gtk_widget_set_sensitive(widget, FALSE);
+
+    action = GHB_ACTION(ud->builder, "source_action");
+    gtk_action_set_sensitive(action, FALSE);
+    action = GHB_ACTION(ud->builder, "source_single_action");
+    gtk_action_set_sensitive(action, FALSE);
+    ghb_backend_scan(path, titlenum, preview_count, 
+            90000L * ghb_settings_get_int64(ud->settings, "MinTitleDuration"));
 }
 
 gboolean
 ghb_idle_scan(signal_user_data_t *ud)
 {
-	gchar *path;
-	path = ghb_settings_get_string( ud->settings, "scan_source");
-	ghb_do_scan(ud, path, 0, TRUE);
-	g_free(path);
-	return FALSE;
+    gchar *path;
+    path = ghb_settings_get_string( ud->settings, "scan_source");
+    ghb_do_scan(ud, path, 0, TRUE);
+    g_free(path);
+    return FALSE;
 }
 
 void
 ghb_do_scan(
-	signal_user_data_t *ud, 
-	const gchar *filename, 
-	gint titlenum, 
-	gboolean force)
-{
-	g_debug("ghb_do_scan()");
-	if (!force && last_scan_file != NULL &&
-		strcmp(last_scan_file, filename) == 0)
-	{
-		if (ghb_queue_edit_settings)
-		{
-			ghb_settings_to_ui(ud, ghb_queue_edit_settings);
-			ghb_set_audio(ud, ghb_queue_edit_settings);
-			ghb_reset_subtitles(ud, ghb_queue_edit_settings);
-			reset_chapter_list(ud, ghb_queue_edit_settings);
-			ghb_value_free(ghb_queue_edit_settings);
-			ghb_queue_edit_settings = NULL;
-		}
-		return;
-	}
-	if (last_scan_file != NULL)
-		g_free(last_scan_file);
-	last_scan_file = NULL;
-	if (filename != NULL)
-	{
-		last_scan_file = g_strdup(filename);
-		ghb_settings_set_string(ud->settings, "scan_source", filename);
-		if (update_source_label(ud, filename, TRUE))
-		{
-			gchar *path;
-			gint preview_count;
-
-			show_scan_progress(ud);
-			path = ghb_settings_get_string( ud->settings, "scan_source");
-			prune_logs(ud);
-
-			preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-			start_scan(ud, path, titlenum, preview_count);
-			g_free(path);
-		}
-		else
-		{
-			// TODO: error dialog
-		}
-	}
+    signal_user_data_t *ud, 
+    const gchar *filename, 
+    gint titlenum, 
+    gboolean force)
+{
+    g_debug("ghb_do_scan()");
+    if (!force && last_scan_file != NULL &&
+        strcmp(last_scan_file, filename) == 0)
+    {
+        if (ghb_queue_edit_settings)
+        {
+            ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+            ghb_set_audio(ud, ghb_queue_edit_settings);
+            ghb_reset_subtitles(ud, ghb_queue_edit_settings);
+            reset_chapter_list(ud, ghb_queue_edit_settings);
+            ghb_value_free(ghb_queue_edit_settings);
+            ghb_queue_edit_settings = NULL;
+        }
+        return;
+    }
+    if (last_scan_file != NULL)
+        g_free(last_scan_file);
+    last_scan_file = NULL;
+    if (filename != NULL)
+    {
+        last_scan_file = g_strdup(filename);
+        ghb_settings_set_string(ud->settings, "scan_source", filename);
+        if (update_source_label(ud, filename, TRUE))
+        {
+            gchar *path;
+            gint preview_count;
+
+            show_scan_progress(ud);
+            path = ghb_settings_get_string( ud->settings, "scan_source");
+            prune_logs(ud);
+
+            preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+            start_scan(ud, path, titlenum, preview_count);
+            g_free(path);
+        }
+        else
+        {
+            // TODO: error dialog
+        }
+    }
 }
 
 static void
 do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	gchar *sourcename;
-	gint	response;
-
-	g_debug("source_browse_clicked_cb ()");
-	sourcename = ghb_settings_get_string(ud->settings, "scan_source");
-	GtkWidget *widget;
-	widget = GHB_WIDGET(ud->builder, "single_title_box");
-	if (single)
-		gtk_widget_show(widget);
-	else
-		gtk_widget_hide(widget);
-	dialog = GHB_WIDGET(ud->builder, "source_dialog");
-	source_dialog_extra_widgets(ud, dialog);
-
-	gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
-	response = gtk_dialog_run(GTK_DIALOG (dialog));
-	gtk_widget_hide(dialog);
-	if (response == GTK_RESPONSE_NO)
-	{
-		gchar *filename;
-
-		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-		if (filename != NULL)
-		{
-			gint titlenum;
-
-			if (single)
-				titlenum = ghb_settings_get_int(ud->settings, "single_title");
-			else
-				titlenum = 0;
-			ghb_do_scan(ud, filename, titlenum, TRUE);
-			if (strcmp(sourcename, filename) != 0)
-			{
-				ghb_settings_set_string (ud->settings, 
-										"default_source", filename);
-				ghb_pref_save (ud->settings, "default_source");
-				ghb_dvd_set_current (filename, ud);
-			}
-			g_free(filename);
-		}
-	}
-	g_free(sourcename);
+    GtkWidget *dialog;
+    gchar *sourcename;
+    gint    response;
+
+    g_debug("source_browse_clicked_cb ()");
+    sourcename = ghb_settings_get_string(ud->settings, "scan_source");
+    GtkWidget *widget;
+    widget = GHB_WIDGET(ud->builder, "single_title_box");
+    if (single)
+        gtk_widget_show(widget);
+    else
+        gtk_widget_hide(widget);
+    dialog = GHB_WIDGET(ud->builder, "source_dialog");
+    source_dialog_extra_widgets(ud, dialog);
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+    // gtk3 has a STUPID BUG!  If you select the "same_path" it ends
+    // up selecting the "Recent Files" shortcut instead of taking you
+    // to the directory and file THAT YOU ASKED FOR!!!  FUUUUK!!!
+    //
+    // So instead, I am just setting the current folder.  It's not
+    // optimal because if you are processing several files in the same
+    // folder, you want the selection to return to where you were last
+    // in the list, but there's not much else I can do at this point.
+    gchar *dirname = g_path_get_dirname(sourcename);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), dirname);
+    g_free(dirname);
+#else
+    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+#endif
+    response = gtk_dialog_run(GTK_DIALOG (dialog));
+    gtk_widget_hide(dialog);
+    if (response == GTK_RESPONSE_NO)
+    {
+        gchar *filename;
+
+        filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+        if (filename != NULL)
+        {
+            gint titlenum;
+
+            if (single)
+                titlenum = ghb_settings_get_int(ud->settings, "single_title");
+            else
+                titlenum = 0;
+            ghb_do_scan(ud, filename, titlenum, TRUE);
+            if (strcmp(sourcename, filename) != 0)
+            {
+                ghb_settings_set_string (ud->settings, 
+                                        "default_source", filename);
+                ghb_pref_save (ud->settings, "default_source");
+                ghb_dvd_set_current (filename, ud);
+            }
+            g_free(filename);
+        }
+    }
+    g_free(sourcename);
 }
 
 G_MODULE_EXPORT void
 source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
 {
-	ghb_status_t status;
-	ghb_get_status(&status);
-	if (status.scan.state & GHB_STATE_SCANNING)
-	{
-		ghb_backend_scan_stop();
-	}
-	else
-	{
-		do_source_dialog(button, FALSE, ud);
-	}
+    ghb_status_t status;
+    ghb_get_status(&status);
+    if (status.scan.state & GHB_STATE_SCANNING)
+    {
+        ghb_backend_scan_stop();
+    }
+    else
+    {
+        do_source_dialog(button, FALSE, ud);
+    }
 }
 
 G_MODULE_EXPORT void
 single_title_source_cb(GtkButton *button, signal_user_data_t *ud)
 {
-	do_source_dialog(button, TRUE, ud);
+    do_source_dialog(button, TRUE, ud);
 }
 
 G_MODULE_EXPORT void
 dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 {
-	const gchar *filename;
-	gchar *sourcename;
+    const gchar *filename;
+    gchar *sourcename;
 
-	sourcename = ghb_settings_get_string(ud->settings, "scan_source");
-	filename = gtk_buildable_get_name(GTK_BUILDABLE(action));
-	ghb_do_scan(ud, filename, 0, TRUE);
-	if (strcmp(sourcename, filename) != 0)
-	{
-		ghb_settings_set_string (ud->settings, "default_source", filename);
-		ghb_pref_save (ud->settings, "default_source");
-		ghb_dvd_set_current (filename, ud);
-	}
-	g_free(sourcename);
+    sourcename = ghb_settings_get_string(ud->settings, "scan_source");
+    filename = gtk_buildable_get_name(GTK_BUILDABLE(action));
+    ghb_do_scan(ud, filename, 0, TRUE);
+    if (strcmp(sourcename, filename) != 0)
+    {
+        ghb_settings_set_string (ud->settings, "default_source", filename);
+        ghb_pref_save (ud->settings, "default_source");
+        ghb_dvd_set_current (filename, ud);
+    }
+    g_free(sourcename);
 }
 
 void
 ghb_update_destination_extension(signal_user_data_t *ud)
 {
-	static gchar *containers[] = {".mkv", ".mp4", ".m4v", NULL};
-	gchar *filename;
-	const gchar *extension;
-	gint ii;
-	GtkEntry *entry;
-	static gboolean busy = FALSE;
-
-	g_debug("ghb_update_destination_extension ()");
-	// Since this function modifies the thing that triggers it's
-	// invocation, check to see if busy to prevent accidental infinite
-	// recursion.
-	if (busy)
-		return;
-	busy = TRUE;
-	extension = get_extension(ud->settings);
-	entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
-	filename = g_strdup(gtk_entry_get_text(entry));
-	for (ii = 0; containers[ii] != NULL; ii++)
-	{
-		if (g_str_has_suffix(filename, containers[ii]))
-		{
-			gchar *pos;
-			gchar *new_name;
-			
-			pos = g_strrstr( filename, "." );
-			if (pos == NULL)
-			{
-				// No period? shouldn't happen
-				break;
-			}
-			*pos = 0;
-			if (strcmp(extension, &pos[1]) == 0)
-			{
-				// Extension is already correct
-				break;
-			}
-			new_name = g_strjoin(".", filename, extension, NULL); 
-			ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
-			g_free(new_name);
-			break;
-		}
-	}
-	g_free(filename);
-	busy = FALSE;
+    static gchar *containers[] = {".mkv", ".mp4", ".m4v", NULL};
+    gchar *filename;
+    const gchar *extension;
+    gint ii;
+    GtkEntry *entry;
+    static gboolean busy = FALSE;
+
+    g_debug("ghb_update_destination_extension ()");
+    // Since this function modifies the thing that triggers it's
+    // invocation, check to see if busy to prevent accidental infinite
+    // recursion.
+    if (busy)
+        return;
+    busy = TRUE;
+    extension = get_extension(ud->settings);
+    entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
+    filename = g_strdup(gtk_entry_get_text(entry));
+    for (ii = 0; containers[ii] != NULL; ii++)
+    {
+        if (g_str_has_suffix(filename, containers[ii]))
+        {
+            gchar *pos;
+            gchar *new_name;
+            
+            pos = g_strrstr( filename, "." );
+            if (pos == NULL)
+            {
+                // No period? shouldn't happen
+                break;
+            }
+            *pos = 0;
+            if (strcmp(extension, &pos[1]) == 0)
+            {
+                // Extension is already correct
+                break;
+            }
+            new_name = g_strjoin(".", filename, extension, NULL); 
+            ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
+            g_free(new_name);
+            break;
+        }
+    }
+    g_free(filename);
+    busy = FALSE;
 }
 
 static void
 destination_select_title(GtkEntry *entry)
 {
-	const gchar *dest;
-	gint start, end;
+    const gchar *dest;
+    gint start, end;
 
-	dest = gtk_entry_get_text(entry);
-	for (end = strlen(dest)-1; end > 0; end--)
-	{
-		if (dest[end] == '.')
-		{
-			break;
-		}
-	}
-	for (start = end; start >= 0; start--)
-	{
-		if (dest[start] == G_DIR_SEPARATOR)
-		{
-			start++;
-			break;
-		}
-	}
-	if (start < 0) start = 0;
-	if (start < end)
-	{
-		gtk_editable_select_region(GTK_EDITABLE(entry), start, end);
-	}
+    dest = gtk_entry_get_text(entry);
+    for (end = strlen(dest)-1; end > 0; end--)
+    {
+        if (dest[end] == '.')
+        {
+            break;
+        }
+    }
+    for (start = end; start >= 0; start--)
+    {
+        if (dest[start] == G_DIR_SEPARATOR)
+        {
+            start++;
+            break;
+        }
+    }
+    if (start < 0) start = 0;
+    if (start < end)
+    {
+        gtk_editable_select_region(GTK_EDITABLE(entry), start, end);
+    }
 }
 
 G_MODULE_EXPORT gboolean
 destination_grab_cb(
-	GtkEntry *entry, 
-	signal_user_data_t *ud)
+    GtkEntry *entry, 
+    signal_user_data_t *ud)
 {
-	destination_select_title(entry);
-	return FALSE;
+    destination_select_title(entry);
+    return FALSE;
 }
 
 static gboolean update_default_destination = FALSE;
@@ -1143,437 +1171,474 @@
 G_MODULE_EXPORT void
 dest_dir_set_cb(GtkFileChooserButton *dest_chooser, signal_user_data_t *ud)
 {
-	gchar *dest_file, *dest_dir, *dest;
-	
-	g_debug("dest_dir_set_cb ()");
-	ghb_widget_to_setting(ud->settings, (GtkWidget*)dest_chooser);
-	dest_file = ghb_settings_get_string(ud->settings, "dest_file");
-	dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
-	dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
-	ghb_settings_set_string(ud->settings, "destination", dest);
-	g_free(dest_file);
-	g_free(dest_dir);
-	g_free(dest);
-	update_default_destination = TRUE;
+    gchar *dest_file, *dest_dir, *dest;
+    
+    g_debug("dest_dir_set_cb ()");
+    ghb_widget_to_setting(ud->settings, (GtkWidget*)dest_chooser);
+    dest_file = ghb_settings_get_string(ud->settings, "dest_file");
+    dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
+    dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
+    ghb_settings_set_string(ud->settings, "destination", dest);
+    g_free(dest_file);
+    g_free(dest_dir);
+    g_free(dest);
+    update_default_destination = TRUE;
 }
 
 G_MODULE_EXPORT void
 dest_file_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
 {
-	gchar *dest_file, *dest_dir, *dest;
-	
-	g_debug("dest_file_changed_cb ()");
-	ghb_update_destination_extension(ud);
-	ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
-	// This signal goes off with ever keystroke, so I'm putting this
-	// update on the timer.
-	dest_file = ghb_settings_get_string(ud->settings, "dest_file");
-	dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
-	dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
-	ghb_settings_set_string(ud->settings, "destination", dest);
-	g_free(dest_file);
-	g_free(dest_dir);
-	g_free(dest);
-	update_default_destination = TRUE;
+    gchar *dest_file, *dest_dir, *dest;
+    
+    g_debug("dest_file_changed_cb ()");
+    ghb_update_destination_extension(ud);
+    ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
+    // This signal goes off with ever keystroke, so I'm putting this
+    // update on the timer.
+    dest_file = ghb_settings_get_string(ud->settings, "dest_file");
+    dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
+    dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
+    ghb_settings_set_string(ud->settings, "destination", dest);
+    g_free(dest_file);
+    g_free(dest_dir);
+    g_free(dest);
+    update_default_destination = TRUE;
 }
 
 G_MODULE_EXPORT void
 destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	GtkEntry *entry;
-	gchar *destname;
-	gchar *basename;
-
-	g_debug("destination_browse_clicked_cb ()");
-	destname = ghb_settings_get_string(ud->settings, "destination");
-	dialog = gtk_file_chooser_dialog_new ("Choose Destination",
-					  NULL,
-					  GTK_FILE_CHOOSER_ACTION_SAVE,
-					  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-					  NULL);
-	gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), destname);
-	basename = g_path_get_basename(destname);
-	g_free(destname);
-	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), basename);
-	g_free(basename);
-	if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-	{
-		char *filename, *dirname;
-		GtkFileChooser *dest_chooser;
-		
-		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-		basename = g_path_get_basename(filename);
-		dirname = g_path_get_dirname(filename);
-		entry = (GtkEntry*)GHB_WIDGET(ud->builder, "dest_file");
-		gtk_entry_set_text(entry, basename);
-		dest_chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "dest_dir"));
-		gtk_file_chooser_set_filename(dest_chooser, dirname);
-		g_free (dirname);
-		g_free (basename);
-		g_free (filename);
-	}
-	gtk_widget_destroy(dialog);
+    GtkWidget *dialog;
+    GtkEntry *entry;
+    gchar *destname;
+    gchar *basename;
+
+    g_debug("destination_browse_clicked_cb ()");
+    destname = ghb_settings_get_string(ud->settings, "destination");
+    dialog = gtk_file_chooser_dialog_new ("Choose Destination",
+                      NULL,
+                      GTK_FILE_CHOOSER_ACTION_SAVE,
+                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                      NULL);
+    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), destname);
+    basename = g_path_get_basename(destname);
+    g_free(destname);
+    gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), basename);
+    g_free(basename);
+    if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+    {
+        char *filename, *dirname;
+        GtkFileChooser *dest_chooser;
+        
+        filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+        basename = g_path_get_basename(filename);
+        dirname = g_path_get_dirname(filename);
+        entry = (GtkEntry*)GHB_WIDGET(ud->builder, "dest_file");
+        gtk_entry_set_text(entry, basename);
+        dest_chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "dest_dir"));
+        gtk_file_chooser_set_filename(dest_chooser, dirname);
+        g_free (dirname);
+        g_free (basename);
+        g_free (filename);
+    }
+    gtk_widget_destroy(dialog);
 }
 
 G_MODULE_EXPORT gboolean
 window_destroy_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *ud)
 {
-	g_debug("window_destroy_event_cb ()");
-	ghb_hb_cleanup(FALSE);
-	prune_logs(ud);
-	gtk_main_quit();
-	return FALSE;
+    g_debug("window_destroy_event_cb ()");
+    ghb_hb_cleanup(FALSE);
+    prune_logs(ud);
+    gtk_main_quit();
+    return FALSE;
 }
 
 G_MODULE_EXPORT gboolean
 window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *ud)
 {
-	gint state = ghb_get_queue_state();
-	g_debug("window_delete_event_cb ()");
-	if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
-	{
-		if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
-		{
-			ghb_hb_cleanup(FALSE);
-			prune_logs(ud);
-			gtk_main_quit();
-			return FALSE;
-		}
-		return TRUE;
-	}
-	ghb_hb_cleanup(FALSE);
-	prune_logs(ud);
-	gtk_main_quit();
-	return FALSE;
+    gint state = ghb_get_queue_state();
+    g_debug("window_delete_event_cb ()");
+    if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
+    {
+        if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
+        {
+            ghb_hb_cleanup(FALSE);
+            prune_logs(ud);
+            gtk_main_quit();
+            return FALSE;
+        }
+        return TRUE;
+    }
+    ghb_hb_cleanup(FALSE);
+    prune_logs(ud);
+    gtk_main_quit();
+    return FALSE;
 }
 
 static void
 update_acodec_combo(signal_user_data_t *ud)
 {
     ghb_adjust_audio_rate_combos(ud);
-	ghb_grey_combo_options (ud);
+    ghb_grey_combo_options (ud);
 }
 
 G_MODULE_EXPORT void
 container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("container_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	update_acodec_combo(ud);
-	ghb_update_destination_extension(ud);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	ghb_subtitle_prune(ud);
-	ghb_audio_list_refresh_selected(ud);
+    g_debug("container_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    update_acodec_combo(ud);
+    ghb_update_destination_extension(ud);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    ghb_subtitle_prune(ud);
+    ghb_subtitle_list_refresh_selected(ud);
+    ghb_audio_list_refresh_selected(ud);
 }
 
 static gchar*
 get_aspect_string(gint aspect_n, gint aspect_d)
 {
-	gchar *aspect;
+    gchar *aspect;
 
-	if (aspect_d < 10)
-	{
-		aspect = g_strdup_printf("%d:%d", aspect_n, aspect_d);
-	}
-	else
-	{
-		gdouble aspect_nf = (gdouble)aspect_n / aspect_d;
-		aspect = g_strdup_printf("%.2f:1", aspect_nf);
-	}
-	return aspect;
+    if (aspect_d < 10)
+    {
+        aspect = g_strdup_printf("%d:%d", aspect_n, aspect_d);
+    }
+    else
+    {
+        gdouble aspect_nf = (gdouble)aspect_n / aspect_d;
+        aspect = g_strdup_printf("%.2f:1", aspect_nf);
+    }
+    return aspect;
 }
 
 static gchar*
 get_rate_string(gint rate_base, gint rate)
 {
-	gdouble rate_f = (gdouble)rate / rate_base;
-	gchar *rate_s;
+    gdouble rate_f = (gdouble)rate / rate_base;
+    gchar *rate_s;
 
-	rate_s = g_strdup_printf("%.6g", rate_f);
-	return rate_s;
+    rate_s = g_strdup_printf("%.6g", rate_f);
+    return rate_s;
 }
 
 static void
 update_title_duration(signal_user_data_t *ud)
 {
-	gint ti;
-	gint hh, mm, ss, start, end;
-	gchar *text;
-	GtkWidget *widget;
-
-	ti = ghb_settings_combo_int(ud->settings, "title");
-	widget = GHB_WIDGET (ud->builder, "title_duration");
-
-	if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		ghb_part_duration(ti, start, end, &hh, &mm, &ss);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
-	{
-		gint duration;
-
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		duration = end - start;
-		hh = duration / (60*60);
-		mm = (duration / 60) % 60;
-		ss = duration % 60;
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
-	{
-		ghb_title_info_t tinfo;
-
-		if (ghb_get_title_info (&tinfo, ti))
-		{
-			gint64 frames;
-			gint duration;
-
-			start = ghb_settings_get_int(ud->settings, "start_point");
-			end = ghb_settings_get_int(ud->settings, "end_point");
-			frames = end - start + 1;
-			duration = frames * tinfo.rate_base / tinfo.rate;
-			hh = duration / (60*60);
-			mm = (duration / 60) % 60;
-			ss = duration % 60;
-		}
-		else
-		{
-			hh = mm = ss = 0;
-		}
-	}
-	text = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
+    gint ti;
+    gint hh, mm, ss, start, end;
+    gchar *text;
+    GtkWidget *widget;
+
+    ti = ghb_settings_combo_int(ud->settings, "title");
+    widget = GHB_WIDGET (ud->builder, "title_duration");
+
+    if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        ghb_part_duration(ti, start, end, &hh, &mm, &ss);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+    {
+        gint duration;
+
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        duration = end - start;
+        hh = duration / (60*60);
+        mm = (duration / 60) % 60;
+        ss = duration % 60;
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+    {
+        hb_title_t * title = ghb_get_title_info (ti);
+        if (title != NULL)
+        {
+            gint64 frames;
+            gint duration;
+
+            start = ghb_settings_get_int(ud->settings, "start_point");
+            end = ghb_settings_get_int(ud->settings, "end_point");
+            frames = end - start + 1;
+            duration = frames * title->rate_base / title->rate;
+            hh = duration / (60*60);
+            mm = (duration / 60) % 60;
+            ss = duration % 60;
+        }
+        else
+        {
+            hh = mm = ss = 0;
+        }
+    }
+    text = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
 }
 
 static void
-show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
+show_title_info(signal_user_data_t *ud, hb_title_t *title)
 {
-	GtkWidget *widget;
-	gchar *text;
+    GtkWidget *widget;
+    gchar *text;
 
-	ghb_settings_set_string(ud->settings, "source", tinfo->path);
-	if (tinfo->type == HB_STREAM_TYPE || tinfo->type == HB_FF_STREAM_TYPE)
-	{
-		GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
-		if (tinfo->name != NULL && tinfo->name[0] != 0)
-		{
-			gtk_label_set_text (GTK_LABEL(widget), tinfo->name);
-			ghb_settings_set_string(ud->settings, "volume_label", tinfo->name);
-			set_destination(ud);
-		}
-		else
-		{
-			gchar *label = "No Title Found";
-			gtk_label_set_text (GTK_LABEL(widget), label);
-			ghb_settings_set_string(ud->settings, "volume_label", label);
-		}
-	}
-	ud->dont_clear_presets = TRUE;
-	ud->scale_busy = TRUE;
-	update_title_duration(ud);
-	widget = GHB_WIDGET (ud->builder, "source_codec");
-	if ( tinfo->video_codec_name )
-		gtk_label_set_text (GTK_LABEL(widget), tinfo->video_codec_name);
-	else
-		gtk_label_set_text (GTK_LABEL(widget), "Unknown");
-	widget = GHB_WIDGET (ud->builder, "source_dimensions");
-	text = g_strdup_printf ("%d x %d", tinfo->width, tinfo->height);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	ghb_settings_set_int(ud->settings, "source_width", tinfo->width);
-	ghb_settings_set_int(ud->settings, "source_height", tinfo->height);
-	g_free(text);
-	widget = GHB_WIDGET (ud->builder, "source_aspect");
-	text = get_aspect_string(tinfo->aspect_n, tinfo->aspect_d);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
-
-	widget = GHB_WIDGET (ud->builder, "source_frame_rate");
-	text = (gchar*)get_rate_string(tinfo->rate_base, tinfo->rate);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
-
-	//widget = GHB_WIDGET (ud->builder, "source_interlaced");
-	//gtk_label_set_text (GTK_LABEL(widget), tinfo->interlaced ? "Yes" : "No");
-
-	ghb_ui_update(ud, "scale_width", 
-		ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
-	// If anamorphic or keep_aspect, the hight will be automatically calculated
-	gboolean keep_aspect;
-	gint pic_par;
-	keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
-	pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
-	if (!(keep_aspect || pic_par) || pic_par == 3)
-	{
-		ghb_ui_update(ud, "scale_height", 
-			ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1]));
-	}
-
-	// Set the limits of cropping.  hb_set_anamorphic_size crashes if
-	// you pass it a cropped width or height == 0.
-	gint bound;
-	bound = tinfo->height / 2 - 8;
-	widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	bound = tinfo->width / 2 - 8;
-	widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
-	{
-		ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(tinfo->crop[0]));
-		ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(tinfo->crop[1]));
-		ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(tinfo->crop[2]));
-		ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(tinfo->crop[3]));
-	}
-	ud->scale_busy = FALSE;
-	ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
-	gint width, height, crop[4];
-	crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
-	crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
-	crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
-	crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
-	width = tinfo->width - crop[2] - crop[3];
-	height = tinfo->height - crop[0] - crop[1];
-	widget = GHB_WIDGET (ud->builder, "crop_dimensions");
-	text = g_strdup_printf ("%d x %d", width, height);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
-
-
-	gint duration = tinfo->duration / 90000;
-
-	if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
-	{
-		widget = GHB_WIDGET (ud->builder, "start_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
-		widget = GHB_WIDGET (ud->builder, "end_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), tinfo->num_chapters);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
-	{
-
-		widget = GHB_WIDGET (ud->builder, "start_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
-
-		widget = GHB_WIDGET (ud->builder, "end_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
-	{
-		gdouble max_frames = (gdouble)duration * tinfo->rate / tinfo->rate_base;
-		widget = GHB_WIDGET (ud->builder, "start_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
-		widget = GHB_WIDGET (ud->builder, "end_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
-	}
-
-	widget = GHB_WIDGET (ud->builder, "angle");
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->angle_count);
-	ghb_settings_set_int(ud->settings, "angle_count", tinfo->angle_count);
-	ud->dont_clear_presets = FALSE;
+    ghb_settings_set_string(ud->settings, "source", title->path);
+    if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
+    {
+        GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
+        if (title->name != NULL && title->name[0] != 0)
+        {
+            gtk_label_set_text (GTK_LABEL(widget), title->name);
+            ghb_settings_set_string(ud->settings, "volume_label", title->name);
+            set_destination(ud);
+        }
+        else
+        {
+            gchar *label = "No Title Found";
+            gtk_label_set_text (GTK_LABEL(widget), label);
+            ghb_settings_set_string(ud->settings, "volume_label", label);
+        }
+    }
+    ud->dont_clear_presets = TRUE;
+    ud->scale_busy = TRUE;
+    update_title_duration(ud);
+    widget = GHB_WIDGET (ud->builder, "source_codec");
+    if ( title->video_codec_name )
+        gtk_label_set_text (GTK_LABEL(widget), title->video_codec_name);
+    else
+        gtk_label_set_text (GTK_LABEL(widget), "Unknown");
+    widget = GHB_WIDGET (ud->builder, "source_dimensions");
+    text = g_strdup_printf ("%d x %d", title->width, title->height);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    ghb_settings_set_int(ud->settings, "source_width", title->width);
+    ghb_settings_set_int(ud->settings, "source_height", title->height);
+    g_free(text);
+    widget = GHB_WIDGET (ud->builder, "source_aspect");
+    gint aspect_n, aspect_d;
+    hb_reduce(&aspect_n, &aspect_d,
+                title->width * title->pixel_aspect_width,
+                title->height * title->pixel_aspect_height);
+    text = get_aspect_string(aspect_n, aspect_d);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
+
+    widget = GHB_WIDGET (ud->builder, "source_frame_rate");
+    text = (gchar*)get_rate_string(title->rate_base, title->rate);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
+
+    //widget = GHB_WIDGET (ud->builder, "source_interlaced");
+    //gtk_label_set_text (GTK_LABEL(widget), title->interlaced ? "Yes" : "No");
+
+    ghb_ui_update(ud, "scale_width", 
+        ghb_int64_value(title->width - title->crop[2] - title->crop[3]));
+    // If anamorphic or keep_aspect, the hight will be automatically calculated
+    gboolean keep_aspect;
+    gint pic_par;
+    keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+    pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
+    if (!(keep_aspect || pic_par) || pic_par == 3)
+    {
+        ghb_ui_update(ud, "scale_height", 
+            ghb_int64_value(title->height - title->crop[0] - title->crop[1]));
+    }
+
+    // Set the limits of cropping.  hb_set_anamorphic_size crashes if
+    // you pass it a cropped width or height == 0.
+    gint bound;
+    bound = title->height / 2 - 8;
+    widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    bound = title->width / 2 - 8;
+    widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
+    {
+        ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(title->crop[0]));
+        ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(title->crop[1]));
+        ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(title->crop[2]));
+        ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(title->crop[3]));
+    }
+    ud->scale_busy = FALSE;
+    ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
+    gint width, height, crop[4];
+    crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+    crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+    crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+    crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+    width = title->width - crop[2] - crop[3];
+    height = title->height - crop[0] - crop[1];
+    widget = GHB_WIDGET (ud->builder, "crop_dimensions");
+    text = g_strdup_printf ("%d x %d", width, height);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
+
+
+    gint duration = title->duration / 90000;
+
+    gint num_chapters = hb_list_count(title->list_chapter);
+    if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+    {
+        widget = GHB_WIDGET (ud->builder, "start_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+        widget = GHB_WIDGET (ud->builder, "end_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), num_chapters);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+    {
+
+        widget = GHB_WIDGET (ud->builder, "start_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
+
+        widget = GHB_WIDGET (ud->builder, "end_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+    {
+        gdouble max_frames = (gdouble)duration * title->rate / title->rate_base;
+        widget = GHB_WIDGET (ud->builder, "start_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+        widget = GHB_WIDGET (ud->builder, "end_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
+    }
+
+    widget = GHB_WIDGET (ud->builder, "angle");
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, title->angle_count);
+    ghb_settings_set_int(ud->settings, "angle_count", title->angle_count);
+    ud->dont_clear_presets = FALSE;
+    // Set default metadata name
+    ghb_ui_update(ud, "MetaName", ghb_string_value(title->name));
+    if (title->metadata)
+    {
+        if (title->metadata->name)
+        {
+            ghb_ui_update(ud, "MetaName",
+                    ghb_string_value(title->metadata->name));
+        }
+        ghb_ui_update(ud, "MetaArtist",
+                ghb_string_value(title->metadata->artist));
+        ghb_ui_update(ud, "MetaReleaseDate",
+                ghb_string_value(title->metadata->release_date));
+        ghb_ui_update(ud, "MetaComment",
+                ghb_string_value(title->metadata->comment));
+        if (!title->metadata->name && title->metadata->album)
+        {
+            ghb_ui_update(ud, "MetaName",
+                    ghb_string_value(title->metadata->album));
+        }
+        ghb_ui_update(ud, "MetaAlbumArtist",
+                ghb_string_value(title->metadata->album_artist));
+        ghb_ui_update(ud, "MetaGenre",
+                ghb_string_value(title->metadata->genre));
+        ghb_ui_update(ud, "MetaDescription",
+                ghb_string_value(title->metadata->description));
+        ghb_ui_update(ud, "MetaLongDescription",
+                ghb_string_value(title->metadata->long_description));
+    }
 }
 
 void
 set_title_settings(GValue *settings, gint titleindex)
 {
-	ghb_title_info_t tinfo;
+    ghb_settings_set_int(settings, "title", titleindex);
+    ghb_settings_set_int(settings, "title_no", titleindex);
 
-	ghb_settings_set_int(settings, "title", titleindex);
-	ghb_settings_set_int(settings, "title_no", titleindex);
+    hb_title_t * title = ghb_get_title_info(titleindex);
+    if (title != NULL)
+    {
+        gint num_chapters = hb_list_count(title->list_chapter);
 
-	if (ghb_get_title_info (&tinfo, titleindex))
-	{
-		ghb_settings_set_int(settings, "source_width", tinfo.width);
-		ghb_settings_set_int(settings, "source_height", tinfo.height);
-		ghb_settings_set_string(settings, "source", tinfo.path);
-		if (tinfo.type == HB_STREAM_TYPE || tinfo.type == HB_FF_STREAM_TYPE)
-		{
-			if (tinfo.name != NULL && tinfo.name[0] != 0)
-			{
-				ghb_settings_set_string(settings, "volume_label", tinfo.name);
-			}
-			else
-			{
-				gchar *label = "No Title Found";
-				ghb_settings_set_string(settings, "volume_label", label);
-			}
-		}
-		ghb_settings_set_int(settings, "scale_width",
-							 tinfo.width - tinfo.crop[2] - tinfo.crop[3]);
-
-		// If anamorphic or keep_aspect, the hight will 
-		// be automatically calculated
-		gboolean keep_aspect;
-		gint pic_par;
-		keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
-		pic_par = ghb_settings_combo_int(settings, "PicturePAR");
-		if (!(keep_aspect || pic_par) || pic_par == 3)
-		{
-			ghb_settings_set_int(settings, "scale_height",
-							 tinfo.width - tinfo.crop[0] - tinfo.crop[1]);
-		}
-
-		ghb_set_scale_settings(settings, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
-		ghb_settings_set_int(settings, "angle_count", tinfo.angle_count);
-	}
-	update_chapter_list_settings(settings);
-	ghb_set_pref_audio_settings(titleindex, settings);
-	ghb_set_pref_subtitle_settings(titleindex, settings);
-	set_destination_settings(settings);
-
-	char *dest_file, *dest_dir, *dest;
-	dest_file = ghb_settings_get_string(settings, "dest_file");
-	dest_dir = ghb_settings_get_string(settings, "dest_dir");
-	dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
-	ghb_settings_set_string(settings, "destination", dest);
-	g_free(dest_file);
-	g_free(dest_dir);
-	g_free(dest);
+        ghb_settings_set_int(settings, "PtoPType", 0);
+        ghb_settings_set_int(settings, "start_point", 1);
+        ghb_settings_set_int(settings, "end_point", num_chapters);
+        ghb_settings_set_int(settings, "source_width", title->width);
+        ghb_settings_set_int(settings, "source_height", title->height);
+        ghb_settings_set_string(settings, "source", title->path);
+        if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
+        {
+            if (title->name != NULL && title->name[0] != 0)
+            {
+                ghb_settings_set_string(settings, "volume_label", title->name);
+            }
+            else
+            {
+                gchar *label = "No Title Found";
+                ghb_settings_set_string(settings, "volume_label", label);
+            }
+        }
+        ghb_settings_set_int(settings, "scale_width",
+                             title->width - title->crop[2] - title->crop[3]);
+
+        // If anamorphic or keep_aspect, the hight will 
+        // be automatically calculated
+        gboolean keep_aspect;
+        gint pic_par;
+        keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
+        pic_par = ghb_settings_combo_int(settings, "PicturePAR");
+        if (!(keep_aspect || pic_par) || pic_par == 3)
+        {
+            ghb_settings_set_int(settings, "scale_height",
+                             title->width - title->crop[0] - title->crop[1]);
+        }
+
+        ghb_set_scale_settings(settings, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
+        ghb_settings_set_int(settings, "angle_count", title->angle_count);
+    }
+    update_chapter_list_settings(settings);
+    ghb_set_pref_audio_settings(titleindex, settings);
+    ghb_set_pref_subtitle_settings(titleindex, settings);
+    set_destination_settings(settings);
+
+    char *dest_file, *dest_dir, *dest;
+    dest_file = ghb_settings_get_string(settings, "dest_file");
+    dest_dir = ghb_settings_get_string(settings, "dest_dir");
+    dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
+    ghb_settings_set_string(settings, "destination", dest);
+    g_free(dest_file);
+    g_free(dest_dir);
+    g_free(dest);
 }
 
 void
 ghb_add_all_titles(signal_user_data_t *ud)
 {
-	gint ii;
-	gint count = ghb_get_title_count();
+    gint ii;
+    gint count = ghb_get_title_count();
 
-	for (ii = 0; ii < count; ii++)
-	{
-		ghb_title_info_t tinfo;
-
-		GValue *settings = ghb_value_dup(ud->settings);
-		ghb_settings_set_boolean(settings, "use_source_name", TRUE);
-		if (ghb_get_title_info (&tinfo, ii))
-		{
-			if (tinfo.type == HB_DVD_TYPE ||
-				tinfo.type == HB_BD_TYPE)
-			{
-				ghb_settings_set_boolean(settings, 
-										"title_no_in_destination", TRUE);
-			}
-		}
-		set_title_settings(settings, ii);
-		ghb_queue_add(ud, settings, ii);
-	}
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *settings = ghb_value_dup(ud->settings);
+        ghb_settings_set_boolean(settings, "use_source_name", TRUE);
+        hb_title_t * title = ghb_get_title_info(ii);
+        if (title != NULL)
+        {
+            if (title->type == HB_DVD_TYPE ||
+                title->type == HB_BD_TYPE)
+            {
+                ghb_settings_set_boolean(settings, 
+                                        "title_no_in_destination", TRUE);
+            }
+        }
+        set_title_settings(settings, ii);
+        ghb_queue_add(ud, settings, ii);
+    }
 }
 
 static gboolean update_preview = FALSE;
@@ -1581,2186 +1646,2240 @@
 G_MODULE_EXPORT void
 title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_title_info_t tinfo;
-	gint titleindex;
+    gint titleindex;
+
+    g_debug("title_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
 
-	g_debug("title_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+    ghb_settings_set_int(ud->settings, "title_no", titleindex);
+    ghb_update_ui_combo_box (ud, "AudioTrack", titleindex, FALSE);
+    ghb_update_ui_combo_box (ud, "SubtitleTrack", titleindex, FALSE);
 
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	ghb_settings_set_int(ud->settings, "title_no", titleindex);
-	ghb_update_ui_combo_box (ud, "AudioTrack", titleindex, FALSE);
-	ghb_update_ui_combo_box (ud, "SubtitleTrack", titleindex, FALSE);
-
-	if (ghb_get_title_info (&tinfo, titleindex))
-	{
-		show_title_info(ud, &tinfo);
-	}
-	ghb_check_dependency(ud, widget, NULL);
-	update_chapter_list_settings(ud->settings);
-	update_chapter_list_from_settings(ud->builder, ud->settings);
-	ghb_set_pref_audio_settings(titleindex, ud->settings);
-	ghb_set_pref_audio_from_settings(ud, ud->settings);
-	ghb_set_pref_subtitle(titleindex, ud);
-	ghb_grey_combo_options (ud);
-
-	// Unfortunately, there is no way to query how many frames were
-	// actually generated during the scan.
-	// If I knew how many were generated, I would adjust the spin
-	// control range here.
-	// I do know how many were asked for.
-	gint preview_count;
-	preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-	widget = GHB_WIDGET(ud->builder, "preview_frame");
-	gtk_range_set_range (GTK_RANGE(widget), 1, preview_count);
-	ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
-
-	ghb_set_preview_image (ud);
-	if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
-	{
-		set_destination(ud);
-	}
-	ghb_preview_set_visible(ud);
-
-	gint end;
-	widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
-	end = ghb_settings_get_int(ud->settings, "end_point");
-	if (1 == end)
-	{
-		gtk_widget_set_sensitive(widget, FALSE);
-	}
-	else
-	{
-		gtk_widget_set_sensitive(widget, TRUE);
-	}
+    hb_title_t * title = ghb_get_title_info(titleindex);
+    if (title != NULL)
+    {
+        show_title_info(ud, title);
+    }
+    ghb_check_dependency(ud, widget, NULL);
+    update_chapter_list_settings(ud->settings);
+    update_chapter_list_from_settings(ud->builder, ud->settings);
+    ghb_set_pref_audio_settings(titleindex, ud->settings);
+    ghb_set_pref_audio_from_settings(ud, ud->settings);
+    ghb_set_pref_subtitle(titleindex, ud);
+    ghb_grey_combo_options (ud);
+
+    // Unfortunately, there is no way to query how many frames were
+    // actually generated during the scan.
+    // If I knew how many were generated, I would adjust the spin
+    // control range here.
+    // I do know how many were asked for.
+    gint preview_count;
+    preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+    widget = GHB_WIDGET(ud->builder, "preview_frame");
+    gtk_range_set_range (GTK_RANGE(widget), 1, preview_count);
+    ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
+
+    ghb_set_preview_image (ud);
+    if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
+    {
+        set_destination(ud);
+    }
+    ghb_preview_set_visible(ud);
+
+    gint end;
+    widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+    end = ghb_settings_get_int(ud->settings, "end_point");
+    if (1 == end)
+    {
+        gtk_widget_set_sensitive(widget, FALSE);
+    }
+    else
+    {
+        gtk_widget_set_sensitive(widget, TRUE);
+    }
 }
 
 G_MODULE_EXPORT void
 ptop_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	gint ti;
-	ghb_title_info_t tinfo;
+    gint ti;
+    hb_title_t * title;
 
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_live_reset(ud);
-
-	ti = ghb_settings_combo_int(ud->settings, "title");
-	if (!ghb_get_title_info (&tinfo, ti))
-		return;
-
-	gint duration = tinfo.duration / 90000;
-	if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
-	{
-		widget = GHB_WIDGET (ud->builder, "start_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo.num_chapters);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
-		widget = GHB_WIDGET (ud->builder, "end_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo.num_chapters);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), tinfo.num_chapters);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
-	{
-		widget = GHB_WIDGET (ud->builder, "start_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
-
-		widget = GHB_WIDGET (ud->builder, "end_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
-	{
-		gdouble max_frames = (gdouble)duration * tinfo.rate / tinfo.rate_base;
-		widget = GHB_WIDGET (ud->builder, "start_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
-		widget = GHB_WIDGET (ud->builder, "end_point");
-		gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
-	}
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_live_reset(ud);
+
+    ti = ghb_settings_combo_int(ud->settings, "title");
+    title = ghb_get_title_info(ti);
+    if (title == NULL)
+        return;
+
+    gint num_chapters = hb_list_count(title->list_chapter);
+    gint duration = title->duration / 90000;
+    if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+    {
+        widget = GHB_WIDGET (ud->builder, "start_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+        widget = GHB_WIDGET (ud->builder, "end_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), num_chapters);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+    {
+        widget = GHB_WIDGET (ud->builder, "start_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
+
+        widget = GHB_WIDGET (ud->builder, "end_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+    {
+        gdouble max_frames = (gdouble)duration * title->rate / title->rate_base;
+        widget = GHB_WIDGET (ud->builder, "start_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+
+        widget = GHB_WIDGET (ud->builder, "end_point");
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
+    }
 }
 
 G_MODULE_EXPORT void
 framerate_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
+    ghb_widget_to_setting(ud->settings, widget);
 
-	if (ghb_settings_combo_int(ud->settings, "VideoFramerate") != 0)
-	{
-		if (!ghb_settings_get_boolean(ud->settings, "VideoFrameratePFR"))
-        {
-		    ghb_ui_update(ud, "VideoFramerateCFR", ghb_boolean_value(TRUE));
-        }
-	}
-	if (ghb_settings_combo_int(ud->settings, "VideoFramerate") == 0 &&
-		ghb_settings_get_boolean(ud->settings, "VideoFrameratePFR"))
-	{
-		ghb_ui_update(ud, "VideoFramerateVFR", ghb_boolean_value(TRUE));
-	}
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
+    if (ghb_settings_combo_int(ud->settings, "VideoFramerate") != 0)
+    {
+        if (!ghb_settings_get_boolean(ud->settings, "VideoFrameratePFR"))
+        {
+            ghb_ui_update(ud, "VideoFramerateCFR", ghb_boolean_value(TRUE));
+        }
+    }
+    if (ghb_settings_combo_int(ud->settings, "VideoFramerate") == 0 &&
+        ghb_settings_get_boolean(ud->settings, "VideoFrameratePFR"))
+    {
+        ghb_ui_update(ud, "VideoFramerateVFR", ghb_boolean_value(TRUE));
+    }
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+}
+
+G_MODULE_EXPORT gboolean
+meta_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
+    signal_user_data_t *ud)
+{
+    ghb_widget_to_setting(ud->settings, widget);
+    return FALSE;
+}
+
+G_MODULE_EXPORT void
+meta_setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+    ghb_widget_to_setting(ud->settings, widget);
 }
 
 G_MODULE_EXPORT void
 chapter_markers_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 vquality_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-
-	gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
-	gdouble step;
-	if (vcodec == HB_VCODEC_X264)
-	{
-		step = ghb_settings_combo_double(ud->settings, 
-											"VideoQualityGranularity");
-	}
-	else
-	{
-		step = 1;
-	}
-	gdouble val = gtk_range_get_value(GTK_RANGE(widget));
-	val = ((int)((val + step / 2) / step)) * step;
-	gtk_range_set_value(GTK_RANGE(widget), val);
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+
+    double vquality = ghb_settings_get_double(ud->settings, "VideoQualitySlider");
+    if (vquality < 1.0)
+    {
+        ghb_ui_update(ud, "h264Profile", ghb_string_value("auto"));
+    }
+
+    gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+    gdouble step;
+    if (vcodec == HB_VCODEC_X264)
+    {
+        step = ghb_settings_combo_double(ud->settings, 
+                                            "VideoQualityGranularity");
+    }
+    else
+    {
+        step = 1;
+    }
+    gdouble val = gtk_range_get_value(GTK_RANGE(widget));
+    val = ((int)((val + step / 2) / step)) * step;
+    gtk_range_set_value(GTK_RANGE(widget), val);
 }
 
 G_MODULE_EXPORT void
 http_opt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	// AC3 is not allowed when Web optimized
-	ghb_grey_combo_options (ud);
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    // AC3 is not allowed when Web optimized
+    ghb_grey_combo_options (ud);
 }
 
 G_MODULE_EXPORT void
 vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	gdouble vqmin, vqmax, step, page;
-	gboolean inverted;
-	gint digits;
-
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
-	GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
-	gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-	gtk_range_set_increments (GTK_RANGE(qp), step, page);
-	gtk_scale_set_digits(GTK_SCALE(qp), digits);
-	gtk_range_set_inverted (GTK_RANGE(qp), inverted);
+    gdouble vqmin, vqmax, step, page;
+    gboolean inverted;
+    gint digits;
+
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+    GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
+    gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
+    gtk_range_set_increments (GTK_RANGE(qp), step, page);
+    gtk_scale_set_digits(GTK_SCALE(qp), digits);
+    gtk_range_set_inverted (GTK_RANGE(qp), inverted);
 }
 
 G_MODULE_EXPORT void
 start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	gint start, end;
-	const gchar *name = ghb_get_setting_key(widget);
+    gint start, end;
+    const gchar *name = ghb_get_setting_key(widget);
 
-	g_debug("start_point_changed_cb () %s", name);
-	ghb_widget_to_setting(ud->settings, widget);
-	if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start > end)
-			ghb_ui_update(ud, "end_point", ghb_int_value(start));
-		ghb_check_dependency(ud, widget, NULL);
-		if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
-		{
-			set_destination(ud);
-		}
-		widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
-		// End may have been changed above, get it again
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start == end)
-		{
-			gtk_widget_set_sensitive(widget, FALSE);
-		}
-		else
-		{
-			gtk_widget_set_sensitive(widget, TRUE);
-		}
-		update_title_duration(ud);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start >= end)
-			ghb_ui_update(ud, "end_point", ghb_int_value(start+1));
-		ghb_check_dependency(ud, widget, NULL);
-		update_title_duration(ud);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start > end)
-			ghb_ui_update(ud, "end_point", ghb_int_value(start));
-		ghb_check_dependency(ud, widget, NULL);
-		update_title_duration(ud);
-	}
+    g_debug("start_point_changed_cb () %s", name);
+    ghb_widget_to_setting(ud->settings, widget);
+    if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start > end)
+            ghb_ui_update(ud, "end_point", ghb_int_value(start));
+        ghb_check_dependency(ud, widget, NULL);
+        if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+        {
+            set_destination(ud);
+        }
+        widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+        // End may have been changed above, get it again
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start == end)
+        {
+            gtk_widget_set_sensitive(widget, FALSE);
+        }
+        else
+        {
+            gtk_widget_set_sensitive(widget, TRUE);
+        }
+        update_title_duration(ud);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start >= end)
+            ghb_ui_update(ud, "end_point", ghb_int_value(start+1));
+        ghb_check_dependency(ud, widget, NULL);
+        update_title_duration(ud);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start > end)
+            ghb_ui_update(ud, "end_point", ghb_int_value(start));
+        ghb_check_dependency(ud, widget, NULL);
+        update_title_duration(ud);
+    }
 }
 
 G_MODULE_EXPORT void
 end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	gint start, end;
-	const gchar *name = ghb_get_setting_key(widget);
+    gint start, end;
+    const gchar *name = ghb_get_setting_key(widget);
 
-	g_debug("end_point_changed_cb () %s", name);
-	ghb_widget_to_setting(ud->settings, widget);
-	if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start > end)
-			ghb_ui_update(ud, "start_point", ghb_int_value(end));
-		ghb_check_dependency(ud, widget, NULL);
-		if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
-		{
-			set_destination(ud);
-		}
-		widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
-		// Start may have been changed above, get it again
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		if (start == end)
-		{
-			gtk_widget_set_sensitive(widget, FALSE);
-		}
-		else
-		{
-			gtk_widget_set_sensitive(widget, TRUE);
-		}
-		update_title_duration(ud);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start >= end)
-			ghb_ui_update(ud, "start_point", ghb_int_value(end-1));
-		ghb_check_dependency(ud, widget, NULL);
-		update_title_duration(ud);
-	}
-	else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
-	{
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		if (start > end)
-			ghb_ui_update(ud, "start_point", ghb_int_value(end));
-		ghb_check_dependency(ud, widget, NULL);
-		update_title_duration(ud);
-	}
+    g_debug("end_point_changed_cb () %s", name);
+    ghb_widget_to_setting(ud->settings, widget);
+    if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start > end)
+            ghb_ui_update(ud, "start_point", ghb_int_value(end));
+        ghb_check_dependency(ud, widget, NULL);
+        if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+        {
+            set_destination(ud);
+        }
+        widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+        // Start may have been changed above, get it again
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        if (start == end)
+        {
+            gtk_widget_set_sensitive(widget, FALSE);
+        }
+        else
+        {
+            gtk_widget_set_sensitive(widget, TRUE);
+        }
+        update_title_duration(ud);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start >= end)
+            ghb_ui_update(ud, "start_point", ghb_int_value(end-1));
+        ghb_check_dependency(ud, widget, NULL);
+        update_title_duration(ud);
+    }
+    else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+    {
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        if (start > end)
+            ghb_ui_update(ud, "start_point", ghb_int_value(end));
+        ghb_check_dependency(ud, widget, NULL);
+        update_title_duration(ud);
+    }
 }
 
 G_MODULE_EXPORT void
 scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("scale_width_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, GHB_PIC_KEEP_WIDTH);
-	update_preview = TRUE;
-	gchar *text;
-	gint width = ghb_settings_get_int(ud->settings, "scale_width");
-	gint height = ghb_settings_get_int(ud->settings, "scale_height");
-	widget = GHB_WIDGET (ud->builder, "scale_dimensions");
-	text = g_strdup_printf ("%d x %d", width, height);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
-	ghb_live_reset(ud);
+    g_debug("scale_width_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, GHB_PIC_KEEP_WIDTH);
+    update_preview = TRUE;
+    gchar *text;
+    gint width = ghb_settings_get_int(ud->settings, "scale_width");
+    gint height = ghb_settings_get_int(ud->settings, "scale_height");
+    widget = GHB_WIDGET (ud->builder, "scale_dimensions");
+    text = g_strdup_printf ("%d x %d", width, height);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("scale_height_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, GHB_PIC_KEEP_HEIGHT);
-	update_preview = TRUE;
-	gchar *text;
-	gint width = ghb_settings_get_int(ud->settings, "scale_width");
-	gint height = ghb_settings_get_int(ud->settings, "scale_height");
-	widget = GHB_WIDGET (ud->builder, "scale_dimensions");
-	text = g_strdup_printf ("%d x %d", width, height);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
-	ghb_live_reset(ud);
+    g_debug("scale_height_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, GHB_PIC_KEEP_HEIGHT);
+    update_preview = TRUE;
+    gchar *text;
+    gint width = ghb_settings_get_int(ud->settings, "scale_width");
+    gint height = ghb_settings_get_int(ud->settings, "scale_height");
+    widget = GHB_WIDGET (ud->builder, "scale_dimensions");
+    text = g_strdup_printf ("%d x %d", width, height);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	gint titleindex, crop[4];
-	ghb_title_info_t tinfo;
-	
-	g_debug("crop_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, 0);
-
-	crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
-	crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
-	crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
-	crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	if (ghb_get_title_info (&tinfo, titleindex))
-	{
-		gint width, height;
-		gchar *text;
-		
-		width = tinfo.width - crop[2] - crop[3];
-		height = tinfo.height - crop[0] - crop[1];
-		widget = GHB_WIDGET (ud->builder, "crop_dimensions");
-		text = g_strdup_printf ("%d x %d", width, height);
-		gtk_label_set_text (GTK_LABEL(widget), text);
-		widget = GHB_WIDGET (ud->builder, "crop_dimensions2");
-		gtk_label_set_text (GTK_LABEL(widget), text);
-		g_free(text);
-	}
-	gchar *text;
-	widget = GHB_WIDGET (ud->builder, "crop_values");
-	text = g_strdup_printf ("%d:%d:%d:%d", crop[0], crop[1], crop[2], crop[3]);
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	g_free(text);
-	update_preview = TRUE;
-	ghb_live_reset(ud);
+    gint titleindex, crop[4];
+    
+    g_debug("crop_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, 0);
+
+    crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+    crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+    crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+    crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+    hb_title_t * title = ghb_get_title_info(titleindex);
+    if (title != NULL)
+    {
+        gint width, height;
+        gchar *text;
+        
+        width = title->width - crop[2] - crop[3];
+        height = title->height - crop[0] - crop[1];
+        widget = GHB_WIDGET (ud->builder, "crop_dimensions");
+        text = g_strdup_printf ("%d x %d", width, height);
+        gtk_label_set_text (GTK_LABEL(widget), text);
+        widget = GHB_WIDGET (ud->builder, "crop_dimensions2");
+        gtk_label_set_text (GTK_LABEL(widget), text);
+        g_free(text);
+    }
+    gchar *text;
+    widget = GHB_WIDGET (ud->builder, "crop_values");
+    text = g_strdup_printf ("%d:%d:%d:%d", crop[0], crop[1], crop[2], crop[3]);
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    g_free(text);
+    update_preview = TRUE;
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 display_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("display_width_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_WIDTH);
+    g_debug("display_width_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_WIDTH);
 
-	update_preview = TRUE;
+    update_preview = TRUE;
 }
 
 G_MODULE_EXPORT void
 display_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("display_height_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
+    g_debug("display_height_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
 
-	update_preview = TRUE;
+    update_preview = TRUE;
 }
 
 G_MODULE_EXPORT void
 par_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("par_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+    g_debug("par_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
 
-	update_preview = TRUE;
+    update_preview = TRUE;
 }
 
 G_MODULE_EXPORT void
 scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("scale_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	ghb_live_reset(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, 0);
-	update_preview = TRUE;
-	
-	gchar *text;
-	
-	text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? "On" : "Off";
-	widget = GHB_WIDGET (ud->builder, "crop_auto");
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
-	widget = GHB_WIDGET (ud->builder, "scale_auto");
-	gtk_label_set_text (GTK_LABEL(widget), text);
-	switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
-	{
-		case 0:
-			text = "Off";
-			break;
-		case 1:
-			text = "Strict";
-			break;
-		case 2:
-			text = "Loose";
-			break;
-		case 3:
-			text = "Custom";
-			break;
-		default:
-			text = "Unknown";
-			break;
-	}
-	widget = GHB_WIDGET (ud->builder, "scale_anamorphic");
-	gtk_label_set_text (GTK_LABEL(widget), text);
+    g_debug("scale_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    ghb_live_reset(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, 0);
+    update_preview = TRUE;
+    
+    gchar *text;
+    
+    text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? "On" : "Off";
+    widget = GHB_WIDGET (ud->builder, "crop_auto");
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
+    widget = GHB_WIDGET (ud->builder, "scale_auto");
+    gtk_label_set_text (GTK_LABEL(widget), text);
+    switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
+    {
+        case 0:
+            text = "Off";
+            break;
+        case 1:
+            text = "Strict";
+            break;
+        case 2:
+            text = "Loose";
+            break;
+        case 3:
+            text = "Custom";
+            break;
+        default:
+            text = "Unknown";
+            break;
+    }
+    widget = GHB_WIDGET (ud->builder, "scale_anamorphic");
+    gtk_label_set_text (GTK_LABEL(widget), text);
 }
 
 G_MODULE_EXPORT void
 show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("show_crop_changed_cb ()");
-	ghb_widget_to_setting(ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_live_reset(ud);
-	if (gtk_widget_is_sensitive(widget))
-		ghb_set_scale (ud, 0);
-	update_preview = TRUE;
+    g_debug("show_crop_changed_cb ()");
+    ghb_widget_to_setting(ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_live_reset(ud);
+    if (gtk_widget_is_sensitive(widget))
+        ghb_set_scale (ud, 0);
+    update_preview = TRUE;
 }
 
 G_MODULE_EXPORT void
 generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
 {
-	// Normally (due to user input) I only want to process the entry
-	// when editing is done and the focus-out signal is sent.
-	// But... there's always a but.
-	// If the entry is changed by software, the focus-out signal is not sent.
-	// The changed signal is sent ... so here we are.
-	// I don't want to process upon every keystroke, so I prevent processing
-	// while the widget has focus.
-	g_debug("generic_entry_changed_cb ()");
-	if (!gtk_widget_has_focus((GtkWidget*)entry))
-	{
-		ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
-	}
+    // Normally (due to user input) I only want to process the entry
+    // when editing is done and the focus-out signal is sent.
+    // But... there's always a but.
+    // If the entry is changed by software, the focus-out signal is not sent.
+    // The changed signal is sent ... so here we are.
+    // I don't want to process upon every keystroke, so I prevent processing
+    // while the widget has focus.
+    g_debug("generic_entry_changed_cb ()");
+    if (!gtk_widget_has_focus((GtkWidget*)entry))
+    {
+        ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
+    }
 }
 
 G_MODULE_EXPORT void
 prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
+    GtkWidget *dialog;
 
-	g_debug("prefs_dialog_cb ()");
-	dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
+    g_debug("prefs_dialog_cb ()");
+    dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_hide(dialog);
 }
 
 typedef struct
 {
-	GtkMessageDialog *dlg;
-	const gchar *msg;
-	const gchar *action;
-	gint timeout;
-	signal_user_data_t *ud;
+    GtkMessageDialog *dlg;
+    const gchar *msg;
+    const gchar *action;
+    gint timeout;
+    signal_user_data_t *ud;
 } countdown_t;
 
 static gboolean
 quit_cb(countdown_t *cd)
 {
-	gchar *str;
+    gchar *str;
+
+    cd->timeout--;
+    if (cd->timeout == 0)
+    {
+        ghb_hb_cleanup(FALSE);
+        prune_logs(cd->ud);
 
-	cd->timeout--;
-	if (cd->timeout == 0)
-	{
-		ghb_hb_cleanup(FALSE);
-		prune_logs(cd->ud);
-
-		gtk_widget_destroy (GTK_WIDGET(cd->dlg));
-		gtk_main_quit();
-		return FALSE;
-	}
-	str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
-							cd->msg, cd->action, cd->timeout);
-	gtk_message_dialog_set_markup(cd->dlg, str);
-	g_free(str);
-	return TRUE;
+        gtk_widget_destroy (GTK_WIDGET(cd->dlg));
+        gtk_main_quit();
+        return FALSE;
+    }
+    str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                            cd->msg, cd->action, cd->timeout);
+    gtk_message_dialog_set_markup(cd->dlg, str);
+    g_free(str);
+    return TRUE;
 }
 
 static gboolean
 shutdown_cb(countdown_t *cd)
 {
-	gchar *str;
+    gchar *str;
+
+    cd->timeout--;
+    if (cd->timeout == 0)
+    {
+        ghb_hb_cleanup(FALSE);
+        prune_logs(cd->ud);
 
-	cd->timeout--;
-	if (cd->timeout == 0)
-	{
-		ghb_hb_cleanup(FALSE);
-		prune_logs(cd->ud);
-
-		ghb_shutdown_gsm();
-		gtk_main_quit();
-		return FALSE;
-	}
-	str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
-							cd->msg, cd->action, cd->timeout);
-	gtk_message_dialog_set_markup(cd->dlg, str);
-	g_free(str);
-	return TRUE;
+        ghb_shutdown_gsm();
+        gtk_main_quit();
+        return FALSE;
+    }
+    str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                            cd->msg, cd->action, cd->timeout);
+    gtk_message_dialog_set_markup(cd->dlg, str);
+    g_free(str);
+    return TRUE;
 }
 
 static gboolean
 suspend_cb(countdown_t *cd)
 {
-	gchar *str;
+    gchar *str;
 
-	cd->timeout--;
-	if (cd->timeout == 0)
-	{
-		gtk_widget_destroy (GTK_WIDGET(cd->dlg));
-		ghb_suspend_gpm();
-		return FALSE;
-	}
-	str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
-							cd->msg, cd->action, cd->timeout);
-	gtk_message_dialog_set_markup(cd->dlg, str);
-	g_free(str);
-	return TRUE;
+    cd->timeout--;
+    if (cd->timeout == 0)
+    {
+        gtk_widget_destroy (GTK_WIDGET(cd->dlg));
+        ghb_suspend_gpm();
+        return FALSE;
+    }
+    str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                            cd->msg, cd->action, cd->timeout);
+    gtk_message_dialog_set_markup(cd->dlg, str);
+    g_free(str);
+    return TRUE;
 }
 
 void
 ghb_countdown_dialog(
-	GtkMessageType type, 
-	const gchar *message, 
-	const gchar *action, 
-	const gchar *cancel, 
-	GSourceFunc action_func,
-	signal_user_data_t *ud,
-	gint timeout)
-{
-	GtkWidget *dialog;
-	GtkResponseType response;
-	guint timeout_id;
-	countdown_t cd;
-			
-	cd.msg = message;
-	cd.action = action;
-	cd.timeout = timeout;
-	cd.ud = ud;
-
-	// Toss up a warning dialog
-	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-							type, GTK_BUTTONS_NONE,
-							"%s\n\n%s in %d seconds ...", 
-							message, action, timeout);
-	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-						   cancel, GTK_RESPONSE_CANCEL,
-						   NULL);
-
-	cd.dlg = GTK_MESSAGE_DIALOG(dialog);
-	timeout_id = g_timeout_add(1000, action_func, &cd);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy (dialog);
-	if (response == GTK_RESPONSE_CANCEL)
-	{
-		GMainContext *mc;
-		GSource *source;
-
-		mc = g_main_context_default();
-		source = g_main_context_find_source_by_id(mc, timeout_id);
-		if (source != NULL)
-			g_source_destroy(source);
-	}
+    GtkMessageType type, 
+    const gchar *message, 
+    const gchar *action, 
+    const gchar *cancel, 
+    GSourceFunc action_func,
+    signal_user_data_t *ud,
+    gint timeout)
+{
+    GtkWidget *dialog;
+    GtkResponseType response;
+    guint timeout_id;
+    countdown_t cd;
+            
+    cd.msg = message;
+    cd.action = action;
+    cd.timeout = timeout;
+    cd.ud = ud;
+
+    // Toss up a warning dialog
+    dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                            type, GTK_BUTTONS_NONE,
+                            "%s\n\n%s in %d seconds ...", 
+                            message, action, timeout);
+    gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                           cancel, GTK_RESPONSE_CANCEL,
+                           NULL);
+
+    cd.dlg = GTK_MESSAGE_DIALOG(dialog);
+    timeout_id = g_timeout_add(1000, action_func, &cd);
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy (dialog);
+    if (response == GTK_RESPONSE_CANCEL)
+    {
+        GMainContext *mc;
+        GSource *source;
+
+        mc = g_main_context_default();
+        source = g_main_context_find_source_by_id(mc, timeout_id);
+        if (source != NULL)
+            g_source_destroy(source);
+    }
 }
 
 gboolean
 ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
-			
-	// Toss up a warning dialog
-	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-							type, GTK_BUTTONS_NONE,
-							"%s", message);
-	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-						   no, GTK_RESPONSE_NO,
-						   yes, GTK_RESPONSE_YES, NULL);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy (dialog);
-	if (response == GTK_RESPONSE_NO)
-	{
-		return FALSE;
-	}
-	return TRUE;
+    GtkWidget *dialog;
+    GtkResponseType response;
+            
+    // Toss up a warning dialog
+    dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                            type, GTK_BUTTONS_NONE,
+                            "%s", message);
+    gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                           no, GTK_RESPONSE_NO,
+                           yes, GTK_RESPONSE_YES, NULL);
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy (dialog);
+    if (response == GTK_RESPONSE_NO)
+    {
+        return FALSE;
+    }
+    return TRUE;
 }
 
 void
 ghb_error_dialog(GtkMessageType type, const gchar *message, const gchar *cancel)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
-			
-	// Toss up a warning dialog
-	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-							type, GTK_BUTTONS_NONE,
-							"%s", message);
-	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-						   cancel, GTK_RESPONSE_CANCEL, NULL);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy (dialog);
+    GtkWidget *dialog;
+
+    // Toss up a warning dialog
+    dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                            type, GTK_BUTTONS_NONE,
+                            "%s", message);
+    gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                           cancel, GTK_RESPONSE_CANCEL, NULL);
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy (dialog);
 }
 
 void
 ghb_cancel_encode(signal_user_data_t *ud, const gchar *extra_msg)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
-	
-	if (extra_msg == NULL) extra_msg = "";
-	// Toss up a warning dialog
-	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-				GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-				"%sYour movie will be lost if you don't continue encoding.",
-				extra_msg);
-	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-						   "Cancel Current and Stop", 1,
-						   "Cancel Current, Start Next", 2,
-						   "Finish Current, then Stop", 3,
-						   "Continue Encoding", 4,
-						   NULL);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy (dialog);
-	switch ((int)response)
-	{
-		case 1:
-			ghb_stop_queue();
-			ud->cancel_encode = GHB_CANCEL_ALL;
-			break;
-		case 2:
-			ghb_stop_queue();
-			ud->cancel_encode = GHB_CANCEL_CURRENT;
-			break;
-		case 3:
-			ud->cancel_encode = GHB_CANCEL_FINISH;
-			break;
-		case 4:
-		default:
-			ud->cancel_encode = GHB_CANCEL_NONE;
-			break;
-	}
+    GtkWidget *dialog;
+    GtkResponseType response;
+    
+    if (extra_msg == NULL) extra_msg = "";
+    // Toss up a warning dialog
+    dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+                "%sYour movie will be lost if you don't continue encoding.",
+                extra_msg);
+    gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                           "Cancel Current and Stop", 1,
+                           "Cancel Current, Start Next", 2,
+                           "Finish Current, then Stop", 3,
+                           "Continue Encoding", 4,
+                           NULL);
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy (dialog);
+    switch ((int)response)
+    {
+        case 1:
+            ghb_stop_queue();
+            ud->cancel_encode = GHB_CANCEL_ALL;
+            break;
+        case 2:
+            ghb_stop_queue();
+            ud->cancel_encode = GHB_CANCEL_CURRENT;
+            break;
+        case 3:
+            ud->cancel_encode = GHB_CANCEL_FINISH;
+            break;
+        case 4:
+        default:
+            ud->cancel_encode = GHB_CANCEL_NONE;
+            break;
+    }
 }
 
 gboolean
 ghb_cancel_encode2(signal_user_data_t *ud, const gchar *extra_msg)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
-	
-	if (extra_msg == NULL) extra_msg = "";
-	// Toss up a warning dialog
-	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-				GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-				"%sYour movie will be lost if you don't continue encoding.",
-				extra_msg);
-	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-						   "Cancel Current and Stop", 1,
-						   "Continue Encoding", 4,
-						   NULL);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy (dialog);
-	switch ((int)response)
-	{
-		case 1:
-			ghb_stop_queue();
-			ud->cancel_encode = GHB_CANCEL_ALL;
-			return TRUE;
-		case 4:
-		default:
-			break;
-	}
-	return FALSE;
+    GtkWidget *dialog;
+    GtkResponseType response;
+    
+    if (extra_msg == NULL) extra_msg = "";
+    // Toss up a warning dialog
+    dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+                "%sYour movie will be lost if you don't continue encoding.",
+                extra_msg);
+    gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                           "Cancel Current and Stop", 1,
+                           "Continue Encoding", 4,
+                           NULL);
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy (dialog);
+    switch ((int)response)
+    {
+        case 1:
+            ghb_stop_queue();
+            ud->cancel_encode = GHB_CANCEL_ALL;
+            return TRUE;
+        case 4:
+        default:
+            break;
+    }
+    return FALSE;
 }
 
 static void
 submit_job(GValue *settings)
 {
-	static gint unique_id = 1;
-	gchar *type, *modified, *preset;
-	const GValue *path;
-	gboolean preset_modified;
-
-	g_debug("submit_job");
-	if (settings == NULL) return;
-	preset_modified = ghb_settings_get_boolean(settings, "preset_modified");
-	path = ghb_settings_get_value(settings, "preset");
-	preset = ghb_preset_path_string(path);
-	type = ghb_preset_is_custom() ? "Custom " : "";
-	modified = preset_modified ? "Modified " : "";
-	ghb_log("%s%sPreset: %s", modified, type, preset);
-	g_free(preset);
-
-	ghb_settings_set_int(settings, "job_unique_id", unique_id);
-	ghb_settings_set_int(settings, "job_status", GHB_QUEUE_RUNNING);
-	ghb_add_job (settings, unique_id);
-	ghb_start_queue();
-	unique_id++;
+    static gint unique_id = 1;
+    gchar *type, *modified, *preset;
+    const GValue *path;
+    gboolean preset_modified;
+
+    g_debug("submit_job");
+    if (settings == NULL) return;
+    preset_modified = ghb_settings_get_boolean(settings, "preset_modified");
+    path = ghb_settings_get_value(settings, "preset");
+    preset = ghb_preset_path_string(path);
+    type = ghb_preset_is_custom() ? "Custom " : "";
+    modified = preset_modified ? "Modified " : "";
+    ghb_log("%s%sPreset: %s", modified, type, preset);
+    g_free(preset);
+
+    ghb_settings_set_int(settings, "job_unique_id", unique_id);
+    ghb_settings_set_int(settings, "job_status", GHB_QUEUE_RUNNING);
+    ghb_add_job (settings, unique_id);
+    ghb_start_queue();
+    unique_id++;
 }
 
 static void
 prune_logs(signal_user_data_t *ud)
 {
-	gchar *dest_dir;
-	gint days;
+    gchar *dest_dir;
+    gint days;
+
+    // Only prune logs stored in the default config dir location
+    days = ghb_settings_combo_int(ud->settings, "LogLongevity");
+    if (days > 365)
+        return;
 
-	// Only prune logs stored in the default config dir location
-	days = ghb_settings_combo_int(ud->settings, "LogLongevity");
-	if (days > 365)
-		return;
-
-	dest_dir = ghb_get_user_config_dir("EncodeLogs");
-	if (g_file_test(dest_dir, G_FILE_TEST_IS_DIR))
-	{
-		const gchar *file;
-		gint duration = days * 24 * 60 * 60;
-		
-		GDir *gdir = g_dir_open(dest_dir, 0, NULL);
-		time_t now;
-
-		now = time(NULL);
-		file = g_dir_read_name(gdir);
-		while (file)
-		{
-			gchar *path;
-			struct stat stbuf;
-
-			path = g_strdup_printf("%s/%s", dest_dir, file);
-			g_stat(path, &stbuf);
-			if (now - stbuf.st_mtime > duration)
-			{
-				g_unlink(path);
-			}
-			g_free(path);
-			file = g_dir_read_name(gdir);
-		}
-		g_dir_close(gdir);
-	}
-	g_free(dest_dir);
-	ghb_preview_cleanup(ud);
+    dest_dir = ghb_get_user_config_dir("EncodeLogs");
+    if (g_file_test(dest_dir, G_FILE_TEST_IS_DIR))
+    {
+        const gchar *file;
+        gint duration = days * 24 * 60 * 60;
+        
+        GDir *gdir = g_dir_open(dest_dir, 0, NULL);
+        time_t now;
+
+        now = time(NULL);
+        file = g_dir_read_name(gdir);
+        while (file)
+        {
+            gchar *path;
+            struct stat stbuf;
+
+            path = g_strdup_printf("%s/%s", dest_dir, file);
+            g_stat(path, &stbuf);
+            if (now - stbuf.st_mtime > duration)
+            {
+                g_unlink(path);
+            }
+            g_free(path);
+            file = g_dir_read_name(gdir);
+        }
+        g_dir_close(gdir);
+    }
+    g_free(dest_dir);
+    ghb_preview_cleanup(ud);
 }
 
 static void
 queue_scan(signal_user_data_t *ud, GValue *js)
 {
-	gchar *path;
-	gint titlenum;
-	time_t	_now;
-	struct tm *now;
-	gchar *log_path, *pos, *destname, *basename, *dest_dir;
-
-	_now = time(NULL);
-	now = localtime(&_now);
-	destname = ghb_settings_get_string(js, "destination");
-	basename = g_path_get_basename(destname);
-	if (ghb_settings_get_boolean(ud->settings, "EncodeLogLocation"))
-	{
-		dest_dir = g_path_get_dirname (destname);
-	}
-	else
-	{
-		dest_dir = ghb_get_user_config_dir("EncodeLogs");
-	}
-	g_free(destname);
-	pos = g_strrstr( basename, "." );
-	if (pos != NULL)
-	{
-		*pos = 0;
-	}
-	log_path = g_strdup_printf("%s/%s %d-%02d-%02d %02d-%02d-%02d.log",
-		dest_dir,
-		basename,
-		now->tm_year + 1900, now->tm_mon + 1, now->tm_mday,
-		now->tm_hour, now->tm_min, now->tm_sec);
-	g_free(basename);
-	g_free(dest_dir);
-	if (ud->job_activity_log)
-		g_io_channel_unref(ud->job_activity_log);
-	ud->job_activity_log = g_io_channel_new_file (log_path, "w", NULL);
-	if (ud->job_activity_log)
-	{
-		gchar *ver_str;
-
-		ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n", 
-									hb_get_version(NULL), hb_get_build(NULL));
-		g_io_channel_write_chars (ud->job_activity_log, ver_str, 
-									-1, NULL, NULL);
-		g_free(ver_str);
-	}
-	g_free(log_path);
-
-	path = ghb_settings_get_string( js, "source");
-	titlenum = ghb_settings_get_int(js, "titlenum");
-	ghb_backend_queue_scan(path, titlenum);
-	g_free(path);
+    gchar *path;
+    gint titlenum;
+    time_t  _now;
+    struct tm *now;
+    gchar *log_path, *pos, *destname, *basename, *dest_dir;
+
+    _now = time(NULL);
+    now = localtime(&_now);
+    destname = ghb_settings_get_string(js, "destination");
+    basename = g_path_get_basename(destname);
+    if (ghb_settings_get_boolean(ud->settings, "EncodeLogLocation"))
+    {
+        dest_dir = g_path_get_dirname (destname);
+    }
+    else
+    {
+        dest_dir = ghb_get_user_config_dir("EncodeLogs");
+    }
+    g_free(destname);
+    pos = g_strrstr( basename, "." );
+    if (pos != NULL)
+    {
+        *pos = 0;
+    }
+    log_path = g_strdup_printf("%s/%s %d-%02d-%02d %02d-%02d-%02d.log",
+        dest_dir,
+        basename,
+        now->tm_year + 1900, now->tm_mon + 1, now->tm_mday,
+        now->tm_hour, now->tm_min, now->tm_sec);
+    g_free(basename);
+    g_free(dest_dir);
+    if (ud->job_activity_log)
+        g_io_channel_unref(ud->job_activity_log);
+    ud->job_activity_log = g_io_channel_new_file (log_path, "w", NULL);
+    if (ud->job_activity_log)
+    {
+        gchar *ver_str;
+
+        ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n", 
+                                    hb_get_version(NULL), hb_get_build(NULL));
+        g_io_channel_write_chars (ud->job_activity_log, ver_str, 
+                                    -1, NULL, NULL);
+        g_free(ver_str);
+    }
+    g_free(log_path);
+
+    path = ghb_settings_get_string( js, "source");
+    titlenum = ghb_settings_get_int(js, "titlenum");
+    ghb_backend_queue_scan(path, titlenum);
+    g_free(path);
 }
 
 static gint
 queue_pending_count(GValue *queue)
 {
-	gint nn, ii, count;
-	GValue *js;
-	gint status;
-
-	nn = 0;
-	count = ghb_array_len(queue);
-	for (ii = 0; ii < count; ii++)
-	{
-
-		js = ghb_array_get_nth(queue, ii);
-		status = ghb_settings_get_int(js, "job_status");
-		if (status == GHB_QUEUE_PENDING)
-		{
-			nn++;
-		}
-	}
-	return nn;
+    gint nn, ii, count;
+    GValue *js;
+    gint status;
+
+    nn = 0;
+    count = ghb_array_len(queue);
+    for (ii = 0; ii < count; ii++)
+    {
+
+        js = ghb_array_get_nth(queue, ii);
+        status = ghb_settings_get_int(js, "job_status");
+        if (status == GHB_QUEUE_PENDING)
+        {
+            nn++;
+        }
+    }
+    return nn;
 }
 
 void
 ghb_update_pending(signal_user_data_t *ud)
 {
-	GtkLabel *label;
-	gint pending;
-	gchar *str;
-
-	label = GTK_LABEL(GHB_WIDGET(ud->builder, "pending_status"));
-	pending = queue_pending_count(ud->queue);
-	str = g_strdup_printf("%d encode(s) pending", pending);
-	gtk_label_set_text(label, str);
-	g_free(str);
+    GtkLabel *label;
+    gint pending;
+    gchar *str;
+
+    label = GTK_LABEL(GHB_WIDGET(ud->builder, "pending_status"));
+    pending = queue_pending_count(ud->queue);
+    str = g_strdup_printf("%d encode(s) pending", pending);
+    gtk_label_set_text(label, str);
+    g_free(str);
 }
 
 GValue* 
 ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 {
-	static gint current = 0;
-	gint count, ii, jj;
-	GValue *js;
-	gint status;
-	GtkWidget *prog;
-
-	g_debug("start_next_job");
-	prog = GHB_WIDGET(ud->builder, "progressbar");
-	gtk_widget_show(prog);
-
-	count = ghb_array_len(ud->queue);
-	if (find_first)
-	{	// Start the first pending item in the queue
-		current = 0;
-		for (ii = 0; ii < count; ii++)
-		{
-
-			js = ghb_array_get_nth(ud->queue, ii);
-			status = ghb_settings_get_int(js, "job_status");
-			if (status == GHB_QUEUE_PENDING)
-			{
-				current = ii;
-				ghb_inhibit_gsm(ud);
-				queue_scan(ud, js);
-				ghb_update_pending(ud);
-				return js;
-			}
-		}
-		// Nothing pending
-		ghb_uninhibit_gsm();
-		ghb_notify_done(ud);
-		return NULL;
-	}
-	// Find the next pending item after the current running item
-	for (ii = 0; ii < count-1; ii++)
-	{
-		js = ghb_array_get_nth(ud->queue, ii);
-		status = ghb_settings_get_int(js, "job_status");
-		if (status == GHB_QUEUE_RUNNING)
-		{
-			for (jj = ii+1; jj < count; jj++)
-			{
-				js = ghb_array_get_nth(ud->queue, jj);
-				status = ghb_settings_get_int(js, "job_status");
-				if (status == GHB_QUEUE_PENDING)
-				{
-					current = jj;
-					ghb_inhibit_gsm(ud);
-					queue_scan(ud, js);
-					ghb_update_pending(ud);
-					return js;
-				}
-			}
-		}
-	}
-	// No running item found? Maybe it was deleted
-	// Look for a pending item starting from the last index we started
-	for (ii = current; ii < count; ii++)
-	{
-		js = ghb_array_get_nth(ud->queue, ii);
-		status = ghb_settings_get_int(js, "job_status");
-		if (status == GHB_QUEUE_PENDING)
-		{
-			current = ii;
-			ghb_inhibit_gsm(ud);
-			queue_scan(ud, js);
-			ghb_update_pending(ud);
-			return js;
-		}
-	}
-	// Nothing found
-	ghb_uninhibit_gsm();
-	ghb_notify_done(ud);
-	ghb_update_pending(ud);
-	gtk_widget_hide(prog);
-	return NULL;
+    static gint current = 0;
+    gint count, ii, jj;
+    GValue *js;
+    gint status;
+    GtkWidget *prog;
+
+    g_debug("start_next_job");
+    prog = GHB_WIDGET(ud->builder, "progressbar");
+    gtk_widget_show(prog);
+
+    count = ghb_array_len(ud->queue);
+    if (find_first)
+    {   // Start the first pending item in the queue
+        current = 0;
+        for (ii = 0; ii < count; ii++)
+        {
+
+            js = ghb_array_get_nth(ud->queue, ii);
+            status = ghb_settings_get_int(js, "job_status");
+            if (status == GHB_QUEUE_PENDING)
+            {
+                current = ii;
+                ghb_inhibit_gsm(ud);
+                queue_scan(ud, js);
+                ghb_update_pending(ud);
+                return js;
+            }
+        }
+        // Nothing pending
+        ghb_uninhibit_gsm();
+        ghb_notify_done(ud);
+        return NULL;
+    }
+    // Find the next pending item after the current running item
+    for (ii = 0; ii < count-1; ii++)
+    {
+        js = ghb_array_get_nth(ud->queue, ii);
+        status = ghb_settings_get_int(js, "job_status");
+        if (status == GHB_QUEUE_RUNNING)
+        {
+            for (jj = ii+1; jj < count; jj++)
+            {
+                js = ghb_array_get_nth(ud->queue, jj);
+                status = ghb_settings_get_int(js, "job_status");
+                if (status == GHB_QUEUE_PENDING)
+                {
+                    current = jj;
+                    ghb_inhibit_gsm(ud);
+                    queue_scan(ud, js);
+                    ghb_update_pending(ud);
+                    return js;
+                }
+            }
+        }
+    }
+    // No running item found? Maybe it was deleted
+    // Look for a pending item starting from the last index we started
+    for (ii = current; ii < count; ii++)
+    {
+        js = ghb_array_get_nth(ud->queue, ii);
+        status = ghb_settings_get_int(js, "job_status");
+        if (status == GHB_QUEUE_PENDING)
+        {
+            current = ii;
+            ghb_inhibit_gsm(ud);
+            queue_scan(ud, js);
+            ghb_update_pending(ud);
+            return js;
+        }
+    }
+    // Nothing found
+    ghb_uninhibit_gsm();
+    ghb_notify_done(ud);
+    ghb_update_pending(ud);
+    gtk_widget_hide(prog);
+    return NULL;
 }
 
 static gint
 find_queue_job(GValue *queue, gint unique_id, GValue **job)
 {
-	GValue *js;
-	gint ii, count;
-	gint job_unique_id;
-	
-	*job = NULL;
-	g_debug("find_queue_job");
-	if (unique_id == 0)  // Invalid Id
-		return -1;
-
-	count = ghb_array_len(queue);
-	for (ii = 0; ii < count; ii++)
-	{
-		js = ghb_array_get_nth(queue, ii);
-		job_unique_id = ghb_settings_get_int(js, "job_unique_id");
-		if (job_unique_id == unique_id)
-		{
-			*job = js;
-			return ii;
-		}
-	}
-	return -1;
+    GValue *js;
+    gint ii, count;
+    gint job_unique_id;
+    
+    *job = NULL;
+    g_debug("find_queue_job");
+    if (unique_id == 0)  // Invalid Id
+        return -1;
+
+    count = ghb_array_len(queue);
+    for (ii = 0; ii < count; ii++)
+    {
+        js = ghb_array_get_nth(queue, ii);
+        job_unique_id = ghb_settings_get_int(js, "job_unique_id");
+        if (job_unique_id == unique_id)
+        {
+            *job = js;
+            return ii;
+        }
+    }
+    return -1;
 }
 
 gchar*
 working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 {
-	gchar *task_str, *job_str, *status_str;
-	gint qcount;
-	gint index;
-	GValue *js;
-	gboolean subtitle_scan = FALSE;
-
-	qcount = ghb_array_len(ud->queue);
-	index = find_queue_job(ud->queue, status->unique_id, &js);
-	if (js != NULL)
-	{
-		subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
-	}
-	if (qcount > 1)
-	{
-		job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
-	}
-	else
-	{
-		job_str = g_strdup("");
-	}
-	if (status->job_count > 1)
-	{
-		if (status->job_cur == 1 && subtitle_scan)
-		{
-			task_str = g_strdup_printf("pass %d (subtitle scan) of %d, ", 
-				status->job_cur, status->job_count);
-		}
-		else
-		{
-			task_str = g_strdup_printf("pass %d of %d, ", 
-				status->job_cur, status->job_count);
-		}
-	}
-	else
-	{
-		task_str = g_strdup("");
-	}
-	if(status->seconds > -1)
-	{
-		status_str= g_strdup_printf(
-			"Encoding: %s%s%.2f %%"
-			" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
-			job_str, task_str,
-			100.0 * status->progress,
-			status->rate_cur, status->rate_avg, status->hours, 
-			status->minutes, status->seconds );
-	}
-	else
-	{
-		status_str= g_strdup_printf(
-			"Encoding: %s%s%.2f %%",
-			job_str, task_str,
-			100.0 * status->progress );
-	}
-	g_free(task_str);
-	g_free(job_str);
-	return status_str;
+    gchar *task_str, *job_str, *status_str;
+    gint qcount;
+    gint index;
+    GValue *js;
+    gboolean subtitle_scan = FALSE;
+
+    qcount = ghb_array_len(ud->queue);
+    index = find_queue_job(ud->queue, status->unique_id, &js);
+    if (js != NULL)
+    {
+        subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
+    }
+    if (qcount > 1)
+    {
+        job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
+    }
+    else
+    {
+        job_str = g_strdup("");
+    }
+    if (status->job_count > 1)
+    {
+        if (status->job_cur == 1 && subtitle_scan)
+        {
+            task_str = g_strdup_printf("pass %d (subtitle scan) of %d, ", 
+                status->job_cur, status->job_count);
+        }
+        else
+        {
+            task_str = g_strdup_printf("pass %d of %d, ", 
+                status->job_cur, status->job_count);
+        }
+    }
+    else
+    {
+        task_str = g_strdup("");
+    }
+    if(status->seconds > -1)
+    {
+        if (status->rate_cur > 0.0)
+        {
+            status_str= g_strdup_printf(
+                "Encoding: %s%s%.2f %%"
+                " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
+                job_str, task_str,
+                100.0 * status->progress,
+                status->rate_cur, status->rate_avg, status->hours, 
+                status->minutes, status->seconds );
+        }
+        else
+        {
+            status_str= g_strdup_printf(
+                "Encoding: %s%s%.2f %%"
+                " (ETA %02dh%02dm%02ds)",
+                job_str, task_str,
+                100.0 * status->progress,
+                status->hours, status->minutes, status->seconds );
+        }
+    }
+    else
+    {
+        status_str= g_strdup_printf(
+            "Encoding: %s%s%.2f %%",
+            job_str, task_str,
+            100.0 * status->progress );
+    }
+    g_free(task_str);
+    g_free(job_str);
+    return status_str;
 }
 
 gchar*
 searching_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 {
-	gchar *task_str, *job_str, *status_str;
-	gint qcount;
-	gint index;
-	GValue *js;
-
-	qcount = ghb_array_len(ud->queue);
-	index = find_queue_job(ud->queue, status->unique_id, &js);
-	if (qcount > 1)
-	{
-		job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
-	}
-	else
-	{
-		job_str = g_strdup("");
-	}
-	task_str = g_strdup_printf("Searching for start time, ");
-	if(status->seconds > -1)
-	{
-		status_str= g_strdup_printf(
-			"Encoding: %s%s%.2f %%"
-			" (ETA %02dh%02dm%02ds)",
-			job_str, task_str,
-			100.0 * status->progress,
-			status->hours, status->minutes, status->seconds );
-	}
-	else
-	{
-		status_str= g_strdup_printf(
-			"Encoding: %s%s%.2f %%",
-			job_str, task_str,
-			100.0 * status->progress );
-	}
-	g_free(task_str);
-	g_free(job_str);
-	return status_str;
+    gchar *task_str, *job_str, *status_str;
+    gint qcount;
+    gint index;
+    GValue *js;
+
+    qcount = ghb_array_len(ud->queue);
+    index = find_queue_job(ud->queue, status->unique_id, &js);
+    if (qcount > 1)
+    {
+        job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
+    }
+    else
+    {
+        job_str = g_strdup("");
+    }
+    task_str = g_strdup_printf("Searching for start time, ");
+    if(status->seconds > -1)
+    {
+        status_str= g_strdup_printf(
+            "Encoding: %s%s%.2f %%"
+            " (ETA %02dh%02dm%02ds)",
+            job_str, task_str,
+            100.0 * status->progress,
+            status->hours, status->minutes, status->seconds );
+    }
+    else
+    {
+        status_str= g_strdup_printf(
+            "Encoding: %s%s%.2f %%",
+            job_str, task_str,
+            100.0 * status->progress );
+    }
+    g_free(task_str);
+    g_free(job_str);
+    return status_str;
 }
 
 static void
 ghb_backend_events(signal_user_data_t *ud)
 {
-	ghb_status_t status;
-	gchar *status_str;
-	GtkProgressBar *progress;
-	GtkLabel       *work_status;
-	gint titleindex;
-	GValue *js;
-	gint index;
-	GtkTreeView *treeview;
-	GtkTreeStore *store;
-	GtkTreeIter iter;
-	static gint prev_scan_state = 0;
-	static gint prev_queue_state = 0;
-	
-	ghb_track_status();
-	ghb_get_status(&status);
-	if (prev_scan_state != status.scan.state ||
-		prev_queue_state != status.queue.state)
-	{
-		ghb_queue_buttons_grey(ud);
-		prev_scan_state = status.scan.state;
-		prev_queue_state = status.queue.state;
-	}
-	progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-	work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
-	if (status.scan.state == GHB_STATE_IDLE && 
-		status.queue.state == GHB_STATE_IDLE)
-	{
-		static gboolean prev_dvdnav;
-		gboolean dvdnav = ghb_settings_get_boolean(ud->settings, "use_dvdnav");
-		if (dvdnav != prev_dvdnav)
-		{
-			hb_dvd_set_dvdnav(dvdnav);
-			prev_dvdnav = dvdnav;
-		}
-	}
-	// First handle the status of title scans
-	// Then handle the status of the queue
-	if (status.scan.state & GHB_STATE_SCANNING)
-	{
-		GtkProgressBar *scan_prog;
-		GtkLabel *label;
-
-		scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
-		label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
-
-		if (status.scan.title_cur == 0)
-		{
-			status_str = g_strdup ("Scanning...");
-		}
-		else
-		{
-			status_str = g_strdup_printf ("Scanning title %d of %d...", 
-							  status.scan.title_cur, status.scan.title_count );
-		}
-		gtk_label_set_text (label, status_str);
-		g_free(status_str);
-		if (status.scan.title_count > 0)
-		{
-			gtk_progress_bar_set_fraction (scan_prog, 
-				(gdouble)status.scan.title_cur / status.scan.title_count);
-		}
-	}
-	else if (status.scan.state & GHB_STATE_SCANDONE)
-	{
-		gchar *source;
-		GtkProgressBar *scan_prog;
-		GtkLabel *label;
-
-		GtkWidget *widget;
-		GtkAction *action;
-
-		widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
-		gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-source");
-		gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Source");
-		gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Choose Video Source");
-
-		action = GHB_ACTION(ud->builder, "source_action");
-		gtk_action_set_sensitive(action, TRUE);
-		action = GHB_ACTION(ud->builder, "source_single_action");
-		gtk_action_set_sensitive(action, TRUE);
-
-		source = ghb_settings_get_string(ud->settings, "scan_source");
-		update_source_label(ud, source, FALSE);
-
-		scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
-		gtk_progress_bar_set_fraction (scan_prog, 1.0);
-		gtk_widget_hide(GTK_WIDGET(scan_prog));
-
-		if (!ghb_settings_get_boolean(ud->settings, "preset_modified"))
-		{
-			ghb_refresh_preset(ud);
-		}
-
-		ghb_title_info_t tinfo;
-			
-		ghb_update_ui_combo_box(ud, "title", 0, FALSE);
-		titleindex = ghb_longest_title();
-		ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
-
-		label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
-		// Are there really any titles.
-		if (!ghb_get_title_info(&tinfo, titleindex))
-		{
-			gtk_label_set_text(label, "None");
-		}
-		ghb_clear_scan_state(GHB_STATE_SCANDONE);
-		if (ghb_queue_edit_settings)
-		{
-			ghb_settings_to_ui(ud, ghb_queue_edit_settings);
-			ghb_set_audio(ud, ghb_queue_edit_settings);
-			ghb_reset_subtitles(ud, ghb_queue_edit_settings);
-			reset_chapter_list(ud, ghb_queue_edit_settings);
-			ghb_value_free(ghb_queue_edit_settings);
-			ghb_queue_edit_settings = NULL;
-		}
-	}
-
-	if (status.queue.state & GHB_STATE_SCANNING)
-	{
-		// This needs to be in scanning and working since scanning
-		// happens fast enough that it can be missed
-		gtk_label_set_text (work_status, "Scanning ...");
-		gtk_progress_bar_set_fraction (progress, 0);
-	}
-	else if (status.queue.state & GHB_STATE_SCANDONE)
-	{
-		ghb_clear_queue_state(GHB_STATE_SCANDONE);
-		usleep(2000000);
-		submit_job(ud->current_job);
-		ghb_update_pending(ud);
-	}
-	else if (status.queue.state & GHB_STATE_PAUSED)
-	{
-		gtk_label_set_text (work_status, "Paused");
-	}
-	else if (status.queue.state & GHB_STATE_SEARCHING)
-	{
-		static gint working = 0;
-
-		// This needs to be in scanning and working since scanning
-		// happens fast enough that it can be missed
-		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
-		if (status.queue.unique_id != 0 && index >= 0)
-		{
-			gchar working_icon[] = "hb-working0";
-			working_icon[10] = '0' + working;
-			working = (working+1) % 6;
-			treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-			store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-			gchar *path = g_strdup_printf ("%d", index);
-			if (gtk_tree_model_get_iter_from_string(
-					GTK_TREE_MODEL(store), &iter, path))
-			{
-				gtk_tree_store_set(store, &iter, 0, working_icon, -1);
-			}
-			g_free(path);
-		}
-		GtkLabel *label;
-		gchar *status_str;
-
-		status_str = searching_status_string(ud, &status.queue);
-		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
-		gtk_label_set_text (label, status_str);
-		if (ghb_settings_get_boolean(ud->settings, "show_status"))
-		{
+    ghb_status_t status;
+    gchar *status_str;
+    GtkProgressBar *progress;
+    GtkLabel       *work_status;
+    gint titleindex;
+    GValue *js;
+    gint index;
+    GtkTreeView *treeview;
+    GtkTreeStore *store;
+    GtkTreeIter iter;
+    static gint prev_scan_state = 0;
+    static gint prev_queue_state = 0;
+    
+    ghb_track_status();
+    ghb_get_status(&status);
+    if (prev_scan_state != status.scan.state ||
+        prev_queue_state != status.queue.state)
+    {
+        ghb_queue_buttons_grey(ud);
+        prev_scan_state = status.scan.state;
+        prev_queue_state = status.queue.state;
+    }
+    progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
+    work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
+    if (status.scan.state == GHB_STATE_IDLE && 
+        status.queue.state == GHB_STATE_IDLE)
+    {
+        static gboolean prev_dvdnav;
+        gboolean dvdnav = ghb_settings_get_boolean(ud->settings, "use_dvdnav");
+        if (dvdnav != prev_dvdnav)
+        {
+            hb_dvd_set_dvdnav(dvdnav);
+            prev_dvdnav = dvdnav;
+        }
+    }
+    // First handle the status of title scans
+    // Then handle the status of the queue
+    if (status.scan.state & GHB_STATE_SCANNING)
+    {
+        GtkProgressBar *scan_prog;
+        GtkLabel *label;
+
+        scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+        label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+
+        if (status.scan.title_cur == 0)
+        {
+            status_str = g_strdup ("Scanning...");
+        }
+        else
+        {
+            if (status.scan.preview_cur == 0)
+                status_str = g_strdup_printf("Scanning title %d of %d...",
+                              status.scan.title_cur, status.scan.title_count );
+            else
+                status_str = g_strdup_printf(
+                    "Scanning title %d of %d preview %d...",
+                    status.scan.title_cur, status.scan.title_count,
+                    status.scan.preview_cur);
+
+        }
+        gtk_label_set_text (label, status_str);
+        g_free(status_str);
+        if (status.scan.title_count > 0)
+        {
+            gtk_progress_bar_set_fraction (scan_prog, status.scan.progress);
+        }
+    }
+    else if (status.scan.state & GHB_STATE_SCANDONE)
+    {
+        gchar *source;
+        GtkProgressBar *scan_prog;
+        GtkLabel *label;
+
+        GtkWidget *widget;
+        GtkAction *action;
+
+        widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
+        gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-source");
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Source");
+        gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Choose Video Source");
+
+        action = GHB_ACTION(ud->builder, "source_action");
+        gtk_action_set_sensitive(action, TRUE);
+        action = GHB_ACTION(ud->builder, "source_single_action");
+        gtk_action_set_sensitive(action, TRUE);
+
+        source = ghb_settings_get_string(ud->settings, "scan_source");
+        update_source_label(ud, source, FALSE);
+
+        scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+        gtk_progress_bar_set_fraction (scan_prog, 1.0);
+        gtk_widget_hide(GTK_WIDGET(scan_prog));
+
+        if (!ghb_settings_get_boolean(ud->settings, "preset_modified"))
+        {
+            ghb_refresh_preset(ud);
+        }
+
+        ghb_update_ui_combo_box(ud, "title", 0, FALSE);
+        titleindex = ghb_longest_title();
+        ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
+
+        label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+        // Are there really any titles.
+        hb_title_t * title = ghb_get_title_info(titleindex);
+        if (title == NULL)
+        {
+            gtk_label_set_text(label, "None");
+        }
+        ghb_clear_scan_state(GHB_STATE_SCANDONE);
+        if (ghb_queue_edit_settings)
+        {
+            ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+            ghb_set_audio(ud, ghb_queue_edit_settings);
+            ghb_reset_subtitles(ud, ghb_queue_edit_settings);
+            reset_chapter_list(ud, ghb_queue_edit_settings);
+            ghb_value_free(ghb_queue_edit_settings);
+            ghb_queue_edit_settings = NULL;
+        }
+    }
+
+    if (status.queue.state & GHB_STATE_SCANNING)
+    {
+        // This needs to be in scanning and working since scanning
+        // happens fast enough that it can be missed
+        gtk_label_set_text (work_status, "Scanning ...");
+        gtk_progress_bar_set_fraction (progress, 0);
+    }
+    else if (status.queue.state & GHB_STATE_SCANDONE)
+    {
+        ghb_clear_queue_state(GHB_STATE_SCANDONE);
+        usleep(2000000);
+        submit_job(ud->current_job);
+        ghb_update_pending(ud);
+    }
+    else if (status.queue.state & GHB_STATE_PAUSED)
+    {
+        gtk_label_set_text (work_status, "Paused");
+    }
+    else if (status.queue.state & GHB_STATE_SEARCHING)
+    {
+        static gint working = 0;
+
+        // This needs to be in scanning and working since scanning
+        // happens fast enough that it can be missed
+        index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+        if (status.queue.unique_id != 0 && index >= 0)
+        {
+            gchar working_icon[] = "hb-working0";
+            working_icon[10] = '0' + working;
+            working = (working+1) % 6;
+            treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+            store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+            gchar *path = g_strdup_printf ("%d", index);
+            if (gtk_tree_model_get_iter_from_string(
+                    GTK_TREE_MODEL(store), &iter, path))
+            {
+                gtk_tree_store_set(store, &iter, 0, working_icon, -1);
+            }
+            g_free(path);
+        }
+        GtkLabel *label;
+        gchar *status_str;
+
+        status_str = searching_status_string(ud, &status.queue);
+        label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+        gtk_label_set_text (label, status_str);
+        if (ghb_settings_get_boolean(ud->settings, "show_status"))
+        {
 #if !GTK_CHECK_VERSION(2, 16, 0)
-			GtkStatusIcon *si;
+            GtkStatusIcon *si;
 
-			si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-			gtk_status_icon_set_tooltip(si, status_str);
+            si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+            gtk_status_icon_set_tooltip(si, status_str);
 #endif
 #if defined(_USE_APP_IND)
-			char * ai_status_str= g_strdup_printf(
-				"%.2f%%",
-				100.0 * status.queue.progress);
-			app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
-			g_free(ai_status_str);
-#endif
-		}
-		gtk_label_set_text (work_status, status_str);
-		gtk_progress_bar_set_fraction (progress, status.queue.progress);
-		g_free(status_str);
-	}
-	else if (status.queue.state & GHB_STATE_WORKING)
-	{
-		static gint working = 0;
-
-		// This needs to be in scanning and working since scanning
-		// happens fast enough that it can be missed
-		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
-		if (status.queue.unique_id != 0 && index >= 0)
-		{
-			gchar working_icon[] = "hb-working0";
-			working_icon[10] = '0' + working;
-			working = (working+1) % 6;
-			treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-			store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-			gchar *path = g_strdup_printf ("%d", index);
-			if (gtk_tree_model_get_iter_from_string(
-					GTK_TREE_MODEL(store), &iter, path))
-			{
-				gtk_tree_store_set(store, &iter, 0, working_icon, -1);
-			}
-			g_free(path);
-		}
-		GtkLabel *label;
-		gchar *status_str;
-
-		status_str = working_status_string(ud, &status.queue);
-		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
-		gtk_label_set_text (label, status_str);
-		if (ghb_settings_get_boolean(ud->settings, "show_status"))
-		{
+            char * ai_status_str= g_strdup_printf(
+                "%.2f%%",
+                100.0 * status.queue.progress);
+            app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
+            g_free(ai_status_str);
+#endif
+        }
+        gtk_label_set_text (work_status, status_str);
+        gtk_progress_bar_set_fraction (progress, status.queue.progress);
+        g_free(status_str);
+    }
+    else if (status.queue.state & GHB_STATE_WORKING)
+    {
+        static gint working = 0;
+
+        // This needs to be in scanning and working since scanning
+        // happens fast enough that it can be missed
+        index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+        if (status.queue.unique_id != 0 && index >= 0)
+        {
+            gchar working_icon[] = "hb-working0";
+            working_icon[10] = '0' + working;
+            working = (working+1) % 6;
+            treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+            store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+            gchar *path = g_strdup_printf ("%d", index);
+            if (gtk_tree_model_get_iter_from_string(
+                    GTK_TREE_MODEL(store), &iter, path))
+            {
+                gtk_tree_store_set(store, &iter, 0, working_icon, -1);
+            }
+            g_free(path);
+        }
+        GtkLabel *label;
+        gchar *status_str;
+
+        status_str = working_status_string(ud, &status.queue);
+        label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+        gtk_label_set_text (label, status_str);
+        if (ghb_settings_get_boolean(ud->settings, "show_status"))
+        {
 #if defined(_USE_APP_IND)
-			char * ai_status_str= g_strdup_printf(
-				"%.2f%%",
-				100.0 * status.queue.progress);
-			app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
-			g_free(ai_status_str);
+            char * ai_status_str= g_strdup_printf(
+                "%.2f%%",
+                100.0 * status.queue.progress);
+            app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
+            g_free(ai_status_str);
 #else
 #if !GTK_CHECK_VERSION(2, 16, 0)
-			GtkStatusIcon *si;
+            GtkStatusIcon *si;
 
-			si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-			gtk_status_icon_set_tooltip(si, status_str);
+            si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+            gtk_status_icon_set_tooltip(si, status_str);
 #endif
 #endif
-		}
-		gtk_label_set_text (work_status, status_str);
-		gtk_progress_bar_set_fraction (progress, status.queue.progress);
-		g_free(status_str);
-	}
-	else if (status.queue.state & GHB_STATE_WORKDONE)
-	{
-		gint qstatus;
-
-		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
-		treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-		store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-		if (ud->cancel_encode == GHB_CANCEL_ALL || 
-			ud->cancel_encode == GHB_CANCEL_CURRENT)
-			status.queue.error = GHB_ERROR_CANCELED;
-		switch( status.queue.error )
-		{
-			case GHB_ERROR_NONE:
-				gtk_label_set_text (work_status, "Encode Done!");
-				qstatus = GHB_QUEUE_DONE;
-				if (js != NULL)
-				{
-					gchar *path = g_strdup_printf ("%d", index);
-					if (gtk_tree_model_get_iter_from_string(
-							GTK_TREE_MODEL(store), &iter, path))
-					{
-						gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
-					}
-					g_free(path);
-				}
-				break;
-			case GHB_ERROR_CANCELED:
-				gtk_label_set_text (work_status, "Encode Canceled.");
-				qstatus = GHB_QUEUE_CANCELED;
-				if (js != NULL)
-				{
-					gchar *path = g_strdup_printf ("%d", index);
-					if (gtk_tree_model_get_iter_from_string(
-							GTK_TREE_MODEL(store), &iter, path))
-					{
-						gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
-					}
-					g_free(path);
-				}
-				break;
-			default:
-				gtk_label_set_text (work_status, "Encode Failed.");
-				qstatus = GHB_QUEUE_CANCELED;
-				if (js != NULL)
-				{
-					gchar *path = g_strdup_printf ("%d", index);
-					if (gtk_tree_model_get_iter_from_string(
-							GTK_TREE_MODEL(store), &iter, path))
-					{
-						gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
-					}
-					g_free(path);
-				}
-		}
-		gtk_progress_bar_set_fraction (progress, 1.0);
-		ghb_clear_queue_state(GHB_STATE_WORKDONE);
-		if (ud->job_activity_log)
-			g_io_channel_unref(ud->job_activity_log);
-		ud->job_activity_log = NULL;
-		if (ud->cancel_encode != GHB_CANCEL_ALL &&
-			ud->cancel_encode != GHB_CANCEL_FINISH)
-		{
-			ud->current_job = ghb_start_next_job(ud, FALSE);
-		}
-		else
-		{
-			ghb_uninhibit_gsm();
-			ud->current_job = NULL;
-			gtk_widget_hide(GTK_WIDGET(progress));
-		}
-		if (js)
-			ghb_settings_set_int(js, "job_status", qstatus);
-		ghb_save_queue(ud->queue);
-		ud->cancel_encode = GHB_CANCEL_NONE;
+        }
+        gtk_label_set_text (work_status, status_str);
+        gtk_progress_bar_set_fraction (progress, status.queue.progress);
+        g_free(status_str);
+    }
+    else if (status.queue.state & GHB_STATE_WORKDONE)
+    {
+        gint qstatus;
+
+        index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+        treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+        store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+        if (ud->cancel_encode == GHB_CANCEL_ALL || 
+            ud->cancel_encode == GHB_CANCEL_CURRENT)
+            status.queue.error = GHB_ERROR_CANCELED;
+        switch( status.queue.error )
+        {
+            case GHB_ERROR_NONE:
+                gtk_label_set_text (work_status, "Encode Done!");
+                qstatus = GHB_QUEUE_DONE;
+                if (js != NULL)
+                {
+                    gchar *path = g_strdup_printf ("%d", index);
+                    if (gtk_tree_model_get_iter_from_string(
+                            GTK_TREE_MODEL(store), &iter, path))
+                    {
+                        gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
+                    }
+                    g_free(path);
+                }
+                break;
+            case GHB_ERROR_CANCELED:
+                gtk_label_set_text (work_status, "Encode Canceled.");
+                qstatus = GHB_QUEUE_CANCELED;
+                if (js != NULL)
+                {
+                    gchar *path = g_strdup_printf ("%d", index);
+                    if (gtk_tree_model_get_iter_from_string(
+                            GTK_TREE_MODEL(store), &iter, path))
+                    {
+                        gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
+                    }
+                    g_free(path);
+                }
+                break;
+            default:
+                gtk_label_set_text (work_status, "Encode Failed.");
+                qstatus = GHB_QUEUE_CANCELED;
+                if (js != NULL)
+                {
+                    gchar *path = g_strdup_printf ("%d", index);
+                    if (gtk_tree_model_get_iter_from_string(
+                            GTK_TREE_MODEL(store), &iter, path))
+                    {
+                        gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
+                    }
+                    g_free(path);
+                }
+        }
+        gtk_progress_bar_set_fraction (progress, 1.0);
+        ghb_clear_queue_state(GHB_STATE_WORKDONE);
+        if (ud->job_activity_log)
+            g_io_channel_unref(ud->job_activity_log);
+        ud->job_activity_log = NULL;
+        if (ud->cancel_encode != GHB_CANCEL_ALL &&
+            ud->cancel_encode != GHB_CANCEL_FINISH)
+        {
+            ud->current_job = ghb_start_next_job(ud, FALSE);
+        }
+        else
+        {
+            ghb_uninhibit_gsm();
+            ud->current_job = NULL;
+            gtk_widget_hide(GTK_WIDGET(progress));
+        }
+        if (js)
+            ghb_settings_set_int(js, "job_status", qstatus);
+        ghb_save_queue(ud->queue);
+        ud->cancel_encode = GHB_CANCEL_NONE;
 #if defined(_USE_APP_IND)
-		app_indicator_set_label( ud->ai, "", "99.99%");
+        app_indicator_set_label( ud->ai, "", "99.99%");
 #else
 #if !GTK_CHECK_VERSION(2, 16, 0)
-		GtkStatusIcon *si;
+        GtkStatusIcon *si;
 
-		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-		gtk_status_icon_set_tooltip(si, "HandBrake");
+        si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+        gtk_status_icon_set_tooltip(si, "HandBrake");
 #endif
 #endif
-	}
-	else if (status.queue.state & GHB_STATE_MUXING)
-	{
-		gtk_label_set_text (work_status, "Muxing: This may take a while...");
-	}
-
-	if (status.scan.state & GHB_STATE_WORKING)
-	{
-		GtkProgressBar *live_progress;
-		live_progress = GTK_PROGRESS_BAR(
-			GHB_WIDGET(ud->builder, "live_encode_progress"));
-		status_str = working_status_string(ud, &status.scan);
-		gtk_progress_bar_set_text (live_progress, status_str);
-		gtk_progress_bar_set_fraction (live_progress, status.scan.progress);
-		g_free(status_str);
-	}
-	if (status.scan.state & GHB_STATE_WORKDONE)
-	{
-		switch( status.scan.error )
-		{
-			case GHB_ERROR_NONE:
-			{
-				ghb_live_encode_done(ud, TRUE);
-			} break;
-			default:
-			{
-				ghb_live_encode_done(ud, FALSE);
-			} break;
-		}
-		ghb_clear_scan_state(GHB_STATE_WORKDONE);
-	}
+    }
+    else if (status.queue.state & GHB_STATE_MUXING)
+    {
+        gtk_label_set_text (work_status, "Muxing: This may take a while...");
+    }
+
+    if (status.scan.state & GHB_STATE_WORKING)
+    {
+        GtkProgressBar *live_progress;
+        live_progress = GTK_PROGRESS_BAR(
+            GHB_WIDGET(ud->builder, "live_encode_progress"));
+        status_str = working_status_string(ud, &status.scan);
+        gtk_progress_bar_set_text (live_progress, status_str);
+        gtk_progress_bar_set_fraction (live_progress, status.scan.progress);
+        g_free(status_str);
+    }
+    if (status.scan.state & GHB_STATE_WORKDONE)
+    {
+        switch( status.scan.error )
+        {
+            case GHB_ERROR_NONE:
+            {
+                ghb_live_encode_done(ud, TRUE);
+            } break;
+            default:
+            {
+                ghb_live_encode_done(ud, FALSE);
+            } break;
+        }
+        ghb_clear_scan_state(GHB_STATE_WORKDONE);
+    }
 }
 
 #if GTK_CHECK_VERSION(2, 16, 0)
 G_MODULE_EXPORT gboolean
 status_icon_query_tooltip_cb(
-	GtkStatusIcon *si,
-	gint           x,
-	gint           y,
-	gboolean       kbd_mode,
-	GtkTooltip    *tt,
-	signal_user_data_t *ud)
-{
-	ghb_status_t status;
-	gchar *status_str;
-
-	ghb_get_status(&status);
-	if (status.queue.state & GHB_STATE_WORKING)
-		status_str = working_status_string(ud, &status.queue);
-	else if (status.queue.state & GHB_STATE_SEARCHING)
-		status_str = searching_status_string(ud, &status.queue);
-	else if (status.queue.state & GHB_STATE_WORKDONE)
-		status_str = g_strdup("Encode Complete");
-	else
-		status_str = g_strdup("HandBrake");
-
-	gtk_tooltip_set_text(tt, status_str);
-	gtk_tooltip_set_icon_from_icon_name(tt, "hb-icon", GTK_ICON_SIZE_BUTTON);
-	g_free(status_str);
-	return TRUE;
+    GtkStatusIcon *si,
+    gint           x,
+    gint           y,
+    gboolean       kbd_mode,
+    GtkTooltip    *tt,
+    signal_user_data_t *ud)
+{
+    ghb_status_t status;
+    gchar *status_str;
+
+    ghb_get_status(&status);
+    if (status.queue.state & GHB_STATE_WORKING)
+        status_str = working_status_string(ud, &status.queue);
+    else if (status.queue.state & GHB_STATE_SEARCHING)
+        status_str = searching_status_string(ud, &status.queue);
+    else if (status.queue.state & GHB_STATE_WORKDONE)
+        status_str = g_strdup("Encode Complete");
+    else
+        status_str = g_strdup("HandBrake");
+
+    gtk_tooltip_set_text(tt, status_str);
+    gtk_tooltip_set_icon_from_icon_name(tt, "hb-icon", GTK_ICON_SIZE_BUTTON);
+    g_free(status_str);
+    return TRUE;
 }
 #endif
 
 G_MODULE_EXPORT gboolean
 ghb_timer_cb(gpointer data)
 {
-	signal_user_data_t *ud = (signal_user_data_t*)data;
+    signal_user_data_t *ud = (signal_user_data_t*)data;
 
-	ghb_live_preview_progress(ud);
-	ghb_backend_events(ud);
-	if (update_default_destination)
-	{
-		gchar *dest, *dest_dir, *def_dest;
-		dest = ghb_settings_get_string(ud->settings, "destination");
-		dest_dir = g_path_get_dirname (dest);
-		def_dest = ghb_settings_get_string(ud->settings, "destination_dir");
-		if (strcmp(dest_dir, def_dest) != 0)
-		{
-			ghb_settings_set_string (ud->settings, "destination_dir", dest_dir);
-			ghb_pref_save (ud->settings, "destination_dir");
-		}
-		g_free(dest);
-		g_free(dest_dir);
-		g_free(def_dest);
-		update_default_destination = FALSE;
-	}
-	if (update_preview)
-	{
-		g_debug("Updating preview\n");
-		ghb_set_preview_image (ud);
-		update_preview = FALSE;
-	}
+    ghb_live_preview_progress(ud);
+    ghb_backend_events(ud);
+    if (update_default_destination)
+    {
+        gchar *dest, *dest_dir, *def_dest;
+        dest = ghb_settings_get_string(ud->settings, "destination");
+        dest_dir = g_path_get_dirname (dest);
+        def_dest = ghb_settings_get_string(ud->settings, "destination_dir");
+        if (strcmp(dest_dir, def_dest) != 0)
+        {
+            ghb_settings_set_string (ud->settings, "destination_dir", dest_dir);
+            ghb_pref_save (ud->settings, "destination_dir");
+        }
+        g_free(dest);
+        g_free(dest_dir);
+        g_free(def_dest);
+        update_default_destination = FALSE;
+    }
+    if (update_preview)
+    {
+        g_debug("Updating preview\n");
+        ghb_set_preview_image (ud);
+        update_preview = FALSE;
+    }
 
 #if !defined(_NO_UPDATE_CHECK)
-	if (!appcast_busy)
-	{
-		gchar *updates;
-		updates = ghb_settings_get_string(ud->settings, "check_updates");
-		gint64 duration = 0;
-		if (strcmp(updates, "daily") == 0)
-			duration = 60 * 60 * 24;
-		else if (strcmp(updates, "weekly") == 0)
-			duration = 60 * 60 * 24 * 7;
-		else if (strcmp(updates, "monthly") == 0)
-			duration = 60 * 60 * 24 * 7;
-
-		g_free(updates);
-		if (duration != 0)
-		{
-			gint64 last;
-			time_t tt;
-
-			last = ghb_settings_get_int64(ud->settings, "last_update_check");
-			time(&tt);
-			if (last + duration < tt)
-			{
-				ghb_settings_set_int64(ud->settings, 
-										"last_update_check", tt);
-				ghb_pref_save(ud->settings, "last_update_check");
-				g_thread_create((GThreadFunc)ghb_check_update, ud, 
-								FALSE, NULL);
-			}
-		}
-	}
+    if (!appcast_busy)
+    {
+        gchar *updates;
+        updates = ghb_settings_get_string(ud->settings, "check_updates");
+        gint64 duration = 0;
+        if (strcmp(updates, "daily") == 0)
+            duration = 60 * 60 * 24;
+        else if (strcmp(updates, "weekly") == 0)
+            duration = 60 * 60 * 24 * 7;
+        else if (strcmp(updates, "monthly") == 0)
+            duration = 60 * 60 * 24 * 7;
+
+        g_free(updates);
+        if (duration != 0)
+        {
+            gint64 last;
+            time_t tt;
+
+            last = ghb_settings_get_int64(ud->settings, "last_update_check");
+            time(&tt);
+            if (last + duration < tt)
+            {
+                ghb_settings_set_int64(ud->settings, 
+                                        "last_update_check", tt);
+                ghb_pref_save(ud->settings, "last_update_check");
+                GHB_THREAD_NEW("Update Check", (GThreadFunc)ghb_check_update, ud);
+            }
+        }
+    }
 #endif
-	return TRUE;
+    return TRUE;
 }
 
 G_MODULE_EXPORT gboolean
 ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 {
-	gchar *text = NULL;
-	gsize length, outlength;
-	GtkTextView *textview;
-	GtkTextBuffer *buffer;
-	GtkTextIter iter;
-	GtkTextMark *mark;
-	GError *gerror = NULL;
-	GIOStatus status;
-	
-	signal_user_data_t *ud = (signal_user_data_t*)data;
-
-	status = g_io_channel_read_line (source, &text, &length, NULL, &gerror);
-	// Trim nils from end of text, they cause g_io_channel_write_chars to
-	// fail with an assertion that aborts
-	while (length > 0 && text[length-1] == 0)
-		length--;
-	if (text != NULL && length > 0)
-	{
-		GdkWindow *window;
-		gint width, height;
-		gint x, y;
-		gboolean bottom = FALSE;
-		gchar *utf8_text;
-
-		textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "activity_view"));
-		buffer = gtk_text_view_get_buffer (textview);
-		// I would like to auto-scroll the window when the scrollbar
-		// is at the bottom, 
-		// must determine whether the insert point is at
-		// the bottom of the window 
-		window = gtk_text_view_get_window(textview, GTK_TEXT_WINDOW_TEXT);
-		if (window != NULL)
-		{
-			gdk_drawable_get_size(GDK_DRAWABLE(window), &width, &height);
-			gtk_text_view_window_to_buffer_coords(textview, 
-				GTK_TEXT_WINDOW_TEXT, width, height, &x, &y);
-			gtk_text_view_get_iter_at_location(textview, &iter, x, y);
-			if (gtk_text_iter_is_end(&iter))
-			{
-				bottom = TRUE;
-			}
-		}
-		else
-		{
-			// If the window isn't available, assume bottom
-			bottom = TRUE;
-		}
-		gtk_text_buffer_get_end_iter(buffer, &iter);
-		utf8_text = g_convert_with_fallback(text, -1, "UTF-8", "ISO-8859-1",
-											"?", NULL, &length, NULL);
-		if (utf8_text != NULL)
-		{
-			gtk_text_buffer_insert(buffer, &iter, utf8_text, -1);
-			if (bottom)
-			{
-				gtk_text_buffer_get_end_iter(buffer, &iter);
-				mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
-				gtk_text_view_scroll_mark_onscreen(textview, mark);
-				gtk_text_buffer_delete_mark(buffer, mark);
-			}
+    gchar *text = NULL;
+    gsize length, outlength;
+    GtkTextView *textview;
+    GtkTextBuffer *buffer;
+    GtkTextIter iter;
+    GtkTextMark *mark;
+    GError *gerror = NULL;
+    GIOStatus status;
+    
+    signal_user_data_t *ud = (signal_user_data_t*)data;
+
+    status = g_io_channel_read_line (source, &text, &length, NULL, &gerror);
+    // Trim nils from end of text, they cause g_io_channel_write_chars to
+    // fail with an assertion that aborts
+    while (length > 0 && text[length-1] == 0)
+        length--;
+    if (text != NULL && length > 0)
+    {
+        GdkWindow *window;
+        gint width, height;
+        gint x, y;
+        gboolean bottom = FALSE;
+        gchar *utf8_text;
+
+        textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "activity_view"));
+        buffer = gtk_text_view_get_buffer (textview);
+        // I would like to auto-scroll the window when the scrollbar
+        // is at the bottom, 
+        // must determine whether the insert point is at
+        // the bottom of the window 
+        window = gtk_text_view_get_window(textview, GTK_TEXT_WINDOW_TEXT);
+        if (window != NULL)
+        {
+            width = gdk_window_get_width(window);
+            height = gdk_window_get_height(window);
+            gtk_text_view_window_to_buffer_coords(textview, 
+                GTK_TEXT_WINDOW_TEXT, width, height, &x, &y);
+            gtk_text_view_get_iter_at_location(textview, &iter, x, y);
+            if (gtk_text_iter_is_end(&iter))
+            {
+                bottom = TRUE;
+            }
+        }
+        else
+        {
+            // If the window isn't available, assume bottom
+            bottom = TRUE;
+        }
+        gtk_text_buffer_get_end_iter(buffer, &iter);
+        utf8_text = g_convert_with_fallback(text, -1, "UTF-8", "ISO-8859-1",
+                                            "?", NULL, &length, NULL);
+        if (utf8_text != NULL)
+        {
+            gtk_text_buffer_insert(buffer, &iter, utf8_text, -1);
+            if (bottom)
+            {
+                gtk_text_buffer_get_end_iter(buffer, &iter);
+                mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
+                gtk_text_view_scroll_mark_onscreen(textview, mark);
+                gtk_text_buffer_delete_mark(buffer, mark);
+            }
 #if defined(_WIN32)
-			gsize one = 1;
-			utf8_text[length-1] = '\r';
+            gsize one = 1;
+            utf8_text[length-1] = '\r';
 #endif
-			g_io_channel_write_chars (ud->activity_log, utf8_text, 
-									length, &outlength, NULL);
+            g_io_channel_write_chars (ud->activity_log, utf8_text, 
+                                    length, &outlength, NULL);
 #if defined(_WIN32)
-			g_io_channel_write_chars (ud->activity_log, "\n", 
-									one, &one, NULL);
+            g_io_channel_write_chars (ud->activity_log, "\n", 
+                                    one, &one, NULL);
 #endif
-			g_io_channel_flush(ud->activity_log, NULL);
-			if (ud->job_activity_log)
-			{
-				g_io_channel_write_chars (ud->job_activity_log, utf8_text, 
-										length, &outlength, NULL);
+            g_io_channel_flush(ud->activity_log, NULL);
+            if (ud->job_activity_log)
+            {
+                g_io_channel_write_chars (ud->job_activity_log, utf8_text, 
+                                        length, &outlength, NULL);
 #if defined(_WIN32)
-				g_io_channel_write_chars (ud->activity_log, "\n", 
-										one, &outlength, NULL);
+                g_io_channel_write_chars (ud->activity_log, "\n", 
+                                        one, &outlength, NULL);
 #endif
-				g_io_channel_flush(ud->job_activity_log, NULL);
-			}
-			g_free(utf8_text);
-		}
-	}
-	if (text != NULL)
-		g_free(text);
-
-	if (status != G_IO_STATUS_NORMAL)
-	{
-		// This should never happen, but if it does I would get into an
-		// infinite loop.  Returning false removes this callback.
-		g_warning("Error while reading activity from pipe");
-		if (gerror != NULL)
-		{
-			g_warning("%s", gerror->message);
-			g_error_free (gerror);
-		}
-		return FALSE;
-	}
-	if (gerror != NULL)
-		g_error_free (gerror);
-	return TRUE;
+                g_io_channel_flush(ud->job_activity_log, NULL);
+            }
+            g_free(utf8_text);
+        }
+    }
+    if (text != NULL)
+        g_free(text);
+
+    if (status != G_IO_STATUS_NORMAL)
+    {
+        // This should never happen, but if it does I would get into an
+        // infinite loop.  Returning false removes this callback.
+        g_warning("Error while reading activity from pipe");
+        if (gerror != NULL)
+        {
+            g_warning("%s", gerror->message);
+            g_error_free (gerror);
+        }
+        return FALSE;
+    }
+    if (gerror != NULL)
+        g_error_free (gerror);
+    return TRUE;
 }
 
 static void
 set_visible(GtkWidget *widget, gboolean visible)
 {
-	if (visible)
-	{
-		gtk_widget_show_now(widget);
-	}
-	else
-	{
-		gtk_widget_hide(widget);
-	}
+    if (visible)
+    {
+        gtk_widget_show_now(widget);
+    }
+    else
+    {
+        gtk_widget_hide(widget);
+    }
 }
 
 G_MODULE_EXPORT void
 show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
-	set_visible(widget, gtk_toggle_tool_button_get_active(
-						GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+    set_visible(widget, gtk_toggle_tool_button_get_active(
+                        GTK_TOGGLE_TOOL_BUTTON(xwidget)));
 }
 
 G_MODULE_EXPORT void
 show_activity_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
-	set_visible(widget, TRUE);
-	widget = GHB_WIDGET (ud->builder, "show_activity");
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+    set_visible(widget, TRUE);
+    widget = GHB_WIDGET (ud->builder, "show_activity");
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
 }
 
 G_MODULE_EXPORT gboolean
 activity_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
 {
-	set_visible(xwidget, FALSE);
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "show_activity");
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
-	return TRUE;
+    set_visible(xwidget, FALSE);
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "show_activity");
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+    return TRUE;
 }
 
 void
 ghb_log(gchar *log, ...)
 {
-	va_list args;
-	time_t _now;
+    va_list args;
+    time_t _now;
     struct tm *now;
-	gchar fmt[362];
+    gchar fmt[362];
 
-	_now = time(NULL);
-	now = localtime( &_now );
-	snprintf(fmt, 362, "[%02d:%02d:%02d] gtkgui: %s\n", 
-			now->tm_hour, now->tm_min, now->tm_sec, log);
-	va_start(args, log);
-	vfprintf(stderr, fmt, args);
-	va_end(args);
+    _now = time(NULL);
+    now = localtime( &_now );
+    snprintf(fmt, 362, "[%02d:%02d:%02d] gtkgui: %s\n", 
+            now->tm_hour, now->tm_min, now->tm_sec, log);
+    va_start(args, log);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
 }
 
 static void
 browse_url(const gchar *url)
 {
 #if defined(_WIN32)
-	HINSTANCE r;
-	r = ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+    HINSTANCE r;
+    r = ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
 #else
-	gboolean result;
-	char *argv[] = 
-		{"xdg-open",NULL,NULL,NULL};
-	argv[1] = (gchar*)url;
-	result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
-				NULL, NULL, NULL);
-	if (result) return;
-
-	argv[0] = "gnome-open";
-	result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
-				NULL, NULL, NULL);
-	if (result) return;
-
-	argv[0] = "kfmclient";
-	argv[1] = "exec";
-	argv[2] = "http://trac.handbrake.fr/wiki/HandBrakeGuide";
-	result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
-				NULL, NULL, NULL);
-	if (result) return;
-
-	argv[0] = "firefox";
-	argv[1] = "http://trac.handbrake.fr/wiki/HandBrakeGuide";
-	argv[2] = NULL;
-	result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
-				NULL, NULL, NULL);
+    gboolean result;
+    char *argv[] = 
+        {"xdg-open",NULL,NULL,NULL};
+    argv[1] = (gchar*)url;
+    result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
+                NULL, NULL, NULL);
+    if (result) return;
+
+    argv[0] = "gnome-open";
+    result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
+                NULL, NULL, NULL);
+    if (result) return;
+
+    argv[0] = "kfmclient";
+    argv[1] = "exec";
+    argv[2] = "http://trac.handbrake.fr/wiki/HandBrakeGuide";
+    result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
+                NULL, NULL, NULL);
+    if (result) return;
+
+    argv[0] = "firefox";
+    argv[1] = "http://trac.handbrake.fr/wiki/HandBrakeGuide";
+    argv[2] = NULL;
+    result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
+                NULL, NULL, NULL);
 #endif
 }
 
+#if 0
+    JJJ
 void
 about_web_hook(GtkAboutDialog *about, const gchar *link, gpointer data)
 {
-	browse_url(link);
+    browse_url(link);
 }
+#endif
 
 G_MODULE_EXPORT void
 about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
-	gchar *ver;
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
+    gchar *ver;
 
-	ver = g_strdup_printf("%s (%s)", HB_PROJECT_VERSION, HB_PROJECT_BUILD_ARCH);
-	gtk_about_dialog_set_url_hook(about_web_hook, NULL, NULL);
-	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ver);
-	g_free(ver);
-	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), 
-								HB_PROJECT_URL_WEBSITE);
-	gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget), 
-										HB_PROJECT_URL_WEBSITE);
-	gtk_widget_show (widget);
+    ver = g_strdup_printf("%s (%s)", HB_PROJECT_VERSION, HB_PROJECT_BUILD_ARCH);
+#if 0
+    JJJ
+    gtk_about_dialog_set_url_hook(about_web_hook, NULL, NULL);
+#endif
+    gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ver);
+    g_free(ver);
+    gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), 
+                                HB_PROJECT_URL_WEBSITE);
+    gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget), 
+                                        HB_PROJECT_URL_WEBSITE);
+    gtk_widget_show (widget);
 }
 
 G_MODULE_EXPORT void
 guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	browse_url("http://trac.handbrake.fr/wiki/HandBrakeGuide");
+    browse_url("http://trac.handbrake.fr/wiki/HandBrakeGuide");
 }
 
 G_MODULE_EXPORT void
 hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
 {
-	gtk_widget_hide (widget);
+    gtk_widget_hide (widget);
 }
 
 G_MODULE_EXPORT void
 show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
-	set_visible(widget, gtk_toggle_tool_button_get_active(
-						GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+    set_visible(widget, gtk_toggle_tool_button_get_active(
+                        GTK_TOGGLE_TOOL_BUTTON(xwidget)));
 }
 
 G_MODULE_EXPORT void
 show_queue_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
-	set_visible(widget, TRUE);
-	widget = GHB_WIDGET (ud->builder, "show_queue");
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+    set_visible(widget, TRUE);
+    widget = GHB_WIDGET (ud->builder, "show_queue");
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
 }
 
 G_MODULE_EXPORT gboolean
 queue_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
 {
-	set_visible(xwidget, FALSE);
-	GtkWidget *widget = GHB_WIDGET (ud->builder, "show_queue");
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
-	return TRUE;
+    set_visible(xwidget, FALSE);
+    GtkWidget *widget = GHB_WIDGET (ud->builder, "show_queue");
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+    return TRUE;
 }
 
 G_MODULE_EXPORT void
 show_presets_toggled_cb(GtkWidget *action, signal_user_data_t *ud)
 {
-	GtkWidget *widget;
-	GtkWindow *hb_window;
-	
-	g_debug("show_presets_clicked_cb ()");
-	widget = GHB_WIDGET (ud->builder, "presets_frame");
-	ghb_widget_to_setting(ud->settings, action);
-	if (ghb_settings_get_boolean(ud->settings, "show_presets"))
-	{
-		gtk_widget_show_now(widget);
-	}
-	else
-	{
-		gtk_widget_hide(widget);
-		hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
-		gtk_window_resize(hb_window, 16, 16);
-	}
-	ghb_pref_save(ud->settings, "show_presets");
+    GtkWidget *widget;
+    GtkWindow *hb_window;
+    
+    g_debug("show_presets_clicked_cb ()");
+    widget = GHB_WIDGET (ud->builder, "presets_frame");
+    ghb_widget_to_setting(ud->settings, action);
+    if (ghb_settings_get_boolean(ud->settings, "show_presets"))
+    {
+        gtk_widget_show_now(widget);
+    }
+    else
+    {
+        gtk_widget_hide(widget);
+        hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
+        gtk_window_resize(hb_window, 16, 16);
+    }
+    ghb_pref_save(ud->settings, "show_presets");
 }
 
 static void
 reset_chapter_list(signal_user_data_t *ud, GValue *settings)
 {
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gboolean done;
-	GValue *chapters;
-	gint titleindex, ii;
-	gint count;
-	
-	g_debug("reset_chapter_list ()");
-	chapters = ghb_value_dup(ghb_settings_get_value(settings, "chapter_list"));
-	count = ghb_array_len(chapters);
-	ghb_settings_set_value(ud->settings, "chapter_list", chapters);
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-	ii = 0;
-	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
-	{
-		do
-		{
-
-			if (ii < count)
-			{
-				gchar *chapter, *duration;
-				gint hh, mm, ss;
-
-				// Update row with settings data
-				g_debug("Updating row");
-				chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
-				ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
-				duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
-				gtk_list_store_set(store, &iter, 
-					0, ii+1,
-					1, duration,
-					2, chapter,
-					3, TRUE,
-					-1);
-				g_free(chapter);
-				g_free(duration);
-				ii++;
-				done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-			}
-			else
-			{
-				// No more settings data, remove row
-				g_debug("Removing row");
-				done = !gtk_list_store_remove(store, &iter);
-			}
-		} while (!done);
-	}
-	while (ii < count)
-	{
-		gchar *chapter, *duration;
-		gint hh, mm, ss;
-
-		// Additional settings, add row
-		g_debug("Adding row");
-		chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
-		ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
-		duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-			0, ii+1,
-			1, duration,
-			2, chapter,
-			3, TRUE,
-			-1);
-		g_free(chapter);
-		g_free(duration);
-		ii++;
-	}
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gboolean done;
+    GValue *chapters;
+    gint titleindex, ii;
+    gint count;
+    
+    g_debug("reset_chapter_list ()");
+    chapters = ghb_value_dup(ghb_settings_get_value(settings, "chapter_list"));
+    count = ghb_array_len(chapters);
+    ghb_settings_set_value(ud->settings, "chapter_list", chapters);
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+    
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+    ii = 0;
+    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+    {
+        do
+        {
+
+            if (ii < count)
+            {
+                gchar *chapter, *duration;
+                gint hh, mm, ss;
+
+                // Update row with settings data
+                g_debug("Updating row");
+                chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+                ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+                duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+                gtk_list_store_set(store, &iter, 
+                    0, ii+1,
+                    1, duration,
+                    2, chapter,
+                    3, TRUE,
+                    -1);
+                g_free(chapter);
+                g_free(duration);
+                ii++;
+                done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+            }
+            else
+            {
+                // No more settings data, remove row
+                g_debug("Removing row");
+                done = !gtk_list_store_remove(store, &iter);
+            }
+        } while (!done);
+    }
+    while (ii < count)
+    {
+        gchar *chapter, *duration;
+        gint hh, mm, ss;
+
+        // Additional settings, add row
+        g_debug("Adding row");
+        chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+        ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+        duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+            0, ii+1,
+            1, duration,
+            2, chapter,
+            3, TRUE,
+            -1);
+        g_free(chapter);
+        g_free(duration);
+        ii++;
+    }
 }
 
 static void
 update_chapter_list_settings(GValue *settings)
 {
-	GValue *chapters;
-	gint titleindex;
-	
-	g_debug("update_chapter_list_settings ()");
-	titleindex = ghb_settings_get_int(settings, "title_no");
-	chapters = ghb_get_chapters(titleindex);
-	if (chapters)
-		ghb_settings_set_value(settings, "chapter_list", chapters);
+    GValue *chapters;
+    gint titleindex;
+    
+    g_debug("update_chapter_list_settings ()");
+    titleindex = ghb_settings_get_int(settings, "title_no");
+    chapters = ghb_get_chapters(titleindex);
+    if (chapters)
+        ghb_settings_set_value(settings, "chapter_list", chapters);
 }
 
 static void
 update_chapter_list_from_settings(GtkBuilder *builder, GValue *settings)
 {
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gboolean done;
-	GValue *chapters;
-	gint titleindex, ii;
-	gint count;
-	
-	g_debug("update_chapter_list ()");
-	titleindex = ghb_settings_get_int(settings, "title_no");
-	chapters = ghb_settings_get_value(settings, "chapter_list");
-	count = ghb_array_len(chapters);
-	
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "chapters_list"));
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-	ii = 0;
-	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
-	{
-		do
-		{
-
-			if (ii < count)
-			{
-				gchar *chapter, *duration;
-				gint hh, mm, ss;
-
-				// Update row with settings data
-				g_debug("Updating row");
-				chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
-				ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
-				duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
-				gtk_list_store_set(store, &iter, 
-					0, ii+1,
-					1, duration,
-					2, chapter,
-					3, TRUE,
-					-1);
-				g_free(chapter);
-				g_free(duration);
-				ii++;
-				done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-			}
-			else
-			{
-				// No more settings data, remove row
-				g_debug("Removing row");
-				done = !gtk_list_store_remove(store, &iter);
-			}
-		} while (!done);
-	}
-	while (ii < count)
-	{
-		gchar *chapter, *duration;
-		gint hh, mm, ss;
-
-		// Additional settings, add row
-		g_debug("Adding row");
-		chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
-		ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
-		duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-			0, ii+1,
-			1, duration,
-			2, chapter,
-			3, TRUE,
-			-1);
-		g_free(chapter);
-		g_free(duration);
-		ii++;
-	}
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gboolean done;
+    GValue *chapters;
+    gint titleindex, ii;
+    gint count;
+    
+    g_debug("update_chapter_list ()");
+    titleindex = ghb_settings_get_int(settings, "title_no");
+    chapters = ghb_settings_get_value(settings, "chapter_list");
+    count = ghb_array_len(chapters);
+    
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "chapters_list"));
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+    ii = 0;
+    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+    {
+        do
+        {
+
+            if (ii < count)
+            {
+                gchar *chapter, *duration;
+                gint hh, mm, ss;
+
+                // Update row with settings data
+                g_debug("Updating row");
+                chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+                ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+                duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+                gtk_list_store_set(store, &iter, 
+                    0, ii+1,
+                    1, duration,
+                    2, chapter,
+                    3, TRUE,
+                    -1);
+                g_free(chapter);
+                g_free(duration);
+                ii++;
+                done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+            }
+            else
+            {
+                // No more settings data, remove row
+                g_debug("Removing row");
+                done = !gtk_list_store_remove(store, &iter);
+            }
+        } while (!done);
+    }
+    while (ii < count)
+    {
+        gchar *chapter, *duration;
+        gint hh, mm, ss;
+
+        // Additional settings, add row
+        g_debug("Adding row");
+        chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+        ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+        duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+            0, ii+1,
+            1, duration,
+            2, chapter,
+            3, TRUE,
+            -1);
+        g_free(chapter);
+        g_free(duration);
+        ii++;
+    }
 }
 
 static gint chapter_edit_key = 0;
 
 G_MODULE_EXPORT gboolean
 chapter_keypress_cb(
-	GhbCellRendererText *cell,
-	GdkEventKey *event,
-	signal_user_data_t *ud)
+    GhbCellRendererText *cell,
+    GdkEventKey *event,
+    signal_user_data_t *ud)
 {
-	chapter_edit_key = event->keyval;
-	return FALSE;
+    chapter_edit_key = event->keyval;
+    return FALSE;
 }
 
 G_MODULE_EXPORT void
 chapter_edited_cb(
-	GhbCellRendererText *cell, 
-	gchar *path, 
-	gchar *text, 
-	signal_user_data_t *ud)
-{
-	GtkTreePath *treepath;
-	GtkListStore *store;
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	gint index;
-	gint *pi;
-	gint row;
-	
-	g_debug("chapter_edited_cb ()");
-	g_debug("path (%s)", path);
-	g_debug("text (%s)", text);
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-	treepath = gtk_tree_path_new_from_string (path);
-	pi = gtk_tree_path_get_indices(treepath);
-	row = pi[0];
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
-	gtk_list_store_set(store, &iter, 
-		2, text,
-		3, TRUE,
-		-1);
-	gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &index, -1);
-
-	const GValue *chapters;
-	GValue *chapter;
-
-	chapters = ghb_settings_get_value(ud->settings, "chapter_list");
-	chapter = ghb_array_get_nth(chapters, index-1);
-	g_value_set_string(chapter, text);
-	if ((chapter_edit_key == GDK_KEY_Return || chapter_edit_key == GDK_KEY_Down) &&
-		gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter))
-	{
-		GtkTreeViewColumn *column;
-
-		gtk_tree_path_next(treepath);
-		// When a cell has been edited, I want to advance to the
-		// next cell and start editing it automaitcally.
-		// Unfortunately, we may not be in a state here where
-		// editing is allowed.  This happens when the user selects
-		// a new cell with the mouse instead of just hitting enter.
-		// Some kind of Gtk quirk.  widget_editable==NULL assertion.
-		// Editing is enabled again once the selection event has been
-		// processed.  So I'm queueing up a callback to be called
-		// when things go idle.  There, I will advance to the next
-		// cell and initiate editing.
-		//
-		// Now, you might be asking why I don't catch the keypress
-		// event and determine what action to take based on that.
-		// The Gtk developers in their infinite wisdom have made the 
-		// actual GtkEdit widget being used a private member of
-		// GtkCellRendererText, so it can not be accessed to hang a
-		// signal handler off of.  And they also do not propagate the
-		// keypress signals in any other way.  So that information is lost.
-		//g_idle_add((GSourceFunc)next_cell, ud);
-		//
-		// Keeping the above comment for posterity.
-		// I got industrious and made my own CellTextRendererText that
-		// passes on the key-press-event. So now I have much better
-		// control of this.
-		column = gtk_tree_view_get_column(treeview, 2);
-		gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
-	}
-	else if (chapter_edit_key == GDK_KEY_Up && row > 0)
-	{
-		GtkTreeViewColumn *column;
-		gtk_tree_path_prev(treepath);
-		column = gtk_tree_view_get_column(treeview, 2);
-		gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
-	}
-	gtk_tree_path_free (treepath);
+    GhbCellRendererText *cell, 
+    gchar *path, 
+    gchar *text, 
+    signal_user_data_t *ud)
+{
+    GtkTreePath *treepath;
+    GtkListStore *store;
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    gint index;
+    gint *pi;
+    gint row;
+    
+    g_debug("chapter_edited_cb ()");
+    g_debug("path (%s)", path);
+    g_debug("text (%s)", text);
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+    treepath = gtk_tree_path_new_from_string (path);
+    pi = gtk_tree_path_get_indices(treepath);
+    row = pi[0];
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
+    gtk_list_store_set(store, &iter, 
+        2, text,
+        3, TRUE,
+        -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &index, -1);
+
+    const GValue *chapters;
+    GValue *chapter;
+
+    chapters = ghb_settings_get_value(ud->settings, "chapter_list");
+    chapter = ghb_array_get_nth(chapters, index-1);
+    g_value_set_string(chapter, text);
+    if ((chapter_edit_key == GDK_KEY_Return || chapter_edit_key == GDK_KEY_Down) &&
+        gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter))
+    {
+        GtkTreeViewColumn *column;
+
+        gtk_tree_path_next(treepath);
+        // When a cell has been edited, I want to advance to the
+        // next cell and start editing it automaitcally.
+        // Unfortunately, we may not be in a state here where
+        // editing is allowed.  This happens when the user selects
+        // a new cell with the mouse instead of just hitting enter.
+        // Some kind of Gtk quirk.  widget_editable==NULL assertion.
+        // Editing is enabled again once the selection event has been
+        // processed.  So I'm queueing up a callback to be called
+        // when things go idle.  There, I will advance to the next
+        // cell and initiate editing.
+        //
+        // Now, you might be asking why I don't catch the keypress
+        // event and determine what action to take based on that.
+        // The Gtk developers in their infinite wisdom have made the 
+        // actual GtkEdit widget being used a private member of
+        // GtkCellRendererText, so it can not be accessed to hang a
+        // signal handler off of.  And they also do not propagate the
+        // keypress signals in any other way.  So that information is lost.
+        //g_idle_add((GSourceFunc)next_cell, ud);
+        //
+        // Keeping the above comment for posterity.
+        // I got industrious and made my own CellTextRendererText that
+        // passes on the key-press-event. So now I have much better
+        // control of this.
+        column = gtk_tree_view_get_column(treeview, 2);
+        gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
+    }
+    else if (chapter_edit_key == GDK_KEY_Up && row > 0)
+    {
+        GtkTreeViewColumn *column;
+        gtk_tree_path_prev(treepath);
+        column = gtk_tree_view_get_column(treeview, 2);
+        gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
+    }
+    gtk_tree_path_free (treepath);
 }
 
 void
 debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
-	signal_user_data_t *ud = (signal_user_data_t*)data;
-	
-	if (ud->debug)
-	{
-		printf("%s: %s\n", domain, msg);
-	}
+    signal_user_data_t *ud = (signal_user_data_t*)data;
+    
+    if (ud->debug)
+    {
+        printf("%s: %s\n", domain, msg);
+    }
 }
 
 void
 warn_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
-	printf("%s: %s\n", domain, msg);
+    printf("%s: %s\n", domain, msg);
 }
 
 void
 ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
 {
-	GtkWidget *widget;
-	g_debug("ghb_hbfd");
-	widget = GHB_WIDGET(ud->builder, "queue_pause1");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "queue_add");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "show_queue");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "show_activity");
-	set_visible(widget, !hbfd);
-
-	widget = GHB_WIDGET(ud->builder, "chapter_box");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "container_box");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "settings_box");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "presets_save");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET(ud->builder, "presets_remove");
-	set_visible(widget, !hbfd);
-	widget = GHB_WIDGET (ud->builder, "hb_window");
-	gtk_window_resize(GTK_WINDOW(widget), 16, 16);
+    GtkWidget *widget;
+    g_debug("ghb_hbfd");
+    widget = GHB_WIDGET(ud->builder, "queue_pause1");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "queue_add");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "show_queue");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "show_activity");
+    set_visible(widget, !hbfd);
+
+    widget = GHB_WIDGET(ud->builder, "chapter_box");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "container_box");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "SettingsNotebook");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "presets_save");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET(ud->builder, "presets_remove");
+    set_visible(widget, !hbfd);
+    widget = GHB_WIDGET (ud->builder, "hb_window");
+    gtk_window_resize(GTK_WINDOW(widget), 16, 16);
 
 }
 
 G_MODULE_EXPORT void
 hbfd_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("hbfd_toggled_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd");
-	ghb_hbfd(ud, hbfd);
-	ghb_pref_save(ud->settings, "hbfd");
+    g_debug("hbfd_toggled_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd");
+    ghb_hbfd(ud, hbfd);
+    ghb_pref_save(ud->settings, "hbfd");
 }
 
 G_MODULE_EXPORT void
 advanced_audio_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("advanced_audio_changed_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
-	ghb_show_hide_advanced_audio( ud );
+    g_debug("advanced_audio_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
+    ghb_show_hide_advanced_audio( ud );
+}
+
+G_MODULE_EXPORT void
+advanced_video_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+    g_debug("advanced_video_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
+    ghb_show_hide_advanced_video( ud );
 }
 
 G_MODULE_EXPORT void
 pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("pref_changed_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
+    g_debug("pref_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
 }
 
 G_MODULE_EXPORT void
 use_m4v_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("use_m4v_changed_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
-	ghb_update_destination_extension(ud);
+    g_debug("use_m4v_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
+    ghb_update_destination_extension(ud);
 }
 
 G_MODULE_EXPORT void
 show_status_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("show_status_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
+    g_debug("show_status_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
 
 #if defined(_USE_APP_IND)
     if (ud->ai)
@@ -3775,122 +3894,123 @@
         }
     }
 #else
-	GtkStatusIcon *si;
+    GtkStatusIcon *si;
 
-	si = GTK_STATUS_ICON(GHB_OBJECT (ud->builder, "hb_status"));
-	gtk_status_icon_set_visible(si,
-			ghb_settings_get_boolean(ud->settings, "show_status"));
+    si = GTK_STATUS_ICON(GHB_OBJECT (ud->builder, "hb_status"));
+    gtk_status_icon_set_visible(si,
+            ghb_settings_get_boolean(ud->settings, "show_status"));
 #endif
 }
 
 G_MODULE_EXPORT void
 vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("vqual_granularity_changed_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
-
-	gdouble vqmin, vqmax, step, page;
-	gboolean inverted;
-	gint digits;
-
-	ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
-	GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
-	gtk_range_set_increments (GTK_RANGE(qp), step, page);
+    g_debug("vqual_granularity_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
+
+    gdouble vqmin, vqmax, step, page;
+    gboolean inverted;
+    gint digits;
+
+    ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+    GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
+    gtk_range_set_increments (GTK_RANGE(qp), step, page);
+    gtk_scale_set_digits(GTK_SCALE(qp), digits);
 }
 
 G_MODULE_EXPORT void
 tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("tweaks_changed_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
+    g_debug("tweaks_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
 }
 
 G_MODULE_EXPORT void
 hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("hbfd_feature_changed_cb");
-	ghb_widget_to_setting (ud->settings, widget);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
-
-	gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd_feature");
-	GtkAction *action;
-	if (hbfd)
-	{
-		const GValue *val;
-		val = ghb_settings_get_value(ud->settings, "hbfd");
-		ghb_ui_update(ud, "hbfd", val);
-	}
-	action = GHB_ACTION (ud->builder, "hbfd");
-	gtk_action_set_visible(action, hbfd);
+    g_debug("hbfd_feature_changed_cb");
+    ghb_widget_to_setting (ud->settings, widget);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
+
+    gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd_feature");
+    GtkAction *action;
+    if (hbfd)
+    {
+        const GValue *val;
+        val = ghb_settings_get_value(ud->settings, "hbfd");
+        ghb_ui_update(ud, "hbfd", val);
+    }
+    action = GHB_ACTION (ud->builder, "hbfd");
+    gtk_action_set_visible(action, hbfd);
 }
 
 gboolean
 ghb_file_menu_add_dvd(signal_user_data_t *ud)
 {
-	GList *link, *drives;
-	static GtkActionGroup *agroup = NULL;
-	static gint merge_id;
-
-	g_debug("ghb_file_menu_add_dvd()");
-	link = drives = dvd_device_list();
-	if (drives != NULL)
-	{
-		GtkUIManager *ui = GTK_UI_MANAGER(
-			gtk_builder_get_object(ud->builder, "uimanager1"));
-
-		if (agroup == NULL)
-		{
-			agroup = gtk_action_group_new("dvdgroup");
-			gtk_ui_manager_insert_action_group(ui, agroup, 0);
-		}
-		else
-			gtk_ui_manager_remove_ui(ui, merge_id);
-
-		merge_id = gtk_ui_manager_new_merge_id(ui);
-		// Add separator
-		gtk_ui_manager_add_ui(ui, merge_id, 
-			"ui/menubar1/menuitem1/quit1", "dvdsep", NULL,
-			GTK_UI_MANAGER_SEPARATOR, TRUE);
-
-		while (link != NULL)
-		{
-			GtkAction *action;
-			gchar *drive = get_dvd_device_name(link->data);
-			gchar *name = get_dvd_volume_name(link->data);
-		
-			action = gtk_action_group_get_action(agroup, drive);
-			if (action != NULL)
-			{
-				gtk_action_group_remove_action(agroup, action);
-				g_object_unref(G_OBJECT(action));
-			}
-			// Create action for this drive
-			action = gtk_action_new(drive, name,
-				"Scan this DVD source", "gtk-cdrom");
-			// Add action to action group
-			gtk_action_group_add_action_with_accel(agroup, action, NULL);
-			// Add to ui manager
-			gtk_ui_manager_add_ui(ui, merge_id, 
-				"ui/menubar1/menuitem1/dvdsep", drive, drive,
-				GTK_UI_MANAGER_AUTO, TRUE);
-			// Connect signal to action (menu item)
-			g_signal_connect(action, "activate", 
-				(GCallback)dvd_source_activate_cb, ud);
-			g_free(name);
-			g_free(drive);
-			free_drive(link->data);
-			link = link->next;
-		}
-		g_list_free(drives);
-	}
-	return FALSE;
+    GList *link, *drives;
+    static GtkActionGroup *agroup = NULL;
+    static gint merge_id;
+
+    g_debug("ghb_file_menu_add_dvd()");
+    link = drives = dvd_device_list();
+    if (drives != NULL)
+    {
+        GtkUIManager *ui = GTK_UI_MANAGER(
+            gtk_builder_get_object(ud->builder, "uimanager1"));
+
+        if (agroup == NULL)
+        {
+            agroup = gtk_action_group_new("dvdgroup");
+            gtk_ui_manager_insert_action_group(ui, agroup, 0);
+        }
+        else
+            gtk_ui_manager_remove_ui(ui, merge_id);
+
+        merge_id = gtk_ui_manager_new_merge_id(ui);
+        // Add separator
+        gtk_ui_manager_add_ui(ui, merge_id, 
+            "ui/menubar1/menuitem1/quit1", "dvdsep", NULL,
+            GTK_UI_MANAGER_SEPARATOR, TRUE);
+
+        while (link != NULL)
+        {
+            GtkAction *action;
+            gchar *drive = get_dvd_device_name(link->data);
+            gchar *name = get_dvd_volume_name(link->data);
+        
+            action = gtk_action_group_get_action(agroup, drive);
+            if (action != NULL)
+            {
+                gtk_action_group_remove_action(agroup, action);
+                g_object_unref(G_OBJECT(action));
+            }
+            // Create action for this drive
+            action = gtk_action_new(drive, name,
+                "Scan this DVD source", "gtk-cdrom");
+            // Add action to action group
+            gtk_action_group_add_action_with_accel(agroup, action, NULL);
+            // Add to ui manager
+            gtk_ui_manager_add_ui(ui, merge_id, 
+                "ui/menubar1/menuitem1/dvdsep", drive, drive,
+                GTK_UI_MANAGER_AUTO, TRUE);
+            // Connect signal to action (menu item)
+            g_signal_connect(action, "activate", 
+                (GCallback)dvd_source_activate_cb, ud);
+            g_free(name);
+            g_free(drive);
+            free_drive(link->data);
+            link = link->next;
+        }
+        g_list_free(drives);
+    }
+    return FALSE;
 }
 
 gboolean ghb_is_cd(GDrive *gd);
@@ -3898,54 +4018,54 @@
 static GList*
 dvd_device_list()
 {
-	GList *dvd_devices = NULL;
+    GList *dvd_devices = NULL;
 
 #if defined(_WIN32)
-	gint ii, drives;
-	gchar drive[5];
+    gint ii, drives;
+    gchar drive[5];
+
+    strcpy(drive, "A:" G_DIR_SEPARATOR_S);
+    drives = GetLogicalDrives();
+    for (ii = 0; ii < 26; ii++)
+    {
+        if (drives & 0x01)
+        {
+            guint dtype;
 
-	strcpy(drive, "A:" G_DIR_SEPARATOR_S);
-	drives = GetLogicalDrives();
-	for (ii = 0; ii < 26; ii++)
-	{
-		if (drives & 0x01)
-		{
-			guint dtype;
-
-			drive[0] = 'A' + ii;
-			dtype = GetDriveType(drive);
-			if (dtype == DRIVE_CDROM)
-			{
-				dvd_devices = g_list_append(dvd_devices, 
-						(gpointer)g_strdup(drive));
-			}
-		}
-		drives >>= 1;
-	}
+            drive[0] = 'A' + ii;
+            dtype = GetDriveType(drive);
+            if (dtype == DRIVE_CDROM)
+            {
+                dvd_devices = g_list_append(dvd_devices, 
+                        (gpointer)g_strdup(drive));
+            }
+        }
+        drives >>= 1;
+    }
 #else
-	GVolumeMonitor *gvm;
-	GList *drives, *link;
-	
-	gvm = g_volume_monitor_get ();
-	drives = g_volume_monitor_get_connected_drives (gvm);
-	link = drives;
-	while (link != NULL)
-	{
-		GDrive *gd;
-		
-		gd = (GDrive*)link->data;
-		if (ghb_is_cd(gd))
-		{
-			dvd_devices = g_list_append(dvd_devices, gd);
-		}
-		else
-			g_object_unref (gd);
-		link = link->next;
-	}
-	g_list_free(drives);
+    GVolumeMonitor *gvm;
+    GList *drives, *link;
+    
+    gvm = g_volume_monitor_get ();
+    drives = g_volume_monitor_get_connected_drives (gvm);
+    link = drives;
+    while (link != NULL)
+    {
+        GDrive *gd;
+        
+        gd = (GDrive*)link->data;
+        if (ghb_is_cd(gd))
+        {
+            dvd_devices = g_list_append(dvd_devices, gd);
+        }
+        else
+            g_object_unref (gd);
+        link = link->next;
+    }
+    g_list_free(drives);
 #endif
 
-	return dvd_devices;
+    return dvd_devices;
 }
 
 #if defined(__linux__)
@@ -3956,33 +4076,33 @@
 ghb_is_cd(GDrive *gd)
 {
 #if defined(__linux__)
-	gchar *device;
-	GUdevDevice *udd;
+    gchar *device;
+    GUdevDevice *udd;
 
-	if (udev_ctx == NULL)
-		return FALSE;
+    if (udev_ctx == NULL)
+        return FALSE;
 
-	device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-	if (device == NULL)
-		return FALSE;
-
-	udd = g_udev_client_query_by_device_file(udev_ctx, device);
-	g_free(device);
-
-	if (udd == NULL)
-	{
-		g_message("udev: Failed to lookup device %s", device);
-		return FALSE;
-	}
-
-	gint val;
-	val = g_udev_device_get_property_as_int(udd, "ID_CDROM_DVD");
-	if (val == 1)
-		return TRUE;
+    device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+    if (device == NULL)
+        return FALSE;
 
-	return FALSE;
+    udd = g_udev_client_query_by_device_file(udev_ctx, device);
+    g_free(device);
+
+    if (udd == NULL)
+    {
+        g_message("udev: Failed to lookup device %s", device);
+        return FALSE;
+    }
+
+    gint val;
+    val = g_udev_device_get_property_as_int(udd, "ID_CDROM_DVD");
+    if (val == 1)
+        return TRUE;
+
+    return FALSE;
 #else
-	return FALSE;
+    return FALSE;
 #endif
 }
 
@@ -3990,7 +4110,7 @@
 ghb_udev_init()
 {
 #if defined(__linux__)
-	udev_ctx = g_udev_client_new(NULL);
+    udev_ctx = g_udev_client_new(NULL);
 #endif
 }
 
@@ -3998,106 +4118,108 @@
 static void
 handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud)
 {
-	guint dtype;
-	static gint ins_count = 0;
-	static gint rem_count = 0;
-
-	// The media change event in windows bounces around a bit
-	// so I debounce it here
-	// DVD insertion detected.  Scan it.
-	dtype = GetDriveType(device);
-	if (dtype != DRIVE_CDROM)
-		return;
-	if (insert)
-	{
-		rem_count = 0;
-		ins_count++;
-		if (ins_count == 2)
-		{
-			g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
-			if (ghb_settings_get_boolean(ud->settings, "AutoScan") &&
-				ud->current_dvd_device != NULL &&
-				strcmp(device, ud->current_dvd_device) == 0)
-			{
-				show_scan_progress(ud);
-				update_source_label(ud, device, TRUE);
-				gint preview_count;
-				preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-				ghb_settings_set_string(ud->settings, "scan_source", device);
-				start_scan(ud, device, 0, preview_count);
-			}
-		}
-	}
-	else
-	{
-		ins_count = 0;
-		rem_count++;
-		if (rem_count == 2)
-		{
-			g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
-			if (ud->current_dvd_device != NULL &&
-				strcmp(device, ud->current_dvd_device) == 0)
-			{
-				ghb_hb_cleanup(TRUE);
-				prune_logs(ud);
-				ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
-				start_scan(ud, "/dev/null", 0, 1);
-			}
-		}
-	}
+    guint dtype;
+    static gint ins_count = 0;
+    static gint rem_count = 0;
+
+    // The media change event in windows bounces around a bit
+    // so I debounce it here
+    // DVD insertion detected.  Scan it.
+    dtype = GetDriveType(device);
+    if (dtype != DRIVE_CDROM)
+        return;
+    if (insert)
+    {
+        rem_count = 0;
+        ins_count++;
+        if (ins_count == 2)
+        {
+            GHB_THREAD_NEW("Cache Volume Names",
+                    (GThreadFunc)ghb_cache_volnames, ud);
+            if (ghb_settings_get_boolean(ud->settings, "AutoScan") &&
+                ud->current_dvd_device != NULL &&
+                strcmp(device, ud->current_dvd_device) == 0)
+            {
+                show_scan_progress(ud);
+                update_source_label(ud, device, TRUE);
+                gint preview_count;
+                preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                ghb_settings_set_string(ud->settings, "scan_source", device);
+                start_scan(ud, device, 0, preview_count);
+            }
+        }
+    }
+    else
+    {
+        ins_count = 0;
+        rem_count++;
+        if (rem_count == 2)
+        {
+            GHB_THREAD_NEW("Cache Volume Names",
+                    (GThreadFunc)ghb_cache_volnames, ud);
+            if (ud->current_dvd_device != NULL &&
+                strcmp(device, ud->current_dvd_device) == 0)
+            {
+                ghb_hb_cleanup(TRUE);
+                prune_logs(ud);
+                ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
+                start_scan(ud, "/dev/null", 0, 1);
+            }
+        }
+    }
 }
 
 static gchar
 FindDriveFromMask(ULONG unitmask)
 {
-	gchar cc;
-	for (cc = 0; cc < 26; cc++)
-	{
-		if (unitmask & 0x01)
-			return 'A' + cc;
-		unitmask >>= 1;
-	}
-	return 0;
+    gchar cc;
+    for (cc = 0; cc < 26; cc++)
+    {
+        if (unitmask & 0x01)
+            return 'A' + cc;
+        unitmask >>= 1;
+    }
+    return 0;
 }
 
 void
 wm_drive_changed(MSG *msg, signal_user_data_t *ud)
 {
-	PDEV_BROADCAST_HDR bch = (PDEV_BROADCAST_HDR)msg->lParam;
-	gchar drive[4];
+    PDEV_BROADCAST_HDR bch = (PDEV_BROADCAST_HDR)msg->lParam;
+    gchar drive[4];
 
-	g_strlcpy(drive, "A:" G_DIR_SEPARATOR_S, 4);
-	switch (msg->wParam)
-	{
-		case DBT_DEVICEARRIVAL:
-		{
-			if (bch->dbch_devicetype == DBT_DEVTYP_VOLUME)
-			{
-				PDEV_BROADCAST_VOLUME bcv = (PDEV_BROADCAST_VOLUME)bch;
-
-				if (bcv->dbcv_flags & DBTF_MEDIA)
-				{
-					drive[0] = FindDriveFromMask(bcv->dbcv_unitmask);
-					handle_media_change(drive, TRUE, ud);
-				}
-			}
-		} break;
-
-		case DBT_DEVICEREMOVECOMPLETE:
-		{
-			if (bch->dbch_devicetype == DBT_DEVTYP_VOLUME)
-			{
-				PDEV_BROADCAST_VOLUME bcv = (PDEV_BROADCAST_VOLUME)bch;
-
-				if (bcv->dbcv_flags & DBTF_MEDIA)
-				{
-					drive[0] = FindDriveFromMask(bcv->dbcv_unitmask);
-					handle_media_change(drive, FALSE, ud);
-				}
-			}
-		} break;
-		default: ;
-	}
+    g_strlcpy(drive, "A:" G_DIR_SEPARATOR_S, 4);
+    switch (msg->wParam)
+    {
+        case DBT_DEVICEARRIVAL:
+        {
+            if (bch->dbch_devicetype == DBT_DEVTYP_VOLUME)
+            {
+                PDEV_BROADCAST_VOLUME bcv = (PDEV_BROADCAST_VOLUME)bch;
+
+                if (bcv->dbcv_flags & DBTF_MEDIA)
+                {
+                    drive[0] = FindDriveFromMask(bcv->dbcv_unitmask);
+                    handle_media_change(drive, TRUE, ud);
+                }
+            }
+        } break;
+
+        case DBT_DEVICEREMOVECOMPLETE:
+        {
+            if (bch->dbch_devicetype == DBT_DEVTYP_VOLUME)
+            {
+                PDEV_BROADCAST_VOLUME bcv = (PDEV_BROADCAST_VOLUME)bch;
+
+                if (bcv->dbcv_flags & DBTF_MEDIA)
+                {
+                    drive[0] = FindDriveFromMask(bcv->dbcv_unitmask);
+                    handle_media_change(drive, FALSE, ud);
+                }
+            }
+        } break;
+        default: ;
+    }
 }
 
 #else
@@ -4105,48 +4227,48 @@
 G_MODULE_EXPORT void
 drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
 {
-	gchar *device;
-	gint state;
+    gchar *device;
+    gint state;
 
-	g_debug("drive_changed_cb()");
-	g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+    g_debug("drive_changed_cb()");
+    GHB_THREAD_NEW("Cache Volume Names", (GThreadFunc)ghb_cache_volnames, ud);
 
-	state = ghb_get_scan_state();
-	device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-	if (ud->current_dvd_device == NULL ||
-		strcmp(device, ud->current_dvd_device) != 0 ||
-		state != GHB_STATE_IDLE )
-	{
-		return;
-	}
-	if (g_drive_has_media(gd))
-	{
-		if (ghb_settings_get_boolean(ud->settings, "AutoScan"))
-		{
-			show_scan_progress(ud);
-			update_source_label(ud, device, TRUE);
-			gint preview_count;
-			preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-			ghb_settings_set_string(ud->settings, "scan_source", device);
-			start_scan(ud, device, 0, preview_count);
-		}
-	}
-	else
-	{
-		ghb_hb_cleanup(TRUE);
-		prune_logs(ud);
-		ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
-		start_scan(ud, "/dev/null", 0, 1);
-	}
+    state = ghb_get_scan_state();
+    device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+    if (ud->current_dvd_device == NULL ||
+        strcmp(device, ud->current_dvd_device) != 0 ||
+        state != GHB_STATE_IDLE )
+    {
+        return;
+    }
+    if (g_drive_has_media(gd))
+    {
+        if (ghb_settings_get_boolean(ud->settings, "AutoScan"))
+        {
+            show_scan_progress(ud);
+            update_source_label(ud, device, TRUE);
+            gint preview_count;
+            preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+            ghb_settings_set_string(ud->settings, "scan_source", device);
+            start_scan(ud, device, 0, preview_count);
+        }
+    }
+    else
+    {
+        ghb_hb_cleanup(TRUE);
+        prune_logs(ud);
+        ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
+        start_scan(ud, "/dev/null", 0, 1);
+    }
 }
 #endif
 
 #if !defined(_WIN32)
-#define GPM_DBUS_PM_SERVICE			"org.freedesktop.PowerManagement"
-#define GPM_DBUS_PM_PATH			"/org/freedesktop/PowerManagement"
-#define GPM_DBUS_PM_INTERFACE		"org.freedesktop.PowerManagement"
-#define GPM_DBUS_INHIBIT_PATH		"/org/freedesktop/PowerManagement/Inhibit"
-#define GPM_DBUS_INHIBIT_INTERFACE	"org.freedesktop.PowerManagement.Inhibit" 
+#define GPM_DBUS_PM_SERVICE         "org.freedesktop.PowerManagement"
+#define GPM_DBUS_PM_PATH            "/org/freedesktop/PowerManagement"
+#define GPM_DBUS_PM_INTERFACE       "org.freedesktop.PowerManagement"
+#define GPM_DBUS_INHIBIT_PATH       "/org/freedesktop/PowerManagement/Inhibit"
+#define GPM_DBUS_INHIBIT_INTERFACE  "org.freedesktop.PowerManagement.Inhibit" 
 static gboolean gpm_inhibited = FALSE;
 static guint gpm_cookie = -1;
 #endif
@@ -4154,93 +4276,93 @@
 static gboolean
 ghb_can_suspend_gpm()
 {
-	gboolean can_suspend = FALSE;
+    gboolean can_suspend = FALSE;
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	g_debug("ghb_can_suspend_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return FALSE;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
-							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return FALSE;
-	}
-	res = dbus_g_proxy_call(proxy, "CanSuspend", &error,
-							G_TYPE_INVALID,
-							G_TYPE_BOOLEAN, &can_suspend,
-							G_TYPE_INVALID);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_warning("CanSuspend failed: %s", error->message);
-			g_error_free(error);
-		}
-		else
-			g_warning("CanSuspend failed");
-		// Try to shutdown anyway
-		can_suspend = TRUE;
-	}
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    g_debug("ghb_can_suspend_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return FALSE;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                            GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return FALSE;
+    }
+    res = dbus_g_proxy_call(proxy, "CanSuspend", &error,
+                            G_TYPE_INVALID,
+                            G_TYPE_BOOLEAN, &can_suspend,
+                            G_TYPE_INVALID);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_warning("CanSuspend failed: %s", error->message);
+            g_error_free(error);
+        }
+        else
+            g_warning("CanSuspend failed");
+        // Try to shutdown anyway
+        can_suspend = TRUE;
+    }
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
 #endif
-	return can_suspend;
+    return can_suspend;
 }
 
 static void
 ghb_suspend_gpm()
 {
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	g_debug("ghb_suspend_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
-							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	res = dbus_g_proxy_call(proxy, "Suspend", &error,
-							G_TYPE_INVALID,
-							G_TYPE_INVALID);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_warning("Suspend failed: %s", error->message);
-			g_error_free(error);
-		}
-		else
-			g_warning("Suspend failed");
-	}
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    g_debug("ghb_suspend_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                            GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    res = dbus_g_proxy_call(proxy, "Suspend", &error,
+                            G_TYPE_INVALID,
+                            G_TYPE_INVALID);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_warning("Suspend failed: %s", error->message);
+            g_error_free(error);
+        }
+        else
+            g_warning("Suspend failed");
+    }
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
 #endif
 }
 
@@ -4248,48 +4370,48 @@
 static gboolean
 ghb_can_shutdown_gpm()
 {
-	gboolean can_shutdown = FALSE;
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	g_debug("ghb_can_shutdown_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return FALSE;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
-							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return FALSE;
-	}
-	res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
-							G_TYPE_INVALID,
-							G_TYPE_BOOLEAN, &can_shutdown,
-							G_TYPE_INVALID);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_warning("CanShutdown failed: %s", error->message);
-			g_error_free(error);
-		}
-		else
-			g_warning("CanShutdown failed");
-		// Try to shutdown anyway
-		can_shutdown = TRUE;
-	}
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
-	return can_shutdown;
+    gboolean can_shutdown = FALSE;
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    g_debug("ghb_can_shutdown_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return FALSE;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                            GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return FALSE;
+    }
+    res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
+                            G_TYPE_INVALID,
+                            G_TYPE_BOOLEAN, &can_shutdown,
+                            G_TYPE_INVALID);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_warning("CanShutdown failed: %s", error->message);
+            g_error_free(error);
+        }
+        else
+            g_warning("CanShutdown failed");
+        // Try to shutdown anyway
+        can_shutdown = TRUE;
+    }
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
+    return can_shutdown;
 }
 #endif
 
@@ -4297,43 +4419,43 @@
 static void
 ghb_shutdown_gpm()
 {
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	g_debug("ghb_shutdown_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
-							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	res = dbus_g_proxy_call(proxy, "Shutdown", &error,
-							G_TYPE_INVALID,
-							G_TYPE_INVALID);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_warning("Shutdown failed: %s", error->message);
-			g_error_free(error);
-		}
-		else
-			g_warning("Shutdown failed");
-	}
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    g_debug("ghb_shutdown_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                            GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    res = dbus_g_proxy_call(proxy, "Shutdown", &error,
+                            G_TYPE_INVALID,
+                            G_TYPE_INVALID);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_warning("Shutdown failed: %s", error->message);
+            g_error_free(error);
+        }
+        else
+            g_warning("Shutdown failed");
+    }
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
 }
 #endif
 
@@ -4341,55 +4463,55 @@
 ghb_inhibit_gpm()
 {
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	if (gpm_inhibited)
-	{
-		// Already inhibited
-		return;
-	}
-	g_debug("ghb_inhibit_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
-							GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	res = dbus_g_proxy_call(proxy, "Inhibit", &error,
-							G_TYPE_STRING, "ghb",
-							G_TYPE_STRING, "Encoding",
-							G_TYPE_INVALID,
-							G_TYPE_UINT, &gpm_cookie,
-							G_TYPE_INVALID);
-	gpm_inhibited = TRUE;
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_warning("Inhibit failed: %s", error->message);
-			g_error_free(error);
-			gpm_cookie = -1;
-		}
-		else
-			g_warning("Inhibit failed");
-		gpm_cookie = -1;
-		gpm_inhibited = FALSE;
-	}
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    if (gpm_inhibited)
+    {
+        // Already inhibited
+        return;
+    }
+    g_debug("ghb_inhibit_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                            GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    res = dbus_g_proxy_call(proxy, "Inhibit", &error,
+                            G_TYPE_STRING, "ghb",
+                            G_TYPE_STRING, "Encoding",
+                            G_TYPE_INVALID,
+                            G_TYPE_UINT, &gpm_cookie,
+                            G_TYPE_INVALID);
+    gpm_inhibited = TRUE;
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_warning("Inhibit failed: %s", error->message);
+            g_error_free(error);
+            gpm_cookie = -1;
+        }
+        else
+            g_warning("Inhibit failed");
+        gpm_cookie = -1;
+        gpm_inhibited = FALSE;
+    }
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
 #endif
 }
 
@@ -4397,150 +4519,150 @@
 ghb_uninhibit_gpm()
 {
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-	g_debug("ghb_uninhibit_gpm() gpm_cookie %u", gpm_cookie);
-
-	if (!gpm_inhibited)
-	{
-		// Not inhibited
-		return;
-	}
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
-							GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	res = dbus_g_proxy_call(proxy, "UnInhibit", &error,
-							G_TYPE_UINT, gpm_cookie,
-							G_TYPE_INVALID,
-							G_TYPE_INVALID);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_warning("UnInhibit failed: %s", error->message);
-			g_error_free(error);
-		}
-		else
-			g_warning("UnInhibit failed");
-	}
-	gpm_inhibited = FALSE;
-	dbus_g_connection_unref(conn);
-	g_object_unref(G_OBJECT(proxy));
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+    g_debug("ghb_uninhibit_gpm() gpm_cookie %u", gpm_cookie);
+
+    if (!gpm_inhibited)
+    {
+        // Not inhibited
+        return;
+    }
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                            GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    res = dbus_g_proxy_call(proxy, "UnInhibit", &error,
+                            G_TYPE_UINT, gpm_cookie,
+                            G_TYPE_INVALID,
+                            G_TYPE_INVALID);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_warning("UnInhibit failed: %s", error->message);
+            g_error_free(error);
+        }
+        else
+            g_warning("UnInhibit failed");
+    }
+    gpm_inhibited = FALSE;
+    dbus_g_connection_unref(conn);
+    g_object_unref(G_OBJECT(proxy));
 #endif
 }
 
 #if !defined(_WIN32)
 
 // For inhibit and shutdown
-#define GPM_DBUS_SM_SERVICE			"org.gnome.SessionManager"
-#define GPM_DBUS_SM_PATH			"/org/gnome/SessionManager"
-#define GPM_DBUS_SM_INTERFACE		"org.gnome.SessionManager"
+#define GPM_DBUS_SM_SERVICE         "org.gnome.SessionManager"
+#define GPM_DBUS_SM_PATH            "/org/gnome/SessionManager"
+#define GPM_DBUS_SM_INTERFACE       "org.gnome.SessionManager"
 
 #endif
 
 static gboolean
 ghb_can_shutdown_gsm()
 {
-	gboolean can_shutdown = FALSE;
+    gboolean can_shutdown = FALSE;
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	g_debug("ghb_can_shutdown_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return FALSE;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
-							GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return FALSE;
-	}
-	res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
-							G_TYPE_INVALID,
-							G_TYPE_BOOLEAN, &can_shutdown,
-							G_TYPE_INVALID);
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_error_free(error);
-		}
-		// Try to shutdown anyway
-		can_shutdown = TRUE;
-		// Try the gpm version
-		return ghb_can_shutdown_gpm();
-	}
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    g_debug("ghb_can_shutdown_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return FALSE;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                            GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return FALSE;
+    }
+    res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
+                            G_TYPE_INVALID,
+                            G_TYPE_BOOLEAN, &can_shutdown,
+                            G_TYPE_INVALID);
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_error_free(error);
+        }
+        // Try to shutdown anyway
+        can_shutdown = TRUE;
+        // Try the gpm version
+        return ghb_can_shutdown_gpm();
+    }
 #endif
-	return can_shutdown;
+    return can_shutdown;
 }
 
 static void
 ghb_shutdown_gsm()
 {
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-
-	g_debug("ghb_shutdown_gpm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
-							GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	res = dbus_g_proxy_call(proxy, "Shutdown", &error,
-							G_TYPE_INVALID,
-							G_TYPE_INVALID);
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_error_free(error);
-		}
-		// Try the gpm version
-		ghb_shutdown_gpm();
-	}
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+
+    g_debug("ghb_shutdown_gpm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                            GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    res = dbus_g_proxy_call(proxy, "Shutdown", &error,
+                            G_TYPE_INVALID,
+                            G_TYPE_INVALID);
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_error_free(error);
+        }
+        // Try the gpm version
+        ghb_shutdown_gpm();
+    }
 #endif
 }
 
@@ -4548,60 +4670,60 @@
 ghb_inhibit_gsm(signal_user_data_t *ud)
 {
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	guint xid;
-	GtkWidget *widget;
-	
-
-	if (gpm_inhibited)
-	{
-		// Already inhibited
-		return;
-	}
-	g_debug("ghb_inhibit_gsm()");
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
-							GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	widget = GHB_WIDGET(ud->builder, "hb_window");
-	xid = GDK_WINDOW_XID(gtk_widget_get_window(widget));
-	res = dbus_g_proxy_call(proxy, "Inhibit", &error,
-							G_TYPE_STRING, "ghb",
-							G_TYPE_UINT, xid,
-							G_TYPE_STRING, "Encoding",
-							G_TYPE_UINT, 1 | 4,
-							G_TYPE_INVALID,
-							G_TYPE_UINT, &gpm_cookie,
-							G_TYPE_INVALID);
-	gpm_inhibited = TRUE;
-	g_object_unref(G_OBJECT(proxy));
-	dbus_g_connection_unref(conn);
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_error_free(error);
-			gpm_cookie = -1;
-		}
-		gpm_cookie = -1;
-		gpm_inhibited = FALSE;
-		// Try the gpm version
-		ghb_inhibit_gpm();
-	}
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    guint xid;
+    GtkWidget *widget;
+    
+
+    if (gpm_inhibited)
+    {
+        // Already inhibited
+        return;
+    }
+    g_debug("ghb_inhibit_gsm()");
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                            GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    widget = GHB_WIDGET(ud->builder, "hb_window");
+    xid = GDK_WINDOW_XID(gtk_widget_get_window(widget));
+    res = dbus_g_proxy_call(proxy, "Inhibit", &error,
+                            G_TYPE_STRING, "ghb",
+                            G_TYPE_UINT, xid,
+                            G_TYPE_STRING, "Encoding",
+                            G_TYPE_UINT, 1 | 4,
+                            G_TYPE_INVALID,
+                            G_TYPE_UINT, &gpm_cookie,
+                            G_TYPE_INVALID);
+    gpm_inhibited = TRUE;
+    g_object_unref(G_OBJECT(proxy));
+    dbus_g_connection_unref(conn);
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_error_free(error);
+            gpm_cookie = -1;
+        }
+        gpm_cookie = -1;
+        gpm_inhibited = FALSE;
+        // Try the gpm version
+        ghb_inhibit_gpm();
+    }
 #endif
 }
 
@@ -4609,523 +4731,525 @@
 ghb_uninhibit_gsm()
 {
 #if !defined(_WIN32)
-	DBusGConnection *conn;
-	DBusGProxy	*proxy;
-	GError *error = NULL;
-	gboolean res;
-	
-	g_debug("ghb_uninhibit_gsm() gpm_cookie %u", gpm_cookie);
-
-	if (!gpm_inhibited)
-	{
-		// Not inhibited
-		return;
-	}
-	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL)
-	{
-		g_warning("DBUS cannot connect: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
-							GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
-	if (proxy == NULL)
-	{
-		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
-		dbus_g_connection_unref(conn);
-		return;
-	}
-	res = dbus_g_proxy_call(proxy, "Uninhibit", &error,
-							G_TYPE_UINT, gpm_cookie,
-							G_TYPE_INVALID,
-							G_TYPE_INVALID);
-	dbus_g_connection_unref(conn);
-	g_object_unref(G_OBJECT(proxy));
-	if (!res)
-	{
-		if (error != NULL)
-		{
-			g_error_free(error);
-		}
-		ghb_uninhibit_gpm();
-	}
-	gpm_inhibited = FALSE;
+    DBusGConnection *conn;
+    DBusGProxy  *proxy;
+    GError *error = NULL;
+    gboolean res;
+    
+    g_debug("ghb_uninhibit_gsm() gpm_cookie %u", gpm_cookie);
+
+    if (!gpm_inhibited)
+    {
+        // Not inhibited
+        return;
+    }
+    conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+    if (error != NULL)
+    {
+        g_warning("DBUS cannot connect: %s", error->message);
+        g_error_free(error);
+        return;
+    }
+    proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SM_SERVICE,
+                            GPM_DBUS_SM_PATH, GPM_DBUS_SM_INTERFACE);
+    if (proxy == NULL)
+    {
+        g_warning("Could not get DBUS proxy: %s", GPM_DBUS_SM_SERVICE);
+        dbus_g_connection_unref(conn);
+        return;
+    }
+    res = dbus_g_proxy_call(proxy, "Uninhibit", &error,
+                            G_TYPE_UINT, gpm_cookie,
+                            G_TYPE_INVALID,
+                            G_TYPE_INVALID);
+    dbus_g_connection_unref(conn);
+    g_object_unref(G_OBJECT(proxy));
+    if (!res)
+    {
+        if (error != NULL)
+        {
+            g_error_free(error);
+        }
+        ghb_uninhibit_gpm();
+    }
+    gpm_inhibited = FALSE;
 #endif
 }
 
 G_MODULE_EXPORT gboolean 
 tweak_setting_cb(
-	GtkWidget *widget, 
-	GdkEventButton *event, 
-	signal_user_data_t *ud)
-{
-	const gchar *name;
-	gchar *tweak_name;
-	gboolean ret = FALSE;
-	gboolean allow_tweaks;
-
-	g_debug("press %d %d", event->type, event->button);
-	allow_tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
-	if (allow_tweaks && event->type == GDK_BUTTON_PRESS && event->button == 3)
-	{ // Its a right mouse click
-		GtkWidget *dialog;
-		GtkEntry *entry;
-		GtkResponseType response;
-		gchar *tweak = NULL;
-
-		name = ghb_get_setting_key(widget);
-		if (g_str_has_prefix(name, "tweak_"))
-		{
-			tweak_name = g_strdup(name);
-		}
-		else
-		{
-			tweak_name = g_strdup_printf("tweak_%s", name);
-		}
-
-		tweak = ghb_settings_get_string (ud->settings, tweak_name);
-		dialog = GHB_WIDGET(ud->builder, "tweak_dialog");
-		gtk_window_set_title(GTK_WINDOW(dialog), tweak_name);
-		entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "tweak_setting"));
-		if (tweak)
-		{
-			gtk_entry_set_text(entry, tweak);
-			g_free(tweak);
-		}
-		response = gtk_dialog_run(GTK_DIALOG(dialog));
-		gtk_widget_hide(dialog);
-		if (response == GTK_RESPONSE_OK)
-		{
-			tweak = (gchar*)gtk_entry_get_text(entry);
-			if (ghb_validate_filter_string(tweak, -1))
-				ghb_settings_set_string(ud->settings, tweak_name, tweak);
-			else
-			{
-				gchar *message;
-				message = g_strdup_printf(
-							"Invalid Settings:\n%s",
-							tweak);
-				ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-				g_free(message);
-			}
-		}
-		g_free(tweak_name);
-		ret = TRUE;
-	}
-	return ret;
+    GtkWidget *widget, 
+    GdkEventButton *event, 
+    signal_user_data_t *ud)
+{
+    const gchar *name;
+    gchar *tweak_name;
+    gboolean ret = FALSE;
+    gboolean allow_tweaks;
+
+    g_debug("press %d %d", event->type, event->button);
+    allow_tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
+    if (allow_tweaks && event->type == GDK_BUTTON_PRESS && event->button == 3)
+    { // Its a right mouse click
+        GtkWidget *dialog;
+        GtkEntry *entry;
+        GtkResponseType response;
+        gchar *tweak = NULL;
+
+        name = ghb_get_setting_key(widget);
+        if (g_str_has_prefix(name, "tweak_"))
+        {
+            tweak_name = g_strdup(name);
+        }
+        else
+        {
+            tweak_name = g_strdup_printf("tweak_%s", name);
+        }
+
+        tweak = ghb_settings_get_string (ud->settings, tweak_name);
+        dialog = GHB_WIDGET(ud->builder, "tweak_dialog");
+        gtk_window_set_title(GTK_WINDOW(dialog), tweak_name);
+        entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "tweak_setting"));
+        if (tweak)
+        {
+            gtk_entry_set_text(entry, tweak);
+            g_free(tweak);
+        }
+        response = gtk_dialog_run(GTK_DIALOG(dialog));
+        gtk_widget_hide(dialog);
+        if (response == GTK_RESPONSE_OK)
+        {
+            tweak = (gchar*)gtk_entry_get_text(entry);
+            if (ghb_validate_filter_string(tweak, -1))
+                ghb_settings_set_string(ud->settings, tweak_name, tweak);
+            else
+            {
+                gchar *message;
+                message = g_strdup_printf(
+                            "Invalid Settings:\n%s",
+                            tweak);
+                ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+                g_free(message);
+            }
+        }
+        g_free(tweak_name);
+        ret = TRUE;
+    }
+    return ret;
 }
 
 G_MODULE_EXPORT gboolean 
 easter_egg_cb(
-	GtkWidget *widget, 
-	GdkEventButton *event, 
-	signal_user_data_t *ud)
-{
-	g_debug("press %d %d", event->type, event->button);
-	if (event->type == GDK_3BUTTON_PRESS && event->button == 1)
-	{ // Its a tripple left mouse button click
-		GtkWidget *widget;
-		widget = GHB_WIDGET(ud->builder, "allow_tweaks");
-		gtk_widget_show(widget);
-		widget = GHB_WIDGET(ud->builder, "hbfd_feature");
-		gtk_widget_show(widget);
-	}
-	else if (event->type == GDK_BUTTON_PRESS && event->button == 1)
-	{
-		GtkWidget *widget;
-		widget = GHB_WIDGET(ud->builder, "allow_tweaks");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "hbfd_feature");
-		gtk_widget_hide(widget);
-	}
-	return FALSE;
+    GtkWidget *widget, 
+    GdkEventButton *event, 
+    signal_user_data_t *ud)
+{
+    g_debug("press %d %d", event->type, event->button);
+    if (event->type == GDK_3BUTTON_PRESS && event->button == 1)
+    { // Its a tripple left mouse button click
+        GtkWidget *widget;
+        widget = GHB_WIDGET(ud->builder, "allow_tweaks");
+        gtk_widget_show(widget);
+        widget = GHB_WIDGET(ud->builder, "hbfd_feature");
+        gtk_widget_show(widget);
+    }
+    else if (event->type == GDK_BUTTON_PRESS && event->button == 1)
+    {
+        GtkWidget *widget;
+        widget = GHB_WIDGET(ud->builder, "allow_tweaks");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "hbfd_feature");
+        gtk_widget_hide(widget);
+    }
+    return FALSE;
 }
 
 G_MODULE_EXPORT gchar*
 format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-	if (val < 5.0)
-	{
-		return g_strdup_printf("Off");
-	}
-	else
-	{
-		return g_strdup_printf("%d", (gint)val);
-	}
+    if (val < 5.0)
+    {
+        return g_strdup_printf("Off");
+    }
+    else
+    {
+        return g_strdup_printf("%d", (gint)val);
+    }
 }
 
 G_MODULE_EXPORT gchar*
 format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-	gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
-	switch (vcodec)
-	{
-		case HB_VCODEC_X264:
-		{
-			if (val == 0.0)
-			{
-				return g_strdup_printf("RF: %.4g (Warning: lossless)", val);
-			}
-			else
-			{
-				return g_strdup_printf("RF: %.4g", val);
-			}
-		} break;
-
-		case HB_VCODEC_FFMPEG_MPEG4:
-		case HB_VCODEC_FFMPEG_MPEG2:
-		{
-			return g_strdup_printf("QP: %d", (int)val);
-		} break;
-
-		case HB_VCODEC_THEORA:
-		{
-			return g_strdup_printf("QP: %d", (int)val);
-		} break;
-
-		default:
-		{
-		} break;
-	}
-	return g_strdup_printf("QP: %.4g", val);
+    gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+    switch (vcodec)
+    {
+        case HB_VCODEC_X264:
+        {
+            if (val == 0.0)
+            {
+                return g_strdup_printf("RF: %.4g (Warning: lossless)", val);
+            }
+            else
+            {
+                return g_strdup_printf("RF: %.4g", val);
+            }
+        } break;
+
+        case HB_VCODEC_FFMPEG_MPEG4:
+        case HB_VCODEC_FFMPEG_MPEG2:
+        {
+            return g_strdup_printf("QP: %d", (int)val);
+        } break;
+
+        case HB_VCODEC_THEORA:
+        {
+            return g_strdup_printf("QP: %d", (int)val);
+        } break;
+
+        default:
+        {
+        } break;
+    }
+    return g_strdup_printf("QP: %.4g", val);
 }
 
 static void
 process_appcast(signal_user_data_t *ud)
 {
-	gchar *description = NULL, *build = NULL, *version = NULL, *msg;
-#if !defined(_WIN32)
-	GtkWidget *window;
-	static GtkWidget *html = NULL;
+    gchar *description = NULL, *build = NULL, *version = NULL, *msg;
+#if !defined(_WIN32) && !defined(_NO_UPDATE_CHECK)
+    GtkWidget *window;
+    static GtkWidget *html = NULL;
 #endif
-	GtkWidget *dialog, *label;
-	gint	response, ibuild = 0, skip;
+    GtkWidget *dialog, *label;
+    gint    response, ibuild = 0, skip;
 
-	if (ud->appcast == NULL || ud->appcast_len < 15 || 
-		strncmp(&(ud->appcast[9]), "200 OK", 6))
-	{
-		goto done;
-	}
-	ghb_appcast_parse(ud->appcast, &description, &build, &version);
-	if (build)
-		ibuild = g_strtod(build, NULL);
-	skip = ghb_settings_get_int(ud->settings, "update_skip_version");
-	if (description == NULL || build == NULL || version == NULL 
-		|| ibuild <= hb_get_build(NULL) || skip == ibuild)
-	{
-		goto done;
-	}
-	msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
-			version, build, hb_get_version(NULL), hb_get_build(NULL));
-	label = GHB_WIDGET(ud->builder, "update_message");
-	gtk_label_set_text(GTK_LABEL(label), msg);
+    if (ud->appcast == NULL || ud->appcast_len < 15 || 
+        strncmp(&(ud->appcast[9]), "200 OK", 6))
+    {
+        goto done;
+    }
+    ghb_appcast_parse(ud->appcast, &description, &build, &version);
+    if (build)
+        ibuild = g_strtod(build, NULL);
+    skip = ghb_settings_get_int(ud->settings, "update_skip_version");
+    if (description == NULL || build == NULL || version == NULL 
+        || ibuild <= hb_get_build(NULL) || skip == ibuild)
+    {
+        goto done;
+    }
+    msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
+            version, build, hb_get_version(NULL), hb_get_build(NULL));
+    label = GHB_WIDGET(ud->builder, "update_message");
+    gtk_label_set_text(GTK_LABEL(label), msg);
 
-#if !defined(_WIN32)
-#if !defined(_NO_UPDATE_CHECK)
-	if (html == NULL)
-	{
-		html = webkit_web_view_new();
-		window = GHB_WIDGET(ud->builder, "update_scroll");
-		gtk_container_add(GTK_CONTAINER(window), html);
-		// Show it
-		gtk_widget_set_size_request(html, 420, 240);
-		gtk_widget_show(html);
-	}
-	webkit_web_view_open(WEBKIT_WEB_VIEW(html), description);
-#endif
-#endif
-	dialog = GHB_WIDGET(ud->builder, "update_dialog");
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
-	if (response == GTK_RESPONSE_OK)
-	{
-		// Skip
-		ghb_settings_set_int(ud->settings, "update_skip_version", ibuild);
-		ghb_pref_save(ud->settings, "update_skip_version");
-	}
-	g_free(msg);
+#if !defined(_WIN32) && !defined(_NO_UPDATE_CHECK)
+    if (html == NULL)
+    {
+        html = webkit_web_view_new();
+        window = GHB_WIDGET(ud->builder, "update_scroll");
+        gtk_container_add(GTK_CONTAINER(window), html);
+        // Show it
+        gtk_widget_set_size_request(html, 420, 240);
+        gtk_widget_show(html);
+    }
+    webkit_web_view_open(WEBKIT_WEB_VIEW(html), description);
+#endif
+    dialog = GHB_WIDGET(ud->builder, "update_dialog");
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_hide(dialog);
+    if (response == GTK_RESPONSE_OK)
+    {
+        // Skip
+        ghb_settings_set_int(ud->settings, "update_skip_version", ibuild);
+        ghb_pref_save(ud->settings, "update_skip_version");
+    }
+    g_free(msg);
 
 done:
-	if (description) g_free(description);
-	if (build) g_free(build);
-	if (version) g_free(version);
-	g_free(ud->appcast);
-	ud->appcast_len = 0;
-	ud->appcast = NULL;
-	appcast_busy = FALSE;
+    if (description) g_free(description);
+    if (build) g_free(build);
+    if (version) g_free(version);
+    g_free(ud->appcast);
+    ud->appcast_len = 0;
+    ud->appcast = NULL;
+    appcast_busy = FALSE;
 }
 
 void
 ghb_net_close(GIOChannel *ioc)
 {
-	gint fd;
+    gint fd;
 
-	g_debug("ghb_net_close");
-	if (ioc == NULL) return;
-	fd = g_io_channel_unix_get_fd(ioc);
-	close(fd);
-	g_io_channel_unref(ioc);
+    g_debug("ghb_net_close");
+    if (ioc == NULL) return;
+    fd = g_io_channel_unix_get_fd(ioc);
+    close(fd);
+    g_io_channel_unref(ioc);
 }
 
 G_MODULE_EXPORT gboolean
 ghb_net_recv_cb(GIOChannel *ioc, GIOCondition cond, gpointer data)
 {
-	gchar buf[2048];
-	gsize len;
-	GError *gerror = NULL;
-	GIOStatus status;
-	
-	g_debug("ghb_net_recv_cb");
-	signal_user_data_t *ud = (signal_user_data_t*)data;
-
-	status = g_io_channel_read_chars (ioc, buf, 2048, &len, &gerror);
-	if ((status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) &&
-		len > 0)
-	{
-		gint new_len = ud->appcast_len + len;
-		ud->appcast = g_realloc(ud->appcast, new_len + 1);
-		memcpy(&(ud->appcast[ud->appcast_len]), buf, len);
-		ud->appcast_len = new_len;
-	}
-	if (status == G_IO_STATUS_EOF)
-	{
-		if ( ud->appcast != NULL )
-		{
-			ud->appcast[ud->appcast_len] = 0;
-		}
-		ghb_net_close(ioc);
-		process_appcast(ud);
-		return FALSE;
-	}
-	return TRUE;
+    gchar buf[2048];
+    gsize len;
+    GError *gerror = NULL;
+    GIOStatus status;
+    
+    g_debug("ghb_net_recv_cb");
+    signal_user_data_t *ud = (signal_user_data_t*)data;
+
+    status = g_io_channel_read_chars (ioc, buf, 2048, &len, &gerror);
+    if ((status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) &&
+        len > 0)
+    {
+        gint new_len = ud->appcast_len + len;
+        ud->appcast = g_realloc(ud->appcast, new_len + 1);
+        memcpy(&(ud->appcast[ud->appcast_len]), buf, len);
+        ud->appcast_len = new_len;
+    }
+    if (status == G_IO_STATUS_EOF)
+    {
+        if ( ud->appcast != NULL )
+        {
+            ud->appcast[ud->appcast_len] = 0;
+        }
+        ghb_net_close(ioc);
+        process_appcast(ud);
+        return FALSE;
+    }
+    return TRUE;
 }
 
 GIOChannel*
 ghb_net_open(signal_user_data_t *ud, gchar *address, gint port)
 {
-	GIOChannel *ioc;
-	gint fd;
+    GIOChannel *ioc;
+    gint fd;
+
+    struct sockaddr_in   sock;
+    struct hostent     * host;
 
-	struct sockaddr_in   sock;
-	struct hostent     * host;
+    g_debug("ghb_net_open");
+    if( !( host = gethostbyname( address ) ) )
+    {
+        g_warning( "gethostbyname failed (%s)", address );
+        appcast_busy = FALSE;
+        return NULL;
+    }
+
+    memset( &sock, 0, sizeof( struct sockaddr_in ) );
+    sock.sin_family = host->h_addrtype;
+    sock.sin_port   = htons( port );
+    memcpy( &sock.sin_addr, host->h_addr, host->h_length );
 
-	g_debug("ghb_net_open");
-	if( !( host = gethostbyname( address ) ) )
-	{
-		g_warning( "gethostbyname failed (%s)", address );
-		appcast_busy = FALSE;
-		return NULL;
-	}
-
-	memset( &sock, 0, sizeof( struct sockaddr_in ) );
-	sock.sin_family = host->h_addrtype;
-	sock.sin_port   = htons( port );
-	memcpy( &sock.sin_addr, host->h_addr, host->h_length );
-
-	fd = socket(host->h_addrtype, SOCK_STREAM, 0);
-	if( fd < 0 )
-	{
-		g_debug( "socket failed" );
-		appcast_busy = FALSE;
-		return NULL;
-	}
-
-	if(connect(fd, (struct sockaddr*)&sock, sizeof(struct sockaddr_in )) < 0 )
-	{
-		g_debug( "connect failed" );
-		appcast_busy = FALSE;
-		return NULL;
-	}
-	ioc = g_io_channel_unix_new(fd);
-	g_io_channel_set_encoding (ioc, NULL, NULL);
-	g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL);
-	g_io_add_watch (ioc, G_IO_IN, ghb_net_recv_cb, (gpointer)ud );
+    fd = socket(host->h_addrtype, SOCK_STREAM, 0);
+    if( fd < 0 )
+    {
+        g_debug( "socket failed" );
+        appcast_busy = FALSE;
+        return NULL;
+    }
 
-	return ioc;
+    if(connect(fd, (struct sockaddr*)&sock, sizeof(struct sockaddr_in )) < 0 )
+    {
+        g_debug( "connect failed" );
+        appcast_busy = FALSE;
+        return NULL;
+    }
+    ioc = g_io_channel_unix_new(fd);
+    g_io_channel_set_encoding (ioc, NULL, NULL);
+    g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL);
+    g_io_add_watch (ioc, G_IO_IN, ghb_net_recv_cb, (gpointer)ud );
+
+    return ioc;
 }
 
 gpointer
 ghb_check_update(signal_user_data_t *ud)
 {
-	gchar *query;
-	gsize len;
-	GIOChannel *ioc;
-	GError *gerror = NULL;
-	GRegex *regex;
-	GMatchInfo *mi;
-	gchar *host, *appcast;
-
-	g_debug("ghb_check_update");
-	appcast_busy = TRUE;
-	regex = g_regex_new("^http://(.+)/(.+)$", 0, 0, NULL);
-	if (!g_regex_match(regex, HB_PROJECT_URL_APPCAST, 0, &mi))
-	{
-		return NULL;
-	}
-
-	host = g_match_info_fetch(mi, 1);
-	appcast = g_match_info_fetch(mi, 2);
-
-	if (host == NULL || appcast == NULL)
-		return NULL;
-
-	query = g_strdup_printf("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
-							appcast, host);
-
-	ioc = ghb_net_open(ud, host, 80);
-	if (ioc == NULL)
-		goto free_resources;
+    gchar *query;
+    gsize len;
+    GIOChannel *ioc;
+    GError *gerror = NULL;
+    GRegex *regex;
+    GMatchInfo *mi;
+    gchar *host, *appcast;
+
+    g_debug("ghb_check_update");
+    appcast_busy = TRUE;
+    regex = g_regex_new("^http://(.+)/(.+)$", 0, 0, NULL);
+    if (!g_regex_match(regex, HB_PROJECT_URL_APPCAST, 0, &mi))
+    {
+        return NULL;
+    }
+
+    host = g_match_info_fetch(mi, 1);
+    appcast = g_match_info_fetch(mi, 2);
+
+    if (host == NULL || appcast == NULL)
+        return NULL;
 
-	g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
-	g_io_channel_flush(ioc, &gerror);
+    query = g_strdup_printf("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
+                            appcast, host);
+
+    ioc = ghb_net_open(ud, host, 80);
+    if (ioc == NULL)
+        goto free_resources;
+
+    g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
+    g_io_channel_flush(ioc, &gerror);
 
 free_resources:
-	g_free(query);
-	g_free(host);
-	g_free(appcast);
-	g_match_info_free(mi);
-	g_regex_unref(regex);
-	return NULL;
+    g_free(query);
+    g_free(host);
+    g_free(appcast);
+    g_match_info_free(mi);
+    g_regex_unref(regex);
+    return NULL;
 }
 
 G_MODULE_EXPORT gboolean
 hb_visibility_event_cb(
-	GtkWidget *widget, 
-	GdkEventVisibility *vs, 
-	signal_user_data_t *ud)
+    GtkWidget *widget, 
+    GdkEventVisibility *vs, 
+    signal_user_data_t *ud)
 {
-	ud->hb_visibility = vs->state;
-	return FALSE;
+    ud->hb_visibility = vs->state;
+    return FALSE;
 }
 
 G_MODULE_EXPORT void
 status_activate_cb(GtkStatusIcon *si, signal_user_data_t *ud)
 {
-	GtkWindow *window;
-	GdkWindowState state;
+    GtkWindow *window;
+    GdkWindowState state;
 
-	window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
-	state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(window)));
-	if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
-		(ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
-	{
-		gtk_window_present(window);
-		gtk_window_set_skip_taskbar_hint(window, FALSE);
-	}
-	else
-	{
-		gtk_window_set_skip_taskbar_hint(window, TRUE);
-		gtk_window_iconify(window);
-	}
+    window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
+    state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(window)));
+    if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
+        (ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
+    {
+        gtk_window_present(window);
+        gtk_window_set_skip_taskbar_hint(window, FALSE);
+    }
+    else
+    {
+        gtk_window_set_skip_taskbar_hint(window, TRUE);
+        gtk_window_iconify(window);
+    }
 }
 
 G_MODULE_EXPORT void
 show_hide_toggle_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWindow *window;
-	GdkWindowState state;
+    GtkWindow *window;
+    GdkWindowState state;
 
-	window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
-	state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(window)));
-	if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
-		(ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
-	{
-		gtk_window_present(window);
-		gtk_window_set_skip_taskbar_hint(window, FALSE);
-	}
-	else
-	{
-		gtk_window_set_skip_taskbar_hint(window, TRUE);
-		gtk_window_iconify(window);
-	}
+    window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
+    state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(window)));
+    if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
+        (ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
+    {
+        gtk_window_present(window);
+        gtk_window_set_skip_taskbar_hint(window, FALSE);
+    }
+    else
+    {
+        gtk_window_set_skip_taskbar_hint(window, TRUE);
+        gtk_window_iconify(window);
+    }
 }
 
 #if !defined(_WIN32)
 G_MODULE_EXPORT void
 notify_closed_cb(NotifyNotification *notification, signal_user_data_t *ud)
 {
-	g_object_unref(G_OBJECT(notification));
+    g_object_unref(G_OBJECT(notification));
 }
 #endif
 
 void
 ghb_notify_done(signal_user_data_t *ud)
 {
-	GtkStatusIcon *si;
-
-	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 0)
-		return;
 
-	si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+    if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 0)
+        return;
 
 #if !defined(_WIN32)
-	NotifyNotification *notification;
-	notification = notify_notification_new(
-		"Encode Complete",
-		"Put down that cocktail, Your HandBrake queue is done!",
-		"hb-icon"
+    NotifyNotification *notification;
+    notification = notify_notification_new(
+        "Encode Complete",
+        "Put down that cocktail, Your HandBrake queue is done!",
+        NULL
 #if NOTIFY_CHECK_VERSION (0, 7, 0)
                 );
 #else
-		,NULL);
-	notify_notification_attach_to_status_icon(notification, si);
+        ,NULL);
+
+    GtkStatusIcon *si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+    notify_notification_attach_to_status_icon(notification, si);
 #endif
-	g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
-	notify_notification_show(notification, NULL);
+    GtkIconTheme *theme = gtk_icon_theme_get_default();
+    GdkPixbuf *pb = gtk_icon_theme_load_icon(theme, "hb-icon", 32,
+                                            GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+    notify_notification_set_icon_from_pixbuf(notification, pb);
+    g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
+    notify_notification_show(notification, NULL);
+    g_object_unref(G_OBJECT(pb));
 #endif
 
-	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
-	{
-		if (ghb_can_shutdown_gsm())
-		{
-			ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
-				"Your encode is complete.",
-				"Shutting down the computer", 
-				"Cancel", (GSourceFunc)shutdown_cb, ud, 60);
-		}
-	}
-	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 2)
-	{
-		if (ghb_can_suspend_gpm())
-		{
-			ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
-				"Your encode is complete.",
-				"Putting computer to sleep", 
-				"Cancel", (GSourceFunc)suspend_cb, ud, 60);
-		}
-	}
-	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 4)
-	{
-		ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
-							"Your encode is complete.",
-							"Quiting Handbrake", 
-							"Cancel", (GSourceFunc)quit_cb, ud, 60);
-	}
+    if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
+    {
+        if (ghb_can_shutdown_gsm())
+        {
+            ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                "Your encode is complete.",
+                "Shutting down the computer", 
+                "Cancel", (GSourceFunc)shutdown_cb, ud, 60);
+        }
+    }
+    if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 2)
+    {
+        if (ghb_can_suspend_gpm())
+        {
+            ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                "Your encode is complete.",
+                "Putting computer to sleep", 
+                "Cancel", (GSourceFunc)suspend_cb, ud, 60);
+        }
+    }
+    if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 4)
+    {
+        ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                            "Your encode is complete.",
+                            "Quiting Handbrake", 
+                            "Cancel", (GSourceFunc)quit_cb, ud, 60);
+    }
 }
 
 G_MODULE_EXPORT gboolean
 window_configure_cb(
-	GtkWidget *widget,
-	GdkEventConfigure *event,
-	signal_user_data_t *ud)
-{
-	//g_message("preview_configure_cb()");
-	if (gtk_widget_get_visible(widget))
-	{
-		gint w, h;
-		w = ghb_settings_get_int(ud->settings, "window_width");
-		h = ghb_settings_get_int(ud->settings, "window_height");
-
-		if ( w != event->width || h != event->height )
-		{
-			ghb_settings_set_int(ud->settings, "window_width", event->width);
-			ghb_settings_set_int(ud->settings, "window_height", event->height);
-			ghb_pref_set(ud->settings, "window_width");
-			ghb_pref_set(ud->settings, "window_height");
-			ghb_prefs_store();
-		}
-	}
-	return FALSE;
+    GtkWidget *widget,
+    GdkEventConfigure *event,
+    signal_user_data_t *ud)
+{
+    //g_message("preview_configure_cb()");
+    if (gtk_widget_get_visible(widget))
+    {
+        gint w, h;
+        w = ghb_settings_get_int(ud->settings, "window_width");
+        h = ghb_settings_get_int(ud->settings, "window_height");
+
+        if ( w != event->width || h != event->height )
+        {
+            ghb_settings_set_int(ud->settings, "window_width", event->width);
+            ghb_settings_set_int(ud->settings, "window_height", event->height);
+            ghb_pref_set(ud->settings, "window_width");
+            ghb_pref_set(ud->settings, "window_height");
+            ghb_prefs_store();
+        }
+    }
+    return FALSE;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/callbacks.h -> HandBrake-0.9.9.tar.bz2/gtk/src/callbacks.h Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * callbacks.h
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * callbacks.h is free software.
  * 
@@ -17,9 +17,9 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with callbacks.h.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #if !defined(_CALLBACKS_H_)
@@ -32,29 +32,37 @@
 #include <gtk/gtk.h>
 #include "settings.h"
 
+#if GLIB_CHECK_VERSION(2, 32, 0)
+#define GHB_THREAD_NEW(n, f, p) \
+                g_thread_new(n, (GThreadFunc)(f), (p))
+#else
+#define GHB_THREAD_NEW(n, f, p) \
+                g_thread_create((GThreadFunc)(f), (p), TRUE, NULL)
+#endif
+
 void ghb_check_all_depencencies(signal_user_data_t *ud);
 gboolean ghb_timer_cb(gpointer data);
 gboolean ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data);
 void warn_log_handler(
-	const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer ud);
+    const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer ud);
 void debug_log_handler(
-	const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer ud);
+    const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer ud);
 void ghb_hbfd(signal_user_data_t *ud, gboolean hbfd);
 gboolean ghb_file_menu_add_dvd(signal_user_data_t *ud);
 void ghb_udev_init(void);
 gboolean ghb_message_dialog(
-	GtkMessageType type, const gchar *message, 
-	const gchar *no, const gchar *yes);
+    GtkMessageType type, const gchar *message, 
+    const gchar *no, const gchar *yes);
 void ghb_error_dialog(
-	GtkMessageType type, const gchar *message, const gchar *cancel);
+    GtkMessageType type, const gchar *message, const gchar *cancel);
 void ghb_init_dep_map(void);
 void ghb_cancel_encode(signal_user_data_t *ud, const gchar *extra_msg);
 gboolean ghb_cancel_encode2(signal_user_data_t *ud, const gchar *extra_msg);
 GValue* ghb_start_next_job(signal_user_data_t *ud, gboolean find_first);
 void ghb_check_dependency(
-	signal_user_data_t *ud, GtkWidget *widget, const gchar *alt_name);
+    signal_user_data_t *ud, GtkWidget *widget, const gchar *alt_name);
 void ghb_do_scan( signal_user_data_t *ud, const gchar *filename, 
-	gint titlenum, gboolean force);
+    gint titlenum, gboolean force);
 void ghb_log(gchar *log, ...);
 gpointer ghb_check_update(signal_user_data_t *ud);
 void ghb_uninhibit_gsm(void);

HandBrake-0.9.8.tar.bz2/gtk/src/create_resources.c -> HandBrake-0.9.9.tar.bz2/gtk/src/create_resources.c Changed

@@ -12,38 +12,38 @@
 
 enum
 {
-	R_NONE = 0,
-	R_RESOURCES,
-	R_SECTION,
-	R_ICON,
-	R_PLIST,
-	R_STRING,
+    R_NONE = 0,
+    R_RESOURCES,
+    R_SECTION,
+    R_ICON,
+    R_PLIST,
+    R_STRING,
 };
 
 typedef struct
 {
-	gchar *tag;
-	gint id;
+    gchar *tag;
+    gint id;
 } tag_map_t;
 
 static tag_map_t tag_map[] =
 {
-	{"resources", R_RESOURCES},
-	{"section", R_SECTION},
-	{"icon", R_ICON},
-	{"plist", R_PLIST},
-	{"string", R_STRING},
+    {"resources", R_RESOURCES},
+    {"section", R_SECTION},
+    {"icon", R_ICON},
+    {"plist", R_PLIST},
+    {"string", R_STRING},
 };
-#define TAG_MAP_SZ	(sizeof(tag_map)/sizeof(tag_map_t))
+#define TAG_MAP_SZ  (sizeof(tag_map)/sizeof(tag_map_t))
 
 typedef struct
 {
-	gchar *key;
-	gchar *value;
-	GValue *plist;
-	GQueue *stack;
-	GQueue *tag_stack;
-	gboolean closed_top;
+    gchar *key;
+    gchar *value;
+    GValue *plist;
+    GQueue *stack;
+    GQueue *tag_stack;
+    gboolean closed_top;
 } parse_data_t;
 
 GList *inc_list = NULL;
@@ -51,427 +51,427 @@
 static gchar*
 find_file(GList *list, const gchar *name)
 {
-	gchar *str;
-	GList *link = list;
-
-	while (link != NULL)
-	{
-		gchar *inc;
-
-		inc = (gchar*)link->data;
-		str = g_strdup_printf("%s/%s", inc, name);
-		if (g_file_test(str, G_FILE_TEST_IS_REGULAR))
-		{
-			return str;
-		}
-		g_free(str);
-		link = g_list_next(link);
-	}
-	if (g_file_test(name, G_FILE_TEST_IS_REGULAR))
-	{
-		return g_strdup(name);
-	}
-	return NULL;
+    gchar *str;
+    GList *link = list;
+
+    while (link != NULL)
+    {
+        gchar *inc;
+
+        inc = (gchar*)link->data;
+        str = g_strdup_printf("%s/%s", inc, name);
+        if (g_file_test(str, G_FILE_TEST_IS_REGULAR))
+        {
+            return str;
+        }
+        g_free(str);
+        link = g_list_next(link);
+    }
+    if (g_file_test(name, G_FILE_TEST_IS_REGULAR))
+    {
+        return g_strdup(name);
+    }
+    return NULL;
 }
 
 static const gchar*
 lookup_attr_value(
-	const gchar *name, 
-	const gchar **attr_names, 
-	const gchar **attr_values)
+    const gchar *name, 
+    const gchar **attr_names, 
+    const gchar **attr_values)
 {
-	gint ii;
-
-	if (attr_names == NULL) return NULL;
-	for (ii = 0; attr_names[ii] != NULL; ii++)
-	{
-		if (strcmp(name, attr_names[ii]) == 0)
-			return attr_values[ii];
-	}
-	return NULL;
+    gint ii;
+
+    if (attr_names == NULL) return NULL;
+    for (ii = 0; attr_names[ii] != NULL; ii++)
+    {
+        if (strcmp(name, attr_names[ii]) == 0)
+            return attr_values[ii];
+    }
+    return NULL;
 }
  
 static GValue*
 read_string_from_file(const gchar *filename)
 {
-	gchar *buffer;
-	size_t size;
-	GValue *gval;
-	FILE *fd;
-
-	fd = g_fopen(filename, "r");
-	if (fd == NULL)
-		return NULL;
-	fseek(fd, 0, SEEK_END);
-	size = ftell(fd);
-	fseek(fd, 0, SEEK_SET);
-	buffer = g_malloc(size+1);
-	size = fread(buffer, 1, size, fd);
-	buffer[size] = 0;
-	gval = ghb_value_new(G_TYPE_STRING);
-	g_value_take_string(gval, buffer);
-	fclose(fd);
-	return gval;
+    gchar *buffer;
+    size_t size;
+    GValue *gval;
+    FILE *fd;
+
+    fd = g_fopen(filename, "r");
+    if (fd == NULL)
+        return NULL;
+    fseek(fd, 0, SEEK_END);
+    size = ftell(fd);
+    fseek(fd, 0, SEEK_SET);
+    buffer = g_malloc(size+1);
+    size = fread(buffer, 1, size, fd);
+    buffer[size] = 0;
+    gval = ghb_value_new(G_TYPE_STRING);
+    g_value_take_string(gval, buffer);
+    fclose(fd);
+    return gval;
 }
 
 static void
 start_element(
-	GMarkupParseContext *ctx, 
-	const gchar *tag, 
-	const gchar **attr_names,
-	const gchar **attr_values,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *tag, 
+    const gchar **attr_names,
+    const gchar **attr_values,
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} id;
-	gint ii;
-
-	// Check to see if the first element found has been closed
-	// If so, ignore any junk following it.
-	if (pd->closed_top)
-		return;
-
-	for (ii = 0; ii < TAG_MAP_SZ; ii++)
-	{
-		if (strcmp(tag, tag_map[ii].tag) == 0)
-		{
-			id.id = tag_map[ii].id;
-			break;
-		}
-	}
-	if (ii == TAG_MAP_SZ)
-	{
-		g_warning("Unrecognized start tag (%s)", tag);
-		return;
-	}
-	g_queue_push_head(pd->tag_stack, id.pid);
-	GType gtype = 0;
-	GValue *gval = NULL;
-	GValue *current = g_queue_peek_head(pd->stack);
-	switch (id.id)
-	{
-		case R_SECTION:
-		{
-			const gchar *name;
-
-			name = lookup_attr_value("name", attr_names, attr_values);
-			if (name && strcmp(name, "icons") == 0)
-			{
-				gval = ghb_dict_value_new();
-				if (pd->key) g_free(pd->key);
-				pd->key = g_strdup(name);
-				g_queue_push_head(pd->stack, gval);
-			}
-		} break;
-		case R_ICON:
-		{
-			gchar *filename;
-			const gchar *name;
-
-			name = lookup_attr_value("file", attr_names, attr_values);
-			filename = find_file(inc_list, name);
-			name = lookup_attr_value("name", attr_names, attr_values);
-			if (filename && name)
-			{
-				ghb_rawdata_t *rd;
-				GdkPixbuf *pb;
-				GError *err = NULL;
-
-				pb = gdk_pixbuf_new_from_file(filename, &err);
-				if (pb == NULL)
-				{
-					g_warning("Failed to open icon file %s: %s", filename, err->message);
-					break;
-				}
-				gval = ghb_dict_value_new();
-				int colorspace = gdk_pixbuf_get_colorspace(pb);
-				gboolean alpha = gdk_pixbuf_get_has_alpha(pb);
-				int width = gdk_pixbuf_get_width(pb);
-				int height = gdk_pixbuf_get_height(pb);
-				int bps = gdk_pixbuf_get_bits_per_sample(pb);
-				int rowstride = gdk_pixbuf_get_rowstride(pb);
-
-				ghb_dict_insert(gval, g_strdup("colorspace"), 
-								ghb_int_value_new(colorspace));
-				ghb_dict_insert(gval, g_strdup("alpha"), 
-								ghb_boolean_value_new(alpha));
-				ghb_dict_insert(gval, g_strdup("width"), 
-								ghb_int_value_new(width));
-				ghb_dict_insert(gval, g_strdup("height"), 
-								ghb_int_value_new(height));
-				ghb_dict_insert(gval, g_strdup("bps"), 
-								ghb_int_value_new(bps));
-				ghb_dict_insert(gval, g_strdup("rowstride"), 
-								ghb_int_value_new(rowstride));
-
-				rd = g_malloc(sizeof(ghb_rawdata_t));
-				rd->data = gdk_pixbuf_get_pixels(pb);
-				rd->size = height * rowstride * bps / 8;
-				GValue *data = ghb_rawdata_value_new(rd);
-				ghb_dict_insert(gval, g_strdup("data"), data);
-
-				if (pd->key) g_free(pd->key);
-				pd->key = g_strdup(name);
-				g_free(filename);
-			}
-			else
-			{
-				g_warning("%s:missing a requried attribute", name);
-    			exit(EXIT_FAILURE);
-			}
-		} break;
-		case R_PLIST:
-		{
-			gchar *filename;
-			const gchar *name;
-
-			name = lookup_attr_value("file", attr_names, attr_values);
-			filename = find_file(inc_list, name);
-			name = lookup_attr_value("name", attr_names, attr_values);
-			if (filename && name)
-			{
-				gval = ghb_plist_parse_file(filename);
-				if (pd->key) g_free(pd->key);
-				pd->key = g_strdup(name);
-				g_free(filename);
-			}
-			else
-			{
-				g_warning("%s:missing a requried attribute", name);
-    			exit(EXIT_FAILURE);
-			}
-		} break;
-		case R_STRING:
-		{
-			gchar *filename;
-			const gchar *name;
-
-			name = lookup_attr_value("file", attr_names, attr_values);
-			filename = find_file(inc_list, name);
-			name = lookup_attr_value("name", attr_names, attr_values);
-			if (filename && name)
-			{
-				gval = read_string_from_file(filename);
-				if (pd->key) g_free(pd->key);
-				pd->key = g_strdup(name);
-				g_free(filename);
-			}
-			else
-			{
-				g_warning("%s:missing a requried attribute", name);
-    			exit(EXIT_FAILURE);
-			}
-		} break;
-	}
-	// Add the element to the current container
-	if (gval)
-	{ // There's an element to add
-		if (current == NULL)
-		{
-			pd->plist = gval;
-			return;
-		}
-		gtype = G_VALUE_TYPE(current);
-		if (gtype == ghb_array_get_type())
-		{
-			ghb_array_append(current, gval);
-		}
-		else if (gtype == ghb_dict_get_type())
-		{
-			if (pd->key == NULL)
-			{
-				g_warning("No key for dictionary item");
-				ghb_value_free(gval);
-			}
-			else
-			{
-				ghb_dict_insert(current, g_strdup(pd->key), gval);
-			}
-		}
-		else
-		{
-			g_error("Invalid container type. This shouldn't happen");
-		}
-	}
+    parse_data_t *pd = (parse_data_t*)ud;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } id;
+    gint ii;
+
+    // Check to see if the first element found has been closed
+    // If so, ignore any junk following it.
+    if (pd->closed_top)
+        return;
+
+    for (ii = 0; ii < TAG_MAP_SZ; ii++)
+    {
+        if (strcmp(tag, tag_map[ii].tag) == 0)
+        {
+            id.id = tag_map[ii].id;
+            break;
+        }
+    }
+    if (ii == TAG_MAP_SZ)
+    {
+        g_warning("Unrecognized start tag (%s)", tag);
+        return;
+    }
+    g_queue_push_head(pd->tag_stack, id.pid);
+    GType gtype = 0;
+    GValue *gval = NULL;
+    GValue *current = g_queue_peek_head(pd->stack);
+    switch (id.id)
+    {
+        case R_SECTION:
+        {
+            const gchar *name;
+
+            name = lookup_attr_value("name", attr_names, attr_values);
+            if (name && strcmp(name, "icons") == 0)
+            {
+                gval = ghb_dict_value_new();
+                if (pd->key) g_free(pd->key);
+                pd->key = g_strdup(name);
+                g_queue_push_head(pd->stack, gval);
+            }
+        } break;
+        case R_ICON:
+        {
+            gchar *filename;
+            const gchar *name;
+
+            name = lookup_attr_value("file", attr_names, attr_values);
+            filename = find_file(inc_list, name);
+            name = lookup_attr_value("name", attr_names, attr_values);
+            if (filename && name)
+            {
+                ghb_rawdata_t *rd;
+                GdkPixbuf *pb;
+                GError *err = NULL;
+
+                pb = gdk_pixbuf_new_from_file(filename, &err);
+                if (pb == NULL)
+                {
+                    g_warning("Failed to open icon file %s: %s", filename, err->message);
+                    break;
+                }
+                gval = ghb_dict_value_new();
+                int colorspace = gdk_pixbuf_get_colorspace(pb);
+                gboolean alpha = gdk_pixbuf_get_has_alpha(pb);
+                int width = gdk_pixbuf_get_width(pb);
+                int height = gdk_pixbuf_get_height(pb);
+                int bps = gdk_pixbuf_get_bits_per_sample(pb);
+                int rowstride = gdk_pixbuf_get_rowstride(pb);
+
+                ghb_dict_insert(gval, g_strdup("colorspace"), 
+                                ghb_int_value_new(colorspace));
+                ghb_dict_insert(gval, g_strdup("alpha"), 
+                                ghb_boolean_value_new(alpha));
+                ghb_dict_insert(gval, g_strdup("width"), 
+                                ghb_int_value_new(width));
+                ghb_dict_insert(gval, g_strdup("height"), 
+                                ghb_int_value_new(height));
+                ghb_dict_insert(gval, g_strdup("bps"), 
+                                ghb_int_value_new(bps));
+                ghb_dict_insert(gval, g_strdup("rowstride"), 
+                                ghb_int_value_new(rowstride));
+
+                rd = g_malloc(sizeof(ghb_rawdata_t));
+                rd->data = gdk_pixbuf_get_pixels(pb);
+                rd->size = height * rowstride * bps / 8;
+                GValue *data = ghb_rawdata_value_new(rd);
+                ghb_dict_insert(gval, g_strdup("data"), data);
+
+                if (pd->key) g_free(pd->key);
+                pd->key = g_strdup(name);
+                g_free(filename);
+            }
+            else
+            {
+                g_warning("%s:missing a requried attribute", name);
+                exit(EXIT_FAILURE);
+            }
+        } break;
+        case R_PLIST:
+        {
+            gchar *filename;
+            const gchar *name;
+
+            name = lookup_attr_value("file", attr_names, attr_values);
+            filename = find_file(inc_list, name);
+            name = lookup_attr_value("name", attr_names, attr_values);
+            if (filename && name)
+            {
+                gval = ghb_plist_parse_file(filename);
+                if (pd->key) g_free(pd->key);
+                pd->key = g_strdup(name);
+                g_free(filename);
+            }
+            else
+            {
+                g_warning("%s:missing a requried attribute", name);
+                exit(EXIT_FAILURE);
+            }
+        } break;
+        case R_STRING:
+        {
+            gchar *filename;
+            const gchar *name;
+
+            name = lookup_attr_value("file", attr_names, attr_values);
+            filename = find_file(inc_list, name);
+            name = lookup_attr_value("name", attr_names, attr_values);
+            if (filename && name)
+            {
+                gval = read_string_from_file(filename);
+                if (pd->key) g_free(pd->key);
+                pd->key = g_strdup(name);
+                g_free(filename);
+            }
+            else
+            {
+                g_warning("%s:missing a requried attribute", name);
+                exit(EXIT_FAILURE);
+            }
+        } break;
+    }
+    // Add the element to the current container
+    if (gval)
+    { // There's an element to add
+        if (current == NULL)
+        {
+            pd->plist = gval;
+            return;
+        }
+        gtype = G_VALUE_TYPE(current);
+        if (gtype == ghb_array_get_type())
+        {
+            ghb_array_append(current, gval);
+        }
+        else if (gtype == ghb_dict_get_type())
+        {
+            if (pd->key == NULL)
+            {
+                g_warning("No key for dictionary item");
+                ghb_value_free(gval);
+            }
+            else
+            {
+                ghb_dict_insert(current, g_strdup(pd->key), gval);
+            }
+        }
+        else
+        {
+            g_error("Invalid container type. This shouldn't happen");
+        }
+    }
 }
 
 static void
 end_element(
-	GMarkupParseContext *ctx, 
-	const gchar *name, 
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *name, 
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	gint id;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} start_id;
-	gint ii;
-
-	// Check to see if the first element found has been closed
-	// If so, ignore any junk following it.
-	if (pd->closed_top)
-		return;
-
-	for (ii = 0; ii < TAG_MAP_SZ; ii++)
-	{
-		if (strcmp(name, tag_map[ii].tag) == 0)
-		{
-			id = tag_map[ii].id;
-			break;
-		}
-	}
-	if (ii == TAG_MAP_SZ)
-	{
-		g_warning("Unrecognized start tag (%s)", name);
-		return;
-	}
-	start_id.pid = g_queue_pop_head(pd->tag_stack);
-	if (start_id.id != id)
-		g_warning("start tag != end tag: (%s %d) %d", name, id, id);
-
-	GValue *gval = NULL;
-	GValue *current = g_queue_peek_head(pd->stack);
-	GType gtype = 0;
-	switch (id)
-	{
-		case R_SECTION:
-		{
-			g_queue_pop_head(pd->stack);
-		} break;
-	}
-	if (gval)
-	{
-		// Get the top of the data structure stack and if it's an array
-		// or dict, add the current element
-		if (current == NULL)
-		{
-			pd->plist = gval;
-			pd->closed_top = TRUE;
-			return;
-		}
-		gtype = G_VALUE_TYPE(current);
-		if (gtype == ghb_array_get_type())
-		{
-			ghb_array_append(current, gval);
-		}
-		else if (gtype == ghb_dict_get_type())
-		{
-			if (pd->key == NULL)
-			{
-				g_warning("No key for dictionary item");
-				ghb_value_free(gval);
-			}
-			else
-			{
-				ghb_dict_insert(current, g_strdup(pd->key), gval);
-			}
-		}
-		else
-		{
-			g_error("Invalid container type. This shouldn't happen");
-		}
-	}
-	if (g_queue_is_empty(pd->tag_stack))
-		pd->closed_top = TRUE;
+    parse_data_t *pd = (parse_data_t*)ud;
+    gint id;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } start_id;
+    gint ii;
+
+    // Check to see if the first element found has been closed
+    // If so, ignore any junk following it.
+    if (pd->closed_top)
+        return;
+
+    for (ii = 0; ii < TAG_MAP_SZ; ii++)
+    {
+        if (strcmp(name, tag_map[ii].tag) == 0)
+        {
+            id = tag_map[ii].id;
+            break;
+        }
+    }
+    if (ii == TAG_MAP_SZ)
+    {
+        g_warning("Unrecognized start tag (%s)", name);
+        return;
+    }
+    start_id.pid = g_queue_pop_head(pd->tag_stack);
+    if (start_id.id != id)
+        g_warning("start tag != end tag: (%s %d) %d", name, id, id);
+
+    GValue *gval = NULL;
+    GValue *current = g_queue_peek_head(pd->stack);
+    GType gtype = 0;
+    switch (id)
+    {
+        case R_SECTION:
+        {
+            g_queue_pop_head(pd->stack);
+        } break;
+    }
+    if (gval)
+    {
+        // Get the top of the data structure stack and if it's an array
+        // or dict, add the current element
+        if (current == NULL)
+        {
+            pd->plist = gval;
+            pd->closed_top = TRUE;
+            return;
+        }
+        gtype = G_VALUE_TYPE(current);
+        if (gtype == ghb_array_get_type())
+        {
+            ghb_array_append(current, gval);
+        }
+        else if (gtype == ghb_dict_get_type())
+        {
+            if (pd->key == NULL)
+            {
+                g_warning("No key for dictionary item");
+                ghb_value_free(gval);
+            }
+            else
+            {
+                ghb_dict_insert(current, g_strdup(pd->key), gval);
+            }
+        }
+        else
+        {
+            g_error("Invalid container type. This shouldn't happen");
+        }
+    }
+    if (g_queue_is_empty(pd->tag_stack))
+        pd->closed_top = TRUE;
 }
 
 static void
 text_data(
-	GMarkupParseContext *ctx, 
-	const gchar *text, 
-	gsize len,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *text, 
+    gsize len,
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	if (pd->value) g_free(pd->value);
-	pd->value = g_strdup(text);
+    parse_data_t *pd = (parse_data_t*)ud;
+    if (pd->value) g_free(pd->value);
+    pd->value = g_strdup(text);
 }
 
 static void
 passthrough(
-	GMarkupParseContext *ctx, 
-	const gchar *text, 
-	gsize len,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *text, 
+    gsize len,
+    gpointer ud,
+    GError **error)
 {
-	//parse_data_t *pd = (parse_data_t*)ud;
+    //parse_data_t *pd = (parse_data_t*)ud;
 
-	//g_debug("passthrough %s", text);
+    //g_debug("passthrough %s", text);
 }
 
 static void
 parse_error(GMarkupParseContext *ctx, GError *error, gpointer ud)
 {
-	g_warning("Resource parse error: %s", error->message);
+    g_warning("Resource parse error: %s", error->message);
 }
 
 // This is required or the parser crashes
 static void 
 destroy_notify(gpointer data)
 { // Do nothing
-	//g_debug("destroy parser");
+    //g_debug("destroy parser");
 }
 
 GValue*
 ghb_resource_parse(const gchar *buf, gssize len)
 {
-	GMarkupParseContext *ctx;
-	GMarkupParser parser;
-	parse_data_t pd;
-	GError *err = NULL;
-
-	pd.stack = g_queue_new();
-	pd.tag_stack = g_queue_new();
-	pd.key = NULL;
-	pd.value = NULL;
-	pd.plist = ghb_dict_value_new();
-	g_queue_push_head(pd.stack, pd.plist);
-	pd.closed_top = FALSE;
-
-	parser.start_element = start_element;
-	parser.end_element = end_element;
-	parser.text = text_data;
-	parser.passthrough = passthrough;
-	parser.error = parse_error;
-	ctx = g_markup_parse_context_new(&parser, 0, &pd, destroy_notify);
-
-	g_markup_parse_context_parse(ctx, buf, len, &err);
-	g_markup_parse_context_end_parse(ctx, &err);
-	g_markup_parse_context_free(ctx);
-	g_queue_free(pd.stack);
-	g_queue_free(pd.tag_stack);
-	return pd.plist;
+    GMarkupParseContext *ctx;
+    GMarkupParser parser;
+    parse_data_t pd;
+    GError *err = NULL;
+
+    pd.stack = g_queue_new();
+    pd.tag_stack = g_queue_new();
+    pd.key = NULL;
+    pd.value = NULL;
+    pd.plist = ghb_dict_value_new();
+    g_queue_push_head(pd.stack, pd.plist);
+    pd.closed_top = FALSE;
+
+    parser.start_element = start_element;
+    parser.end_element = end_element;
+    parser.text = text_data;
+    parser.passthrough = passthrough;
+    parser.error = parse_error;
+    ctx = g_markup_parse_context_new(&parser, 0, &pd, destroy_notify);
+
+    g_markup_parse_context_parse(ctx, buf, len, &err);
+    g_markup_parse_context_end_parse(ctx, &err);
+    g_markup_parse_context_free(ctx);
+    g_queue_free(pd.stack);
+    g_queue_free(pd.tag_stack);
+    return pd.plist;
 }
 
 GValue*
 ghb_resource_parse_file(FILE *fd)
 {
-	gchar *buffer;
-	size_t size;
-	GValue *gval;
-
-	if (fd == NULL)
-		return NULL;
-	fseek(fd, 0, SEEK_END);
-	size = ftell(fd);
-	fseek(fd, 0, SEEK_SET);
-	buffer = g_malloc(size+1);
-	size = fread(buffer, 1, size, fd);
-	buffer[size] = 0;
-	gval = ghb_resource_parse(buffer, (gssize)size);
-	g_free(buffer);
-	return gval;
+    gchar *buffer;
+    size_t size;
+    GValue *gval;
+
+    if (fd == NULL)
+        return NULL;
+    fseek(fd, 0, SEEK_END);
+    size = ftell(fd);
+    fseek(fd, 0, SEEK_SET);
+    buffer = g_malloc(size+1);
+    size = fread(buffer, 1, size, fd);
+    buffer[size] = 0;
+    gval = ghb_resource_parse(buffer, (gssize)size);
+    g_free(buffer);
+    return gval;
 }
 
 static void
@@ -495,10 +495,10 @@
 gint
 main(gint argc, gchar *argv[])
 {
-	FILE *file;
-	GValue *gval;
+    FILE *file;
+    GValue *gval;
     int opt;
-	const gchar *src, *dst;
+    const gchar *src, *dst;
 
     do
     {
@@ -508,30 +508,30 @@
         case -1: break;
 
         case 'I':
-			inc_list = g_list_prepend(inc_list, g_strdup(optarg));
+            inc_list = g_list_prepend(inc_list, g_strdup(optarg));
             break;
         }
     } while (opt != -1);
 
-	if (optind != argc - 2)
-	{
-		usage(argv[0]);
-		return EXIT_FAILURE;
-	}
+    if (optind != argc - 2)
+    {
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
     src = argv[optind++];
     dst = argv[optind++];
 
-	g_type_init();
-	file = g_fopen(src, "r");
-	if (file == NULL)
-	{
-		fprintf(stderr, "Error: failed to open %s\n", src);
-		return EXIT_FAILURE;
-	}
-
-	gval = ghb_resource_parse_file(file);
-	ghb_plist_write_file(dst, gval);
-	fclose(file);
-	return 0;
+    g_type_init();
+    file = g_fopen(src, "r");
+    if (file == NULL)
+    {
+        fprintf(stderr, "Error: failed to open %s\n", src);
+        return EXIT_FAILURE;
+    }
+
+    gval = ghb_resource_parse_file(file);
+    ghb_plist_write_file(dst, gval);
+    fclose(file);
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/create_resources.py -> HandBrake-0.9.9.tar.bz2/gtk/src/create_resources.py Changed

@@ -16,148 +16,148 @@
 stack.append(pl)
 
 def top(ss):
-	return ss[len(ss)-1]
+    return ss[len(ss)-1]
 
 def end_element_handler(tag):
-	global stack
+    global stack
 
-	if tag == "section":
-		stack.pop()
+    if tag == "section":
+        stack.pop()
 
 def start_element_handler(tag, attr):
-	global pl, stack
-
-	current = top(stack)
-	key = val = None
-	if tag == "section":
-		key = attr["name"]
-		if key == "icons":
-			val = dict()
-			stack.append(val)
-	elif tag == "icon":
-		fbase = attr["file"]
-		fname = find_file(fbase)
-		key = attr["name"]
-		if fname != None and key != None:
-			val = dict()
-			pb = gdk.pixbuf_new_from_file(fname)
-			val["colorspace"] = pb.get_colorspace()
-			val["alpha"] = pb.get_has_alpha()
-			val["bps"] = pb.get_bits_per_sample()
-			val["width"] = pb.get_width()
-			val["height"] = pb.get_height()
-			val["rowstride"] = pb.get_rowstride()
-			val["data"] = plistlib.Data(pb.get_pixels())
-		elif fname == None:
-			print >> sys.stderr, ( "Error: No such icon file %s" % fbase )
-			sys.exit(1)
-	elif tag == "plist":
-		fbase = attr["file"]
-		fname = find_file(fbase)
-		key = attr["name"]
-		if fname != None and key != None:
-			val = plistlib.readPlist(fname)
-		elif fname == None:
-			print >> sys.stderr, ( "Error: No such plist file %s" % fbase )
-			sys.exit(1)
-	elif tag == "string":
-		fbase = attr["file"]
-		fname = find_file(fbase)
-		key = attr["name"]
-		if fname != None and key != None:
-			try:
-				ff = open(fname)
-				val = ff.read()
-			except Exception, err:
-				print >> sys.stderr, ( "Error: %s"  % str(err) )
-				sys.exit(1)
-		elif fname == None:
-			print >> sys.stderr, ( "Error: No such string file %s" % fbase )
-			sys.exit(1)
-		
-	if val != None:
-		if type(current) == types.DictType:
-			current[key] = val
-		elif type(current) == types.TupleType:
-			current.append(val)
+    global pl, stack
+
+    current = top(stack)
+    key = val = None
+    if tag == "section":
+        key = attr["name"]
+        if key == "icons":
+            val = dict()
+            stack.append(val)
+    elif tag == "icon":
+        fbase = attr["file"]
+        fname = find_file(fbase)
+        key = attr["name"]
+        if fname != None and key != None:
+            val = dict()
+            pb = gdk.pixbuf_new_from_file(fname)
+            val["colorspace"] = pb.get_colorspace()
+            val["alpha"] = pb.get_has_alpha()
+            val["bps"] = pb.get_bits_per_sample()
+            val["width"] = pb.get_width()
+            val["height"] = pb.get_height()
+            val["rowstride"] = pb.get_rowstride()
+            val["data"] = plistlib.Data(pb.get_pixels())
+        elif fname == None:
+            print >> sys.stderr, ( "Error: No such icon file %s" % fbase )
+            sys.exit(1)
+    elif tag == "plist":
+        fbase = attr["file"]
+        fname = find_file(fbase)
+        key = attr["name"]
+        if fname != None and key != None:
+            val = plistlib.readPlist(fname)
+        elif fname == None:
+            print >> sys.stderr, ( "Error: No such plist file %s" % fbase )
+            sys.exit(1)
+    elif tag == "string":
+        fbase = attr["file"]
+        fname = find_file(fbase)
+        key = attr["name"]
+        if fname != None and key != None:
+            try:
+                ff = open(fname)
+                val = ff.read()
+            except Exception, err:
+                print >> sys.stderr, ( "Error: %s"  % str(err) )
+                sys.exit(1)
+        elif fname == None:
+            print >> sys.stderr, ( "Error: No such string file %s" % fbase )
+            sys.exit(1)
+        
+    if val != None:
+        if type(current) == types.DictType:
+            current[key] = val
+        elif type(current) == types.TupleType:
+            current.append(val)
 
 
 def cdata_handler(str):
-	return
+    return
 
 def resource_parse_file(infile):
-	parser = expat.ParserCreate()
-	parser.StartElementHandler = start_element_handler
-	parser.EndElementHandler = end_element_handler
-	parser.CharacterDataHandler = cdata_handler
-	parser.ParseFile(infile)
+    parser = expat.ParserCreate()
+    parser.StartElementHandler = start_element_handler
+    parser.EndElementHandler = end_element_handler
+    parser.CharacterDataHandler = cdata_handler
+    parser.ParseFile(infile)
 
 def usage():
-	print >> sys.stderr, (
-		"Usage: %s [-I <inc path>] <resource list> [resource plist]\n"
-		"Summary:\n"
-		"    Creates a resource plist from a resource list\n\n"
-		"Options:\n"
-		"    I - Include path to search for files\n"
-		"    <resource list>    Input resources file\n"
-		"    <resource plist>  Output resources plist file\n"
-		% sys.argv[0]
-	)
+    print >> sys.stderr, (
+        "Usage: %s [-I <inc path>] <resource list> [resource plist]\n"
+        "Summary:\n"
+        "    Creates a resource plist from a resource list\n\n"
+        "Options:\n"
+        "    I - Include path to search for files\n"
+        "    <resource list>    Input resources file\n"
+        "    <resource plist>  Output resources plist file\n"
+        % sys.argv[0]
+    )
 
 inc_list = list()
 
 def find_file(name):
-	global inc_list
+    global inc_list
 
-	for inc_dir in inc_list:
-		inc = "%s/%s" % (inc_dir, name)
-		if os.path.isfile(inc):
-			return inc
+    for inc_dir in inc_list:
+        inc = "%s/%s" % (inc_dir, name)
+        if os.path.isfile(inc):
+            return inc
 
-	if os.path.isfile(name):
-		return name
+    if os.path.isfile(name):
+        return name
 
-	return None
+    return None
 
 def main():
-	global inc_list
-
-	OPTS = "I:"
-	try:
-		opts, args = getopt.gnu_getopt(sys.argv[1:], OPTS)
-	except getopt.GetoptError, err:
-		print >> sys.stderr, str(err)
-		usage()
-		sys.exit(2)
-
-	for o, a in opts:
-		if o == "-I":
-			# add to include list
-			inc_list.append(a)
-		else:
-			assert False, "unhandled option"
-
-	if len(args) > 2 or len(args) < 1:
-		usage()
-		sys.exit(2)
-
-	try:
-		infile = open(args[0])
-	except Exception, err:
-		print >> sys.stderr, ( "Error: %s"  % str(err) )
-		sys.exit(1)
-
-	if len(args) > 1:
-		try:
-			outfile = open(args[1], "w")
-		except Exception, err:
-			print >> sys.stderr, ( "Error: %s"  % str(err))
-			sys.exit(1)
-	else:
-		outfile = sys.stdout
-
-	resource_parse_file(infile)
-	plistlib.writePlist(pl, outfile)
+    global inc_list
+
+    OPTS = "I:"
+    try:
+        opts, args = getopt.gnu_getopt(sys.argv[1:], OPTS)
+    except getopt.GetoptError, err:
+        print >> sys.stderr, str(err)
+        usage()
+        sys.exit(2)
+
+    for o, a in opts:
+        if o == "-I":
+            # add to include list
+            inc_list.append(a)
+        else:
+            assert False, "unhandled option"
+
+    if len(args) > 2 or len(args) < 1:
+        usage()
+        sys.exit(2)
+
+    try:
+        infile = open(args[0])
+    except Exception, err:
+        print >> sys.stderr, ( "Error: %s"  % str(err) )
+        sys.exit(1)
+
+    if len(args) > 1:
+        try:
+            outfile = open(args[1], "w")
+        except Exception, err:
+            print >> sys.stderr, ( "Error: %s"  % str(err))
+            sys.exit(1)
+    else:
+        outfile = sys.stdout
+
+    resource_parse_file(infile)
+    plistlib.writePlist(pl, outfile)
 
 main()

HandBrake-0.9.8.tar.bz2/gtk/src/ghb-dvd.c -> HandBrake-0.9.9.tar.bz2/gtk/src/ghb-dvd.c Changed

@@ -2,7 +2,7 @@
  *            ghb-dvd.c
  *
  *  Sat Apr 19 11:12:53 2008
- *  Copyright  2008-2011  John Stebbins
+ *  Copyright  2008-2013  John Stebbins
  *  <john at stebbins dot name>
  ****************************************************************************/
 
@@ -32,9 +32,9 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.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 version 2 of the License.
+ *  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 version 2 of the License.
  */
 
 #if defined(_WIN32)
@@ -52,52 +52,52 @@
 #include <string.h>
 
 #ifndef PACKED
-#define PACKED				__attribute__((packed))
+#define PACKED              __attribute__((packed))
 #endif
 
 struct volume_descriptor {
-	struct descriptor_tag {
-		guint16	id;
-		guint16	version;
-		guint8	checksum;
-		guint8	reserved;
-		guint16	serial;
-		guint16	crc;
-		guint16	crc_len;
-		guint32	location;
-	} PACKED tag;
-	union {
-		struct anchor_descriptor {
-			guint32	length;
-			guint32	location;
-		} PACKED anchor;
-		struct primary_descriptor {
-			guint32	seq_num;
-			guint32	desc_num;
-			struct dstring {
-				guint8	clen;
-				guint8	c[31];
-			} PACKED ident;
-		} PACKED primary;
-	} PACKED type;
+    struct descriptor_tag {
+        guint16 id;
+        guint16 version;
+        guint8  checksum;
+        guint8  reserved;
+        guint16 serial;
+        guint16 crc;
+        guint16 crc_len;
+        guint32 location;
+    } PACKED tag;
+    union {
+        struct anchor_descriptor {
+            guint32 length;
+            guint32 location;
+        } PACKED anchor;
+        struct primary_descriptor {
+            guint32 seq_num;
+            guint32 desc_num;
+            struct dstring {
+                guint8  clen;
+                guint8  c[31];
+            } PACKED ident;
+        } PACKED primary;
+    } PACKED type;
 } PACKED;
 
 struct volume_structure_descriptor {
-	guint8		type;
-	guint8		id[5];
-	guint8		version;
+    guint8      type;
+    guint8      id[5];
+    guint8      version;
 } PACKED;
 
-#define VOLUME_ID_LABEL_SIZE		64
+#define VOLUME_ID_LABEL_SIZE        64
 typedef struct 
 {
-	gint fd;
-	gchar label[VOLUME_ID_LABEL_SIZE+1];
+    gint fd;
+    gchar label[VOLUME_ID_LABEL_SIZE+1];
 } udf_info_t;
 
 enum endian {
-	LE = 0,
-	BE = 1
+    LE = 0,
+    BE = 1
 };
 
 #ifdef __BYTE_ORDER
@@ -122,294 +122,294 @@
 #endif
 #endif /* __BYTE_ORDER */
 
-#define UDF_VSD_OFFSET			0x8000
+#define UDF_VSD_OFFSET          0x8000
 
 static guint8*
 get_buffer(int fd, guint64 off, gsize len)
 {
-	gint buf_len;
-	
-	if (lseek(fd, off, SEEK_SET) < 0) 
-	{
-		return NULL;
-	}
-	guint8 *buffer = g_malloc(len);
-	buf_len = read(fd, buffer, len);
-	if (buf_len < 0) 
-	{
-		g_free(buffer);
-		return NULL;
-	}
-	return buffer;
+    gint buf_len;
+    
+    if (lseek(fd, off, SEEK_SET) < 0) 
+    {
+        return NULL;
+    }
+    guint8 *buffer = g_malloc(len);
+    buf_len = read(fd, buffer, len);
+    if (buf_len < 0) 
+    {
+        g_free(buffer);
+        return NULL;
+    }
+    return buffer;
 }
 
 static gint 
 set_unicode16(guint8 *str, gsize len, const guint8 *buf, gint endianess, gsize count)
 {
-	gint ii, jj;
-	guint16 c;
-
-	jj = 0;
-	for (ii = 0; ii + 2 <= count; ii += 2) {
-		if (endianess == LE)
-			c = (buf[ii+1] << 8) | buf[ii];
-		else
-			c = (buf[ii] << 8) | buf[ii+1];
-		if (c == 0) {
-			str[jj] = '\0';
-			break;
-		} else if (c < 0x80) {
-			if (jj+1 >= len)
-				break;
-			str[jj++] = (guint8) c;
-		} else if (c < 0x800) {
-			if (jj+2 >= len)
-				break;
-			str[jj++] = (guint8) (0xc0 | (c >> 6));
-			str[jj++] = (guint8) (0x80 | (c & 0x3f));
-		} else {
-			if (jj+3 >= len)
-				break;
-			str[jj++] = (guint8) (0xe0 | (c >> 12));
-			str[jj++] = (guint8) (0x80 | ((c >> 6) & 0x3f));
-			str[jj++] = (guint8) (0x80 | (c & 0x3f));
-		}
-	}
-	str[jj] = '\0';
-	return jj;
+    gint ii, jj;
+    guint16 c;
+
+    jj = 0;
+    for (ii = 0; ii + 2 <= count; ii += 2) {
+        if (endianess == LE)
+            c = (buf[ii+1] << 8) | buf[ii];
+        else
+            c = (buf[ii] << 8) | buf[ii+1];
+        if (c == 0) {
+            str[jj] = '\0';
+            break;
+        } else if (c < 0x80) {
+            if (jj+1 >= len)
+                break;
+            str[jj++] = (guint8) c;
+        } else if (c < 0x800) {
+            if (jj+2 >= len)
+                break;
+            str[jj++] = (guint8) (0xc0 | (c >> 6));
+            str[jj++] = (guint8) (0x80 | (c & 0x3f));
+        } else {
+            if (jj+3 >= len)
+                break;
+            str[jj++] = (guint8) (0xe0 | (c >> 12));
+            str[jj++] = (guint8) (0x80 | ((c >> 6) & 0x3f));
+            str[jj++] = (guint8) (0x80 | (c & 0x3f));
+        }
+    }
+    str[jj] = '\0';
+    return jj;
 }
 
 static void 
 set_label_string(guint8 *str, const guint8 *buf, gsize count)
 {
-	gint ii;
-
-	memcpy(str, buf, count);
-	str[count] = 0;
-	
-	/* remove trailing whitespace */
-	ii = strlen((gchar*)str);
-	while (ii--) 
-	{
-		if (!g_ascii_isspace(str[ii]))
-			break;
-	}
-	str[ii+1] = 0;
+    gint ii;
+
+    memcpy(str, buf, count);
+    str[count] = 0;
+    
+    /* remove trailing whitespace */
+    ii = strlen((gchar*)str);
+    while (ii--) 
+    {
+        if (!g_ascii_isspace(str[ii]))
+            break;
+    }
+    str[ii+1] = 0;
 }
  
 static gint 
 probe_udf(udf_info_t *id)
 {
-	struct volume_descriptor *vd;
-	struct volume_structure_descriptor *vsd;
-	guint bs;
-	guint b;
-	guint type;
-	guint count;
-	guint loc;
-	guint clen;
-	guint64 off = 0;
-
-	vsd = (struct volume_structure_descriptor *) get_buffer(id->fd, off + UDF_VSD_OFFSET, 0x200);
-	if (vsd == NULL)
-		return -1;
-
-	if (memcmp(vsd->id, "NSR02", 5) == 0)
-		goto blocksize;
-	if (memcmp(vsd->id, "NSR03", 5) == 0)
-		goto blocksize;
-	if (memcmp(vsd->id, "BEA01", 5) == 0)
-		goto blocksize;
-	if (memcmp(vsd->id, "BOOT2", 5) == 0)
-		goto blocksize;
-	if (memcmp(vsd->id, "CD001", 5) == 0)
-		goto blocksize;
-	if (memcmp(vsd->id, "CDW02", 5) == 0)
-		goto blocksize;
-	if (memcmp(vsd->id, "TEA03", 5) == 0)
-		goto blocksize;
-	return -1;
+    struct volume_descriptor *vd;
+    struct volume_structure_descriptor *vsd;
+    guint bs;
+    guint b;
+    guint type;
+    guint count;
+    guint loc;
+    guint clen;
+    guint64 off = 0;
+
+    vsd = (struct volume_structure_descriptor *) get_buffer(id->fd, off + UDF_VSD_OFFSET, 0x200);
+    if (vsd == NULL)
+        return -1;
+
+    if (memcmp(vsd->id, "NSR02", 5) == 0)
+        goto blocksize;
+    if (memcmp(vsd->id, "NSR03", 5) == 0)
+        goto blocksize;
+    if (memcmp(vsd->id, "BEA01", 5) == 0)
+        goto blocksize;
+    if (memcmp(vsd->id, "BOOT2", 5) == 0)
+        goto blocksize;
+    if (memcmp(vsd->id, "CD001", 5) == 0)
+        goto blocksize;
+    if (memcmp(vsd->id, "CDW02", 5) == 0)
+        goto blocksize;
+    if (memcmp(vsd->id, "TEA03", 5) == 0)
+        goto blocksize;
+    return -1;
 
 blocksize:
-	/* search the next VSD to get the logical block size of the volume */
-	for (bs = 0x800; bs < 0x8000; bs += 0x800) {
-		vsd = (struct volume_structure_descriptor *) get_buffer(id->fd, off + UDF_VSD_OFFSET + bs, 0x800);
-		if (vsd == NULL)
-			return -1;
-		if (vsd->id[0] != '\0')
-			goto nsr;
-	}
-	return -1;
+    /* search the next VSD to get the logical block size of the volume */
+    for (bs = 0x800; bs < 0x8000; bs += 0x800) {
+        vsd = (struct volume_structure_descriptor *) get_buffer(id->fd, off + UDF_VSD_OFFSET + bs, 0x800);
+        if (vsd == NULL)
+            return -1;
+        if (vsd->id[0] != '\0')
+            goto nsr;
+    }
+    return -1;
 
 nsr:
-	/* search the list of VSDs for a NSR descriptor */
-	for (b = 0; b < 64; b++) {
-		vsd = (struct volume_structure_descriptor *) get_buffer(id->fd, off + UDF_VSD_OFFSET + (b * bs), 0x800);
-		if (vsd == NULL)
-			return -1;
-
-		if (vsd->id[0] == '\0')
-			return -1;
-		if (memcmp(vsd->id, "NSR02", 5) == 0)
-			goto anchor;
-		if (memcmp(vsd->id, "NSR03", 5) == 0)
-			goto anchor;
-	}
-	return -1;
+    /* search the list of VSDs for a NSR descriptor */
+    for (b = 0; b < 64; b++) {
+        vsd = (struct volume_structure_descriptor *) get_buffer(id->fd, off + UDF_VSD_OFFSET + (b * bs), 0x800);
+        if (vsd == NULL)
+            return -1;
+
+        if (vsd->id[0] == '\0')
+            return -1;
+        if (memcmp(vsd->id, "NSR02", 5) == 0)
+            goto anchor;
+        if (memcmp(vsd->id, "NSR03", 5) == 0)
+            goto anchor;
+    }
+    return -1;
 
 anchor:
-	/* read anchor volume descriptor */
-	vd = (struct volume_descriptor *) get_buffer(id->fd, off + (256 * bs), 0x200);
-	if (vd == NULL)
-		return -1;
-
-	type = le16_to_cpu(vd->tag.id);
-	if (type != 2) /* TAG_ID_AVDP */
-		goto found;
-
-	/* get desriptor list address and block count */
-	count = le32_to_cpu(vd->type.anchor.length) / bs;
-	loc = le32_to_cpu(vd->type.anchor.location);
-
-	/* pick the primary descriptor from the list */
-	for (b = 0; b < count; b++) {
-		vd = (struct volume_descriptor *) get_buffer(id->fd, off + ((loc + b) * bs), 0x200);
-		if (vd == NULL)
-			return -1;
-
-		type = le16_to_cpu(vd->tag.id);
-
-		/* check validity */
-		if (type == 0)
-			goto found;
-		if (le32_to_cpu(vd->tag.location) != loc + b)
-			goto found;
-
-		if (type == 1) /* TAG_ID_PVD */
-			goto pvd;
-	}
-	goto found;
+    /* read anchor volume descriptor */
+    vd = (struct volume_descriptor *) get_buffer(id->fd, off + (256 * bs), 0x200);
+    if (vd == NULL)
+        return -1;
+
+    type = le16_to_cpu(vd->tag.id);
+    if (type != 2) /* TAG_ID_AVDP */
+        goto found;
+
+    /* get desriptor list address and block count */
+    count = le32_to_cpu(vd->type.anchor.length) / bs;
+    loc = le32_to_cpu(vd->type.anchor.location);
+
+    /* pick the primary descriptor from the list */
+    for (b = 0; b < count; b++) {
+        vd = (struct volume_descriptor *) get_buffer(id->fd, off + ((loc + b) * bs), 0x200);
+        if (vd == NULL)
+            return -1;
+
+        type = le16_to_cpu(vd->tag.id);
+
+        /* check validity */
+        if (type == 0)
+            goto found;
+        if (le32_to_cpu(vd->tag.location) != loc + b)
+            goto found;
+
+        if (type == 1) /* TAG_ID_PVD */
+            goto pvd;
+    }
+    goto found;
 
 pvd:
-	clen = vd->type.primary.ident.clen;
-	if (clen == 8)
-		set_label_string((guint8*)id->label, vd->type.primary.ident.c, 31);
-	else if (clen == 16)
-		set_unicode16((guint8*)id->label, sizeof(id->label), vd->type.primary.ident.c, BE, 31);
+    clen = vd->type.primary.ident.clen;
+    if (clen == 8)
+        set_label_string((guint8*)id->label, vd->type.primary.ident.c, 31);
+    else if (clen == 16)
+        set_unicode16((guint8*)id->label, sizeof(id->label), vd->type.primary.ident.c, BE, 31);
 
 found:
-	return 0;
+    return 0;
 }
 
 gchar*
 ghb_dvd_volname(const gchar *device)
 {
-	udf_info_t id;
-	gchar *buffer = NULL;
-
-	id.fd = open(device, O_RDONLY);
-	if (id.fd < 0) {
-		return NULL;
-	}
-	if (probe_udf (&id) == 0)
-	{
-		buffer = g_strdup(id.label);
-	}
-	return buffer;
+    udf_info_t id;
+    gchar *buffer = NULL;
+
+    id.fd = open(device, O_RDONLY);
+    if (id.fd < 0) {
+        return NULL;
+    }
+    if (probe_udf (&id) == 0)
+    {
+        buffer = g_strdup(id.label);
+    }
+    return buffer;
 }
 #endif
 
 gchar*
 ghb_resolve_symlink(const gchar *name)
 {
-	gchar *file;
-	GFileInfo *info;
-	GFile *gfile;
-
-	gfile = g_file_new_for_path(name);
-	info = g_file_query_info(gfile, 
-		G_FILE_ATTRIBUTE_STANDARD_NAME ","
-		G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET ","
-		G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
-		G_FILE_QUERY_INFO_NONE, NULL, NULL);
-	while ((info != NULL) && g_file_info_get_is_symlink(info))
-	{
-		GFile *parent;
-		const gchar *target;
-
-		parent = g_file_get_parent(gfile);
-		g_object_unref(gfile);
-		target = g_file_info_get_symlink_target(info);
-		gfile = g_file_resolve_relative_path(parent, target);
-		g_object_unref(parent);
-
-		g_object_unref(info);
-		info = g_file_query_info(gfile, 
-			G_FILE_ATTRIBUTE_STANDARD_NAME ","
-			G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET ","
-			G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
-			G_FILE_QUERY_INFO_NONE, NULL, NULL);
-	}
-	if (info != NULL)
-	{
-		file = g_file_get_path(gfile);
-		g_object_unref(info);
-	}
-	else
-	{
-		file = g_strdup(name);
-	}
-	g_object_unref(gfile);
-	return file;
+    gchar *file;
+    GFileInfo *info;
+    GFile *gfile;
+
+    gfile = g_file_new_for_path(name);
+    info = g_file_query_info(gfile, 
+        G_FILE_ATTRIBUTE_STANDARD_NAME ","
+        G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET ","
+        G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
+        G_FILE_QUERY_INFO_NONE, NULL, NULL);
+    while ((info != NULL) && g_file_info_get_is_symlink(info))
+    {
+        GFile *parent;
+        const gchar *target;
+
+        parent = g_file_get_parent(gfile);
+        g_object_unref(gfile);
+        target = g_file_info_get_symlink_target(info);
+        gfile = g_file_resolve_relative_path(parent, target);
+        g_object_unref(parent);
+
+        g_object_unref(info);
+        info = g_file_query_info(gfile, 
+            G_FILE_ATTRIBUTE_STANDARD_NAME ","
+            G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET ","
+            G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
+            G_FILE_QUERY_INFO_NONE, NULL, NULL);
+    }
+    if (info != NULL)
+    {
+        file = g_file_get_path(gfile);
+        g_object_unref(info);
+    }
+    else
+    {
+        file = g_strdup(name);
+    }
+    g_object_unref(gfile);
+    return file;
 }
 
 void
 ghb_dvd_set_current(const gchar *name, signal_user_data_t *ud)
 {
 #if !defined(_WIN32)
-	GFile *gfile;
-	GFileInfo *info;
-	gchar *resolved = ghb_resolve_symlink(name);
-
-	if (ud->current_dvd_device != NULL)
-	{
-		g_free(ud->current_dvd_device);
-		ud->current_dvd_device = NULL;
-	}
-	gfile = g_file_new_for_path(resolved);
-	info = g_file_query_info(gfile, 
-		G_FILE_ATTRIBUTE_STANDARD_TYPE,
-		G_FILE_QUERY_INFO_NONE, NULL, NULL);
-	if (info != NULL)
-	{
-		if (g_file_info_get_file_type(info) == G_FILE_TYPE_SPECIAL)
-		{
-			// I could go through the trouble to scan the connected drives and 
-			// verify that this device is connected and is a DVD.  But I don't 
-			// think its neccessary.
-			ud->current_dvd_device = resolved;
-		}
-		g_object_unref(info);
-	}
-	else
-	{
-		g_free(resolved);
-	}
-	g_object_unref(gfile);
+    GFile *gfile;
+    GFileInfo *info;
+    gchar *resolved = ghb_resolve_symlink(name);
+
+    if (ud->current_dvd_device != NULL)
+    {
+        g_free(ud->current_dvd_device);
+        ud->current_dvd_device = NULL;
+    }
+    gfile = g_file_new_for_path(resolved);
+    info = g_file_query_info(gfile, 
+        G_FILE_ATTRIBUTE_STANDARD_TYPE,
+        G_FILE_QUERY_INFO_NONE, NULL, NULL);
+    if (info != NULL)
+    {
+        if (g_file_info_get_file_type(info) == G_FILE_TYPE_SPECIAL)
+        {
+            // I could go through the trouble to scan the connected drives and 
+            // verify that this device is connected and is a DVD.  But I don't 
+            // think its neccessary.
+            ud->current_dvd_device = resolved;
+        }
+        g_object_unref(info);
+    }
+    else
+    {
+        g_free(resolved);
+    }
+    g_object_unref(gfile);
 #else
-	gchar drive[4];
-	guint dtype;
-
-	if (ud->current_dvd_device != NULL)
-	{
-		g_free(ud->current_dvd_device);
-		ud->current_dvd_device = NULL;
-	}
-	g_strlcpy(drive, name, 4);
-	dtype = GetDriveType(drive);
-	if (dtype == DRIVE_CDROM)
-	{
-		ud->current_dvd_device = g_strdup(name);
-	}
+    gchar drive[4];
+    guint dtype;
+
+    if (ud->current_dvd_device != NULL)
+    {
+        g_free(ud->current_dvd_device);
+        ud->current_dvd_device = NULL;
+    }
+    g_strlcpy(drive, name, 4);
+    dtype = GetDriveType(drive);
+    if (dtype == DRIVE_CDROM)
+    {
+        ud->current_dvd_device = g_strdup(name);
+    }
 #endif
 }

HandBrake-0.9.8.tar.bz2/gtk/src/ghb.ui -> HandBrake-0.9.9.tar.bz2/gtk/src/ghb.ui Changed

@@ -1,6 +1,64 @@
 <?xml version="1.0"?>
 
 <interface>
+  <object class="GtkLabel" id="SubTrackLabel">
+    <property name="visible">True</property>
+    <property name="label" translatable="yes">&lt;b&gt;Track&lt;/b&gt;</property>
+    <property name="tooltip-text" translatable="yes">The source subtitle track
+
+You can choose any of the subtitles
+recognized in your source file.
+
+In addition, there is a special track option
+"Foreign Audio Search".  This option will add
+an extra pass to the encode that searches for
+subtitles that may correspond to a foreign
+language scene.  This option is best used in
+conjunction with the "Forced" option.</property>
+    <property name="use_markup">True</property>
+  </object>
+  <object class="GtkLabel" id="SubForcedLabel">
+    <property name="visible">True</property>
+    <property name="label" translatable="yes">&lt;b&gt;Forced Only&lt;/b&gt;</property>
+    <property name="tooltip-text" translatable="yes">Use only subtitles that have been flagged
+as forced in the source subtitle track
+
+"Forced" subtitles are usually used to show
+subtitles during scenes where someone is speaking
+a foreign language.</property>
+    <property name="use_markup">True</property>
+  </object>
+  <object class="GtkLabel" id="SubBurnedLabel">
+    <property name="visible">True</property>
+    <property name="label" translatable="yes">&lt;b&gt;Burned In&lt;/b&gt;</property>
+    <property name="tooltip-text" translatable="yes">Render the subtitle over the video.
+
+The subtitle will be part of the video and can not be disabled.</property>
+    <property name="use_markup">True</property>
+  </object>
+  <object class="GtkLabel" id="SubDefaultLabel">
+    <property name="visible">True</property>
+    <property name="label" translatable="yes">&lt;b&gt;Default&lt;/b&gt;</property>
+    <property name="tooltip-text" translatable="yes">Set the default output subtitle track.
+
+Most players will automatically display this
+subtitle track whenever the video is played.
+
+This is usefule for creating a "forced" track
+in your output.</property>
+    <property name="use_markup">True</property>
+  </object>
+  <object class="GtkLabel" id="SubSRTOffsetLabel">
+    <property name="visible">True</property>
+    <property name="label" translatable="yes">&lt;b&gt;SRT Offset&lt;/b&gt;</property>
+    <property name="tooltip-text" translatable="yes">Add (or subtract) an offset (in milliseconds)
+to the start of the SRT subtitle track.
+
+Often, the start of an external SRT file
+does not coincide with the start of the video.
+This setting allows you to synchronize the files.</property>
+    <property name="use_markup">True</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="lower">1</property>
@@ -121,6 +179,14 @@
     <property name="page_size">0</property>
     <property name="value">20.25</property>
   </object>
+  <object class="GtkAdjustment" id="x264PresetRange">
+    <property name="upper">1</property>
+    <property name="lower">0</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment8">
     <property name="upper">16</property>
     <property name="lower">1</property>
@@ -147,10 +213,10 @@
   </object>
   <object class="GtkAdjustment" id="adjustment21">
     <property name="value">15</property>
-    <property name="lower">5</property>
-    <property name="upper">60</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="lower">15</property>
+    <property name="upper">240</property>
+    <property name="step_increment">15</property>
+    <property name="page_increment">15</property>
     <property name="page_size">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment22">
@@ -273,7 +339,7 @@
     <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="preview_count_adj">
-    <property name="upper">30</property>
+    <property name="upper">60</property>
     <property name="lower">5</property>
     <property name="page_increment">10</property>
     <property name="step_increment">5</property>
@@ -406,7 +472,7 @@
         <child>
           <object class="GtkAction" id="queue_start_menu">
             <property name="sensitive">False</property>
-            <property name="icon-name">hb-play</property>
+            <property name="icon-name">hb-start</property>
             <property name="name">queue_start_menu</property>
             <property name="label">_Start Queue</property>
             <signal handler="queue_start_clicked_cb" name="activate"/>
@@ -534,12 +600,6 @@
       </popup>
     </ui>
   </object>
-  <object class="GtkListStore" id="device_list">
-    <columns>
-      
-      <column type="gchararray"/>
-    </columns>
-  </object>
 
   <object class="GtkMenu" id="presets_menu">
     <child>
@@ -646,7 +706,7 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="tooltip-text" translatable="yes">Start Encoding</property>
                 <property name="label" translatable="yes">Start</property>
-                <property name="icon_name">hb-play</property>
+                <property name="icon_name">hb-start</property>
                 <signal handler="queue_start_clicked_cb" name="clicked"/>
               </object>
               <packing>
@@ -675,7 +735,7 @@
                 <property name="sensitive">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="tooltip-text" translatable="yes">Add to Queue</property>
-                <property name="label" translatable="yes">Add to Queue</property>
+                <property name="label" translatable="yes">Enqueue</property>
                 <property name="icon_name">hb-add-queue</property>
                 <signal handler="queue_add_clicked_cb" name="clicked"/>
               </object>
@@ -689,7 +749,7 @@
                 <property name="is_important">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="tooltip-text" translatable="yes">Show Queue</property>
-                <property name="label" translatable="yes">Show Queue</property>
+                <property name="label" translatable="yes">Queue</property>
                 <property name="icon_name">hb-queue</property>
                 <signal handler="show_queue_clicked_cb" name="toggled"/>
               </object>
@@ -717,7 +777,7 @@
                 <property name="is_important">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="tooltip-text" translatable="yes">Show Activity Window</property>
-                <property name="label" translatable="yes">Activity Window</property>
+                <property name="label" translatable="yes">Activity</property>
                 <property name="icon_name">hb-activity</property>
                 <signal handler="show_activity_clicked_cb" name="toggled"/>
               </object>
@@ -731,3051 +791,3610 @@
             <property name="position">1</property>
           </packing>
         </child>
-
-    <child>
-      <object class="GtkHBox" id="hbox1">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
-          <object class="GtkVBox" id="vbox14">
-            <property name="orientation">vertical</property>
+          <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <object class="GtkVBox" id="vbox15">
+              <object class="GtkVBox" id="vbox14">
                 <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkVBox" id="vbox15">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
-                    <property name="left_padding">6</property>
-                    <property name="right_padding">12</property>
-                    <property name="top_padding">12</property>
-                    <property name="bottom_padding">6</property>
-                    <property name="xalign">0</property>
-                    <property name="xscale">1</property>
                     <child>
-                      <object class="GtkVBox" id="vbox16">
-                        <property name="orientation">vertical</property>
+                      <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
-                        <property name="spacing">2</property>
+                        <property name="left_padding">6</property>
+                        <property name="right_padding">12</property>
+                        <property name="top_padding">12</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="xalign">0</property>
+                        <property name="xscale">1</property>
                         <child>
-                          <object class="GtkHBox" id="hbox54">
+                          <object class="GtkVBox" id="vbox16">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label7">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Source:&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
+                            <property name="spacing">2</property>
                             <child>
-                              <object class="GtkLabel" id="source_title">
+                              <object class="GtkHBox" id="hbox54">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">None</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkAlignment" id="alignment68">
-                                <property name="visible">True</property>
-                                <property name="xscale">1</property>
-                                <property name="yscale">0</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label7">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Source:&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
                                 <child>
-                                  <object class="GtkProgressBar" id="scan_prog">
-                                    <property name="height_request">10</property>
-                                    <property name="width_request">400</property>
-                                    <property name="visible">False</property>
+                                  <object class="GtkLabel" id="source_title">
+                                    <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="text" translatable="yes"/>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">None</property>
                                   </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkTable" id="table7">
-                            <property name="visible">True</property>
-                            <property name="n_rows">2</property>
-                            <property name="n_columns">2</property>
-                            <property name="column-spacing">5</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment72">
-                                <property name="visible">True</property>
-                                <property name="top_padding">6</property>
-                                <property name="left_padding">6</property>
                                 <child>
-                                  <object class="GtkLabel" id="label20">
+                                  <object class="GtkAlignment" id="alignment68">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0.1</property>
-                                    <property name="label" translatable="yes">Title:</property>
+                                    <property name="xscale">1</property>
+                                    <property name="yscale">0</property>
+                                    <child>
+                                      <object class="GtkProgressBar" id="scan_prog">
+                                        <property name="height_request">10</property>
+                                        <property name="width_request">400</property>
+                                        <property name="visible">False</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="text" translatable="yes"/>
+                                      </object>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="bottom_attach">1</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox42">
+                              <object class="GtkTable" id="table7">
                                 <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="spacing">5</property>
-
-                                <child>
-                                  <object class="GtkAlignment" id="alignment75">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xscale">0</property>
-                                    <property name="yscale">0</property>
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <property name="column-spacing">5</property>
                                 <child>
-                                  <object class="GtkComboBox" id="title">
+                                  <object class="GtkAlignment" id="alignment72">
                                     <property name="visible">True</property>
-                                    <property name="has_frame">False</property>
-                                    <property name="tooltip-text" translatable="yes">Set the title to encode. By default the longest title is chosen.  This is often the feature title of a DVD.</property>
-                                    <signal handler="title_changed_cb" name="changed"/>
+                                    <property name="top_padding">6</property>
+                                    <property name="left_padding">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label20">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0.1</property>
+                                        <property name="label" translatable="yes">Title:</property>
+                                      </object>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkHBox" id="hbox42">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="spacing">5</property>
 
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment75">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xscale">0</property>
+                                        <property name="yscale">0</property>
+                                    <child>
+                                      <object class="GtkComboBox" id="title">
+                                        <property name="visible">True</property>
+                                        <property name="has_frame">False</property>
+                                        <property name="tooltip-text" translatable="yes">Set the title to encode. By default the longest title is chosen.  This is often the feature title of a DVD.</property>
+                                        <signal handler="title_changed_cb" name="changed"/>
+                                      </object>
+                                    </child>
+
+                                      </object>
+                                    </child>
+
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment73">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">1</property>
+                                        <property name="xscale">0</property>
+                                        <property name="yscale">0</property>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox44">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="spacing">7</property>
+                                            <child>
+                                              <object class="GtkLabel" id="angle_label">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Angle:</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSpinButton" id="angle">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="tooltip-text" translatable="yes">For multi-angle DVD's, select the desired angle to encode.</property>
+                                                <property name="adjustment">adjustment27</property>
+                                                <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                  </packing>
                                 </child>
 
                                 <child>
-                                  <object class="GtkAlignment" id="alignment73">
+                                  <object class="GtkAlignment" id="alignment74">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
+                                    <property name="xalign">0</property>
                                     <property name="xscale">0</property>
                                     <property name="yscale">0</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox44">
+                                      <object class="GtkHBox" id="hbox48">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="spacing">7</property>
+                                        <property name="spacing">5</property>
+
                                         <child>
-                                          <object class="GtkLabel" id="angle_label">
+                                          <object class="GtkComboBox" id="PtoPType">
                                             <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Angle:</property>
+                                            <property name="tooltip-text" translatable="yes">Range of title to encode. Can be chapters, seconds, or frames.</property>
+                                            <signal handler="ptop_widget_changed_cb" name="changed"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="fill">False</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkSpinButton" id="angle">
+                                          <object class="GtkSpinButton" id="start_point">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="tooltip-text" translatable="yes">For multi-angle DVD's, select the desired angle to encode.</property>
-                                            <property name="adjustment">adjustment27</property>
-                                            <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                                            <property name="tooltip-text" translatable="yes">Set the first chapter to encode.</property>
+                                            <property name="adjustment">adjustment1</property>
+                                            <signal handler="start_point_changed_cb" name="value_changed"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label56">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">through</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="end_point">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the last chapter to encode.</property>
+                                            <property name="adjustment">adjustment2</property>
+                                            <signal handler="end_point_changed_cb" name="value_changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox47">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="spacing">7</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label6">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0.1</property>
+                                            <property name="label" translatable="yes">Duration:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="title_duration">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">hh:mm:ss</property>
+                                            <property name="width_chars">8</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
                                       </object>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">0</property>
-                                <property name="bottom_attach">1</property>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
-
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame2">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment44">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment74">
+                              <object class="GtkHBox" id="hbox67">
                                 <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
+                                <property name="spacing">12</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox48">
+                                  <object class="GtkTable" id="table4">
                                     <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="spacing">5</property>
-
+                                    <property name="n_rows">2</property>
+                                    <property name="n_columns">2</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                     <child>
-                                      <object class="GtkComboBox" id="PtoPType">
+                                      <object class="GtkFileChooserButton" id="dest_dir">
                                         <property name="visible">True</property>
-                                        <property name="tooltip-text" translatable="yes">Range of title to encode. Can be chapters, seconds, or frames.</property>
-                                        <signal handler="ptop_widget_changed_cb" name="changed"/>
+                                        <property name="local-only">False</property>
+                                        <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                        <property name="title" translatable="yes">Destination Directory</property>
+                                        <property name="tooltip-text" translatable="yes">Destination directory for your encode.</property>
+                                        <signal name="selection_changed" handler="dest_dir_set_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">0</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkSpinButton" id="start_point">
+                                      <object class="GtkEntry" id="dest_file">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip-text" translatable="yes">Set the first chapter to encode.</property>
-                                        <property name="adjustment">adjustment1</property>
-                                        <signal handler="start_point_changed_cb" name="value_changed"/>
+                                        <property name="width_chars">40</property>
+                                        <property name="tooltip-text" translatable="yes">Destination filename for your encode.</property>
+                                        <signal name="changed" handler="dest_file_changed_cb"/>
+                                        <signal name="grab_focus" handler="destination_grab_cb" after="yes"/>
+                                        <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">1</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="label56">
+                                      <object class="GtkLabel" id="label18">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">through</property>
+                                        <property name="label" translatable="yes">File:</property>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkTable" id="container_box">
+                                    <property name="visible">True</property>
+                                    <property name="n_rows">2</property>
+                                    <property name="n_columns">2</property>
+                                    <property name="column_spacing">4</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox3">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">4</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label45">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Format:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="FileFormat">
+                                            <property name="visible">True</property>
+                                            <property name="tooltip-text" translatable="yes">Format to mux encoded tracks to.</property>
+                                            <signal name="changed" handler="container_changed_cb"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options">GTK_FILL</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkSpinButton" id="end_point">
+                                      <object class="GtkCheckButton" id="Mp4iPodCompatible">
+                                        <property name="label" translatable="yes">iPod 5G Support</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip-text" translatable="yes">Set the last chapter to encode.</property>
-                                        <property name="adjustment">adjustment2</property>
-                                        <signal handler="end_point_changed_cb" name="value_changed"/>
+                                        <property name="tooltip-text" translatable="yes">Add iPod Atom needed by some older iPods.</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="setting_widget_changed_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">3</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
                                       </packing>
                                     </child>
-                                <child>
-                                  <object class="GtkHBox" id="hbox47">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="spacing">7</property>
                                     <child>
-                                      <object class="GtkLabel" id="label6">
+                                      <object class="GtkCheckButton" id="Mp4HttpOptimize">
+                                        <property name="label" translatable="yes">Web optimized</property>
                                         <property name="visible">True</property>
-                                        <property name="xalign">0.1</property>
-                                        <property name="label" translatable="yes">Duration:</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="tooltip-text" translatable="yes">Optimize the layout of the MP4 file for progressive download.  This allows a player to initiate playback before downloading the entire file.</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="http_opt_changed_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">0</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="title_duration">
+                                      <object class="GtkCheckButton" id="Mp4LargeFile">
+                                        <property name="label" translatable="yes">Large file (&gt;4GB)</property>
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="tooltip-markup" translatable="yes">Allow 64 bit MP4 file which can be over 4GB.
+
+    &lt;b&gt;Caution:&lt;/b&gt; This option may break device compatibility.</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">hh:mm:ss</property>
-                                        <property name="width_chars">8</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="setting_widget_changed_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">1</property>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="position">1</property>
                                     <property name="expand">False</property>
-                                    <property name="position">4</property>
                                   </packing>
                                 </child>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label11">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;&lt;u&gt;D&lt;/u&gt;estination&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame2">
+                  <object class="GtkAlignment" id="alignment67">
                     <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="top_padding">0</property>
+                    <property name="left_padding">12</property>
+                    <property name="right_padding">12</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment44">
+                      <object class="GtkNotebook" id="SettingsNotebook">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <property name="top_padding">6</property>
-                        <property name="bottom_padding">6</property>
+                        <property name="can_focus">True</property>
                         <child>
-                          <object class="GtkHBox" id="hbox67">
+                          <object class="GtkHBox" id="picture_tab">
                             <property name="visible">True</property>
-                            <property name="spacing">12</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="spacing">3</property>
+
                             <child>
-                              <object class="GtkTable" id="table4">
+                              <object class="GtkAlignment" id="picture_summary">
                                 <property name="visible">True</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <object class="GtkFileChooserButton" id="dest_dir">
-                                    <property name="visible">True</property>
-                                    <property name="local-only">False</property>
-                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
-                                    <property name="title" translatable="yes">Destination Directory</property>
-                                    <property name="tooltip-text" translatable="yes">Destination directory for your encode.</property>
-                                    <signal name="selection_changed" handler="dest_dir_set_cb"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="dest_file">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="width_chars">40</property>
-                                    <property name="tooltip-text" translatable="yes">Destination filename for your encode.</property>
-                                    <signal name="changed" handler="dest_file_changed_cb"/>
-                                    <signal name="grab_focus" handler="destination_grab_cb" after="yes"/>
-                                    <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
+                                <property name="top_padding">10</property>
+                                <property name="left_padding">10</property>
+
                                 <child>
-                                  <object class="GtkLabel" id="label18">
+                                  <object class="GtkVBox" id="vbox43">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">File:</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="spacing">14</property>
+                                    <child>
+                                      <object class="GtkFrame" id="frame5">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment9">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="top_padding">6</property>
+                                            <property name="bottom_padding">2</property>
+                                            <property name="left_padding">12</property>
+                                            <child>
+                                              <object class="GtkTable" id="table11">
+                                                <property name="visible">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="n_rows">4</property>
+                                                <property name="n_columns">2</property>
+                                                <property name="homogeneous">True</property>
+
+                                                <child>
+                                                  <object class="GtkLabel" id="labela5">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Source Codec:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="source_codec">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label23">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Dimensions:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="source_dimensions">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label42">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Aspect: </property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="source_aspect">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label43">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Frame Rate:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">3</property>
+                                                    <property name="bottom_attach">4</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="source_frame_rate">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">3</property>
+                                                    <property name="bottom_attach">4</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label44">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Source Picture Parameters&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="padding">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkFrame" id="Cropping1">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment52">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="top_padding">6</property>
+                                            <property name="bottom_padding">2</property>
+                                            <property name="left_padding">12</property>
+                                            <property name="right_padding">2</property>
+                                            <child>
+                                              <object class="GtkTable" id="table12">
+                                                <property name="visible">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="n_rows">3</property>
+                                                <property name="n_columns">2</property>
+                                                <property name="homogeneous">True</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="label13">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Autocrop:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="crop_auto">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes">On</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label12">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Crop:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="crop_values">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label76">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Crop Dimensions:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="crop_dimensions">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label16">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="padding">2</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkFrame" id="frame16">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment20">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="top_padding">6</property>
+                                            <property name="bottom_padding">2</property>
+                                            <property name="left_padding">12</property>
+                                            <property name="right_padding">2</property>
+                                            <child>
+                                              <object class="GtkTable" id="table13">
+                                                <property name="visible">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="n_rows">3</property>
+                                                <property name="n_columns">2</property>
+                                                <property name="homogeneous">True</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="label14">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Scale Dimensions:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="scale_dimensions">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes">--</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label15">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Optimal for Source:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="scale_auto">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes">On</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label17">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Anamorphic:</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="scale_anamorphic">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes">On</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_EXPAND|GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label19">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Scaling&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="padding">2</property>
+                                      </packing>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
                                 </child>
+
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkTable" id="container_box">
+                              <object class="GtkAlignment" id="alignment56">
                                 <property name="visible">True</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">4</property>
+                                <property name="right_padding">12</property>
+                                <property name="top_padding">12</property>
+                                <property name="yalign">0.4</property>
+                                <property name="yscale">0</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox3">
+                                  <object class="GtkVBox" id="vbox9">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
-                                    <property name="spacing">4</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <child>
-                                      <object class="GtkLabel" id="label45">
+                                      <object class="GtkAlignment" id="alignment19">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Format:</property>
+                                        <property name="bottom_padding">4</property>
+                                        <property name="left_padding">4</property>
+                                        <property name="right_padding">4</property>
+                                        <property name="yalign">1</property>
+                                        <child>
+                                          <object class="GtkImage" id="preview_button_image">
+                                            <property name="width_request">448</property>
+                                            <property name="height_request">200</property>
+                                            <property name="visible">True</property>
+                                            <property name="icon_name">hb-icon</property>
+                                            <property name="pixel-size">128</property>
+                                            <signal name="size_allocate" handler="preview_button_size_allocate_cb"/>
+                                          </object>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
-                                        <property name="position">0</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="FileFormat">
+                                      <object class="GtkAlignment" id="picture_summary2">
                                         <property name="visible">True</property>
-                                        <property name="tooltip-text" translatable="yes">Format to mux encoded tracks to.</property>
-                                        <signal name="changed" handler="container_changed_cb"/>
+                                        <property name="yalign">0</property>
+                                        <property name="xscale">0</property>
+                                        <property name="yscale">0</property>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox7">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">4</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label10">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Presentation Dimensions:</property>
+                                                <property name="justify">right</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="preview_dims">
+                                                <property name="width_request">85</property>
+                                                <property name="visible">True</property>
+                                                <property name="xalign">0.2</property>
+                                                <property name="yalign">0</property>
+                                                <property name="label" translatable="yes">--</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+
+                                          </object>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="position">1</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="Mp4iPodCompatible">
-                                    <property name="label" translatable="yes">iPod 5G Support</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Add iPod Atom needed by some older iPods.</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="setting_widget_changed_cb"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="Mp4HttpOptimize">
-                                    <property name="label" translatable="yes">Web optimized</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Optimize the layout of the MP4 file for progressive download.  This allows a player to initiate playback before downloading the entire file.</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="http_opt_changed_cb"/>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="Mp4LargeFile">
-                                    <property name="label" translatable="yes">Large file (&gt;4GB)</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-markup" translatable="yes">Allow 64 bit MP4 file which can be over 4GB.
-
-&lt;b&gt;Caution:&lt;/b&gt; This option may break device compatibility.</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="setting_widget_changed_cb"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
-                                <property name="expand">False</property>
                               </packing>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label11">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;&lt;u&gt;D&lt;/u&gt;estination&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="alignment67">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="top_padding">0</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
-
-            <child>
-              <object class="GtkNotebook" id="settings_box">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <object class="GtkHBox" id="picture_tab">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="spacing">3</property>
-
-                    <child>
-                      <object class="GtkAlignment" id="alignment55">
-                        <property name="visible">True</property>
-                        <property name="top_padding">10</property>
-                        <property name="left_padding">10</property>
-
-						<child>
-						  <object class="GtkVBox" id="vbox43">
-							<property name="orientation">vertical</property>
-							<property name="visible">True</property>
-							<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-							<property name="spacing">14</property>
-							<child>
-							  <object class="GtkFrame" id="frame5">
-								<property name="visible">True</property>
-								<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-								<property name="label_xalign">0</property>
-								<property name="shadow_type">GTK_SHADOW_NONE</property>
-								<child>
-								  <object class="GtkAlignment" id="alignment9">
-									<property name="visible">True</property>
-									<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-									<property name="top_padding">6</property>
-									<property name="bottom_padding">2</property>
-									<property name="left_padding">12</property>
-									<child>
-									  <object class="GtkTable" id="table11">
-										<property name="visible">True</property>
-										<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-										<property name="n_rows">4</property>
-										<property name="n_columns">2</property>
-										<property name="homogeneous">True</property>
-
-										<child>
-										  <object class="GtkLabel" id="labela5">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Source Codec:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">0</property>
-											<property name="bottom_attach">1</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="source_codec">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">0</property>
-											<property name="bottom_attach">1</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label23">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Dimensions:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">1</property>
-											<property name="bottom_attach">2</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="source_dimensions">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">1</property>
-											<property name="bottom_attach">2</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label42">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Aspect: </property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">2</property>
-											<property name="bottom_attach">3</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="source_aspect">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">2</property>
-											<property name="bottom_attach">3</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label43">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Frame Rate:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">3</property>
-											<property name="bottom_attach">4</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="source_frame_rate">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">3</property>
-											<property name="bottom_attach">4</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-									  </object>
-									</child>
-								  </object>
-								</child>
-								<child type="label">
-								  <object class="GtkLabel" id="label44">
-									<property name="visible">True</property>
-									<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-									<property name="label" translatable="yes">&lt;b&gt;Source Picture Parameters&lt;/b&gt;</property>
-									<property name="use_markup">True</property>
-								  </object>
-								</child>
-							  </object>
-							  <packing>
-								<property name="expand">False</property>
-								<property name="padding">2</property>
-							  </packing>
-							</child>
-							<child>
-							  <object class="GtkFrame" id="Cropping1">
-								<property name="visible">True</property>
-								<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-								<property name="label_xalign">0</property>
-								<property name="shadow_type">GTK_SHADOW_NONE</property>
-								<child>
-								  <object class="GtkAlignment" id="alignment52">
-									<property name="visible">True</property>
-									<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-									<property name="top_padding">6</property>
-									<property name="bottom_padding">2</property>
-									<property name="left_padding">12</property>
-									<property name="right_padding">2</property>
-									<child>
-									  <object class="GtkTable" id="table12">
-										<property name="visible">True</property>
-										<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-										<property name="n_rows">3</property>
-										<property name="n_columns">2</property>
-										<property name="homogeneous">True</property>
-										<child>
-										  <object class="GtkLabel" id="label13">
-											<property name="visible">True</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Autocrop:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">0</property>
-											<property name="bottom_attach">1</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="crop_auto">
-											<property name="visible">True</property>
-											<property name="label" translatable="yes">On</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">0</property>
-											<property name="bottom_attach">1</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label12">
-											<property name="visible">True</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Crop:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">1</property>
-											<property name="bottom_attach">2</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="crop_values">
-											<property name="visible">True</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">1</property>
-											<property name="bottom_attach">2</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label76">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Crop Dimensions:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">2</property>
-											<property name="bottom_attach">3</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="crop_dimensions">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">2</property>
-											<property name="bottom_attach">3</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-									  </object>
-									</child>
-								  </object>
-								</child>
-								<child type="label">
-								  <object class="GtkLabel" id="label16">
-									<property name="visible">True</property>
-									<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-									<property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
-									<property name="use_markup">True</property>
-								  </object>
-								</child>
-							  </object>
-							  <packing>
-								<property name="expand">False</property>
-								<property name="padding">2</property>
-								<property name="position">1</property>
-							  </packing>
-							</child>
-							<child>
-							  <object class="GtkFrame" id="frame16">
-								<property name="visible">True</property>
-								<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-								<property name="label_xalign">0</property>
-								<property name="shadow_type">GTK_SHADOW_NONE</property>
-								<child>
-								  <object class="GtkAlignment" id="alignment20">
-									<property name="visible">True</property>
-									<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-									<property name="top_padding">6</property>
-									<property name="bottom_padding">2</property>
-									<property name="left_padding">12</property>
-									<property name="right_padding">2</property>
-									<child>
-									  <object class="GtkTable" id="table13">
-										<property name="visible">True</property>
-										<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-										<property name="n_rows">3</property>
-										<property name="n_columns">2</property>
-										<property name="homogeneous">True</property>
-										<child>
-										  <object class="GtkLabel" id="label14">
-											<property name="visible">True</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Scale Dimensions:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">0</property>
-											<property name="bottom_attach">1</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="scale_dimensions">
-											<property name="visible">True</property>
-											<property name="label" translatable="yes">--</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">0</property>
-											<property name="bottom_attach">1</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label15">
-											<property name="visible">True</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Optimal for Source:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">1</property>
-											<property name="bottom_attach">2</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="scale_auto">
-											<property name="visible">True</property>
-											<property name="label" translatable="yes">On</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">1</property>
-											<property name="bottom_attach">2</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="label17">
-											<property name="visible">True</property>
-											<property name="xalign">0</property>
-											<property name="label" translatable="yes">Anamorphic:</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">0</property>
-											<property name="right_attach">1</property>
-											<property name="top_attach">2</property>
-											<property name="bottom_attach">3</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-										<child>
-										  <object class="GtkLabel" id="scale_anamorphic">
-											<property name="visible">True</property>
-											<property name="label" translatable="yes">On</property>
-										  </object>
-										  <packing>
-											<property name="left_attach">1</property>
-											<property name="right_attach">2</property>
-											<property name="top_attach">2</property>
-											<property name="bottom_attach">3</property>
-											<property name="x_options">GTK_EXPAND|GTK_FILL</property>
-										  </packing>
-										</child>
-									  </object>
-									</child>
-								  </object>
-								</child>
-								<child type="label">
-								  <object class="GtkLabel" id="label19">
-									<property name="visible">True</property>
-									<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-									<property name="label" translatable="yes">&lt;b&gt;Scaling&lt;/b&gt;</property>
-									<property name="use_markup">True</property>
-								  </object>
-								</child>
-							  </object>
-							  <packing>
-								<property name="expand">False</property>
-								<property name="padding">2</property>
-							  </packing>
-							</child>
-						  </object>
-						</child>
-
-                      </object>
-                      <packing>
-						<property name="expand">True</property>
-						<property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment56">
-                        <property name="visible">True</property>
-                        <property name="right_padding">12</property>
-                        <property name="top_padding">12</property>
-						<child>
-						  <object class="GtkVBox" id="vbox9">
-							<property name="orientation">vertical</property>
-							<property name="visible">True</property>
-							<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-							<child>
-							  <object class="GtkFrame" id="frame8">
-								<property name="visible">True</property>
-								<property name="label_xalign">0</property>
-								<property name="shadow_type">none</property>
-								<child>
-								  <object class="GtkAlignment" id="alignment19">
-									<property name="visible">True</property>
-									<property name="bottom_padding">4</property>
-									<property name="left_padding">4</property>
-									<property name="right_padding">4</property>
-									<child>
-									  <object class="GtkImage" id="preview_button_image">
-										<property name="width_request">448</property>
-										<property name="height_request">200</property>
-										<property name="visible">True</property>
-										<property name="icon_name">hb-icon</property>
-										<property name="icon-size">6</property>
-										<signal name="size_allocate" handler="preview_button_size_allocate_cb"/>
-									  </object>
-									</child>
-								  </object>
-								</child>
-							  </object>
-							  <packing>
-								<property name="expand">False</property>
-								<property name="fill">False</property>
-								<property name="position">1</property>
-							  </packing>
-							</child>
-							<child>
-							  <object class="GtkAlignment" id="alignment57">
-								<property name="visible">True</property>
-								<property name="xscale">0</property>
-								<property name="yscale">0</property>
-								<child>
-								  <object class="GtkHBox" id="hbox7">
-									<property name="visible">True</property>
-									<property name="spacing">4</property>
-									<child>
-									  <object class="GtkLabel" id="label10">
-										<property name="visible">True</property>
-										<property name="label" translatable="yes">Presentation Dimensions:</property>
-										<property name="justify">right</property>
-									  </object>
-									  <packing>
-										<property name="expand">False</property>
-										<property name="position">0</property>
-									  </packing>
-									</child>
-									<child>
-									  <object class="GtkLabel" id="preview_dims">
-										<property name="width_request">85</property>
-										<property name="visible">True</property>
-										<property name="xalign">0.2</property>
-										<property name="yalign">0</property>
-										<property name="label" translatable="yes">--</property>
-									  </object>
-									  <packing>
-										<property name="expand">False</property>
-										<property name="position">1</property>
-									  </packing>
-									</child>
-
-								  </object>
-								</child>
-							  </object>
-							  <packing>
-								<property name="expand">False</property>
-								<property name="fill">False</property>
-								<property name="position">2</property>
-							  </packing>
-							</child>
-						  </object>
-						</child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="picture_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Summary</property>
-                  </object>
-                  <packing>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox17">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-
-                    <property name="spacing">48</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment14">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="top_padding">48</property>
-                        <property name="left_padding">24</property>
+                        <child type="tab">
+                          <object class="GtkLabel" id="picture_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Summary</property>
+                          </object>
+                          <packing>
+                            <property name="tab_fill">False</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkVBox" id="vbox13">
-                            <property name="orientation">vertical</property>
+                          <object class="GtkVBox" id="vbox22">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">4</property>
+
+                            <property name="spacing">8</property>
                             <child>
-                              <object class="GtkHBox" id="hbox18">
+                              <object class="GtkHBox" id="hbox17">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+
+                                <property name="spacing">48</property>
                                 <child>
-                                  <object class="GtkLabel" id="label46">
+                                  <object class="GtkAlignment" id="alignment14">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Video Encoder:</property>
-                                    <property name="width_chars">11</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="top_padding">48</property>
+                                    <property name="left_padding">24</property>
+                                    <child>
+                                      <object class="GtkTable" id="table15">
+                                        <property name="row_spacing">5</property>
+                                        <property name="column_spacing">5</property>
+                                        <property name="n_rows">6</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label46">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Video Encoder:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="VideoEncoder">
+                                            <property name="visible">True</property>
+                                            <property name="tooltip-text" translatable="yes">Available video encoders.</property>
+                                            <signal handler="vcodec_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label47">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Framerate:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="VideoFramerate">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Output framerate.  'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it.</property>
+                                            <signal handler="framerate_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="VideoFramerateCFR">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Enables constant framerate output.</property>
+                                            <property name="label" translatable="yes">Constant Framerate</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="VideoFrameratePFR">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Enables variable framerate output with a peak rate determined by the framerate setting. VFR is not compatible with some players.</property>
+                                            <property name="label" translatable="yes">Peak Framerate (VFR)</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">VideoFramerateCFR</property>
+                                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="VideoFramerateVFR">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Enables variable framerate output. VFR is not compatible with some players.</property>
+                                            <property name="label" translatable="yes">Variable Framerate</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">VideoFramerateCFR</property>
+                                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment11">
+                                  <object class="GtkAlignment" id="alignment10">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xscale">0</property>
+                                    <property name="top_padding">48</property>
+                                    <property name="right_padding">24</property>
                                     <child>
-                                      <object class="GtkComboBox" id="VideoEncoder">
+                                      <object class="GtkTable" id="table8">
+                                        <property name="row_spacing">5</property>
+                                        <property name="column_spacing">5</property>
+                                        <property name="n_rows">6</property>
+                                        <property name="n_columns">3</property>
                                         <property name="visible">True</property>
-                                        <property name="tooltip-text" translatable="yes">Available video encoders.</property>
-                                        <signal handler="vcodec_changed_cb" name="changed"/>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <object class="GtkHScale" id="VideoQualitySlider">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the desired quality factor. The encoder targets a certain quality.  The scale used by each video encoder is different.  
+
+            x264's scale is logarithmic and lower values coorespond to higher quality.  So small decreases in value will result in progressively larger increases in the resulting file size.  A value of 0 means lossless and will result in a file size that is larger than the original source, unless the source was also lossless.
+
+            FFMpeg's and Theora's scale is more linear.  These encoders do not have a lossless mode.</property>
+                                            <property name="adjustment">adjustment5</property>
+                                            <property name="digits">3</property>
+                                            <property name="value_pos">GTK_POS_TOP</property>
+                                            <signal handler="vquality_changed_cb" name="value_changed"/>
+                                            <signal handler="format_vquality_cb" name="format-value"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="vquality_type_constant">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the desired quality factor. The encoder targets a certain quality.  The scale used by each video encoder is different.  
+
+            x264's scale is logarithmic and lower values coorespond to higher quality.  So small decreases in value will result in progressively larger increases in the resulting file size.  A value of 0 means lossless and will result in a file size that is larger than the original source, unless the source was also lossless.
+
+            FFMpeg's and Theora's scale is more linear.  These encoders do not have a lossless mode.</property>
+                                            <property name="label" translatable="yes">Constant Quality:</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="vquality_type_bitrate">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the average bitrate. The instantaneous bitrate can be much higher or lower at any point in time.  But the average over a long duration will be the value set here.  If you need to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</property>
+                                            <property name="label" translatable="yes">Bitrate (kbps):    </property>
+                                            <property name="group">vquality_type_constant</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" id="VideoAvgBitrate">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the average bitrate. The instantaneous bitrate can be much higher or lower at any point in time.  But the average over a long duration will be the value set here.  If you need to limit instantaneous bitrate, look into x264 vbv-bufsize and vbv-maxrate.</property>
+                                            <property name="adjustment">adjustment3</property>
+                                            <signal handler="setting_widget_changed_cb" name="value_changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="VideoTwoPass">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Perform 2 Pass Encoding.  The 'Bitrate' option is prerequisite. During the 1st pass, statistics about the video are collected.  Then in the second pass, those statistics are used to make bitrate allocation decisions.</property>
+                                            <property name="label" translatable="yes">2-Pass Encoding</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment13">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="left_padding">16</property>
+                                            <child>
+                                              <object class="GtkCheckButton" id="VideoTurboTwoPass">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="tooltip-text" translatable="yes">During the 1st pass of a 2 pass encode, use settings that speed things along.</property>
+                                                <property name="label" translatable="yes">Turbo First Pass</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
+                                                <signal handler="setting_widget_changed_cb" name="toggled"/>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="top_attach">4</property>
+                                            <property name="bottom_attach">5</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">4</property>
+                                    <property name="padding">2</property>
                                     <property name="position">1</property>
+                                    <property name="expand">True</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="padding">2</property>
+                                <property name="position">0</property>
                                 <property name="expand">False</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox19">
+                              <object class="GtkAlignment" id="alignment55">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="left_padding">24</property>
+                                <property name="right_padding">24</property>
                                 <child>
-                                  <object class="GtkLabel" id="label47">
+                                  <object class="GtkVBox" id="x264VideoSettings">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Framerate:</property>
-                                    <property name="width_chars">11</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment12">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xscale">0</property>
                                     <child>
-                                      <object class="GtkComboBox" id="VideoFramerate">
+                                      <object class="GtkCheckButton" id="x264UseAdvancedOptions">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip-text" translatable="yes">Output framerate.  'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it.</property>
-                                        <signal handler="framerate_changed_cb" name="changed"/>
+                                        <property name="tooltip-text" translatable="yes">Use advanced options Tab for x264 settings.
+
+        Use at your own risk!</property>
+                                        <property name="label" translatable="yes">Use Advanced Options</property>
+                                        <property name="active">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal handler="x264_use_advanced_options_changed_cb" name="toggled"/>
                                       </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="padding">2</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">4</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="VideoFramerateCFR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Enables constant framerate output.</property>
-                                <property name="label" translatable="yes">Constant Framerate</property>
-                                <property name="draw_indicator">True</property>
-                                <signal handler="setting_widget_changed_cb" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="VideoFrameratePFR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Enables variable framerate output with a peak rate determined by the framerate setting. VFR is not compatible with some players.</property>
-                                <property name="label" translatable="yes">Peak Framerate (VFR)</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">VideoFramerateCFR</property>
-                                <signal handler="setting_widget_changed_cb" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="VideoFramerateVFR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Enables variable framerate output. VFR is not compatible with some players.</property>
-                                <property name="label" translatable="yes">Variable Framerate</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">VideoFramerateCFR</property>
-                                <signal handler="setting_widget_changed_cb" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment10">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="top_padding">48</property>
-                        <property name="right_padding">24</property>
-                        <child>
-                          <object class="GtkTable" id="table8">
-                            <property name="n_rows">6</property>
-                            <property name="n_columns">3</property>
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <child>
-                              <object class="GtkHScale" id="VideoQualitySlider">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Set the desired quality factor. The encoder targets a certain quality.  The scale used by each video encoder is different.  
+                                    <child>
+                                      <object class="GtkTable" id="x264VideoSettingsTable">
+                                        <property name="row_spacing">5</property>
+                                        <property name="column_spacing">5</property>
+                                        <property name="n_rows">4</property>
+                                        <property name="n_columns">6</property>
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <object class="GtkLabel" id="x264PresetLabel">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">x264 Preset:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHScale" id="x264PresetSlider">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Adjusts x264 settings to trade off compression efficiency against encoding speed.
 
-x264's scale is logarithmic and lower values coorespond to higher quality.  So small decreases in value will result in progressively larger increases in the resulting file size.  A value of 0 means lossless and will result in a file size that is larger than the original source, unless the source was also lossless.
+            This establishes your default x264 settings.  Tunes, profiles, levels and advanced option string will be applied to this.
 
-FFMpeg's and Theora's scale is more linear.  These encoders do not have a lossless mode.</property>
-                                <property name="adjustment">adjustment5</property>
-                                <property name="digits">3</property>
-                                <property name="value_pos">GTK_POS_TOP</property>
-                                <signal handler="vquality_changed_cb" name="value_changed"/>
-                                <signal handler="format_vquality_cb" name="format-value"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">0</property>
-                                <property name="bottom_attach">1</property>
-                                <property name="y_options">GTK_FILL</property>
-                                <property name="x_options">GTK_FILL|GTK_EXPAND</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="vquality_type_constant">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Set the desired quality factor. The encoder targets a certain quality.  The scale used by each video encoder is different.  
+            You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.</property>
+                                            <property name="adjustment">x264PresetRange</property>
+                                            <property name="digits">0</property>
+                                            <property name="value_pos">GTK_POS_RIGHT</property>
+                                            <signal handler="x264_setting_changed_cb" name="value_changed"/>
+                                            <signal handler="format_x264_preset_cb" name="format-value"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">6</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="x264TuneLabel">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">x264 Tune:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="x264Tune">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Tune settings to optimize for common scenarios.
 
-x264's scale is logarithmic and lower values coorespond to higher quality.  So small decreases in value will result in progressively larger increases in the resulting file size.  A value of 0 means lossless and will result in a file size that is larger than the original source, unless the source was also lossless.
+            This can improve effeciency for particular source characteristics or set characteristics of the output file.
 
-FFMpeg's and Theora's scale is more linear.  These encoders do not have a lossless mode.</property>
-                                <property name="label" translatable="yes">Constant Quality:</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal handler="setting_widget_changed_cb" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="vquality_type_bitrate">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Set the average bitrate. The instantaneous bitrate can be much higher or lower at any point in time.  But the average over a long duration will be the value set here.  If you need to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</property>
-                                <property name="label" translatable="yes">Bitrate (kbps):    </property>
-                                <property name="group">vquality_type_constant</property>
-                                <property name="draw_indicator">True</property>
-                                <signal handler="setting_widget_changed_cb" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="y_options">GTK_FILL</property>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="VideoAvgBitrate">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Set the average bitrate. The instantaneous bitrate can be much higher or lower at any point in time.  But the average over a long duration will be the value set here.  If you need to limit instantaneous bitrate, look into x264 vbv-bufsize and vbv-maxrate.</property>
-                                <property name="adjustment">adjustment3</property>
-                                <signal handler="setting_widget_changed_cb" name="value_changed"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="y_options">GTK_FILL</property>
-                                <property name="x_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="VideoTwoPass">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="tooltip-text" translatable="yes">Perform 2 Pass Encoding.  The 'Bitrate' option is prerequisite. During the 1st pass, statistics about the video are collected.  Then in the second pass, those statistics are used to make bitrate allocation decisions.</property>
-                                <property name="label" translatable="yes">2-Pass Encoding</property>
-                                <property name="draw_indicator">True</property>
-                                <signal handler="setting_widget_changed_cb" name="toggled"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="y_options">GTK_FILL</property>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkAlignment" id="alignment13">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="left_padding">16</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="VideoTurboTwoPass">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">During the 1st pass of a 2 pass encode, use settings that speed things along.</property>
-                                    <property name="label" translatable="yes">Turbo First Pass</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal handler="setting_widget_changed_cb" name="toggled"/>
+            Changes will be applied after the preset but before all other parameters.</property>
+                                            <signal handler="x264_setting_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="x264FastDecode">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Reduce decoder CPU usage.
+
+            Set this if your device is struggling to play the output (dropped frames).</property>
+                                            <property name="label" translatable="yes">Fast Decode</property>
+                                            <property name="active">False</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal handler="x264_setting_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="x_padding">20</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="x264ZeroLatency">
+                                            <property name="visible">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Minimize latency between input to encoder and output of decoder.
+
+            This is useful for broadcast of live streams.
+            Since HandBrake is not suitable for live stream broadcast purposes, this setting is of little value here.</property>
+                                            <property name="label" translatable="yes">Zero Latency</property>
+                                            <property name="active">False</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal handler="x264_setting_changed_cb" name="toggled"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="x_padding">20</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="h264ProfileLabel">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">H.264 Profile:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="h264Profile">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Limit the H.264 profile of the output stream.
+
+            Overrides all other settings.</property>
+                                            <signal handler="x264_setting_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="h264LevelLabel">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">H.264 Level:</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="h264Level">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Sets and ensures compliance with the specified H.264 level.
+
+            Overrides all other settings.</property>
+                                            <signal handler="x264_setting_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox43">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="spacing">5</property>
+                                            <child>
+                                              <object class="GtkLabel" id="x264OptionExtraLabel">
+                                                <property name="visible">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">More Settings:</property>
+                                              </object>
+                                              <packing>
+                                                <property name="position">0</property>
+                                                <property name="expand">False</property>
+                                                <property name="padding">5</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkScrolledWindow" id="scrolledwindow8">
+                                                <property name="height_request">60</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                                <property name="shadow_type">etched-in</property>
+                                                <child>
+                                                  <object class="GtkTextView" id="x264OptionExtra">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                        <property name="tooltip-text" translatable="yes">Additional x264 settings.
+
+            Colon separated list of x264 options.</property>
+                                                    <property name="wrap_mode">GTK_WRAP_CHAR</property>
+                                                    <property name="accepts_tab">False</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">6</property>
+                                            <property name="y_options"></property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="padding">2</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="right_attach">1</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="y_options">GTK_FILL</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="expand">True</property>
+                                <property name="padding">2</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="padding">2</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label65">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Video</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="audio_tab">
-                    <property name="orientation">vertical</property>
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment18">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="top_padding">12</property>
-                        <property name="bottom_padding">2</property>
-                        <property name="left_padding">12</property>
-                        <property name="right_padding">2</property>
+                        <child type="tab">
+                          <object class="GtkLabel" id="label65">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Video</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                            <property name="tab_fill">False</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkVBox" id="vbox17">
+                          <object class="GtkVBox" id="audio_tab">
                             <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">2</property>
                             <child>
-                              <object class="GtkTable" id="table16">
+                              <object class="GtkAlignment" id="alignment18">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">3</property>
-                                <property name="row_spacing">5</property>
-                                <property name="column_spacing">5</property>
+                                <property name="top_padding">12</property>
+                                <property name="bottom_padding">2</property>
+                                <property name="left_padding">12</property>
+                                <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment47">
+                                  <object class="GtkVBox" id="vbox17">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="yalign">0</property>
-                                    <property name="yscale">0</property>
+                                    <property name="spacing">2</property>
                                     <child>
-                                      <object class="GtkButton" id="audio_add">
+                                      <object class="GtkTable" id="table16">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip-text" translatable="yes">Add new audio settings to the list</property>
-                                        <property name="relief">GTK_RELIEF_NONE</property>
-                                        <signal handler="audio_add_clicked_cb" name="clicked"/>
+                                        <property name="n_rows">2</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="row_spacing">5</property>
+                                        <property name="column_spacing">5</property>
                                         <child>
-                                          <object class="GtkImage" id="image4">
+                                          <object class="GtkAlignment" id="alignment47">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="stock">gtk-add</property>
+                                            <property name="yalign">0</property>
+                                            <property name="yscale">0</property>
+                                            <child>
+                                              <object class="GtkButton" id="audio_add">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="tooltip-text" translatable="yes">Add new audio settings to the list</property>
+                                                <property name="relief">GTK_RELIEF_NONE</property>
+                                                <signal handler="audio_add_clicked_cb" name="clicked"/>
+                                                <child>
+                                                  <object class="GtkImage" id="image4">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="stock">gtk-add</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
                                           </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
                                         </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment37">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="yalign">0</property>
-                                    <property name="yscale">0</property>
-                                    <child>
-                                      <object class="GtkButton" id="audio_remove">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip-text" translatable="yes">Remove the selected audio settings</property>
-                                        <property name="relief">GTK_RELIEF_NONE</property>
-                                        <signal handler="audio_remove_clicked_cb" name="clicked"/>
                                         <child>
-                                          <object class="GtkImage" id="image8">
+                                          <object class="GtkAlignment" id="alignment37">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="stock">gtk-remove</property>
+                                            <property name="yalign">0</property>
+                                            <property name="yscale">0</property>
+                                            <child>
+                                              <object class="GtkButton" id="audio_remove">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="tooltip-text" translatable="yes">Remove the selected audio settings</property>
+                                                <property name="relief">GTK_RELIEF_NONE</property>
+                                                <signal handler="audio_remove_clicked_cb" name="clicked"/>
+                                                <child>
+                                                  <object class="GtkImage" id="image8">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="stock">gtk-remove</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
                                           </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                      </packing>
                                     </child>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="labela6">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes"></property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_EXPAND</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkExpander" id="AdvancedAudioExpander">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="expanded">False</property>
-                                    <property name="label">Advanced</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox44">
+                                      <object class="GtkExpander" id="AdvancedAudioExpander">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="spacing">5</property>
+                                        <property name="expanded">False</property>
+                                        <property name="label">Advanced</property>
                                         <child>
-                                          <object class="GtkTable" id="AdvancedAudioPassTable">
-                                            <property name="visible">False</property>
+                                          <object class="GtkVBox" id="vbox44">
+                                            <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="n_rows">2</property>
-                                            <property name="n_columns">8</property>
-                                            <property name="row_spacing">5</property>
-                                            <property name="column_spacing">5</property>
+                                            <property name="spacing">5</property>
                                             <child>
-                                              <object class="GtkHBox" id="hbox40">
-                                                <property name="visible">True</property>
+                                              <object class="GtkTable" id="AdvancedAudioPassTable">
+                                                <property name="visible">False</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="spacing">5</property>
+                                                <property name="n_rows">2</property>
+                                                <property name="n_columns">8</property>
+                                                <property name="row_spacing">5</property>
+                                                <property name="column_spacing">5</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="labela3">
+                                                  <object class="GtkHBox" id="hbox40">
                                                     <property name="visible">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="xalign">1</property>
-                                                    <property name="label" translatable="yes">Auto Passthru:</property>
+                                                    <property name="spacing">5</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="labela3">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">1</property>
+                                                        <property name="label" translatable="yes">Auto Passthru:</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">0</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="AudioAllowMP3Pass">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
+                                                        <property name="label" translatable="yes">MP3</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="AudioAllowAACPass">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
+                                                        <property name="label" translatable="yes">AAC</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">2</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="AudioAllowAC3Pass">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AC-3. This permits AC-3 passthru to be selected when automatic passthru selection is enabled.</property>
+                                                        <property name="label" translatable="yes">AC-3</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">3</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="AudioAllowDTSPass">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
+                                                        <property name="label" translatable="yes">DTS</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">4</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
+                                                        <property name="label" translatable="yes">DTS-HD</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">5</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">0</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">4</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="AudioAllowMP3Pass">
+                                                  <object class="GtkLabel" id="labela4">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
-                                                    <property name="label" translatable="yes">MP3</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                    <property name="xalign">1</property>
+                                                    <property name="label" translatable="yes">Passthru Fallback:</property>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">1</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">4</property>
+                                                    <property name="right_attach">7</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="AudioAllowAACPass">
+                                                  <object class="GtkComboBox" id="AudioEncoderFallback">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
-                                                    <property name="label" translatable="yes">AAC</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                    <property name="tooltip-text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property>
+                                                    <signal handler="global_audio_widget_changed_cb" name="changed"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">2</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">7</property>
+                                                    <property name="right_attach">8</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="AudioAllowAC3Pass">
+                                                  <object class="GtkHSeparator" id="separator1">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AC-3. This permits AC-3 passthru to be selected when automatic passthru selection is enabled.</property>
-                                                    <property name="label" translatable="yes">AC-3</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                    <property name="orientation">horizontal</property>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">3</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">8</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
+                                              </object>
+                                              <packing>
+                                                <property name="position">0</property>
+                                                <property name="expand">False</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkTable" id="table14">
+                                                <property name="visible">True</property>
+                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                <property name="n_rows">2</property>
+                                                <property name="n_columns">8</property>
+                                                <property name="row_spacing">5</property>
+                                                <property name="column_spacing">5</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="AudioAllowDTSPass">
+                                                  <object class="GtkAlignment" id="alignment59">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-text" translatable="yes">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
-                                                    <property name="label" translatable="yes">DTS</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                    <property name="xalign">0</property>
+                                                    <property name="top_padding">8</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="audio_name_label">
+                                                        <property name="visible">True</property>
+                                                        <property name="xalign">0.5</property>
+                                                        <property name="label" translatable="yes">Track Name:</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">4</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
+                                                  <object class="GtkAlignment" id="alignment25">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-text" translatable="yes">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
-                                                    <property name="label" translatable="yes">DTS-HD</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <signal handler="global_audio_widget_changed_cb" name="toggled"/>
+                                                    <property name="xalign">0</property>
+                                                    <child>
+                                                      <object class="GtkEntry" id="AudioTrackName">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="max_length">40</property>
+                                                        <property name="activates_default">True</property>
+                                                        <property name="width_chars">20</property>
+                                                        <property name="truncate_multiline">True</property>
+                                                        <property name="tooltip-text" translatable="yes">Set the audio track name. Players may use this in the audio selection list.</property>
+                                                        <signal handler="audio_widget_changed_cb" name="changed"/>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">5</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">4</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="labela4">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">1</property>
-                                                <property name="label" translatable="yes">Passthru Fallback:</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">4</property>
-                                                <property name="right_attach">7</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkComboBox" id="AudioEncoderFallback">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property>
-                                                <signal handler="global_audio_widget_changed_cb" name="changed"/>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">7</property>
-                                                <property name="right_attach">8</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHSeparator" id="separator1">
-                                                <property name="visible">True</property>
-                                                <property name="orientation">horizontal</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">8</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="position">0</property>
-                                            <property name="expand">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTable" id="table14">
-                                            <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="n_rows">2</property>
-                                            <property name="n_columns">8</property>
-                                            <property name="row_spacing">5</property>
-                                            <property name="column_spacing">5</property>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment59">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="top_padding">8</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="audio_name_label">
+                                                  <object class="GtkLabel" id="AudioSamplerateLabel">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0.5</property>
-                                                    <property name="label" translatable="yes">Track Name:</property>
+                                                    <property name="label" translatable="yes">Sample Rate:</property>
                                                     <property name="use_markup">True</property>
                                                   </object>
+                                                  <packing>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
                                                 </child>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment25">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
                                                 <child>
-                                                  <object class="GtkEntry" id="AudioTrackName">
+                                                  <object class="GtkAlignment" id="alignment34">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="max_length">40</property>
-                                                    <property name="activates_default">True</property>
-                                                    <property name="width_chars">20</property>
-                                                    <property name="truncate_multiline">True</property>
-                                                    <property name="tooltip-text" translatable="yes">Set the audio track name. Players may use this in the audio selection list.</property>
-                                                    <signal handler="audio_widget_changed_cb" name="changed"/>
+                                                    <property name="xalign">0.5</property>
+                                                    <property name="xscale">0</property>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="AudioSamplerate">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Set the sample rate of the output audio track.</property>
+                                                        <signal handler="audio_widget_changed_cb" name="changed"/>
+                                                      </object>
+                                                    </child>
                                                   </object>
+                                                  <packing>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
                                                 </child>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="AudioSamplerateLabel">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="label" translatable="yes">Sample Rate:</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment34">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="xscale">0</property>
                                                 <child>
-                                                  <object class="GtkComboBox" id="AudioSamplerate">
+                                                  <object class="GtkLabel" id="AudioTrackGainLabel">
                                                     <property name="visible">True</property>
-                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-text" translatable="yes">Set the sample rate of the output audio track.</property>
-                                                    <signal handler="audio_widget_changed_cb" name="changed"/>
+                                                    <property name="xalign">0.5</property>
+                                                    <property name="label" translatable="yes">Gain:</property>
+                                                    <property name="use_markup">True</property>
                                                   </object>
+                                                  <packing>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">2</property>
+                                                    <property name="right_attach">3</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
                                                 </child>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="AudioTrackGainLabel">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="label" translatable="yes">Gain:</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHBox" id="hbox34">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="spacing">0</property>
                                                 <child>
-                                                  <object class="GtkScaleButton" id="AudioTrackGain">
+                                                  <object class="GtkHBox" id="hbox34">
                                                     <property name="visible">True</property>
-                                                    <property name="orientation">vertical</property>
-                                                    <property name="icons">audio-volume-muted
-audio-volume-high
-audio-volume-low
-audio-volume-medium</property>
-                                                    <property name="adjustment">adjustment35</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-markup" translatable="yes">&lt;b&gt;Audio Gain:&lt;/b&gt; Adjust the amplification or attenuation of the output audio track.</property>
-                                                    <signal handler="gain_widget_changed_cb" name="value_changed"/>
+                                                    <property name="spacing">0</property>
+                                                    <child>
+                                                      <object class="GtkScaleButton" id="AudioTrackGain">
+                                                        <property name="visible">True</property>
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="icons">audio-volume-muted
+        audio-volume-high
+        audio-volume-low
+        audio-volume-medium</property>
+                                                        <property name="adjustment">adjustment35</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-markup" translatable="yes">&lt;b&gt;Audio Gain:&lt;/b&gt; Adjust the amplification or attenuation of the output audio track.</property>
+                                                        <signal handler="gain_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">0</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="AudioTrackGainValue">
+                                                        <property name="visible">True</property>
+                                                        <property name="width_chars">6</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">0dB</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">0</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">2</property>
+                                                    <property name="right_attach">3</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="AudioTrackGainValue">
+                                                  <object class="GtkLabel" id="AudioTrackDRCSliderLabel">
                                                     <property name="visible">True</property>
-                                                    <property name="width_chars">6</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">0dB</property>
+                                                    <property name="xalign">0.5</property>
+                                                    <property name="label" translatable="yes">DRC:</property>
+                                                    <property name="tooltip-markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track. 
+
+                                For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder.</property>
                                                     <property name="use_markup">True</property>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">1</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">3</property>
+                                                    <property name="right_attach">4</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="AudioTrackDRCSliderLabel">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="label" translatable="yes">DRC:</property>
-                                                <property name="tooltip-markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track. 
-
-                            For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder.</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">3</property>
-                                                <property name="right_attach">4</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHBox" id="hbox33">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="spacing">0</property>
                                                 <child>
-                                                  <object class="GtkScaleButton" id="AudioTrackDRCSlider">
+                                                  <object class="GtkHBox" id="hbox33">
                                                     <property name="visible">True</property>
-                                                    <property name="orientation">vertical</property>
-                                                    <property name="icons">audio-input-microphone</property>
-                                                    <property name="adjustment">adjustment28</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track. 
-
-                                For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder.</property>
-                                                    <signal handler="drc_widget_changed_cb" name="value_changed"/>
+                                                    <property name="spacing">0</property>
+                                                    <child>
+                                                      <object class="GtkScaleButton" id="AudioTrackDRCSlider">
+                                                        <property name="visible">True</property>
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="icons">audio-input-microphone</property>
+                                                        <property name="adjustment">adjustment28</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track. 
+
+                                    For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder.</property>
+                                                        <signal handler="drc_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">0</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="AudioTrackDRCValue">
+                                                        <property name="visible">True</property>
+                                                        <property name="width_chars">4</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">Off</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">0</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">3</property>
+                                                    <property name="right_attach">4</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="AudioTrackDRCValue">
+                                                  <object class="GtkCheckButton" id="AudioTrackQualityEnable">
                                                     <property name="visible">True</property>
-                                                    <property name="width_chars">4</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="use_markup">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="label" translatable="yes">Quality:</property>
+                                                    <property name="tooltip-markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
+                                                    <property name="active">False</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal handler="audio_widget_changed_cb" name="toggled"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">1</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">4</property>
+                                                    <property name="right_attach">5</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">3</property>
-                                                <property name="right_attach">4</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkCheckButton" id="AudioTrackQualityEnable">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="label" translatable="yes">Quality:</property>
-                                                <property name="tooltip-markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
-                                                <property name="active">False</property>
-                                                <property name="draw_indicator">True</property>
-                                                <signal handler="audio_widget_changed_cb" name="toggled"/>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">4</property>
-                                                <property name="right_attach">5</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHBox" id="hbox32">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="spacing">0</property>
                                                 <child>
-                                                  <object class="GtkScaleButton" id="AudioTrackQuality">
+                                                  <object class="GtkHBox" id="hbox32">
                                                     <property name="visible">True</property>
-                                                    <property name="orientation">vertical</property>
-                                                    <property name="icons">weather-storm
-weather-clear
-weather-storm
-weather-showers-scattered
-weather-showers
-weather-overcast
-weather-few-clouds
-weather-clear</property>
-                                                    <property name="adjustment">audio_quality_adj</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                    <property name="tooltip-markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
-                                                    <signal handler="quality_widget_changed_cb" name="value_changed"/>
+                                                    <property name="spacing">0</property>
+                                                    <child>
+                                                      <object class="GtkScaleButton" id="AudioTrackQuality">
+                                                        <property name="visible">True</property>
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="icons">weather-storm
+        weather-clear
+        weather-storm
+        weather-showers-scattered
+        weather-showers
+        weather-overcast
+        weather-few-clouds
+        weather-clear</property>
+                                                        <property name="adjustment">audio_quality_adj</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
+                                                        <signal handler="quality_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">0</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="AudioTrackQualityValue">
+                                                        <property name="visible">True</property>
+                                                        <property name="width_chars">4</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">00.0</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">0</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">4</property>
+                                                    <property name="right_attach">5</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="AudioTrackQualityValue">
+                                                  <object class="GtkLabel" id="filler_label0">
                                                     <property name="visible">True</property>
-                                                    <property name="width_chars">4</property>
+                                                    <property name="label" translatable="yes"></property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">00.0</property>
                                                     <property name="use_markup">True</property>
                                                   </object>
                                                   <packing>
-                                                    <property name="position">1</property>
-                                                    <property name="expand">False</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">5</property>
+                                                    <property name="right_attach">8</property>
+                                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="filler_label1">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes"></property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">5</property>
+                                                    <property name="right_attach">8</property>
+                                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                                    <property name="y_options"></property>
                                                   </packing>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">4</property>
-                                                <property name="right_attach">5</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="filler_label0">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes"></property>
-                                                <property name="xalign">0</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">5</property>
-                                                <property name="right_attach">8</property>
-                                                <property name="x_options">GTK_FILL|GTK_EXPAND</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="filler_label1">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes"></property>
-                                                <property name="xalign">0</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">5</property>
-                                                <property name="right_attach">8</property>
-                                                <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                                <property name="position">1</property>
+                                                <property name="expand">False</property>
                                               </packing>
                                             </child>
                                           </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTable" id="table1">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="n_rows">2</property>
+                                        <property name="n_columns">4</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label35">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Track</property>
+                                          </object>
                                           <packing>
-                                            <property name="position">1</property>
-                                            <property name="expand">False</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label68">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Encoder</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="x_padding">12</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="AudioBitrateLabel">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Bitrate</property>
+                                            <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="x_padding">10</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="AudioMixdownLabel">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Mix</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="AudioTrack">
+                                            <property name="width_request">180</property>
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">List of audio tracks available from your source.</property>
+                                            <signal handler="audio_track_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">0</property>
+                                            <property name="right_attach">1</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="AudioEncoder">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the audio codec to encode this track with.</property>
+                                            <signal handler="audio_codec_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="AudioBitrate">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the bitrate to encode this track with.</property>
+                                            <signal handler="audio_widget_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="AudioMixdown">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the mixdown of the output audio track.</property>
+                                            <signal handler="audio_mix_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="table1">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">4</property>
-                                <child>
-                                  <object class="GtkLabel" id="label35">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Track</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label68">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Encoder</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="x_padding">12</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="AudioBitrateLabel">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Bitrate</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="x_padding">10</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="AudioMixdownLabel">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Mix</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="AudioTrack">
-                                    <property name="width_request">180</property>
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">List of audio tracks available from your source.</property>
-                                    <signal handler="audio_track_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="AudioEncoder">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Set the audio codec to encode this track with.</property>
-                                    <signal handler="audio_codec_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="AudioBitrate">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Set the bitrate to encode this track with.</property>
-                                    <signal handler="audio_widget_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="AudioMixdown">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Set the mixdown of the output audio track.</property>
-                                    <signal handler="audio_mix_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <child>
-                                  <object class="GtkTreeView" id="audio_list">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="headers_clickable">True</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label48">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Audio</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="subtitle_tab">
-                    <property name="orientation">vertical</property>
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment23">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="top_padding">12</property>
-                        <property name="bottom_padding">2</property>
-                        <property name="left_padding">12</property>
-                        <property name="right_padding">2</property>
-                        <child>
-                          <object class="GtkVBox" id="vbox12">
-                            <property name="orientation">vertical</property>
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">2</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox45">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="spacing">5</property>
-                                <child>
-                                  <object class="GtkButton" id="subtitle_add">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Add new subtitle to the list</property>
-                                    <property name="relief">GTK_RELIEF_NONE</property>
-                                    <property name="label">Subtitle</property>
-                                    <property name="image">subtitle_add_image</property>
-                                    <signal handler="subtitle_add_clicked_cb" name="clicked"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="srt_add">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Add new SRT subtitle to the list</property>
-                                    <property name="relief">GTK_RELIEF_NONE</property>
-                                    <property name="label">Import SRT</property>
-                                    <property name="image">srt_add_image</property>
-                                    <signal handler="srt_add_clicked_cb" name="clicked"/>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="subtitle_remove">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Remove the selected subtitle settings</property>
-                                    <property name="relief">GTK_RELIEF_NONE</property>
-                                    <signal handler="subtitle_remove_clicked_cb" name="clicked"/>
                                     <child>
-                                      <object class="GtkImage" id="image2">
+                                      <object class="GtkScrolledWindow" id="scrolledwindow5">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="stock">gtk-remove</property>
+                                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                        <child>
+                                          <object class="GtkTreeView" id="audio_list">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="headers_clickable">True</property>
+                                          </object>
+                                        </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
-                                  </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="subtitle_table">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">5</property>
-                                <property name="column-spacing">4</property>
-                                <child>
-                                  <object class="GtkLabel" id="subtitle_track_label">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Track</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="srt_lang_label">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Language</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="srt_code_label">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Character Code</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="srt_file_label">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">File</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="srt_offset_label">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Offset (ms)</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="left_attach">4</property>
-                                    <property name="right_attach">5</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="bottom_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="SubtitleTrack">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">List of subtitle tracks available from your source.</property>
-                                    <signal handler="subtitle_track_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                    <property name="left_attach">0</property>
-                                    <property name="right_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="SrtLanguage">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Set the language of this subtitle. This value will be used by players in subtitle menus.</property>
-                                    <signal handler="srt_lang_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBoxEntry" id="SrtCodeset">
-                                    <property name="width_request">150</property>
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Set the character code used by the SRT file you are importing. SRTs come in all flavours of character sets.  We translate the character set to UTF-8. The source's character code is needed in order to perform this translation.</property>
-                                    <signal handler="srt_changed_cb" name="changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkFileChooserButton" id="SrtFile">
-                                    <property name="visible">True</property>
-                                    <property name="local-only">False</property>
-                                    <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-                                    <property name="title" translatable="yes">Srt File</property>
-                                    <property name="tooltip-text" translatable="yes">Select the SRT file to import.</property>
-                                    <signal name="selection_changed" handler="srt_file_changed_cb"/>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
-                                    <property name="y_options"></property>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="SrtOffset">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="tooltip-text" translatable="yes">Adjust the offset in milliseconds between video and SRT timestamps</property>
-                                    <property name="adjustment">adjustment31</property>
-                                    <signal handler="srt_changed_cb" name="value_changed"/>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                    <property name="left_attach">4</property>
-                                    <property name="right_attach">5</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <child>
-                                  <object class="GtkTreeView" id="subtitle_list">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="headers_clickable">True</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label9">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Subtitles</property>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="advanced_tab">
-                    <property name="orientation">vertical</property>
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-
-                  <object class="GtkVBox" id="x264_tab">
-                    <property name="orientation">vertical</property>
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox73">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="spacing">2</property>
+                        <child type="tab">
+                          <object class="GtkLabel" id="label48">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Audio</property>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                            <property name="tab_fill">False</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkVBox" id="vbox21">
+                          <object class="GtkVBox" id="subtitle_tab">
                             <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkFrame" id="frame10">
+                              <object class="GtkAlignment" id="alignment23">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="top_padding">12</property>
+                                <property name="bottom_padding">2</property>
+                                <property name="left_padding">12</property>
+                                <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment26">
+                                  <object class="GtkVBox" id="vbox12">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="top_padding">6</property>
-                                    <property name="bottom_padding">2</property>
-                                    <property name="left_padding">12</property>
-                                    <property name="right_padding">2</property>
+                                    <property name="spacing">2</property>
                                     <child>
-                                      <object class="GtkTable" id="table6">
+                                      <object class="GtkHBox" id="hbox45">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="n_rows">4</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="column-spacing">4</property>
-                                        <property name="row-spacing">2</property>
+                                        <property name="spacing">5</property>
                                         <child>
-                                          <object class="GtkLabel" id="label49">
+                                          <object class="GtkButton" id="subtitle_add">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">&lt;small&gt;Reference Frames:&lt;/small&gt;</property>
-                                    		<property name="use_markup">True</property>
+                                            <property name="tooltip-text" translatable="yes">Add new subtitle to the list</property>
+                                            <property name="relief">GTK_RELIEF_NONE</property>
+                                            <property name="label">Subtitle</property>
+                                            <property name="image">subtitle_add_image</property>
+                                            <signal handler="subtitle_add_clicked_cb" name="clicked"/>
                                           </object>
                                           <packing>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
+                                            <property name="expand">False</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment41">
+                                          <object class="GtkButton" id="srt_add">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
+                                            <property name="tooltip-text" translatable="yes">Add new SRT subtitle to the list</property>
+                                            <property name="relief">GTK_RELIEF_NONE</property>
+                                            <property name="label">Import SRT</property>
+                                            <property name="image">srt_add_image</property>
+                                            <signal handler="srt_add_clicked_cb" name="clicked"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="subtitle_remove">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Remove the selected subtitle settings</property>
+                                            <property name="relief">GTK_RELIEF_NONE</property>
+                                            <signal handler="subtitle_remove_clicked_cb" name="clicked"/>
                                             <child>
-                                              <object class="GtkSpinButton" id="x264_refs">
+                                              <object class="GtkImage" id="image2">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Sane values are ~1-6.  The more you add, the better the compression, but the slower the encode.  Cel animation tends to benefit from more reference frames a lot more than film content.  Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, don't touch this unless you're absolutely sure you know what you're doing!</property>
-                                                <property name="adjustment">adjustment8</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                <property name="stock">gtk-remove</property>
                                               </object>
-                                              <packing>
-                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options">GTK_FILL</property>
-                                            <property name="top_attach">0</property>
-                                            <property name="bottom_attach">1</property>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="expand">False</property>
+                                            <property name="position">2</property>
                                           </packing>
                                         </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTable" id="subtitle_table">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="n_rows">2</property>
+                                        <property name="n_columns">5</property>
+                                        <property name="column-spacing">4</property>
                                         <child>
-                                          <object class="GtkLabel" id="label51">
+                                          <object class="GtkLabel" id="subtitle_track_label">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">&lt;small&gt;Maximum B-Frames:&lt;/small&gt;</property>
-                                    		<property name="use_markup">True</property>
+                                            <property name="label" translatable="yes">Track</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
+                                            <property name="y_options">GTK_FILL</property>
                                             <property name="left_attach">0</property>
                                             <property name="right_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment38">
+                                          <object class="GtkLabel" id="srt_lang_label">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <child>
-                                              <object class="GtkSpinButton" id="x264_bframes">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Sane values are ~2-5.  This specifies the maximum number of sequential B-frames that the encoder can use.  Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.  Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</property>
-                                                <property name="adjustment">adjustment9</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Language</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label50">
+                                          <object class="GtkLabel" id="srt_code_label">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">&lt;small&gt;Pyramidal B-Frames:&lt;/small&gt;</property>
-                                    		<property name="use_markup">True</property>
+                                            <property name="label" translatable="yes">Character Code</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">1</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
                                           </packing>
                                         </child>
                                         <child>
-										  <object class="GtkComboBox" id="x264_bpyramid">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="tooltip-text" translatable="yes">B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to reference each other to improve compression.  Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.</property>
-											<signal handler="x264_widget_changed_cb" name="changed"/>
-										  </object>
+                                          <object class="GtkLabel" id="srt_file_label">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">File</property>
+                                          </object>
                                           <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
                                             <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label40">
+                                          <object class="GtkLabel" id="srt_offset_label">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">&lt;small&gt;Weighted P-Frames:&lt;/small&gt;</property>
-                                    		<property name="use_markup">True</property>
+                                            <property name="label" translatable="yes">Offset (ms)</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                            <property name="left_attach">4</property>
+                                            <property name="right_attach">5</property>
+                                            <property name="top_attach">0</property>
+                                            <property name="bottom_attach">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="SubtitleTrack">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">List of subtitle tracks available from your source.</property>
+                                            <signal handler="subtitle_track_changed_cb" name="changed"/>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                             <property name="left_attach">0</property>
                                             <property name="right_attach">1</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
-										  <object class="GtkComboBox" id="x264_weighted_pframes">
-											<property name="visible">True</property>
-											<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="tooltip-text" translatable="yes">Performs extra analysis to decide upon weighting parameters for each frame.  This improves overall compression slightly and improves the quality of fades greatly. Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled.  Note that some devices and players, even those that support Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</property>
-											<signal handler="x264_widget_changed_cb" name="changed"/>
-										  </object>
+                                          <object class="GtkComboBox" id="SrtLanguage">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="tooltip-text" translatable="yes">Set the language of this subtitle. This value will be used by players in subtitle menus.</property>
+                                            <signal handler="srt_lang_changed_cb" name="changed"/>
+                                          </object>
                                           <packing>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkCheckButton" id="x264_8x8dct">
+                                          <object class="GtkComboBox" id="SrtCodeset">
+                                            <property name="width_request">150</property>
+                                            <property name="has_entry">True</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="tooltip-text" translatable="yes">The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.  It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain.  However, it requires High Profile, which many devices may not support.</property>
-                                            <property name="label" translatable="yes">8x8 Transform</property>
-                                            <property name="active">True</property>
-                                            <property name="draw_indicator">True</property>
-                                            <signal handler="x264_widget_changed_cb" name="toggled"/>
+                                            <property name="tooltip-text" translatable="yes">Set the character code used by the SRT file you are importing. SRTs come in all flavours of character sets.  We translate the character set to UTF-8. The source's character code is needed in order to perform this translation.</property>
+                                            <signal handler="srt_changed_cb" name="changed"/>
                                           </object>
                                           <packing>
-                                            <property name="top_attach">4</property>
-                                            <property name="bottom_attach">5</property>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkFileChooserButton" id="SrtFile">
+                                            <property name="visible">True</property>
+                                            <property name="local-only">False</property>
+                                            <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+                                            <property name="title" translatable="yes">Srt File</property>
+                                            <property name="tooltip-text" translatable="yes">Select the SRT file to import.</property>
+                                            <signal name="selection_changed" handler="srt_file_changed_cb"/>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                            <property name="y_options"></property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkCheckButton" id="x264_cabac">
+                                          <object class="GtkSpinButton" id="SrtOffset">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="tooltip-text" translatable="yes">After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR.  H.264 provides two options for this: CAVLC and CABAC.  CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates.  If you're looking to minimize CPU requirements for video playback, disable this option. Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</property>
-                                            <property name="label" translatable="yes">CABAC Entropy Encoding</property>
-                                            <property name="active">True</property>
-                                            <property name="draw_indicator">True</property>
-                                            <signal handler="x264_widget_changed_cb" name="toggled"/>
+                                            <property name="tooltip-text" translatable="yes">Adjust the offset in milliseconds between video and SRT timestamps</property>
+                                            <property name="adjustment">adjustment31</property>
+                                            <signal handler="srt_changed_cb" name="value_changed"/>
                                           </object>
                                           <packing>
-                                            <property name="top_attach">5</property>
-                                            <property name="bottom_attach">6</property>
-                                            <property name="left_attach">0</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                            <property name="left_attach">4</property>
+                                            <property name="right_attach">5</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScrolledWindow" id="scrolledwindow4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                        <child>
+                                          <object class="GtkTreeView" id="subtitle_list">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="headers_clickable">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
-                                  </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label53">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Encoding Features&lt;/b&gt;&lt;/small&gt;</property>
-                                    <property name="use_markup">True</property>
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
                           </object>
+                        </child>
+                        <child type="tab">
+                          <object class="GtkLabel" id="label9">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Subtitles</property>
+                          </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="position">3</property>
+                            <property name="tab_fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox25">
+                          <object class="GtkHBox" id="advanced_tab">
+                            <property name="orientation">vertical</property>
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <child>
+
+                          <object class="GtkVBox" id="x264_tab">
                             <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkFrame" id="frame12">
+                              <object class="GtkHBox" id="hbox73">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="spacing">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox84">
+                                  <object class="GtkVBox" id="vbox21">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-
                                     <child>
-                                      <object class="GtkAlignment" id="alignment30">
+                                      <object class="GtkFrame" id="frame10">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="top_padding">6</property>
-                                        <property name="bottom_padding">2</property>
-                                        <property name="left_padding">12</property>
-                                        <property name="right_padding">2</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkTable" id="table5">
+                                          <object class="GtkAlignment" id="alignment26">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="n_rows">4</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="row-spacing">2</property>
-                                            <property name="column-spacing">4</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label55">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Motion Est. Method:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_me">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  A better motion search method improves compression at the cost of speed.
-
-Diamond: performs an extremely fast and simple search using a diamond pattern.
-
-Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
-
-Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
-
-Exhaustive: performs a "dumb" search of every pixel in a wide area.  Significantly slower for only a small compression gain.
-
-Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</property>
-                                                <signal handler="x264_me_changed_cb" name="changed"/>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
+                                            <property name="top_padding">6</property>
+                                            <property name="bottom_padding">2</property>
+                                            <property name="left_padding">12</property>
+                                            <property name="right_padding">2</property>
                                             <child>
-                                              <object class="GtkLabel" id="label58">
+                                              <object class="GtkTable" id="table6">
                                                 <property name="visible">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Subpel ME &amp;amp; Mode:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
+                                                <property name="n_rows">4</property>
+                                                <property name="n_columns">2</property>
+                                                <property name="column-spacing">4</property>
+                                                <property name="row-spacing">2</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="label49">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;Reference Frames:&lt;/small&gt;</property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkAlignment" id="alignment41">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <child>
+                                                      <object class="GtkSpinButton" id="x264_refs">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Sane values are ~1-6.  The more you add, the better the compression, but the slower the encode.  Cel animation tends to benefit from more reference frames a lot more than film content.  Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, don't touch this unless you're absolutely sure you know what you're doing!</property>
+                                                        <property name="adjustment">adjustment8</property>
+                                                        <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="bottom_attach">1</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label51">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;Maximum B-Frames:&lt;/small&gt;</property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="y_options"></property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkAlignment" id="alignment38">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <child>
+                                                      <object class="GtkSpinButton" id="x264_bframes">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Sane values are ~2-5.  This specifies the maximum number of sequential B-frames that the encoder can use.  Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.  Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</property>
+                                                        <property name="adjustment">adjustment9</property>
+                                                        <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label50">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;Pyramidal B-Frames:&lt;/small&gt;</property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="y_options"></property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBox" id="x264_bpyramid">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="tooltip-text" translatable="yes">B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to reference each other to improve compression.  Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.</property>
+                                                    <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label40">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">&lt;small&gt;Weighted P-Frames:&lt;/small&gt;</property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="y_options"></property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="top_attach">3</property>
+                                                    <property name="bottom_attach">4</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBox" id="x264_weighted_pframes">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="tooltip-text" translatable="yes">Performs extra analysis to decide upon weighting parameters for each frame.  This improves overall compression slightly and improves the quality of fades greatly. Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled.  Note that some devices and players, even those that support Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</property>
+                                                    <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="top_attach">3</property>
+                                                    <property name="bottom_attach">4</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="x264_8x8dct">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="tooltip-text" translatable="yes">The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.  It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain.  However, it requires High Profile, which many devices may not support.</property>
+                                                    <property name="label" translatable="yes">8x8 Transform</property>
+                                                    <property name="active">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal handler="x264_widget_changed_cb" name="toggled"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="top_attach">4</property>
+                                                    <property name="bottom_attach">5</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="x264_cabac">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="tooltip-text" translatable="yes">After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR.  H.264 provides two options for this: CAVLC and CABAC.  CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates.  If you're looking to minimize CPU requirements for video playback, disable this option. Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</property>
+                                                    <property name="label" translatable="yes">CABAC Entropy Encoding</property>
+                                                    <property name="active">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal handler="x264_widget_changed_cb" name="toggled"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="top_attach">5</property>
+                                                    <property name="bottom_attach">6</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
                                               </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
-                                              </packing>
                                             </child>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_subme">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-markup" translatable="yes">This setting controls both subpixel-precision motion estimation and mode decision methods.
-
-Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
-
-Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
-
-SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
-
-6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
-
-11 disables all early terminations in analysis.
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label53">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Encoding Features&lt;/b&gt;&lt;/small&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" id="vbox25">
+                                    <property name="orientation">vertical</property>
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <child>
+                                      <object class="GtkFrame" id="frame12">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox84">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
-10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always).</property>
-                                                <signal handler="x264_widget_changed_cb" name="changed"/>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
                                             <child>
-                                              <object class="GtkLabel" id="label57">
+                                              <object class="GtkAlignment" id="alignment30">
                                                 <property name="visible">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Motion Est. Range:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
+                                                <property name="top_padding">6</property>
+                                                <property name="bottom_padding">2</property>
+                                                <property name="left_padding">12</property>
+                                                <property name="right_padding">2</property>
+                                                <child>
+                                                  <object class="GtkTable" id="table5">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="n_rows">4</property>
+                                                    <property name="n_columns">2</property>
+                                                    <property name="row-spacing">2</property>
+                                                    <property name="column-spacing">4</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label55">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Motion Est. Method:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                        <property name="top_attach">0</property>
+                                                        <property name="bottom_attach">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="x264_me">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  A better motion search method improves compression at the cost of speed.
+
+        Diamond: performs an extremely fast and simple search using a diamond pattern.
+
+        Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
+
+        Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
+
+        Exhaustive: performs a "dumb" search of every pixel in a wide area.  Significantly slower for only a small compression gain.
+
+        Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</property>
+                                                        <signal handler="x264_me_changed_cb" name="changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="top_attach">0</property>
+                                                        <property name="bottom_attach">1</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label58">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Subpel ME &amp;amp; Mode:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="x264_subme">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-markup" translatable="yes">This setting controls both subpixel-precision motion estimation and mode decision methods.
+
+        Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
+
+        Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
+
+        SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
+
+        6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
+
+        11 disables all early terminations in analysis.
+
+        10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always).</property>
+                                                        <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label57">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Motion Est. Range:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkSpinButton" id="x264_merange">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.</property>
+                                                        <property name="adjustment">adjustment10</property>
+                                                        <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label52">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Adaptive Direct Mode:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkAlignment" id="alignment39">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <child>
+                                                          <object class="GtkComboBox" id="x264_direct">
+                                                            <property name="visible">True</property>
+                                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="tooltip-text" translatable="yes">H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
+
+        Spatial, the default, is almost always better, but temporal is sometimes useful too.
+
+        x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.</property>
+                                                            <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="top_attach">3</property>
+                                                        <property name="bottom_attach">4</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label84">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Adaptive B-Frames:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="top_attach">4</property>
+                                                        <property name="bottom_attach">5</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkAlignment" id="alignment40">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <child>
+                                                          <object class="GtkComboBox" id="x264_b_adapt">
+                                                            <property name="visible">True</property>
+                                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                            <property name="tooltip-markup" translatable="yes">x264 has a variety of algorithms to decide when to use B-frames and how many to use.
+
+        Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.
+
+        Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.</property>
+                                                            <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="top_attach">4</property>
+                                                        <property name="bottom_attach">5</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                </child>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkSpinButton" id="x264_merange">
+                                              <object class="GtkAlignment" id="alignment31">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.</property>
-                                                <property name="adjustment">adjustment10</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                <property name="top_padding">6</property>
+                                                <property name="bottom_padding">2</property>
+                                                <property name="left_padding">12</property>
+                                                <property name="right_padding">2</property>
+                                                <child>
+                                                  <object class="GtkTable" id="table3">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="n_rows">4</property>
+                                                    <property name="n_columns">2</property>
+                                                    <property name="row-spacing">2</property>
+                                                    <property name="column-spacing">4</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label59">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Partitions:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                        <property name="top_attach">0</property>
+                                                        <property name="bottom_attach">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="x264_analyse">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Mode decision picks from a variety of options to make its decision: this option chooses what options those are.  Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.</property>
+                                                        <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">0</property>
+                                                        <property name="bottom_attach">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label62">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Trellis:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options">GTK_FILL</property>
+                                                        <property name="left_attach">0</property>
+                                                        <property name="right_attach">1</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkComboBox" id="x264_trellis">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. "Always" uses trellis not only during the main encoding process, but also during analysis, which improves compression even more, albeit at great speed cost.  Trellis costs more speed at higher bitrates and requires CABAC.</property>
+                                                        <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="y_options"></property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                </child>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
-											<child>
-											  <object class="GtkLabel" id="label52">
-												<property name="visible">True</property>
-												<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-												<property name="xalign">0</property>
-												<property name="label" translatable="yes">&lt;small&gt;Adaptive Direct Mode:&lt;/small&gt;</property>
-												<property name="use_markup">True</property>
-											  </object>
-											  <packing>
-												<property name="top_attach">3</property>
-												<property name="bottom_attach">4</property>
-												<property name="left_attach">0</property>
-												<property name="right_attach">1</property>
-												<property name="x_options">GTK_FILL</property>
-											  </packing>
-											</child>
-											<child>
-											  <object class="GtkAlignment" id="alignment39">
-												<property name="visible">True</property>
-												<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-												<property name="xalign">0</property>
-												<child>
-												  <object class="GtkComboBox" id="x264_direct">
-													<property name="visible">True</property>
-													<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-													<property name="tooltip-text" translatable="yes">H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
-
-Spatial, the default, is almost always better, but temporal is sometimes useful too.
-
-x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.</property>
-													<signal handler="x264_widget_changed_cb" name="changed"/>
-												  </object>
-												</child>
-											  </object>
-											  <packing>
-												<property name="x_options">GTK_FILL</property>
-												<property name="y_options">GTK_FILL</property>
-												<property name="top_attach">3</property>
-												<property name="bottom_attach">4</property>
-												<property name="left_attach">1</property>
-												<property name="right_attach">2</property>
-											  </packing>
-											</child>
-											<child>
-											  <object class="GtkLabel" id="label84">
-												<property name="visible">True</property>
-												<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-												<property name="xalign">0</property>
-												<property name="label" translatable="yes">&lt;small&gt;Adaptive B-Frames:&lt;/small&gt;</property>
-												<property name="use_markup">True</property>
-											  </object>
-											  <packing>
-												<property name="top_attach">4</property>
-												<property name="bottom_attach">5</property>
-												<property name="left_attach">0</property>
-												<property name="right_attach">1</property>
-												<property name="x_options">GTK_FILL</property>
-											  </packing>
-											</child>
-											<child>
-											  <object class="GtkAlignment" id="alignment40">
-												<property name="visible">True</property>
-												<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-												<property name="xalign">0</property>
-												<child>
-												  <object class="GtkComboBox" id="x264_b_adapt">
-													<property name="visible">True</property>
-													<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-													<property name="tooltip-markup" translatable="yes">x264 has a variety of algorithms to decide when to use B-frames and how many to use.
-
-Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.
-
-Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.</property>
-													<signal handler="x264_widget_changed_cb" name="changed"/>
-												  </object>
-												</child>
-											  </object>
-											  <packing>
-												<property name="x_options">GTK_FILL</property>
-												<property name="y_options">GTK_FILL</property>
-												<property name="top_attach">4</property>
-												<property name="bottom_attach">5</property>
-												<property name="left_attach">1</property>
-												<property name="right_attach">2</property>
-											  </packing>
-											</child>
+                                          </object>
+                                          <packing>
+                                          </packing>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label60">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Analysis&lt;/b&gt;&lt;/small&gt;</property>
+                                            <property name="use_markup">True</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="padding">2</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkAlignment" id="alignment31">
+                                      <object class="GtkFrame" id="frame13">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="top_padding">6</property>
-                                        <property name="bottom_padding">2</property>
-                                        <property name="left_padding">12</property>
-                                        <property name="right_padding">2</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkTable" id="table3">
+                                          <object class="GtkAlignment" id="alignment35">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="n_rows">4</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="row-spacing">2</property>
-                                            <property name="column-spacing">4</property>
+                                            <property name="top_padding">6</property>
+                                            <property name="bottom_padding">2</property>
+                                            <property name="left_padding">12</property>
+                                            <property name="right_padding">2</property>
                                             <child>
-                                              <object class="GtkLabel" id="label59">
+                                              <object class="GtkVBox" id="vbox27">
+                                                <property name="orientation">vertical</property>
                                                 <property name="visible">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Partitions:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_analyse">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Mode decision picks from a variety of options to make its decision: this option chooses what options those are.  Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.</property>
-                                                <signal handler="x264_widget_changed_cb" name="changed"/>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="bottom_attach">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label62">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Trellis:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="left_attach">0</property>
-                                                <property name="right_attach">1</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkComboBox" id="x264_trellis">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. "Always" uses trellis not only during the main encoding process, but also during analysis, which improves compression even more, albeit at great speed cost.  Trellis costs more speed at higher bitrates and requires CABAC.</property>
-                                                <signal handler="x264_widget_changed_cb" name="changed"/>
+                                                <child>
+                                                  <object class="GtkTable" id="table9">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <property name="n_rows">2</property>
+                                                    <property name="n_columns">2</property>
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label73">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Adaptive Quantization Strength:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkHScale" id="x264_aq_strength">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Adaptive quantization controls how the encoder distributes bits across the frame.  Higher values take more bits away from edges and complex areas to improve areas with finer detail.</property>
+                                                        <property name="adjustment">adjustment34</property>
+                                                        <property name="restrict_to_fill_level">False</property>
+                                                        <property name="value_pos">GTK_POS_RIGHT</property>
+                                                        <signal handler="x264_slider_changed_cb" name="value_changed"/>
+                                                        <signal name="format_value" handler="x264_format_slider_cb"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label82">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Psychovisual Rate Distortion:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkHScale" id="x264_psy_rd">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Psychovisual rate-distortion optimization takes advantage of the characteristics of human vision to dramatically improve apparent detail and sharpness.  The effect can be made weaker or stronger by adjusting the strength.  Being an RD algorithm, it requires mode decision to be at least "6".</property>
+                                                        <property name="adjustment">adjustment22</property>
+                                                        <property name="restrict_to_fill_level">False</property>
+                                                        <property name="value_pos">GTK_POS_RIGHT</property>
+                                                        <signal handler="x264_slider_changed_cb" name="value_changed"/>
+                                                        <signal name="format_value" handler="x264_format_slider_cb"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="top_attach">1</property>
+                                                        <property name="bottom_attach">2</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label83">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">&lt;small&gt;Psychovisual Trellis:&lt;/small&gt;</property>
+                                                        <property name="use_markup">True</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="x_options">GTK_FILL</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkHScale" id="x264_psy_trell">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">Psychovisual trellis is an experimental algorithm to further improve sharpness and detail retention beyond what Psychovisual RD does.  Recommended values are around 0.2, though higher values may help for very grainy video or lower bitrate encodes.  Not recommended for cel animation and other sharp-edged graphics.</property>
+                                                        <property name="adjustment">adjustment23</property>
+                                                        <property name="digits">2</property>
+                                                        <property name="restrict_to_fill_level">False</property>
+                                                        <property name="value_pos">GTK_POS_RIGHT</property>
+                                                        <signal handler="x264_slider_changed_cb" name="value_changed"/>
+                                                        <signal name="format_value" handler="x264_format_slider_cb"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="top_attach">2</property>
+                                                        <property name="bottom_attach">3</property>
+                                                        <property name="left_attach">1</property>
+                                                        <property name="right_attach">2</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkHBox" id="hbox39">
+                                                    <property name="visible">True</property>
+                                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="label61">
+                                                        <property name="visible">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="xalign">0</property>
+                                                        <property name="label" translatable="yes">Deblocking: </property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkSpinButton" id="x264_deblock_alpha">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-markup" translatable="yes">H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
+
+        The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta). The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</property>
+                                                        <property name="adjustment">adjustment11</property>
+                                                        <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkSpinButton" id="x264_deblock_beta">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-markup" translatable="yes">H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
+
+        The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta). The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</property>
+                                                        <property name="adjustment">adjustment12</property>
+                                                        <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="position">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkCheckButton" id="x264_no_dct_decimate">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                                        <property name="tooltip-text" translatable="yes">x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video.  However, this can sometimes have slight negative effects on retention of subtle grain and dither.  Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.</property>
+                                                        <property name="label" translatable="yes">No DCT Decimate</property>
+                                                        <property name="active">True</property>
+                                                        <property name="draw_indicator">True</property>
+                                                        <signal handler="x264_widget_changed_cb" name="toggled"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="padding">20</property>
+                                                        <property name="position">3</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
                                               </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options">GTK_FILL</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                              </packing>
                                             </child>
                                           </object>
                                         </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label63">
+                                            <property name="visible">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Psychovisual&lt;/b&gt;&lt;/small&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label60">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Analysis&lt;/b&gt;&lt;/small&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="padding">2</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkFrame" id="frame13">
+                              <object class="GtkHBox" id="hbox85">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="spacing">2</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="frame11">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">none</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment35">
+                                  <object class="GtkAlignment" id="alignment29">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="top_padding">6</property>
@@ -3783,675 +4402,772 @@
                                     <property name="left_padding">12</property>
                                     <property name="right_padding">2</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox27">
-                                        <property name="orientation">vertical</property>
+                                      <object class="GtkScrolledWindow" id="scrolledwindow6">
+                                        <property name="height_request">40</property>
                                         <property name="visible">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                        <property name="shadow_type">etched-in</property>
                                         <child>
-                                          <object class="GtkTable" id="table9">
+                                          <object class="GtkTextView" id="x264Option">
                                             <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="n_rows">2</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="visible">True</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label73">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            	<property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Adaptive Quantization Strength:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHScale" id="x264_aq_strength">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Adaptive quantization controls how the encoder distributes bits across the frame.  Higher values take more bits away from edges and complex areas to improve areas with finer detail.</property>
-                                                <property name="adjustment">adjustment34</property>
-                                                <property name="restrict_to_fill_level">False</property>
-                                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="x264_slider_changed_cb" name="value_changed"/>
-                                                <signal name="format_value" handler="x264_format_slider_cb"/>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label82">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            	<property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Psychovisual Rate Distortion:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHScale" id="x264_psy_rd">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Psychovisual rate-distortion optimization takes advantage of the characteristics of human vision to dramatically improve apparent detail and sharpness.  The effect can be made weaker or stronger by adjusting the strength.  Being an RD algorithm, it requires mode decision to be at least "6".</property>
-                                                <property name="adjustment">adjustment22</property>
-                                                <property name="restrict_to_fill_level">False</property>
-                                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="x264_slider_changed_cb" name="value_changed"/>
-                                                <signal name="format_value" handler="x264_format_slider_cb"/>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label83">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            	<property name="xalign">0</property>
-                                                <property name="label" translatable="yes">&lt;small&gt;Psychovisual Trellis:&lt;/small&gt;</property>
-                            					<property name="use_markup">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHScale" id="x264_psy_trell">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Psychovisual trellis is an experimental algorithm to further improve sharpness and detail retention beyond what Psychovisual RD does.  Recommended values are around 0.2, though higher values may help for very grainy video or lower bitrate encodes.  Not recommended for cel animation and other sharp-edged graphics.</property>
-                                                <property name="adjustment">adjustment23</property>
-                                                <property name="digits">2</property>
-                                                <property name="restrict_to_fill_level">False</property>
-                                                <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="x264_slider_changed_cb" name="value_changed"/>
-                                                <signal name="format_value" handler="x264_format_slider_cb"/>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
+                                            <property name="can_focus">True</property>
+                                                <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
+        You can edit these and add additional options.  
+
+        Default values will not be shown. The defaults are:
+        ref=3:bframes=3:b-adapt=fast:direct=spatial:
+        b-pyramid=normal:weightp=2:me=hex:merange=16:
+        subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:
+        deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:
+        no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
+                                            <property name="wrap_mode">GTK_WRAP_CHAR</property>
+                                            <property name="accepts_tab">False</property>
+                                            <signal handler="x264_focus_out_cb" name="focus_out_event"/>
                                           </object>
-                                          <packing>
-                                            <property name="position">0</property>
-                                          </packing>
                                         </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label54">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current x264 Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">2</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="padding">0</property>
+                            <property name="position">0</property>
+                          </packing>
+
+                            </child>
+                            <child>
+                              <object class="GtkVBox" id="lavc_mpeg4_tab">
+                                <property name="orientation">vertical</property>
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <child>
+                                  <object class="GtkHBox" id="hbox86">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="spacing">2</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkFrame" id="frame18">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label_xalign">0</property>
+                                    <property name="shadow_type">none</property>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment33">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="top_padding">6</property>
+                                        <property name="bottom_padding">2</property>
+                                        <property name="left_padding">12</property>
+                                        <property name="right_padding">2</property>
                                         <child>
-                                          <object class="GtkHBox" id="hbox39">
+                                          <object class="GtkScrolledWindow" id="scrolledwindow7">
+                                            <property name="height_request">40</property>
                                             <property name="visible">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label61">
-                                                <property name="visible">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Deblocking: </property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSpinButton" id="x264_deblock_alpha">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-markup" translatable="yes">H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
-
-The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta). The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</property>
-                                                <property name="adjustment">adjustment11</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
+                                            <property name="can_focus">True</property>
+                                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                            <property name="shadow_type">etched-in</property>
                                             <child>
-                                              <object class="GtkSpinButton" id="x264_deblock_beta">
+                                              <object class="GtkTextView" id="lavcOption">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-markup" translatable="yes">H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
-
-The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta). The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</property>
-                                                <property name="adjustment">adjustment12</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                    <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
+            You can edit these and add additional options.</property>
+                                                <property name="wrap_mode">GTK_WRAP_CHAR</property>
+                                                <property name="accepts_tab">False</property>
+                                                <signal handler="lavc_focus_out_cb" name="focus_out_event"/>
                                               </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="position">2</property>
-                                              </packing>
                                             </child>
-											<child>
-											  <object class="GtkCheckButton" id="x264_no_dct_decimate">
-												<property name="visible">True</property>
-												<property name="can_focus">True</property>
-												<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-												<property name="tooltip-text" translatable="yes">x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video.  However, this can sometimes have slight negative effects on retention of subtle grain and dither.  Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.</property>
-												<property name="label" translatable="yes">No DCT Decimate</property>
-												<property name="active">True</property>
-												<property name="draw_indicator">True</property>
-												<signal handler="x264_widget_changed_cb" name="toggled"/>
-											  </object>
-											  <packing>
-												<property name="padding">20</property>
-												<property name="position">3</property>
-											  </packing>
-											</child>
                                           </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
                                         </child>
                                       </object>
                                     </child>
+                                    <child type="label">
+                                      <object class="GtkLabel" id="label75">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current FFMpeg Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </object>
+                                    </child>
                                   </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label63">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Psychovisual&lt;/b&gt;&lt;/small&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">2</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="padding">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="position">2</property>
                           </packing>
                         </child>
-                      </object>
-					  <packing>
-						<property name="expand">False</property>
-						<property name="position">0</property>
-					  </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox85">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="spacing">2</property>
-                      </object>
-					  <packing>
-						<property name="expand">True</property>
-						<property name="position">1</property>
-					  </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame11">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <child type="tab">
+                          <object class="GtkLabel" id="advanced_tab_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Advanced</property>
+                          </object>
+                          <packing>
+                            <property name="position">4</property>
+                            <property name="tab_fill">False</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment29">
+                          <object class="GtkVBox" id="chapters_tab">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">2</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">2</property>
                             <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow6">
-                                <property name="height_request">40</property>
+                              <object class="GtkHBox" id="hbox30">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="ChapterMarkers">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="tooltip-text" translatable="yes">Add chapter markers to output file.</property>
+                                    <property name="label" translatable="yes">Chapter Markers</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="chapter_markers_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">etched-in</property>
                                 <child>
-                                  <object class="GtkTextView" id="x264Option">
+                                  <object class="GtkTreeView" id="chapters_list">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                        <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
-You can edit these and add additional options.  
-
-Default values will not be shown. The defaults are:
-ref=3:bframes=3:b-adapt=fast:direct=spatial:
-b-pyramid=normal:weightp=2:me=hex:merange=16:
-subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:
-deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:
-no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
-                                    <property name="wrap_mode">GTK_WRAP_CHAR</property>
-                                    <property name="accepts_tab">False</property>
-                                    <signal handler="x264_focus_out_cb" name="focus_out_event"/>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="headers_clickable">True</property>
+                                    <property name="rules_hint">True</property>
+                                    <property name="enable-search">False</property>
                                   </object>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label54">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current x264 Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-						<property name="fill">True</property>
-                        <property name="padding">2</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="padding">0</property>
-                    <property name="position">0</property>
-                  </packing>
-
-                    </child>
-                    <child>
-                      <object class="GtkVBox" id="lavc_mpeg4_tab">
-                        <property name="orientation">vertical</property>
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox86">
+                        <child type="tab">
+                          <object class="GtkLabel" id="chapters_label">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">2</property>
+                            <property name="label" translatable="yes">Chapters</property>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="position">0</property>
+                            <property name="position">5</property>
+                            <property name="tab_fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="frame18">
+                          <object class="GtkAlignment" id="alignment76">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
+                            <property name="top_padding">24</property>
+                            <property name="right_padding">24</property>
+                            <property name="left_padding">24</property>
+                            <property name="bottom_padding">24</property>
+                            <property name="yscale">1</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment33">
+                              <object class="GtkTable" id="tags_table">
+                                <property name="n_rows">8</property>
+                                <property name="n_columns">2</property>
                                 <property name="visible">True</property>
+                                <property name="column_spacing">5</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">2</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow7">
-                                    <property name="height_request">40</property>
+                                  <object class="GtkLabel" id="tag_title_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Title:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaName">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_actors_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Actors:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaArtist">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_director_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Director:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaAlbumArtist">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_release_date_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Release Date:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaReleaseDate">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_comment_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Comment:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaComment">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_genre_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Genre:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaGenre">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_description_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Description:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">6</property>
+                                    <property name="bottom_attach">7</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="MetaDescription">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="max_length">80</property>
+                                    <property name="activates_default">True</property>
+                                    <property name="width_chars">50</property>
+                                    <property name="truncate_multiline">True</property>
+                                    <signal name="changed" handler="meta_setting_widget_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">6</property>
+                                    <property name="bottom_attach">7</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="tag_long_description_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Plot:</property>
+                                    <property name="use_markup">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_EXPAND</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="MetaLongDescriptionScroll">
+                                    <property name="height_request">80</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                     <property name="shadow_type">etched-in</property>
                                     <child>
-                                      <object class="GtkTextView" id="lavcOption">
+                                      <object class="GtkTextView" id="MetaLongDescription">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                            <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
-    You can edit these and add additional options.</property>
                                         <property name="wrap_mode">GTK_WRAP_CHAR</property>
                                         <property name="accepts_tab">False</property>
-                                        <signal handler="lavc_focus_out_cb" name="focus_out_event"/>
+                                        <signal handler="meta_focus_out_cb" name="focus_out_event"/>
                                       </object>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+                                    <property name="y_options">GTK_FILL|GTK_EXPAND</property>
+                                  </packing>
                                 </child>
                               </object>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label75">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current FFMpeg Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
+                          </object>
+                        </child>
+                        <child type="tab">
+                          <object class="GtkLabel" id="metadata_label">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">Tags</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">2</property>
-                            <property name="position">1</property>
+                            <property name="position">6</property>
+                            <property name="tab_fill">False</property>
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">0</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="advanced_tab_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Advanced</property>
-                  </object>
-                  <packing>
-                    <property name="position">4</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
+
                 <child>
-                  <object class="GtkVBox" id="chapters_tab">
-                    <property name="orientation">vertical</property>
+                  <object class="GtkAlignment" id="alignment66">
                     <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="top_padding">4</property>
+                    <property name="bottom_padding">4</property>
+                    <property name="left_padding">12</property>
+                    <property name="right_padding">12</property>
+                    <property name="xalign">0.0</property>
+                    <property name="yalign">1.0</property>
                     <child>
-                      <object class="GtkHBox" id="hbox30">
+                      <object class="GtkHBox" id="hbox46">
                         <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <object class="GtkCheckButton" id="ChapterMarkers">
+                          <object class="GtkLabel" id="work_status">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="xalign">0</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Add chapter markers to output file.</property>
-                            <property name="label" translatable="yes">Chapter Markers</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="chapter_markers_changed_cb" name="toggled"/>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <child>
-                          <object class="GtkTreeView" id="chapters_list">
+                          <object class="GtkLabel" id="pending_status">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="xalign">1</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="headers_clickable">True</property>
-                            <property name="rules_hint">True</property>
-                            <property name="enable-search">False</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="chapters_label">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Chapters</property>
-                  </object>
                   <packing>
-                    <property name="position">5</property>
-                    <property name="tab_fill">False</property>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
-              </object>
-            </child>
-
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-
-            <child>
-              <object class="GtkAlignment" id="alignment66">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="top_padding">4</property>
-                <property name="bottom_padding">4</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
-                <property name="xalign">0.0</property>
-                <property name="yalign">1.0</property>
                 <child>
-                  <object class="GtkHBox" id="hbox46">
+                  <object class="GtkAlignment" id="alignment71">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="left_padding">12</property>
+                    <property name="right_padding">12</property>
+                    <property name="bottom_padding">6</property>
                     <child>
-                      <object class="GtkLabel" id="work_status">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
+                      <object class="GtkProgressBar" id="progressbar">
+                        <property name="height_request">10</property>
+                        <property name="visible">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="text" translatable="yes"/>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="pending_status">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
               </object>
               <packing>
+                <property name="position">0</property>
                 <property name="expand">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="alignment71">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
-                <property name="bottom_padding">6</property>
-                <child>
-                  <object class="GtkProgressBar" id="progressbar">
-                    <property name="height_request">10</property>
-                    <property name="visible">False</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="text" translatable="yes"/>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">3</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-
-        <child>
-          <object class="GtkAlignment" id="alignment69">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="top_padding">6</property>
-            <property name="right_padding">6</property>
-
-        <child>
-          <object class="GtkFrame" id="presets_frame">
-            <property name="visible">False</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <signal handler="presets_frame_size_allocate_cb" name="size_allocate"/>
             <child>
-              <object class="GtkAlignment" id="alignment21">
+              <object class="GtkAlignment" id="alignment69">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="top_padding">6</property>
-                <property name="left_padding">8</property>
+                <property name="right_padding">6</property>
                 <child>
-                  <object class="GtkVBox" id="presets_vbox">
-                    <property name="orientation">vertical</property>
-                    <property name="visible">True</property>
+                  <object class="GtkFrame" id="presets_frame">
+                    <property name="visible">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <signal handler="presets_frame_size_allocate_cb" name="size_allocate"/>
                     <child>
-                      <object class="GtkScrolledWindow" id="presets_scroll">
+                      <object class="GtkAlignment" id="alignment21">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">etched-in</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">8</property>
                         <child>
-                          <object class="GtkTreeView" id="presets_list">
-                            <property name="width_request">206</property>
+                          <object class="GtkVBox" id="presets_vbox">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">True</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="presets_scroll">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="shadow_type">etched-in</property>
+                                <child>
+                                  <object class="GtkTreeView" id="presets_list">
+                                    <property name="width_request">206</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="headers_visible">False</property>
+                                    <property name="headers_clickable">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolbar" id="presets_toolbar">
+                                <property name="icon-size">2</property>
+                                <property name="visible">True</property>
+                                <property name="show_arrow">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <child>
+                                  <object class="GtkToolButton" id="presets_save">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">True</property>
+                                    <property name="is_important">False</property>
+                                    <property name="label" translatable="yes">_Save</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="tooltip-text" translatable="yes">Save current settings to new preset.</property>
+                                    <property name="stock_id">gtk-save</property>
+                                    <signal name="clicked" handler="presets_save_clicked_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="presets_remove">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">True</property>
+                                    <property name="is_important">False</property>
+                                    <property name="label" translatable="yes">_Delete</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="tooltip-text" translatable="yes">Delete the currently selected preset.</property>
+                                    <property name="stock_id">gtk-delete</property>
+                                    <signal name="clicked" handler="presets_remove_clicked_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSeparatorToolItem" id="toolbutton2">
+                                    <property name="visible">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="homogeneous">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolButton" id="presets_menu_button">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">True</property>
+                                    <property name="is_important">True</property>
+                                    <property name="label" translatable="yes">_Options</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="tooltip-text" translatable="yes">Preset Options</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock_id">gtk-preferences</property>
+                                    <signal handler="presets_menu_clicked_cb" name="clicked"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkToolbar" id="presets_toolbar">
-                        <property name="icon-size">2</property>
+                    <child type="label">
+                      <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
-                        <property name="show_arrow">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <object class="GtkToolButton" id="presets_save">
-                            <property name="visible">True</property>
-                            <property name="sensitive">True</property>
-                            <property name="is_important">False</property>
-                            <property name="label" translatable="yes">_Save</property>
-                            <property name="use_underline">True</property>
-                            <property name="tooltip-text" translatable="yes">Save current settings to new preset.</property>
-                            <property name="stock_id">gtk-save</property>
-                            <signal name="clicked" handler="presets_save_clicked_cb"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="presets_remove">
-                            <property name="visible">True</property>
-                            <property name="sensitive">True</property>
-                            <property name="is_important">False</property>
-                            <property name="label" translatable="yes">_Delete</property>
-                            <property name="use_underline">True</property>
-                            <property name="tooltip-text" translatable="yes">Delete the currently selected preset.</property>
-                            <property name="stock_id">gtk-delete</property>
-                            <signal name="clicked" handler="presets_remove_clicked_cb"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSeparatorToolItem" id="toolbutton2">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="presets_menu_button">
-                            <property name="visible">True</property>
-                            <property name="sensitive">True</property>
-                            <property name="is_important">True</property>
-                            <property name="label" translatable="yes">_Options</property>
-                            <property name="use_underline">True</property>
-                            <property name="tooltip-text" translatable="yes">Preset Options</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="stock_id">gtk-preferences</property>
-                            <signal handler="presets_menu_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes">&lt;b&gt;Presets&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="expand">True</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="label34">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">&lt;b&gt;Presets&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
-
       </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
     </child>
-
-      </object>
-    </child>
-
   </object>
 
   <object class="GtkDialog" id="prefs_dialog">
@@ -4486,7 +5202,7 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="icon_name">hb-icon</property>
-                        <property name="icon-size">6</property>
+                        <property name="pixel-size">64</property>
                       </object>
                     </child>
                   </object>
@@ -4508,7 +5224,7 @@
                 <property name="visible">True</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkNotebook" id="notebook2">
+                  <object class="GtkNotebook" id="PrefsNotebook">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="show-border">False</property>
@@ -4857,6 +5573,7 @@
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -4904,6 +5621,7 @@
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
+                                    <property name="expand">False</property>
                                   </packing>
                                 </child>
                               </object>
@@ -4955,19 +5673,22 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox1">
-                        <property name="orientation">vertical</property>
+                      <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment3">
+                          <object class="GtkVBox" id="vbox1">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkVBox" id="vbox3">
-                                <property name="orientation">vertical</property>
+                              <object class="GtkTable" id="AdvancedPrefsTable">
                                 <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="n_rows">9</property>
+                                <property name="n_columns">2</property>
+                                <property name="row_spacing">6</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
@@ -4994,50 +5715,16 @@
                                       </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                  </packing>
                                 </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment2">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="use_dvdnav">
-                                <property name="label" translatable="yes">Use dvdnav (instead of libdvdread)</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="pref_changed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment17">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkVBox" id="vbox2">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="EncodeLogLocation">
-                                    <property name="label" translatable="yes">Put individual encode logs in same location as movie</property>
+                                  <object class="GtkCheckButton" id="use_dvdnav">
+                                    <property name="label" translatable="yes">Use dvdnav (instead of libdvdread)</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5045,171 +5732,195 @@
                                     <signal name="toggled" handler="pref_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment51">
+                                  <object class="GtkVBox" id="vbox2">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
-                                    <property name="left_padding">21</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox50">
+                                      <object class="GtkCheckButton" id="EncodeLogLocation">
+                                        <property name="label" translatable="yes">Put individual encode logs in same location as movie</property>
                                         <property name="visible">True</property>
-                                        <property name="spacing">4</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="pref_changed_cb"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment51">
+                                        <property name="visible">True</property>
+                                        <property name="left_padding">21</property>
                                         <child>
-                                          <object class="GtkComboBox" id="LoggingLevel">
-                                            <property name="width_request">55</property>
+                                          <object class="GtkHBox" id="hbox50">
                                             <property name="visible">True</property>
-                                            <signal name="changed" handler="pref_changed_cb"/>
+                                            <property name="spacing">4</property>
+                                            <child>
+                                              <object class="GtkComboBox" id="LoggingLevel">
+                                                <property name="width_request">55</property>
+                                                <property name="visible">True</property>
+                                                <signal name="changed" handler="pref_changed_cb"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label1">
+                                                <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Activity Log Verbosity Level</property>
+                                              </object>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
                                           </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
                                         </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment63">
+                                        <property name="visible">True</property>
+                                        <property name="left_padding">21</property>
                                         <child>
-                                          <object class="GtkLabel" id="label1">
+                                          <object class="GtkHBox" id="hbox83">
                                             <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Activity Log Verbosity Level</property>
+                                            <property name="spacing">4</property>
+                                            <child>
+                                              <object class="GtkComboBox" id="LogLongevity">
+                                                <property name="visible">True</property>
+                                                <signal name="changed" handler="pref_changed_cb"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="labela2">
+                                                <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Activity Log Longevity</property>
+                                              </object>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
                                           </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment63">
+                                  <object class="GtkCheckButton" id="reduce_hd_preview">
+                                    <property name="label" translatable="yes">Scale down High Definition previews</property>
                                     <property name="visible">True</property>
-                                    <property name="left_padding">21</property>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox83">
-                                        <property name="visible">True</property>
-                                        <property name="spacing">4</property>
-                                        <child>
-                                          <object class="GtkComboBox" id="LogLongevity">
-                                            <property name="visible">True</property>
-                                            <signal name="changed" handler="pref_changed_cb"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="labela2">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Activity Log Longevity</property>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="pref_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="AutoScan">
+                                    <property name="label" translatable="yes">Automatically Scan DVD when loaded</property>
+                                    <property name="tooltip-text" translatable="yes">Scans the DVD whenever a new disc is loaded</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="AdvancedAutoPassthru">
+                                    <property name="label" translatable="yes">Enable Advanced Auto-Passthru options</property>
+                                    <property name="tooltip-text" translatable="yes">Enabling this adds extra widgets to the audio panel that allow
+    you to specify which particular codecs shall be passed
+    and which codec to use when passthru is not possible</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="advanced_audio_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="HideAdvancedVideoSettings">
+                                    <property name="label" translatable="yes">Hide Advanced Video Options Tab</property>
+                                    <property name="tooltip-text" translatable="yes">Use advanced video options at your own risk.
+We recommend that you use the controls available
+on the Video tab instead.</property>
+                                    <property name="active">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="advanced_video_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">6</property>
+                                    <property name="bottom_attach">7</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment49">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="reduce_hd_preview">
-                                <property name="label" translatable="yes">Scale down High Definition previews</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="pref_changed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment48">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="AutoScan">
-                                <property name="label" translatable="yes">Automatically Scan DVD when loaded</property>
-                                <property name="tooltip-text" translatable="yes">Scans the DVD whenever a new disc is loaded</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="pref_changed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment65">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="AdvancedAutoPassthru">
-                                <property name="label" translatable="yes">Enable Advanced Auto-Passthru options</property>
-                                <property name="tooltip-text" translatable="yes">Enabling this adds extra widgets to the audio panel that allow
-you to specify which particular codecs shall be passed
-and which codec to use when passthru is not possible</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="advanced_audio_changed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="hidden_prefs">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkVBox" id="vbox4">
-                                <property name="orientation">vertical</property>
+                              <object class="GtkTable" id="hidden_prefs">
                                 <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="n_rows">9</property>
+                                <property name="n_columns">2</property>
                                 <child>
                                   <object class="GtkCheckButton" id="allow_tweaks">
                                     <property name="label" translatable="yes">Allow Tweaks</property>
@@ -5219,8 +5930,10 @@
                                     <signal name="toggled" handler="tweaks_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -5232,17 +5945,19 @@
                                     <signal name="toggled" handler="hbfd_feature_changed_cb"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">6</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -5443,7 +6158,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-				<property name="position">0</property>
+                <property name="position">0</property>
                 <property name="padding">10</property>
               </packing>
             </child>
@@ -5583,124 +6298,124 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-				<property name="position">0</property>
+                <property name="position">0</property>
                 <property name="padding">10</property>
               </packing>
             </child>
-			<child>
-			  <object class="GtkTable" id="PicturePresetBox">
-				<property name="visible">True</property>
-				<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-				<property name="n_rows">3</property>
-				<property name="n_columns">3</property>
-				<child>
-				  <object class="GtkLabel" id="UsingCurrentPicLabel">
-					<property name="visible">True</property>
-					<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-					<property name="label" translatable="yes">&lt;b&gt;Custom Picture Dimensions&lt;/b&gt;</property>
-					<property name="xalign">0</property>
-					<property name="use_markup">True</property>
-				  </object>
-				  <packing>
-					<property name="top_attach">0</property>
-					<property name="bottom_attach">1</property>
-					<property name="left_attach">0</property>
-					<property name="right_attach">3</property>
-				  </packing>
-				</child>
-				<child>
-				  <object class="GtkLabel" id="fillerlabel1">
-					<property name="visible">True</property>
-					<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-					<property name="label" translatable="yes"></property>
-					<property name="xalign">0</property>
-				  </object>
-				  <packing>
-					<property name="top_attach">1</property>
-					<property name="bottom_attach">2</property>
-					<property name="left_attach">2</property>
-					<property name="right_attach">3</property>
+            <child>
+              <object class="GtkTable" id="PicturePresetBox">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="n_rows">3</property>
+                <property name="n_columns">3</property>
+                <child>
+                  <object class="GtkLabel" id="UsingCurrentPicLabel">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Custom Picture Dimensions&lt;/b&gt;</property>
+                    <property name="xalign">0</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">0</property>
+                    <property name="bottom_attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="fillerlabel1">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes"></property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
                     <property name="x_options">GTK_EXPAND</property>
-				  </packing>
-				</child>
-				<child>
-				  <object class="GtkCheckButton" id="PictureWidthEnable">
-					<property name="label" translatable="yes">Maximum Width:</property>
-					<property name="visible">True</property>
-					<property name="can_focus">True</property>
-					<property name="receives_default">False</property>
-					<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-					<property name="tooltip-text" translatable="yes">Enable maximum width limit.</property>
-					<property name="draw_indicator">True</property>
-					<signal name="toggled" handler="setting_widget_changed_cb"/>
-				  </object>
-				  <packing>
-					<property name="top_attach">1</property>
-					<property name="bottom_attach">2</property>
-					<property name="left_attach">0</property>
-					<property name="right_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="PictureWidthEnable">
+                    <property name="label" translatable="yes">Maximum Width:</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="tooltip-text" translatable="yes">Enable maximum width limit.</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="setting_widget_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">1</property>
                     <property name="x_options">GTK_FILL</property>
-				  </packing>
-				</child>
-				<child>
-				  <object class="GtkSpinButton" id="PictureWidth">
-					<property name="visible">True</property>
-					<property name="can_focus">True</property>
-					<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-					<property name="tooltip-text" translatable="yes">This is the maximum width that the video will be stored at.  Whenever a new source is loaded, this value will be applied if the source width is greater. Setting this to 0 means there is no maximum width.</property>
-					<property name="adjustment">adjustment32</property>
-					<property name="snap_to_ticks">True</property>
-					<signal name="value_changed" handler="setting_widget_changed_cb"/>
-				  </object>
-				  <packing>
-					<property name="top_attach">1</property>
-					<property name="bottom_attach">2</property>
-					<property name="left_attach">1</property>
-					<property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="PictureWidth">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="tooltip-text" translatable="yes">This is the maximum width that the video will be stored at.  Whenever a new source is loaded, this value will be applied if the source width is greater. Setting this to 0 means there is no maximum width.</property>
+                    <property name="adjustment">adjustment32</property>
+                    <property name="snap_to_ticks">True</property>
+                    <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
                     <property name="x_options"></property>
-				  </packing>
-				</child>
-				<child>
-				  <object class="GtkCheckButton" id="PictureHeightEnable">
-					<property name="label" translatable="yes">Maximum Height:</property>
-					<property name="visible">True</property>
-					<property name="can_focus">True</property>
-					<property name="receives_default">False</property>
-					<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-					<property name="tooltip-text" translatable="yes">Enable maximum height limit.</property>
-					<property name="draw_indicator">True</property>
-					<signal name="toggled" handler="setting_widget_changed_cb"/>
-				  </object>
-				  <packing>
-					<property name="top_attach">2</property>
-					<property name="bottom_attach">3</property>
-					<property name="left_attach">0</property>
-					<property name="right_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="PictureHeightEnable">
+                    <property name="label" translatable="yes">Maximum Height:</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="tooltip-text" translatable="yes">Enable maximum height limit.</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="setting_widget_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">1</property>
                     <property name="x_options">GTK_FILL</property>
-				  </packing>
-				</child>
-				<child>
-				  <object class="GtkSpinButton" id="PictureHeight">
-					<property name="visible">True</property>
-					<property name="can_focus">True</property>
-					<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-					<property name="tooltip-text" translatable="yes">This is the maximum height that the video will be stored at.  Whenever a new source is loaded, this value will be applied if the source height is greater. Setting this to 0 means there is no maximum height.</property>
-					<property name="adjustment">adjustment33</property>
-					<signal name="value_changed" handler="setting_widget_changed_cb"/>
-				  </object>
-				  <packing>
-					<property name="top_attach">2</property>
-					<property name="bottom_attach">3</property>
-					<property name="left_attach">1</property>
-					<property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="PictureHeight">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="tooltip-text" translatable="yes">This is the maximum height that the video will be stored at.  Whenever a new source is loaded, this value will be applied if the source height is greater. Setting this to 0 means there is no maximum height.</property>
+                    <property name="adjustment">adjustment33</property>
+                    <signal name="value_changed" handler="setting_widget_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
                     <property name="x_options"></property>
-				  </packing>
-				</child>
-			  </object>
-			  <packing>
-				<property name="position">1</property>
-			  </packing>
-			</child>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkFrame" id="frame14">
                 <property name="visible">True</property>
@@ -5791,6 +6506,8 @@
     <property name="visible">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+    <property name="default_width">800</property>
+    <property name="default_height">600</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="transient-for">hb_window</property>
@@ -5850,6 +6567,8 @@
     <property name="title" translatable="yes">HandBrake Queue</property>
     <property name="icon_name">hb-queue</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+    <property name="default_width">800</property>
+    <property name="default_height">600</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="transient-for">hb_window</property>
@@ -5869,7 +6588,7 @@
                 <property name="sensitive">False</property>
                 <property name="is_important">True</property>
                 <property name="label" translatable="yes">Start</property>
-                <property name="icon_name">hb-play</property>
+                <property name="icon_name">hb-start</property>
                 <signal handler="queue_start_clicked_cb" name="clicked"/>
               </object>
               <packing>
@@ -5917,6 +6636,10 @@
               <object class="GtkLabel" id="current_encode">
                 <property name="visible">True</property>
               </object>
+              <packing>
+                <property name="position">0</property>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <object class="GtkHBox" id="hbox28">
@@ -5940,6 +6663,7 @@
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">False</property>
               </packing>
             </child>
           </object>
@@ -7144,6 +7868,7 @@
                       <object class="GtkVBox" id="live_progress_box">
                         <property name="orientation">vertical</property>
                         <property name="visible">True</property>
+                        
                         <child>
                           <object class="GtkProgressBar" id="live_encode_progress">
                             <property name="height_request">20</property>
@@ -7161,9 +7887,10 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
+                        
                       </object>
                       <packing>
                         <property name="position">2</property>
@@ -7181,6 +7909,7 @@
                   </object>
                   <packing>
                     <property name="position">1</property>
+                    <property name="expand">False</property>
                   </packing>
                 </child>
                 <child>
@@ -7222,7 +7951,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="show_crop">
+                      <object class="GtkCheckButton" id="preview_show_crop">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip-text" translatable="yes">Show Cropped area of the preview</property>
@@ -7240,6 +7969,7 @@
                         <property name="can_focus">True</property>
                         <property name="tooltip-text" translatable="yes">View Fullscreen Preview</property>
                         <property name="label" translatable="yes">Fullscreen</property>
+                        <property name="relief">none</property>
                         <signal handler="fullscreen_clicked_cb" name="toggled"/>
                       </object>
                       <packing>
@@ -7253,6 +7983,7 @@
                         <property name="can_focus">True</property>
                         <property name="tooltip-text" translatable="yes">Hide the picture settings window while leaving the preview visible.</property>
                         <property name="label" translatable="yes">Hide Settings</property>
+                        <property name="relief">none</property>
                         <signal handler="picture_settings_alt2_clicked_cb" name="clicked"/>
                       </object>
                       <packing>
@@ -7305,8 +8036,8 @@
     <property name="skip_pager_hint">True</property>
     <property name="program_name">HandBrake</property>
     <property name="version">0.9.2</property>
-    <property name="copyright" translatable="yes">Copyright &#xA9; 2008 - 2011 John Stebbins
-Copyright &#xA9; 2004 - 2011, HandBrake Devs</property>
+    <property name="copyright" translatable="yes">Copyright &#xA9; 2008 - 2013 John Stebbins
+Copyright &#xA9; 2004 - 2013, HandBrake Devs</property>
     <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property>
     <property name="website">http://handbrake.fr</property>
     <property name="website_label" translatable="yes">http://handbrake.fr</property>
@@ -7544,7 +8275,7 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="icon_name">hb-icon</property>
-                        <property name="icon-size">6</property>
+                        <property name="pixel-size">64</property>
                       </object>
                     </child>
                   </object>
@@ -7731,6 +8462,7 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -7754,16 +8486,10 @@
                     <property name="xalign">0</property>
                     <property name="xscale">0</property>
                     <child>
-                      <object class="GtkComboBox" id="source_device">
+                      <object class="GtkComboBoxText" id="source_device">
                         <property name="visible">True</property>
-                        <property name="model">device_list</property>
+                        <property name="entry-text-column">0</property>
                         <signal handler="dvd_device_changed_cb" name="changed"/>
-                        <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
                       </object>
                     </child>
                   </object>
@@ -7774,6 +8500,7 @@
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">False</property>
               </packing>
             </child>
           </object>

HandBrake-0.9.8.tar.bz2/gtk/src/ghbcellrenderertext.c -> HandBrake-0.9.9.tar.bz2/gtk/src/ghbcellrenderertext.c Changed

@@ -38,39 +38,54 @@
 #define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#define MyGdkRectangle  const GdkRectangle
+#else
+#define MyGdkRectangle  GdkRectangle
+#endif
+
 
 static void ghb_cell_renderer_text_finalize   (GObject                  *object);
 
 static void ghb_cell_renderer_text_get_property  (GObject                  *object,
-						  guint                     param_id,
-						  GValue                   *value,
-						  GParamSpec               *pspec);
+                          guint                     param_id,
+                          GValue                   *value,
+                          GParamSpec               *pspec);
 static void ghb_cell_renderer_text_set_property  (GObject                  *object,
-						  guint                     param_id,
-						  const GValue             *value,
-						  GParamSpec               *pspec);
+                          guint                     param_id,
+                          const GValue             *value,
+                          GParamSpec               *pspec);
 static void ghb_cell_renderer_text_get_size   (GtkCellRenderer          *cell,
-					       GtkWidget                *widget,
-					       GdkRectangle             *cell_area,
-					       gint                     *x_offset,
-					       gint                     *y_offset,
-					       gint                     *width,
-					       gint                     *height);
+                           GtkWidget                *widget,
+                           MyGdkRectangle           *cell_area,
+                           gint                     *x_offset,
+                           gint                     *y_offset,
+                           gint                     *width,
+                           gint                     *height);
+#if GTK_CHECK_VERSION(3, 0, 0)
 static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
-					       GdkWindow                *window,
-					       GtkWidget                *widget,
-					       GdkRectangle             *background_area,
-					       GdkRectangle             *cell_area,
-					       GdkRectangle             *expose_area,
-					       GtkCellRendererState      flags);
+                           cairo_t                  *cr,
+                           GtkWidget                *widget,
+                           MyGdkRectangle           *background_area,
+                           MyGdkRectangle           *cell_area,
+                           GtkCellRendererState      flags);
+#else
+static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
+                           GdkWindow                *window,
+                           GtkWidget                *widget,
+                           MyGdkRectangle           *background_area,
+                           MyGdkRectangle           *cell_area,
+                           GdkRectangle             *expose_area,
+                           GtkCellRendererState      flags);
+#endif
 
 static GtkCellEditable *ghb_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
-							      GdkEvent             *event,
-							      GtkWidget            *widget,
-							      const gchar          *path,
-							      GdkRectangle         *background_area,
-							      GdkRectangle         *cell_area,
-							      GtkCellRendererState  flags);
+                                  GdkEvent             *event,
+                                  GtkWidget            *widget,
+                                  const gchar          *path,
+                                  MyGdkRectangle       *background_area,
+                                  MyGdkRectangle       *cell_area,
+                                  GtkCellRendererState  flags);
 
 enum {
   EDITED,
@@ -218,12 +233,12 @@
                                                         GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
-				   PROP_ATTRIBUTES,
-				   g_param_spec_boxed ("attributes",
-						       P_("Attributes"),
-						       P_("A list of style attributes to apply to the text of the renderer"),
-						       PANGO_TYPE_ATTR_LIST,
-						       GTK_PARAM_READWRITE));
+                   PROP_ATTRIBUTES,
+                   g_param_spec_boxed ("attributes",
+                               P_("Attributes"),
+                               P_("A list of style attributes to apply to the text of the renderer"),
+                               PANGO_TYPE_ATTR_LIST,
+                               GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SINGLE_PARAGRAPH_MODE,
@@ -372,7 +387,7 @@
                                    g_param_spec_int ("rise",
                                                      P_("Rise"),
                                                      P_("Offset of text above the baseline "
-							"(below the baseline if rise is negative)"),
+                            "(below the baseline if rise is negative)"),
                                                      -G_MAXINT,
                                                      G_MAXINT,
                                                      0,
@@ -401,8 +416,8 @@
                                    g_param_spec_string ("language",
                                                         P_("Language"),
                                                         P_("The language this text is in, as an ISO code. "
-							   "Pango can use this as a hint when rendering the text. "
-							   "If you don't understand this parameter, you probably don't need it"),
+                               "Pango can use this as a hint when rendering the text. "
+                               "If you don't understand this parameter, you probably don't need it"),
                                                         NULL,
                                                         GTK_PARAM_READWRITE));
 
@@ -420,13 +435,13 @@
   g_object_class_install_property (object_class,
                                    PROP_ELLIPSIZE,
                                    g_param_spec_enum ("ellipsize",
-						      P_("Ellipsize"),
-						      P_("The preferred place to ellipsize the string, "
-							 "if the cell renderer does not have enough room "
-							 "to display the entire string"),
-						      PANGO_TYPE_ELLIPSIZE_MODE,
-						      PANGO_ELLIPSIZE_NONE,
-						      GTK_PARAM_READWRITE));
+                              P_("Ellipsize"),
+                              P_("The preferred place to ellipsize the string, "
+                             "if the cell renderer does not have enough room "
+                             "to display the entire string"),
+                              PANGO_TYPE_ELLIPSIZE_MODE,
+                              PANGO_ELLIPSIZE_NONE,
+                              GTK_PARAM_READWRITE));
 
   /**
    * GhbCellRendererText:width-chars:
@@ -459,13 +474,13 @@
   g_object_class_install_property (object_class,
                                    PROP_WRAP_MODE,
                                    g_param_spec_enum ("wrap-mode",
-						      P_("Wrap mode"),
-						      P_("How to break the string into multiple lines, "
-							 "if the cell renderer does not have enough room "
-							 "to display the entire string"),
-						      PANGO_TYPE_WRAP_MODE,
-						      PANGO_WRAP_CHAR,
-						      GTK_PARAM_READWRITE));
+                              P_("Wrap mode"),
+                              P_("How to break the string into multiple lines, "
+                             "if the cell renderer does not have enough room "
+                             "to display the entire string"),
+                              PANGO_TYPE_WRAP_MODE,
+                              PANGO_WRAP_CHAR,
+                              GTK_PARAM_READWRITE));
 
   /**
    * GhbCellRendererText:wrap-width:
@@ -477,14 +492,14 @@
    * Since: 2.8
    */
   g_object_class_install_property (object_class,
-				   PROP_WRAP_WIDTH,
-				   g_param_spec_int ("wrap-width",
-						     P_("Wrap width"),
-						     P_("The width at which the text is wrapped"),
-						     -1,
-						     G_MAXINT,
-						     -1,
-						     GTK_PARAM_READWRITE));
+                   PROP_WRAP_WIDTH,
+                   g_param_spec_int ("wrap-width",
+                             P_("Wrap width"),
+                             P_("The width at which the text is wrapped"),
+                             -1,
+                             G_MAXINT,
+                             -1,
+                             GTK_PARAM_READWRITE));
 
   /**
    * GhbCellRendererText:alignment:
@@ -500,11 +515,11 @@
   g_object_class_install_property (object_class,
                                    PROP_ALIGN,
                                    g_param_spec_enum ("alignment",
-						      P_("Alignment"),
-						      P_("How to align the lines"),
-						      PANGO_TYPE_ALIGNMENT,
-						      PANGO_ALIGN_LEFT,
-						      GTK_PARAM_READWRITE));
+                              P_("Alignment"),
+                              P_("How to align the lines"),
+                              PANGO_TYPE_ALIGNMENT,
+                              PANGO_ALIGN_LEFT,
+                              GTK_PARAM_READWRITE));
   
   /* Style props are set or not */
 
@@ -587,24 +602,24 @@
    */
   text_cell_renderer_signals [EDITED] =
     g_signal_new (I_("edited"),
-		  G_OBJECT_CLASS_TYPE (object_class),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GhbCellRendererTextClass, edited),
-		  NULL, NULL,
-		  ghb_marshal_VOID__STRING_STRING,
-		  G_TYPE_NONE, 2,
-		  G_TYPE_STRING,
-		  G_TYPE_STRING);
+          G_OBJECT_CLASS_TYPE (object_class),
+          G_SIGNAL_RUN_LAST,
+          G_STRUCT_OFFSET (GhbCellRendererTextClass, edited),
+          NULL, NULL,
+          ghb_marshal_VOID__STRING_STRING,
+          G_TYPE_NONE, 2,
+          G_TYPE_STRING,
+          G_TYPE_STRING);
 
   text_cell_renderer_signals [KEYPRESS] =
     g_signal_new (I_("key-press-event"),
-		  G_OBJECT_CLASS_TYPE (object_class),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GhbCellRendererTextClass, keypress),
-		  NULL, NULL,
-		  ghb_marshal_BOOLEAN__BOXED,
-		  G_TYPE_BOOLEAN, 1,
-		  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+          G_OBJECT_CLASS_TYPE (object_class),
+          G_SIGNAL_RUN_LAST,
+          G_STRUCT_OFFSET (GhbCellRendererTextClass, keypress),
+          NULL, NULL,
+          ghb_marshal_BOOLEAN__BOXED,
+          G_TYPE_BOOLEAN, 1,
+          GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
   g_type_class_add_private (object_class, sizeof (GhbCellRendererTextPrivate));
 }
@@ -654,9 +669,9 @@
 
 static void
 ghb_cell_renderer_text_get_property (GObject        *object,
-				     guint           param_id,
-				     GValue         *value,
-				     GParamSpec     *pspec)
+                     guint           param_id,
+                     GValue         *value,
+                     GParamSpec     *pspec)
 {
   GhbCellRendererText *celltext = GHB_CELL_RENDERER_TEXT (object);
   GhbCellRendererTextPrivate *priv;
@@ -792,10 +807,10 @@
     case PROP_STRETCH_SET:
     case PROP_SIZE_SET:
       {
-	PangoFontMask mask = get_property_font_set_mask (param_id);
-	g_value_set_boolean (value, (pango_font_description_get_set_fields (celltext->font) & mask) != 0);
-	
-	break;
+    PangoFontMask mask = get_property_font_set_mask (param_id);
+    g_value_set_boolean (value, (pango_font_description_get_set_fields (celltext->font) & mask) != 0);
+    
+    break;
       }
 
     case PROP_SCALE_SET:
@@ -899,7 +914,7 @@
 
 static PangoFontMask
 set_font_desc_fields (PangoFontDescription *desc,
-		      PangoFontMask         to_set)
+              PangoFontMask         to_set)
 {
   PangoFontMask changed_mask = 0;
   
@@ -907,10 +922,10 @@
     {
       const char *family = pango_font_description_get_family (desc);
       if (!family)
-	{
-	  family = "sans";
-	  changed_mask |= PANGO_FONT_MASK_FAMILY;
-	}
+    {
+      family = "sans";
+      changed_mask |= PANGO_FONT_MASK_FAMILY;
+    }
 
       pango_font_description_set_family (desc, family);
     }
@@ -926,10 +941,10 @@
     {
       gint size = pango_font_description_get_size (desc);
       if (size <= 0)
-	{
-	  size = 10 * PANGO_SCALE;
-	  changed_mask |= PANGO_FONT_MASK_SIZE;
-	}
+    {
+      size = 10 * PANGO_SCALE;
+      changed_mask |= PANGO_FONT_MASK_SIZE;
+    }
       
       pango_font_description_set_size (desc, size);
     }
@@ -939,7 +954,7 @@
 
 static void
 notify_set_changed (GObject       *object,
-		    PangoFontMask  changed_mask)
+            PangoFontMask  changed_mask)
 {
   if (changed_mask & PANGO_FONT_MASK_FAMILY)
     g_object_notify (object, "family-set");
@@ -957,7 +972,7 @@
 
 static void
 notify_fields_changed (GObject       *object,
-		       PangoFontMask  changed_mask)
+               PangoFontMask  changed_mask)
 {
   if (changed_mask & PANGO_FONT_MASK_FAMILY)
     g_object_notify (object, "family");
@@ -1023,9 +1038,9 @@
 
 static void
 ghb_cell_renderer_text_set_property (GObject      *object,
-				     guint         param_id,
-				     const GValue *value,
-				     GParamSpec   *pspec)
+                     guint         param_id,
+                     const GValue *value,
+                     GParamSpec   *pspec)
 {
   GhbCellRendererText *celltext = GHB_CELL_RENDERER_TEXT (object);
   GhbCellRendererTextPrivate *priv;
@@ -1051,7 +1066,7 @@
 
     case PROP_ATTRIBUTES:
       if (celltext->extra_attrs)
-	pango_attr_list_unref (celltext->extra_attrs);
+    pango_attr_list_unref (celltext->extra_attrs);
 
       celltext->extra_attrs = g_value_get_boxed (value);
       if (celltext->extra_attrs)
@@ -1059,33 +1074,33 @@
       break;
     case PROP_MARKUP:
       {
-	const gchar *str;
-	gchar *text = NULL;
-	GError *error = NULL;
-	PangoAttrList *attrs = NULL;
-
-	str = g_value_get_string (value);
-	if (str && !pango_parse_markup (str,
-					-1,
-					0,
-					&attrs,
-					&text,
-					NULL,
-					&error))
-	  {
-	    g_warning ("Failed to set text from markup due to error parsing markup: %s",
-		       error->message);
-	    g_error_free (error);
-	    return;
-	  }
-
-	g_free (celltext->text);
-
-	if (celltext->extra_attrs)
-	  pango_attr_list_unref (celltext->extra_attrs);
-
-	celltext->text = text;
-	celltext->extra_attrs = attrs;
+    const gchar *str;
+    gchar *text = NULL;
+    GError *error = NULL;
+    PangoAttrList *attrs = NULL;
+
+    str = g_value_get_string (value);
+    if (str && !pango_parse_markup (str,
+                    -1,
+                    0,
+                    &attrs,
+                    &text,
+                    NULL,
+                    &error))
+      {
+        g_warning ("Failed to set text from markup due to error parsing markup: %s",
+               error->message);
+        g_error_free (error);
+        return;
+      }
+
+    g_free (celltext->text);
+
+    if (celltext->extra_attrs)
+      pango_attr_list_unref (celltext->extra_attrs);
+
+    celltext->text = text;
+    celltext->extra_attrs = attrs;
         priv->markup_set = TRUE;
       }
       break;
@@ -1146,10 +1161,10 @@
 
         set_font_description (celltext, font_desc);
 
-	pango_font_description_free (font_desc);
+    pango_font_description_free (font_desc);
         
-	if (celltext->fixed_height_rows != -1)
-	  celltext->calc_fixed_height = TRUE;
+    if (celltext->fixed_height_rows != -1)
+      celltext->calc_fixed_height = TRUE;
       }
       break;
 
@@ -1157,7 +1172,7 @@
       set_font_description (celltext, g_value_get_boxed (value));
       
       if (celltext->fixed_height_rows != -1)
-	celltext->calc_fixed_height = TRUE;
+    celltext->calc_fixed_height = TRUE;
       break;
 
     case PROP_FAMILY:
@@ -1168,57 +1183,57 @@
     case PROP_SIZE:
     case PROP_SIZE_POINTS:
       {
-	PangoFontMask old_set_mask = pango_font_description_get_set_fields (celltext->font);
-	
-	switch (param_id)
-	  {
-	  case PROP_FAMILY:
-	    pango_font_description_set_family (celltext->font,
-					       g_value_get_string (value));
-	    break;
-	  case PROP_STYLE:
-	    pango_font_description_set_style (celltext->font,
-					      g_value_get_enum (value));
-	    break;
-	  case PROP_VARIANT:
-	    pango_font_description_set_variant (celltext->font,
-						g_value_get_enum (value));
-	    break;
-	  case PROP_WEIGHT:
-	    pango_font_description_set_weight (celltext->font,
-					       g_value_get_int (value));
-	    break;
-	  case PROP_STRETCH:
-	    pango_font_description_set_stretch (celltext->font,
-						g_value_get_enum (value));
-	    break;
-	  case PROP_SIZE:
-	    pango_font_description_set_size (celltext->font,
-					     g_value_get_int (value));
-	    g_object_notify (object, "size-points");
-	    break;
-	  case PROP_SIZE_POINTS:
-	    pango_font_description_set_size (celltext->font,
-					     g_value_get_double (value) * PANGO_SCALE);
-	    g_object_notify (object, "size");
-	    break;
-	  }
-	
-	if (celltext->fixed_height_rows != -1)
-	  celltext->calc_fixed_height = TRUE;
-	
-	notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (celltext->font));
-	g_object_notify (object, "font-desc");
-	g_object_notify (object, "font");
-
-	break;
+    PangoFontMask old_set_mask = pango_font_description_get_set_fields (celltext->font);
+    
+    switch (param_id)
+      {
+      case PROP_FAMILY:
+        pango_font_description_set_family (celltext->font,
+                           g_value_get_string (value));
+        break;
+      case PROP_STYLE:
+        pango_font_description_set_style (celltext->font,
+                          g_value_get_enum (value));
+        break;
+      case PROP_VARIANT:
+        pango_font_description_set_variant (celltext->font,
+                        g_value_get_enum (value));
+        break;
+      case PROP_WEIGHT:
+        pango_font_description_set_weight (celltext->font,
+                           g_value_get_int (value));
+        break;
+      case PROP_STRETCH:
+        pango_font_description_set_stretch (celltext->font,
+                        g_value_get_enum (value));
+        break;
+      case PROP_SIZE:
+        pango_font_description_set_size (celltext->font,
+                         g_value_get_int (value));
+        g_object_notify (object, "size-points");
+        break;
+      case PROP_SIZE_POINTS:
+        pango_font_description_set_size (celltext->font,
+                         g_value_get_double (value) * PANGO_SCALE);
+        g_object_notify (object, "size");
+        break;
+      }
+    
+    if (celltext->fixed_height_rows != -1)
+      celltext->calc_fixed_height = TRUE;
+    
+    notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (celltext->font));
+    g_object_notify (object, "font-desc");
+    g_object_notify (object, "font");
+
+    break;
       }
       
     case PROP_SCALE:
       celltext->font_scale = g_value_get_double (value);
       celltext->scale_set = TRUE;
       if (celltext->fixed_height_rows != -1)
-	celltext->calc_fixed_height = TRUE;
+    celltext->calc_fixed_height = TRUE;
       g_object_notify (object, "scale-set");
       break;
       
@@ -1250,7 +1265,7 @@
       celltext->rise_set = TRUE;
       g_object_notify (object, "rise-set");
       if (celltext->fixed_height_rows != -1)
-	celltext->calc_fixed_height = TRUE;
+    celltext->calc_fixed_height = TRUE;
       break;  
 
     case PROP_LANGUAGE:
@@ -1300,18 +1315,18 @@
     case PROP_STRETCH_SET:
     case PROP_SIZE_SET:
       if (!g_value_get_boolean (value))
-	{
-	  pango_font_description_unset_fields (celltext->font,
-					       get_property_font_set_mask (param_id));
-	}
+    {
+      pango_font_description_unset_fields (celltext->font,
+                           get_property_font_set_mask (param_id));
+    }
       else
-	{
-	  PangoFontMask changed_mask;
-	  
-	  changed_mask = set_font_desc_fields (celltext->font,
-					       get_property_font_set_mask (param_id));
-	  notify_fields_changed (G_OBJECT (celltext), changed_mask);
-	}
+    {
+      PangoFontMask changed_mask;
+      
+      changed_mask = set_font_desc_fields (celltext->font,
+                           get_property_font_set_mask (param_id));
+      notify_fields_changed (G_OBJECT (celltext), changed_mask);
+    }
       break;
 
     case PROP_SCALE_SET:
@@ -1412,7 +1427,7 @@
        */
       
       if (celltext->foreground_set
-	  && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
+      && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
         {
           PangoColor color;
 
@@ -1487,9 +1502,9 @@
       PangoAlignment align;
 
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-	align = PANGO_ALIGN_RIGHT;
+    align = PANGO_ALIGN_RIGHT;
       else
-	align = PANGO_ALIGN_LEFT;
+    align = PANGO_ALIGN_LEFT;
 
       pango_layout_set_alignment (layout, align);
     }
@@ -1503,13 +1518,13 @@
 
 static void
 get_size (GtkCellRenderer *cell,
-	  GtkWidget       *widget,
-	  GdkRectangle    *cell_area,
-	  PangoLayout     *layout,
-	  gint            *x_offset,
-	  gint            *y_offset,
-	  gint            *width,
-	  gint            *height)
+      GtkWidget       *widget,
+      MyGdkRectangle    *cell_area,
+      PangoLayout     *layout,
+      gint            *x_offset,
+      gint            *y_offset,
+      gint            *width,
+      gint            *height)
 {
   GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
   PangoRectangle rect;
@@ -1531,36 +1546,36 @@
       PangoFontDescription *font_desc;
       gint row_height;
 
-      font_desc = pango_font_description_copy_static (widget->style->font_desc);
-      pango_font_description_merge_static (font_desc, celltext->font, TRUE);
+      font_desc = pango_font_description_copy_static(gtk_widget_get_style(widget)->font_desc);
+      pango_font_description_merge_static(font_desc, celltext->font, TRUE);
 
       if (celltext->scale_set)
-	pango_font_description_set_size (font_desc,
-					 celltext->font_scale * pango_font_description_get_size (font_desc));
+    pango_font_description_set_size (font_desc,
+                     celltext->font_scale * pango_font_description_get_size (font_desc));
 
       context = gtk_widget_get_pango_context (widget);
 
       metrics = pango_context_get_metrics (context,
-					   font_desc,
-					   pango_context_get_language (context));
+                       font_desc,
+                       pango_context_get_language (context));
       row_height = (pango_font_metrics_get_ascent (metrics) +
-		    pango_font_metrics_get_descent (metrics));
+            pango_font_metrics_get_descent (metrics));
       pango_font_metrics_unref (metrics);
 
       pango_font_description_free (font_desc);
 
       gtk_cell_renderer_set_fixed_size (cell,
-					cell_width, 2*cell_ypad +
-					celltext->fixed_height_rows * PANGO_PIXELS (row_height));
+                    cell_width, 2*cell_ypad +
+                    celltext->fixed_height_rows * PANGO_PIXELS (row_height));
       
       if (height)
-	{
+    {
           *height = cell_height;
-	  height = NULL;
-	}
+      height = NULL;
+    }
       celltext->calc_fixed_height = FALSE;
       if (width == NULL)
-	return;
+    return;
     }
   
   if (layout)
@@ -1576,20 +1591,20 @@
       rect.width = MIN(rect.width, cell_area->width - 2 * cell_xpad);
 
       if (x_offset)
-	{
-	  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-	    *x_offset = (1.0 - cell_xalign) * (cell_area->width - (2 * cell_xpad));
-	  else 
-	    *x_offset = cell_xalign * (cell_area->width - (2 * cell_xpad));
-
-	  if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->wrap_width != -1)
-	    *x_offset = MAX(*x_offset, 0);
-	}
+    {
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+        *x_offset = (1.0 - cell_xalign) * (cell_area->width - (2 * cell_xpad));
+      else 
+        *x_offset = cell_xalign * (cell_area->width - (2 * cell_xpad));
+
+      if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->wrap_width != -1)
+        *x_offset = MAX(*x_offset, 0);
+    }
       if (y_offset)
-	{
-	  *y_offset = cell_yalign * (cell_area->height - (rect.height + (2 * cell_ypad)));
-	  *y_offset = MAX (*y_offset, 0);
-	}
+    {
+      *y_offset = cell_yalign * (cell_area->height - (rect.height + (2 * cell_ypad)));
+      *y_offset = MAX (*y_offset, 0);
+    }
     }
   else
     {
@@ -1609,125 +1624,203 @@
 
 static void
 ghb_cell_renderer_text_get_size (GtkCellRenderer *cell,
-				 GtkWidget       *widget,
-				 GdkRectangle    *cell_area,
-				 gint            *x_offset,
-				 gint            *y_offset,
-				 gint            *width,
-				 gint            *height)
+                 GtkWidget       *widget,
+                 MyGdkRectangle  *cell_area,
+                 gint            *x_offset,
+                 gint            *y_offset,
+                 gint            *width,
+                 gint            *height)
 {
   get_size (cell, widget, cell_area, NULL,
-	    x_offset, y_offset, width, height);
+        x_offset, y_offset, width, height);
 }
 
-static void
-ghb_cell_renderer_text_render (GtkCellRenderer      *cell,
-			       GdkDrawable          *window,
-			       GtkWidget            *widget,
-			       GdkRectangle         *background_area,
-			       GdkRectangle         *cell_area,
-			       GdkRectangle         *expose_area,
-			       GtkCellRendererState  flags)
+#if GTK_CHECK_VERSION(3, 0, 0)
+static void ghb_cell_renderer_text_render(
+    GtkCellRenderer          *cell,
+    cairo_t                  *cr,
+    GtkWidget                *widget,
+    MyGdkRectangle           *background_area,
+    MyGdkRectangle           *cell_area,
+    GtkCellRendererState      flags)
+{
+    GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
+    PangoLayout *layout;
+    gint x_offset;
+    gint y_offset;
+    GhbCellRendererTextPrivate *priv;
+
+    priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+
+    layout = get_layout (celltext, widget, TRUE, flags);
+    get_size(cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
+
+    gint xpad, ypad;
+#if 0
+    GtkStateType state;
+    gboolean sensitive;
+
+    sensitive = gtk_cell_renderer_get_sensitive(cell);
+    if (!sensitive) 
+    {
+      state = GTK_STATE_INSENSITIVE;
+    }
+    else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+    {
+        if (gtk_widget_has_focus (widget))
+            state = GTK_STATE_SELECTED;
+        else
+            state = GTK_STATE_ACTIVE;
+    }
+    else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
+       gtk_widget_get_state(widget) == GTK_STATE_PRELIGHT)
+    {
+        state = GTK_STATE_PRELIGHT;
+    }
+    else
+    {
+        if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
+            state = GTK_STATE_INSENSITIVE;
+        else
+            state = GTK_STATE_NORMAL;
+    }
+#endif
+
+    gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
+
+    if (celltext->background_set && 
+      (flags & GTK_CELL_RENDERER_SELECTED) == 0)
+    {
+        gdk_cairo_rectangle (cr, background_area);
+        cairo_set_source_rgb (cr,
+                celltext->background.red / 65535.,
+                celltext->background.green / 65535.,
+                celltext->background.blue / 65535.);
+        cairo_fill (cr);
+    }
+
+    if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
+        pango_layout_set_width (layout, 
+                (cell_area->width - x_offset - 2 * xpad) * PANGO_SCALE);
+    else if (priv->wrap_width == -1)
+        pango_layout_set_width (layout, -1);
+
+    gtk_render_layout(gtk_widget_get_style_context(widget),
+                      cr,
+                      cell_area->x + x_offset + xpad,
+                      cell_area->y + y_offset + ypad,
+                      layout);
 
+    g_object_unref (layout);
+}
+#else
+static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
+                           GdkWindow                *window,
+                           GtkWidget                *widget,
+                           MyGdkRectangle           *background_area,
+                           MyGdkRectangle           *cell_area,
+                           GdkRectangle             *expose_area,
+                           GtkCellRendererState      flags)
 {
-  GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
-  PangoLayout *layout;
-  GtkStateType state;
-  gint x_offset;
-  gint y_offset;
-  GhbCellRendererTextPrivate *priv;
+    GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
+    PangoLayout *layout;
+    GtkStateType state;
+    gint x_offset;
+    gint y_offset;
+    GhbCellRendererTextPrivate *priv;
 
-  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+    priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
 
-  layout = get_layout (celltext, widget, TRUE, flags);
-  get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
+    layout = get_layout (celltext, widget, TRUE, flags);
+    get_size(cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
 
-  gboolean sensitive;
-  gint xpad, ypad;
+    gboolean sensitive;
+    gint xpad, ypad;
 
-  sensitive = gtk_cell_renderer_get_sensitive(cell);
-  if (!sensitive) 
+    sensitive = gtk_cell_renderer_get_sensitive(cell);
+    if (!sensitive) 
     {
       state = GTK_STATE_INSENSITIVE;
     }
-  else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+    else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
     {
-      if (gtk_widget_has_focus (widget))
-	state = GTK_STATE_SELECTED;
-      else
-	state = GTK_STATE_ACTIVE;
+        if (gtk_widget_has_focus (widget))
+            state = GTK_STATE_SELECTED;
+        else
+            state = GTK_STATE_ACTIVE;
     }
-  else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
-	   GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
+    else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
+       GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
     {
-      state = GTK_STATE_PRELIGHT;
+        state = GTK_STATE_PRELIGHT;
     }
-  else
+    else
     {
-      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
-	state = GTK_STATE_INSENSITIVE;
-      else
-	state = GTK_STATE_NORMAL;
+        if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
+            state = GTK_STATE_INSENSITIVE;
+        else
+            state = GTK_STATE_NORMAL;
     }
 
-  gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
+    gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
 
-  if (celltext->background_set && 
+    if (celltext->background_set && 
       (flags & GTK_CELL_RENDERER_SELECTED) == 0)
     {
-      cairo_t *cr = gdk_cairo_create (window);
-
-      if (expose_area)
-	{
-	  gdk_cairo_rectangle (cr, expose_area);
-	  cairo_clip (cr);
-	}
-
-      gdk_cairo_rectangle (cr, background_area);
-      cairo_set_source_rgb (cr,
-			    celltext->background.red / 65535.,
-			    celltext->background.green / 65535.,
-			    celltext->background.blue / 65535.);
-      cairo_fill (cr);
+        cairo_t *cr = gdk_cairo_create (window);
+
+        if (expose_area)
+        {
+            gdk_cairo_rectangle (cr, expose_area);
+            cairo_clip (cr);
+        }
+
+        gdk_cairo_rectangle (cr, background_area);
+        cairo_set_source_rgb (cr,
+                celltext->background.red / 65535.,
+                celltext->background.green / 65535.,
+                celltext->background.blue / 65535.);
+        cairo_fill (cr);
       
-      cairo_destroy (cr);
+        cairo_destroy (cr);
     }
 
-  if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
-    pango_layout_set_width (layout, 
-			    (cell_area->width - x_offset - 2 * xpad) * PANGO_SCALE);
-  else if (priv->wrap_width == -1)
-    pango_layout_set_width (layout, -1);
-
-  gtk_paint_layout (widget->style,
-                    window,
-                    state,
-		    TRUE,
-                    expose_area,
-                    widget,
-                    "cellrenderertext",
-                    cell_area->x + x_offset + xpad,
-                    cell_area->y + y_offset + ypad,
-                    layout);
-
-  g_object_unref (layout);
+    if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
+        pango_layout_set_width (layout, 
+                (cell_area->width - x_offset - 2 * xpad) * PANGO_SCALE);
+    else if (priv->wrap_width == -1)
+        pango_layout_set_width (layout, -1);
+
+    gtk_paint_layout (widget->style,
+                      window,
+                      state,
+                      TRUE,
+                      expose_area,
+                      widget,
+                      "cellrenderertext",
+                      cell_area->x + x_offset + xpad,
+                      cell_area->y + y_offset + ypad,
+                      layout);
+
+    g_object_unref (layout);
 }
+#endif
 
 static gboolean
 ghb_cell_renderer_text_keypress(
-	GtkCellEditable *entry,
-	GdkEventKey *event,
-	gpointer data)
+    GtkCellEditable *entry,
+    GdkEventKey *event,
+    gpointer data)
 {
-	gboolean result;
-	g_signal_emit(
-		data, text_cell_renderer_signals[KEYPRESS], 0, event, &result);
-	return result;
+    gboolean result;
+    g_signal_emit(
+        data, text_cell_renderer_signals[KEYPRESS], 0, event, &result);
+    return result;
 }
 
 static void
 ghb_cell_renderer_text_editing_done (GtkCellEditable *entry,
-				     gpointer         data)
+                     gpointer         data)
 {
   const gchar *path;
   const gchar *new_text;
@@ -1758,7 +1851,7 @@
   gboolean editing_canceled;
   g_object_get(entry, "editing-canceled", &editing_canceled, NULL);
   gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (data), 
-				  editing_canceled);
+                  editing_canceled);
   if (editing_canceled)
     return;
 
@@ -1823,8 +1916,8 @@
 
 static gboolean
 ghb_cell_renderer_text_focus_out_event (GtkWidget *entry,
-		                        GdkEvent  *event,
-					gpointer   data)
+                                GdkEvent  *event,
+                    gpointer   data)
 {
   GhbCellRendererTextPrivate *priv;
 
@@ -1843,90 +1936,97 @@
 
 static GtkCellEditable *
 ghb_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
-				      GdkEvent             *event,
-				      GtkWidget            *widget,
-				      const gchar          *path,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GtkCellRendererState  flags)
+                      GdkEvent             *event,
+                      GtkWidget            *widget,
+                      const gchar          *path,
+                      MyGdkRectangle       *background_area,
+                      MyGdkRectangle       *cell_area,
+                      GtkCellRendererState  flags)
 {
-  GtkRequisition requisition;
-  GhbCellRendererText *celltext;
-  GhbCellRendererTextPrivate *priv;
+    GhbCellRendererText *celltext;
+    GhbCellRendererTextPrivate *priv;
 
-  celltext = GHB_CELL_RENDERER_TEXT (cell);
-  priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+    celltext = GHB_CELL_RENDERER_TEXT (cell);
+    priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
+
+    /* If the cell isn't editable we return NULL. */
+    if (celltext->editable == FALSE)
+        return NULL;
 
-  /* If the cell isn't editable we return NULL. */
-  if (celltext->editable == FALSE)
-    return NULL;
+    gint xalign;
+    g_object_get(cell, "xalign", &xalign, NULL);
+    priv->entry = g_object_new (GTK_TYPE_ENTRY,
+                  "has-frame", FALSE,
+                  "xalign", xalign,
+                  NULL);
 
-  gint xalign;
-  g_object_get(cell, "xalign", &xalign, NULL);
-  priv->entry = g_object_new (GTK_TYPE_ENTRY,
-			      "has-frame", FALSE,
-			      "xalign", xalign,
-			      NULL);
+    if (celltext->text)
+        gtk_entry_set_text (GTK_ENTRY (priv->entry), celltext->text);
 
-  if (celltext->text)
-    gtk_entry_set_text (GTK_ENTRY (priv->entry), celltext->text);
-  g_object_set_data_full (G_OBJECT (priv->entry), I_(GHB_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free);
+    g_object_set_data_full (G_OBJECT (priv->entry),
+            I_(GHB_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free);
   
-  gtk_editable_select_region (GTK_EDITABLE (priv->entry), 0, -1);
+    gtk_editable_select_region (GTK_EDITABLE (priv->entry), 0, -1);
   
-  gtk_widget_size_request (priv->entry, &requisition);
-  if (requisition.height < cell_area->height)
+#if 0
+    GtkRequisition min_size, size;
+
+    gtk_widget_get_preferred_size(priv->entry, &min_size, &size);
+    if (min_size.height > size.height)
+        size.height = min_size.height;
+    if (min_size.width > size.width)
+        size.width = min_size.width;
+    if (size.height < cell_area->height)
     {
-      GtkBorder *style_border;
-      GtkBorder border;
+        GtkBorder *style_border;
+        GtkBorder border;
 
-      gtk_widget_style_get (priv->entry,
-			    "inner-border", &style_border,
-			    NULL);
+        gtk_widget_style_get (priv->entry,
+                "inner-border", &style_border,
+                NULL);
 
-      if (style_border)
+        if (style_border)
         {
-	  border = *style_border;
-	  g_boxed_free (GTK_TYPE_BORDER, style_border);
-	}
-      else
+            border = *style_border;
+            g_boxed_free (GTK_TYPE_BORDER, style_border);
+        }
+        else
         {
-	  /* Since boxed style properties can't have default values ... */
-	  border.left = 2;
-	  border.right = 2;
-	}
-
-      border.top = (cell_area->height - requisition.height) / 2;
-      border.bottom = (cell_area->height - requisition.height) / 2;
-      gtk_entry_set_inner_border (GTK_ENTRY (priv->entry), &border);
-    }
+            /* Since boxed style properties can't have default values ... */
+            border.left = 2;
+            border.right = 2;
+        }
 
-  priv->in_entry_menu = FALSE;
-  if (priv->entry_menu_popdown_timeout)
+        border.top = (cell_area->height - size.height) / 2;
+        border.bottom = (cell_area->height - size.height) / 2;
+        gtk_entry_set_inner_border (GTK_ENTRY (priv->entry), &border);
+    }
+#endif
+    priv->in_entry_menu = FALSE;
+    if (priv->entry_menu_popdown_timeout)
     {
-      g_source_remove (priv->entry_menu_popdown_timeout);
-      priv->entry_menu_popdown_timeout = 0;
+        g_source_remove (priv->entry_menu_popdown_timeout);
+        priv->entry_menu_popdown_timeout = 0;
     }
 
-  g_signal_connect (priv->entry,
-		    "key-press-event",
-		    G_CALLBACK (ghb_cell_renderer_text_keypress),
-		    celltext);
-  g_signal_connect (priv->entry,
-		    "editing_done",
-		    G_CALLBACK (ghb_cell_renderer_text_editing_done),
-		    celltext);
-  priv->focus_out_id = g_signal_connect_after (priv->entry, "focus_out_event",
-					       G_CALLBACK (ghb_cell_renderer_text_focus_out_event),
-					       celltext);
-  priv->populate_popup_id =
-    g_signal_connect (priv->entry, "populate_popup",
+    g_signal_connect (priv->entry,
+            "key-press-event",
+            G_CALLBACK (ghb_cell_renderer_text_keypress),
+            celltext);
+    g_signal_connect (priv->entry,
+            "editing_done",
+            G_CALLBACK (ghb_cell_renderer_text_editing_done),
+            celltext);
+    priv->focus_out_id = g_signal_connect_after (priv->entry, "focus_out_event",
+                           G_CALLBACK (ghb_cell_renderer_text_focus_out_event),
+                           celltext);
+    priv->populate_popup_id = g_signal_connect (priv->entry, "populate_popup",
                       G_CALLBACK (ghb_cell_renderer_text_populate_popup),
                       celltext);
  
-  gtk_widget_show (priv->entry);
+    gtk_widget_show (priv->entry);
 
-  return GTK_CELL_EDITABLE (priv->entry);
+    return GTK_CELL_EDITABLE (priv->entry);
 }
 
 /**
@@ -1944,7 +2044,7 @@
  **/
 void
 ghb_cell_renderer_text_set_fixed_height_from_font (GhbCellRendererText *renderer,
-						   gint                 number_of_rows)
+                           gint                 number_of_rows)
 {
   g_return_if_fail (GHB_IS_CELL_RENDERER_TEXT (renderer));
   g_return_if_fail (number_of_rows == -1 || number_of_rows > 0);
@@ -1954,8 +2054,8 @@
       gint width;
       g_object_get(renderer, "width", &width, NULL);
       gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (renderer),
-					width,
-					-1);
+                    width,
+                    -1);
     }
   else
     {

HandBrake-0.9.8.tar.bz2/gtk/src/ghbcellrenderertext.h -> HandBrake-0.9.9.tar.bz2/gtk/src/ghbcellrenderertext.h Changed

@@ -27,11 +27,11 @@
 G_BEGIN_DECLS
 
 
-#define GHB_TYPE_CELL_RENDERER_TEXT		(ghb_cell_renderer_text_get_type ())
-#define GHB_CELL_RENDERER_TEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GHB_TYPE_CELL_RENDERER_TEXT, GhbCellRendererText))
-#define GHB_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GHB_TYPE_CELL_RENDERER_TEXT, GhbCellRendererTextClass))
-#define GHB_IS_CELL_RENDERER_TEXT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHB_TYPE_CELL_RENDERER_TEXT))
-#define GHB_IS_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GHB_TYPE_CELL_RENDERER_TEXT))
+#define GHB_TYPE_CELL_RENDERER_TEXT     (ghb_cell_renderer_text_get_type ())
+#define GHB_CELL_RENDERER_TEXT(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHB_TYPE_CELL_RENDERER_TEXT, GhbCellRendererText))
+#define GHB_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GHB_TYPE_CELL_RENDERER_TEXT, GhbCellRendererTextClass))
+#define GHB_IS_CELL_RENDERER_TEXT(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHB_TYPE_CELL_RENDERER_TEXT))
+#define GHB_IS_CELL_RENDERER_TEXT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GHB_TYPE_CELL_RENDERER_TEXT))
 #define GHB_CELL_RENDERER_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GHB_TYPE_CELL_RENDERER_TEXT, GhbCellRendererTextClass))
 
 typedef struct _GhbCellRendererText      GhbCellRendererText;
@@ -79,11 +79,11 @@
   GtkCellRendererClass parent_class;
 
   void (* edited) (GhbCellRendererText *cell_renderer_text,
-		   const gchar         *path,
-		   const gchar         *new_text);
+           const gchar         *path,
+           const gchar         *new_text);
 
   gboolean (* keypress) (GhbCellRendererText *cell_renderer_text,
-		   GdkEventKey *event);
+           GdkEventKey *event);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -96,7 +96,7 @@
 GtkCellRenderer *ghb_cell_renderer_text_new      (void);
 
 void             ghb_cell_renderer_text_set_fixed_height_from_font (GhbCellRendererText *renderer,
-								    gint                 number_of_rows);
+                                    gint                 number_of_rows);
 
 
 G_END_DECLS

HandBrake-0.9.8.tar.bz2/gtk/src/ghbcompat.h -> HandBrake-0.9.9.tar.bz2/gtk/src/ghbcompat.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/ghbcompositor.c -> HandBrake-0.9.9.tar.bz2/gtk/src/ghbcompositor.c Changed

@@ -45,12 +45,23 @@
 static void     ghb_compositor_finalize      (GObject        *object);
 static void     ghb_compositor_realize       (GtkWidget      *widget);
 static void     ghb_compositor_unrealize     (GtkWidget      *widget);
-static void     ghb_compositor_size_request  (GtkWidget      *widget,
-                                             GtkRequisition  *requisition);
 static void     ghb_compositor_size_allocate (GtkWidget      *widget,
                                              GtkAllocation   *allocation);
+#if GTK_CHECK_VERSION(3, 0, 0)
+static gboolean ghb_compositor_draw          (GtkWidget      *widget,
+                                             cairo_t         *cr);
+static void ghb_compositor_get_preferred_width(GtkWidget      *widget,
+                                             gint            *minimum_size,
+                                             gint            *natural_size);
+static void ghb_compositor_get_preferred_height(GtkWidget      *widget,
+                                             gint            *minimum_size,
+                                             gint            *natural_size);
+#else
 static gboolean ghb_compositor_expose        (GtkWidget      *widget,
                                              GdkEventExpose  *event);
+static void     ghb_compositor_size_request  (GtkWidget      *widget,
+                                             GtkRequisition  *requisition);
+#endif
 static void     ghb_compositor_set_property  (GObject        *object,
                                              guint            prop_id,
                                              const GValue    *value,
@@ -93,14 +104,19 @@
     gobject_class->set_property = ghb_compositor_set_property;
     gobject_class->get_property = ghb_compositor_get_property;
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+    widget_class->draw = ghb_compositor_draw;
+    widget_class->get_preferred_width = ghb_compositor_get_preferred_width;
+    widget_class->get_preferred_height = ghb_compositor_get_preferred_height;
+#else
     widget_class->size_request = ghb_compositor_size_request;
+    widget_class->expose_event = ghb_compositor_expose;
+#endif
     widget_class->size_allocate = ghb_compositor_size_allocate;
 
     widget_class->realize = ghb_compositor_realize;
     widget_class->unrealize = ghb_compositor_unrealize;
 
-    widget_class->expose_event = ghb_compositor_expose;
-
     container_class->add = ghb_compositor_add;
     container_class->remove = ghb_compositor_remove;
     container_class->forall = ghb_compositor_forall;
@@ -139,10 +155,6 @@
     GValue     *value,
     GParamSpec *pspec)
 {
-    GhbCompositor *compositor;
-
-    compositor = GHB_COMPOSITOR (object);
-
     switch (prop_id)
     {
     default:
@@ -158,10 +170,6 @@
     const GValue *value,
     GParamSpec   *pspec)
 {
-    GhbCompositor *compositor;
-
-    compositor = GHB_COMPOSITOR (object);
-
     switch (prop_id)
     {
     default:
@@ -433,7 +441,7 @@
     GhbCompositorChild *cc;
     GList *link, *next;
 
-    for (link = compositor->children; link != NULL; link = link->next)
+    for (link = compositor->children; link != NULL; )
     {
         // The callback may cause the link to be removed from the list.
         // So find next before calling callback
@@ -495,11 +503,15 @@
     GdkWindow *window;
     if (visible_window)
     {
-        attributes.visual = gtk_widget_get_visual (widget);
+#if GTK_CHECK_VERSION(3, 0, 0)
+        attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+#else
+        attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
         attributes.colormap = gtk_widget_get_colormap (widget);
+#endif
+        attributes.visual = gtk_widget_get_visual (widget);
         attributes.wclass = GDK_INPUT_OUTPUT;
 
-        attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
         window = gdk_window_new(gtk_widget_get_parent_window (widget),
                                 &attributes, attributes_mask);
@@ -513,11 +525,13 @@
         g_object_ref (window);
     }
 
-    widget->style = gtk_style_attach (widget->style, window);
+#if !GTK_CHECK_VERSION(3, 0, 0)
+    gtk_widget_style_attach(widget);
 
     if (visible_window)
         gtk_style_set_background(widget->style, window, 
                                 GTK_STATE_NORMAL);
+#endif
 }
 
 static void
@@ -526,6 +540,60 @@
     GTK_WIDGET_CLASS (ghb_compositor_parent_class)->unrealize (widget);
 }
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+static void
+ghb_compositor_get_preferred_width(
+        GtkWidget *widget,
+        gint *minimum_size,
+        gint *natural_size)
+{
+    GhbCompositor *compositor = GHB_COMPOSITOR (widget);
+    GList *link;
+    GhbCompositorChild *cc;
+    gint width = 0;
+    GtkRequisition min_size, size;
+
+    for (link = compositor->children; link != NULL; link = link->next)
+    {
+        cc = (GhbCompositorChild*)link->data;
+        if (gtk_widget_get_visible(cc->widget))
+        {
+            gtk_widget_get_preferred_size(cc->widget, &min_size, &size);
+            width = MAX(MAX(min_size.width, size.width), width);
+        }
+    }
+
+    *minimum_size = width + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
+    *natural_size = width + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
+}
+
+static void
+ghb_compositor_get_preferred_height(
+        GtkWidget *widget,
+        gint *minimum_size,
+        gint *natural_size)
+{
+    GhbCompositor *compositor = GHB_COMPOSITOR (widget);
+    GList *link;
+    GhbCompositorChild *cc;
+    gint height = 0;
+    GtkRequisition min_size, size;
+
+    for (link = compositor->children; link != NULL; link = link->next)
+    {
+        cc = (GhbCompositorChild*)link->data;
+        if (gtk_widget_get_visible(cc->widget))
+        {
+            gtk_widget_get_preferred_size(cc->widget, &min_size, &size);
+            height = MAX(MAX(min_size.height, size.height), height);
+        }
+    }
+
+    *minimum_size = height + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
+    *natural_size = height + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
+}
+#else
+
 static void
 ghb_compositor_size_request(
     GtkWidget      *widget,
@@ -535,23 +603,24 @@
     GList *link;
     GhbCompositorChild *cc;
     gint width = 0, height = 0;
-    GtkRequisition child_requisition;
+    GtkRequisition size;
 
     for (link = compositor->children; link != NULL; link = link->next)
     {
         cc = (GhbCompositorChild*)link->data;
         if (gtk_widget_get_visible(cc->widget))
         {
-            gtk_widget_size_request(cc->widget, NULL);
-            gtk_widget_get_child_requisition(cc->widget, &child_requisition);
-            width = MAX(child_requisition.width, width);
-            height = MAX(child_requisition.height, height);
+            //gtk_widget_size_request(cc->widget, NULL);
+            gtk_widget_size_request(cc->widget, &size);
+            width = MAX(size.width, width);
+            height = MAX(size.height, height);
         }
     }
 
     requisition->width = width + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
     requisition->height = height + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
 }
+#endif
 
 static void
 ghb_compositor_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
@@ -561,7 +630,7 @@
     GhbCompositorChild *cc;
     GList *link;
 
-    widget->allocation = *allocation;
+    gtk_widget_set_allocation(widget, allocation);
     compositor = GHB_COMPOSITOR (widget);
 
     if (!gtk_widget_get_has_window(widget))
@@ -596,11 +665,95 @@
     for (link = compositor->children; link != NULL; link = link->next)
     {
         cc = (GhbCompositorChild*)link->data;
-    	if (gtk_widget_get_realized (cc->widget))
-        	gtk_widget_size_allocate (cc->widget, &child_allocation);
+        if (gtk_widget_get_realized (cc->widget))
+            gtk_widget_size_allocate (cc->widget, &child_allocation);
+    }
+}
+
+#if 0
+static void showrects(cairo_region_t *region)
+{
+    cairo_rectangle_int_t rect;
+    int ii;
+    int count = cairo_region_num_rectangles(region);
+
+    printf("rect count %d\n", count);
+    for (ii = 0; ii < count; ii++)
+    {
+        cairo_region_get_rectangle(region, ii, &rect);
+        printf("rect %d: %d,%d %dx%d\n",
+                ii, rect.x, rect.y, rect.width, rect.height);
     }
 }
+#endif
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+static void
+ghb_compositor_blend (GtkWidget *widget, cairo_t *cr)
+{
+    GhbCompositor *compositor = GHB_COMPOSITOR (widget);
+    GList *link, *draw;
+    cairo_region_t *region;
+    GtkWidget *child;
+    GhbCompositorChild *cc;
+
+    if (compositor->children == NULL) return;
+    /* create a cairo context to draw to the window */
+
+    for (link = compositor->children; link != NULL; link = link->next)
+    {
+        cc = (GhbCompositorChild*)link->data;
+        for (draw = cc->drawables; draw != NULL; draw = draw->next)
+        {
+            GtkAllocation child_alloc;
+
+            /* get our child */
+            child = GTK_WIDGET(draw->data);
+
+            if (
+//!gtk_cairo_should_draw_window(cr, gtk_widget_get_window(child)) ||
+                !gtk_widget_get_visible(cc->widget) || 
+                !gtk_widget_get_visible(child))
+                continue;
+
+            gtk_widget_get_allocation(child, &child_alloc);
+            cairo_save(cr);
+
+            /* the source data is the (composited) event box */
+            gdk_cairo_set_source_window(cr, gtk_widget_get_window(child),
+                                        child_alloc.x,
+                                        child_alloc.y);
+
+            cairo_rectangle_int_t rect;
+
+            rect.x = child_alloc.x;
+            rect.y = child_alloc.y;
+            rect.width = child_alloc.width;
+            rect.height = child_alloc.height;
+
+            /* draw no more than our expose event intersects our child */
+            region = cairo_region_create_rectangle(&rect);
+
+            cairo_region_t *dregion = gdk_window_get_visible_region(
+                                            gtk_widget_get_window(child));
+            cairo_region_translate(dregion, child_alloc.x, child_alloc.y);
+            cairo_region_intersect(region, dregion);
+            cairo_region_destroy(dregion);
+
+            gdk_cairo_region(cr, region);
+            cairo_region_destroy(region);
+            cairo_clip(cr);
 
+            /* composite, with an opacity */
+            cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+            cairo_paint_with_alpha(cr, cc->opacity);
+
+            cairo_restore(cr);
+        }
+    }
+    /* we're done */
+}
+#else
 static void
 ghb_compositor_blend (GtkWidget *widget, GdkEventExpose *event)
 {
@@ -639,6 +792,7 @@
                                             gtk_widget_get_window(child));
             gdk_region_offset(dregion, child->allocation.x, child->allocation.y);
             gdk_region_intersect (region, dregion);
+            gdk_region_destroy(dregion);
 
             gdk_cairo_region (cr, region);
             gdk_region_destroy(region);
@@ -652,7 +806,23 @@
     /* we're done */
     cairo_destroy (cr);
 }
+#endif
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+static gboolean
+ghb_compositor_draw(GtkWidget *widget, cairo_t *cr)
+{
+    if (gtk_widget_is_drawable(widget))
+    {
+        if (gtk_widget_get_has_window(widget))
+            ghb_compositor_blend (widget, cr);
+
+    }
+    GTK_WIDGET_CLASS(ghb_compositor_parent_class)->draw(widget, cr);
 
+    return FALSE;
+}
+#else
 static gboolean
 ghb_compositor_expose (GtkWidget *widget, GdkEventExpose *event)
 {
@@ -667,3 +837,4 @@
 
     return FALSE;
 }
+#endif

HandBrake-0.9.8.tar.bz2/gtk/src/hb-activity.32.png -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-activity.32.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-activity.64.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/hb-add-queue.32.png -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-add-queue.32.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-add-queue.64.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/hb-backend.c -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-backend.c Changed

@@ -2,7 +2,7 @@
  *            hb-backend.c
  *
  *  Fri Mar 28 10:38:44 2008
- *  Copyright  2008-2011  John Stebbins
+ *  Copyright  2008-2013  John Stebbins
  *  <john at stebbins dot name>
  ****************************************************************************/
 
@@ -39,16 +39,16 @@
 
 typedef struct
 {
-	gchar *option;
-	const gchar *shortOpt;
-	gdouble ivalue;
-	const gchar *svalue;
+    gchar *option;
+    const gchar *shortOpt;
+    gdouble ivalue;
+    const gchar *svalue;
 } options_map_t;
 
 typedef struct
 {
-	gint count;
-	options_map_t *map;
+    gint count;
+    options_map_t *map;
 } combo_opts_t;
 
 static gchar **index_str = NULL;
@@ -57,389 +57,391 @@
 static void 
 index_str_init(gint max_index)
 {
-	gint ii;
+    gint ii;
 
-	if (max_index+1 > index_str_size)
-	{
-		index_str = realloc(index_str, (max_index+1) * sizeof(char*));
-		for (ii = index_str_size; ii <= max_index; ii++)
-		{
-			index_str[ii] = g_strdup_printf("%d", ii);
-		}
-		index_str_size = max_index + 1;
-	}
+    if (max_index+1 > index_str_size)
+    {
+        index_str = realloc(index_str, (max_index+1) * sizeof(char*));
+        for (ii = index_str_size; ii <= max_index; ii++)
+        {
+            index_str[ii] = g_strdup_printf("%d", ii);
+        }
+        index_str_size = max_index + 1;
+    }
 }
 
 static options_map_t d_point_to_point_opts[] =
 {
-	{"Chapters:",       "chapter", 0, "0"},
-	{"Seconds:", "time",    1, "1"},
-	{"Frames:",   "frame",   2, "2"},
+    {"Chapters:",       "chapter", 0, "0"},
+    {"Seconds:", "time",    1, "1"},
+    {"Frames:",   "frame",   2, "2"},
 };
 combo_opts_t point_to_point_opts =
 {
-	sizeof(d_point_to_point_opts)/sizeof(options_map_t),
-	d_point_to_point_opts
+    sizeof(d_point_to_point_opts)/sizeof(options_map_t),
+    d_point_to_point_opts
 };
 
 static options_map_t d_when_complete_opts[] =
 {
-	{"Do Nothing",            "nothing",  0, "0"},
-	{"Show Notification",     "notify",   1, "1"},
-	{"Quit Handbrake",        "quit",     4, "4"},
-	{"Put Computer To Sleep", "sleep",    2, "2"},
-	{"Shutdown Computer",     "shutdown", 3, "3"},
+    {"Do Nothing",            "nothing",  0, "0"},
+    {"Show Notification",     "notify",   1, "1"},
+    {"Quit Handbrake",        "quit",     4, "4"},
+    {"Put Computer To Sleep", "sleep",    2, "2"},
+    {"Shutdown Computer",     "shutdown", 3, "3"},
 };
 combo_opts_t when_complete_opts =
 {
-	sizeof(d_when_complete_opts)/sizeof(options_map_t),
-	d_when_complete_opts
+    sizeof(d_when_complete_opts)/sizeof(options_map_t),
+    d_when_complete_opts
 };
 
 static options_map_t d_par_opts[] =
 {
-	{"Off", "0", 0, "0"},
-	{"Strict", "1", 1, "1"},
-	{"Loose", "2", 2, "2"},
-	{"Custom", "3", 3, "3"},
+    {"Off", "0", 0, "0"},
+    {"Strict", "1", 1, "1"},
+    {"Loose", "2", 2, "2"},
+    {"Custom", "3", 3, "3"},
 };
 combo_opts_t par_opts =
 {
-	sizeof(d_par_opts)/sizeof(options_map_t),
-	d_par_opts
+    sizeof(d_par_opts)/sizeof(options_map_t),
+    d_par_opts
 };
 
 static options_map_t d_alignment_opts[] =
 {
-	{"2", "2", 2, "2"},
-	{"4", "4", 4, "4"},
-	{"8", "8", 8, "8"},
-	{"16", "16", 16, "16"},
+    {"2", "2", 2, "2"},
+    {"4", "4", 4, "4"},
+    {"8", "8", 8, "8"},
+    {"16", "16", 16, "16"},
 };
 combo_opts_t alignment_opts =
 {
-	sizeof(d_alignment_opts)/sizeof(options_map_t),
-	d_alignment_opts
+    sizeof(d_alignment_opts)/sizeof(options_map_t),
+    d_alignment_opts
 };
 
 static options_map_t d_logging_opts[] =
 {
-	{"0", "0", 0, "0"},
-	{"1", "1", 1, "1"},
-	{"2", "2", 2, "2"},
+    {"0", "0", 0, "0"},
+    {"1", "1", 1, "1"},
+    {"2", "2", 2, "2"},
 };
 combo_opts_t logging_opts =
 {
-	sizeof(d_logging_opts)/sizeof(options_map_t),
-	d_logging_opts
+    sizeof(d_logging_opts)/sizeof(options_map_t),
+    d_logging_opts
 };
 
 static options_map_t d_log_longevity_opts[] =
 {
-	{"Week",     "week",     7, "7"},
-	{"Month",    "month",    30, "30"},
-	{"Year",     "year",     365, "365"},
-	{"Immortal", "immortal", 366, "366"},
+    {"Week",     "week",     7, "7"},
+    {"Month",    "month",    30, "30"},
+    {"Year",     "year",     365, "365"},
+    {"Immortal", "immortal", 366, "366"},
 };
 combo_opts_t log_longevity_opts =
 {
-	sizeof(d_log_longevity_opts)/sizeof(options_map_t),
-	d_log_longevity_opts
+    sizeof(d_log_longevity_opts)/sizeof(options_map_t),
+    d_log_longevity_opts
 };
 
 static options_map_t d_appcast_update_opts[] =
 {
-	{"Never", "never", 0, "never"},
-	{"Daily", "daily", 1, "daily"},
-	{"Weekly", "weekly", 2, "weekly"},
-	{"Monthly", "monthly", 3, "monthly"},
+    {"Never", "never", 0, "never"},
+    {"Daily", "daily", 1, "daily"},
+    {"Weekly", "weekly", 2, "weekly"},
+    {"Monthly", "monthly", 3, "monthly"},
 };
 combo_opts_t appcast_update_opts =
 {
-	sizeof(d_appcast_update_opts)/sizeof(options_map_t),
-	d_appcast_update_opts
+    sizeof(d_appcast_update_opts)/sizeof(options_map_t),
+    d_appcast_update_opts
 };
 
 static options_map_t d_vqual_granularity_opts[] =
 {
-	{"0.2",  "0.2",  0.2,  "0.2"},
-	{"0.25", "0.25", 0.25, "0.25"},
-	{"0.5",  "0.5",  0.5,  "0.5"},
-	{"1",    "1",    1,    "1"},
+    {"0.2",  "0.2",  0.2,  "0.2"},
+    {"0.25", "0.25", 0.25, "0.25"},
+    {"0.5",  "0.5",  0.5,  "0.5"},
+    {"1",    "1",    1,    "1"},
 };
 combo_opts_t vqual_granularity_opts =
 {
-	sizeof(d_vqual_granularity_opts)/sizeof(options_map_t),
-	d_vqual_granularity_opts
+    sizeof(d_vqual_granularity_opts)/sizeof(options_map_t),
+    d_vqual_granularity_opts
 };
 
 static options_map_t d_container_opts[] =
 {
-	{"MKV", "mkv", HB_MUX_MKV, "mkv"},
-	{"MP4", "mp4", HB_MUX_MP4, "mp4"},
+    {"MKV", "mkv", HB_MUX_MKV, "mkv"},
+    {"MP4", "mp4", HB_MUX_MP4, "mp4"},
 };
 combo_opts_t container_opts =
 {
-	sizeof(d_container_opts)/sizeof(options_map_t),
-	d_container_opts
+    sizeof(d_container_opts)/sizeof(options_map_t),
+    d_container_opts
 };
 
 static options_map_t d_detel_opts[] =
 {
-	{"Off",    "off",   0, ""},
-	{"Custom", "custom", 1, ""},
-	{"Default","default",2, NULL},
+    {"Off",    "off",   0, ""},
+    {"Custom", "custom", 1, ""},
+    {"Default","default",2, NULL},
 };
 combo_opts_t detel_opts =
 {
-	sizeof(d_detel_opts)/sizeof(options_map_t),
-	d_detel_opts
+    sizeof(d_detel_opts)/sizeof(options_map_t),
+    d_detel_opts
 };
 
 static options_map_t d_decomb_opts[] =
 {
-	{"Off",    "off",   0, ""},
-	{"Custom", "custom", 1, ""},
-	{"Default","default",2, NULL},
-	{"Fast",   "fast",   3, "7:2:6:9:1:80"},
+    {"Off",    "off",   0, ""},
+    {"Custom", "custom", 1, ""},
+    {"Default","default",2, NULL},
+    {"Fast",   "fast",   3, "7:2:6:9:1:80"},
+    {"Bob",    "bob",    4, "455"},
 };
 combo_opts_t decomb_opts =
 {
-	sizeof(d_decomb_opts)/sizeof(options_map_t),
-	d_decomb_opts
+    sizeof(d_decomb_opts)/sizeof(options_map_t),
+    d_decomb_opts
 };
 
 static options_map_t d_deint_opts[] =
 {
-	{"Off",    "off",   0, ""},
-	{"Custom", "custom", 1, ""},
-	{"Fast",   "fast",   2, "-1:-1:-1:0:1"},
-	{"Slow",   "slow",   3, "2:-1:-1:0:1"},
-	{"Slower", "slower", 4, "0:-1:-1:0:1"},
+    {"Off",    "off",    0,  ""},
+    {"Custom", "custom", 1,  ""},
+    {"Fast",   "fast",   2,  "0:-1:-1:0:1"},
+    {"Slow",   "slow",   3,  "1:-1:-1:0:1"},
+    {"Slower", "slower", 4,  "3:-1:-1:0:1"},
+    {"Bob",    "bob",    5, "15:-1:-1:0:1"},
 };
 combo_opts_t deint_opts =
 {
-	sizeof(d_deint_opts)/sizeof(options_map_t),
-	d_deint_opts
+    sizeof(d_deint_opts)/sizeof(options_map_t),
+    d_deint_opts
 };
 
 static options_map_t d_denoise_opts[] =
 {
-	{"Off",    "off",   0, ""},
-	{"Custom", "custom", 1, ""},
-	{"Weak",   "weak",   2, "2:1:2:3"},
-	{"Medium", "medium", 3, "3:2:2:3"},
-	{"Strong", "strong", 4, "7:7:5:5"},
+    {"Off",    "off",   0, ""},
+    {"Custom", "custom", 1, ""},
+    {"Weak",   "weak",   2, "2:1:2:3"},
+    {"Medium", "medium", 3, "3:2:2:3"},
+    {"Strong", "strong", 4, "7:7:5:5"},
 };
 combo_opts_t denoise_opts =
 {
-	sizeof(d_denoise_opts)/sizeof(options_map_t),
-	d_denoise_opts
+    sizeof(d_denoise_opts)/sizeof(options_map_t),
+    d_denoise_opts
 };
 
 static options_map_t d_direct_opts[] =
 {
-	{"None",      "none",     0, "none"},
-	{"Spatial",   "spatial",  1, "spatial"},
-	{"Temporal",  "temporal", 2, "temporal"},
-	{"Automatic", "auto",     3, "auto"},
+    {"None",      "none",     0, "none"},
+    {"Spatial",   "spatial",  1, "spatial"},
+    {"Temporal",  "temporal", 2, "temporal"},
+    {"Automatic", "auto",     3, "auto"},
 };
 combo_opts_t direct_opts =
 {
-	sizeof(d_direct_opts)/sizeof(options_map_t),
-	d_direct_opts
+    sizeof(d_direct_opts)/sizeof(options_map_t),
+    d_direct_opts
 };
 
 static options_map_t d_badapt_opts[] =
 {
-	{"Off",             "0", 0, "0"},
-	{"Fast",            "1", 1, "1"},
-	{"Optimal",         "2", 2, "2"},
+    {"Off",             "0", 0, "0"},
+    {"Fast",            "1", 1, "1"},
+    {"Optimal",         "2", 2, "2"},
 };
 combo_opts_t badapt_opts =
 {
-	sizeof(d_badapt_opts)/sizeof(options_map_t),
-	d_badapt_opts
+    sizeof(d_badapt_opts)/sizeof(options_map_t),
+    d_badapt_opts
 };
 
 static options_map_t d_bpyramid_opts[] =
 {
-	{"Off",    "none",   0, "none"},
-	{"Strict", "strict", 1, "strict"},
-	{"Normal", "normal", 2, "normal"},
+    {"Off",    "none",   0, "none"},
+    {"Strict", "strict", 1, "strict"},
+    {"Normal", "normal", 2, "normal"},
 };
 combo_opts_t bpyramid_opts =
 {
-	sizeof(d_bpyramid_opts)/sizeof(options_map_t),
-	d_bpyramid_opts
+    sizeof(d_bpyramid_opts)/sizeof(options_map_t),
+    d_bpyramid_opts
 };
 
 static options_map_t d_weightp_opts[] =
 {
-	{"Off",    "0", 0, "0"},
-	{"Simple", "1", 1, "1"},
-	{"Smart",  "2", 2, "2"},
+    {"Off",    "0", 0, "0"},
+    {"Simple", "1", 1, "1"},
+    {"Smart",  "2", 2, "2"},
 };
 combo_opts_t weightp_opts =
 {
-	sizeof(d_weightp_opts)/sizeof(options_map_t),
-	d_weightp_opts
+    sizeof(d_weightp_opts)/sizeof(options_map_t),
+    d_weightp_opts
 };
 
 static options_map_t d_me_opts[] =
 {
-	{"Diamond",              "dia",  0, "dia"},
-	{"Hexagon",              "hex",  1, "hex"},
-	{"Uneven Multi-Hexagon", "umh",  2, "umh"},
-	{"Exhaustive",           "esa",  3, "esa"},
-	{"Hadamard Exhaustive",  "tesa", 4, "tesa"},
+    {"Diamond",              "dia",  0, "dia"},
+    {"Hexagon",              "hex",  1, "hex"},
+    {"Uneven Multi-Hexagon", "umh",  2, "umh"},
+    {"Exhaustive",           "esa",  3, "esa"},
+    {"Hadamard Exhaustive",  "tesa", 4, "tesa"},
 };
 combo_opts_t me_opts =
 {
-	sizeof(d_me_opts)/sizeof(options_map_t),
-	d_me_opts
+    sizeof(d_me_opts)/sizeof(options_map_t),
+    d_me_opts
 };
 
 static options_map_t d_subme_opts[] =
 {
-	{"0: SAD, no subpel",          "0", 0, "0"},
-	{"1: SAD, qpel",               "1", 1, "1"},
-	{"2: SATD, qpel",              "2", 2, "2"},
-	{"3: SATD: multi-qpel",        "3", 3, "3"},
-	{"4: SATD, qpel on all",       "4", 4, "4"},
-	{"5: SATD, multi-qpel on all", "5", 5, "5"},
-	{"6: RD in I/P-frames",        "6", 6, "6"},
-	{"7: RD in all frames",        "7", 7, "7"},
-	{"8: RD refine in I/P-frames", "8", 8, "8"},
-	{"9: RD refine in all frames", "9", 9, "9"},
-	{"10: QPRD in all frames",     "10", 10, "10"},
-	{"11: No early terminations in analysis", "11", 11, "11"},
+    {"0: SAD, no subpel",          "0", 0, "0"},
+    {"1: SAD, qpel",               "1", 1, "1"},
+    {"2: SATD, qpel",              "2", 2, "2"},
+    {"3: SATD: multi-qpel",        "3", 3, "3"},
+    {"4: SATD, qpel on all",       "4", 4, "4"},
+    {"5: SATD, multi-qpel on all", "5", 5, "5"},
+    {"6: RD in I/P-frames",        "6", 6, "6"},
+    {"7: RD in all frames",        "7", 7, "7"},
+    {"8: RD refine in I/P-frames", "8", 8, "8"},
+    {"9: RD refine in all frames", "9", 9, "9"},
+    {"10: QPRD in all frames",     "10", 10, "10"},
+    {"11: No early terminations in analysis", "11", 11, "11"},
 };
 combo_opts_t subme_opts =
 {
-	sizeof(d_subme_opts)/sizeof(options_map_t),
-	d_subme_opts
+    sizeof(d_subme_opts)/sizeof(options_map_t),
+    d_subme_opts
 };
 
 static options_map_t d_analyse_opts[] =
 {
-	{"Most", "p8x8,b8x8,i8x8,i4x4", 0, "p8x8,b8x8,i8x8,i4x4"},
-	{"None", "none", 1, "none"},
-	{"Some", "i4x4,i8x8", 2, "i4x4,i8x8"},
-	{"All",  "all",  3, "all"},
-	{"Custom",  "custom",  4, "all"},
+    {"Most", "p8x8,b8x8,i8x8,i4x4", 0, "p8x8,b8x8,i8x8,i4x4"},
+    {"None", "none", 1, "none"},
+    {"Some", "i4x4,i8x8", 2, "i4x4,i8x8"},
+    {"All",  "all",  3, "all"},
+    {"Custom",  "custom",  4, "all"},
 };
 combo_opts_t analyse_opts =
 {
-	sizeof(d_analyse_opts)/sizeof(options_map_t),
-	d_analyse_opts
+    sizeof(d_analyse_opts)/sizeof(options_map_t),
+    d_analyse_opts
 };
 
 static options_map_t d_trellis_opts[] =
 {
-	{"Off",         "0", 0, "0"},
-	{"Encode only", "1", 1, "1"},
-	{"Always",      "2", 2, "2"},
+    {"Off",         "0", 0, "0"},
+    {"Encode only", "1", 1, "1"},
+    {"Always",      "2", 2, "2"},
 };
 combo_opts_t trellis_opts =
 {
-	sizeof(d_trellis_opts)/sizeof(options_map_t),
-	d_trellis_opts
+    sizeof(d_trellis_opts)/sizeof(options_map_t),
+    d_trellis_opts
 };
 
 combo_opts_t subtitle_opts =
 {
-	0,
-	NULL
+    0,
+    NULL
 };
 
 combo_opts_t title_opts =
 {
-	0,
-	NULL
+    0,
+    NULL
 };
 
 combo_opts_t audio_track_opts =
 {
-	0,
-	NULL
+    0,
+    NULL
 };
 
 typedef struct
 {
-	const gchar *name;
-	combo_opts_t *opts;
+    const gchar *name;
+    combo_opts_t *opts;
 } combo_name_map_t;
 
 combo_name_map_t combo_name_map[] =
 {
-	{"PtoPType", &point_to_point_opts},
-	{"WhenComplete", &when_complete_opts},
-	{"PicturePAR", &par_opts},
-	{"PictureModulus", &alignment_opts},
-	{"LoggingLevel", &logging_opts},
-	{"LogLongevity", &log_longevity_opts},
-	{"check_updates", &appcast_update_opts},
-	{"VideoQualityGranularity", &vqual_granularity_opts},
-	{"FileFormat", &container_opts},
-	{"PictureDeinterlace", &deint_opts},
-	{"PictureDecomb", &decomb_opts},
-	{"PictureDetelecine", &detel_opts},
-	{"PictureDenoise", &denoise_opts},
-	{"x264_direct", &direct_opts},
-	{"x264_b_adapt", &badapt_opts},
-	{"x264_bpyramid", &bpyramid_opts},
-	{"x264_weighted_pframes", &weightp_opts},
-	{"x264_me", &me_opts},
-	{"x264_subme", &subme_opts},
-	{"x264_analyse", &analyse_opts},
-	{"x264_trellis", &trellis_opts},
-	{"SubtitleTrack", &subtitle_opts},
-	{"title", &title_opts},
-	{"AudioTrack", &audio_track_opts},
-	{NULL, NULL}
+    {"PtoPType", &point_to_point_opts},
+    {"WhenComplete", &when_complete_opts},
+    {"PicturePAR", &par_opts},
+    {"PictureModulus", &alignment_opts},
+    {"LoggingLevel", &logging_opts},
+    {"LogLongevity", &log_longevity_opts},
+    {"check_updates", &appcast_update_opts},
+    {"VideoQualityGranularity", &vqual_granularity_opts},
+    {"FileFormat", &container_opts},
+    {"PictureDeinterlace", &deint_opts},
+    {"PictureDecomb", &decomb_opts},
+    {"PictureDetelecine", &detel_opts},
+    {"PictureDenoise", &denoise_opts},
+    {"x264_direct", &direct_opts},
+    {"x264_b_adapt", &badapt_opts},
+    {"x264_bpyramid", &bpyramid_opts},
+    {"x264_weighted_pframes", &weightp_opts},
+    {"x264_me", &me_opts},
+    {"x264_subme", &subme_opts},
+    {"x264_analyse", &analyse_opts},
+    {"x264_trellis", &trellis_opts},
+    {"SubtitleTrack", &subtitle_opts},
+    {"title", &title_opts},
+    {"AudioTrack", &audio_track_opts},
+    {NULL, NULL}
 };
 
 const gchar *srt_codeset_table[] =
 {
-	"ANSI_X3.4-1968",
-	"ANSI_X3.4-1986",
-	"ANSI_X3.4",
-	"ANSI_X3.110-1983",
-	"ANSI_X3.110",
-	"ASCII",
-	"ECMA-114",
-	"ECMA-118",
-	"ECMA-128",
-	"ECMA-CYRILLIC",
-	"IEC_P27-1",
-	"ISO-8859-1",
-	"ISO-8859-2",
-	"ISO-8859-3",
-	"ISO-8859-4",
-	"ISO-8859-5",
-	"ISO-8859-6",
-	"ISO-8859-7",
-	"ISO-8859-8",
-	"ISO-8859-9",
-	"ISO-8859-9E",
-	"ISO-8859-10",
-	"ISO-8859-11",
-	"ISO-8859-13",
-	"ISO-8859-14",
-	"ISO-8859-15",
-	"ISO-8859-16",
-	"UTF-7",
-	"UTF-8",
-	"UTF-16",
-	"UTF-16LE",
-	"UTF-16BE",
-	"UTF-32",
-	"UTF-32LE",
-	"UTF-32BE",
-	NULL
+    "ANSI_X3.4-1968",
+    "ANSI_X3.4-1986",
+    "ANSI_X3.4",
+    "ANSI_X3.110-1983",
+    "ANSI_X3.110",
+    "ASCII",
+    "ECMA-114",
+    "ECMA-118",
+    "ECMA-128",
+    "ECMA-CYRILLIC",
+    "IEC_P27-1",
+    "ISO-8859-1",
+    "ISO-8859-2",
+    "ISO-8859-3",
+    "ISO-8859-4",
+    "ISO-8859-5",
+    "ISO-8859-6",
+    "ISO-8859-7",
+    "ISO-8859-8",
+    "ISO-8859-9",
+    "ISO-8859-9E",
+    "ISO-8859-10",
+    "ISO-8859-11",
+    "ISO-8859-13",
+    "ISO-8859-14",
+    "ISO-8859-15",
+    "ISO-8859-16",
+    "UTF-7",
+    "UTF-8",
+    "UTF-16",
+    "UTF-16LE",
+    "UTF-16BE",
+    "UTF-32",
+    "UTF-32LE",
+    "UTF-32BE",
+    NULL
 };
-#define	SRT_TABLE_SIZE (sizeof(srt_codeset_table)/ sizeof(char*)-1)
+#define SRT_TABLE_SIZE (sizeof(srt_codeset_table)/ sizeof(char*)-1)
 
 #if 0
 typedef struct iso639_lang_t
@@ -454,619 +456,619 @@
 
 const iso639_lang_t ghb_language_table[] =
 { 
-	{ "Any", "", "zz", "und" },
-	{ "Afar", "", "aa", "aar" },
-	{ "Abkhazian", "", "ab", "abk" },
-	{ "Afrikaans", "", "af", "afr" },
-	{ "Akan", "", "ak", "aka" },
-	{ "Albanian", "", "sq", "sqi", "alb" },
-	{ "Amharic", "", "am", "amh" },
-	{ "Arabic", "", "ar", "ara" },
-	{ "Aragonese", "", "an", "arg" },
-	{ "Armenian", "", "hy", "hye", "arm" },
-	{ "Assamese", "", "as", "asm" },
-	{ "Avaric", "", "av", "ava" },
-	{ "Avestan", "", "ae", "ave" },
-	{ "Aymara", "", "ay", "aym" },
-	{ "Azerbaijani", "", "az", "aze" },
-	{ "Bashkir", "", "ba", "bak" },
-	{ "Bambara", "", "bm", "bam" },
-	{ "Basque", "", "eu", "eus", "baq" },
-	{ "Belarusian", "", "be", "bel" },
-	{ "Bengali", "", "bn", "ben" },
-	{ "Bihari", "", "bh", "bih" },
-	{ "Bislama", "", "bi", "bis" },
-	{ "Bosnian", "", "bs", "bos" },
-	{ "Breton", "", "br", "bre" },
-	{ "Bulgarian", "", "bg", "bul" },
-	{ "Burmese", "", "my", "mya", "bur" },
-	{ "Catalan", "", "ca", "cat" },
-	{ "Chamorro", "", "ch", "cha" },
-	{ "Chechen", "", "ce", "che" },
-	{ "Chinese", "", "zh", "zho", "chi" },
-	{ "Church Slavic", "", "cu", "chu" },
-	{ "Chuvash", "", "cv", "chv" },
-	{ "Cornish", "", "kw", "cor" },
-	{ "Corsican", "", "co", "cos" },
-	{ "Cree", "", "cr", "cre" },
-	{ "Czech", "", "cs", "ces", "cze" },
-	{ "Danish", "Dansk", "da", "dan" },
-	{ "German", "Deutsch", "de", "deu", "ger" },
-	{ "Divehi", "", "dv", "div" },
-	{ "Dzongkha", "", "dz", "dzo" },
-	{ "English", "English", "en", "eng" },
-	{ "Spanish", "Espanol", "es", "spa" },
-	{ "Esperanto", "", "eo", "epo" },
-	{ "Estonian", "", "et", "est" },
-	{ "Ewe", "", "ee", "ewe" },
-	{ "Faroese", "", "fo", "fao" },
-	{ "Fijian", "", "fj", "fij" },
-	{ "French", "Francais", "fr", "fra", "fre" },
-	{ "Western Frisian", "", "fy", "fry" },
-	{ "Fulah", "", "ff", "ful" },
-	{ "Georgian", "", "ka", "kat", "geo" },
-	{ "Gaelic (Scots)", "", "gd", "gla" },
-	{ "Irish", "", "ga", "gle" },
-	{ "Galician", "", "gl", "glg" },
-	{ "Manx", "", "gv", "glv" },
-	{ "Greek, Modern", "", "el", "ell", "gre" },
-	{ "Guarani", "", "gn", "grn" },
-	{ "Gujarati", "", "gu", "guj" },
-	{ "Haitian", "", "ht", "hat" },
-	{ "Hausa", "", "ha", "hau" },
-	{ "Hebrew", "", "he", "heb" },
-	{ "Herero", "", "hz", "her" },
-	{ "Hindi", "", "hi", "hin" },
-	{ "Hiri Motu", "", "ho", "hmo" },
-	{ "Croatian", "Hrvatski", "hr", "hrv", "scr" },
-	{ "Igbo", "", "ig", "ibo" },
-	{ "Ido", "", "io", "ido" },
-	{ "Icelandic", "Islenska", "is", "isl", "ice" },
-	{ "Sichuan Yi", "", "ii", "iii" },
-	{ "Inuktitut", "", "iu", "iku" },
-	{ "Interlingue", "", "ie", "ile" },
-	{ "Interlingua", "", "ia", "ina" },
-	{ "Indonesian", "", "id", "ind" },
-	{ "Inupiaq", "", "ik", "ipk" },
-	{ "Italian", "Italiano", "it", "ita" },
-	{ "Javanese", "", "jv", "jav" },
-	{ "Japanese", "", "ja", "jpn" },
-	{ "Kalaallisut", "", "kl", "kal" },
-	{ "Kannada", "", "kn", "kan" },
-	{ "Kashmiri", "", "ks", "kas" },
-	{ "Kanuri", "", "kr", "kau" },
-	{ "Kazakh", "", "kk", "kaz" },
-	{ "Central Khmer", "", "km", "khm" },
-	{ "Kikuyu", "", "ki", "kik" },
-	{ "Kinyarwanda", "", "rw", "kin" },
-	{ "Kirghiz", "", "ky", "kir" },
-	{ "Komi", "", "kv", "kom" },
-	{ "Kongo", "", "kg", "kon" },
-	{ "Korean", "", "ko", "kor" },
-	{ "Kuanyama", "", "kj", "kua" },
-	{ "Kurdish", "", "ku", "kur" },
-	{ "Lao", "", "lo", "lao" },
-	{ "Latin", "", "la", "lat" },
-	{ "Latvian", "", "lv", "lav" },
-	{ "Limburgan", "", "li", "lim" },
-	{ "Lingala", "", "ln", "lin" },
-	{ "Lithuanian", "", "lt", "lit" },
-	{ "Luxembourgish", "", "lb", "ltz" },
-	{ "Luba-Katanga", "", "lu", "lub" },
-	{ "Ganda", "", "lg", "lug" },
-	{ "Macedonian", "", "mk", "mkd", "mac" },
-	{ "Hungarian", "Magyar", "hu", "hun" },
-	{ "Marshallese", "", "mh", "mah" },
-	{ "Malayalam", "", "ml", "mal" },
-	{ "Maori", "", "mi", "mri", "mao" },
-	{ "Marathi", "", "mr", "mar" },
-	{ "Malay", "", "ms", "msa", "msa" },
-	{ "Malagasy", "", "mg", "mlg" },
-	{ "Maltese", "", "mt", "mlt" },
-	{ "Moldavian", "", "mo", "mol" },
-	{ "Mongolian", "", "mn", "mon" },
-	{ "Nauru", "", "na", "nau" },
-	{ "Navajo", "", "nv", "nav" },
-	{ "Dutch", "Nederlands", "nl", "nld", "dut" },
-	{ "Ndebele, South", "", "nr", "nbl" },
-	{ "Ndebele, North", "", "nd", "nde" },
-	{ "Ndonga", "", "ng", "ndo" },
-	{ "Nepali", "", "ne", "nep" },
-	{ "Norwegian", "Norsk", "no", "nor" },
-	{ "Norwegian Nynorsk", "", "nn", "nno" },
-	{ "Norwegian Bokmål", "", "nb", "nob" },
-	{ "Chichewa; Nyanja", "", "ny", "nya" },
-	{ "Occitan", "", "oc", "oci" },
-	{ "Ojibwa", "", "oj", "oji" },
-	{ "Oriya", "", "or", "ori" },
-	{ "Oromo", "", "om", "orm" },
-	{ "Ossetian", "", "os", "oss" },
-	{ "Panjabi", "", "pa", "pan" },
-	{ "Persian", "", "fa", "fas", "per" },
-	{ "Pali", "", "pi", "pli" },
-	{ "Polish", "", "pl", "pol" },
-	{ "Portuguese", "Portugues", "pt", "por" },
-	{ "Pushto", "", "ps", "pus" },
-	{ "Quechua", "", "qu", "que" },
-	{ "Romansh", "", "rm", "roh" },
-	{ "Romanian", "", "ro", "ron", "rum" },
-	{ "Rundi", "", "rn", "run" },
-	{ "Russian", "", "ru", "rus" },
-	{ "Sango", "", "sg", "sag" },
-	{ "Sanskrit", "", "sa", "san" },
-	{ "Serbian", "", "sr", "srp", "scc" },
-	{ "Sinhala", "", "si", "sin" },
-	{ "Slovak", "", "sk", "slk", "slo" },
-	{ "Slovenian", "", "sl", "slv" },
-	{ "Northern Sami", "", "se", "sme" },
-	{ "Samoan", "", "sm", "smo" },
-	{ "Shona", "", "sn", "sna" },
-	{ "Sindhi", "", "sd", "snd" },
-	{ "Somali", "", "so", "som" },
-	{ "Sotho, Southern", "", "st", "sot" },
-	{ "Sardinian", "", "sc", "srd" },
-	{ "Swati", "", "ss", "ssw" },
-	{ "Sundanese", "", "su", "sun" },
-	{ "Finnish", "Suomi", "fi", "fin" },
-	{ "Swahili", "", "sw", "swa" },
-	{ "Swedish", "Svenska", "sv", "swe" },
-	{ "Tahitian", "", "ty", "tah" },
-	{ "Tamil", "", "ta", "tam" },
-	{ "Tatar", "", "tt", "tat" },
-	{ "Telugu", "", "te", "tel" },
-	{ "Tajik", "", "tg", "tgk" },
-	{ "Tagalog", "", "tl", "tgl" },
-	{ "Thai", "", "th", "tha" },
-	{ "Tibetan", "", "bo", "bod", "tib" },
-	{ "Tigrinya", "", "ti", "tir" },
-	{ "Tonga", "", "to", "ton" },
-	{ "Tswana", "", "tn", "tsn" },
-	{ "Tsonga", "", "ts", "tso" },
-	{ "Turkmen", "", "tk", "tuk" },
-	{ "Turkish", "", "tr", "tur" },
-	{ "Twi", "", "tw", "twi" },
-	{ "Uighur", "", "ug", "uig" },
-	{ "Ukrainian", "", "uk", "ukr" },
-	{ "Urdu", "", "ur", "urd" },
-	{ "Uzbek", "", "uz", "uzb" },
-	{ "Venda", "", "ve", "ven" },
-	{ "Vietnamese", "", "vi", "vie" },
-	{ "Volapük", "", "vo", "vol" },
-	{ "Welsh", "", "cy", "cym", "wel" },
-	{ "Walloon", "", "wa", "wln" },
-	{ "Wolof", "", "wo", "wol" },
-	{ "Xhosa", "", "xh", "xho" },
-	{ "Yiddish", "", "yi", "yid" },
-	{ "Yoruba", "", "yo", "yor" },
-	{ "Zhuang", "", "za", "zha" },
-	{ "Zulu", "", "zu", "zul" },
-	{NULL, NULL, NULL, NULL}
+    { "Any", "", "zz", "und" },
+    { "Afar", "", "aa", "aar" },
+    { "Abkhazian", "", "ab", "abk" },
+    { "Afrikaans", "", "af", "afr" },
+    { "Akan", "", "ak", "aka" },
+    { "Albanian", "", "sq", "sqi", "alb" },
+    { "Amharic", "", "am", "amh" },
+    { "Arabic", "", "ar", "ara" },
+    { "Aragonese", "", "an", "arg" },
+    { "Armenian", "", "hy", "hye", "arm" },
+    { "Assamese", "", "as", "asm" },
+    { "Avaric", "", "av", "ava" },
+    { "Avestan", "", "ae", "ave" },
+    { "Aymara", "", "ay", "aym" },
+    { "Azerbaijani", "", "az", "aze" },
+    { "Bashkir", "", "ba", "bak" },
+    { "Bambara", "", "bm", "bam" },
+    { "Basque", "", "eu", "eus", "baq" },
+    { "Belarusian", "", "be", "bel" },
+    { "Bengali", "", "bn", "ben" },
+    { "Bihari", "", "bh", "bih" },
+    { "Bislama", "", "bi", "bis" },
+    { "Bosnian", "", "bs", "bos" },
+    { "Breton", "", "br", "bre" },
+    { "Bulgarian", "", "bg", "bul" },
+    { "Burmese", "", "my", "mya", "bur" },
+    { "Catalan", "", "ca", "cat" },
+    { "Chamorro", "", "ch", "cha" },
+    { "Chechen", "", "ce", "che" },
+    { "Chinese", "", "zh", "zho", "chi" },
+    { "Church Slavic", "", "cu", "chu" },
+    { "Chuvash", "", "cv", "chv" },
+    { "Cornish", "", "kw", "cor" },
+    { "Corsican", "", "co", "cos" },
+    { "Cree", "", "cr", "cre" },
+    { "Czech", "", "cs", "ces", "cze" },
+    { "Danish", "Dansk", "da", "dan" },
+    { "German", "Deutsch", "de", "deu", "ger" },
+    { "Divehi", "", "dv", "div" },
+    { "Dzongkha", "", "dz", "dzo" },
+    { "English", "English", "en", "eng" },
+    { "Spanish", "Espanol", "es", "spa" },
+    { "Esperanto", "", "eo", "epo" },
+    { "Estonian", "", "et", "est" },
+    { "Ewe", "", "ee", "ewe" },
+    { "Faroese", "", "fo", "fao" },
+    { "Fijian", "", "fj", "fij" },
+    { "French", "Francais", "fr", "fra", "fre" },
+    { "Western Frisian", "", "fy", "fry" },
+    { "Fulah", "", "ff", "ful" },
+    { "Georgian", "", "ka", "kat", "geo" },
+    { "Gaelic (Scots)", "", "gd", "gla" },
+    { "Irish", "", "ga", "gle" },
+    { "Galician", "", "gl", "glg" },
+    { "Manx", "", "gv", "glv" },
+    { "Greek, Modern", "", "el", "ell", "gre" },
+    { "Guarani", "", "gn", "grn" },
+    { "Gujarati", "", "gu", "guj" },
+    { "Haitian", "", "ht", "hat" },
+    { "Hausa", "", "ha", "hau" },
+    { "Hebrew", "", "he", "heb" },
+    { "Herero", "", "hz", "her" },
+    { "Hindi", "", "hi", "hin" },
+    { "Hiri Motu", "", "ho", "hmo" },
+    { "Croatian", "Hrvatski", "hr", "hrv", "scr" },
+    { "Igbo", "", "ig", "ibo" },
+    { "Ido", "", "io", "ido" },
+    { "Icelandic", "Islenska", "is", "isl", "ice" },
+    { "Sichuan Yi", "", "ii", "iii" },
+    { "Inuktitut", "", "iu", "iku" },
+    { "Interlingue", "", "ie", "ile" },
+    { "Interlingua", "", "ia", "ina" },
+    { "Indonesian", "", "id", "ind" },
+    { "Inupiaq", "", "ik", "ipk" },
+    { "Italian", "Italiano", "it", "ita" },
+    { "Javanese", "", "jv", "jav" },
+    { "Japanese", "", "ja", "jpn" },
+    { "Kalaallisut", "", "kl", "kal" },
+    { "Kannada", "", "kn", "kan" },
+    { "Kashmiri", "", "ks", "kas" },
+    { "Kanuri", "", "kr", "kau" },
+    { "Kazakh", "", "kk", "kaz" },
+    { "Central Khmer", "", "km", "khm" },
+    { "Kikuyu", "", "ki", "kik" },
+    { "Kinyarwanda", "", "rw", "kin" },
+    { "Kirghiz", "", "ky", "kir" },
+    { "Komi", "", "kv", "kom" },
+    { "Kongo", "", "kg", "kon" },
+    { "Korean", "", "ko", "kor" },
+    { "Kuanyama", "", "kj", "kua" },
+    { "Kurdish", "", "ku", "kur" },
+    { "Lao", "", "lo", "lao" },
+    { "Latin", "", "la", "lat" },
+    { "Latvian", "", "lv", "lav" },
+    { "Limburgan", "", "li", "lim" },
+    { "Lingala", "", "ln", "lin" },
+    { "Lithuanian", "", "lt", "lit" },
+    { "Luxembourgish", "", "lb", "ltz" },
+    { "Luba-Katanga", "", "lu", "lub" },
+    { "Ganda", "", "lg", "lug" },
+    { "Macedonian", "", "mk", "mkd", "mac" },
+    { "Hungarian", "Magyar", "hu", "hun" },
+    { "Marshallese", "", "mh", "mah" },
+    { "Malayalam", "", "ml", "mal" },
+    { "Maori", "", "mi", "mri", "mao" },
+    { "Marathi", "", "mr", "mar" },
+    { "Malay", "", "ms", "msa", "msa" },
+    { "Malagasy", "", "mg", "mlg" },
+    { "Maltese", "", "mt", "mlt" },
+    { "Moldavian", "", "mo", "mol" },
+    { "Mongolian", "", "mn", "mon" },
+    { "Nauru", "", "na", "nau" },
+    { "Navajo", "", "nv", "nav" },
+    { "Dutch", "Nederlands", "nl", "nld", "dut" },
+    { "Ndebele, South", "", "nr", "nbl" },
+    { "Ndebele, North", "", "nd", "nde" },
+    { "Ndonga", "", "ng", "ndo" },
+    { "Nepali", "", "ne", "nep" },
+    { "Norwegian", "Norsk", "no", "nor" },
+    { "Norwegian Nynorsk", "", "nn", "nno" },
+    { "Norwegian Bokmål", "", "nb", "nob" },
+    { "Chichewa; Nyanja", "", "ny", "nya" },
+    { "Occitan", "", "oc", "oci" },
+    { "Ojibwa", "", "oj", "oji" },
+    { "Oriya", "", "or", "ori" },
+    { "Oromo", "", "om", "orm" },
+    { "Ossetian", "", "os", "oss" },
+    { "Panjabi", "", "pa", "pan" },
+    { "Persian", "", "fa", "fas", "per" },
+    { "Pali", "", "pi", "pli" },
+    { "Polish", "", "pl", "pol" },
+    { "Portuguese", "Portugues", "pt", "por" },
+    { "Pushto", "", "ps", "pus" },
+    { "Quechua", "", "qu", "que" },
+    { "Romansh", "", "rm", "roh" },
+    { "Romanian", "", "ro", "ron", "rum" },
+    { "Rundi", "", "rn", "run" },
+    { "Russian", "", "ru", "rus" },
+    { "Sango", "", "sg", "sag" },
+    { "Sanskrit", "", "sa", "san" },
+    { "Serbian", "", "sr", "srp", "scc" },
+    { "Sinhala", "", "si", "sin" },
+    { "Slovak", "", "sk", "slk", "slo" },
+    { "Slovenian", "", "sl", "slv" },
+    { "Northern Sami", "", "se", "sme" },
+    { "Samoan", "", "sm", "smo" },
+    { "Shona", "", "sn", "sna" },
+    { "Sindhi", "", "sd", "snd" },
+    { "Somali", "", "so", "som" },
+    { "Sotho, Southern", "", "st", "sot" },
+    { "Sardinian", "", "sc", "srd" },
+    { "Swati", "", "ss", "ssw" },
+    { "Sundanese", "", "su", "sun" },
+    { "Finnish", "Suomi", "fi", "fin" },
+    { "Swahili", "", "sw", "swa" },
+    { "Swedish", "Svenska", "sv", "swe" },
+    { "Tahitian", "", "ty", "tah" },
+    { "Tamil", "", "ta", "tam" },
+    { "Tatar", "", "tt", "tat" },
+    { "Telugu", "", "te", "tel" },
+    { "Tajik", "", "tg", "tgk" },
+    { "Tagalog", "", "tl", "tgl" },
+    { "Thai", "", "th", "tha" },
+    { "Tibetan", "", "bo", "bod", "tib" },
+    { "Tigrinya", "", "ti", "tir" },
+    { "Tonga", "", "to", "ton" },
+    { "Tswana", "", "tn", "tsn" },
+    { "Tsonga", "", "ts", "tso" },
+    { "Turkmen", "", "tk", "tuk" },
+    { "Turkish", "", "tr", "tur" },
+    { "Twi", "", "tw", "twi" },
+    { "Uighur", "", "ug", "uig" },
+    { "Ukrainian", "", "uk", "ukr" },
+    { "Urdu", "", "ur", "urd" },
+    { "Uzbek", "", "uz", "uzb" },
+    { "Venda", "", "ve", "ven" },
+    { "Vietnamese", "", "vi", "vie" },
+    { "Volapük", "", "vo", "vol" },
+    { "Welsh", "", "cy", "cym", "wel" },
+    { "Walloon", "", "wa", "wln" },
+    { "Wolof", "", "wo", "wol" },
+    { "Xhosa", "", "xh", "xho" },
+    { "Yiddish", "", "yi", "yid" },
+    { "Yoruba", "", "yo", "yor" },
+    { "Zhuang", "", "za", "zha" },
+    { "Zulu", "", "zu", "zul" },
+    {NULL, NULL, NULL, NULL}
 };
-#define	LANG_TABLE_SIZE (sizeof(ghb_language_table)/ sizeof(iso639_lang_t)-1)
+#define LANG_TABLE_SIZE (sizeof(ghb_language_table)/ sizeof(iso639_lang_t)-1)
 
 static void audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name);
 
 static void
 del_tree(const gchar *name, gboolean del_top)
 {
-	const gchar *file;
+    const gchar *file;
 
-	if (g_file_test(name, G_FILE_TEST_IS_DIR))
-	{
-		GDir *gdir = g_dir_open(name, 0, NULL);
-		file = g_dir_read_name(gdir);
-		while (file)
-		{
-			gchar *path;
-			path = g_strdup_printf("%s/%s", name, file);
-			del_tree(path, TRUE);
-			g_free(path);
-			file = g_dir_read_name(gdir);
-		}
-		if (del_top)
-			g_rmdir(name);
-		g_dir_close(gdir);
-	}
-	else
-	{
-		g_unlink(name);
-	}
+    if (g_file_test(name, G_FILE_TEST_IS_DIR))
+    {
+        GDir *gdir = g_dir_open(name, 0, NULL);
+        file = g_dir_read_name(gdir);
+        while (file)
+        {
+            gchar *path;
+            path = g_strdup_printf("%s/%s", name, file);
+            del_tree(path, TRUE);
+            g_free(path);
+            file = g_dir_read_name(gdir);
+        }
+        if (del_top)
+            g_rmdir(name);
+        g_dir_close(gdir);
+    }
+    else
+    {
+        g_unlink(name);
+    }
 }
 
 const gchar*
 ghb_version()
 {
-	return hb_get_version(NULL);
+    return hb_get_version(NULL);
 }
 
 void
 ghb_vquality_range(
-	signal_user_data_t *ud, 
-	gdouble *min, 
-	gdouble *max,
-	gdouble *step,
-	gdouble *page,
-	gint *digits,
-	gboolean *inverted)
-{
-	gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
-	*page = 10;
-	*digits = 0;
-	switch (vcodec)
-	{
-		case HB_VCODEC_X264:
-		{
-			*min = 0;
-			*max = 51;
-			*step = ghb_settings_combo_double(ud->settings, 
-											"VideoQualityGranularity");
-			if (*step == 0.2 || *step == 0.5)
-				*digits = 1;
-			else if (*step == 0.25)
-				*digits = 2;
-			*inverted = TRUE;
-		} break;
-
-		case HB_VCODEC_FFMPEG_MPEG2:
-		case HB_VCODEC_FFMPEG_MPEG4:
-		{
-			*min = 1;
-			*max = 31;
-			*step = 1;
-			*inverted = TRUE;
-		} break;
-
-		case HB_VCODEC_THEORA:
-		{
-			*min = 0;
-			*max = 63;
-			*step = 1;
-			*inverted = FALSE;
-		} break;
-
-		default:
-		{
-			*min = 0;
-			*max = 100;
-			*step = 1;
-			*inverted = FALSE;
-		} break;
-	}
+    signal_user_data_t *ud, 
+    gdouble *min, 
+    gdouble *max,
+    gdouble *step,
+    gdouble *page,
+    gint *digits,
+    gboolean *inverted)
+{
+    gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+    *page = 10;
+    *digits = 0;
+    switch (vcodec)
+    {
+        case HB_VCODEC_X264:
+        {
+            *min = 0;
+            *max = 51;
+            *step = ghb_settings_combo_double(ud->settings, 
+                                            "VideoQualityGranularity");
+            if (*step == 0.2 || *step == 0.5)
+                *digits = 1;
+            else if (*step == 0.25)
+                *digits = 2;
+            *inverted = TRUE;
+        } break;
+
+        case HB_VCODEC_FFMPEG_MPEG2:
+        case HB_VCODEC_FFMPEG_MPEG4:
+        {
+            *min = 1;
+            *max = 31;
+            *step = 1;
+            *inverted = TRUE;
+        } break;
+
+        case HB_VCODEC_THEORA:
+        {
+            *min = 0;
+            *max = 63;
+            *step = 1;
+            *inverted = FALSE;
+        } break;
+
+        default:
+        {
+            *min = 0;
+            *max = 100;
+            *step = 1;
+            *inverted = FALSE;
+        } break;
+    }
 }
 
 gint
 find_combo_entry(combo_opts_t *opts, const GValue *gval)
 {
-	gint ii;
+    gint ii;
 
-	if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
-	{
-		gchar *str;
-		str = ghb_value_string(gval);
-		for (ii = 0; ii < opts->count; ii++)
-		{
-			if (strcmp(opts->map[ii].shortOpt, str) == 0)
-			{
-				break;
-			}
-		}
-		g_free(str);
-		return ii;
-	}
-	else if (G_VALUE_TYPE(gval) == G_TYPE_DOUBLE)
-	{
-		gdouble val;
-		val = ghb_value_double(gval);
-		for (ii = 0; ii < opts->count; ii++)
-		{
-			if (opts->map[ii].ivalue == val)
-			{
-				break;
-			}
-		}
-		return ii;
-	}
-	else if (G_VALUE_TYPE(gval) == G_TYPE_INT ||
-			 G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN ||
-			 G_VALUE_TYPE(gval) == G_TYPE_INT64)
-	{
-		gint64 val;
-		val = ghb_value_int64(gval);
-		for (ii = 0; ii < opts->count; ii++)
-		{
-			if ((gint64)opts->map[ii].ivalue == val)
-			{
-				break;
-			}
-		}
-		return ii;
-	}
-	return opts->count;
+    if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
+    {
+        gchar *str;
+        str = ghb_value_string(gval);
+        for (ii = 0; ii < opts->count; ii++)
+        {
+            if (strcmp(opts->map[ii].shortOpt, str) == 0)
+            {
+                break;
+            }
+        }
+        g_free(str);
+        return ii;
+    }
+    else if (G_VALUE_TYPE(gval) == G_TYPE_DOUBLE)
+    {
+        gdouble val;
+        val = ghb_value_double(gval);
+        for (ii = 0; ii < opts->count; ii++)
+        {
+            if (opts->map[ii].ivalue == val)
+            {
+                break;
+            }
+        }
+        return ii;
+    }
+    else if (G_VALUE_TYPE(gval) == G_TYPE_INT ||
+             G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN ||
+             G_VALUE_TYPE(gval) == G_TYPE_INT64)
+    {
+        gint64 val;
+        val = ghb_value_int64(gval);
+        for (ii = 0; ii < opts->count; ii++)
+        {
+            if ((gint64)opts->map[ii].ivalue == val)
+            {
+                break;
+            }
+        }
+        return ii;
+    }
+    return opts->count;
 }
 
 static const gchar*
 lookup_generic_string(combo_opts_t *opts, const GValue *gval)
 {
-	gint ii;
-	const gchar *result = "";
+    gint ii;
+    const gchar *result = "";
 
-	ii = find_combo_entry(opts, gval);
-	if (ii < opts->count)
-	{
-		result = opts->map[ii].svalue;
-	}
-	return result;
+    ii = find_combo_entry(opts, gval);
+    if (ii < opts->count)
+    {
+        result = opts->map[ii].svalue;
+    }
+    return result;
 }
 
 static gint
 lookup_generic_int(combo_opts_t *opts, const GValue *gval)
 {
-	gint ii;
-	gint result = -1;
+    gint ii;
+    gint result = -1;
 
-	ii = find_combo_entry(opts, gval);
-	if (ii < opts->count)
-	{
-		result = opts->map[ii].ivalue;
-	}
-	return result;
+    ii = find_combo_entry(opts, gval);
+    if (ii < opts->count)
+    {
+        result = opts->map[ii].ivalue;
+    }
+    return result;
 }
 
 static gdouble
 lookup_generic_double(combo_opts_t *opts, const GValue *gval)
 {
-	gint ii;
-	gdouble result = -1;
+    gint ii;
+    gdouble result = -1;
 
-	ii = find_combo_entry(opts, gval);
-	if (ii < opts->count)
-	{
-		result = opts->map[ii].ivalue;
-	}
-	return result;
+    ii = find_combo_entry(opts, gval);
+    if (ii < opts->count)
+    {
+        result = opts->map[ii].ivalue;
+    }
+    return result;
 }
 
 static const gchar*
 lookup_generic_option(combo_opts_t *opts, const GValue *gval)
 {
-	gint ii;
-	const gchar *result = "";
+    gint ii;
+    const gchar *result = "";
 
-	ii = find_combo_entry(opts, gval);
-	if (ii < opts->count)
-	{
-		result = opts->map[ii].option;
-	}
-	return result;
+    ii = find_combo_entry(opts, gval);
+    if (ii < opts->count)
+    {
+        result = opts->map[ii].option;
+    }
+    return result;
 }
 
 static gint
 lookup_mix_int(const GValue *mix)
 {
-	gint ii;
-	gint result = 0;
+    gint ii;
+    gint result = 0;
 
 
-	if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
-	{
-		gchar * str = ghb_value_string(mix);
-		for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-		{
-			if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
-			{
-				result = hb_audio_mixdowns[ii].amixdown;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
-			 G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
-	{
-		gint val = ghb_value_int(mix);
-		for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-		{
-			if (hb_audio_mixdowns[ii].amixdown == val)
-			{
-				result = hb_audio_mixdowns[ii].amixdown;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
+    {
+        gchar * str = ghb_value_string(mix);
+        for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+        {
+            if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+            {
+                result = hb_audio_mixdowns[ii].amixdown;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
+             G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
+    {
+        gint val = ghb_value_int(mix);
+        for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+        {
+            if (hb_audio_mixdowns[ii].amixdown == val)
+            {
+                result = hb_audio_mixdowns[ii].amixdown;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static const gchar*
 lookup_mix_option(const GValue *mix)
 {
-	gint ii;
-	gchar *result = "None";
+    gint ii;
+    const gchar *result = "None";
 
 
-	if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
-	{
-		gchar *str = ghb_value_string(mix);
-		for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-		{
-			if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
-			{
-				result = hb_audio_mixdowns[ii].human_readable_name;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
-			 G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
-	{
-		gint val = ghb_value_int(mix);
-		for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-		{
-			if (hb_audio_mixdowns[ii].amixdown == val)
-			{
-				result = hb_audio_mixdowns[ii].human_readable_name;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
+    {
+        gchar *str = ghb_value_string(mix);
+        for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+        {
+            if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+            {
+                result = hb_audio_mixdowns[ii].human_readable_name;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
+             G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
+    {
+        gint val = ghb_value_int(mix);
+        for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+        {
+            if (hb_audio_mixdowns[ii].amixdown == val)
+            {
+                result = hb_audio_mixdowns[ii].human_readable_name;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static const gchar*
 lookup_mix_string(const GValue *mix)
 {
-	gint ii;
-	gchar *result = "none";
+    gint ii;
+    const gchar *result = "none";
 
 
-	if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
-	{
-		gchar *str = ghb_value_string(mix);
-		for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-		{
-			if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
-			{
-				result = hb_audio_mixdowns[ii].short_name;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
-			 G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
-	{
-		gint val = ghb_value_int(mix);
-		for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-		{
-			if (hb_audio_mixdowns[ii].amixdown == val)
-			{
-				result = hb_audio_mixdowns[ii].short_name;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
+    {
+        gchar *str = ghb_value_string(mix);
+        for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+        {
+            if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+            {
+                result = hb_audio_mixdowns[ii].short_name;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
+             G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
+    {
+        gint val = ghb_value_int(mix);
+        for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+        {
+            if (hb_audio_mixdowns[ii].amixdown == val)
+            {
+                result = hb_audio_mixdowns[ii].short_name;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static gint
 lookup_video_rate_int(const GValue *vrate)
 {
-	gint ii;
-	gchar *str;
-	gint result = 0;
-
-	str = ghb_value_string(vrate);
-	for (ii = 0; ii < hb_video_rates_count; ii++)
-	{
-		if (strcmp(hb_video_rates[ii].string, str) == 0)
-		{
-			result = hb_video_rates[ii].rate;
-			break;
-		}
-	}
-	g_free(str);
-	// Default to "same as source"
-	return result;
+    gint ii;
+    gchar *str;
+    gint result = 0;
+
+    str = ghb_value_string(vrate);
+    for (ii = 0; ii < hb_video_rates_count; ii++)
+    {
+        if (strcmp(hb_video_rates[ii].string, str) == 0)
+        {
+            result = hb_video_rates[ii].rate;
+            break;
+        }
+    }
+    g_free(str);
+    // Default to "same as source"
+    return result;
 }
 
 static const gchar*
 lookup_video_rate_option(const GValue *vrate)
 {
-	gint ii;
-	gchar *str;
-	const gchar *result = "Same as source";
-
-	str = ghb_value_string(vrate);
-	for (ii = 0; ii < hb_video_rates_count; ii++)
-	{
-		if (strcmp(hb_video_rates[ii].string, str) == 0)
-		{
-			result = hb_video_rates[ii].string;
-			break;
-		}
-	}
-	g_free(str);
-	// Default to "same as source"
-	return result;
+    gint ii;
+    gchar *str;
+    const gchar *result = "Same as source";
+
+    str = ghb_value_string(vrate);
+    for (ii = 0; ii < hb_video_rates_count; ii++)
+    {
+        if (strcmp(hb_video_rates[ii].string, str) == 0)
+        {
+            result = hb_video_rates[ii].string;
+            break;
+        }
+    }
+    g_free(str);
+    // Default to "same as source"
+    return result;
 }
 
 static gint
 lookup_audio_rate_int(const GValue *rate)
 {
-	gint ii;
-	gint result = 0;
+    gint ii;
+    gint result = 0;
 
-	if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
-	{
-		// Coincidentally, the string "source" will return 0
-		// which is our flag to use "same as source"
-		gchar * str = ghb_value_string(rate);
-		for (ii = 0; ii < hb_audio_rates_count; ii++)
-		{
-			if (strcmp(hb_audio_rates[ii].string, str) == 0)
-			{
-				result = hb_audio_rates[ii].rate;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
-			 G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
-	{
-		for (ii = 0; ii < hb_audio_rates_count; ii++)
-		{
-			gint val = ghb_value_int(rate);
-			if (val == hb_audio_rates[ii].rate)
-			{
-				result = hb_audio_rates[ii].rate;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
+    {
+        // Coincidentally, the string "source" will return 0
+        // which is our flag to use "same as source"
+        gchar * str = ghb_value_string(rate);
+        for (ii = 0; ii < hb_audio_rates_count; ii++)
+        {
+            if (strcmp(hb_audio_rates[ii].string, str) == 0)
+            {
+                result = hb_audio_rates[ii].rate;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
+             G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
+    {
+        for (ii = 0; ii < hb_audio_rates_count; ii++)
+        {
+            gint val = ghb_value_int(rate);
+            if (val == hb_audio_rates[ii].rate)
+            {
+                result = hb_audio_rates[ii].rate;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static const gchar*
 lookup_audio_rate(const GValue *rate, const char *def)
 {
-	gint ii;
-	const gchar *result = def;
+    gint ii;
+    const gchar *result = def;
 
-	if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
-	{
-		// Coincidentally, the string "source" will return 0
-		// which is our flag to use "same as source"
-		gchar *str = ghb_value_string(rate);
-		for (ii = 0; ii < hb_audio_rates_count; ii++)
-		{
-			if (strcmp(hb_audio_rates[ii].string, str) == 0)
-			{
-				result = hb_audio_rates[ii].string;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
-			 G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
-	{
-		for (ii = 0; ii < hb_audio_rates_count; ii++)
-		{
-			gint val = ghb_value_int(rate);
-			if (val == hb_audio_rates[ii].rate)
-			{
-				result = hb_audio_rates[ii].string;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
+    {
+        // Coincidentally, the string "source" will return 0
+        // which is our flag to use "same as source"
+        gchar *str = ghb_value_string(rate);
+        for (ii = 0; ii < hb_audio_rates_count; ii++)
+        {
+            if (strcmp(hb_audio_rates[ii].string, str) == 0)
+            {
+                result = hb_audio_rates[ii].string;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
+             G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
+    {
+        for (ii = 0; ii < hb_audio_rates_count; ii++)
+        {
+            gint val = ghb_value_int(rate);
+            if (val == hb_audio_rates[ii].rate)
+            {
+                result = hb_audio_rates[ii].string;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static const gchar*
@@ -1084,19 +1086,19 @@
 gint
 ghb_find_closest_audio_rate(gint rate)
 {
-	gint ii;
-	gint result;
+    gint ii;
+    gint result;
 
-	result = 0;
-	for (ii = 0; ii < hb_audio_rates_count; ii++)
-	{
-		if (rate <= hb_audio_rates[ii].rate)
-		{
-			result = hb_audio_rates[ii].rate;
-			break;
-		}
-	}
-	return result;
+    result = 0;
+    for (ii = 0; ii < hb_audio_rates_count; ii++)
+    {
+        if (rate <= hb_audio_rates[ii].rate)
+        {
+            result = hb_audio_rates[ii].rate;
+            break;
+        }
+    }
+    return result;
 }
 
 hb_rate_t *ghb_audio_bitrates;
@@ -1105,264 +1107,264 @@
 static gint
 lookup_audio_bitrate_int(const GValue *rate)
 {
-	gint ii;
-	gint result = 160;
+    gint ii;
+    gint result = 160;
 
-	if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
-	{
-		// Coincidentally, the string "source" will return 0
-		// which is our flag to use "same as source"
-		gchar *str = ghb_value_string(rate);
-		for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
-		{
-			if (strcmp(ghb_audio_bitrates[ii].string, str) == 0)
-			{
-				result = ghb_audio_bitrates[ii].rate;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
-			 G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
-	{
-		gint val = ghb_value_int(rate);
-		for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
-		{
-			if (ghb_audio_bitrates[ii].rate == val)
-			{
-				result = ghb_audio_bitrates[ii].rate;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
+    {
+        // Coincidentally, the string "source" will return 0
+        // which is our flag to use "same as source"
+        gchar *str = ghb_value_string(rate);
+        for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+        {
+            if (strcmp(ghb_audio_bitrates[ii].string, str) == 0)
+            {
+                result = ghb_audio_bitrates[ii].rate;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
+             G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
+    {
+        gint val = ghb_value_int(rate);
+        for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+        {
+            if (ghb_audio_bitrates[ii].rate == val)
+            {
+                result = ghb_audio_bitrates[ii].rate;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static const gchar*
 lookup_audio_bitrate_option(const GValue *rate)
 {
-	gint ii;
-	const gchar *result = "160";
+    gint ii;
+    const gchar *result = "160";
 
-	if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
-	{
-		// Coincidentally, the string "source" will return 0
-		// which is our flag to use "same as source"
-		gchar *str = ghb_value_string(rate);
-		for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
-		{
-			if (strcmp(ghb_audio_bitrates[ii].string, str) == 0)
-			{
-				result = ghb_audio_bitrates[ii].string;
-				break;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
-			 G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
-	{
-		gint val = ghb_value_int(rate);
-		for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
-		{
-			if (ghb_audio_bitrates[ii].rate == val)
-			{
-				result = ghb_audio_bitrates[ii].string;
-				break;
-			}
-		}
-	}
-	return result;
+    if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
+    {
+        // Coincidentally, the string "source" will return 0
+        // which is our flag to use "same as source"
+        gchar *str = ghb_value_string(rate);
+        for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+        {
+            if (strcmp(ghb_audio_bitrates[ii].string, str) == 0)
+            {
+                result = ghb_audio_bitrates[ii].string;
+                break;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
+             G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
+    {
+        gint val = ghb_value_int(rate);
+        for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+        {
+            if (ghb_audio_bitrates[ii].rate == val)
+            {
+                result = ghb_audio_bitrates[ii].string;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 static gint
 lookup_hb_encoder_int(const GValue *enc, hb_encoder_t *encoders, int len)
 {
-	gint ii;
+    gint ii;
 
-	if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
-	{
-		gchar *str = ghb_value_string(enc);
-		for (ii = 0; ii < len; ii++)
-		{
-			if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
-				strcmp(encoders[ii].short_name, str) == 0)
-			{
-				g_free(str);
-				return encoders[ii].encoder;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
-			 G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
-	{
-		int val = ghb_value_int(enc);
-		for (ii = 0; ii < len; ii++)
-		{
-			if (encoders[ii].encoder == val)
-			{
-				return encoders[ii].encoder;
-			}
-		}
-	}
-	return 0;
+    if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
+    {
+        gchar *str = ghb_value_string(enc);
+        for (ii = 0; ii < len; ii++)
+        {
+            if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
+                strcmp(encoders[ii].short_name, str) == 0)
+            {
+                g_free(str);
+                return encoders[ii].encoder;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
+             G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
+    {
+        int val = ghb_value_int(enc);
+        for (ii = 0; ii < len; ii++)
+        {
+            if (encoders[ii].encoder == val)
+            {
+                return encoders[ii].encoder;
+            }
+        }
+    }
+    return 0;
 }
 
 static const gchar*
 lookup_hb_encoder_option(const GValue *enc, hb_encoder_t *encoders, int len)
 {
-	gint ii;
+    gint ii;
 
-	if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
-	{
-		gchar *str = ghb_value_string(enc);
-		for (ii = 0; ii < len; ii++)
-		{
-			if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
-				strcmp(encoders[ii].short_name, str) == 0)
-			{
-				g_free(str);
-				return encoders[ii].human_readable_name;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
-			 G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
-	{
-		int val = ghb_value_int(enc);
-		for (ii = 0; ii < len; ii++)
-		{
-			if (encoders[ii].encoder == val)
-			{
-				return encoders[ii].human_readable_name;
-			}
-		}
-	}
-	return 0;
+    if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
+    {
+        gchar *str = ghb_value_string(enc);
+        for (ii = 0; ii < len; ii++)
+        {
+            if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
+                strcmp(encoders[ii].short_name, str) == 0)
+            {
+                g_free(str);
+                return encoders[ii].human_readable_name;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
+             G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
+    {
+        int val = ghb_value_int(enc);
+        for (ii = 0; ii < len; ii++)
+        {
+            if (encoders[ii].encoder == val)
+            {
+                return encoders[ii].human_readable_name;
+            }
+        }
+    }
+    return 0;
 }
 
 static const gchar*
 lookup_hb_encoder_string(const GValue *enc, hb_encoder_t *encoders, int len)
 {
-	gint ii;
+    gint ii;
 
-	if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
-	{
-		gchar *str = ghb_value_string(enc);
-		for (ii = 0; ii < len; ii++)
-		{
-			if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
-				strcmp(encoders[ii].short_name, str) == 0)
-			{
-				g_free(str);
-				return encoders[ii].short_name;
-			}
-		}
-		g_free(str);
-	}
-	else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
-			 G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
-			 G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
-	{
-		int val = ghb_value_int(enc);
-		for (ii = 0; ii < len; ii++)
-		{
-			if (encoders[ii].encoder == val)
-			{
-				return encoders[ii].short_name;
-			}
-		}
-	}
-	return 0;
+    if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
+    {
+        gchar *str = ghb_value_string(enc);
+        for (ii = 0; ii < len; ii++)
+        {
+            if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
+                strcmp(encoders[ii].short_name, str) == 0)
+            {
+                g_free(str);
+                return encoders[ii].short_name;
+            }
+        }
+        g_free(str);
+    }
+    else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
+             G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
+             G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
+    {
+        int val = ghb_value_int(enc);
+        for (ii = 0; ii < len; ii++)
+        {
+            if (encoders[ii].encoder == val)
+            {
+                return encoders[ii].short_name;
+            }
+        }
+    }
+    return 0;
 }
 
 static gint
 lookup_audio_lang_int(const GValue *rate)
 {
-	gint ii;
-	gchar *str;
-	gint result = 0;
-
-	// Coincidentally, the string "source" will return 0
-	// which is our flag to use "same as source"
-	str = ghb_value_string(rate);
-	for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
-	{
-		if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
-		{
-			result = ii;
-			break;
-		}
-	}
-	g_free(str);
-	return result;
+    gint ii;
+    gchar *str;
+    gint result = 0;
+
+    // Coincidentally, the string "source" will return 0
+    // which is our flag to use "same as source"
+    str = ghb_value_string(rate);
+    for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+    {
+        if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
+        {
+            result = ii;
+            break;
+        }
+    }
+    g_free(str);
+    return result;
 }
 
 static const gchar*
 lookup_audio_lang_option(const GValue *rate)
 {
-	gint ii;
-	gchar *str;
-	const gchar *result = "Same as source";
-
-	// Coincidentally, the string "source" will return 0
-	// which is our flag to use "same as source"
-	str = ghb_value_string(rate);
-	for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
-	{
-		if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
-		{
-			if (ghb_language_table[ii].native_name[0] != 0)
-				result = ghb_language_table[ii].native_name;
-			else
-				result = ghb_language_table[ii].eng_name;
-			break;
-		}
-	}
-	g_free(str);
-	return result;
+    gint ii;
+    gchar *str;
+    const gchar *result = "Same as source";
+
+    // Coincidentally, the string "source" will return 0
+    // which is our flag to use "same as source"
+    str = ghb_value_string(rate);
+    for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+    {
+        if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
+        {
+            if (ghb_language_table[ii].native_name[0] != 0)
+                result = ghb_language_table[ii].native_name;
+            else
+                result = ghb_language_table[ii].eng_name;
+            break;
+        }
+    }
+    g_free(str);
+    return result;
 }
 
 GValue*
 ghb_lookup_acodec_value(gint val)
 {
-	GValue *value = NULL;
-	gint ii;
+    GValue *value = NULL;
+    gint ii;
 
-	for (ii = 0; ii < hb_audio_encoders_count; ii++)
-	{
-		if ((int)hb_audio_encoders[ii].encoder == val)
-		{
-			value = ghb_string_value_new(hb_audio_encoders[ii].short_name);
-			return value;
-		}
-	}
-	value = ghb_string_value_new("copy");
-	return value;
+    for (ii = 0; ii < hb_audio_encoders_count; ii++)
+    {
+        if ((int)hb_audio_encoders[ii].encoder == val)
+        {
+            value = ghb_string_value_new(hb_audio_encoders[ii].short_name);
+            return value;
+        }
+    }
+    value = ghb_string_value_new("copy");
+    return value;
 }
 
 static GValue*
 get_amix_value(gint val)
 {
-	GValue *value = NULL;
-	gint ii;
+    GValue *value = NULL;
+    gint ii;
 
-	for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-	{
-		if (hb_audio_mixdowns[ii].amixdown == val)
-		{
-			value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name);
-			break;
-		}
-	}
-	return value;
+    for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+    {
+        if (hb_audio_mixdowns[ii].amixdown == val)
+        {
+            value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name);
+            break;
+        }
+    }
+    return value;
 }
 
 // Handle for libhb.  Gets set by ghb_backend_init()
@@ -1374,219 +1376,156 @@
 gchar*
 ghb_get_tmp_dir()
 {
-	char dir[512];
+    char dir[512];
 
-	hb_get_temporary_directory(dir);
-	return g_strdup(dir);
+    hb_get_temporary_directory(dir);
+    return g_strdup(dir);
 }
 
 void
 ghb_hb_cleanup(gboolean partial)
 {
-	char dir[512];
+    char dir[512];
 
-	hb_get_temporary_directory(dir);
-	del_tree(dir, !partial);
+    hb_get_temporary_directory(dir);
+    del_tree(dir, !partial);
 }
 
 gint
 ghb_subtitle_track_source(GValue *settings, gint track)
 {
-	gint titleindex;
+    gint titleindex;
 
-	if (track == -2)
-		return SRTSUB;
-	if (track < 0)
-		return VOBSUB;
-	titleindex = ghb_settings_combo_int(settings, "title");
-	if (titleindex < 0)
-		return VOBSUB;
-
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_subtitle_t * sub;
-	
-	if (h_scan == NULL) return VOBSUB;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return VOBSUB;
-	}
-	title = hb_list_item( list, titleindex );
-	if (title == NULL) return VOBSUB;	// Bad titleindex
-	sub = hb_list_item( title->list_subtitle, track);
-	if (sub != NULL)
-		return sub->source;
-	else
-		return VOBSUB;
-}
-
-const char*
-ghb_subtitle_source_name(gint source)
-{
-	const gchar * name = "Unknown";
-	switch (source)
-	{
-		case VOBSUB:
-			name = "VOBSUB";
-			break;
-		case TX3GSUB:
-			name = "TX3G";
-			break;
-		case UTF8SUB:
-			name = "UTF8";
-			break;
-		case CC708SUB:
-		case CC608SUB:
-			name = "CC";
-			break;
-		case SRTSUB:
-			name = "SRT";
-			break;
-		case SSASUB:
-			name = "SSA";
-			break;
-		default:
-			break;
-	}
-	return name;
+    if (track == -2)
+        return SRTSUB;
+    if (track < 0)
+        return VOBSUB;
+    titleindex = ghb_settings_combo_int(settings, "title");
+    if (titleindex < 0)
+        return VOBSUB;
+
+    hb_title_t * title;
+    hb_subtitle_t * sub;
+    
+    if (h_scan == NULL) return VOBSUB;
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL) return VOBSUB;   // Bad titleindex
+    sub = hb_list_item( title->list_subtitle, track);
+    if (sub != NULL)
+        return sub->source;
+    else
+        return VOBSUB;
 }
 
 const char*
 ghb_subtitle_track_source_name(GValue *settings, gint track)
 {
-	gint titleindex;
-	const gchar * name = "Unknown";
+    gint titleindex;
+    const gchar * name = "Unknown";
 
-	if (track == -2)
-	{
-		name = "SRT";
-		goto done;
-	}
-	if (track == -1)
-	{
-		name = "Bitmap";
-		goto done;
-	}
-
-	titleindex = ghb_settings_combo_int(settings, "title");
-	if (titleindex < 0)
-		goto done;
-
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_subtitle_t * sub;
-	
-	if (h_scan == NULL) 
-		goto done;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-		goto done;
-
-	title = hb_list_item( list, titleindex );
-	if (title == NULL)
-		goto done;
-
-	sub = hb_list_item( title->list_subtitle, track);
-	if (sub != NULL)
-	{
-		name = ghb_subtitle_source_name(sub->source);
-	}
+    if (track == -2)
+    {
+        name = "SRT";
+        goto done;
+    }
+    if (track == -1)
+    {
+        name = "Bitmap";
+        goto done;
+    }
+
+    titleindex = ghb_settings_combo_int(settings, "title");
+    if (titleindex < 0)
+        goto done;
+
+    hb_title_t * title;
+    hb_subtitle_t * sub;
+    
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL)
+        goto done;
+
+    sub = hb_list_item( title->list_subtitle, track);
+    if (sub != NULL)
+    {
+        name = hb_subsource_name(sub->source);
+    }
 
 done:
-	return name;
+    return name;
 }
 
-gchar*
+const gchar*
 ghb_subtitle_track_lang(GValue *settings, gint track)
 {
-	gint titleindex;
+    gint titleindex;
 
-	titleindex = ghb_settings_combo_int(settings, "title");
-	if (titleindex < 0)
-		goto fail;
-	if (track == -1)
-		return ghb_get_user_audio_lang(settings, titleindex, 0);
-	if (track < 0)
-		goto fail;
-
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_subtitle_t * sub;
-	
-	if (h_scan == NULL)
-		goto fail;
-
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		goto fail;
-	}
-	title = hb_list_item( list, titleindex );
-	if (title == NULL) 	// Bad titleindex
-		goto fail;
-	sub = hb_list_item( title->list_subtitle, track);
-	if (sub != NULL)
-	   	return g_strdup(sub->iso639_2);
+    titleindex = ghb_settings_combo_int(settings, "title");
+    if (titleindex < 0)
+        goto fail;
+    if (track == -1)
+        return ghb_get_user_audio_lang(settings, titleindex, 0);
+    if (track < 0)
+        goto fail;
+
+    hb_title_t * title;
+    hb_subtitle_t * sub;
+    
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL)  // Bad titleindex
+        goto fail;
+    sub = hb_list_item( title->list_subtitle, track);
+    if (sub != NULL)
+        return sub->iso639_2;
 
 fail:
-	return g_strdup("und");
+    return "und";
 }
 
 gint
 ghb_get_title_number(gint titleindex)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	
-	if (h_scan == NULL) return 1;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return 1;
-	}
-	title = hb_list_item( list, titleindex );
-	if (title == NULL) return 1;	// Bad titleindex
-	return title->index;
+    hb_title_t * title;
+    
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL) return 1;    // Bad titleindex
+    return title->index;
 }
 
 static hb_audio_config_t*
 get_hb_audio(hb_handle_t *h, gint titleindex, gint track)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
+    hb_list_t  * list;
+    hb_title_t * title;
     hb_audio_config_t *audio = NULL;
-	
+    
     if (h == NULL) return NULL;
-	list = hb_get_titles( h );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return NULL;
-	}
+    list = hb_get_titles( h );
+    if( !hb_list_count( list ) )
+    {
+        /* No valid title, stop right there */
+        return NULL;
+    }
     title = hb_list_item( list, titleindex );
-	if (title == NULL) return NULL;	// Bad titleindex
-	if (!hb_list_count(title->list_audio))
-	{
-		return NULL;
-	}
+    if (title == NULL) return NULL; // Bad titleindex
+    if (!hb_list_count(title->list_audio))
+    {
+        return NULL;
+    }
     audio = (hb_audio_config_t *)hb_list_audio_config_item(title->list_audio, track);
-	return audio;
+    return audio;
 }
 
 static gint
 search_rates(hb_rate_t *rates, gint rate, gint count)
 {
-	gint ii;
-	for (ii = 0; ii < count; ii++)
-	{
-		if (rates[ii].rate == rate)
-			return ii;
-	}
-	return -1;
+    gint ii;
+    for (ii = 0; ii < count; ii++)
+    {
+        if (rates[ii].rate == rate)
+            return ii;
+    }
+    return -1;
 }
 
 static gboolean find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter);
@@ -1594,404 +1533,398 @@
 static GtkListStore*
 get_combo_box_store(GtkBuilder *builder, const gchar *name)
 {
-	GtkComboBox *combo;
-	GtkListStore *store;
+    GtkComboBox *combo;
+    GtkListStore *store;
 
-	g_debug("get_combo_box_store() %s\n", name);
-	// First modify the combobox model to allow greying out of options
-	combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
-	store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
-	return store;
+    g_debug("get_combo_box_store() %s\n", name);
+    // First modify the combobox model to allow greying out of options
+    combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+    store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
+    return store;
 }
 
 static void
 grey_combo_box_item(GtkBuilder *builder, const gchar *name, gint value, gboolean grey)
 {
-	GtkListStore *store;
-	GtkTreeIter iter;
-	
-	store = get_combo_box_store(builder, name);
-	if (find_combo_item_by_int(GTK_TREE_MODEL(store), value, &iter))
-	{
-		gtk_list_store_set(store, &iter, 
-						   1, !grey, 
-						   -1);
-	}
+    GtkListStore *store;
+    GtkTreeIter iter;
+    
+    store = get_combo_box_store(builder, name);
+    if (find_combo_item_by_int(GTK_TREE_MODEL(store), value, &iter))
+    {
+        gtk_list_store_set(store, &iter, 
+                           1, !grey, 
+                           -1);
+    }
+}
+
+static void
+grey_mix_opts(signal_user_data_t *ud, gint acodec, gint64 layout)
+{
+    gint ii;
+    
+    g_debug("grey_mix_opts()\n");
+    for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+    {
+        grey_combo_box_item(ud->builder, "AudioMixdown",
+                hb_audio_mixdowns[ii].amixdown,
+                !hb_mixdown_is_supported(hb_audio_mixdowns[ii].amixdown,
+                                        acodec, layout));
+    }
 }
 
 void
 ghb_grey_combo_options(signal_user_data_t *ud)
 {
-	GtkWidget *widget;
-	gint mux, track, titleindex, acodec, fallback;
-	hb_audio_config_t *aconfig = NULL;
-	GValue *gval;
-	int ii;
-
-	widget = GHB_WIDGET (ud->builder, "title");
-	gval = ghb_widget_value(widget);
-	titleindex = ghb_lookup_combo_int("title", gval);
-	ghb_value_free(gval);
-	widget = GHB_WIDGET (ud->builder, "AudioTrack");
-	gval = ghb_widget_value(widget);
-	track = ghb_lookup_combo_int("AudioTrack", gval);
-	ghb_value_free(gval);
-	aconfig = get_hb_audio(h_scan, titleindex, track);
-	widget = GHB_WIDGET (ud->builder, "FileFormat");
-	gval = ghb_widget_value(widget);
-	mux = ghb_lookup_combo_int("FileFormat", gval);
-	ghb_value_free(gval);
-
-	grey_combo_box_item(ud->builder, "x264_analyse", 4, TRUE);
-	for (ii = 0; ii < hb_audio_encoders_count; ii++)
-	{
-		if (!(mux & hb_audio_encoders[ii].muxers))
-		{
-			grey_combo_box_item(ud->builder, "AudioEncoder", 
-				hb_audio_encoders[ii].encoder, TRUE);
-			grey_combo_box_item(ud->builder, "AudioEncoderFallback",
-				hb_audio_encoders[ii].encoder, TRUE);
-		}
+    GtkWidget *widget;
+    gint mux, track, titleindex, acodec, fallback;
+    hb_audio_config_t *aconfig = NULL;
+    GValue *gval;
+    int ii;
+
+    widget = GHB_WIDGET (ud->builder, "title");
+    gval = ghb_widget_value(widget);
+    titleindex = ghb_lookup_combo_int("title", gval);
+    ghb_value_free(gval);
+    widget = GHB_WIDGET (ud->builder, "AudioTrack");
+    gval = ghb_widget_value(widget);
+    track = ghb_lookup_combo_int("AudioTrack", gval);
+    ghb_value_free(gval);
+    aconfig = get_hb_audio(h_scan, titleindex, track);
+    widget = GHB_WIDGET (ud->builder, "FileFormat");
+    gval = ghb_widget_value(widget);
+    mux = ghb_lookup_combo_int("FileFormat", gval);
+    ghb_value_free(gval);
+
+    grey_combo_box_item(ud->builder, "x264_analyse", 4, TRUE);
+    for (ii = 0; ii < hb_audio_encoders_count; ii++)
+    {
+        if (!(mux & hb_audio_encoders[ii].muxers))
+        {
+            grey_combo_box_item(ud->builder, "AudioEncoder", 
+                hb_audio_encoders[ii].encoder, TRUE);
+            grey_combo_box_item(ud->builder, "AudioEncoderFallback",
+                hb_audio_encoders[ii].encoder, TRUE);
+        }
         else
         {
-			grey_combo_box_item(ud->builder, "AudioEncoder", 
-				hb_audio_encoders[ii].encoder, FALSE);
-			grey_combo_box_item(ud->builder, "AudioEncoderFallback",
-				hb_audio_encoders[ii].encoder, FALSE);
-        }
-	}
-	for (ii = 0; ii < hb_video_encoders_count; ii++)
-	{
-		if (!(mux & hb_video_encoders[ii].muxers))
-		{
-			grey_combo_box_item(ud->builder, "VideoEncoder", 
-				hb_video_encoders[ii].encoder, TRUE);
-		}
+            grey_combo_box_item(ud->builder, "AudioEncoder", 
+                hb_audio_encoders[ii].encoder, FALSE);
+            grey_combo_box_item(ud->builder, "AudioEncoderFallback",
+                hb_audio_encoders[ii].encoder, FALSE);
+        }
+    }
+    for (ii = 0; ii < hb_video_encoders_count; ii++)
+    {
+        if (!(mux & hb_video_encoders[ii].muxers))
+        {
+            grey_combo_box_item(ud->builder, "VideoEncoder", 
+                hb_video_encoders[ii].encoder, TRUE);
+        }
         else
-		{
-			grey_combo_box_item(ud->builder, "VideoEncoder", 
-				hb_video_encoders[ii].encoder, FALSE);
-		}
-	}
-
-	if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_MP3)
-	{
-		grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_MP3_PASS, TRUE);
-	}
-	if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_FFAAC)
-	{
-		grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AAC_PASS, TRUE);
-	}
-	if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_AC3)
-	{
-		grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AC3_PASS, TRUE);
-	}
-	if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA)
-	{
-		grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
-	}
-	if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA_HD)
-	{
-		grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
-	}
-
-	widget = GHB_WIDGET (ud->builder, "AudioEncoder");
-	gval = ghb_widget_value(widget);
-	acodec = ghb_lookup_combo_int("AudioEncoder", gval);
-	ghb_value_free(gval);
-	grey_combo_box_item(ud->builder, "AudioMixdown", 0, TRUE);
-
-	gboolean allow_mono = TRUE;
-	gboolean allow_stereo = TRUE;
-	gboolean allow_dolby = TRUE;
-	gboolean allow_dpl2 = TRUE;
-	gboolean allow_6ch = TRUE;
-	allow_6ch = acodec & ~HB_ACODEC_LAME;
-	if (aconfig)
-	{
-		fallback = ghb_settings_combo_int(ud->settings, "AudioEncoderFallback");
-		gint copy_mask = ghb_get_copy_mask(ud->settings);
-		acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
-		gint best = hb_get_best_mixdown(acodec, aconfig->in.channel_layout, 0);
-
-		allow_stereo = best >= HB_AMIXDOWN_STEREO;
-		allow_dolby = best >= HB_AMIXDOWN_DOLBY;
-		allow_dpl2 = best >= HB_AMIXDOWN_DOLBYPLII;
-		allow_6ch = best >= HB_AMIXDOWN_6CH;
-		allow_mono = best >= HB_AMIXDOWN_MONO;
-	}
-	grey_combo_box_item(ud->builder, "AudioMixdown", HB_AMIXDOWN_MONO, !allow_mono);
-	grey_combo_box_item(ud->builder, "AudioMixdown", HB_AMIXDOWN_STEREO, !allow_stereo);
-	grey_combo_box_item(ud->builder, "AudioMixdown", HB_AMIXDOWN_DOLBY, !allow_dolby);
-	grey_combo_box_item(ud->builder, "AudioMixdown", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2);
-	grey_combo_box_item(ud->builder, "AudioMixdown", HB_AMIXDOWN_6CH, !allow_6ch);
+        {
+            grey_combo_box_item(ud->builder, "VideoEncoder", 
+                hb_video_encoders[ii].encoder, FALSE);
+        }
+    }
+
+    if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_MP3)
+    {
+        grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_MP3_PASS, TRUE);
+    }
+    if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_FFAAC)
+    {
+        grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AAC_PASS, TRUE);
+    }
+    if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_AC3)
+    {
+        grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AC3_PASS, TRUE);
+    }
+    if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA)
+    {
+        grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
+    }
+    if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA_HD)
+    {
+        grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
+    }
+
+    widget = GHB_WIDGET (ud->builder, "AudioEncoder");
+    gval = ghb_widget_value(widget);
+    acodec = ghb_lookup_combo_int("AudioEncoder", gval);
+    ghb_value_free(gval);
+
+    gint64 layout = aconfig != NULL ? aconfig->in.channel_layout : ~0;
+    fallback = ghb_select_fallback(ud->settings, mux, acodec);
+    gint copy_mask = ghb_get_copy_mask(ud->settings);
+    acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
+    grey_mix_opts(ud, acodec, layout);
 }
 
 gint
 ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix)
 {
-	gint layout;
-	layout = aconfig ? aconfig->in.channel_layout : 
-						HB_INPUT_CH_LAYOUT_3F2R | HB_INPUT_CH_LAYOUT_HAS_LFE;
-	return hb_get_best_mixdown( acodec, layout, mix );
+    gint layout;
+    layout = aconfig ? aconfig->in.channel_layout : AV_CH_LAYOUT_5POINT1;
+
+    if (mix == HB_AMIXDOWN_NONE)
+        mix = hb_audio_mixdowns[hb_audio_mixdowns_count-1].amixdown;
+    
+    return hb_get_best_mixdown( acodec, layout, mix );
 }
 
 // Set up the model for the combo box
 static void
 init_combo_box(GtkBuilder *builder, const gchar *name)
 {
-	GtkComboBox *combo;
-	GtkListStore *store;
-	GtkCellRenderer *cell;
-
-	g_debug("init_combo_box() %s\n", name);
-	// First modify the combobox model to allow greying out of options
-	combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
-	if (combo == NULL)
-		return;
-	// Store contains:
-	// 1 - String to display
-	// 2 - bool indicating whether the entry is selectable (grey or not)
-	// 3 - String that is used for presets
-	// 4 - Int value determined by backend
-	// 5 - String value determined by backend
-	store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_BOOLEAN, 
-							   G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_STRING);
-	gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
-
-	if (G_OBJECT_TYPE(combo) == GTK_TYPE_COMBO_BOX)
-	{
-		gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
-    	cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
-    	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
-    	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
-      		"markup", 0, "sensitive", 1, NULL);
-	}
-	else
-	{ // Combo box entry
-		gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
-	}
-}	
+    GtkComboBox *combo;
+    GtkListStore *store;
+    GtkCellRenderer *cell;
+
+    g_debug("init_combo_box() %s\n", name);
+    // First modify the combobox model to allow greying out of options
+    combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+    if (combo == NULL)
+        return;
+    // Store contains:
+    // 1 - String to display
+    // 2 - bool indicating whether the entry is selectable (grey or not)
+    // 3 - String that is used for presets
+    // 4 - Int value determined by backend
+    // 5 - String value determined by backend
+    store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_BOOLEAN, 
+                               G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_STRING);
+    gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
+
+    if (!gtk_combo_box_get_has_entry(combo))
+    {
+        gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
+        cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
+        gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
+        gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
+            "markup", 0, "sensitive", 1, NULL);
+    }
+    else
+    { // Combo box entry
+        gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(combo), 0);
+    }
+}   
 
 static void
 audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	gchar *str;
-	
-	g_debug("audio_samplerate_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	// Add an item for "Same As Source"
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 
-					   0, "<small>Same as source</small>", 
-					   1, TRUE, 
-					   2, "source", 
-					   3, 0.0, 
-					   4, "source", 
-					   -1);
-	for (ii = 0; ii < count; ii++)
-	{
-		gtk_list_store_append(store, &iter);
-		str = g_strdup_printf("<small>%s</small>", rates[ii].string);
-		gtk_list_store_set(store, &iter, 
-						   0, str,
-						   1, TRUE, 
-						   2, rates[ii].string, 
-						   3, (gdouble)rates[ii].rate, 
-						   4, rates[ii].string, 
-						   -1);
-		g_free(str);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    gchar *str;
+    
+    g_debug("audio_samplerate_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    // Add an item for "Same As Source"
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+                       0, "<small>Same as source</small>", 
+                       1, TRUE, 
+                       2, "source", 
+                       3, 0.0, 
+                       4, "source", 
+                       -1);
+    for (ii = 0; ii < count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        str = g_strdup_printf("<small>%s</small>", rates[ii].string);
+        gtk_list_store_set(store, &iter, 
+                           0, str,
+                           1, TRUE, 
+                           2, rates[ii].string, 
+                           3, (gdouble)rates[ii].rate, 
+                           4, rates[ii].string, 
+                           -1);
+        g_free(str);
+    }
 }
 
 static void
 video_rate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	
-	g_debug("video_rate_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	// Add an item for "Same As Source"
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 
-					   0, "Same as source", 
-					   1, TRUE, 
-					   2, "source", 
-					   3, 0.0, 
-					   4, "source", 
-					   -1);
-	for (ii = 0; ii < count; ii++)
-	{
-		gchar *desc = "";
-		gchar *option;
-		if (strcmp(rates[ii].string, "23.976") == 0)
-		{
-			desc = "(NTSC Film)";
-		}
-		else if (strcmp(rates[ii].string, "25") == 0)
-		{
-			desc = "(PAL Film/Video)";
-		}
-		else if (strcmp(rates[ii].string, "29.97") == 0)
-		{
-			desc = "(NTSC Video)";
-		}
-		option = g_strdup_printf ("%s %s", rates[ii].string, desc);
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, option, 
-						   1, TRUE, 
-						   2, rates[ii].string, 
-						   3, (gdouble)rates[ii].rate, 
-						   4, rates[ii].string, 
-						   -1);
-		g_free(option);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    
+    g_debug("video_rate_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    // Add an item for "Same As Source"
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+                       0, "Same as source", 
+                       1, TRUE, 
+                       2, "source", 
+                       3, 0.0, 
+                       4, "source", 
+                       -1);
+    for (ii = 0; ii < count; ii++)
+    {
+        gchar *desc = "";
+        gchar *option;
+        if (strcmp(rates[ii].string, "23.976") == 0)
+        {
+            desc = "(NTSC Film)";
+        }
+        else if (strcmp(rates[ii].string, "25") == 0)
+        {
+            desc = "(PAL Film/Video)";
+        }
+        else if (strcmp(rates[ii].string, "29.97") == 0)
+        {
+            desc = "(NTSC Video)";
+        }
+        option = g_strdup_printf ("%s %s", rates[ii].string, desc);
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, option, 
+                           1, TRUE, 
+                           2, rates[ii].string, 
+                           3, (gdouble)rates[ii].rate, 
+                           4, rates[ii].string, 
+                           -1);
+        g_free(option);
+    }
 }
 
 static void
 hb_encoder_opts_set_with_mask(
-	GtkBuilder *builder,
-	const gchar *name,
-	hb_encoder_t *encoders,
-	int len,
-	int mask,
-	int neg_mask)
-{
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	gchar *str;
-	
-	g_debug("hb_encoder_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < len; ii++)
-	{
-		if ((mask & encoders[ii].encoder) &&
-			!(neg_mask & encoders[ii].encoder))
-		{
-			gtk_list_store_append(store, &iter);
-			str = g_strdup_printf("<small>%s</small>",
-				encoders[ii].human_readable_name);
-			gtk_list_store_set(store, &iter, 
-							   0, str,
-							   1, TRUE, 
-							   2, encoders[ii].short_name, 
-							   3, (gdouble)encoders[ii].encoder, 
-							   4, encoders[ii].short_name, 
-							   -1);
-			g_free(str);
-		}
-	}
+    GtkBuilder *builder,
+    const gchar *name,
+    hb_encoder_t *encoders,
+    int len,
+    int mask,
+    int neg_mask)
+{
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    gchar *str;
+    
+    g_debug("hb_encoder_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < len; ii++)
+    {
+        if ((mask & encoders[ii].encoder) &&
+            !(neg_mask & encoders[ii].encoder))
+        {
+            gtk_list_store_append(store, &iter);
+            str = g_strdup_printf("<small>%s</small>",
+                encoders[ii].human_readable_name);
+            gtk_list_store_set(store, &iter, 
+                               0, str,
+                               1, TRUE, 
+                               2, encoders[ii].short_name, 
+                               3, (gdouble)encoders[ii].encoder, 
+                               4, encoders[ii].short_name, 
+                               -1);
+            g_free(str);
+        }
+    }
 }
 
 static void
 hb_encoder_opts_set(
-	GtkBuilder *builder,
-	const gchar *name,
-	hb_encoder_t *encoders,
-	int len)
+    GtkBuilder *builder,
+    const gchar *name,
+    hb_encoder_t *encoders,
+    int len)
 {
-	hb_encoder_opts_set_with_mask(builder, name, encoders, len, ~0, 0);
+    hb_encoder_opts_set_with_mask(builder, name, encoders, len, ~0, 0);
 }
 
 static void
 acodec_fallback_opts_set(GtkBuilder *builder, const gchar *name)
 {
-	hb_encoder_opts_set_with_mask(builder, name, hb_audio_encoders, 
-							hb_audio_encoders_count, ~0, HB_ACODEC_PASS_FLAG);
+    hb_encoder_opts_set_with_mask(builder, name, hb_audio_encoders, 
+                            hb_audio_encoders_count, ~0, HB_ACODEC_PASS_FLAG);
 }
 
 static void
 mix_opts_set(GtkBuilder *builder, const gchar *name)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	gchar *str;
-	
-	g_debug("mix_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
-	{
-		gtk_list_store_append(store, &iter);
-		str = g_strdup_printf("<small>%s</small>",
-			hb_audio_mixdowns[ii].human_readable_name);
-		gtk_list_store_set(store, &iter, 
-						   0, str,
-						   1, TRUE, 
-						   2, hb_audio_mixdowns[ii].short_name, 
-						   3, (gdouble)hb_audio_mixdowns[ii].amixdown, 
-						   4, hb_audio_mixdowns[ii].internal_name, 
-						   -1);
-		g_free(str);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    gchar *str;
+    
+    g_debug("mix_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        str = g_strdup_printf("<small>%s</small>",
+            hb_audio_mixdowns[ii].human_readable_name);
+        gtk_list_store_set(store, &iter, 
+                           0, str,
+                           1, TRUE, 
+                           2, hb_audio_mixdowns[ii].short_name, 
+                           3, (gdouble)hb_audio_mixdowns[ii].amixdown, 
+                           4, hb_audio_mixdowns[ii].internal_name, 
+                           -1);
+        g_free(str);
+    }
 }
 
 static void
 srt_codeset_opts_set(GtkBuilder *builder, const gchar *name)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	
-	g_debug("srt_codeset_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < SRT_TABLE_SIZE; ii++)
-	{
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, srt_codeset_table[ii],
-						   1, TRUE, 
-						   2, srt_codeset_table[ii],
-						   3, (gdouble)ii, 
-						   4, srt_codeset_table[ii],
-						   -1);
-	}
-	GtkComboBoxEntry *cbe;
-
-	cbe = GTK_COMBO_BOX_ENTRY(GHB_WIDGET(builder, name));
-	//gtk_combo_box_entry_set_text_column(cbe, 0);
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    
+    g_debug("srt_codeset_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < SRT_TABLE_SIZE; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, srt_codeset_table[ii],
+                           1, TRUE, 
+                           2, srt_codeset_table[ii],
+                           3, (gdouble)ii, 
+                           4, srt_codeset_table[ii],
+                           -1);
+    }
 }
 
 static void
 language_opts_set(GtkBuilder *builder, const gchar *name)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	
-	g_debug("language_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
-	{
-		const gchar *lang;
-
-		if (ghb_language_table[ii].native_name[0] != 0)
-			lang = ghb_language_table[ii].native_name;
-		else
-			lang = ghb_language_table[ii].eng_name;
-		
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, lang,
-						   1, TRUE, 
-						   2, ghb_language_table[ii].iso639_2, 
-						   3, (gdouble)ii, 
-						   4, ghb_language_table[ii].iso639_1, 
-						   -1);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    
+    g_debug("language_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+    {
+        const gchar *lang;
+
+        if (ghb_language_table[ii].native_name[0] != 0)
+            lang = ghb_language_table[ii].native_name;
+        else
+            lang = ghb_language_table[ii].eng_name;
+        
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, lang,
+                           1, TRUE, 
+                           2, ghb_language_table[ii].iso639_2, 
+                           3, (gdouble)ii, 
+                           4, ghb_language_table[ii].iso639_1, 
+                           -1);
+    }
 }
 
 static gchar **titles = NULL;
@@ -1999,116 +1932,212 @@
 void
 title_opts_set(GtkBuilder *builder, const gchar *name)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	hb_list_t  * list = NULL;
-	hb_title_t * title = NULL;
-	gint ii;
-	gint count = 0;
-	
-	g_debug("title_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	if (h_scan != NULL)
-	{
-		list = hb_get_titles( h_scan );
-		count = hb_list_count( list );
-	}
-	if (titles) g_strfreev(titles);
-	if (title_opts.map) g_free(title_opts.map);
-	if (count > 0)
-	{
-		title_opts.count = count;
-		title_opts.map = g_malloc(count*sizeof(options_map_t));
-		titles = g_malloc((count+1) * sizeof(gchar*));
-	}
-	else
-	{
-		title_opts.count = 1;
-		title_opts.map = g_malloc(sizeof(options_map_t));
-		titles = NULL;
-	}
-	if( count <= 0 )
-	{
-		// No titles.  Fill in a default.
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, "No Titles", 
-						   1, TRUE, 
-						   2, "none", 
-						   3, -1.0, 
-						   4, "none", 
-						   -1);
-		title_opts.map[0].option = "No Titles";
-		title_opts.map[0].shortOpt = "none";
-		title_opts.map[0].ivalue = -1;
-		title_opts.map[0].svalue = "none";
-		return;
-	}
-	for (ii = 0; ii < count; ii++)
-	{
-		title = (hb_title_t*)hb_list_item(list, ii);
-		if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
-		{
-			if (title->duration != 0)
-			{
+    GtkTreeIter iter;
+    GtkListStore *store;
+    hb_list_t  * list = NULL;
+    hb_title_t * title = NULL;
+    gint ii;
+    gint count = 0;
+    
+    g_debug("title_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    if (h_scan != NULL)
+    {
+        list = hb_get_titles( h_scan );
+        count = hb_list_count( list );
+    }
+    if (titles) g_strfreev(titles);
+    if (title_opts.map) g_free(title_opts.map);
+    if (count > 0)
+    {
+        title_opts.count = count;
+        title_opts.map = g_malloc(count*sizeof(options_map_t));
+        titles = g_malloc((count+1) * sizeof(gchar*));
+    }
+    else
+    {
+        title_opts.count = 1;
+        title_opts.map = g_malloc(sizeof(options_map_t));
+        titles = NULL;
+    }
+    if( count <= 0 )
+    {
+        // No titles.  Fill in a default.
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, "No Titles", 
+                           1, TRUE, 
+                           2, "none", 
+                           3, -1.0, 
+                           4, "none", 
+                           -1);
+        title_opts.map[0].option = "No Titles";
+        title_opts.map[0].shortOpt = "none";
+        title_opts.map[0].ivalue = -1;
+        title_opts.map[0].svalue = "none";
+        return;
+    }
+    for (ii = 0; ii < count; ii++)
+    {
+        title = (hb_title_t*)hb_list_item(list, ii);
+        if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
+        {
+            if (title->duration != 0)
+            {
                 char *tmp;
-				tmp  = g_strdup_printf ("%d - %02dh%02dm%02ds - %s",
-					title->index, title->hours, title->minutes, title->seconds, 
-					title->name);
+                tmp  = g_strdup_printf ("%d - %02dh%02dm%02ds - %s",
+                    title->index, title->hours, title->minutes, title->seconds, 
+                    title->name);
                 titles[ii] = g_markup_escape_text(tmp, -1);
                 g_free(tmp);
-			}
-			else
-			{
+            }
+            else
+            {
                 char *tmp;
-				tmp  = g_strdup_printf ("%d - %s", 
-										title->index, title->name);
+                tmp  = g_strdup_printf ("%d - %s", 
+                                        title->index, title->name);
                 titles[ii] = g_markup_escape_text(tmp, -1);
                 g_free(tmp);
-			}
-		}
-		else if (title->type == HB_BD_TYPE)
-		{
-			if (title->duration != 0)
-			{
-				titles[ii] = g_strdup_printf("%d (%05d.MPLS) - %02dh%02dm%02ds",
-					title->index, title->playlist, title->hours, 
-					title->minutes, title->seconds);
-			}
-			else
-			{
-				titles[ii] = g_strdup_printf("%d (%05d.MPLS) - Unknown Length",
-					title->index, title->playlist);
-			}
-		}
-		else
-		{
-			if (title->duration != 0)
-			{
-				titles[ii]  = g_strdup_printf("%d - %02dh%02dm%02ds",
-					title->index, title->hours, title->minutes, title->seconds);
-			}
-			else
-			{
-				titles[ii]  = g_strdup_printf("%d - Unknown Length",
-										title->index);
-			}
-		}
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, titles[ii], 
-						   1, TRUE, 
-						   2, titles[ii], 
-						   3, (gdouble)ii, 
-						   4, titles[ii], 
-						   -1);
-		title_opts.map[ii].option = titles[ii];
-		title_opts.map[ii].shortOpt = titles[ii];
-		title_opts.map[ii].ivalue = ii;
-		title_opts.map[ii].svalue = titles[ii];
-	}
-	titles[ii] = NULL;
+            }
+        }
+        else if (title->type == HB_BD_TYPE)
+        {
+            if (title->duration != 0)
+            {
+                titles[ii] = g_strdup_printf("%d (%05d.MPLS) - %02dh%02dm%02ds",
+                    title->index, title->playlist, title->hours, 
+                    title->minutes, title->seconds);
+            }
+            else
+            {
+                titles[ii] = g_strdup_printf("%d (%05d.MPLS) - Unknown Length",
+                    title->index, title->playlist);
+            }
+        }
+        else
+        {
+            if (title->duration != 0)
+            {
+                titles[ii]  = g_strdup_printf("%d - %02dh%02dm%02ds",
+                    title->index, title->hours, title->minutes, title->seconds);
+            }
+            else
+            {
+                titles[ii]  = g_strdup_printf("%d - Unknown Length",
+                                        title->index);
+            }
+        }
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, titles[ii], 
+                           1, TRUE, 
+                           2, titles[ii], 
+                           3, (gdouble)ii, 
+                           4, titles[ii], 
+                           -1);
+        title_opts.map[ii].option = titles[ii];
+        title_opts.map[ii].shortOpt = titles[ii];
+        title_opts.map[ii].ivalue = ii;
+        title_opts.map[ii].svalue = titles[ii];
+    }
+    titles[ii] = NULL;
+}
+
+static void
+x264_tune_opts_set(GtkBuilder *builder, const gchar *name)
+{
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii, count = 0;
+
+    const char * const *tunes;
+    tunes = hb_x264_tunes();
+    while (tunes && tunes[count]) count++;
+
+    g_debug("x264_tune_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+                       0, "None",
+                       1, TRUE, 
+                       2, "none",
+                       3, (gdouble)0, 
+                       4, "none",
+                       -1);
+
+    for (ii = 0; ii < count; ii++)
+    {
+        if (strcmp(tunes[ii], "fastdecode") && strcmp(tunes[ii], "zerolatency"))
+        {
+            gtk_list_store_append(store, &iter);
+            gtk_list_store_set(store, &iter, 
+                               0, tunes[ii],
+                               1, TRUE, 
+                               2, tunes[ii],
+                               3, (gdouble)ii + 1,
+                               4, tunes[ii],
+                               -1);
+        }
+    }
+}
+
+static void
+h264_profile_opts_set(GtkBuilder *builder, const gchar *name)
+{
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii, count = 0;
+
+    const char * const *profiles;
+    profiles = hb_h264_profiles();
+    while (profiles && profiles[count]) count++;
+
+    g_debug("h264_profile_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+
+    for (ii = 0; ii < count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, profiles[ii],
+                           1, TRUE, 
+                           2, profiles[ii],
+                           3, (gdouble)ii,
+                           4, profiles[ii],
+                           -1);
+    }
+}
+
+static void
+h264_level_opts_set(GtkBuilder *builder, const gchar *name)
+{
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii, count = 0;
+
+    const char * const *levels;
+    levels = hb_h264_levels();
+    while (levels && levels[count]) count++;
+
+    g_debug("h264_level_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+
+    for (ii = 0; ii < count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, levels[ii],
+                           1, TRUE, 
+                           2, levels[ii],
+                           3, (gdouble)ii,
+                           4, levels[ii],
+                           -1);
+    }
 }
 
 int
@@ -2120,1275 +2149,1309 @@
 static gboolean
 find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter)
 {
-	gdouble ivalue;
-	gboolean foundit = FALSE;
-	
-	if (gtk_tree_model_get_iter_first (store, iter))
-	{
-		do
-		{
-			gtk_tree_model_get(store, iter, 3, &ivalue, -1);
-			if (value == (gint)ivalue)
-			{
-				foundit = TRUE;
-				break;
-			}
-		} while (gtk_tree_model_iter_next (store, iter));
-	}
-	return foundit;
+    gdouble ivalue;
+    gboolean foundit = FALSE;
+    
+    if (gtk_tree_model_get_iter_first (store, iter))
+    {
+        do
+        {
+            gtk_tree_model_get(store, iter, 3, &ivalue, -1);
+            if (value == (gint)ivalue)
+            {
+                foundit = TRUE;
+                break;
+            }
+        } while (gtk_tree_model_iter_next (store, iter));
+    }
+    return foundit;
 }
 
 void
 audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	hb_list_t  * list = NULL;
-	hb_title_t * title = NULL;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    hb_title_t * title = NULL;
     hb_audio_config_t * audio;
-	gint ii;
-	gint count = 0;
-	gchar *str;
-	
-	g_debug("audio_track_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	if (h_scan != NULL)
-	{
-		list = hb_get_titles( h_scan );
-	    title = (hb_title_t*)hb_list_item( list, titleindex );
-		if (title != NULL)
-		{
-			count = hb_list_count( title->list_audio );
-		}
-	}
-	if (count > 100) count = 100;
-	if (audio_track_opts.map)
-	{
-		for (ii = 0; ii < audio_track_opts.count; ii++)
-		{
-			if (audio_track_opts.map[ii].option)
-				g_free(audio_track_opts.map[ii].option);
-		}
-		g_free(audio_track_opts.map);
-	}
-	if (count > 0)
-	{
-		audio_track_opts.count = count;
-		audio_track_opts.map = g_malloc(count*sizeof(options_map_t));
-	}
-	else
-	{
-		audio_track_opts.count = 1;
-		audio_track_opts.map = g_malloc(sizeof(options_map_t));
-	}
-	if( count <= 0 )
-	{
-		// No audio. set some default
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, "<small>No Audio</small>", 
-						   1, TRUE, 
-						   2, "none", 
-						   3, -1.0, 
-						   4, "none", 
-						   -1);
-		audio_track_opts.map[0].option = g_strdup("No Audio");
-		audio_track_opts.map[0].shortOpt = "none";
-		audio_track_opts.map[0].ivalue = -1;
-		audio_track_opts.map[0].svalue = "none";
-		return;
-	}
-	index_str_init(count-1);
-	for (ii = 0; ii < count; ii++)
-	{
+    gint ii;
+    gint count = 0;
+    gchar *str;
+    
+    g_debug("audio_track_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    title = ghb_get_title_info(titleindex);
+    if (title != NULL)
+    {
+        count = hb_list_count( title->list_audio );
+    }
+    if (count > 100) count = 100;
+    if (audio_track_opts.map)
+    {
+        for (ii = 0; ii < audio_track_opts.count; ii++)
+        {
+            if (audio_track_opts.map[ii].option)
+                g_free(audio_track_opts.map[ii].option);
+        }
+        g_free(audio_track_opts.map);
+    }
+    if (count > 0)
+    {
+        audio_track_opts.count = count;
+        audio_track_opts.map = g_malloc(count*sizeof(options_map_t));
+    }
+    else
+    {
+        audio_track_opts.count = 1;
+        audio_track_opts.map = g_malloc(sizeof(options_map_t));
+    }
+    if( count <= 0 )
+    {
+        // No audio. set some default
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, "<small>No Audio</small>", 
+                           1, TRUE, 
+                           2, "none", 
+                           3, -1.0, 
+                           4, "none", 
+                           -1);
+        audio_track_opts.map[0].option = g_strdup("No Audio");
+        audio_track_opts.map[0].shortOpt = "none";
+        audio_track_opts.map[0].ivalue = -1;
+        audio_track_opts.map[0].svalue = "none";
+        return;
+    }
+    index_str_init(count-1);
+    for (ii = 0; ii < count; ii++)
+    {
         audio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, ii );
-		gtk_list_store_append(store, &iter);
-		char *tmp = g_strdup_printf("%d - %s", ii + 1, audio->lang.description);
-		str = g_strdup_printf("<small>%s</small>", tmp);
-		gtk_list_store_set(store, &iter, 
-						   0, str,
-						   1, TRUE, 
-						   2, index_str[ii], 
-						   3, (gdouble)ii, 
-						   4, index_str[ii], 
-						   -1);
-		g_free(str);
-		audio_track_opts.map[ii].option = g_strdup(tmp);
-		g_free(tmp);
-		audio_track_opts.map[ii].shortOpt = index_str[ii];
-		audio_track_opts.map[ii].ivalue = ii;
-		audio_track_opts.map[ii].svalue = index_str[ii];
-	}
-	GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
-	gtk_combo_box_set_active (combo, 0);
+        gtk_list_store_append(store, &iter);
+        char *tmp = g_strdup_printf("%d - %s", ii + 1, audio->lang.description);
+        str = g_strdup_printf("<small>%s</small>", tmp);
+        gtk_list_store_set(store, &iter, 
+                           0, str,
+                           1, TRUE, 
+                           2, index_str[ii], 
+                           3, (gdouble)ii, 
+                           4, index_str[ii], 
+                           -1);
+        g_free(str);
+        audio_track_opts.map[ii].option = g_strdup(tmp);
+        g_free(tmp);
+        audio_track_opts.map[ii].shortOpt = index_str[ii];
+        audio_track_opts.map[ii].ivalue = ii;
+        audio_track_opts.map[ii].svalue = index_str[ii];
+    }
+    GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+    gtk_combo_box_set_active (combo, 0);
 }
 
 const gchar*
 ghb_audio_track_description(gint track, int titleindex)
 {
-	hb_list_t  * list = NULL;
-	hb_title_t * title = NULL;
+    hb_title_t * title = NULL;
     hb_audio_config_t * audio;
-	gchar * desc = "Unknown";
-	
-	g_debug("ghb_audio_track_description ()\n");
-
-	if (h_scan == NULL) return desc;
-	list = hb_get_titles( h_scan );
-	title = (hb_title_t*)hb_list_item( list, titleindex );
-	if (title == NULL) return desc;
-	if (track >= hb_list_count( title->list_audio )) return desc;
-
-	audio = hb_list_audio_config_item(title->list_audio, track);
-	if (audio == NULL) return desc;
-	return audio->lang.description;
+    gchar * desc = "Unknown";
+    
+    g_debug("ghb_audio_track_description ()\n");
+
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL) return desc;
+    if (track >= hb_list_count( title->list_audio )) return desc;
+
+    audio = hb_list_audio_config_item(title->list_audio, track);
+    if (audio == NULL) return desc;
+    return audio->lang.description;
 }
 
 void
 subtitle_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	hb_list_t  * list = NULL;
-	hb_title_t * title = NULL;
-	hb_subtitle_t * subtitle;
-	gint ii, count = 0;
-	static char ** options = NULL;
-	
-	g_debug("subtitle_track_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	if (h_scan != NULL)
-	{
-		list = hb_get_titles( h_scan );
-	    title = (hb_title_t*)hb_list_item( list, titleindex );
-		if (title != NULL)
-		{
-			count = hb_list_count( title->list_subtitle );
-		}
-	}
-	if (count > 100) count = 100;
-	if (subtitle_opts.map) g_free(subtitle_opts.map);
-	if (count > 0)
-	{
-		subtitle_opts.count = count+1;
-		subtitle_opts.map = g_malloc((count+1)*sizeof(options_map_t));
-	}
-	else
-	{
-		subtitle_opts.count = LANG_TABLE_SIZE+1;
-		subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+1)*sizeof(options_map_t));
-	}
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 
-					   0, "Foreign Audio Search", 
-					   1, TRUE, 
-					   2, "-1", 
-					   3, -1.0, 
-					   4, "auto", 
-					   -1);
-	subtitle_opts.map[0].option = "Foreign Audio Search";
-	subtitle_opts.map[0].shortOpt = "-1";
-	subtitle_opts.map[0].ivalue = -1;
-	subtitle_opts.map[0].svalue = "auto";
-	if (count > 0)
-	{
-		if (options != NULL)
-			g_strfreev(options);
-		options = g_malloc((count+1)*sizeof(gchar*));
-		index_str_init(count-1);
-		for (ii = 0; ii < count; ii++)
-		{
-       		subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
-			options[ii] = g_strdup_printf("%d - %s (%s)", ii+1, 
-				subtitle->lang, 
-				ghb_subtitle_source_name(subtitle->source));
-			subtitle_opts.map[ii+1].option = options[ii];
-			subtitle_opts.map[ii+1].shortOpt = index_str[ii];
-			subtitle_opts.map[ii+1].ivalue = ii;
-			subtitle_opts.map[ii+1].svalue = subtitle->iso639_2;
-			gtk_list_store_append(store, &iter);
-			gtk_list_store_set(store, &iter, 
-					   	0, options[ii], 
-					   	1, TRUE, 
-					   	2, index_str[ii], 
-					   	3, (gdouble)ii, 
-					   	4, subtitle->iso639_2, 
-					   	-1);
-		}
-		options[count] = NULL;
-	}
-	else
-	{
-		index_str_init(LANG_TABLE_SIZE-1);
-		for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
-		{
-			const gchar *lang;
-
-			if (ghb_language_table[ii].native_name[0] != 0)
-				lang = ghb_language_table[ii].native_name;
-			else
-				lang = ghb_language_table[ii].eng_name;
-
-			subtitle_opts.map[ii+1].option = (gchar*)lang;
-			subtitle_opts.map[ii+1].shortOpt = index_str[ii];
-			subtitle_opts.map[ii+1].ivalue = ii;
-			subtitle_opts.map[ii+1].svalue = ghb_language_table[ii].iso639_2;
-			gtk_list_store_append(store, &iter);
-			gtk_list_store_set(store, &iter, 
-					0, lang,
-					1, TRUE, 
-					2, index_str[ii],
-					3, (gdouble)ii, 
-					4, ghb_language_table[ii].iso639_2, 
-					-1);
-		}
-	}
-	GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
-	gtk_combo_box_set_active (combo, 0);
+    GtkTreeIter iter;
+    GtkListStore *store;
+    hb_title_t * title = NULL;
+    hb_subtitle_t * subtitle;
+    gint ii, count = 0;
+    static char ** options = NULL;
+    
+    g_debug("subtitle_track_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    title = ghb_get_title_info(titleindex);
+    if (title != NULL)
+    {
+        count = hb_list_count( title->list_subtitle );
+    }
+    if (count > 100) count = 100;
+    if (subtitle_opts.map) g_free(subtitle_opts.map);
+    if (count > 0)
+    {
+        subtitle_opts.count = count+1;
+        subtitle_opts.map = g_malloc((count+1)*sizeof(options_map_t));
+    }
+    else
+    {
+        subtitle_opts.count = LANG_TABLE_SIZE+1;
+        subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+1)*sizeof(options_map_t));
+    }
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+                       0, "Foreign Audio Search", 
+                       1, TRUE, 
+                       2, "-1", 
+                       3, -1.0, 
+                       4, "auto", 
+                       -1);
+    subtitle_opts.map[0].option = "Foreign Audio Search";
+    subtitle_opts.map[0].shortOpt = "-1";
+    subtitle_opts.map[0].ivalue = -1;
+    subtitle_opts.map[0].svalue = "auto";
+    if (count > 0)
+    {
+        if (options != NULL)
+            g_strfreev(options);
+        options = g_malloc((count+1)*sizeof(gchar*));
+        index_str_init(count-1);
+        for (ii = 0; ii < count; ii++)
+        {
+            subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
+            options[ii] = g_strdup_printf("%d - %s (%s)", ii+1, 
+                subtitle->lang, 
+                hb_subsource_name(subtitle->source));
+            subtitle_opts.map[ii+1].option = options[ii];
+            subtitle_opts.map[ii+1].shortOpt = index_str[ii];
+            subtitle_opts.map[ii+1].ivalue = ii;
+            subtitle_opts.map[ii+1].svalue = subtitle->iso639_2;
+            gtk_list_store_append(store, &iter);
+            gtk_list_store_set(store, &iter, 
+                        0, options[ii], 
+                        1, TRUE, 
+                        2, index_str[ii], 
+                        3, (gdouble)ii, 
+                        4, subtitle->iso639_2, 
+                        -1);
+        }
+        options[count] = NULL;
+    }
+    else
+    {
+        index_str_init(LANG_TABLE_SIZE-1);
+        for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+        {
+            const gchar *lang;
+
+            if (ghb_language_table[ii].native_name[0] != 0)
+                lang = ghb_language_table[ii].native_name;
+            else
+                lang = ghb_language_table[ii].eng_name;
+
+            subtitle_opts.map[ii+1].option = (gchar*)lang;
+            subtitle_opts.map[ii+1].shortOpt = index_str[ii];
+            subtitle_opts.map[ii+1].ivalue = ii;
+            subtitle_opts.map[ii+1].svalue = ghb_language_table[ii].iso639_2;
+            gtk_list_store_append(store, &iter);
+            gtk_list_store_set(store, &iter, 
+                    0, lang,
+                    1, TRUE, 
+                    2, index_str[ii],
+                    3, (gdouble)ii, 
+                    4, ghb_language_table[ii].iso639_2, 
+                    -1);
+        }
+    }
+    GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+    gtk_combo_box_set_active (combo, 0);
 }
 
 gint
 ghb_longest_title()
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	gint ii;
-	gint count = 0;
-	gint titleindex = 0;
-	gint feature;
-	
-	g_debug("ghb_longest_title ()\n");
-	if (h_scan == NULL) return 0;
-	list = hb_get_titles( h_scan );
-	count = hb_list_count( list );
-	if (count < 1) return 0;
-	title = (hb_title_t*)hb_list_item(list, 0);
-	feature = title->job->feature;
-	for (ii = 0; ii < count; ii++)
-	{
-		title = (hb_title_t*)hb_list_item(list, ii);
-		if (title->index == feature)
-		{
-			return ii;
-		}
-	}
-	return titleindex;
+    hb_title_set_t * title_set;
+    hb_title_t * title;
+    gint ii;
+    gint count = 0;
+    gint feature;
+    
+    g_debug("ghb_longest_title ()\n");
+    if (h_scan == NULL) return 0;
+    title_set = hb_get_title_set( h_scan );
+    count = hb_list_count( title_set->list_title );
+    if (count < 1) return 0;
+    title = (hb_title_t*)hb_list_item(title_set->list_title, 0);
+    feature = title_set->feature;
+    for (ii = 0; ii < count; ii++)
+    {
+        title = (hb_title_t*)hb_list_item(title_set->list_title, ii);
+        if (title->index == feature)
+        {
+            return ii;
+        }
+    }
+    return 0;
 }
 
-gchar*
+const gchar*
 ghb_get_source_audio_lang(gint titleindex, gint track)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
+    hb_title_t * title;
     hb_audio_config_t * audio;
-	gchar *lang = NULL;
-	
-	g_debug("ghb_lookup_1st_audio_lang ()\n");
-	if (h_scan == NULL) 
-		return NULL;
-	list = hb_get_titles( h_scan );
-    title = (hb_title_t*)hb_list_item( list, titleindex );
-	if (title == NULL)
-		return NULL;
-	if (hb_list_count( title->list_audio ) <= track)
-		return NULL;
-
-	audio = hb_list_audio_config_item(title->list_audio, track);
-	if (audio == NULL)
-		return NULL;
+    const gchar *lang = "und";
+    
+    g_debug("ghb_lookup_1st_audio_lang ()\n");
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL)
+        return lang;
+    if (hb_list_count( title->list_audio ) <= track)
+        return lang;
+
+    audio = hb_list_audio_config_item(title->list_audio, track);
+    if (audio == NULL)
+        return lang;
 
-	lang = g_strdup(audio->lang.iso639_2);
-	return lang;
+    lang = audio->lang.iso639_2;
+    return lang;
 }
 
 static gboolean*
 get_track_used(gint acodec, GHashTable *track_indices, gint count)
 {
-	gboolean *used;
+    gboolean *used;
+
+    used = g_hash_table_lookup(track_indices, &acodec);
+    if (used == NULL)
+    {
+        gint *key;
 
-	used = g_hash_table_lookup(track_indices, &acodec);
-	if (used == NULL)
-	{
-		gint *key;
-
-		used = g_malloc0(count * sizeof(gboolean));
-		key = g_malloc(sizeof(gint));
-		*key = acodec;
-		g_hash_table_insert(track_indices, key, used);
-	}
-	return used;
+        used = g_malloc0(count * sizeof(gboolean));
+        key = g_malloc(sizeof(gint));
+        *key = acodec;
+        g_hash_table_insert(track_indices, key, used);
+    }
+    return used;
 }
 
 gint
 ghb_find_audio_track(
-	gint titleindex, 
-	const gchar *lang, 
-	gint acodec,
-	gint fallback_acodec,
-	GHashTable *track_indices)
-{
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_audio_config_t * audio;
-	gint ii;
-	gint count = 0;
-	gint track = -1;
-	gint max_chan;
-	gboolean *used = NULL;
-	gboolean *passthru_used;
-	gint try_acodec;
-	gint passthru_acodec;
-	gboolean passthru;
-	gint channels;
-	
-	g_debug("find_audio_track ()\n");
-	if (h_scan == NULL) return -1;
-	list = hb_get_titles( h_scan );
-	title = (hb_title_t*)hb_list_item( list, titleindex );
-	if (title != NULL)
-	{
-		count = hb_list_count( title->list_audio );
-	}
-	if (count > 10) count = 10;
-	// Try to find an item that matches the preferred language and
-	// the passthru codec type
-	max_chan = 0;
-	passthru = (acodec & HB_ACODEC_PASS_FLAG) != 0;
-	if (passthru)
-	{
-		for (ii = 0; ii < count; ii++)
-		{
-			audio = (hb_audio_config_t*)hb_list_audio_config_item( 
-													title->list_audio, ii );
-			passthru_acodec = HB_ACODEC_PASS_MASK & acodec & audio->in.codec;
-			// Is the source track use a passthru capable codec?
-			if (passthru_acodec == 0)
-				continue;
-			used = get_track_used(passthru_acodec, track_indices, count);
-			// Has the track already been used with this codec?
-			if (used[ii])
-				continue;
-
-			channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
-													audio->in.channel_layout);
-			// Find a track that is not visually impaired or dirctor's
-			// commentary, and has the highest channel count.
-			if ((audio->lang.type < 2) &&
-				((strcmp(lang, audio->lang.iso639_2) == 0) ||
-				(strcmp(lang, "und") == 0)))
-			{
-				if (channels > max_chan)
-				{
-					track = ii;
-					max_chan = channels;
-				}
-			}
-		}
-		try_acodec = fallback_acodec;
-	}
-	else
-	{
-		try_acodec = acodec;
-	}
-	if (track > -1)
-	{
-		used[track] = TRUE;
-		return track;
-	}
-	// Try to find an item that matches the preferred language
-	max_chan = 0;
-	used = get_track_used(try_acodec, track_indices, count);
-	for (ii = 0; ii < count; ii++)
-	{
-		// Has the track already been used with this codec?
-		if (used[ii])
-			continue;
-		audio = (hb_audio_config_t*)hb_list_audio_config_item( 
-												title->list_audio, ii );
-		passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
-		if (passthru_acodec && passthru)
-		{
-			passthru_used = get_track_used(passthru_acodec, track_indices, count);
-			// Has the track already been used with this codec for passthru?
-			if (passthru_used[ii])
-				continue;
-		}
-		channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
-												audio->in.channel_layout);
-		// Find a track that is not visually impaired or dirctor's commentary
-		if ((audio->lang.type < 2) &&
-			((strcmp(lang, audio->lang.iso639_2) == 0) ||
-			(strcmp(lang, "und") == 0)))
-		{
-			if (channels > max_chan)
-			{
-				track = ii;
-				max_chan = channels;
-			}
-		}
-	}
-	if (track > -1)
-	{
-		used[track] = TRUE;
-		return track;
-	}
-	// Try to fine an item that does not match the preferred language and
-	// matches the passthru codec type
-	max_chan = 0;
-	if (passthru)
-	{
-		for (ii = 0; ii < count; ii++)
-		{
-			audio = (hb_audio_config_t*)hb_list_audio_config_item( 
-													title->list_audio, ii );
-			passthru_acodec = HB_ACODEC_PASS_MASK & acodec & audio->in.codec;
-			// Is the source track use a passthru capable codec?
-			if (passthru_acodec == 0)
-				continue;
-			used = get_track_used(passthru_acodec, track_indices, count);
-			// Has the track already been used with this codec?
-			if (used[ii])
-				continue;
-
-			channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
-													audio->in.channel_layout);
-			// Find a track that is not visually impaired or dirctor's
-			// commentary, and has the highest channel count.
-			if (audio->lang.type < 2)
-			{
-				if (channels > max_chan)
-				{
-					track = ii;
-					max_chan = channels;
-				}
-			}
-		}
-		try_acodec = fallback_acodec;
-	}
-	else
-	{
-		try_acodec = acodec;
-	}
-	if (track > -1)
-	{
-		used[track] = TRUE;
-		return track;
-	}
-	// Try to fine an item that does not match the preferred language
-	max_chan = 0;
-	used = get_track_used(try_acodec, track_indices, count);
-	for (ii = 0; ii < count; ii++)
-	{
-		// Has the track already been used with this codec?
-		if (used[ii])
-			continue;
-		audio = (hb_audio_config_t*)hb_list_audio_config_item( 
-													title->list_audio, ii );
-		passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
-		channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
-												audio->in.channel_layout);
-		if (passthru_acodec && passthru)
-		{
-			passthru_used = get_track_used(passthru_acodec, track_indices, count);
-			// Has the track already been used with this codec for passthru?
-			if (passthru_used[ii])
-				continue;
-		}
-		// Find a track that is not visually impaired or dirctor's commentary
-		if (audio->lang.type < 2)
-		{
-			if (channels > max_chan)
-			{
-				track = ii;
-				max_chan = channels;
-			}
-		}
-	}
-	if (track > -1)
-	{
-		used[track] = TRUE;
-		return track;
-	}
-	// Last ditch, anything goes
-	for (ii = 0; ii < count; ii++)
-	{
-		audio = (hb_audio_config_t*)hb_list_audio_config_item( 
-												title->list_audio, ii );
-		passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
-		if (passthru_acodec && passthru)
-		{
-			passthru_used = get_track_used(passthru_acodec, track_indices, count);
-			// Has the track already been used with this codec for passthru?
-			if (passthru_used[ii])
-				continue;
-		}
-		// Has the track already been used with this codec?
-		if (!used[ii])
-		{
-			track = ii;
-			break;
-		}
-	}
-	if (track > -1)
-	{
-		used[track] = TRUE;
-	}
-	return track;
+    gint titleindex, 
+    const gchar *lang, 
+    gint acodec,
+    gint fallback_acodec,
+    GHashTable *track_indices)
+{
+    hb_title_t * title;
+    hb_audio_config_t * audio;
+    gint ii;
+    gint count = 0;
+    gint track = -1;
+    gint max_chan;
+    gboolean *used = NULL;
+    gboolean *passthru_used;
+    gint try_acodec;
+    gint passthru_acodec;
+    gboolean passthru;
+    gint channels;
+    
+    g_debug("find_audio_track ()\n");
+    title = ghb_get_title_info( titleindex );
+    if (title != NULL)
+    {
+        count = hb_list_count( title->list_audio );
+    }
+    if (count > 10) count = 10;
+    // Try to find an item that matches the preferred language and
+    // the passthru codec type
+    max_chan = 0;
+    passthru = (acodec & HB_ACODEC_PASS_FLAG) != 0;
+    if (passthru)
+    {
+        for (ii = 0; ii < count; ii++)
+        {
+            audio = (hb_audio_config_t*)hb_list_audio_config_item( 
+                                                    title->list_audio, ii );
+            passthru_acodec = HB_ACODEC_PASS_MASK & acodec & audio->in.codec;
+            // Is the source track use a passthru capable codec?
+            if (passthru_acodec == 0)
+                continue;
+            used = get_track_used(passthru_acodec, track_indices, count);
+            // Has the track already been used with this codec?
+            if (used[ii])
+                continue;
+
+            channels = av_get_channel_layout_nb_channels(
+                                                    audio->in.channel_layout);
+            // Find a track that is not visually impaired or dirctor's
+            // commentary, and has the highest channel count.
+            if ((audio->lang.type < 2) &&
+                ((strcmp(lang, audio->lang.iso639_2) == 0) ||
+                (strcmp(lang, "und") == 0)))
+            {
+                if (channels > max_chan)
+                {
+                    track = ii;
+                    max_chan = channels;
+                }
+            }
+        }
+        try_acodec = fallback_acodec;
+    }
+    else
+    {
+        try_acodec = acodec;
+    }
+    if (track > -1)
+    {
+        used[track] = TRUE;
+        return track;
+    }
+    // Try to find an item that matches the preferred language
+    max_chan = 0;
+    used = get_track_used(try_acodec, track_indices, count);
+    for (ii = 0; ii < count; ii++)
+    {
+        // Has the track already been used with this codec?
+        if (used[ii])
+            continue;
+        audio = (hb_audio_config_t*)hb_list_audio_config_item( 
+                                                title->list_audio, ii );
+        passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
+        if (passthru_acodec && passthru)
+        {
+            passthru_used = get_track_used(passthru_acodec, track_indices, count);
+            // Has the track already been used with this codec for passthru?
+            if (passthru_used[ii])
+                continue;
+        }
+        channels = av_get_channel_layout_nb_channels(
+                                                audio->in.channel_layout);
+        // Find a track that is not visually impaired or dirctor's commentary
+        if ((audio->lang.type < 2) &&
+            ((strcmp(lang, audio->lang.iso639_2) == 0) ||
+            (strcmp(lang, "und") == 0)))
+        {
+            if (channels > max_chan)
+            {
+                track = ii;
+                max_chan = channels;
+            }
+        }
+    }
+    if (track > -1)
+    {
+        used[track] = TRUE;
+        return track;
+    }
+    // Try to fine an item that does not match the preferred language and
+    // matches the passthru codec type
+    max_chan = 0;
+    if (passthru)
+    {
+        for (ii = 0; ii < count; ii++)
+        {
+            audio = (hb_audio_config_t*)hb_list_audio_config_item( 
+                                                    title->list_audio, ii );
+            passthru_acodec = HB_ACODEC_PASS_MASK & acodec & audio->in.codec;
+            // Is the source track use a passthru capable codec?
+            if (passthru_acodec == 0)
+                continue;
+            used = get_track_used(passthru_acodec, track_indices, count);
+            // Has the track already been used with this codec?
+            if (used[ii])
+                continue;
+
+            channels = av_get_channel_layout_nb_channels(
+                                                    audio->in.channel_layout);
+            // Find a track that is not visually impaired or dirctor's
+            // commentary, and has the highest channel count.
+            if (audio->lang.type < 2)
+            {
+                if (channels > max_chan)
+                {
+                    track = ii;
+                    max_chan = channels;
+                }
+            }
+        }
+        try_acodec = fallback_acodec;
+    }
+    else
+    {
+        try_acodec = acodec;
+    }
+    if (track > -1)
+    {
+        used[track] = TRUE;
+        return track;
+    }
+    // Try to fine an item that does not match the preferred language
+    max_chan = 0;
+    used = get_track_used(try_acodec, track_indices, count);
+    for (ii = 0; ii < count; ii++)
+    {
+        // Has the track already been used with this codec?
+        if (used[ii])
+            continue;
+        audio = (hb_audio_config_t*)hb_list_audio_config_item( 
+                                                    title->list_audio, ii );
+        passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
+        channels = av_get_channel_layout_nb_channels(
+                                                audio->in.channel_layout);
+        if (passthru_acodec && passthru)
+        {
+            passthru_used = get_track_used(passthru_acodec, track_indices, count);
+            // Has the track already been used with this codec for passthru?
+            if (passthru_used[ii])
+                continue;
+        }
+        // Find a track that is not visually impaired or dirctor's commentary
+        if (audio->lang.type < 2)
+        {
+            if (channels > max_chan)
+            {
+                track = ii;
+                max_chan = channels;
+            }
+        }
+    }
+    if (track > -1)
+    {
+        used[track] = TRUE;
+        return track;
+    }
+    // Last ditch, anything goes
+    for (ii = 0; ii < count; ii++)
+    {
+        audio = (hb_audio_config_t*)hb_list_audio_config_item( 
+                                                title->list_audio, ii );
+        passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
+        if (passthru_acodec && passthru)
+        {
+            passthru_used = get_track_used(passthru_acodec, track_indices, count);
+            // Has the track already been used with this codec for passthru?
+            if (passthru_used[ii])
+                continue;
+        }
+        // Has the track already been used with this codec?
+        if (!used[ii])
+        {
+            track = ii;
+            break;
+        }
+    }
+    if (track > -1)
+    {
+        used[track] = TRUE;
+    }
+    return track;
 }
 
 gint
 ghb_find_pref_subtitle_track(const gchar *lang)
 {
-	gint ii, count;
-	count = subtitle_opts.count;
-	for (ii = 0; ii < count; ii++)
-	{
-		if (strcmp(lang, subtitle_opts.map[ii].svalue) == 0)
-		{
-			return subtitle_opts.map[ii].ivalue;
-		}
-	}
-	return -2;
+    gint ii, count;
+    count = subtitle_opts.count;
+    for (ii = 0; ii < count; ii++)
+    {
+        if (strcmp(lang, subtitle_opts.map[ii].svalue) == 0)
+        {
+            return subtitle_opts.map[ii].ivalue;
+        }
+    }
+    return -2;
 }
 
 gint
 ghb_find_cc_track(gint titleindex)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_subtitle_t * subtitle;
-	gint count, ii;
-	
-	g_debug("ghb_find_cc_track ()\n");
-	if (h_scan == NULL) return -2;
-	list = hb_get_titles( h_scan );
-	title = (hb_title_t*)hb_list_item( list, titleindex );
-	if (title != NULL)
-	{
-		count = hb_list_count( title->list_subtitle );
-		// Try to find an item that matches the preferred language
-		for (ii = 0; ii < count; ii++)
-		{
-       		subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
-			if (subtitle->source == CC608SUB || subtitle->source == CC708SUB)
-				return ii;
-		}
-	}
-	return -2;
-}
-
-static gboolean
-canForce(int source)
-{
-	return (source == VOBSUB);
-}
-
-static gboolean
-canBurn(int source)
-{
-	return (source == VOBSUB || source == SSASUB);
+    hb_title_t * title;
+    hb_subtitle_t * subtitle;
+    gint count, ii;
+    
+    g_debug("ghb_find_cc_track ()\n");
+    title = ghb_get_title_info( titleindex );
+    if (title != NULL)
+    {
+        count = hb_list_count( title->list_subtitle );
+        // Try to find an item that matches the preferred language
+        for (ii = 0; ii < count; ii++)
+        {
+            subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
+            if (subtitle->source == CC608SUB || subtitle->source == CC708SUB)
+                return ii;
+        }
+    }
+    return -2;
 }
 
 gint
 ghb_find_subtitle_track(
-	gint          titleindex, 
-	const gchar * lang, 
-	gboolean      burn,
-	gboolean      force,
-	gint          source,
-	GHashTable  * track_indices)
-{
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_subtitle_t * subtitle;
-	gint count, ii;
-	gboolean *used;
-	
-	g_debug("find_subtitle_track ()\n");
-	if (strcmp(lang, "auto") == 0)
-		return -1;
-	if (h_scan == NULL) return -1;
-	list = hb_get_titles( h_scan );
-	title = (hb_title_t*)hb_list_item( list, titleindex );
-	if (title != NULL)
-	{
-		count = hb_list_count( title->list_subtitle );
-		used = g_hash_table_lookup(track_indices, lang);
-		if (used == NULL)
-		{
-			used = g_malloc0(count * sizeof(gboolean));
-			g_hash_table_insert(track_indices, g_strdup(lang), used);
-		}
-		// Try to find an item that matches the preferred language and source
-		for (ii = 0; ii < count; ii++)
-		{
-			if (used[ii])
-				continue;
-
-       		subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
-			if (source == subtitle->source &&
-				((strcmp(lang, subtitle->iso639_2) == 0) ||
-				 (strcmp(lang, "und") == 0)))
-			{
-				used[ii] = TRUE;
-				return ii;
-			}
-		}
-		// Try to find an item that matches the preferred language
-		for (ii = 0; ii < count; ii++)
-		{
-			if (used[ii])
-				continue;
-
-       		subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
-			if (((!force || (force && canForce(subtitle->source))) &&
-				 (!burn  || (burn  &&  canBurn(subtitle->source)))) &&
-				((strcmp(lang, subtitle->iso639_2) == 0) ||
-				 (strcmp(lang, "und") == 0)))
-			{
-				used[ii] = TRUE;
-				return ii;
-			}
-		}
-	}
-	return -2;
+    gint          titleindex, 
+    const gchar * lang, 
+    gboolean      burn,
+    gboolean      force,
+    gint          source,
+    GHashTable  * track_indices)
+{
+    hb_title_t * title;
+    hb_subtitle_t * subtitle;
+    gint count, ii;
+    gboolean *used;
+
+    g_debug("find_subtitle_track ()\n");
+    if (strcmp(lang, "auto") == 0)
+        return -1;
+
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL)
+        return -2;
+
+    count = hb_list_count( title->list_subtitle );
+    used = g_hash_table_lookup(track_indices, lang);
+    if (used == NULL)
+    {
+        used = g_malloc0(count * sizeof(gboolean));
+        g_hash_table_insert(track_indices, g_strdup(lang), used);
+    }
+    // Try to find an item that matches the preferred language and source
+    for (ii = 0; ii < count; ii++)
+    {
+        if (used[ii])
+            continue;
+
+        subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
+        if (source == subtitle->source &&
+            ((strcmp(lang, subtitle->iso639_2) == 0) ||
+             (strcmp(lang, "und") == 0)))
+        {
+            used[ii] = TRUE;
+            return ii;
+        }
+    }
+    // Try to find an item that matches the preferred language
+    for (ii = 0; ii < count; ii++)
+    {
+        if (used[ii])
+            continue;
+
+        subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
+        if (((!force || (force && ghb_canForceSub(subtitle->source))) &&
+             (!burn  || (burn  &&  ghb_canBurnSub(subtitle->source)))) &&
+            ((strcmp(lang, subtitle->iso639_2) == 0) ||
+             (strcmp(lang, "und") == 0)))
+        {
+            used[ii] = TRUE;
+            return ii;
+        }
+    }
+    return -2;
 }
 
 static void
 generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	
-	g_debug("generic_opts_set ()\n");
-	if (name == NULL || opts == NULL) return;
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < opts->count; ii++)
-	{
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, opts->map[ii].option, 
-						   1, TRUE, 
-						   2, opts->map[ii].shortOpt, 
-						   3, opts->map[ii].ivalue, 
-						   4, opts->map[ii].svalue, 
-						   -1);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    
+    g_debug("generic_opts_set ()\n");
+    if (name == NULL || opts == NULL) return;
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < opts->count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, opts->map[ii].option, 
+                           1, TRUE, 
+                           2, opts->map[ii].shortOpt, 
+                           3, opts->map[ii].ivalue, 
+                           4, opts->map[ii].svalue, 
+                           -1);
+    }
 }
 
 static void
 small_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	gchar *str;
-	
-	g_debug("small_opts_set ()\n");
-	if (name == NULL || opts == NULL) return;
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < opts->count; ii++)
-	{
-		gtk_list_store_append(store, &iter);
-		str = g_strdup_printf("<small>%s</small>", opts->map[ii].option);
-		gtk_list_store_set(store, &iter, 
-						   0, str,
-						   1, TRUE, 
-						   2, opts->map[ii].shortOpt, 
-						   3, opts->map[ii].ivalue, 
-						   4, opts->map[ii].svalue, 
-						   -1);
-		g_free(str);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    gchar *str;
+    
+    g_debug("small_opts_set ()\n");
+    if (name == NULL || opts == NULL) return;
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < opts->count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        str = g_strdup_printf("<small>%s</small>", opts->map[ii].option);
+        gtk_list_store_set(store, &iter, 
+                           0, str,
+                           1, TRUE, 
+                           2, opts->map[ii].shortOpt, 
+                           3, opts->map[ii].ivalue, 
+                           4, opts->map[ii].svalue, 
+                           -1);
+        g_free(str);
+    }
 }
 
 combo_opts_t*
 find_combo_table(const gchar *name)
 {
-	gint ii;
+    gint ii;
 
-	for (ii = 0; combo_name_map[ii].name != NULL; ii++)
-	{
-		if (strcmp(name, combo_name_map[ii].name) == 0)
-		{
-			return combo_name_map[ii].opts;
-		}
-	}
-	return NULL;
+    for (ii = 0; combo_name_map[ii].name != NULL; ii++)
+    {
+        if (strcmp(name, combo_name_map[ii].name) == 0)
+        {
+            return combo_name_map[ii].opts;
+        }
+    }
+    return NULL;
 }
 
 gint
 ghb_lookup_combo_int(const gchar *name, const GValue *gval)
 {
-	if (gval == NULL)
-		return 0;
-	if (strcmp(name, "AudioBitrate") == 0)
-		return lookup_audio_bitrate_int(gval);
-	else if (strcmp(name, "AudioSamplerate") == 0)
-		return lookup_audio_rate_int(gval);
-	else if (strcmp(name, "VideoFramerate") == 0)
-		return lookup_video_rate_int(gval);
-	else if (strcmp(name, "AudioMixdown") == 0)
-		return lookup_mix_int(gval);
-	else if (strcmp(name, "SrtLanguage") == 0)
-		return lookup_audio_lang_int(gval);
-	else if (strcmp(name, "PreferredLanguage") == 0)
-		return lookup_audio_lang_int(gval);
-	else if (strcmp(name, "VideoEncoder") == 0)
-		return lookup_hb_encoder_int(gval, hb_video_encoders, hb_video_encoders_count);
-	else if (strcmp(name, "AudioEncoder") == 0)
-		return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderFallback") == 0)
-		return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderActual") == 0)
-		return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else
-	{
-		return lookup_generic_int(find_combo_table(name), gval);
-	}
-	g_warning("ghb_lookup_combo_int() couldn't find %s", name);
-	return 0;
+    if (gval == NULL)
+        return 0;
+    if (strcmp(name, "AudioBitrate") == 0)
+        return lookup_audio_bitrate_int(gval);
+    else if (strcmp(name, "AudioSamplerate") == 0)
+        return lookup_audio_rate_int(gval);
+    else if (strcmp(name, "VideoFramerate") == 0)
+        return lookup_video_rate_int(gval);
+    else if (strcmp(name, "AudioMixdown") == 0)
+        return lookup_mix_int(gval);
+    else if (strcmp(name, "SrtLanguage") == 0)
+        return lookup_audio_lang_int(gval);
+    else if (strcmp(name, "PreferredLanguage") == 0)
+        return lookup_audio_lang_int(gval);
+    else if (strcmp(name, "VideoEncoder") == 0)
+        return lookup_hb_encoder_int(gval, hb_video_encoders, hb_video_encoders_count);
+    else if (strcmp(name, "AudioEncoder") == 0)
+        return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderFallback") == 0)
+        return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderActual") == 0)
+        return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else
+    {
+        return lookup_generic_int(find_combo_table(name), gval);
+    }
+    g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+    return 0;
 }
 
 gdouble
 ghb_lookup_combo_double(const gchar *name, const GValue *gval)
 {
-	if (gval == NULL)
-		return 0;
-	if (strcmp(name, "AudioBitrate") == 0)
-		return lookup_audio_bitrate_int(gval);
-	else if (strcmp(name, "AudioSamplerate") == 0)
-		return lookup_audio_rate_int(gval);
-	else if (strcmp(name, "VideoFramerate") == 0)
-		return lookup_video_rate_int(gval);
-	else if (strcmp(name, "AudioMixdown") == 0)
-		return lookup_mix_int(gval);
-	else if (strcmp(name, "SrtLanguage") == 0)
-		return lookup_audio_lang_int(gval);
-	else if (strcmp(name, "PreferredLanguage") == 0)
-		return lookup_audio_lang_int(gval);
-	else if (strcmp(name, "VideoEncoder") == 0)
-		return lookup_hb_encoder_int(gval, hb_video_encoders, hb_video_encoders_count);
-	else if (strcmp(name, "AudioEncoder") == 0)
-		return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderFallback") == 0)
-		return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderActual") == 0)
-		return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else
-	{
-		return lookup_generic_double(find_combo_table(name), gval);
-	}
-	g_warning("ghb_lookup_combo_double() couldn't find %s", name);
-	return 0;
+    if (gval == NULL)
+        return 0;
+    if (strcmp(name, "AudioBitrate") == 0)
+        return lookup_audio_bitrate_int(gval);
+    else if (strcmp(name, "AudioSamplerate") == 0)
+        return lookup_audio_rate_int(gval);
+    else if (strcmp(name, "VideoFramerate") == 0)
+        return lookup_video_rate_int(gval);
+    else if (strcmp(name, "AudioMixdown") == 0)
+        return lookup_mix_int(gval);
+    else if (strcmp(name, "SrtLanguage") == 0)
+        return lookup_audio_lang_int(gval);
+    else if (strcmp(name, "PreferredLanguage") == 0)
+        return lookup_audio_lang_int(gval);
+    else if (strcmp(name, "VideoEncoder") == 0)
+        return lookup_hb_encoder_int(gval, hb_video_encoders, hb_video_encoders_count);
+    else if (strcmp(name, "AudioEncoder") == 0)
+        return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderFallback") == 0)
+        return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderActual") == 0)
+        return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else
+    {
+        return lookup_generic_double(find_combo_table(name), gval);
+    }
+    g_warning("ghb_lookup_combo_double() couldn't find %s", name);
+    return 0;
 }
 
 const gchar*
 ghb_lookup_combo_option(const gchar *name, const GValue *gval)
 {
-	if (gval == NULL)
-		return NULL;
-	if (strcmp(name, "AudioBitrate") == 0)
-		return lookup_audio_bitrate_option(gval);
-	else if (strcmp(name, "AudioSamplerate") == 0)
-		return lookup_audio_rate_option(gval);
-	else if (strcmp(name, "VideoFramerate") == 0)
-		return lookup_video_rate_option(gval);
-	else if (strcmp(name, "AudioMixdown") == 0)
-		return lookup_mix_option(gval);
-	else if (strcmp(name, "SrtLanguage") == 0)
-		return lookup_audio_lang_option(gval);
-	else if (strcmp(name, "PreferredLanguage") == 0)
-		return lookup_audio_lang_option(gval);
-	else if (strcmp(name, "VideoEncoder") == 0)
-		return lookup_hb_encoder_option(gval, hb_video_encoders, hb_video_encoders_count);
-	else if (strcmp(name, "AudioEncoder") == 0)
-		return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderFallback") == 0)
-		return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderActual") == 0)
-		return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else
-	{
-		return lookup_generic_option(find_combo_table(name), gval);
-	}
-	g_warning("ghb_lookup_combo_int() couldn't find %s", name);
-	return NULL;
+    if (gval == NULL)
+        return NULL;
+    if (strcmp(name, "AudioBitrate") == 0)
+        return lookup_audio_bitrate_option(gval);
+    else if (strcmp(name, "AudioSamplerate") == 0)
+        return lookup_audio_rate_option(gval);
+    else if (strcmp(name, "VideoFramerate") == 0)
+        return lookup_video_rate_option(gval);
+    else if (strcmp(name, "AudioMixdown") == 0)
+        return lookup_mix_option(gval);
+    else if (strcmp(name, "SrtLanguage") == 0)
+        return lookup_audio_lang_option(gval);
+    else if (strcmp(name, "PreferredLanguage") == 0)
+        return lookup_audio_lang_option(gval);
+    else if (strcmp(name, "VideoEncoder") == 0)
+        return lookup_hb_encoder_option(gval, hb_video_encoders, hb_video_encoders_count);
+    else if (strcmp(name, "AudioEncoder") == 0)
+        return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderFallback") == 0)
+        return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderActual") == 0)
+        return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else
+    {
+        return lookup_generic_option(find_combo_table(name), gval);
+    }
+    g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+    return NULL;
 }
 
 const gchar*
 ghb_lookup_combo_string(const gchar *name, const GValue *gval)
 {
-	if (gval == NULL)
-		return NULL;
-	if (strcmp(name, "AudioBitrate") == 0)
-		return lookup_audio_bitrate_option(gval);
-	else if (strcmp(name, "AudioSamplerate") == 0)
-		return lookup_audio_rate_string(gval);
-	else if (strcmp(name, "VideoFramerate") == 0)
-		return lookup_video_rate_option(gval);
-	else if (strcmp(name, "AudioMixdown") == 0)
-		return lookup_mix_string(gval);
-	else if (strcmp(name, "SrtLanguage") == 0)
-		return lookup_audio_lang_option(gval);
-	else if (strcmp(name, "PreferredLanguage") == 0)
-		return lookup_audio_lang_option(gval);
-	else if (strcmp(name, "VideoEncoder") == 0)
-		return lookup_hb_encoder_string(gval, hb_video_encoders, hb_video_encoders_count);
-	else if (strcmp(name, "AudioEncoder") == 0)
-		return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderFallback") == 0)
-		return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else if (strcmp(name, "AudioEncoderActual") == 0)
-		return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
-	else
-	{
-		return lookup_generic_string(find_combo_table(name), gval);
-	}
-	g_warning("ghb_lookup_combo_int() couldn't find %s", name);
-	return NULL;
+    if (gval == NULL)
+        return NULL;
+    if (strcmp(name, "AudioBitrate") == 0)
+        return lookup_audio_bitrate_option(gval);
+    else if (strcmp(name, "AudioSamplerate") == 0)
+        return lookup_audio_rate_string(gval);
+    else if (strcmp(name, "VideoFramerate") == 0)
+        return lookup_video_rate_option(gval);
+    else if (strcmp(name, "AudioMixdown") == 0)
+        return lookup_mix_string(gval);
+    else if (strcmp(name, "SrtLanguage") == 0)
+        return lookup_audio_lang_option(gval);
+    else if (strcmp(name, "PreferredLanguage") == 0)
+        return lookup_audio_lang_option(gval);
+    else if (strcmp(name, "VideoEncoder") == 0)
+        return lookup_hb_encoder_string(gval, hb_video_encoders, hb_video_encoders_count);
+    else if (strcmp(name, "AudioEncoder") == 0)
+        return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderFallback") == 0)
+        return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else if (strcmp(name, "AudioEncoderActual") == 0)
+        return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
+    else
+    {
+        return lookup_generic_string(find_combo_table(name), gval);
+    }
+    g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+    return NULL;
 }
 
 void
 ghb_update_ui_combo_box(
-	signal_user_data_t *ud, 
-	const gchar *name, 
-	gint user_data, 
-	gboolean all)
-{
-	GtkComboBox *combo = NULL;
-	gint signal_id;
-	gint handler_id = 0;
-
-	if (name != NULL)
-	{		
-		g_debug("ghb_update_ui_combo_box() %s\n", name);
-		// Clearing a combo box causes a rash of "changed" events, even when
-		// the active item is -1 (inactive).  To control things, I'm disabling
-		// the event till things are settled down.
-		combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
-		signal_id = g_signal_lookup("changed", GTK_TYPE_COMBO_BOX);
-		if (signal_id > 0)
-		{
-			// Valid signal id found.  This should always succeed.
-			handler_id = g_signal_handler_find ((gpointer)combo, G_SIGNAL_MATCH_ID, 
-												signal_id, 0, 0, 0, 0);
-			if (handler_id > 0)
-			{
-				// This should also always succeed
-				g_signal_handler_block ((gpointer)combo, handler_id);
-			}
-		}
-	}	
-	if (all)
-	{
-		audio_bitrate_opts_set(ud->builder, "AudioBitrate");
-		audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
-		video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
-		mix_opts_set(ud->builder, "AudioMixdown");
-		hb_encoder_opts_set(ud->builder, "VideoEncoder", hb_video_encoders, hb_video_encoders_count);
-		hb_encoder_opts_set(ud->builder, "AudioEncoder", hb_audio_encoders, hb_audio_encoders_count);
-		acodec_fallback_opts_set(ud->builder, "AudioEncoderFallback");
-		language_opts_set(ud->builder, "SrtLanguage");
-		language_opts_set(ud->builder, "PreferredLanguage");
-		srt_codeset_opts_set(ud->builder, "SrtCodeset");
-		title_opts_set(ud->builder, "title");
-		audio_track_opts_set(ud->builder, "AudioTrack", user_data);
-		subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
-		generic_opts_set(ud->builder, "VideoQualityGranularity", &vqual_granularity_opts);
-		generic_opts_set(ud->builder, "PtoPType", &point_to_point_opts);
-		generic_opts_set(ud->builder, "WhenComplete", &when_complete_opts);
-		generic_opts_set(ud->builder, "PicturePAR", &par_opts);
-		generic_opts_set(ud->builder, "PictureModulus", &alignment_opts);
-		generic_opts_set(ud->builder, "LoggingLevel", &logging_opts);
-		generic_opts_set(ud->builder, "LogLongevity", &log_longevity_opts);
-		generic_opts_set(ud->builder, "check_updates", &appcast_update_opts);
-		generic_opts_set(ud->builder, "FileFormat", &container_opts);
-		generic_opts_set(ud->builder, "PictureDeinterlace", &deint_opts);
-		generic_opts_set(ud->builder, "PictureDetelecine", &detel_opts);
-		generic_opts_set(ud->builder, "PictureDecomb", &decomb_opts);
-		generic_opts_set(ud->builder, "PictureDenoise", &denoise_opts);
-		small_opts_set(ud->builder, "x264_direct", &direct_opts);
-		small_opts_set(ud->builder, "x264_b_adapt", &badapt_opts);
-		small_opts_set(ud->builder, "x264_bpyramid", &bpyramid_opts);
-		small_opts_set(ud->builder, "x264_weighted_pframes", &weightp_opts);
-		small_opts_set(ud->builder, "x264_me", &me_opts);
-		small_opts_set(ud->builder, "x264_subme", &subme_opts);
-		small_opts_set(ud->builder, "x264_analyse", &analyse_opts);
-		small_opts_set(ud->builder, "x264_trellis", &trellis_opts);
-	}
-	else
-	{
-		if (strcmp(name, "AudioBitrate") == 0)
-			audio_bitrate_opts_set(ud->builder, "AudioBitrate");
-		else if (strcmp(name, "AudioSamplerate") == 0)
-			audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
-		else if (strcmp(name, "VideoFramerate") == 0)
-			video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
-		else if (strcmp(name, "AudioMixdown") == 0)
-			mix_opts_set(ud->builder, "AudioMixdown");
-		else if (strcmp(name, "VideoEncoder") == 0)
-			hb_encoder_opts_set(ud->builder, "VideoEncoder", hb_video_encoders, hb_video_encoders_count);
-		else if (strcmp(name, "AudioEncoder") == 0)
-			hb_encoder_opts_set(ud->builder, "AudioEncoder", hb_audio_encoders, hb_audio_encoders_count);
-		else if (strcmp(name, "AudioEncoderFallback") == 0)
-			acodec_fallback_opts_set(ud->builder, "AudioEncoderFallback");
-		else if (strcmp(name, "SrtLanguage") == 0)
-			language_opts_set(ud->builder, "SrtLanguage");
-		else if (strcmp(name, "PreferredLanguage") == 0)
-			language_opts_set(ud->builder, "PreferredLanguage");
-		else if (strcmp(name, "SrtCodeset") == 0)
-			srt_codeset_opts_set(ud->builder, "SrtCodeset");
-		else if (strcmp(name, "title") == 0)
-			title_opts_set(ud->builder, "title");
-		else if (strcmp(name, "SubtitleTrack") == 0)
-			subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
-		else if (strcmp(name, "AudioTrack") == 0)
-			audio_track_opts_set(ud->builder, "AudioTrack", user_data);
-		else
-			generic_opts_set(ud->builder, name, find_combo_table(name));
-	}
-	if (handler_id > 0)
-	{
-		g_signal_handler_unblock ((gpointer)combo, handler_id);
-	}
+    signal_user_data_t *ud, 
+    const gchar *name, 
+    gint user_data, 
+    gboolean all)
+{
+    GtkComboBox *combo = NULL;
+    gint signal_id;
+    gint handler_id = 0;
+
+    if (name != NULL)
+    {       
+        g_debug("ghb_update_ui_combo_box() %s\n", name);
+        // Clearing a combo box causes a rash of "changed" events, even when
+        // the active item is -1 (inactive).  To control things, I'm disabling
+        // the event till things are settled down.
+        combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
+        signal_id = g_signal_lookup("changed", GTK_TYPE_COMBO_BOX);
+        if (signal_id > 0)
+        {
+            // Valid signal id found.  This should always succeed.
+            handler_id = g_signal_handler_find ((gpointer)combo, G_SIGNAL_MATCH_ID, 
+                                                signal_id, 0, 0, 0, 0);
+            if (handler_id > 0)
+            {
+                // This should also always succeed
+                g_signal_handler_block ((gpointer)combo, handler_id);
+            }
+        }
+    }   
+    if (all)
+    {
+        audio_bitrate_opts_set(ud->builder, "AudioBitrate");
+        audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+        video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+        mix_opts_set(ud->builder, "AudioMixdown");
+        hb_encoder_opts_set(ud->builder, "VideoEncoder", hb_video_encoders, hb_video_encoders_count);
+        hb_encoder_opts_set(ud->builder, "AudioEncoder", hb_audio_encoders, hb_audio_encoders_count);
+        acodec_fallback_opts_set(ud->builder, "AudioEncoderFallback");
+        language_opts_set(ud->builder, "SrtLanguage");
+        language_opts_set(ud->builder, "PreferredLanguage");
+        srt_codeset_opts_set(ud->builder, "SrtCodeset");
+        title_opts_set(ud->builder, "title");
+        audio_track_opts_set(ud->builder, "AudioTrack", user_data);
+        subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
+        generic_opts_set(ud->builder, "VideoQualityGranularity", &vqual_granularity_opts);
+        generic_opts_set(ud->builder, "PtoPType", &point_to_point_opts);
+        generic_opts_set(ud->builder, "WhenComplete", &when_complete_opts);
+        generic_opts_set(ud->builder, "PicturePAR", &par_opts);
+        generic_opts_set(ud->builder, "PictureModulus", &alignment_opts);
+        generic_opts_set(ud->builder, "LoggingLevel", &logging_opts);
+        generic_opts_set(ud->builder, "LogLongevity", &log_longevity_opts);
+        generic_opts_set(ud->builder, "check_updates", &appcast_update_opts);
+        generic_opts_set(ud->builder, "FileFormat", &container_opts);
+        generic_opts_set(ud->builder, "PictureDeinterlace", &deint_opts);
+        generic_opts_set(ud->builder, "PictureDetelecine", &detel_opts);
+        generic_opts_set(ud->builder, "PictureDecomb", &decomb_opts);
+        generic_opts_set(ud->builder, "PictureDenoise", &denoise_opts);
+        small_opts_set(ud->builder, "x264_direct", &direct_opts);
+        small_opts_set(ud->builder, "x264_b_adapt", &badapt_opts);
+        small_opts_set(ud->builder, "x264_bpyramid", &bpyramid_opts);
+        small_opts_set(ud->builder, "x264_weighted_pframes", &weightp_opts);
+        small_opts_set(ud->builder, "x264_me", &me_opts);
+        small_opts_set(ud->builder, "x264_subme", &subme_opts);
+        small_opts_set(ud->builder, "x264_analyse", &analyse_opts);
+        small_opts_set(ud->builder, "x264_trellis", &trellis_opts);
+        x264_tune_opts_set(ud->builder, "x264Tune");
+        h264_profile_opts_set(ud->builder, "h264Profile");
+        h264_level_opts_set(ud->builder, "h264Level");
+    }
+    else
+    {
+        if (strcmp(name, "AudioBitrate") == 0)
+            audio_bitrate_opts_set(ud->builder, "AudioBitrate");
+        else if (strcmp(name, "AudioSamplerate") == 0)
+            audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+        else if (strcmp(name, "VideoFramerate") == 0)
+            video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+        else if (strcmp(name, "AudioMixdown") == 0)
+            mix_opts_set(ud->builder, "AudioMixdown");
+        else if (strcmp(name, "VideoEncoder") == 0)
+            hb_encoder_opts_set(ud->builder, "VideoEncoder", hb_video_encoders, hb_video_encoders_count);
+        else if (strcmp(name, "AudioEncoder") == 0)
+            hb_encoder_opts_set(ud->builder, "AudioEncoder", hb_audio_encoders, hb_audio_encoders_count);
+        else if (strcmp(name, "AudioEncoderFallback") == 0)
+            acodec_fallback_opts_set(ud->builder, "AudioEncoderFallback");
+        else if (strcmp(name, "SrtLanguage") == 0)
+            language_opts_set(ud->builder, "SrtLanguage");
+        else if (strcmp(name, "PreferredLanguage") == 0)
+            language_opts_set(ud->builder, "PreferredLanguage");
+        else if (strcmp(name, "SrtCodeset") == 0)
+            srt_codeset_opts_set(ud->builder, "SrtCodeset");
+        else if (strcmp(name, "title") == 0)
+            title_opts_set(ud->builder, "title");
+        else if (strcmp(name, "SubtitleTrack") == 0)
+            subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
+        else if (strcmp(name, "AudioTrack") == 0)
+            audio_track_opts_set(ud->builder, "AudioTrack", user_data);
+        else if (strcmp(name, "x264Tune") == 0)
+            x264_tune_opts_set(ud->builder, "x264Tune");
+        else if (strcmp(name, "h264Profile") == 0)
+            h264_profile_opts_set(ud->builder, "h264Profile");
+        else if (strcmp(name, "h264Level") == 0)
+            h264_level_opts_set(ud->builder, "h264Level");
+        else
+            generic_opts_set(ud->builder, name, find_combo_table(name));
+    }
+    if (handler_id > 0)
+    {
+        g_signal_handler_unblock ((gpointer)combo, handler_id);
+    }
 }
-	
+    
 static void
 init_ui_combo_boxes(GtkBuilder *builder)
 {
-	gint ii;
+    gint ii;
 
-	init_combo_box(builder, "AudioBitrate");
-	init_combo_box(builder, "AudioSamplerate");
-	init_combo_box(builder, "VideoFramerate");
-	init_combo_box(builder, "AudioMixdown");
-	init_combo_box(builder, "SrtLanguage");
-	init_combo_box(builder, "PreferredLanguage");
-	init_combo_box(builder, "SrtCodeset");
-	init_combo_box(builder, "title");
-	init_combo_box(builder, "AudioTrack");
-	init_combo_box(builder, "VideoEncoder");
-	init_combo_box(builder, "AudioEncoder");
-	init_combo_box(builder, "AudioEncoderFallback");
-	for (ii = 0; combo_name_map[ii].name != NULL; ii++)
-	{
-		init_combo_box(builder, combo_name_map[ii].name);
-	}
-}
-	
-static const char * turbo_lavc_opts = "";
-
-static const char * turbo_x264_opts = 
-	"ref=1:subme=2:me=dia:analyse=none:trellis=0:"
-	"no-fast-pskip=0:8x8dct=0";
+    init_combo_box(builder, "AudioBitrate");
+    init_combo_box(builder, "AudioSamplerate");
+    init_combo_box(builder, "VideoFramerate");
+    init_combo_box(builder, "AudioMixdown");
+    init_combo_box(builder, "SrtLanguage");
+    init_combo_box(builder, "PreferredLanguage");
+    init_combo_box(builder, "SrtCodeset");
+    init_combo_box(builder, "title");
+    init_combo_box(builder, "AudioTrack");
+    init_combo_box(builder, "VideoEncoder");
+    init_combo_box(builder, "AudioEncoder");
+    init_combo_box(builder, "AudioEncoderFallback");
+    init_combo_box(builder, "x264Tune");
+    init_combo_box(builder, "h264Profile");
+    init_combo_box(builder, "h264Level");
+    for (ii = 0; combo_name_map[ii].name != NULL; ii++)
+    {
+        init_combo_box(builder, combo_name_map[ii].name);
+    }
+}
 
 // Construct the advanced options string
 // The result is allocated, so someone must free it at some point.
 gchar*
 ghb_build_advanced_opts_string(GValue *settings)
 {
-	gchar *result;
+    gchar *result;
+
+    gint vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
+
+    switch (vcodec)
+    {
+        case HB_VCODEC_X264:
+        {
+            gchar *opts = ghb_settings_get_string(settings, "x264Option");
+            if (opts != NULL)
+            {
+                result = opts;
+            }
+            else
+            {
+                result = g_strdup("");
+            }
+        } break;
+
+        case HB_VCODEC_FFMPEG_MPEG2:
+        case HB_VCODEC_FFMPEG_MPEG4:
+        {
+            gchar *opts = ghb_settings_get_string(settings, "lavcOption");
+            if (opts != NULL)
+            {
+                result = opts;
+            }
+            else
+            {
+                result = g_strdup("");
+            }
+        } break;
+
+        case HB_VCODEC_THEORA:
+        default:
+        {
+            result = g_strdup("");
+        } break;
+    }
+    return result;
+}
+
+void ghb_set_video_encoder_opts(hb_job_t *job, GValue *js)
+{
+    gint vcodec = ghb_settings_combo_int(js, "VideoEncoder");
+
+    switch (vcodec)
+    {
+        case HB_VCODEC_X264:
+        {
+            if (ghb_settings_get_boolean(js, "x264UseAdvancedOptions"))
+            {
+                char *opts = ghb_settings_get_string(js, "x264Option");
+                hb_job_set_advanced_opts(job, opts);
+                g_free(opts);
+            }
+            else
+            {
+                GString *str = g_string_new("");
+                char *preset = ghb_settings_get_string(js, "x264Preset");
+                char *tune = ghb_settings_get_string(js, "x264Tune");
+                char *profile = ghb_settings_get_string(js, "h264Profile");
+                char *level = ghb_settings_get_string(js, "h264Level");
+                char *opts = ghb_settings_get_string(js, "x264OptionExtra");
+                char *tunes;
+
+                g_string_append_printf(str, "%s", tune);
+                if (ghb_settings_get_boolean(js, "x264FastDecode"))
+                {
+                    g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "fastdecode");
+                }
+                if (ghb_settings_get_boolean(js, "x264ZeroLatency"))
+                {
+                    g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "zerolatency");
+                }
+                tunes = g_string_free(str, FALSE);
+
+                hb_job_set_x264_preset(job, preset);
+
+                if (tunes != NULL && strcasecmp(tune, "none"))
+                    hb_job_set_x264_tune(job, tunes);
+
+                if (profile != NULL && strcasecmp(profile, "auto"))
+                    hb_job_set_h264_profile(job, profile);
+
+                if (level != NULL && strcasecmp(level, "auto"))
+                    hb_job_set_h264_level(job, level);
+
+                hb_job_set_advanced_opts(job, opts);
+
+                g_free(preset);
+                g_free(tune);
+                g_free(profile);
+                g_free(level);
+                g_free(opts);
+                g_free(tunes);
+            }
+        } break;
 
-	gint vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
+        case HB_VCODEC_FFMPEG_MPEG2:
+        case HB_VCODEC_FFMPEG_MPEG4:
+        {
+            gchar *opts = ghb_settings_get_string(js, "lavcOption");
+            if (opts != NULL && opts[0])
+            {
+                hb_job_set_advanced_opts(job, opts);
+            }
+            g_free(opts);
+        } break;
 
-	switch (vcodec)
-	{
-		case HB_VCODEC_X264:
-		{
-			gchar *opts = ghb_settings_get_string(settings, "x264Option");
-			if (opts != NULL)
-			{
-				result = opts;
-			}
-			else
-			{
-				result = g_strdup("");
-			}
-		} break;
-
-		case HB_VCODEC_FFMPEG_MPEG2:
-		case HB_VCODEC_FFMPEG_MPEG4:
-		{
-			gchar *opts = ghb_settings_get_string(settings, "lavcOption");
-			if (opts != NULL)
-			{
-				result = opts;
-			}
-			else
-			{
-				result = g_strdup("");
-			}
-		} break;
-
-		case HB_VCODEC_THEORA:
-		default:
-		{
-			result = g_strdup("");
-		} break;
-	}
-	return result;
+        case HB_VCODEC_THEORA:
+        default:
+        {
+        } break;
+    }
 }
 
 void
 ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
+    hb_title_t * title;
     hb_chapter_t * chapter;
-	gint count, c;
-	gint64 duration;
-	
-	*hh = *mm = *ss = 0;
-	if (h_scan == NULL) return;
-	list = hb_get_titles( h_scan );
-    title = (hb_title_t*)hb_list_item( list, tt );
-	if (title == NULL) return;
-
-	*hh = title->hours;
-	*mm = title->minutes;
-	*ss = title->seconds;
-
-	count = hb_list_count(title->list_chapter);
-	if (sc > count) sc = count;
-	if (ec > count) ec = count;
-
-	if (sc == 1 && ec == count)
-		return;
-
-	duration = 0;
-	for (c = sc; c <= ec; c++)
-	{
-		chapter = hb_list_item(title->list_chapter, c-1);
-		duration += chapter->duration;
-	}
-
-	*hh =   duration / 90000 / 3600;
-	*mm = ((duration / 90000) % 3600) / 60;
-	*ss =  (duration / 90000) % 60;
+    gint count, c;
+    gint64 duration;
+    
+    *hh = *mm = *ss = 0;
+    title = ghb_get_title_info( tt );
+    if (title == NULL) return;
+
+    *hh = title->hours;
+    *mm = title->minutes;
+    *ss = title->seconds;
+
+    count = hb_list_count(title->list_chapter);
+    if (sc > count) sc = count;
+    if (ec > count) ec = count;
+
+    if (sc == 1 && ec == count)
+        return;
+
+    duration = 0;
+    for (c = sc; c <= ec; c++)
+    {
+        chapter = hb_list_item(title->list_chapter, c-1);
+        duration += chapter->duration;
+    }
+
+    *hh =   duration / 90000 / 3600;
+    *mm = ((duration / 90000) % 3600) / 60;
+    *ss =  (duration / 90000) % 60;
 }
 
 void
 ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
+    hb_title_t * title;
     hb_chapter_t * chapter;
-	gint count;
-	
-	g_debug("ghb_get_chapter_duration (title = %d)\n", ti);
-	*hh = *mm = *ss = 0;
-	if (h_scan == NULL) return;
-	list = hb_get_titles( h_scan );
-    title = (hb_title_t*)hb_list_item( list, ti );
-	if (title == NULL) return;
-	count = hb_list_count( title->list_chapter );
-	if (ii >= count) return;
-	chapter = hb_list_item(title->list_chapter, ii);
-	if (chapter == NULL) return;
-	*hh = chapter->hours;
-	*mm = chapter->minutes;
-	*ss = chapter->seconds;
+    gint count;
+    
+    g_debug("ghb_get_chapter_duration (title = %d)\n", ti);
+    *hh = *mm = *ss = 0;
+    title = ghb_get_title_info( ti );
+    if (title == NULL) return;
+    count = hb_list_count( title->list_chapter );
+    if (ii >= count) return;
+    chapter = hb_list_item(title->list_chapter, ii);
+    if (chapter == NULL) return;
+    *hh = chapter->hours;
+    *mm = chapter->minutes;
+    *ss = chapter->seconds;
 }
 
 GValue*
 ghb_get_chapters(gint titleindex)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
+    hb_title_t * title;
     hb_chapter_t * chapter;
-	gint count, ii;
-	GValue *chapters = NULL;
-	
-	g_debug("ghb_get_chapters (title = %d)\n", titleindex);
-	chapters = ghb_array_value_new(0);
-
-	if (h_scan == NULL) return chapters;
-	list = hb_get_titles( h_scan );
-    title = (hb_title_t*)hb_list_item( list, titleindex );
-	if (title == NULL) return chapters;
-	count = hb_list_count( title->list_chapter );
-	for (ii = 0; ii < count; ii++)
-	{
-		chapter = hb_list_item(title->list_chapter, ii);
-		if (chapter == NULL) break;
-		if (chapter->title == NULL || chapter->title[0] == 0)
-		{
-			gchar *str;
-			str = g_strdup_printf ("Chapter %2d", ii+1);
-			ghb_array_append(chapters, ghb_string_value_new(str));
-			g_free(str);
-		}
-		else 
-		{
-			ghb_array_append(chapters, ghb_string_value_new(chapter->title));
-		}
-	}
-	return chapters;
+    gint count, ii;
+    GValue *chapters = NULL;
+    
+    g_debug("ghb_get_chapters (title = %d)\n", titleindex);
+    chapters = ghb_array_value_new(0);
+
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL) return chapters;
+    count = hb_list_count( title->list_chapter );
+    for (ii = 0; ii < count; ii++)
+    {
+        chapter = hb_list_item(title->list_chapter, ii);
+        if (chapter == NULL) break;
+        if (chapter->title == NULL || chapter->title[0] == 0)
+        {
+            gchar *str;
+            str = g_strdup_printf ("Chapter %2d", ii+1);
+            ghb_array_append(chapters, ghb_string_value_new(str));
+            g_free(str);
+        }
+        else 
+        {
+            ghb_array_append(chapters, ghb_string_value_new(chapter->title));
+        }
+    }
+    return chapters;
 }
 
 gboolean
 ghb_ac3_in_audio_list(const GValue *audio_list)
 {
-	gint count, ii;
+    gint count, ii;
 
-	count = ghb_array_len(audio_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *asettings;
-		gint acodec;
-
-		asettings = ghb_array_get_nth(audio_list, ii);
-		acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
-		if (acodec & HB_ACODEC_AC3)
-			return TRUE;
-	}
-	return FALSE;
+    count = ghb_array_len(audio_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *asettings;
+        gint acodec;
+
+        asettings = ghb_array_get_nth(audio_list, ii);
+        acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
+        if (acodec & HB_ACODEC_AC3)
+            return TRUE;
+    }
+    return FALSE;
 }
 
 static void
 audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gchar *str;
-	
-	g_debug("audio_bitrate_opts_add ()\n");
-
-	if (rate >= 0 && rate < 8) return;
-
-	if (ghb_audio_bitrates[hb_audio_bitrates_count].string)
-	{
-		g_free(ghb_audio_bitrates[hb_audio_bitrates_count].string);
-	}
-	ghb_audio_bitrates[hb_audio_bitrates_count].rate = rate;
-	if (rate < 0)
-	{
-		ghb_audio_bitrates[hb_audio_bitrates_count].string = 
-			g_strdup_printf("N/A");
-	}
-	else
-	{
-		ghb_audio_bitrates[hb_audio_bitrates_count].string = 
-			g_strdup_printf("%d", rate);
-	}
-	ghb_audio_bitrates_count = hb_audio_bitrates_count + 1;
-
-	store = get_combo_box_store(builder, name);
-	if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
-	{
-		str = g_strdup_printf ("<small>%s</small>",
-						ghb_audio_bitrates[hb_audio_bitrates_count].string);
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 
-						   0, str, 
-						   1, TRUE, 
-						   2, ghb_audio_bitrates[hb_audio_bitrates_count].string, 
-						   3, (gdouble)rate, 
-						   4, ghb_audio_bitrates[hb_audio_bitrates_count].string, 
-						   -1);
-		g_free(str);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gchar *str;
+    
+    g_debug("audio_bitrate_opts_add ()\n");
+
+    if (rate >= 0 && rate < 8) return;
+
+    if (ghb_audio_bitrates[hb_audio_bitrates_count].string)
+    {
+        g_free((char*)ghb_audio_bitrates[hb_audio_bitrates_count].string);
+    }
+    ghb_audio_bitrates[hb_audio_bitrates_count].rate = rate;
+    if (rate < 0)
+    {
+        ghb_audio_bitrates[hb_audio_bitrates_count].string = 
+            g_strdup_printf("N/A");
+    }
+    else
+    {
+        ghb_audio_bitrates[hb_audio_bitrates_count].string = 
+            g_strdup_printf("%d", rate);
+    }
+    ghb_audio_bitrates_count = hb_audio_bitrates_count + 1;
+
+    store = get_combo_box_store(builder, name);
+    if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
+    {
+        str = g_strdup_printf ("<small>%s</small>",
+                        ghb_audio_bitrates[hb_audio_bitrates_count].string);
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 
+                           0, str, 
+                           1, TRUE, 
+                           2, ghb_audio_bitrates[hb_audio_bitrates_count].string, 
+                           3, (gdouble)rate, 
+                           4, ghb_audio_bitrates[hb_audio_bitrates_count].string, 
+                           -1);
+        g_free(str);
+    }
 }
 
 static void
 audio_bitrate_opts_update(
-	GtkBuilder *builder, 
-	const gchar *name, 
-	gint first_rate, 
-	gint last_rate,
-	gint extra_rate)
-{
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gdouble ivalue;
-	gboolean done = FALSE;
-	gint ii = 0;
-	guint last = (guint)last_rate;
-	guint first = (guint)first_rate;
-	
-	ghb_audio_bitrates_count = hb_audio_bitrates_count;
-
-	g_debug("audio_bitrate_opts_clean ()\n");
-	store = get_combo_box_store(builder, name);
-	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
-	{
-		do
-		{
-			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
-			if (ivalue != first_rate && ivalue != last_rate && 
-				!(ivalue == extra_rate && extra_rate >= first_rate) &&
-				search_rates(
-				ghb_audio_bitrates, ivalue, ghb_audio_bitrates_count) < 0)
-			{
-				done = !gtk_list_store_remove(store, &iter);
-			}
-			else if ((int)ivalue < first || (int)ivalue > last)
-			{
-				ii++;
-				gtk_list_store_set(store, &iter, 1, FALSE, -1);
-				done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
-			}
-			else
-			{
-				ii++;
-				gtk_list_store_set(store, &iter, 1, TRUE, -1);
-				done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
-			}
-		} while (!done);
-	}
-	if (extra_rate >= first_rate)
-		audio_bitrate_opts_add(builder, name, extra_rate);
+    GtkBuilder *builder, 
+    const gchar *name, 
+    gint first_rate, 
+    gint last_rate,
+    gint extra_rate)
+{
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gdouble ivalue;
+    gboolean done = FALSE;
+    gint ii = 0;
+    guint last = (guint)last_rate;
+    guint first = (guint)first_rate;
+    
+    ghb_audio_bitrates_count = hb_audio_bitrates_count;
+
+    g_debug("audio_bitrate_opts_clean ()\n");
+    store = get_combo_box_store(builder, name);
+    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
+    {
+        do
+        {
+            gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
+            if (ivalue != first_rate && ivalue != last_rate && 
+                !(ivalue == extra_rate && extra_rate >= first_rate) &&
+                search_rates(
+                ghb_audio_bitrates, ivalue, ghb_audio_bitrates_count) < 0)
+            {
+                done = !gtk_list_store_remove(store, &iter);
+            }
+            else if ((int)ivalue < first || (int)ivalue > last)
+            {
+                ii++;
+                gtk_list_store_set(store, &iter, 1, FALSE, -1);
+                done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+            }
+            else
+            {
+                ii++;
+                gtk_list_store_set(store, &iter, 1, TRUE, -1);
+                done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+            }
+        } while (!done);
+    }
+    if (extra_rate >= first_rate)
+        audio_bitrate_opts_add(builder, name, extra_rate);
 }
 
 static void
 audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name)
 {
-	GtkTreeIter iter;
-	GtkListStore *store;
-	gint ii;
-	gchar *str;
-	
-	ghb_audio_bitrates_count = hb_audio_bitrates_count;
-	ghb_audio_bitrates = calloc(hb_audio_bitrates_count+1, sizeof(hb_rate_t));
-
-	for (ii = 0; ii < hb_audio_bitrates_count; ii++)
-	{
-		ghb_audio_bitrates[ii] = hb_audio_bitrates[ii];
-	}
-
-	g_debug("audio_bitrate_opts_set ()\n");
-	store = get_combo_box_store(builder, name);
-	gtk_list_store_clear(store);
-	for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
-	{
-		gtk_list_store_append(store, &iter);
-		str = g_strdup_printf ("<small>%s</small>", 
-			ghb_audio_bitrates[ii].string);
-		gtk_list_store_set(store, &iter, 
-						   0, str,
-						   1, TRUE, 
-						   2, ghb_audio_bitrates[ii].string, 
-						   3, (gdouble)ghb_audio_bitrates[ii].rate, 
-						   4, ghb_audio_bitrates[ii].string, 
-						   -1);
-		g_free(str);
-	}
+    GtkTreeIter iter;
+    GtkListStore *store;
+    gint ii;
+    gchar *str;
+    
+    ghb_audio_bitrates_count = hb_audio_bitrates_count;
+    ghb_audio_bitrates = calloc(hb_audio_bitrates_count+1, sizeof(hb_rate_t));
+
+    for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+    {
+        ghb_audio_bitrates[ii] = hb_audio_bitrates[ii];
+    }
+
+    g_debug("audio_bitrate_opts_set ()\n");
+    store = get_combo_box_store(builder, name);
+    gtk_list_store_clear(store);
+    for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+    {
+        gtk_list_store_append(store, &iter);
+        str = g_strdup_printf ("<small>%s</small>", 
+            ghb_audio_bitrates[ii].string);
+        gtk_list_store_set(store, &iter, 
+                           0, str,
+                           1, TRUE, 
+                           2, ghb_audio_bitrates[ii].string, 
+                           3, (gdouble)ghb_audio_bitrates[ii].rate, 
+                           4, ghb_audio_bitrates[ii].string, 
+                           -1);
+        g_free(str);
+    }
 }
 
 void
 ghb_set_bitrate_opts(
-	GtkBuilder *builder, 
-	gint first_rate, 
-	gint last_rate,
-	gint extra_rate)
+    GtkBuilder *builder, 
+    gint first_rate, 
+    gint last_rate,
+    gint extra_rate)
 {
-	audio_bitrate_opts_update(builder, "AudioBitrate", first_rate, last_rate, extra_rate);
+    audio_bitrate_opts_update(builder, "AudioBitrate", first_rate, last_rate, extra_rate);
 }
 
 static ghb_status_t hb_status;
@@ -3396,10 +3459,10 @@
 void
 ghb_combo_init(signal_user_data_t *ud)
 {
-	// Set up the list model for the combos
-	init_ui_combo_boxes(ud->builder);
-	// Populate all the combos
-	ghb_update_ui_combo_box(ud, NULL, 0, TRUE);
+    // Set up the list model for the combos
+    init_ui_combo_boxes(ud->builder);
+    // Populate all the combos
+    ghb_update_ui_combo_box(ud, NULL, 0, TRUE);
 }
 
 void
@@ -3413,9 +3476,9 @@
 void
 ghb_backend_close()
 {
-	hb_close(&h_queue);
-	hb_close(&h_scan);
-	hb_global_close();
+    hb_close(&h_queue);
+    hb_close(&h_scan);
+    hb_global_close();
 }
 
 void ghb_backend_scan_stop()
@@ -3427,61 +3490,64 @@
 ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, uint64_t min_duration)
 {
     hb_scan( h_scan, path, titleindex, preview_count, 1, min_duration );
-	hb_status.scan.state |= GHB_STATE_SCANNING;
-	// initialize count and cur to something that won't cause FPE
-	// when computing progress
-	hb_status.scan.title_count = 1;
-	hb_status.scan.title_cur = 0;
+    hb_status.scan.state |= GHB_STATE_SCANNING;
+    // initialize count and cur to something that won't cause FPE
+    // when computing progress
+    hb_status.scan.title_count = 1;
+    hb_status.scan.title_cur = 0;
+    hb_status.scan.preview_count = 1;
+    hb_status.scan.preview_cur = 0;
+    hb_status.scan.progress = 0;
 }
 
 void
 ghb_backend_queue_scan(const gchar *path, gint titlenum)
 {
-	g_debug("ghb_backend_queue_scan()");
-	hb_scan( h_queue, path, titlenum, 10, 0, 0 );
-	hb_status.queue.state |= GHB_STATE_SCANNING;
+    g_debug("ghb_backend_queue_scan()");
+    hb_scan( h_queue, path, titlenum, 10, 0, 0 );
+    hb_status.queue.state |= GHB_STATE_SCANNING;
 }
 
 gint
 ghb_get_scan_state()
 {
-	return hb_status.scan.state;
+    return hb_status.scan.state;
 }
 
 gint
 ghb_get_queue_state()
 {
-	return hb_status.queue.state;
+    return hb_status.queue.state;
 }
 
 void
 ghb_clear_scan_state(gint state)
 {
-	hb_status.scan.state &= ~state;
+    hb_status.scan.state &= ~state;
 }
 
 void
 ghb_clear_queue_state(gint state)
 {
-	hb_status.queue.state &= ~state;
+    hb_status.queue.state &= ~state;
 }
 
 void
 ghb_set_scan_state(gint state)
 {
-	hb_status.scan.state |= state;
+    hb_status.scan.state |= state;
 }
 
 void
 ghb_set_queue_state(gint state)
 {
-	hb_status.queue.state |= state;
+    hb_status.queue.state |= state;
 }
 
 void
 ghb_get_status(ghb_status_t *status)
 {
-	memcpy(status, &hb_status, sizeof(ghb_status_t));
+    memcpy(status, &hb_status, sizeof(ghb_status_t));
 }
 
 void 
@@ -3490,288 +3556,260 @@
     hb_state_t s_scan;
     hb_state_t s_queue;
 
-	if (h_scan == NULL) return;
+    if (h_scan == NULL) return;
     hb_get_state( h_scan, &s_scan );
-	switch( s_scan.state )
+    switch( s_scan.state )
     {
 #define p s_scan.param.scanning
         case HB_STATE_SCANNING:
-		{
-			hb_status.scan.state |= GHB_STATE_SCANNING;
-			hb_status.scan.title_count = p.title_count;
-			hb_status.scan.title_cur = p.title_cur;
-		} break;
+        {
+            hb_status.scan.state |= GHB_STATE_SCANNING;
+            hb_status.scan.title_count = p.title_count;
+            hb_status.scan.title_cur = p.title_cur;
+            hb_status.scan.preview_count = p.preview_count;
+            hb_status.scan.preview_cur = p.preview_cur;
+            hb_status.scan.progress = p.progress;
+        } break;
 #undef p
 
         case HB_STATE_SCANDONE:
         {
-			hb_status.scan.state &= ~GHB_STATE_SCANNING;
-			hb_status.scan.state |= GHB_STATE_SCANDONE;
+            hb_status.scan.state &= ~GHB_STATE_SCANNING;
+            hb_status.scan.state |= GHB_STATE_SCANDONE;
         } break;
 
 #define p s_scan.param.working
         case HB_STATE_WORKING:
-			hb_status.scan.state |= GHB_STATE_WORKING;
-			hb_status.scan.state &= ~GHB_STATE_PAUSED;
-			hb_status.scan.job_cur = p.job_cur;
-			hb_status.scan.job_count = p.job_count;
-			hb_status.scan.progress = p.progress;
-			hb_status.scan.rate_cur = p.rate_cur;
-			hb_status.scan.rate_avg = p.rate_avg;
-			hb_status.scan.hours = p.hours;
-			hb_status.scan.minutes = p.minutes;
-			hb_status.scan.seconds = p.seconds;
-			hb_status.scan.unique_id = p.sequence_id & 0xFFFFFF;
+            hb_status.scan.state |= GHB_STATE_WORKING;
+            hb_status.scan.state &= ~GHB_STATE_PAUSED;
+            hb_status.scan.job_cur = p.job_cur;
+            hb_status.scan.job_count = p.job_count;
+            hb_status.scan.progress = p.progress;
+            hb_status.scan.rate_cur = p.rate_cur;
+            hb_status.scan.rate_avg = p.rate_avg;
+            hb_status.scan.hours = p.hours;
+            hb_status.scan.minutes = p.minutes;
+            hb_status.scan.seconds = p.seconds;
+            hb_status.scan.unique_id = p.sequence_id & 0xFFFFFF;
             break;
 #undef p
 
         case HB_STATE_PAUSED:
-			hb_status.scan.state |= GHB_STATE_PAUSED;
+            hb_status.scan.state |= GHB_STATE_PAUSED;
             break;
-				
+                
         case HB_STATE_MUXING:
         {
-			hb_status.scan.state |= GHB_STATE_MUXING;
+            hb_status.scan.state |= GHB_STATE_MUXING;
         } break;
 
 #define p s_scan.param.workdone
         case HB_STATE_WORKDONE:
-		{
+        {
             hb_job_t *job;
 
-			hb_status.scan.state |= GHB_STATE_WORKDONE;
-			hb_status.scan.state &= ~GHB_STATE_MUXING;
-			hb_status.scan.state &= ~GHB_STATE_PAUSED;
-			hb_status.scan.state &= ~GHB_STATE_WORKING;
-			switch (p.error)
-			{
-			case HB_ERROR_NONE:
-				hb_status.scan.error = GHB_ERROR_NONE;
-				break;
-			case HB_ERROR_CANCELED:
-				hb_status.scan.error = GHB_ERROR_CANCELED;
-				break;
-			default:
-				hb_status.scan.error = GHB_ERROR_FAIL;
-				break;
-			}
-			// Delete all remaining jobs of this encode.
-			// An encode can be composed of multiple associated jobs.
-			// When a job is stopped, libhb removes it from the job list,
-			// but does not remove other jobs that may be associated with it.
-			// Associated jobs are taged in the sequence id.
+            hb_status.scan.state |= GHB_STATE_WORKDONE;
+            hb_status.scan.state &= ~GHB_STATE_MUXING;
+            hb_status.scan.state &= ~GHB_STATE_PAUSED;
+            hb_status.scan.state &= ~GHB_STATE_WORKING;
+            switch (p.error)
+            {
+            case HB_ERROR_NONE:
+                hb_status.scan.error = GHB_ERROR_NONE;
+                break;
+            case HB_ERROR_CANCELED:
+                hb_status.scan.error = GHB_ERROR_CANCELED;
+                break;
+            default:
+                hb_status.scan.error = GHB_ERROR_FAIL;
+                break;
+            }
+            // Delete all remaining jobs of this encode.
+            // An encode can be composed of multiple associated jobs.
+            // When a job is stopped, libhb removes it from the job list,
+            // but does not remove other jobs that may be associated with it.
+            // Associated jobs are taged in the sequence id.
             while ((job = hb_job(h_scan, 0)) != NULL) 
                 hb_rem( h_scan, job );
-		} break;
+        } break;
 #undef p
     }
     hb_get_state( h_queue, &s_queue );
-	switch( s_queue.state )
+    switch( s_queue.state )
     {
 #define p s_queue.param.scanning
         case HB_STATE_SCANNING:
-		{
-			hb_status.queue.state |= GHB_STATE_SCANNING;
-			hb_status.queue.title_count = p.title_count;
-			hb_status.queue.title_cur = p.title_cur;
-		} break;
+        {
+            hb_status.queue.state |= GHB_STATE_SCANNING;
+            hb_status.queue.title_count = p.title_count;
+            hb_status.queue.title_cur = p.title_cur;
+            hb_status.queue.preview_count = p.preview_count;
+            hb_status.queue.preview_cur = p.preview_cur;
+            hb_status.queue.progress = p.progress;
+        } break;
 #undef p
 
         case HB_STATE_SCANDONE:
         {
-			hb_status.queue.state &= ~GHB_STATE_SCANNING;
-			hb_status.queue.state |= GHB_STATE_SCANDONE;
+            hb_status.queue.state &= ~GHB_STATE_SCANNING;
+            hb_status.queue.state |= GHB_STATE_SCANDONE;
         } break;
 
 #define p s_queue.param.working
         case HB_STATE_WORKING:
-			hb_status.queue.state |= GHB_STATE_WORKING;
-			hb_status.queue.state &= ~GHB_STATE_PAUSED;
-			hb_status.queue.state &= ~GHB_STATE_SEARCHING;
-			hb_status.queue.job_cur = p.job_cur;
-			hb_status.queue.job_count = p.job_count;
-			hb_status.queue.progress = p.progress;
-			hb_status.queue.rate_cur = p.rate_cur;
-			hb_status.queue.rate_avg = p.rate_avg;
-			hb_status.queue.hours = p.hours;
-			hb_status.queue.minutes = p.minutes;
-			hb_status.queue.seconds = p.seconds;
-			hb_status.queue.unique_id = p.sequence_id & 0xFFFFFF;
+            hb_status.queue.state |= GHB_STATE_WORKING;
+            hb_status.queue.state &= ~GHB_STATE_PAUSED;
+            hb_status.queue.state &= ~GHB_STATE_SEARCHING;
+            hb_status.queue.job_cur = p.job_cur;
+            hb_status.queue.job_count = p.job_count;
+            hb_status.queue.progress = p.progress;
+            hb_status.queue.rate_cur = p.rate_cur;
+            hb_status.queue.rate_avg = p.rate_avg;
+            hb_status.queue.hours = p.hours;
+            hb_status.queue.minutes = p.minutes;
+            hb_status.queue.seconds = p.seconds;
+            hb_status.queue.unique_id = p.sequence_id & 0xFFFFFF;
             break;
 
         case HB_STATE_SEARCHING:
-			hb_status.queue.state |= GHB_STATE_SEARCHING;
-			hb_status.queue.state &= ~GHB_STATE_WORKING;
-			hb_status.queue.state &= ~GHB_STATE_PAUSED;
-			hb_status.queue.job_cur = p.job_cur;
-			hb_status.queue.job_count = p.job_count;
-			hb_status.queue.progress = p.progress;
-			hb_status.queue.rate_cur = p.rate_cur;
-			hb_status.queue.rate_avg = p.rate_avg;
-			hb_status.queue.hours = p.hours;
-			hb_status.queue.minutes = p.minutes;
-			hb_status.queue.seconds = p.seconds;
-			hb_status.queue.unique_id = p.sequence_id & 0xFFFFFF;
+            hb_status.queue.state |= GHB_STATE_SEARCHING;
+            hb_status.queue.state &= ~GHB_STATE_WORKING;
+            hb_status.queue.state &= ~GHB_STATE_PAUSED;
+            hb_status.queue.job_cur = p.job_cur;
+            hb_status.queue.job_count = p.job_count;
+            hb_status.queue.progress = p.progress;
+            hb_status.queue.rate_cur = p.rate_cur;
+            hb_status.queue.rate_avg = p.rate_avg;
+            hb_status.queue.hours = p.hours;
+            hb_status.queue.minutes = p.minutes;
+            hb_status.queue.seconds = p.seconds;
+            hb_status.queue.unique_id = p.sequence_id & 0xFFFFFF;
             break;
 #undef p
 
         case HB_STATE_PAUSED:
-			hb_status.queue.state |= GHB_STATE_PAUSED;
+            hb_status.queue.state |= GHB_STATE_PAUSED;
             break;
-				
+                
         case HB_STATE_MUXING:
         {
-			hb_status.queue.state |= GHB_STATE_MUXING;
+            hb_status.queue.state |= GHB_STATE_MUXING;
         } break;
 
 #define p s_queue.param.workdone
         case HB_STATE_WORKDONE:
-		{
+        {
             hb_job_t *job;
 
-			hb_status.queue.state |= GHB_STATE_WORKDONE;
-			hb_status.queue.state &= ~GHB_STATE_MUXING;
-			hb_status.queue.state &= ~GHB_STATE_PAUSED;
-			hb_status.queue.state &= ~GHB_STATE_WORKING;
-			hb_status.queue.state &= ~GHB_STATE_SEARCHING;
-			switch (p.error)
-			{
-			case HB_ERROR_NONE:
-				hb_status.queue.error = GHB_ERROR_NONE;
-				break;
-			case HB_ERROR_CANCELED:
-				hb_status.queue.error = GHB_ERROR_CANCELED;
-				break;
-			default:
-				hb_status.queue.error = GHB_ERROR_FAIL;
-				break;
-			}
-			// Delete all remaining jobs of this encode.
-			// An encode can be composed of multiple associated jobs.
-			// When a job is stopped, libhb removes it from the job list,
-			// but does not remove other jobs that may be associated with it.
-			// Associated jobs are taged in the sequence id.
+            hb_status.queue.state |= GHB_STATE_WORKDONE;
+            hb_status.queue.state &= ~GHB_STATE_MUXING;
+            hb_status.queue.state &= ~GHB_STATE_PAUSED;
+            hb_status.queue.state &= ~GHB_STATE_WORKING;
+            hb_status.queue.state &= ~GHB_STATE_SEARCHING;
+            switch (p.error)
+            {
+            case HB_ERROR_NONE:
+                hb_status.queue.error = GHB_ERROR_NONE;
+                break;
+            case HB_ERROR_CANCELED:
+                hb_status.queue.error = GHB_ERROR_CANCELED;
+                break;
+            default:
+                hb_status.queue.error = GHB_ERROR_FAIL;
+                break;
+            }
+            // Delete all remaining jobs of this encode.
+            // An encode can be composed of multiple associated jobs.
+            // When a job is stopped, libhb removes it from the job list,
+            // but does not remove other jobs that may be associated with it.
+            // Associated jobs are taged in the sequence id.
             while ((job = hb_job(h_queue, 0)) != NULL) 
                 hb_rem( h_queue, job );
-		} break;
+        } break;
 #undef p
     }
 }
 
-gboolean
-ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex)
+hb_title_t *
+ghb_get_title_info(gint titleindex)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	
-    if (h_scan == NULL) return FALSE;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return FALSE;
-	}
-
-	title = hb_list_item( list, titleindex );
-	if (title == NULL) return FALSE;	// Bad titleindex
-	tinfo->index = titleindex;
-	tinfo->video_codec_name = title->video_codec_name;
-	tinfo->width = title->width;
-	tinfo->height = title->height;
-	memcpy(tinfo->crop, title->crop, 4 * sizeof(int));
-	// Don't allow crop to 0
-	if (title->crop[0] + title->crop[1] >= title->height)
-		title->crop[0] = title->crop[1] = 0;
-	if (title->crop[2] + title->crop[3] >= title->width)
-		title->crop[2] = title->crop[3] = 0;
-	tinfo->num_chapters = hb_list_count(title->list_chapter);
-	tinfo->rate_base = title->rate_base;
-	tinfo->rate = title->rate;
-	tinfo->interlaced = title->detected_interlacing;
-	hb_reduce(&(tinfo->aspect_n), &(tinfo->aspect_d), 
-				title->width * title->pixel_aspect_width, 
-				title->height * title->pixel_aspect_height);
-	tinfo->hours = title->hours;
-	tinfo->minutes = title->minutes;
-	tinfo->seconds = title->seconds;
-	tinfo->duration = title->duration;
-
-	tinfo->angle_count = title->angle_count;
-	tinfo->path = title->path;
-	tinfo->name = title->name;
-	tinfo->type = title->type;
-	return TRUE;
+    hb_list_t  * list;
+
+    if (h_scan == NULL) return NULL;
+    list = hb_get_titles( h_scan );
+    if (list == NULL) return NULL;
+    return hb_list_item( list, titleindex );
 }
 
 hb_audio_config_t*
 ghb_get_scan_audio_info(gint titleindex, gint audioindex)
 {
     hb_audio_config_t *aconfig;
-	
-	aconfig = get_hb_audio(h_scan, titleindex, audioindex);
-	return aconfig;
+    
+    aconfig = get_hb_audio(h_scan, titleindex, audioindex);
+    return aconfig;
 }
 
 gboolean
 ghb_audio_is_passthru(gint acodec)
 {
-	g_debug("ghb_audio_is_passthru () \n");
-	return (acodec & HB_ACODEC_PASS_FLAG) != 0;
+    g_debug("ghb_audio_is_passthru () \n");
+    return (acodec & HB_ACODEC_PASS_FLAG) != 0;
 }
 
 gboolean
 ghb_audio_can_passthru(gint acodec)
 {
-	g_debug("ghb_audio_can_passthru () \n");
-	return (acodec & HB_ACODEC_PASS_MASK) != 0;
+    g_debug("ghb_audio_can_passthru () \n");
+    return (acodec & HB_ACODEC_PASS_MASK) != 0;
 }
 
 gint
 ghb_get_default_acodec()
 {
-	return HB_ACODEC_FAAC;
+    return HB_ACODEC_FAAC;
 }
 
 static void
 picture_settings_deps(signal_user_data_t *ud)
 {
-	gboolean autoscale, keep_aspect, enable_keep_aspect;
-	gboolean enable_scale_width, enable_scale_height;
-	gboolean enable_disp_width, enable_disp_height, enable_par;
-	gint pic_par;
-	GtkWidget *widget;
-
-	pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
-	enable_keep_aspect = (pic_par != 1 && pic_par != 2);
-	keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
-	autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
-
-	enable_scale_width = !autoscale && (pic_par != 1);
-	enable_scale_height = !autoscale && (pic_par != 1);
-	enable_disp_width = (pic_par == 3) && !keep_aspect;
-	enable_par = (pic_par == 3) && !keep_aspect;
-	enable_disp_height = FALSE;
-
-	widget = GHB_WIDGET(ud->builder, "PictureModulus");
-	gtk_widget_set_sensitive(widget, pic_par != 1);
-	widget = GHB_WIDGET(ud->builder, "PictureLooseCrop");
-	gtk_widget_set_sensitive(widget, pic_par != 1);
-	widget = GHB_WIDGET(ud->builder, "scale_width");
-	gtk_widget_set_sensitive(widget, enable_scale_width);
-	widget = GHB_WIDGET(ud->builder, "scale_height");
-	gtk_widget_set_sensitive(widget, enable_scale_height);
-	widget = GHB_WIDGET(ud->builder, "PictureDisplayWidth");
-	gtk_widget_set_sensitive(widget, enable_disp_width);
-	widget = GHB_WIDGET(ud->builder, "PictureDisplayHeight");
-	gtk_widget_set_sensitive(widget, enable_disp_height);
-	widget = GHB_WIDGET(ud->builder, "PicturePARWidth");
-	gtk_widget_set_sensitive(widget, enable_par);
-	widget = GHB_WIDGET(ud->builder, "PicturePARHeight");
-	gtk_widget_set_sensitive(widget, enable_par);
-	widget = GHB_WIDGET(ud->builder, "PictureKeepRatio");
-	gtk_widget_set_sensitive(widget, enable_keep_aspect);
-	widget = GHB_WIDGET(ud->builder, "autoscale");
-	gtk_widget_set_sensitive(widget, pic_par != 1);
+    gboolean autoscale, keep_aspect, enable_keep_aspect;
+    gboolean enable_scale_width, enable_scale_height;
+    gboolean enable_disp_width, enable_disp_height, enable_par;
+    gint pic_par;
+    GtkWidget *widget;
+
+    pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
+    enable_keep_aspect = (pic_par != 1 && pic_par != 2);
+    keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+    autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
+
+    enable_scale_width = !autoscale && (pic_par != 1);
+    enable_scale_height = !autoscale && (pic_par != 1);
+    enable_disp_width = (pic_par == 3) && !keep_aspect;
+    enable_par = (pic_par == 3) && !keep_aspect;
+    enable_disp_height = FALSE;
+
+    widget = GHB_WIDGET(ud->builder, "PictureModulus");
+    gtk_widget_set_sensitive(widget, pic_par != 1);
+    widget = GHB_WIDGET(ud->builder, "PictureLooseCrop");
+    gtk_widget_set_sensitive(widget, pic_par != 1);
+    widget = GHB_WIDGET(ud->builder, "scale_width");
+    gtk_widget_set_sensitive(widget, enable_scale_width);
+    widget = GHB_WIDGET(ud->builder, "scale_height");
+    gtk_widget_set_sensitive(widget, enable_scale_height);
+    widget = GHB_WIDGET(ud->builder, "PictureDisplayWidth");
+    gtk_widget_set_sensitive(widget, enable_disp_width);
+    widget = GHB_WIDGET(ud->builder, "PictureDisplayHeight");
+    gtk_widget_set_sensitive(widget, enable_disp_height);
+    widget = GHB_WIDGET(ud->builder, "PicturePARWidth");
+    gtk_widget_set_sensitive(widget, enable_par);
+    widget = GHB_WIDGET(ud->builder, "PicturePARHeight");
+    gtk_widget_set_sensitive(widget, enable_par);
+    widget = GHB_WIDGET(ud->builder, "PictureKeepRatio");
+    gtk_widget_set_sensitive(widget, enable_keep_aspect);
+    widget = GHB_WIDGET(ud->builder, "autoscale");
+    gtk_widget_set_sensitive(widget, pic_par != 1);
 }
 
 void
@@ -3797,1480 +3835,1443 @@
 void
 ghb_set_scale_settings(GValue *settings, gint mode)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_job_t   * job;
-	gboolean keep_aspect;
-	gint pic_par;
-	gboolean autocrop, autoscale, noscale;
-	gint crop[4], width, height, par_width, par_height;
-	gint crop_width, crop_height;
-	gint aspect_n, aspect_d;
-	gboolean keep_width = (mode & GHB_PIC_KEEP_WIDTH);
-	gboolean keep_height = (mode & GHB_PIC_KEEP_HEIGHT);
-	gint mod;
-	gint max_width = 0;
-	gint max_height = 0;
-	
-	g_debug("ghb_set_scale ()\n");
-
-	pic_par = ghb_settings_combo_int(settings, "PicturePAR");
-	if (pic_par == 1)
-	{
-		ghb_settings_set_boolean(settings, "autoscale", TRUE);
-		ghb_settings_set_int(settings, "PictureModulus", 2);
-		ghb_settings_set_boolean(settings, "PictureLooseCrop", TRUE);
-	}
-	if (pic_par == 1 || pic_par == 2)
-	{
-		ghb_settings_set_boolean(settings, "PictureKeepRatio", TRUE);
-	}
-
-	if (h_scan == NULL) return;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return;
-	}
-	gint titleindex;
-
-	titleindex = ghb_settings_combo_int(settings, "title");
-	title = hb_list_item( list, titleindex );
-	if (title == NULL) return;
-	job   = title->job;
-	if (job == NULL) return;
-
-	// First configure widgets
-	mod = ghb_settings_combo_int(settings, "PictureModulus");
-	keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
-	autocrop = ghb_settings_get_boolean(settings, "PictureAutoCrop");
-	autoscale = ghb_settings_get_boolean(settings, "autoscale");
-	// "Noscale" is a flag that says we prefer to crop extra to satisfy
-	// alignment constraints rather than scaling to satisfy them.
-	noscale = ghb_settings_get_boolean(settings, "PictureLooseCrop");
-	// Align dimensions to either 16 or 2 pixels
-	// The scaler crashes if the dimensions are not divisible by 2
-	// x264 also will not accept dims that are not multiple of 2
-	if (autoscale)
-	{
-		keep_width = FALSE;
-		keep_height = FALSE;
-	}
-
-	ghb_title_info_t tinfo;
-	ghb_get_title_info (&tinfo, titleindex);
-	if (autocrop)
-	{
-		crop[0] = tinfo.crop[0];
-		crop[1] = tinfo.crop[1];
-		crop[2] = tinfo.crop[2];
-		crop[3] = tinfo.crop[3];
-		ghb_settings_set_int(settings, "PictureTopCrop", crop[0]);
-		ghb_settings_set_int(settings, "PictureBottomCrop", crop[1]);
-		ghb_settings_set_int(settings, "PictureLeftCrop", crop[2]);
-		ghb_settings_set_int(settings, "PictureRightCrop", crop[3]);
-	}
-	else
-	{
-		crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
-		crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
-		crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
-		crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
-	}
-	if (noscale)
-	{
-		gint need1, need2;
-
-		// Adjust the cropping to accomplish the desired width and height
-		crop_width = tinfo.width - crop[2] - crop[3];
-		crop_height = tinfo.height - crop[0] - crop[1];
-		width = MOD_DOWN(crop_width, mod);
-		height = MOD_DOWN(crop_height, mod);
-
-		need1 = (crop_height - height) / 2;
-		need2 = crop_height - height - need1;
-		crop[0] += need1;
-		crop[1] += need2;
-		need1 = (crop_width - width) / 2;
-		need2 = crop_width - width - need1;
-		crop[2] += need1;
-		crop[3] += need2;
-		ghb_settings_set_int(settings, "PictureTopCrop", crop[0]);
-		ghb_settings_set_int(settings, "PictureBottomCrop", crop[1]);
-		ghb_settings_set_int(settings, "PictureLeftCrop", crop[2]);
-		ghb_settings_set_int(settings, "PictureRightCrop", crop[3]);
-	}
-	hb_reduce(&aspect_n, &aspect_d, 
-				title->width * title->pixel_aspect_width, 
-				title->height * title->pixel_aspect_height);
-	crop_width = title->width - crop[2] - crop[3];
-	crop_height = title->height - crop[0] - crop[1];
-	if (autoscale)
-	{
-		width = crop_width;
-		height = crop_height;
-	}
-	else
-	{
-		width = ghb_settings_get_int(settings, "scale_width");
-		height = ghb_settings_get_int(settings, "scale_height");
-		if (mode & GHB_PIC_USE_MAX)
-		{
-			max_width = MOD_DOWN(
-				ghb_settings_get_int(settings, "PictureWidth"), mod);
-			max_height = MOD_DOWN(
-				ghb_settings_get_int(settings, "PictureHeight"), mod);
-		}
-	}
-	g_debug("max_width %d, max_height %d\n", max_width, max_height);
-
-	if (width < 16)
-		width = title->width - crop[2] - crop[3];
-	if (height < 16)
-		height = title->height - crop[0] - crop[1];
-
-	width = MOD_ROUND(width, mod);
-	height = MOD_ROUND(height, mod);
-
-	job->anamorphic.mode = pic_par;
-	if (pic_par)
-	{
-		// The scaler crashes if the dimensions are not divisible by 2
-		// Align mod 2.  And so does something in x264_encoder_headers()
-		job->modulus = mod;
-		job->anamorphic.par_width = title->pixel_aspect_width;
-		job->anamorphic.par_height = title->pixel_aspect_height;
-		job->anamorphic.dar_width = 0;
-		job->anamorphic.dar_height = 0;
-
-		if (keep_height && pic_par == 2)
-		{
-			width = ((double)height * crop_width / crop_height);
-			width = MOD_ROUND(width, mod);
-		}
-		job->width = width;
-		job->height = height;
-		job->maxWidth = max_width;
-		job->maxHeight = max_height;
-		job->crop[0] = crop[0];
-		job->crop[1] = crop[1];
-		job->crop[2] = crop[2];
-		job->crop[3] = crop[3];
-		if (job->anamorphic.mode == 3 && !keep_aspect)
-		{
-			job->anamorphic.keep_display_aspect = 0;
-			if (mode & GHB_PIC_KEEP_PAR)
-			{
-				job->anamorphic.par_width = 
-					ghb_settings_get_int(settings, "PicturePARWidth");
-				job->anamorphic.par_height = 
-					ghb_settings_get_int(settings, "PicturePARHeight");
-			}
-			else
-			{
-				job->anamorphic.dar_width = 
-					ghb_settings_get_int(settings, "PictureDisplayWidth");
-				job->anamorphic.dar_height = height;
-			}
-		}
-		else
-		{
-			job->anamorphic.keep_display_aspect = 1;
-		}
-		// hb_set_anamorphic_size will adjust par, dar, and width/height
-		// to conform to job parameters that have been set, including 
-		// maxWidth and maxHeight
-		hb_set_anamorphic_size(job, &width, &height, &par_width, &par_height);
-		if (job->anamorphic.mode == 3 && !keep_aspect && 
-			mode & GHB_PIC_KEEP_PAR)
-		{
-			// hb_set_anamorphic_size reduces the par, which we
-			// don't want in this case because the user is
-			// explicitely specifying it.
-			par_width = ghb_settings_get_int(settings, "PicturePARWidth");
-			par_height = ghb_settings_get_int(settings, "PicturePARHeight");
-		}
-	}
-	else 
-	{
-		// Adjust dims according to max values
-		if (max_height) height = MIN(height, max_height);
-		if (max_width) width = MIN(width, max_width);
-
-		if (keep_aspect)
-		{
-			gdouble par;
-			gint new_width, new_height;
-			
-			// Compute pixel aspect ration.  
-			par = (gdouble)(title->height * aspect_n) / (title->width * aspect_d);
-			// Must scale so that par becomes 1:1
-			// Try to keep largest dimension
-			new_height = (crop_height * ((gdouble)width/crop_width) / par);
-			new_width = (crop_width * ((gdouble)height/crop_height) * par);
-
-			if (max_width && new_width > max_width)
-			{
-				height = new_height;
-			}
-			else if (max_height && new_height > max_height)
-			{
-				width = new_width;
-			}
-			else if (keep_width)
-			{
-				height = new_height;
-			}
-			else if (keep_height)
-			{
-				width = new_width;
-			}
-			else if (width > new_width)
-			{
-				height = new_height;
-			}
-			else
-			{
-				width = new_width;
-			}
-			g_debug("new w %d h %d\n", width, height);
-		}
-		width = MOD_ROUND(width, mod);
-		height = MOD_ROUND(height, mod);
-		if (max_height)
-			height = MIN(height, max_height);
-		if (max_width)
-			width = MIN(width, max_width);
-		par_width = par_height = 1;
-	}
-	ghb_settings_set_int(settings, "scale_width", width);
-	ghb_settings_set_int(settings, "scale_height", height);
+    hb_title_t * title;
+    hb_job_t   * job;
+    gboolean keep_aspect;
+    gint pic_par;
+    gboolean autocrop, autoscale, noscale;
+    gint crop[4] = {0,};
+    gint width, height, par_width, par_height;
+    gint crop_width, crop_height;
+    gint aspect_n, aspect_d;
+    gboolean keep_width = (mode & GHB_PIC_KEEP_WIDTH);
+    gboolean keep_height = (mode & GHB_PIC_KEEP_HEIGHT);
+    gint mod;
+    gint max_width = 0;
+    gint max_height = 0;
+    
+    g_debug("ghb_set_scale ()\n");
 
-	gint disp_width;
+    pic_par = ghb_settings_combo_int(settings, "PicturePAR");
+    if (pic_par == 1)
+    {
+        ghb_settings_set_boolean(settings, "autoscale", TRUE);
+        ghb_settings_set_int(settings, "PictureModulus", 2);
+        ghb_settings_set_boolean(settings, "PictureLooseCrop", TRUE);
+    }
+    if (pic_par == 1 || pic_par == 2)
+    {
+        ghb_settings_set_boolean(settings, "PictureKeepRatio", TRUE);
+    }
+
+    gint titleindex;
+
+    titleindex = ghb_settings_combo_int(settings, "title");
+    title = ghb_get_title_info (titleindex);
+    if (title == NULL) return;
+
+    job = hb_job_init( title );
+    if (job == NULL) return;
+
+    // First configure widgets
+    mod = ghb_settings_combo_int(settings, "PictureModulus");
+    keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
+    autocrop = ghb_settings_get_boolean(settings, "PictureAutoCrop");
+    autoscale = ghb_settings_get_boolean(settings, "autoscale");
+    // "Noscale" is a flag that says we prefer to crop extra to satisfy
+    // alignment constraints rather than scaling to satisfy them.
+    noscale = ghb_settings_get_boolean(settings, "PictureLooseCrop");
+    // Align dimensions to either 16 or 2 pixels
+    // The scaler crashes if the dimensions are not divisible by 2
+    // x264 also will not accept dims that are not multiple of 2
+    if (autoscale)
+    {
+        keep_width = FALSE;
+        keep_height = FALSE;
+    }
+
+    if (autocrop)
+    {
+        crop[0] = title->crop[0];
+        crop[1] = title->crop[1];
+        crop[2] = title->crop[2];
+        crop[3] = title->crop[3];
+        ghb_settings_set_int(settings, "PictureTopCrop", crop[0]);
+        ghb_settings_set_int(settings, "PictureBottomCrop", crop[1]);
+        ghb_settings_set_int(settings, "PictureLeftCrop", crop[2]);
+        ghb_settings_set_int(settings, "PictureRightCrop", crop[3]);
+    }
+    else
+    {
+        crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
+        crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
+        crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
+        crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
+    }
+    if (noscale)
+    {
+        gint need1, need2;
+
+        // Adjust the cropping to accomplish the desired width and height
+        crop_width = title->width - crop[2] - crop[3];
+        crop_height = title->height - crop[0] - crop[1];
+        width = MOD_DOWN(crop_width, mod);
+        height = MOD_DOWN(crop_height, mod);
+
+        need1 = (crop_height - height) / 2;
+        need2 = crop_height - height - need1;
+        crop[0] += need1;
+        crop[1] += need2;
+        need1 = (crop_width - width) / 2;
+        need2 = crop_width - width - need1;
+        crop[2] += need1;
+        crop[3] += need2;
+        ghb_settings_set_int(settings, "PictureTopCrop", crop[0]);
+        ghb_settings_set_int(settings, "PictureBottomCrop", crop[1]);
+        ghb_settings_set_int(settings, "PictureLeftCrop", crop[2]);
+        ghb_settings_set_int(settings, "PictureRightCrop", crop[3]);
+    }
+    hb_reduce(&aspect_n, &aspect_d, 
+                title->width * title->pixel_aspect_width, 
+                title->height * title->pixel_aspect_height);
+    crop_width = title->width - crop[2] - crop[3];
+    crop_height = title->height - crop[0] - crop[1];
+    if (autoscale)
+    {
+        width = crop_width;
+        height = crop_height;
+    }
+    else
+    {
+        width = ghb_settings_get_int(settings, "scale_width");
+        height = ghb_settings_get_int(settings, "scale_height");
+        if (mode & GHB_PIC_USE_MAX)
+        {
+            max_width = MOD_DOWN(
+                ghb_settings_get_int(settings, "PictureWidth"), mod);
+            max_height = MOD_DOWN(
+                ghb_settings_get_int(settings, "PictureHeight"), mod);
+        }
+    }
+    g_debug("max_width %d, max_height %d\n", max_width, max_height);
+
+    if (width < 16)
+        width = title->width - crop[2] - crop[3];
+    if (height < 16)
+        height = title->height - crop[0] - crop[1];
+
+    width = MOD_ROUND(width, mod);
+    height = MOD_ROUND(height, mod);
+
+    job->anamorphic.mode = pic_par;
+    if (pic_par)
+    {
+        // The scaler crashes if the dimensions are not divisible by 2
+        // Align mod 2.  And so does something in x264_encoder_headers()
+        job->modulus = mod;
+        job->anamorphic.par_width = title->pixel_aspect_width;
+        job->anamorphic.par_height = title->pixel_aspect_height;
+        job->anamorphic.dar_width = 0;
+        job->anamorphic.dar_height = 0;
+
+        if (keep_height && pic_par == 2)
+        {
+            width = ((double)height * crop_width / crop_height);
+            width = MOD_ROUND(width, mod);
+        }
+        job->width = width;
+        job->height = height;
+        job->maxWidth = max_width;
+        job->maxHeight = max_height;
+        job->crop[0] = crop[0];
+        job->crop[1] = crop[1];
+        job->crop[2] = crop[2];
+        job->crop[3] = crop[3];
+        if (job->anamorphic.mode == 3 && !keep_aspect)
+        {
+            job->anamorphic.keep_display_aspect = 0;
+            if (mode & GHB_PIC_KEEP_PAR)
+            {
+                job->anamorphic.par_width = 
+                    ghb_settings_get_int(settings, "PicturePARWidth");
+                job->anamorphic.par_height = 
+                    ghb_settings_get_int(settings, "PicturePARHeight");
+            }
+            else
+            {
+                job->anamorphic.dar_width = 
+                    ghb_settings_get_int(settings, "PictureDisplayWidth");
+                job->anamorphic.dar_height = height;
+            }
+        }
+        else
+        {
+            job->anamorphic.keep_display_aspect = 1;
+        }
+        // hb_set_anamorphic_size will adjust par, dar, and width/height
+        // to conform to job parameters that have been set, including 
+        // maxWidth and maxHeight
+        hb_set_anamorphic_size(job, &width, &height, &par_width, &par_height);
+        if (job->anamorphic.mode == 3 && !keep_aspect && 
+            mode & GHB_PIC_KEEP_PAR)
+        {
+            // hb_set_anamorphic_size reduces the par, which we
+            // don't want in this case because the user is
+            // explicitely specifying it.
+            par_width = ghb_settings_get_int(settings, "PicturePARWidth");
+            par_height = ghb_settings_get_int(settings, "PicturePARHeight");
+        }
+    }
+    else 
+    {
+        // Adjust dims according to max values
+        if (max_height) height = MIN(height, max_height);
+        if (max_width) width = MIN(width, max_width);
+
+        if (keep_aspect)
+        {
+            gdouble par;
+            gint new_width, new_height;
+            
+            // Compute pixel aspect ration.  
+            par = (gdouble)(title->height * aspect_n) / (title->width * aspect_d);
+            // Must scale so that par becomes 1:1
+            // Try to keep largest dimension
+            new_height = (crop_height * ((gdouble)width/crop_width) / par);
+            new_width = (crop_width * ((gdouble)height/crop_height) * par);
+
+            if (max_width && new_width > max_width)
+            {
+                height = new_height;
+            }
+            else if (max_height && new_height > max_height)
+            {
+                width = new_width;
+            }
+            else if (keep_width)
+            {
+                height = new_height;
+            }
+            else if (keep_height)
+            {
+                width = new_width;
+            }
+            else if (width > new_width)
+            {
+                height = new_height;
+            }
+            else
+            {
+                width = new_width;
+            }
+            g_debug("new w %d h %d\n", width, height);
+        }
+        width = MOD_ROUND(width, mod);
+        height = MOD_ROUND(height, mod);
+        if (max_height)
+            height = MIN(height, max_height);
+        if (max_width)
+            width = MIN(width, max_width);
+        par_width = par_height = 1;
+    }
+    ghb_settings_set_int(settings, "scale_width", width);
+    ghb_settings_set_int(settings, "scale_height", height);
+
+    gint disp_width;
 
-	disp_width = ((gdouble)par_width / par_height) * width + 0.5;
+    disp_width = ((gdouble)par_width / par_height) * width + 0.5;
     ghb_limit_rational(&par_width, &par_height, 65535);
 
-	ghb_settings_set_int(settings, "PicturePARWidth", par_width);
-	ghb_settings_set_int(settings, "PicturePARHeight", par_height);
-	ghb_settings_set_int(settings, "PictureDisplayWidth", disp_width);
-	ghb_settings_set_int(settings, "PictureDisplayHeight", height);
+    ghb_settings_set_int(settings, "PicturePARWidth", par_width);
+    ghb_settings_set_int(settings, "PicturePARHeight", par_height);
+    ghb_settings_set_int(settings, "PictureDisplayWidth", disp_width);
+    ghb_settings_set_int(settings, "PictureDisplayHeight", height);
+    hb_job_close( &job );
 }
 
 void
 ghb_set_scale(signal_user_data_t *ud, gint mode)
 {
-	if (ud->scale_busy) return;
-	ud->scale_busy = TRUE;
+    if (ud->scale_busy) return;
+    ud->scale_busy = TRUE;
 
-	ghb_set_scale_settings(ud->settings, mode);
-	picture_settings_deps(ud);
+    ghb_set_scale_settings(ud->settings, mode);
+    picture_settings_deps(ud);
 
-	// Step needs to be at least 2 because odd widths cause scaler crash
-	// subsampled chroma requires even crop values.
-	GtkWidget *widget;
-	int mod = ghb_settings_combo_int(ud->settings, "PictureModulus");
-	widget = GHB_WIDGET (ud->builder, "scale_width");
-	gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
-	widget = GHB_WIDGET (ud->builder, "scale_height");
-	gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
-
-	// "Noscale" is a flag that says we prefer to crop extra to satisfy
-	// alignment constraints rather than scaling to satisfy them.
-	gboolean noscale = ghb_settings_get_boolean(ud->settings, "PictureLooseCrop");
-	if (noscale)
-	{
-		widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
-		widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
-		widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
-		widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
-	}
-	else
-	{
-		widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
-		widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
-		widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
-		widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
-		gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
-	}
-
-	ghb_ui_update_from_settings(ud->builder, "autoscale", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureModulus", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureLooseCrop", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureKeepRatio", ud->settings);
-
-	ghb_ui_update_from_settings(ud->builder, "PictureTopCrop", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureBottomCrop", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureLeftCrop", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureRightCrop", ud->settings);
-
-	ghb_ui_update_from_settings(ud->builder, "scale_width", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "scale_height", ud->settings);
-
-	ghb_ui_update_from_settings(ud->builder, "PicturePARWidth", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PicturePARHeight", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureDisplayWidth", ud->settings);
-	ghb_ui_update_from_settings(ud->builder, "PictureDisplayHeight", ud->settings);
-	gint disp_width, disp_height, dar_width, dar_height;
-	gchar *str;
-
-	disp_width = ghb_settings_get_int(ud->settings, "PictureDisplayWidth");
-	disp_height = ghb_settings_get_int(ud->settings, "PictureDisplayHeight");
-	hb_reduce(&dar_width, &dar_height, disp_width, disp_height);
-	gint iaspect = dar_width * 9 / dar_height;
-	if (dar_width > 2 * dar_height)
-	{
-		str = g_strdup_printf("%.2f : 1", (gdouble)dar_width / dar_height);
-	}
-	else if (iaspect <= 16 && iaspect >= 15)
-	{
-		str = g_strdup_printf("%.2f : 9", (gdouble)dar_width * 9 / dar_height);
-	}
-	else if (iaspect <= 12 && iaspect >= 11)
-	{
-		str = g_strdup_printf("%.2f : 3", (gdouble)dar_width * 3 / dar_height);
-	}
-	else
-	{
-		str = g_strdup_printf("%d : %d", dar_width, dar_height);
-	}
-	ghb_ui_update(ud, "display_aspect", ghb_string_value(str));
-	g_free(str);
-	ud->scale_busy = FALSE;
+    // Step needs to be at least 2 because odd widths cause scaler crash
+    // subsampled chroma requires even crop values.
+    GtkWidget *widget;
+    int mod = ghb_settings_combo_int(ud->settings, "PictureModulus");
+    widget = GHB_WIDGET (ud->builder, "scale_width");
+    gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
+    widget = GHB_WIDGET (ud->builder, "scale_height");
+    gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
+
+    // "Noscale" is a flag that says we prefer to crop extra to satisfy
+    // alignment constraints rather than scaling to satisfy them.
+    gboolean noscale = ghb_settings_get_boolean(ud->settings, "PictureLooseCrop");
+    if (noscale)
+    {
+        widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
+        widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
+        widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
+        widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
+    }
+    else
+    {
+        widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
+        widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
+        widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
+        widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
+    }
+
+    ghb_ui_update_from_settings(ud->builder, "autoscale", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureModulus", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureLooseCrop", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureKeepRatio", ud->settings);
+
+    ghb_ui_update_from_settings(ud->builder, "PictureTopCrop", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureBottomCrop", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureLeftCrop", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureRightCrop", ud->settings);
+
+    ghb_ui_update_from_settings(ud->builder, "scale_width", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "scale_height", ud->settings);
+
+    ghb_ui_update_from_settings(ud->builder, "PicturePARWidth", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PicturePARHeight", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureDisplayWidth", ud->settings);
+    ghb_ui_update_from_settings(ud->builder, "PictureDisplayHeight", ud->settings);
+    gint disp_width, disp_height, dar_width, dar_height;
+    gchar *str;
+
+    disp_width = ghb_settings_get_int(ud->settings, "PictureDisplayWidth");
+    disp_height = ghb_settings_get_int(ud->settings, "PictureDisplayHeight");
+    hb_reduce(&dar_width, &dar_height, disp_width, disp_height);
+    gint iaspect = dar_width * 9 / dar_height;
+    if (dar_width > 2 * dar_height)
+    {
+        str = g_strdup_printf("%.2f : 1", (gdouble)dar_width / dar_height);
+    }
+    else if (iaspect <= 16 && iaspect >= 15)
+    {
+        str = g_strdup_printf("%.2f : 9", (gdouble)dar_width * 9 / dar_height);
+    }
+    else if (iaspect <= 12 && iaspect >= 11)
+    {
+        str = g_strdup_printf("%.2f : 3", (gdouble)dar_width * 3 / dar_height);
+    }
+    else
+    {
+        str = g_strdup_printf("%d : %d", dar_width, dar_height);
+    }
+    ghb_ui_update(ud, "display_aspect", ghb_string_value(str));
+    g_free(str);
+    ud->scale_busy = FALSE;
 }
 
 static void
 set_preview_job_settings(hb_job_t *job, GValue *settings)
 {
-	job->crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
-	job->crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
-	job->crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
-	job->crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
-
-	job->anamorphic.mode = ghb_settings_combo_int(settings, "PicturePAR");
-	job->modulus = 
-		ghb_settings_combo_int(settings, "PictureModulus");
-	job->width = ghb_settings_get_int(settings, "scale_width");
-	job->height = ghb_settings_get_int(settings, "scale_height");
-	if (ghb_settings_get_boolean(settings, "show_crop"))
-	{
-		gdouble xscale = (gdouble)job->width / 
-			(gdouble)(job->title->width - job->crop[2] - job->crop[3]);
-		gdouble yscale = (gdouble)job->height / 
-			(gdouble)(job->title->height - job->crop[0] - job->crop[1]);
-	
-		job->width += xscale * (job->crop[2] + job->crop[3]);
-		job->height += yscale * (job->crop[0] + job->crop[1]);
-		job->crop[0] = 0;
-		job->crop[1] = 0;
-		job->crop[2] = 0;
-		job->crop[3] = 0;
-		job->modulus = 2;
-	}
-
-	gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
-	if (decomb_deint)
-	{
-		gint decomb = ghb_settings_combo_int(settings, "PictureDecomb");
-		job->deinterlace = (decomb == 0) ? 0 : 1;
-	}
-	else
-	{
-		gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
-		job->deinterlace = (deint == 0) ? 0 : 1;
-	}
-
-	gboolean keep_aspect;
-	keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
-	if (job->anamorphic.mode)
-	{
-		job->anamorphic.par_width = job->title->pixel_aspect_width;
-		job->anamorphic.par_height = job->title->pixel_aspect_height;
-		job->anamorphic.dar_width = 0;
-		job->anamorphic.dar_height = 0;
-
-		if (job->anamorphic.mode == 3 && !keep_aspect)
-		{
-			job->anamorphic.keep_display_aspect = 0;
-			job->anamorphic.par_width = 
-				ghb_settings_get_int(settings, "PicturePARWidth");
-			job->anamorphic.par_height = 
-				ghb_settings_get_int(settings, "PicturePARHeight");
-		}
-		else
-		{
-			job->anamorphic.keep_display_aspect = 1;
-		}
-	}
+    job->crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
+    job->crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
+    job->crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
+    job->crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
+
+    job->anamorphic.mode = ghb_settings_combo_int(settings, "PicturePAR");
+    job->modulus = 
+        ghb_settings_combo_int(settings, "PictureModulus");
+    job->width = ghb_settings_get_int(settings, "scale_width");
+    job->height = ghb_settings_get_int(settings, "scale_height");
+    if (ghb_settings_get_boolean(settings, "preview_show_crop"))
+    {
+        gdouble xscale = (gdouble)job->width / 
+            (gdouble)(job->title->width - job->crop[2] - job->crop[3]);
+        gdouble yscale = (gdouble)job->height / 
+            (gdouble)(job->title->height - job->crop[0] - job->crop[1]);
+    
+        job->width += xscale * (job->crop[2] + job->crop[3]);
+        job->height += yscale * (job->crop[0] + job->crop[1]);
+        job->crop[0] = 0;
+        job->crop[1] = 0;
+        job->crop[2] = 0;
+        job->crop[3] = 0;
+        job->modulus = 2;
+    }
+
+    gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
+    if (decomb_deint)
+    {
+        gint decomb = ghb_settings_combo_int(settings, "PictureDecomb");
+        job->deinterlace = (decomb == 0) ? 0 : 1;
+    }
+    else
+    {
+        gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
+        job->deinterlace = (deint == 0) ? 0 : 1;
+    }
+
+    gboolean keep_aspect;
+    keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
+    if (job->anamorphic.mode)
+    {
+        job->anamorphic.par_width = job->title->pixel_aspect_width;
+        job->anamorphic.par_height = job->title->pixel_aspect_height;
+        job->anamorphic.dar_width = 0;
+        job->anamorphic.dar_height = 0;
+
+        if (job->anamorphic.mode == 3 && !keep_aspect)
+        {
+            job->anamorphic.keep_display_aspect = 0;
+            job->anamorphic.par_width = 
+                ghb_settings_get_int(settings, "PicturePARWidth");
+            job->anamorphic.par_height = 
+                ghb_settings_get_int(settings, "PicturePARHeight");
+        }
+        else
+        {
+            job->anamorphic.keep_display_aspect = 1;
+        }
+    }
 }
 
 gboolean
 ghb_validate_filter_string(const gchar *str, gint max_fields)
 {
-	gint fields = 0;
-	gchar *end;
-	gdouble val;
-
-	if (str == NULL || *str == 0) return TRUE;
-	while (*str)
-	{
-		val = g_strtod(str, &end);
-		if (str != end)
-		{ // Found a numeric value
-			fields++;
-			// negative max_fields means infinate
-			if (max_fields >= 0 && fields > max_fields) return FALSE;
-			if (*end == 0)
-				return TRUE;
-			if (*end != ':')
-				return FALSE;
-			str = end + 1;
-		}
-		else
-			return FALSE;
-	}
-	return FALSE;
+    gint fields = 0;
+    gchar *end;
+
+    if (str == NULL || *str == 0) return TRUE;
+    while (*str)
+    {
+        g_strtod(str, &end);
+        if (str != end)
+        { // Found a numeric value
+            fields++;
+            // negative max_fields means infinate
+            if (max_fields >= 0 && fields > max_fields) return FALSE;
+            if (*end == 0)
+                return TRUE;
+            if (*end != ':')
+                return FALSE;
+            str = end + 1;
+        }
+        else
+            return FALSE;
+    }
+    return FALSE;
 }
 
 gboolean
 ghb_validate_filters(GValue *settings)
 {
-	gchar *str;
-	gint index;
-	gchar *message;
-
-	gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
-	// deinte
-	index = ghb_settings_combo_int(settings, "PictureDeinterlace");
-	if (!decomb_deint && index == 1)
-	{
-		str = ghb_settings_get_string(settings, "PictureDeinterlaceCustom");
-		if (!ghb_validate_filter_string(str, -1))
-		{
-			message = g_strdup_printf(
-						"Invalid Deinterlace Settings:\n\n%s\n",
-						str);
-			ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-			g_free(message);
-			g_free(str);
-			return FALSE;
-		}
-		g_free(str);
-	}
-	// detel
-	index = ghb_settings_combo_int(settings, "PictureDetelecine");
-	if (index == 1)
-	{
-		str = ghb_settings_get_string(settings, "PictureDetelecineCustom");
-		if (!ghb_validate_filter_string(str, -1))
-		{
-			message = g_strdup_printf(
-						"Invalid Detelecine Settings:\n\n%s\n",
-						str);
-			ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-			g_free(message);
-			g_free(str);
-			return FALSE;
-		}
-		g_free(str);
-	}
-	// decomb
-	index = ghb_settings_combo_int(settings, "PictureDecomb");
-	if (decomb_deint && index == 1)
-	{
-		str = ghb_settings_get_string(settings, "PictureDecombCustom");
-		if (!ghb_validate_filter_string(str, -1))
-		{
-			message = g_strdup_printf(
-						"Invalid Decomb Settings:\n\n%s\n",
-						str);
-			ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-			g_free(message);
-			g_free(str);
-			return FALSE;
-		}
-		g_free(str);
-	}
-	// denois
-	index = ghb_settings_combo_int(settings, "PictureDenoise");
-	if (index == 1)
-	{
-		str = ghb_settings_get_string(settings, "PictureDenoiseCustom");
-		if (!ghb_validate_filter_string(str, -1))
-		{
-			message = g_strdup_printf(
-						"Invalid Denoise Settings:\n\n%s\n",
-						str);
-			ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-			g_free(str);
-			g_free(message);
-			return FALSE;
-		}
-		g_free(str);
-	}
-	return TRUE;
+    gchar *str;
+    gint index;
+    gchar *message;
+
+    gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
+    // deinte
+    index = ghb_settings_combo_int(settings, "PictureDeinterlace");
+    if (!decomb_deint && index == 1)
+    {
+        str = ghb_settings_get_string(settings, "PictureDeinterlaceCustom");
+        if (!ghb_validate_filter_string(str, -1))
+        {
+            message = g_strdup_printf(
+                        "Invalid Deinterlace Settings:\n\n%s\n",
+                        str);
+            ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+            g_free(message);
+            g_free(str);
+            return FALSE;
+        }
+        g_free(str);
+    }
+    // detel
+    index = ghb_settings_combo_int(settings, "PictureDetelecine");
+    if (index == 1)
+    {
+        str = ghb_settings_get_string(settings, "PictureDetelecineCustom");
+        if (!ghb_validate_filter_string(str, -1))
+        {
+            message = g_strdup_printf(
+                        "Invalid Detelecine Settings:\n\n%s\n",
+                        str);
+            ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+            g_free(message);
+            g_free(str);
+            return FALSE;
+        }
+        g_free(str);
+    }
+    // decomb
+    index = ghb_settings_combo_int(settings, "PictureDecomb");
+    if (decomb_deint && index == 1)
+    {
+        str = ghb_settings_get_string(settings, "PictureDecombCustom");
+        if (!ghb_validate_filter_string(str, -1))
+        {
+            message = g_strdup_printf(
+                        "Invalid Decomb Settings:\n\n%s\n",
+                        str);
+            ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+            g_free(message);
+            g_free(str);
+            return FALSE;
+        }
+        g_free(str);
+    }
+    // denois
+    index = ghb_settings_combo_int(settings, "PictureDenoise");
+    if (index == 1)
+    {
+        str = ghb_settings_get_string(settings, "PictureDenoiseCustom");
+        if (!ghb_validate_filter_string(str, -1))
+        {
+            message = g_strdup_printf(
+                        "Invalid Denoise Settings:\n\n%s\n",
+                        str);
+            ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+            g_free(str);
+            g_free(message);
+            return FALSE;
+        }
+        g_free(str);
+    }
+    return TRUE;
 }
 
 gboolean
 ghb_validate_video(GValue *settings)
 {
-	gint vcodec, mux;
-	gchar *message;
+    gint vcodec, mux;
+    gchar *message;
 
-	mux = ghb_settings_combo_int(settings, "FileFormat");
-	vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
-	if ((mux == HB_MUX_MP4) && (vcodec == HB_VCODEC_THEORA))
-	{
-		// mp4/theora combination is not supported.
-		message = g_strdup_printf(
-					"Theora is not supported in the MP4 container.\n\n"
-					"You should choose a different video codec or container.\n"
-					"If you continue, FFMPEG will be chosen for you.");
-		if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
-		{
-			g_free(message);
-			return FALSE;
-		}
-		g_free(message);
-		ghb_settings_set_int(settings, "VideoEncoder", HB_VCODEC_FFMPEG_MPEG4);
-	}
-	return TRUE;
+    mux = ghb_settings_combo_int(settings, "FileFormat");
+    vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
+    if ((mux == HB_MUX_MP4) && (vcodec == HB_VCODEC_THEORA))
+    {
+        // mp4/theora combination is not supported.
+        message = g_strdup_printf(
+                    "Theora is not supported in the MP4 container.\n\n"
+                    "You should choose a different video codec or container.\n"
+                    "If you continue, FFMPEG will be chosen for you.");
+        if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+        {
+            g_free(message);
+            return FALSE;
+        }
+        g_free(message);
+        ghb_settings_set_int(settings, "VideoEncoder", HB_VCODEC_FFMPEG_MPEG4);
+    }
+    return TRUE;
 }
 
 gboolean
 ghb_validate_subtitles(GValue *settings)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	gchar *message;
-
-	if (h_scan == NULL) return FALSE;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		g_message("No title found.\n");
-		return FALSE;
-	}
+    hb_title_t * title;
+    gchar *message;
 
-	gint titleindex;
+    gint titleindex;
 
-	titleindex = ghb_settings_combo_int(settings, "title");
-    title = hb_list_item( list, titleindex );
-	if (title == NULL) return FALSE;
+    titleindex = ghb_settings_combo_int(settings, "title");
+    title = ghb_get_title_info(titleindex);
+    if (title == NULL)
+    {
+        /* No valid title, stop right there */
+        g_message("No title found.\n");
+        return FALSE;
+    }
 
-	const GValue *slist, *subtitle;
-	gint count, ii, source;
-	gboolean burned, one_burned = FALSE;
-
-	slist = ghb_settings_get_value(settings, "subtitle_list");
-	count = ghb_array_len(slist);
-	for (ii = 0; ii < count; ii++)
-	{
-		subtitle = ghb_array_get_nth(slist, ii);
-		source = ghb_settings_get_int(subtitle, "SubtitleSource");
-		burned = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
-		if (burned && one_burned)
-		{
-			// MP4 can only handle burned vobsubs.  make sure there isn't
-			// already something burned in the list
-			message = g_strdup_printf(
-			"Only one subtitle may be burned into the video.\n\n"
-				"You should change your subtitle selections.\n"
-				"If you continue, some subtitles will be lost.");
-			if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-			break;
-		}
-		else if (burned)
-		{
-			one_burned = TRUE;
-		}
-		if (source == SRTSUB)
-		{
-			gchar *filename;
-
-			filename = ghb_settings_get_string(subtitle, "SrtFile");
-			if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
-			{
-				message = g_strdup_printf(
-				"Srt file does not exist or not a regular file.\n\n"
-					"You should choose a valid file.\n"
-					"If you continue, this subtitle will be ignored.");
-				if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, 
-					"Cancel", "Continue"))
-				{
-					g_free(message);
-					return FALSE;
-				}
-				g_free(message);
-				break;
-			}
-		}
-	}
-	return TRUE;
+    const GValue *slist, *subtitle;
+    gint count, ii, source;
+    gboolean burned, one_burned = FALSE;
+
+    slist = ghb_settings_get_value(settings, "subtitle_list");
+    count = ghb_array_len(slist);
+    for (ii = 0; ii < count; ii++)
+    {
+        subtitle = ghb_array_get_nth(slist, ii);
+        source = ghb_settings_get_int(subtitle, "SubtitleSource");
+        burned = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
+        if (burned && one_burned)
+        {
+            // MP4 can only handle burned vobsubs.  make sure there isn't
+            // already something burned in the list
+            message = g_strdup_printf(
+            "Only one subtitle may be burned into the video.\n\n"
+                "You should change your subtitle selections.\n"
+                "If you continue, some subtitles will be lost.");
+            if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+            {
+                g_free(message);
+                return FALSE;
+            }
+            g_free(message);
+            break;
+        }
+        else if (burned)
+        {
+            one_burned = TRUE;
+        }
+        if (source == SRTSUB)
+        {
+            gchar *filename;
+
+            filename = ghb_settings_get_string(subtitle, "SrtFile");
+            if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+            {
+                message = g_strdup_printf(
+                "Srt file does not exist or not a regular file.\n\n"
+                    "You should choose a valid file.\n"
+                    "If you continue, this subtitle will be ignored.");
+                if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, 
+                    "Cancel", "Continue"))
+                {
+                    g_free(message);
+                    return FALSE;
+                }
+                g_free(message);
+                break;
+            }
+        }
+    }
+    return TRUE;
 }
 
 gboolean
 ghb_validate_audio(GValue *settings)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	gchar *message;
-	GValue *value;
-
-	if (h_scan == NULL) return FALSE;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		g_message("No title found.\n");
-		return FALSE;
-	}
+    hb_title_t * title;
+    gchar *message;
+    GValue *value;
+
+    gint titleindex;
+
+    titleindex = ghb_settings_combo_int(settings, "title");
+    title = ghb_get_title_info( titleindex );
+    if (title == NULL)
+    {
+        /* No valid title, stop right there */
+        g_message("No title found.\n");
+        return FALSE;
+    }
+    gint mux = ghb_settings_combo_int(settings, "FileFormat");
 
-	gint titleindex;
+    const GValue *audio_list;
+    gint count, ii;
 
-	titleindex = ghb_settings_combo_int(settings, "title");
-    title = hb_list_item( list, titleindex );
-	if (title == NULL) return FALSE;
-	gint mux = ghb_settings_combo_int(settings, "FileFormat");
-
-	const GValue *audio_list;
-	gint count, ii;
+    audio_list = ghb_settings_get_value(settings, "audio_list");
+    count = ghb_array_len(audio_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *asettings;
+        hb_audio_config_t *aconfig;
 
-	audio_list = ghb_settings_get_value(settings, "audio_list");
-	count = ghb_array_len(audio_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *asettings;
-	    hb_audio_config_t *aconfig;
-
-		asettings = ghb_array_get_nth(audio_list, ii);
-		gint track = ghb_settings_combo_int(asettings, "AudioTrack");
-		gint codec = ghb_settings_combo_int(asettings, "AudioEncoder");
-		if (codec == HB_ACODEC_AUTO_PASS)
-			continue;
+        asettings = ghb_array_get_nth(audio_list, ii);
+        gint track = ghb_settings_combo_int(asettings, "AudioTrack");
+        gint codec = ghb_settings_combo_int(asettings, "AudioEncoder");
+        if (codec == HB_ACODEC_AUTO_PASS)
+            continue;
 
         aconfig = (hb_audio_config_t *) hb_list_audio_config_item(
-											title->list_audio, track );
-		if ( ghb_audio_is_passthru(codec) &&
-			!(ghb_audio_can_passthru(aconfig->in.codec) && 
-			 (aconfig->in.codec & codec)))
-		{
-			// Not supported.  AC3 is passthrough only, so input must be AC3
-			message = g_strdup_printf(
-						"The source does not support Pass-Thru.\n\n"
-						"You should choose a different audio codec.\n"
-						"If you continue, one will be chosen for you.");
-			if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-			if ((codec & HB_ACODEC_AC3) ||
-				(aconfig->in.codec & HB_ACODEC_MASK) == HB_ACODEC_DCA)
-			{
-				codec = HB_ACODEC_AC3;
-			}
-			else if (mux == HB_MUX_MKV)
-			{
-				codec = HB_ACODEC_LAME;
-			}
-			else
-			{
-				codec = HB_ACODEC_FAAC;
-			}
-			value = ghb_lookup_acodec_value(codec);
-			ghb_settings_take_value(asettings, "AudioEncoder", value);
-		}
-		gchar *a_unsup = NULL;
-		gchar *mux_s = NULL;
-		if (mux == HB_MUX_MP4)
-		{ 
-			mux_s = "MP4";
-			// mp4/vorbis|DTS combination is not supported.
-			if (codec == HB_ACODEC_VORBIS)
-			{
-				a_unsup = "Vorbis";
-				codec = HB_ACODEC_FAAC;
-			}
-		}
-		if (a_unsup)
-		{
-			message = g_strdup_printf(
-						"%s is not supported in the %s container.\n\n"
-						"You should choose a different audio codec.\n"
-						"If you continue, one will be chosen for you.", a_unsup, mux_s);
-			if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-			value = ghb_lookup_acodec_value(codec);
-			ghb_settings_take_value(asettings, "AudioEncoder", value);
-		}
-
-		gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
-		gboolean allow_mono = TRUE;
-		gboolean allow_stereo = TRUE;
-		gboolean allow_dolby = TRUE;
-		gboolean allow_dpl2 = TRUE;
-		gboolean allow_6ch = TRUE;
-		allow_mono = TRUE;
-
-		gint best = hb_get_best_mixdown(codec, aconfig->in.channel_layout, 0);
-
-		allow_stereo = best >= HB_AMIXDOWN_STEREO;
-		allow_dolby = best >= HB_AMIXDOWN_DOLBY;
-		allow_dpl2 = best >= HB_AMIXDOWN_DOLBYPLII;
-		allow_6ch = best >= HB_AMIXDOWN_6CH;
-
-		gchar *mix_unsup = NULL;
-		if (mix == HB_AMIXDOWN_MONO && !allow_mono)
-		{
-			mix_unsup = "mono";
-		}
-		if (mix == HB_AMIXDOWN_STEREO && !allow_stereo)
-		{
-			mix_unsup = "stereo";
-		}
-		if (mix == HB_AMIXDOWN_DOLBY && !allow_dolby)
-		{
-			mix_unsup = "Dolby";
-		}
-		if (mix == HB_AMIXDOWN_DOLBYPLII && !allow_dpl2)
-		{
-			mix_unsup = "Dolby Pro Logic II";
-		}
-		if (mix == HB_AMIXDOWN_6CH && !allow_6ch)
-		{
-			mix_unsup = "6 Channel";
-		}
-		if (mix_unsup)
-		{
-			message = g_strdup_printf(
-						"The source audio does not support %s mixdown.\n\n"
-						"You should choose a different mixdown.\n"
-						"If you continue, one will be chosen for you.", mix_unsup);
-			if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-			mix = ghb_get_best_mix(aconfig, codec, mix);
-			value = get_amix_value(mix);
-			ghb_settings_take_value(asettings, "AudioMixdown", value);
-		}
-	}
-	return TRUE;
+                                            title->list_audio, track );
+        if ( ghb_audio_is_passthru(codec) &&
+            !(ghb_audio_can_passthru(aconfig->in.codec) && 
+             (aconfig->in.codec & codec)))
+        {
+            // Not supported.  AC3 is passthrough only, so input must be AC3
+            message = g_strdup_printf(
+                        "The source does not support Pass-Thru.\n\n"
+                        "You should choose a different audio codec.\n"
+                        "If you continue, one will be chosen for you.");
+            if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+            {
+                g_free(message);
+                return FALSE;
+            }
+            g_free(message);
+            if ((codec & HB_ACODEC_AC3) ||
+                (aconfig->in.codec & HB_ACODEC_MASK) == HB_ACODEC_DCA)
+            {
+                codec = HB_ACODEC_AC3;
+            }
+            else if (mux == HB_MUX_MKV)
+            {
+                codec = HB_ACODEC_LAME;
+            }
+            else
+            {
+                codec = HB_ACODEC_FAAC;
+            }
+            value = ghb_lookup_acodec_value(codec);
+            ghb_settings_take_value(asettings, "AudioEncoder", value);
+        }
+        gchar *a_unsup = NULL;
+        gchar *mux_s = NULL;
+        if (mux == HB_MUX_MP4)
+        { 
+            mux_s = "MP4";
+            // mp4/vorbis|DTS combination is not supported.
+            if (codec == HB_ACODEC_VORBIS)
+            {
+                a_unsup = "Vorbis";
+                codec = HB_ACODEC_FAAC;
+            }
+        }
+        if (a_unsup)
+        {
+            message = g_strdup_printf(
+                        "%s is not supported in the %s container.\n\n"
+                        "You should choose a different audio codec.\n"
+                        "If you continue, one will be chosen for you.", a_unsup, mux_s);
+            if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+            {
+                g_free(message);
+                return FALSE;
+            }
+            g_free(message);
+            value = ghb_lookup_acodec_value(codec);
+            ghb_settings_take_value(asettings, "AudioEncoder", value);
+        }
+
+        gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
+
+        gint jj;
+        const gchar *mix_unsup = NULL;
+        if (!hb_mixdown_is_supported(mix, codec, aconfig->in.channel_layout))
+        {
+            for (jj = 0; jj < hb_audio_mixdowns_count; jj++)
+            {
+                if (mix == hb_audio_mixdowns[jj].amixdown)
+                {
+                    {
+                        mix_unsup = hb_audio_mixdowns[jj].human_readable_name;
+                    }
+                }
+            }
+        }
+        if (mix_unsup)
+        {
+            message = g_strdup_printf(
+                        "The source audio does not support %s mixdown.\n\n"
+                        "You should choose a different mixdown.\n"
+                        "If you continue, one will be chosen for you.", mix_unsup);
+            if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+            {
+                g_free(message);
+                return FALSE;
+            }
+            g_free(message);
+            mix = ghb_get_best_mix(aconfig, codec, mix);
+            value = get_amix_value(mix);
+            ghb_settings_take_value(asettings, "AudioMixdown", value);
+        }
+    }
+    return TRUE;
 }
 
 gboolean
 ghb_validate_vquality(GValue *settings)
 {
-	gint vcodec;
-	gchar *message;
-	gint min, max;
-
-	if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE;
-	vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
-	gdouble vquality;
-	vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
-	if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
-	{
-		switch (vcodec)
-		{
-			case HB_VCODEC_X264:
-			{
-				min = 16;
-				max = 30;
-			} break;
-
-			case HB_VCODEC_FFMPEG_MPEG2:
-			case HB_VCODEC_FFMPEG_MPEG4:
-			{
-				min = 1;
-				max = 8;
-			} break;
-
-			case HB_VCODEC_THEORA:
-			{
-				min = 0;
-				max = 63;
-			} break;
-
-			default:
-			{
-				min = 48;
-				max = 62;
-			} break;
-		}
-		if (vcodec == HB_VCODEC_X264 && vquality == 0.0)
-		{
-			message = g_strdup_printf(
-						"Warning: lossless h.264 selected\n\n"
-						"Lossless h.264 is not well supported by\n"
-						"many players and editors.\n\n"
+    gint vcodec;
+    gchar *message;
+    gint min, max;
+
+    if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE;
+    vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
+    gdouble vquality;
+    vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
+    if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
+    {
+        switch (vcodec)
+        {
+            case HB_VCODEC_X264:
+            {
+                min = 16;
+                max = 30;
+            } break;
+
+            case HB_VCODEC_FFMPEG_MPEG2:
+            case HB_VCODEC_FFMPEG_MPEG4:
+            {
+                min = 1;
+                max = 8;
+            } break;
+
+            case HB_VCODEC_THEORA:
+            {
+                min = 0;
+                max = 63;
+            } break;
+
+            default:
+            {
+                min = 48;
+                max = 62;
+            } break;
+        }
+        if (vcodec == HB_VCODEC_X264 && vquality == 0.0)
+        {
+            message = g_strdup_printf(
+                        "Warning: lossless h.264 selected\n\n"
+                        "Lossless h.264 is not well supported by\n"
+                        "many players and editors.\n\n"
                         "It will produce enormous output files.\n\n"
-						"Are you sure you wish to use this setting?");
-			if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, 
-									"Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-		}
-		else if (vquality < min || vquality > max)
-		{
-			message = g_strdup_printf(
-						"Interesting video quality choice: %d\n\n"
-						"Typical values range from %d to %d.\n\n"
-						"Are you sure you wish to use this setting?",
-						(gint)vquality, min, max);
-			if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, 
-									"Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-		}
-	}
-	return TRUE;
+                        "Are you sure you wish to use this setting?");
+            if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, 
+                                    "Cancel", "Continue"))
+            {
+                g_free(message);
+                return FALSE;
+            }
+            g_free(message);
+            ghb_settings_set_string(settings, "h264Profile", "auto");
+        }
+        else if (vquality < min || vquality > max)
+        {
+            message = g_strdup_printf(
+                        "Interesting video quality choice: %d\n\n"
+                        "Typical values range from %d to %d.\n\n"
+                        "Are you sure you wish to use this setting?",
+                        (gint)vquality, min, max);
+            if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, 
+                                    "Cancel", "Continue"))
+            {
+                g_free(message);
+                return FALSE;
+            }
+            g_free(message);
+        }
+    }
+    return TRUE;
 }
 
 static void
 add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 {
-	hb_list_t  * list;
-	hb_title_t * title;
-	hb_job_t   * job;
-	static gchar *advanced_opts;
-	gint sub_id = 0;
-	gboolean tweaks = FALSE;
-	gchar *detel_str = NULL;
-	gchar *decomb_str = NULL;
-	gchar *deint_str = NULL;
-	gchar *deblock_str = NULL;
-	gchar *denoise_str = NULL;
-	gchar *dest_str = NULL;
-
-	g_debug("add_job()\n");
-	if (h == NULL) return;
-	list = hb_get_titles( h );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return;
-	}
+    hb_list_t  * list;
+    hb_title_t * title;
+    hb_job_t   * job;
+    gint sub_id = 0;
+    hb_filter_object_t * filter;
+    gchar *filter_str;
+    gchar *dest_str = NULL;
+
+    g_debug("add_job()\n");
+    if (h == NULL) return;
+    list = hb_get_titles( h );
+    if( !hb_list_count( list ) )
+    {
+        /* No valid title, stop right there */
+        return;
+    }
 
     title = hb_list_item( list, titleindex );
-	if (title == NULL) return;
+    if (title == NULL) return;
+
+    /* Set job settings */
+    job = hb_job_init( title );
+    if (job == NULL) return;
+
+    job->angle = ghb_settings_get_int(js, "angle");
+    job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1;
+    if (job->start_at_preview)
+    {
+        job->seek_points = ghb_settings_get_int(js, "preview_count");
+        job->pts_to_stop = ghb_settings_get_int(js, "live_duration") * 90000LL;
+    }
+
+    job->mux = ghb_settings_combo_int(js, "FileFormat");
+    if (job->mux == HB_MUX_MP4)
+    {
+        job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
+        job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
+    }
+    else
+    {
+        job->largeFileSize = FALSE;
+        job->mp4_optimize = FALSE;
+    }
+    if (!job->start_at_preview)
+    {
+        gint start, end;
+        gint num_chapters = hb_list_count(title->list_chapter);
+        gint duration = title->duration / 90000;
+        job->chapter_markers = FALSE;
+        job->chapter_start = 1;
+        job->chapter_end = num_chapters;
 
-	/* Set job settings */
-	job   = title->job;
-	if (job == NULL) return;
-
-	job->angle = ghb_settings_get_int(js, "angle");
-	job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1;
-	if (job->start_at_preview)
-	{
-		job->seek_points = ghb_settings_get_int(js, "preview_count");
-		job->pts_to_stop = ghb_settings_get_int(js, "live_duration") * 90000LL;
-	}
-
-	tweaks = ghb_settings_get_boolean(js, "allow_tweaks");
-	job->mux = ghb_settings_combo_int(js, "FileFormat");
-	if (job->mux == HB_MUX_MP4)
-	{
-		job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
-		job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
-	}
-	else
-	{
-		job->largeFileSize = FALSE;
-		job->mp4_optimize = FALSE;
-	}
-	if (!job->start_at_preview)
-	{
-		gint start, end;
-		gint num_chapters = hb_list_count(title->list_chapter);
-		gint duration = title->duration / 90000;
-		job->chapter_markers = FALSE;
-		job->chapter_start = 1;
-		job->chapter_end = num_chapters;
-
-		if (ghb_settings_combo_int(js, "PtoPType") == 0)
-		{
-			start = ghb_settings_get_int(js, "start_point");
-			end = ghb_settings_get_int(js, "end_point");
-			job->chapter_start = MIN( num_chapters, start );
-			job->chapter_end   = MAX( job->chapter_start, end );
-
-		}
-		if (ghb_settings_combo_int(js, "PtoPType") == 1)
-		{
-			start = ghb_settings_get_int(js, "start_point");
-			end = ghb_settings_get_int(js, "end_point");
-			job->pts_to_start = (int64_t)MIN(duration-1, start) * 90000;
-			job->pts_to_stop = (int64_t)MAX(start+1, end) * 90000 - 
-								job->pts_to_start;
-		}
-		if (ghb_settings_combo_int(js, "PtoPType") == 2)
-		{
-			start = ghb_settings_get_int(js, "start_point");
-			end = ghb_settings_get_int(js, "end_point");
-			gint64 max_frames;
-			max_frames = (gint64)duration * title->rate / title->rate_base;
-			job->frame_to_start = (int64_t)MIN(max_frames-1, start-1);
-			job->frame_to_stop = (int64_t)MAX(start, end-1) - 
-								 job->frame_to_start;
-		}
-		if (job->chapter_start != job->chapter_end)
-		{
-			job->chapter_markers = ghb_settings_get_boolean(js, "ChapterMarkers");
-		}
-		if (job->chapter_start == job->chapter_end)
-			job->chapter_markers = 0;
-		if ( job->chapter_markers )
-		{
-			GValue *chapters;
-			GValue *chapter;
-			gint chap;
-			gint count;
-
-			chapters = ghb_settings_get_value(js, "chapter_list");
-			count = ghb_array_len(chapters);
-			for(chap = 0; chap < count; chap++)
-			{
-				hb_chapter_t * chapter_s;
-				gchar *name;
-
-				name = NULL;
-				chapter = ghb_array_get_nth(chapters, chap);
-				name = ghb_value_string(chapter); 
-				if (name == NULL)
-				{
-					name = g_strdup_printf ("Chapter %2d", chap+1);
-				}
-				chapter_s = hb_list_item( job->title->list_chapter, chap);
-				strncpy(chapter_s->title, name, 1023);
-				chapter_s->title[1023] = '\0';
-				g_free(name);
-			}
-		}
-	}
-	job->crop[0] = ghb_settings_get_int(js, "PictureTopCrop");
-	job->crop[1] = ghb_settings_get_int(js, "PictureBottomCrop");
-	job->crop[2] = ghb_settings_get_int(js, "PictureLeftCrop");
-	job->crop[3] = ghb_settings_get_int(js, "PictureRightCrop");
-
-	
-	gboolean decomb_deint = ghb_settings_get_boolean(js, "PictureDecombDeinterlace");
-	gint decomb = ghb_settings_combo_int(js, "PictureDecomb");
-	gint deint = ghb_settings_combo_int(js, "PictureDeinterlace");
-	if (!decomb_deint)
-		job->deinterlace = (deint != 0) ? 1 : 0;
-	else
-		job->deinterlace = 0;
+        if (ghb_settings_combo_int(js, "PtoPType") == 0)
+        {
+            start = ghb_settings_get_int(js, "start_point");
+            end = ghb_settings_get_int(js, "end_point");
+            job->chapter_start = MIN( num_chapters, start );
+            job->chapter_end   = MAX( job->chapter_start, end );
+
+        }
+        if (ghb_settings_combo_int(js, "PtoPType") == 1)
+        {
+            start = ghb_settings_get_int(js, "start_point");
+            end = ghb_settings_get_int(js, "end_point");
+            job->pts_to_start = (int64_t)MIN(duration-1, start) * 90000;
+            job->pts_to_stop = (int64_t)MAX(start+1, end) * 90000 - 
+                                job->pts_to_start;
+        }
+        if (ghb_settings_combo_int(js, "PtoPType") == 2)
+        {
+            start = ghb_settings_get_int(js, "start_point");
+            end = ghb_settings_get_int(js, "end_point");
+            gint64 max_frames;
+            max_frames = (gint64)duration * title->rate / title->rate_base;
+            job->frame_to_start = (int64_t)MIN(max_frames-1, start-1);
+            job->frame_to_stop = (int64_t)MAX(start, end-1) - 
+                                 job->frame_to_start;
+        }
+        if (job->chapter_start != job->chapter_end)
+        {
+            job->chapter_markers = ghb_settings_get_boolean(js, "ChapterMarkers");
+        }
+        if (job->chapter_start == job->chapter_end)
+            job->chapter_markers = 0;
+        if ( job->chapter_markers )
+        {
+            GValue *chapters;
+            GValue *chapter;
+            gint chap;
+            gint count;
+
+            chapters = ghb_settings_get_value(js, "chapter_list");
+            count = ghb_array_len(chapters);
+            for(chap = 0; chap < count; chap++)
+            {
+                hb_chapter_t * chapter_s;
+                gchar *name;
+
+                name = NULL;
+                chapter = ghb_array_get_nth(chapters, chap);
+                name = ghb_value_string(chapter); 
+                if (name == NULL)
+                {
+                    name = g_strdup_printf ("Chapter %2d", chap+1);
+                }
+                chapter_s = hb_list_item( job->list_chapter, chap);
+                hb_chapter_set_title(chapter_s, name);
+                g_free(name);
+            }
+        }
+    }
+    
+    gboolean decomb_deint = ghb_settings_get_boolean(js, "PictureDecombDeinterlace");
+    gint decomb = ghb_settings_combo_int(js, "PictureDecomb");
+    gint deint = ghb_settings_combo_int(js, "PictureDeinterlace");
+    if (!decomb_deint)
+        job->deinterlace = (deint != 0) ? 1 : 0;
+    else
+        job->deinterlace = 0;
     job->grayscale   = ghb_settings_get_boolean(js, "VideoGrayScale");
 
-	gboolean keep_aspect;
-	keep_aspect = ghb_settings_get_boolean(js, "PictureKeepRatio");
-	job->anamorphic.mode = ghb_settings_combo_int(js, "PicturePAR");
-	job->modulus = ghb_settings_combo_int(js, "PictureModulus");
-	if (job->anamorphic.mode)
-	{
-		job->anamorphic.par_width = title->pixel_aspect_width;
-		job->anamorphic.par_height = title->pixel_aspect_height;
-		job->anamorphic.dar_width = 0;
-		job->anamorphic.dar_height = 0;
-
-		if (job->anamorphic.mode == 3 && !keep_aspect)
-		{
-			job->anamorphic.keep_display_aspect = 0;
-			job->anamorphic.par_width = 
-				ghb_settings_get_int(js, "PicturePARWidth");
-			job->anamorphic.par_height = 
-				ghb_settings_get_int(js, "PicturePARHeight");
-		}
-		else
-		{
-			job->anamorphic.keep_display_aspect = 1;
-		}
-	}
-
-	/* Add selected filters */
-	job->filters = hb_list_init();
-	gint detel = ghb_settings_combo_int(js, "PictureDetelecine");
-	if ( detel )
-	{
-		if (detel != 1)
-		{
-			if (detel_opts.map[detel].svalue != NULL)
-				detel_str = g_strdup(detel_opts.map[detel].svalue);
-		}
-		else
-			detel_str = ghb_settings_get_string(js, "PictureDetelecineCustom");
-		hb_filter_detelecine.settings = detel_str;
-		hb_list_add( job->filters, &hb_filter_detelecine );
-	}
-	if ( decomb_deint && decomb )
-	{
-		if (decomb != 1)
-		{
-			if (decomb_opts.map[decomb].svalue != NULL)
-				decomb_str = g_strdup(decomb_opts.map[decomb].svalue);
-		}
-		else
-			decomb_str = ghb_settings_get_string(js, "PictureDecombCustom");
-		hb_filter_decomb.settings = decomb_str;
-		hb_list_add( job->filters, &hb_filter_decomb );
-	}
-	if( job->deinterlace )
-	{
-		if (deint != 1)
-		{
-			if (deint_opts.map[deint].svalue != NULL)
-				deint_str = g_strdup(deint_opts.map[deint].svalue);
-		}
-		else
-			deint_str = ghb_settings_get_string(js, "PictureDeinterlaceCustom");
-		hb_filter_deinterlace.settings = deint_str;
-		hb_list_add( job->filters, &hb_filter_deinterlace );
-	}
-	gint deblock = ghb_settings_get_int(js, "PictureDeblock");
-	if( deblock >= 5 )
-	{
-		deblock_str = g_strdup_printf("%d", deblock);
-		hb_filter_deblock.settings = deblock_str;
-		hb_list_add( job->filters, &hb_filter_deblock );
-	}
-	gint denoise = ghb_settings_combo_int(js, "PictureDenoise");
-	if( denoise )
-	{
-		if (denoise != 1)
-		{
-			if (denoise_opts.map[denoise].svalue != NULL)
-				denoise_str = g_strdup(denoise_opts.map[denoise].svalue);
-		}
-		else
-			denoise_str = ghb_settings_get_string(js, "PictureDenoiseCustom");
-		hb_filter_denoise.settings = denoise_str;
-		hb_list_add( job->filters, &hb_filter_denoise );
-	}
-	job->width = ghb_settings_get_int(js, "scale_width");
-	job->height = ghb_settings_get_int(js, "scale_height");
-
-	job->vcodec = ghb_settings_combo_int(js, "VideoEncoder");
-	if ((job->mux == HB_MUX_MP4 ) && (job->vcodec == HB_VCODEC_THEORA))
-	{
-		// mp4/theora combination is not supported.
-		job->vcodec = HB_VCODEC_FFMPEG_MPEG4;
-	}
-	if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
-	{
-		job->ipod_atom = ghb_settings_get_boolean(js, "Mp4iPodCompatible");
-	}
-	if (ghb_settings_get_boolean(js, "vquality_type_constant"))
-	{
-		gdouble vquality;
-		vquality = ghb_settings_get_double(js, "VideoQualitySlider");
-		job->vquality =  vquality;
-		job->vbitrate = 0;
-	}
-	else if (ghb_settings_get_boolean(js, "vquality_type_bitrate"))
-	{
-		job->vquality = -1.0;
-		job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate");
-	}
-
-	gint vrate = ghb_settings_combo_int(js, "VideoFramerate");
-	if( vrate == 0 )
-	{
-		job->vrate = title->rate;
-		job->vrate_base = title->rate_base;
-	}
-	else
-	{
-		job->vrate = 27000000;
-		job->vrate_base = vrate;
-	}
-	if (ghb_settings_get_boolean(js, "VideoFrameratePFR"))
-		job->cfr = 2;
-	else if (ghb_settings_get_boolean(js, "VideoFramerateCFR"))
-		job->cfr = 1;
-	else
-		job->cfr = 0;
-
-	const GValue *audio_list;
-	gint count, ii;
-	gint tcount = 0;
-	
-	audio_list = ghb_settings_get_value(js, "audio_list");
-	count = ghb_array_len(audio_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *asettings;
-	    hb_audio_config_t audio;
-	    hb_audio_config_t *aconfig;
-		gint acodec, fallback;
-
-		hb_audio_config_init(&audio);
-		asettings = ghb_array_get_nth(audio_list, ii);
-		audio.in.track = ghb_settings_get_int(asettings, "AudioTrack");
-		audio.out.track = tcount;
-
-		char * aname = ghb_settings_get_string(asettings, "AudioTrackName");
-		if (aname && *aname)
-		{
-			// This leaks, but there is no easy way to clean up 
-			// presently
-			audio.out.name = aname;
-		}
-		else
-		{
-			g_free(aname);
-		}
+    gboolean keep_aspect;
+    keep_aspect = ghb_settings_get_boolean(js, "PictureKeepRatio");
+    job->anamorphic.mode = ghb_settings_combo_int(js, "PicturePAR");
+    job->modulus = ghb_settings_combo_int(js, "PictureModulus");
+    if (job->anamorphic.mode)
+    {
+        job->anamorphic.par_width = 
+            ghb_settings_get_int(js, "PicturePARWidth");
+        job->anamorphic.par_height = 
+            ghb_settings_get_int(js, "PicturePARHeight");
+        job->anamorphic.dar_width = 0;
+        job->anamorphic.dar_height = 0;
+
+        if (job->anamorphic.mode == 3 && !keep_aspect)
+        {
+            job->anamorphic.keep_display_aspect = 0;
+        }
+        else
+        {
+            job->anamorphic.keep_display_aspect = 1;
+        }
+    }
+
+    int width, height, crop[4];
+    width = ghb_settings_get_int(js, "scale_width");
+    height = ghb_settings_get_int(js, "scale_height");
+
+    crop[0] = ghb_settings_get_int(js, "PictureTopCrop");
+    crop[1] = ghb_settings_get_int(js, "PictureBottomCrop");
+    crop[2] = ghb_settings_get_int(js, "PictureLeftCrop");
+    crop[3] = ghb_settings_get_int(js, "PictureRightCrop");
+
+    filter_str = g_strdup_printf("%d:%d:%d:%d:%d:%d", 
+                            width, height, crop[0], crop[1], crop[2], crop[3]);
+    filter = hb_filter_init(HB_FILTER_CROP_SCALE);
+    hb_add_filter( job, filter, filter_str );
+    g_free(filter_str);
+
+    /* Add selected filters */
+    gint detel = ghb_settings_combo_int(js, "PictureDetelecine");
+    if ( detel )
+    {
+        filter_str = NULL;
+        if (detel != 1)
+        {
+            if (detel_opts.map[detel].svalue != NULL)
+                filter_str = g_strdup(detel_opts.map[detel].svalue);
+        }
+        else
+            filter_str = ghb_settings_get_string(js, "PictureDetelecineCustom");
+        filter = hb_filter_init(HB_FILTER_DETELECINE);
+        hb_add_filter( job, filter, filter_str );
+        g_free(filter_str);
+    }
+    if ( decomb_deint && decomb )
+    {
+        filter_str = NULL;
+        if (decomb != 1)
+        {
+            if (decomb_opts.map[decomb].svalue != NULL)
+                filter_str = g_strdup(decomb_opts.map[decomb].svalue);
+        }
+        else
+            filter_str = ghb_settings_get_string(js, "PictureDecombCustom");
+        filter = hb_filter_init(HB_FILTER_DECOMB);
+        hb_add_filter( job, filter, filter_str );
+        g_free(filter_str);
+    }
+    if( job->deinterlace )
+    {
+        filter_str = NULL;
+        if (deint != 1)
+        {
+            if (deint_opts.map[deint].svalue != NULL)
+                filter_str = g_strdup(deint_opts.map[deint].svalue);
+        }
+        else
+            filter_str = ghb_settings_get_string(js, "PictureDeinterlaceCustom");
+        filter = hb_filter_init(HB_FILTER_DEINTERLACE);
+        hb_add_filter( job, filter, filter_str );
+        g_free(filter_str);
+    }
+    gint denoise = ghb_settings_combo_int(js, "PictureDenoise");
+    if( denoise )
+    {
+        filter_str = NULL;
+        if (denoise != 1)
+        {
+            if (denoise_opts.map[denoise].svalue != NULL)
+                filter_str = g_strdup(denoise_opts.map[denoise].svalue);
+        }
+        else
+            filter_str = ghb_settings_get_string(js, "PictureDenoiseCustom");
+        filter = hb_filter_init(HB_FILTER_DENOISE);
+        hb_add_filter( job, filter, filter_str );
+        g_free(filter_str);
+    }
+    gint deblock = ghb_settings_get_int(js, "PictureDeblock");
+    if( deblock >= 5 )
+    {
+        filter_str = NULL;
+        filter_str = g_strdup_printf("%d", deblock);
+        filter = hb_filter_init(HB_FILTER_DEBLOCK);
+        hb_add_filter( job, filter, filter_str );
+        g_free(filter_str);
+    }
+
+    job->vcodec = ghb_settings_combo_int(js, "VideoEncoder");
+    if ((job->mux == HB_MUX_MP4 ) && (job->vcodec == HB_VCODEC_THEORA))
+    {
+        // mp4/theora combination is not supported.
+        job->vcodec = HB_VCODEC_FFMPEG_MPEG4;
+    }
+    if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
+    {
+        job->ipod_atom = ghb_settings_get_boolean(js, "Mp4iPodCompatible");
+    }
+    if (ghb_settings_get_boolean(js, "vquality_type_constant"))
+    {
+        gdouble vquality;
+        vquality = ghb_settings_get_double(js, "VideoQualitySlider");
+        job->vquality =  vquality;
+        job->vbitrate = 0;
+    }
+    else if (ghb_settings_get_boolean(js, "vquality_type_bitrate"))
+    {
+        job->vquality = -1.0;
+        job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate");
+    }
+
+    gint vrate;
+    gint vrate_base = ghb_settings_combo_int(js, "VideoFramerate");
+    gint cfr;
+    if (ghb_settings_get_boolean(js, "VideoFrameratePFR"))
+        cfr = 2;
+    else if (ghb_settings_get_boolean(js, "VideoFramerateCFR"))
+        cfr = 1;
+    else
+        cfr = 0;
+
+    // x264 zero latency requires CFR encode
+    if (ghb_settings_get_boolean(js, "x264ZeroLatency"))
+    {
+        cfr = 1;
+        ghb_log("zerolatency x264 tune selected, forcing constant framerate");
+    }
+
+    if( vrate_base == 0 )
+    {
+        vrate = title->rate;
+        vrate_base = title->rate_base;
+    }
+    else
+    {
+        vrate = 27000000;
+    }
+    filter_str = g_strdup_printf("%d:%d:%d", cfr, vrate, vrate_base);
+    filter = hb_filter_init(HB_FILTER_VFR);
+    hb_add_filter( job, filter, filter_str );
+    g_free(filter_str);
+
+    const GValue *audio_list;
+    gint count, ii;
+    gint tcount = 0;
+    
+    audio_list = ghb_settings_get_value(js, "audio_list");
+    count = ghb_array_len(audio_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *asettings;
+        hb_audio_config_t audio;
+        hb_audio_config_t *aconfig;
+        gint acodec, fallback;
+
+        hb_audio_config_init(&audio);
+        asettings = ghb_array_get_nth(audio_list, ii);
+        audio.in.track = ghb_settings_get_int(asettings, "AudioTrack");
+        audio.out.track = tcount;
+
+        char * aname = ghb_settings_get_string(asettings, "AudioTrackName");
+        if (aname && *aname)
+        {
+            // This leaks, but there is no easy way to clean up 
+            // presently
+            audio.out.name = aname;
+        }
+        else
+        {
+            g_free(aname);
+        }
 
         aconfig = (hb_audio_config_t *) hb_list_audio_config_item(
-									title->list_audio, audio.in.track );
+                                    title->list_audio, audio.in.track );
 
-		acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
+        acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
 
-		fallback = ghb_settings_combo_int(js, "AudioEncoderFallback");
-		gint copy_mask = ghb_get_copy_mask(js);
-		audio.out.codec = ghb_select_audio_codec(job->mux, aconfig, acodec, fallback, copy_mask);
+        fallback = ghb_settings_combo_int(js, "AudioEncoderFallback");
+        gint copy_mask = ghb_get_copy_mask(js);
+        audio.out.codec = ghb_select_audio_codec(job->mux, aconfig, acodec, fallback, copy_mask);
 
-		audio.out.gain = 
-			ghb_settings_get_double(asettings, "AudioTrackGain");
+        audio.out.gain = 
+            ghb_settings_get_double(asettings, "AudioTrackGain");
 
         audio.out.dynamic_range_compression = 
-			ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
+            ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
         if (audio.out.dynamic_range_compression < 1.0)
-        	audio.out.dynamic_range_compression = 0.0;
+            audio.out.dynamic_range_compression = 0.0;
 
-		// It would be better if this were done in libhb for us, but its not yet.
-		if (ghb_audio_is_passthru(audio.out.codec))
-		{
-			audio.out.mixdown = 0;
-		}
-		else
-		{
-			audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown");
-			// Make sure the mixdown is valid and pick a new one if not.
-			audio.out.mixdown = ghb_get_best_mix(aconfig, audio.out.codec, 
-													audio.out.mixdown);
-			gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate");
-			if (srate == 0)	// 0 is same as source
-				audio.out.samplerate = aconfig->in.samplerate;
-			else
-				audio.out.samplerate = srate;
-			double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
-			if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
-				quality != HB_INVALID_AUDIO_QUALITY)
-			{
-				audio.out.quality = quality;
-				audio.out.bitrate = -1;
-			}
-			else
-			{
-				audio.out.quality = HB_INVALID_AUDIO_QUALITY;
-				audio.out.bitrate = 
-					ghb_settings_combo_int(asettings, "AudioBitrate");
-
-				audio.out.bitrate = hb_get_best_audio_bitrate(
-					audio.out.codec, audio.out.bitrate, 
-					audio.out.samplerate, audio.out.mixdown);
-			}
-		}
+        // It would be better if this were done in libhb for us, but its not yet.
+        if (ghb_audio_is_passthru(audio.out.codec))
+        {
+            audio.out.mixdown = 0;
+        }
+        else
+        {
+            audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown");
+            // Make sure the mixdown is valid and pick a new one if not.
+            audio.out.mixdown = ghb_get_best_mix(aconfig, audio.out.codec, 
+                                                    audio.out.mixdown);
+            gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate");
+            if (srate == 0) // 0 is same as source
+                audio.out.samplerate = aconfig->in.samplerate;
+            else
+                audio.out.samplerate = srate;
+            double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
+            if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
+                quality != HB_INVALID_AUDIO_QUALITY)
+            {
+                audio.out.quality = quality;
+                audio.out.bitrate = -1;
+            }
+            else
+            {
+                audio.out.quality = HB_INVALID_AUDIO_QUALITY;
+                audio.out.bitrate = 
+                    ghb_settings_combo_int(asettings, "AudioBitrate");
+
+                audio.out.bitrate = hb_get_best_audio_bitrate(
+                    audio.out.codec, audio.out.bitrate, 
+                    audio.out.samplerate, audio.out.mixdown);
+            }
+        }
 
-		// Add it to the jobs audio list
+        // Add it to the jobs audio list
         hb_audio_add( job, &audio );
-		tcount++;
-	}
+        tcount++;
+    }
+
+    dest_str = ghb_settings_get_string(js, "destination");
+    hb_job_set_file( job, dest_str);
+    g_free(dest_str);
+
+    const GValue *subtitle_list;
+    gint subtitle;
+    gboolean force, burned, def, one_burned = FALSE;
+    
+    ghb_settings_set_boolean(js, "subtitle_scan", FALSE);
+    subtitle_list = ghb_settings_get_value(js, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *ssettings;
+        gint source;
+
+        ssettings = ghb_array_get_nth(subtitle_list, ii);
+
+        force = ghb_settings_get_boolean(ssettings, "SubtitleForced");
+        burned = ghb_settings_get_boolean(ssettings, "SubtitleBurned");
+        def = ghb_settings_get_boolean(ssettings, "SubtitleDefaultTrack");
+        source = ghb_settings_get_int(ssettings, "SubtitleSource");
+
+        if (source == SRTSUB)
+        {
+            hb_subtitle_config_t sub_config;
+            gchar *filename, *lang, *code;
+
+            filename = ghb_settings_get_string(ssettings, "SrtFile");
+            if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+            {
+                continue;
+            }
+            sub_config.offset = ghb_settings_get_int(ssettings, "SrtOffset");
+            lang = ghb_settings_get_string(ssettings, "SrtLanguage");
+            code = ghb_settings_get_string(ssettings, "SrtCodeset");
+            strncpy(sub_config.src_filename, filename, 255);
+            sub_config.src_filename[255] = 0;
+            strncpy(sub_config.src_codeset, code, 39);
+            sub_config.src_codeset[39] = 0;
+            sub_config.force = 0;
+            sub_config.dest = PASSTHRUSUB;
+            sub_config.default_track = def;
+
+            hb_srt_add( job, &sub_config, lang);
+
+            g_free(filename);
+            g_free(lang);
+            g_free(code);
+            continue;
+        }
+
+        subtitle = ghb_settings_get_int(ssettings, "SubtitleTrack");
+        if (subtitle == -1)
+        {
+            if (!burned)
+            {
+                job->select_subtitle_config.dest = PASSTHRUSUB;
+            }
+            else if (burned)
+            {
+                // Only allow one subtitle to be burned into the video
+                if (one_burned)
+                    continue;
+                job->select_subtitle_config.dest = RENDERSUB;
+                one_burned = TRUE;
+            }
+            job->select_subtitle_config.force = force;
+            job->select_subtitle_config.default_track = def;
+            job->indepth_scan = 1;
+            ghb_settings_set_boolean(js, "subtitle_scan", TRUE);
+        }
+        else if (subtitle >= 0)
+        {
+            hb_subtitle_t * subt;
+            hb_subtitle_config_t sub_config;
+
+            subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, subtitle);
+            if (subt != NULL)
+            {
+                sub_config = subt->config;
+                if (!burned)
+                {
+                    sub_config.dest = PASSTHRUSUB;
+                }
+                else if ( burned && ghb_canBurnSub(subt->source) )
+                {
+                    // Only allow one subtitle to be burned into the video
+                    if (one_burned)
+                        continue;
+                    sub_config.dest = RENDERSUB;
+                    one_burned = TRUE;
+                }
+                sub_config.force = force;
+                sub_config.default_track = def;
+                hb_subtitle_add( job, &sub_config, subtitle );
+            }
+        }
+    }
+    if (one_burned)
+    {
+        // Add filter that renders vobsubs
+        filter = hb_filter_init(HB_FILTER_RENDER_SUB);
+        filter_str = g_strdup_printf("%d:%d:%d:%d", 
+                                crop[0], crop[1], crop[2], crop[3]);
+        hb_add_filter( job, filter, filter_str );
+        g_free(filter_str);
+    }
+
+
+    char * meta;
+
+    meta = ghb_settings_get_string(js, "MetaName");
+    if (meta && *meta)
+    {
+        hb_metadata_set_name(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaArtist");
+    if (meta && *meta)
+    {
+        hb_metadata_set_artist(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaAlbumArtist");
+    if (meta && *meta)
+    {
+        hb_metadata_set_album_artist(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaReleaseDate");
+    if (meta && *meta)
+    {
+        hb_metadata_set_release_date(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaComment");
+    if (meta && *meta)
+    {
+        hb_metadata_set_comment(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaGenre");
+    if (meta && *meta)
+    {
+        hb_metadata_set_genre(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaDescription");
+    if (meta && *meta)
+    {
+        hb_metadata_set_description(job->metadata, meta);
+    }
+    free(meta);
+    meta = ghb_settings_get_string(js, "MetaLongDescription");
+    if (meta && *meta)
+    {
+        hb_metadata_set_long_description(job->metadata, meta);
+    }
+    free(meta);
+
+    if (job->indepth_scan == 1)
+    {
+        // Subtitle scan. Look for subtitle matching audio language
 
-	dest_str = ghb_settings_get_string(js, "destination");
-	job->file = dest_str;
+        /*
+         * When subtitle scan is enabled do a fast pre-scan job
+         * which will determine which subtitles to enable, if any.
+         */
+        job->pass = -1;
+        job->indepth_scan = 1;
+        hb_job_set_advanced_opts(job, NULL);
+
+        /*
+         * Add the pre-scan job
+         */
+        job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
+        hb_add( h, job );
+    }
+
+    if( ghb_settings_get_boolean(js, "VideoTwoPass") &&
+        !ghb_settings_get_boolean(js, "vquality_type_constant"))
+    {
+        /*
+         * If subtitle_scan is enabled then only turn it on
+         * for the second pass and then off again for the
+         * second.
+         */
+        job->pass = 1;
+        job->indepth_scan = 0;
+        ghb_set_video_encoder_opts(job, js);
+
+        /*
+         * If turbo options have been selected then set job->fastfirstpass
+         */
+        if( ghb_settings_get_boolean(js, "VideoTurboTwoPass") &&
+            job->vcodec == HB_VCODEC_X264 )
+        {
+            job->fastfirstpass = 1;
+        }
+        else
+        {
+            job->fastfirstpass = 0;
+        }
+
+        job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
+        hb_add( h, job );
+
+        job->pass = 2;
+        /*
+         * On the second pass we turn off subtitle scan so that we
+         * can actually encode using any subtitles that were auto
+         * selected in the first pass (using the whacky select-subtitle
+         * attribute of the job).
+         */
+        job->indepth_scan = 0;
+        job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
+        hb_add( h, job );
+    }
+    else
+    {
+        ghb_set_video_encoder_opts(job, js);
+        job->indepth_scan = 0;
+        job->pass = 0;
+        job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
+        hb_add( h, job );
+    }
 
-	const GValue *subtitle_list;
-	gint subtitle;
-	gboolean force, burned, def, one_burned = FALSE;
-	
-	ghb_settings_set_boolean(js, "subtitle_scan", FALSE);
-	subtitle_list = ghb_settings_get_value(js, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *ssettings;
-		gint source;
-
-		ssettings = ghb_array_get_nth(subtitle_list, ii);
-
-		force = ghb_settings_get_boolean(ssettings, "SubtitleForced");
-		burned = ghb_settings_get_boolean(ssettings, "SubtitleBurned");
-		def = ghb_settings_get_boolean(ssettings, "SubtitleDefaultTrack");
-		source = ghb_settings_get_int(ssettings, "SubtitleSource");
-
-		if (source == SRTSUB)
-		{
-    		hb_subtitle_config_t sub_config;
-			gchar *filename, *lang, *code;
-
-			filename = ghb_settings_get_string(ssettings, "SrtFile");
-			if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
-			{
-				continue;
-			}
-			sub_config.offset = ghb_settings_get_int(ssettings, "SrtOffset");
-			lang = ghb_settings_get_string(ssettings, "SrtLanguage");
-			code = ghb_settings_get_string(ssettings, "SrtCodeset");
-			strncpy(sub_config.src_filename, filename, 255);
-			sub_config.src_filename[255] = 0;
-			strncpy(sub_config.src_codeset, code, 39);
-			sub_config.src_codeset[39] = 0;
-			sub_config.force = 0;
-			sub_config.dest = PASSTHRUSUB;
-			sub_config.default_track = def;
-
-			hb_srt_add( job, &sub_config, lang);
-
-			g_free(filename);
-			g_free(lang);
-			g_free(code);
-			continue;
-		}
-
-		subtitle = ghb_settings_get_int(ssettings, "SubtitleTrack");
-		if (subtitle == -1)
-		{
-			if (!burned)
-			{
-				job->select_subtitle_config.dest = PASSTHRUSUB;
-			}
-			else if (burned)
-			{
-				// Only allow one subtitle to be burned into the video
-				if (one_burned)
-					continue;
-				job->select_subtitle_config.dest = RENDERSUB;
-				one_burned = TRUE;
-			}
-			job->select_subtitle_config.force = force;
-			job->select_subtitle_config.default_track = def;
-			job->indepth_scan = 1;
-			ghb_settings_set_boolean(js, "subtitle_scan", TRUE);
-		}
-		else if (subtitle >= 0)
-		{
-    		hb_subtitle_t * subt;
-    		hb_subtitle_config_t sub_config;
-
-       		subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, subtitle);
-			if (subt != NULL)
-			{
-				sub_config = subt->config;
-				if (!burned)
-				{
-					sub_config.dest = PASSTHRUSUB;
-				}
-				else if ( burned && canBurn(subt->source) )
-				{
-					// Only allow one subtitle to be burned into the video
-					if (one_burned)
-						continue;
-					sub_config.dest = RENDERSUB;
-					one_burned = TRUE;
-				}
-				sub_config.force = force;
-				sub_config.default_track = def;
-        		hb_subtitle_add( job, &sub_config, subtitle );
-			}
-		}
-	}
-
-	// TODO: libhb holds onto a reference to the advanced_opts and is not
-	// finished with it until encoding the job is done.  But I can't
-	// find a way to get at the job before it is removed in order to
-	// free up the memory I am allocating here.
-	// The short story is THIS LEAKS.
-	advanced_opts = ghb_build_advanced_opts_string(js);
-	
-	if( advanced_opts && *advanced_opts == '\0' )
-	{
-		g_free(advanced_opts);
-		advanced_opts = NULL;
-	}
-
-	if (job->indepth_scan == 1)
-	{
-		// Subtitle scan. Look for subtitle matching audio language
-
-		/*
-		 * When subtitle scan is enabled do a fast pre-scan job
-		 * which will determine which subtitles to enable, if any.
-		 */
-		job->pass = -1;
-		job->indepth_scan = 1;
-		job->advanced_opts = NULL;
-
-		/*
-		 * Add the pre-scan job
-		 */
-		job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
-		hb_add( h, job );
-	}
-
-	if( ghb_settings_get_boolean(js, "VideoTwoPass") &&
-		!ghb_settings_get_boolean(js, "vquality_type_constant"))
-	{
-		/*
-		 * If subtitle_scan is enabled then only turn it on
-		 * for the second pass and then off again for the
-		 * second.
-		 */
-		job->pass = 1;
-		job->indepth_scan = 0;
-
-		/*
-		 * If turbo options have been selected then append them
-		 * to the advanced_opts now (size includes one ':' and the '\0')
-		 */
-		if( ghb_settings_get_boolean(js, "VideoTurboTwoPass") )
-		{
-			gchar *tmp_advanced_opts;
-			gchar *extra_opts;
-
-			if (job->vcodec == HB_VCODEC_X264)
-			{
-				gint badapt;
-
-				badapt = ghb_lookup_badapt(advanced_opts);
-				if (badapt == 2)
-				{
-					extra_opts = g_strdup_printf("%s", turbo_x264_opts);
-				}
-				else
-				{
-					extra_opts = g_strdup_printf("%s:weightb=0", turbo_x264_opts);
-				}
-			}
-			else if (job->vcodec == HB_VCODEC_FFMPEG_MPEG4)
-			{
-				extra_opts = g_strdup_printf("%s", turbo_lavc_opts);
-			}
-			else
-			{
-				extra_opts = g_strdup("");
-			}
-
-			if ( advanced_opts )
-			{
-				tmp_advanced_opts = g_strdup_printf("%s:%s", advanced_opts, extra_opts);
-			} 
-			else 
-			{
-				/*
-				 * No advanced_opts to modify, but apply the turbo options
-				 * anyway as they may be modifying defaults
-				 */
-				tmp_advanced_opts = g_strdup_printf("%s", extra_opts);
-			}
-			g_free(extra_opts);
-
-			job->advanced_opts = tmp_advanced_opts;
-		}
-		else
-		{
-			job->advanced_opts = advanced_opts;
-		}
-		job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
-		hb_add( h, job );
-		//if (job->advanced_opts != NULL)
-		//	g_free(job->advanced_opts);
-
-		job->pass = 2;
-		/*
-		 * On the second pass we turn off subtitle scan so that we
-		 * can actually encode using any subtitles that were auto
-		 * selected in the first pass (using the whacky select-subtitle
-		 * attribute of the job).
-		 */
-		job->indepth_scan = 0;
-		job->advanced_opts = advanced_opts;
-		job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
-		hb_add( h, job );
-		//if (job->advanced_opts != NULL)
-		//	g_free(job->advanced_opts);
-	}
-	else
-	{
-		job->advanced_opts = advanced_opts;
-		job->indepth_scan = 0;
-		job->pass = 0;
-		job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
-		hb_add( h, job );
-		//if (job->advanced_opts != NULL)
-		//	g_free(job->advanced_opts);
-	}
-
-	// clean up audio list
-	gint num_audio_tracks = hb_list_count(job->list_audio);
-	for(ii = 0; ii < num_audio_tracks; ii++)
-	{
-		hb_audio_t *audio = (hb_audio_t*)hb_list_item(job->list_audio, 0);
-		hb_list_rem(job->list_audio, audio);
-		free(audio);
-	}
-
-	// clean up subtitle list
-	gint num_subtitle_tracks = hb_list_count(job->list_subtitle);
-	for(ii = 0; ii < num_subtitle_tracks; ii++)
-	{
-		hb_subtitle_t *subtitle = hb_list_item(job->list_subtitle, 0);
-		hb_list_rem(job->list_subtitle, subtitle);
-		free(subtitle);
-	}
-
-	if (detel_str) g_free(detel_str);
-	if (decomb_str) g_free(decomb_str);
-	if (deint_str) g_free(deint_str);
-	if (deblock_str) g_free(deblock_str);
-	if (denoise_str) g_free(denoise_str);
-	if (dest_str) g_free(dest_str);
+    hb_job_close(&job);
 }
 
 void
 ghb_add_job(GValue *js, gint unique_id)
 {
-	// Since I'm doing a scan of the single title I want just prior 
-	// to adding the job, there is only the one title to choose from.
-	add_job(h_queue, js, unique_id, 0);
+    // Since I'm doing a scan of the single title I want just prior 
+    // to adding the job, there is only the one title to choose from.
+    add_job(h_queue, js, unique_id, 0);
 }
 
 void
 ghb_add_live_job(GValue *js, gint unique_id)
 {
-	// Since I'm doing a scan of the single title I want just prior 
-	// to adding the job, there is only the one title to choose from.
-	gint titleindex = ghb_settings_combo_int(js, "title");
-	add_job(h_scan, js, unique_id, titleindex);
+    gint titleindex = ghb_settings_combo_int(js, "title");
+    add_job(h_scan, js, unique_id, titleindex);
 }
 
 void
@@ -5278,40 +5279,40 @@
 {
     hb_job_t * job;
     gint ii;
-	
-	// Multiples passes all get the same id
-	// remove them all.
-	// Go backwards through list, so reordering doesn't screw me.
-	ii = hb_count(h_queue) - 1;
+    
+    // Multiples passes all get the same id
+    // remove them all.
+    // Go backwards through list, so reordering doesn't screw me.
+    ii = hb_count(h_queue) - 1;
     while ((job = hb_job(h_queue, ii--)) != NULL)
     {
         if ((job->sequence_id & 0xFFFFFF) == unique_id)
-			hb_rem(h_queue, job);
+            hb_rem(h_queue, job);
     }
 }
 
 void
 ghb_start_queue()
 {
-	hb_start( h_queue );
+    hb_start( h_queue );
 }
 
 void
 ghb_stop_queue()
 {
-	hb_stop( h_queue );
+    hb_stop( h_queue );
 }
 
 void
 ghb_start_live_encode()
 {
-	hb_start( h_scan );
+    hb_start( h_scan );
 }
 
 void
 ghb_stop_live_encode()
 {
-	hb_stop( h_scan );
+    hb_stop( h_scan );
 }
 
 void
@@ -5322,298 +5323,296 @@
 
     if( s.state == HB_STATE_PAUSED )
     {
-		hb_status.queue.state &= ~GHB_STATE_PAUSED;
-		hb_resume( h_queue );
+        hb_status.queue.state &= ~GHB_STATE_PAUSED;
+        hb_resume( h_queue );
     }
     else
     {
-		hb_status.queue.state |= GHB_STATE_PAUSED;
-		hb_pause( h_queue );
+        hb_status.queue.state |= GHB_STATE_PAUSED;
+        hb_pause( h_queue );
     }
 }
 
 static void
 vert_line(
-	GdkPixbuf * pb, 
-	guint8 r, 
-	guint8 g, 
-	guint8 b, 
-	gint x, 
-	gint y, 
-	gint len, 
-	gint width)
-{
-	guint8 *pixels = gdk_pixbuf_get_pixels (pb);
-	guint8 *dst;
-	gint ii, jj;
-	gint channels = gdk_pixbuf_get_n_channels (pb);
-	gint stride = gdk_pixbuf_get_rowstride (pb);
-
-	for (jj = 0; jj < width; jj++)
-	{
-		dst = pixels + y * stride + (x+jj) * channels;
-		for (ii = 0; ii < len; ii++)
-		{
-			dst[0] = r;
-			dst[1] = g;
-			dst[2] = b;
-			dst += stride;
-		}
-	}
+    GdkPixbuf * pb, 
+    guint8 r, 
+    guint8 g, 
+    guint8 b, 
+    gint x, 
+    gint y, 
+    gint len, 
+    gint width)
+{
+    guint8 *pixels = gdk_pixbuf_get_pixels (pb);
+    guint8 *dst;
+    gint ii, jj;
+    gint channels = gdk_pixbuf_get_n_channels (pb);
+    gint stride = gdk_pixbuf_get_rowstride (pb);
+
+    for (jj = 0; jj < width; jj++)
+    {
+        dst = pixels + y * stride + (x+jj) * channels;
+        for (ii = 0; ii < len; ii++)
+        {
+            dst[0] = r;
+            dst[1] = g;
+            dst[2] = b;
+            dst += stride;
+        }
+    }
 }
 
 static void
 horz_line(
-	GdkPixbuf * pb, 
-	guint8 r, 
-	guint8 g, 
-	guint8 b, 
-	gint x, 
-	gint y, 
-	gint len,
-	gint width)
-{
-	guint8 *pixels = gdk_pixbuf_get_pixels (pb);
-	guint8 *dst;
-	gint ii, jj;
-	gint channels = gdk_pixbuf_get_n_channels (pb);
-	gint stride = gdk_pixbuf_get_rowstride (pb);
-
-	for (jj = 0; jj < width; jj++)
-	{
-		dst = pixels + (y+jj) * stride + x * channels;
-		for (ii = 0; ii < len; ii++)
-		{
-			dst[0] = r;
-			dst[1] = g;
-			dst[2] = b;
-			dst += channels;
-		}
-	}
+    GdkPixbuf * pb, 
+    guint8 r, 
+    guint8 g, 
+    guint8 b, 
+    gint x, 
+    gint y, 
+    gint len,
+    gint width)
+{
+    guint8 *pixels = gdk_pixbuf_get_pixels (pb);
+    guint8 *dst;
+    gint ii, jj;
+    gint channels = gdk_pixbuf_get_n_channels (pb);
+    gint stride = gdk_pixbuf_get_rowstride (pb);
+
+    for (jj = 0; jj < width; jj++)
+    {
+        dst = pixels + (y+jj) * stride + x * channels;
+        for (ii = 0; ii < len; ii++)
+        {
+            dst[0] = r;
+            dst[1] = g;
+            dst[2] = b;
+            dst += channels;
+        }
+    }
 }
 
 static void
 hash_pixbuf(
-	GdkPixbuf * pb,
-	gint        x,
-	gint        y,
-	gint        w,
-	gint        h,
-	gint        step,
-	gint		orientation)
-{
-	gint ii, jj;
-	gint line_width = 8;
-	struct
-	{
-		guint8 r;
-		guint8 g;
-		guint8 b;
-	} c[4] = 
-	{{0x80, 0x80, 0x80},{0xC0, 0x80, 0x70},{0x80, 0xA0, 0x80},{0x70, 0x80, 0xA0}};
-
-	if (!orientation)
-	{
-		// vertical lines
-		for (ii = x, jj = 0; ii+line_width < x+w; ii += step, jj++)
-		{
-			vert_line(pb, c[jj&3].r, c[jj&3].g, c[jj&3].b, ii, y, h, line_width);
-		}
-	}
-	else
-	{
-		// horizontal lines
-		for (ii = y, jj = 0; ii+line_width < y+h; ii += step, jj++)
-		{
-			horz_line(pb, c[jj&3].r, c[jj&3].g, c[jj&3].b, x, ii, w, line_width);
-		}
-	}
+    GdkPixbuf * pb,
+    gint        x,
+    gint        y,
+    gint        w,
+    gint        h,
+    gint        step,
+    gint        orientation)
+{
+    gint ii, jj;
+    gint line_width = 8;
+    struct
+    {
+        guint8 r;
+        guint8 g;
+        guint8 b;
+    } c[4] = 
+    {{0x80, 0x80, 0x80},{0xC0, 0x80, 0x70},{0x80, 0xA0, 0x80},{0x70, 0x80, 0xA0}};
+
+    if (!orientation)
+    {
+        // vertical lines
+        for (ii = x, jj = 0; ii+line_width < x+w; ii += step, jj++)
+        {
+            vert_line(pb, c[jj&3].r, c[jj&3].g, c[jj&3].b, ii, y, h, line_width);
+        }
+    }
+    else
+    {
+        // horizontal lines
+        for (ii = y, jj = 0; ii+line_width < y+h; ii += step, jj++)
+        {
+            horz_line(pb, c[jj&3].r, c[jj&3].g, c[jj&3].b, x, ii, w, line_width);
+        }
+    }
 }
 
 GdkPixbuf*
 ghb_get_preview_image(
-	gint titleindex, 
-	gint index, 
-	signal_user_data_t *ud,
-	gint *out_width,
-	gint *out_height)
-{
-	GValue *settings;
-	hb_title_t *title;
-	hb_list_t  *list;
-	
-	settings = ud->settings;
-	list = hb_get_titles( h_scan );
-	if( !hb_list_count( list ) )
-	{
-		/* No valid title, stop right there */
-		return NULL;
-	}
-    title = hb_list_item( list, titleindex );
-	if (title == NULL) return NULL;
-	if (title->job == NULL) return NULL;
-	set_preview_job_settings(title->job, settings);
-
-	// hb_get_preview doesn't compensate for anamorphic, so lets
-	// calculate scale factors
-	gint width, height, par_width = 1, par_height = 1;
-	gint pic_par = ghb_settings_combo_int(settings, "PicturePAR");
-	if (pic_par)
-	{
-		hb_set_anamorphic_size( title->job, &width, &height, 
-								&par_width, &par_height );
-	}
-
-	// Make sure we have a big enough buffer to receive the image from libhb
-	gint dstWidth = title->job->width;
-	gint dstHeight= title->job->height;
-
-	static guint8 *buffer = NULL;
-	static gint bufferSize = 0;
-	gint newSize;
-
-	newSize = dstWidth * dstHeight * 4;
-	if( bufferSize < newSize )
-	{
-		bufferSize = newSize;
-		buffer     = (guint8*) g_realloc( buffer, bufferSize );
-	}
-	hb_get_preview( h_scan, title, index, buffer );
-
-	// Create an GdkPixbuf and copy the libhb image into it, converting it from
-	// libhb's format something suitable.
-	
-	// The image data returned by hb_get_preview is 4 bytes per pixel, 
-	// BGRA format. Alpha is ignored.
-
-	GdkPixbuf *preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, dstWidth, dstHeight);
-	guint8 *pixels = gdk_pixbuf_get_pixels (preview);
-	
-	guint32 *src = (guint32*)buffer;
-	guint8 *dst = pixels;
-
-	gint ii, jj;
-	gint channels = gdk_pixbuf_get_n_channels (preview);
-	gint stride = gdk_pixbuf_get_rowstride (preview);
-	guint8 *tmp;
-
-	for (ii = 0; ii < dstHeight; ii++)
-	{
-		tmp = dst;
-		for (jj = 0; jj < dstWidth; jj++)
-		{
-			tmp[0] = src[0] >> 16;
-			tmp[1] = src[0] >> 8;
-			tmp[2] = src[0] >> 0;
-			tmp += channels;
-			src++;
-		}
-		dst += stride;
-	}
-	gint w = ghb_settings_get_int(settings, "scale_width");
-	gint h = ghb_settings_get_int(settings, "scale_height");
-	ghb_par_scale(ud, &w, &h, par_width, par_height);
-
-	gint c0, c1, c2, c3;
-	c0 = ghb_settings_get_int(settings, "PictureTopCrop");
-	c1 = ghb_settings_get_int(settings, "PictureBottomCrop");
-	c2 = ghb_settings_get_int(settings, "PictureLeftCrop");
-	c3 = ghb_settings_get_int(settings, "PictureRightCrop");
-
-	gdouble xscale = (gdouble)w / (gdouble)(title->width - c2 - c3);
-	gdouble yscale = (gdouble)h / (gdouble)(title->height - c0 - c1);
-	
-	ghb_par_scale(ud, &dstWidth, &dstHeight, par_width, par_height);
-	*out_width = w;
-	*out_height = h;
-	if (ghb_settings_get_boolean(settings, "reduce_hd_preview"))
-	{
-		GdkScreen *ss;
-		gint s_w, s_h;
-		gint orig_w, orig_h;
-		gint factor = 80;
-
-		if (ghb_settings_get_boolean(settings, "preview_fullscreen"))
-		{
-			factor = 100;
-		}
-		ss = gdk_screen_get_default();
-		s_w = gdk_screen_get_width(ss);
-		s_h = gdk_screen_get_height(ss);
-		orig_w = dstWidth;
-		orig_h = dstHeight;
-
-		if (dstWidth > s_w * factor / 100)
-		{
-			dstWidth = s_w * factor / 100;
-			dstHeight = dstHeight * dstWidth / orig_w;
-		}
-		if (dstHeight > s_h * factor / 100)
-		{
-			dstHeight = s_h * factor / 100;
-			dstWidth = orig_w * dstHeight / orig_h;
-		}
-		xscale *= (gdouble)dstWidth / orig_w;
-		yscale *= (gdouble)dstHeight / orig_h;
-		w *= (gdouble)dstWidth / orig_w;
-		h *= (gdouble)dstHeight / orig_h;
-	}
-	GdkPixbuf *scaled_preview;
-	scaled_preview = gdk_pixbuf_scale_simple(preview, dstWidth, dstHeight, GDK_INTERP_HYPER);
-	if (ghb_settings_get_boolean(settings, "show_crop"))
-	{
-		c0 *= yscale;
-		c1 *= yscale;
-		c2 *= xscale;
-		c3 *= xscale;
-		// Top
-		hash_pixbuf(scaled_preview, c2, 0, w, c0, 32, 0);
-		// Bottom
-		hash_pixbuf(scaled_preview, c2, dstHeight-c1, w, c1, 32, 0);
-		// Left
-		hash_pixbuf(scaled_preview, 0, c0, c2, h, 32, 1);
-		// Right
-		hash_pixbuf(scaled_preview, dstWidth-c3, c0, c3, h, 32, 1);
-	}
-	g_object_unref (preview);
-	return scaled_preview;
+    gint titleindex, 
+    gint index, 
+    signal_user_data_t *ud,
+    gint *out_width,
+    gint *out_height)
+{
+    GValue *settings;
+    hb_title_t *title;
+    hb_job_t *job;
+    
+    settings = ud->settings;
+    title = ghb_get_title_info( titleindex );
+    if( title == NULL ) return NULL;
+
+    job = hb_job_init( title );
+    if (job == NULL) return NULL;
+
+    set_preview_job_settings(job, settings);
+
+    // hb_get_preview doesn't compensate for anamorphic, so lets
+    // calculate scale factors
+    gint width, height, par_width = 1, par_height = 1;
+    gint pic_par = ghb_settings_combo_int(settings, "PicturePAR");
+    if (pic_par)
+    {
+        hb_set_anamorphic_size( job, &width, &height, 
+                                &par_width, &par_height );
+    }
+
+    // Make sure we have a big enough buffer to receive the image from libhb
+    gint dstWidth = job->width;
+    gint dstHeight= job->height;
+
+    static guint8 *buffer = NULL;
+    static gint bufferSize = 0;
+    gint newSize;
+
+    newSize = dstWidth * dstHeight * 4;
+    if( bufferSize < newSize )
+    {
+        bufferSize = newSize;
+        buffer     = (guint8*) g_realloc( buffer, bufferSize );
+    }
+    hb_get_preview( h_scan, job, index, buffer );
+    hb_job_close( &job );
+
+    // Create an GdkPixbuf and copy the libhb image into it, converting it from
+    // libhb's format something suitable.
+    
+    // The image data returned by hb_get_preview is 4 bytes per pixel, 
+    // BGRA format. Alpha is ignored.
+
+    GdkPixbuf *preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, dstWidth, dstHeight);
+    guint8 *pixels = gdk_pixbuf_get_pixels (preview);
+    
+    guint32 *src = (guint32*)buffer;
+    guint8 *dst = pixels;
+
+    gint ii, jj;
+    gint channels = gdk_pixbuf_get_n_channels (preview);
+    gint stride = gdk_pixbuf_get_rowstride (preview);
+    guint8 *tmp;
+
+    for (ii = 0; ii < dstHeight; ii++)
+    {
+        tmp = dst;
+        for (jj = 0; jj < dstWidth; jj++)
+        {
+            tmp[0] = src[0] >> 16;
+            tmp[1] = src[0] >> 8;
+            tmp[2] = src[0] >> 0;
+            tmp += channels;
+            src++;
+        }
+        dst += stride;
+    }
+    gint w = ghb_settings_get_int(settings, "scale_width");
+    gint h = ghb_settings_get_int(settings, "scale_height");
+    ghb_par_scale(ud, &w, &h, par_width, par_height);
+
+    gint c0, c1, c2, c3;
+    c0 = ghb_settings_get_int(settings, "PictureTopCrop");
+    c1 = ghb_settings_get_int(settings, "PictureBottomCrop");
+    c2 = ghb_settings_get_int(settings, "PictureLeftCrop");
+    c3 = ghb_settings_get_int(settings, "PictureRightCrop");
+
+    gdouble xscale = (gdouble)w / (gdouble)(title->width - c2 - c3);
+    gdouble yscale = (gdouble)h / (gdouble)(title->height - c0 - c1);
+    
+    ghb_par_scale(ud, &dstWidth, &dstHeight, par_width, par_height);
+    *out_width = w;
+    *out_height = h;
+    if (ghb_settings_get_boolean(settings, "reduce_hd_preview"))
+    {
+        GdkScreen *ss;
+        gint s_w, s_h;
+        gint orig_w, orig_h;
+        gint factor = 80;
+
+        if (ghb_settings_get_boolean(settings, "preview_fullscreen"))
+        {
+            factor = 100;
+        }
+        ss = gdk_screen_get_default();
+        s_w = gdk_screen_get_width(ss);
+        s_h = gdk_screen_get_height(ss);
+        orig_w = dstWidth;
+        orig_h = dstHeight;
+
+        if (dstWidth > s_w * factor / 100)
+        {
+            dstWidth = s_w * factor / 100;
+            dstHeight = dstHeight * dstWidth / orig_w;
+        }
+        if (dstHeight > s_h * factor / 100)
+        {
+            dstHeight = s_h * factor / 100;
+            dstWidth = orig_w * dstHeight / orig_h;
+        }
+        xscale *= (gdouble)dstWidth / orig_w;
+        yscale *= (gdouble)dstHeight / orig_h;
+        w *= (gdouble)dstWidth / orig_w;
+        h *= (gdouble)dstHeight / orig_h;
+    }
+    GdkPixbuf *scaled_preview;
+    scaled_preview = gdk_pixbuf_scale_simple(preview, dstWidth, dstHeight, GDK_INTERP_HYPER);
+    if (ghb_settings_get_boolean(settings, "preview_show_crop"))
+    {
+        c0 *= yscale;
+        c1 *= yscale;
+        c2 *= xscale;
+        c3 *= xscale;
+        // Top
+        hash_pixbuf(scaled_preview, c2, 0, w, c0, 32, 0);
+        // Bottom
+        hash_pixbuf(scaled_preview, c2, dstHeight-c1, w, c1, 32, 0);
+        // Left
+        hash_pixbuf(scaled_preview, 0, c0, c2, h, 32, 1);
+        // Right
+        hash_pixbuf(scaled_preview, dstWidth-c3, c0, c3, h, 32, 1);
+    }
+    g_object_unref (preview);
+    return scaled_preview;
 }
 
 static void
 sanitize_volname(gchar *name)
 {
-	gchar *a, *b;
+    gchar *a, *b;
 
-	a = b = name;
-	while (*b)
-	{
-		switch(*b)
-		{
-		case '<':
-			b++;
-			break;
-		case '>':
-			b++;
-			break;
-		default:
-			*a = *b & 0x7f;
-			a++; b++;
-			break;
-		}
-	}
-	*a = 0;
+    a = b = name;
+    while (*b)
+    {
+        switch(*b)
+        {
+        case '<':
+            b++;
+            break;
+        case '>':
+            b++;
+            break;
+        default:
+            *a = *b & 0x7f;
+            a++; b++;
+            break;
+        }
+    }
+    *a = 0;
 }
 
 gchar*
 ghb_dvd_volname(const gchar *device)
 {
-	gchar *name;
-	name = hb_dvd_name((gchar*)device);
-	if (name != NULL && name[0] != 0)
-	{
-		name = g_strdup(name);
-		sanitize_volname(name);
-		return name;
-	}
-	return NULL;
+    gchar *name;
+    name = hb_dvd_name((gchar*)device);
+    if (name != NULL && name[0] != 0)
+    {
+        name = g_strdup(name);
+        sanitize_volname(name);
+        return name;
+    }
+    return NULL;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/hb-backend.h -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-backend.h Changed

@@ -22,36 +22,38 @@
 
 enum
 {
-	GHB_ERROR_NONE,
-	GHB_ERROR_CANCELED,
-	GHB_ERROR_FAIL,
+    GHB_ERROR_NONE,
+    GHB_ERROR_CANCELED,
+    GHB_ERROR_FAIL,
 };
 
 typedef struct
 {
-	gint state;
+    gint state;
 
-	// SCANNING
-	gint title_count;
-	gint title_cur;
+    // SCANNING
+    gint title_count;
+    gint title_cur;
+    gint preview_count;
+    gint preview_cur;
 
-	// WORKING
-	gint unique_id;
-	gint job_cur;
-	gint job_count;
-	gdouble progress;
-	gdouble rate_cur;
-	gdouble rate_avg;
-	gint hours;
-	gint minutes;
-	gint seconds;
-	gint error;
+    // WORKING
+    gint unique_id;
+    gint job_cur;
+    gint job_count;
+    gdouble progress;
+    gdouble rate_cur;
+    gdouble rate_avg;
+    gint hours;
+    gint minutes;
+    gint seconds;
+    gint error;
 } ghb_instance_status_t;
 
 typedef struct
 {
-	ghb_instance_status_t scan;
-	ghb_instance_status_t queue;
+    ghb_instance_status_t scan;
+    ghb_instance_status_t queue;
 } ghb_status_t;
 
 #define GHB_PIC_KEEP_WIDTH          0x01
@@ -62,42 +64,19 @@
 #define GHB_PIC_KEEP_PAR            0x20
 #define GHB_PIC_USE_MAX             0x40
 
-typedef struct
-{
-	gchar *path;
-	gchar *name;
-	gint index;
-	gint type;
-	char *video_codec_name;
-	gint width;
-	gint height;
-	gint crop[4];
-	gint num_chapters;
-	gint rate;
-	gint rate_base;
-	gint interlaced;
-	gint aspect_n;
-	gint aspect_d;
-	gint hours;
-	gint minutes;
-	gint seconds;
-	gint64 duration;
-	gint angle_count;
-} ghb_title_info_t;
-
 #define GHB_AUDIO_SAMPLERATE 1
 #define GHB_AUDIO_BITRATE 2
 #define GHB_FRAMERATE 3
 
 const gchar* ghb_version(void);
 void ghb_vquality_range(
-	signal_user_data_t *ud, 
-	gdouble *min, 
-	gdouble *max,
-	gdouble *step,
-	gdouble *page,
-	gint *digits,
-	gboolean *inverted);
+    signal_user_data_t *ud, 
+    gdouble *min, 
+    gdouble *max,
+    gdouble *step,
+    gdouble *page,
+    gint *digits,
+    gboolean *inverted);
 //const gchar* ghb_get_rate_string(gint rate, gint type);
 void ghb_combo_init(signal_user_data_t *ud);
 void ghb_backend_init(gint debug);
@@ -123,7 +102,7 @@
 void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
 void ghb_backend_scan_stop();
 void ghb_backend_queue_scan(const gchar *path, gint titleindex);
-gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
+hb_title_t* ghb_get_title_info(gint titleindex);
 void ghb_par_init(signal_user_data_t *ud);
 void ghb_set_scale(signal_user_data_t *ud, gint mode);
 void ghb_set_scale_settings(GValue *settings, gint mode);
@@ -137,34 +116,33 @@
 gint ghb_get_default_acodec(void);
 hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
 void ghb_set_bitrate_opts(
-	GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
+    GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
 void ghb_grey_combo_options(signal_user_data_t *ud);
 void ghb_update_ui_combo_box(
-	signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
-gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
+    signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
+const gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
 gint ghb_find_audio_track(
-	gint titleindex, const gchar *lang, gint acodec, 
-	gint fallback_acodec, GHashTable *track_indices);
+    gint titleindex, const gchar *lang, gint acodec, 
+    gint fallback_acodec, GHashTable *track_indices);
 const gchar* ghb_audio_track_description(gint track, int titleindex);
 void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
 gint ghb_find_pref_subtitle_track(const gchar *lang);
 gint ghb_find_subtitle_track(
-	gint titleindex, const gchar *lang, gboolean burn, 
-	gboolean force, gint source, GHashTable *track_indices);
+    gint titleindex, const gchar *lang, gboolean burn, 
+    gboolean force, gint source, GHashTable *track_indices);
 gint ghb_pick_subtitle_track(signal_user_data_t *ud);
 gint ghb_find_cc_track(gint titleindex);
 gint ghb_longest_title(void);
 gchar* ghb_build_advanced_opts_string(GValue *settings);
 GdkPixbuf* ghb_get_preview_image(
-	gint titleindex, gint index, signal_user_data_t *ud,
-	gint *width, gint *height);
+    gint titleindex, gint index, signal_user_data_t *ud,
+    gint *width, gint *height);
 gchar* ghb_dvd_volname(const gchar *device);
 gint ghb_get_title_number(gint titleindex);
 int ghb_get_title_count();
 gint ghb_subtitle_track_source(GValue *settings, gint track);
 const char* ghb_subtitle_track_source_name(GValue *settings, gint track);
-const char* ghb_subtitle_source_name(gint source);
-gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
+const gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
 
 gboolean ghb_validate_vquality(GValue *settings);
 gboolean ghb_validate_audio(GValue *settings);

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.1024.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/hb-icon.128.png -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.128.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.16.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.22.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.24.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.256.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.32.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.48.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.512.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/hb-icon.64.png -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.64.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-pause.64.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/hb-picture.32.png -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-picture.32.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-picture.64.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-remove.24.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-remove.48.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-showqueue.32.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-showqueue.64.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/hb-source.32.png -> HandBrake-0.9.9.tar.bz2/gtk/src/hb-source.32.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-source.64.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-start.32.png Changed

HandBrake-0.9.9.tar.bz2/gtk/src/hb-start.64.png Added

HandBrake-0.9.9.tar.bz2/gtk/src/hb-stop.64.png Added

HandBrake-0.9.8.tar.bz2/gtk/src/icon_tools.c -> HandBrake-0.9.9.tar.bz2/gtk/src/icon_tools.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * icon_tools.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * icon_tools.c is free software.
  * 
@@ -19,84 +19,84 @@
 GdkPixbuf*
 icon_deserialize(const guint8 *sd, guint len)
 {
-	GdkPixdata pd;
-	GdkPixbuf *pb;
-	GError *err = NULL;
+    GdkPixdata pd;
+    GdkPixbuf *pb;
+    GError *err = NULL;
 
-	gdk_pixdata_deserialize(&pd, len, sd, &err);
-	pb = gdk_pixbuf_from_pixdata(&pd, TRUE, &err);
-	return pb;
+    gdk_pixdata_deserialize(&pd, len, sd, &err);
+    pb = gdk_pixbuf_from_pixdata(&pd, TRUE, &err);
+    return pb;
 }
 
 guint8*
 icon_serialize(const GdkPixbuf *pixbuf, guint *len)
 {
-	GdkPixdata pd;
-	guint8 *sd;
+    GdkPixdata pd;
+    guint8 *sd;
 
-	gdk_pixdata_from_pixbuf(&pd, pixbuf, FALSE);
-	sd = gdk_pixdata_serialize(&pd, len);
-	return sd;
+    gdk_pixdata_from_pixbuf(&pd, pixbuf, FALSE);
+    sd = gdk_pixdata_serialize(&pd, len);
+    return sd;
 }
 
 guint8*
 icon_file_serialize(const gchar *filename, guint *len)
 {
-	GdkPixbuf *pb;
-	GError *err = NULL;
+    GdkPixbuf *pb;
+    GError *err = NULL;
 
-	pb = gdk_pixbuf_new_from_file(filename, &err);
-	if (pb == NULL)
-	{
-		g_warning("Failed to open icon file %s: %s", filename, err->message);
-		return NULL;
-	}
-	return icon_serialize(pb, len);
+    pb = gdk_pixbuf_new_from_file(filename, &err);
+    if (pb == NULL)
+    {
+        g_warning("Failed to open icon file %s: %s", filename, err->message);
+        return NULL;
+    }
+    return icon_serialize(pb, len);
 }
 
 GdkPixbuf*
 base64_to_icon(const gchar *bd)
 {
-	guchar *sd;
-	gsize len;
-	GdkPixdata pd;
-	GdkPixbuf *pb;
-	GError *err = NULL;
+    guchar *sd;
+    gsize len;
+    GdkPixdata pd;
+    GdkPixbuf *pb;
+    GError *err = NULL;
 
-	sd = g_base64_decode(bd, &len);
-	gdk_pixdata_deserialize(&pd, len, sd, &err);
-	pb = gdk_pixbuf_from_pixdata(&pd, TRUE, &err);
-	g_free(sd);
-	return pb;
+    sd = g_base64_decode(bd, &len);
+    gdk_pixdata_deserialize(&pd, len, sd, &err);
+    pb = gdk_pixbuf_from_pixdata(&pd, TRUE, &err);
+    g_free(sd);
+    return pb;
 }
 
 gchar*
 icon_to_base64(const GdkPixbuf *pixbuf)
 {
-	GdkPixdata pd;
-	guint len;
-	guint8 *sd;
-	gchar *bd;
+    GdkPixdata pd;
+    guint len;
+    guint8 *sd;
+    gchar *bd;
 
-	gdk_pixdata_from_pixbuf(&pd, pixbuf, FALSE);
-	sd = gdk_pixdata_serialize(&pd, &len);
-	bd = g_base64_encode(sd, len);
-	g_free(sd);
-	return bd;
+    gdk_pixdata_from_pixbuf(&pd, pixbuf, FALSE);
+    sd = gdk_pixdata_serialize(&pd, &len);
+    bd = g_base64_encode(sd, len);
+    g_free(sd);
+    return bd;
 }
 
 gchar*
 icon_file_to_base64(const gchar *filename)
 {
-	GdkPixbuf *pb;
-	GError *err = NULL;
+    GdkPixbuf *pb;
+    GError *err = NULL;
 
-	pb = gdk_pixbuf_new_from_file(filename, &err);
-	if (pb == NULL)
-	{
-		g_warning("Failed to open icon file %s: %s", filename, err->message);
-		return NULL;
-	}
-	return icon_to_base64(pb);
+    pb = gdk_pixbuf_new_from_file(filename, &err);
+    if (pb == NULL)
+    {
+        g_warning("Failed to open icon file %s: %s", filename, err->message);
+        return NULL;
+    }
+    return icon_to_base64(pb);
 }

HandBrake-0.9.8.tar.bz2/gtk/src/icons.c -> HandBrake-0.9.9.tar.bz2/gtk/src/icons.c Changed

@@ -6,36 +6,43 @@
 void
 ghb_load_icons()
 {
-	GHashTableIter iter;
-	gchar *name;
-	GValue *gval;
+    GHashTableIter iter;
+    gchar *key;
+    GValue *gval;
 
-	GValue *icons = ghb_resource_get("icons");
-	ghb_dict_iter_init(&iter, icons);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&name, (gpointer*)(void*)&gval))
-	{
-		gint colorspace, bps, width, height, rowstride;
-		gboolean alpha;
-		ghb_rawdata_t *rd;
-		gint size;
-		GdkPixbuf *pb;
+    GValue *icons = ghb_resource_get("icons");
+    ghb_dict_iter_init(&iter, icons);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        gint colorspace, bps, width, height, rowstride;
+        gboolean alpha;
+        ghb_rawdata_t *rd;
+        gint size;
+        GdkPixbuf *pb;
+        char *name = g_strdup(key);
+        char *pos;
 
-		colorspace = ghb_value_int(ghb_dict_lookup(gval, "colorspace"));
-		alpha = ghb_value_boolean(ghb_dict_lookup(gval, "alpha"));
-		bps = ghb_value_int(ghb_dict_lookup(gval, "bps"));
-		width = ghb_value_int(ghb_dict_lookup(gval, "width"));
-		height = ghb_value_int(ghb_dict_lookup(gval, "height"));
-		rowstride = ghb_value_int(ghb_dict_lookup(gval, "rowstride"));
-		rd = g_value_get_boxed(ghb_dict_lookup(gval, "data"));
-		pb = gdk_pixbuf_new_from_data(
-				rd->data, colorspace, alpha, bps,
-				width, height, rowstride,
-				NULL, NULL);
-		size = gdk_pixbuf_get_height(pb);
-		gtk_icon_theme_add_builtin_icon(name, size, pb);
-		gdk_pixbuf_unref(pb);
-	}
+        pos = g_strstr_len(name, -1, ".");
+        if (pos != NULL)
+            *pos = '\0';
+
+        colorspace = ghb_value_int(ghb_dict_lookup(gval, "colorspace"));
+        alpha = ghb_value_boolean(ghb_dict_lookup(gval, "alpha"));
+        bps = ghb_value_int(ghb_dict_lookup(gval, "bps"));
+        width = ghb_value_int(ghb_dict_lookup(gval, "width"));
+        height = ghb_value_int(ghb_dict_lookup(gval, "height"));
+        rowstride = ghb_value_int(ghb_dict_lookup(gval, "rowstride"));
+        rd = g_value_get_boxed(ghb_dict_lookup(gval, "data"));
+        pb = gdk_pixbuf_new_from_data(
+                rd->data, colorspace, alpha, bps,
+                width, height, rowstride,
+                NULL, NULL);
+        size = gdk_pixbuf_get_height(pb);
+        gtk_icon_theme_add_builtin_icon(name, size, pb);
+        g_object_unref(pb);
+        g_free(name);
+    }
 }

HandBrake-0.9.8.tar.bz2/gtk/src/ini_to_plist.c -> HandBrake-0.9.9.tar.bz2/gtk/src/ini_to_plist.c Changed

@@ -8,97 +8,97 @@
 gboolean
 string_is_true(const gchar *str)
 {
-	return (strcmp(str, "enable") == 0);
+    return (strcmp(str, "enable") == 0);
 }
 
 gboolean
 string_is_bool(const gchar *str)
 {
-	return (strcmp(str, "enable") == 0) || (strcmp(str, "disable") == 0);
+    return (strcmp(str, "enable") == 0) || (strcmp(str, "disable") == 0);
 }
 
 GType
 guess_type(const gchar *str)
 {
-	gchar *end;
-	gdouble dval;
+    gchar *end;
+    gdouble dval;
 
-	if (*str == 0)
-		return G_TYPE_STRING;
-	if (string_is_bool(str))
-		return G_TYPE_BOOLEAN;
-	dval = g_strtod(str, &end);
-	if (*end == 0)
-	{
-		if (strchr(str, '.') == NULL)
-			return G_TYPE_INT64;
-		else
-			return G_TYPE_DOUBLE;
-	}
+    if (*str == 0)
+        return G_TYPE_STRING;
+    if (string_is_bool(str))
+        return G_TYPE_BOOLEAN;
+    dval = g_strtod(str, &end);
+    if (*end == 0)
+    {
+        if (strchr(str, '.') == NULL)
+            return G_TYPE_INT64;
+        else
+            return G_TYPE_DOUBLE;
+    }
 
-	return G_TYPE_STRING;
+    return G_TYPE_STRING;
 }
 
 void
 set_value(GValue *gval, const gchar *str, GType gtype)
 {
-	if (gtype == G_TYPE_STRING)
-	{
-		g_value_set_string(gval, str);
-	}
-	else if (gtype == G_TYPE_INT64)
-	{
-		gint64 val = g_strtod(str, NULL);
-		g_value_set_int64(gval, val);
-	}
-	else if (gtype == G_TYPE_DOUBLE)
-	{
-		gdouble val = g_strtod(str, NULL);
-		g_value_set_double(gval, val);
-	}
-	else if (gtype == G_TYPE_BOOLEAN)
-	{
-		if (string_is_true(str))
-			g_value_set_boolean(gval, TRUE);
-		else
-			g_value_set_boolean(gval, FALSE);
-	}
+    if (gtype == G_TYPE_STRING)
+    {
+        g_value_set_string(gval, str);
+    }
+    else if (gtype == G_TYPE_INT64)
+    {
+        gint64 val = g_strtod(str, NULL);
+        g_value_set_int64(gval, val);
+    }
+    else if (gtype == G_TYPE_DOUBLE)
+    {
+        gdouble val = g_strtod(str, NULL);
+        g_value_set_double(gval, val);
+    }
+    else if (gtype == G_TYPE_BOOLEAN)
+    {
+        if (string_is_true(str))
+            g_value_set_boolean(gval, TRUE);
+        else
+            g_value_set_boolean(gval, FALSE);
+    }
 }
 
 int
 main(gint argc, gchar *argv[])
 {
-	GKeyFile *kf;
-	gchar **groups;
-	gchar **keys;
-	gint ii, jj;
-	GValue *top;
-	GValue *dict;
+    GKeyFile *kf;
+    gchar **groups;
+    gchar **keys;
+    gint ii, jj;
+    GValue *top;
+    GValue *dict;
 
-	g_type_init();
-	top = ghb_dict_value_new();
-	kf = g_key_file_new();
-	g_key_file_load_from_file(kf, argv[1], 0, NULL);
-	groups = g_key_file_get_groups(kf, NULL);
-	for (ii = 0; groups[ii]; ii++)
-	{
-		dict = ghb_dict_value_new();
-		ghb_dict_insert(top, , g_strdup(groups[ii]), dict);
-		keys = g_key_file_get_keys(kf, groups[ii], NULL, NULL);
-		for (jj = 0; keys[jj]; jj++)
-		{
-			gchar *str;
-			GValue *gval;
-			GType gtype;
+    g_type_init();
+    top = ghb_dict_value_new();
+    kf = g_key_file_new();
+    g_key_file_load_from_file(kf, argv[1], 0, NULL);
+    groups = g_key_file_get_groups(kf, NULL);
+    for (ii = 0; groups[ii]; ii++)
+    {
+        dict = ghb_dict_value_new();
+        ghb_dict_insert(top, , g_strdup(groups[ii]), dict);
+        keys = g_key_file_get_keys(kf, groups[ii], NULL, NULL);
+        for (jj = 0; keys[jj]; jj++)
+        {
+            gchar *str;
+            GValue *gval;
+            GType gtype;
 
-			str = g_key_file_get_string(kf, groups[ii], keys[jj], NULL);
-			gtype = guess_type(str);
-			gval = g_malloc0(sizeof(GValue));
-			g_value_init(gval, gtype);
-			set_value(gval, str, gtype);
-			ghb_dict_insert(dict, g_strdup(keys[jj]), gval);
-		}
-	}
-	ghb_plist_write_file("a_p_list", top);
+            str = g_key_file_get_string(kf, groups[ii], keys[jj], NULL);
+            gtype = guess_type(str);
+            gval = g_malloc0(sizeof(GValue));
+            g_value_init(gval, gtype);
+            set_value(gval, str, gtype);
+            ghb_dict_insert(dict, g_strdup(keys[jj]), gval);
+        }
+    }
+    ghb_plist_write_file("a_p_list", top);
 }

HandBrake-0.9.8.tar.bz2/gtk/src/internal_defaults.xml -> HandBrake-0.9.9.tar.bz2/gtk/src/internal_defaults.xml Changed

@@ -2,385 +2,421 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Initialization</key>
-	<dict>
-		<key>AudioTrackName</key>
-		<string></string>
-		<key>AudioEncoderActual</key>
-		<string></string>
-		<key>angle_count</key>
-		<integer>1</integer>
-		<key>angle</key>
-		<integer>1</integer>
-		<key>anamorphic</key>
-		<true />
-		<key>autoscale</key>
-		<false />
-		<key>dest_dir</key>
-		<string></string>
-		<key>dest_file</key>
-		<string>new_video.mp4</string>
-		<key>end_point</key>
-		<integer>100</integer>
-		<key>folder</key>
-		<string></string>
-		<key>preset</key>
-		<array>
-			<string>Normal</string>
-		</array>
-		<key>preset_selection</key>
-		<array>
-			<string>Normal</string>
-		</array>
-		<key>PictureDisplayWidth</key>
-		<integer>720</integer>
-		<key>PictureDisplayHeight</key>
-		<integer>480</integer>
-		<key>PtoPType</key>
-		<string>chapter</string>
-		<key>scale_height</key>
-		<integer>0</integer>
-		<key>scale_width</key>
-		<integer>0</integer>
-		<key>show_crop</key>
-		<false />
-		<key>hide_settings</key>
-		<false />
-		<key>show_picture</key>
-		<false />
-		<key>single_title</key>
-		<integer>1</integer>
-		<key>start_point</key>
-		<integer>1</integer>
-		<key>start_frame</key>
-		<integer>-1</integer>
-		<key>title_no</key>
-		<integer>0</integer>
-		<key>title</key>
-		<string>none</string>
-		<key>volume_label</key>
-		<string>New Video</string>
-		<key>x264_8x8dct</key>
-		<false />
-		<key>x264_analyse</key>
-		<string>some</string>
-		<key>x264_bframes</key>
-		<integer>0</integer>
-		<key>x264_mbtree</key>
-		<true />
-		<key>x264_bpyramid</key>
-		<false />
-		<key>x264_cabac</key>
-		<true />
-		<key>x264_deblock_alpha</key>
-		<integer>0</integer>
-		<key>x264_deblock_beta</key>
-		<integer>0</integer>
-		<key>x264_direct</key>
-		<string>spatial</string>
-		<key>x264_b_adapt</key>
-		<string>1</string>
-		<key>x264_me</key>
-		<string>hex</string>
-		<key>x264_merange</key>
-		<integer>16</integer>
-		<key>x264_mixed_refs</key>
-		<false />
-		<key>x264_no_dct_decimate</key>
-		<false />
-		<key>x264_no_fast_pskip</key>
-		<false />
-		<key>x264_refs</key>
-		<integer>1</integer>
-		<key>x264_subme</key>
-		<integer>6</integer>
-		<key>x264_trellis</key>
-		<integer>0</integer>
-		<key>x264_weighted_bframes</key>
-		<false />
-		<key>audio_list</key>
-		<array>
-		</array>
-		<key>subtitle_list</key>
-		<array>
-		</array>
-		<key>vquality_type_bitrate</key>
-		<false />
-		<key>vquality_type_constant</key>
-		<false />
-		<key>SrtLanguage</key>
-		<string>und</string>
-		<key>SrtCodeset</key>
-		<string>ISO-8859-1</string>
-		<key>SrtFile</key>
-		<string></string>
-		<key>SrtOffset</key>
-		<integer>0</integer>
-		<key>VideoFramerateCFR</key>
-		<false />
-		<key>VideoFrameratePFR</key>
-		<false />
-		<key>VideoFramerateVFR</key>
-		<false />
-	</dict>
-	<key>Preferences</key>
-	<dict>
-		<key>AdvancedAutoPassthru</key>
-		<false />
-		<key>AutoScan</key>
-		<false />
-		<key>AddCC</key>
-		<false />
-		<key>EncodeLogLocation</key>
-		<false />
-		<key>show_status</key>
-		<true />
-		<key>allow_tweaks</key>
-		<false />
-		<key>title_no_in_destination</key>
-		<false />
-		<key>last_update_check</key>
-		<integer>0</integer>
-		<key>check_updates</key>
-		<string>weekly</string>
-		<key>chapters_in_destination</key>
-		<false />
-		<key>default_source</key>
-		<string>/dev/dvd</string>
-		<key>ExportDirectory</key>
-		<string></string>
-		<key>destination_dir</key>
-		<string></string>
-		<key>hbfd</key>
-		<false />
-		<key>hbfd_feature</key>
-		<false />
-		<key>live_duration</key>
-		<integer>15</integer>
-		<key>LoggingLevel</key>
-		<string>1</string>
-		<key>LogLongevity</key>
-		<string>immortal</string>
-		<key>nocheckvquality</key>
-		<false />
-		<key>use_dvdnav</key>
-		<true />
-		<key>reduce_hd_preview</key>
-		<true />
-		<key>MinTitleDuration</key>
-		<integer>10</integer>
-		<key>preview_count</key>
-		<integer>10</integer>
-		<key>preview_fullscreen</key>
-		<false />
-		<key>preview_x</key>
-		<integer>-1</integer>
-		<key>preview_y</key>
-		<integer>-1</integer>
-		<key>settings_x</key>
-		<integer>-1</integer>
-		<key>settings_y</key>
-		<integer>-1</integer>
-		<key>show_presets</key>
-		<true />
-		<key>show_preview</key>
-		<true />
-		<key>UseM4v</key>
-		<true />
-		<key>use_source_name</key>
-		<true />
-		<key>update_skip_version</key>
-		<integer>0</integer>
-		<key>VideoQualityGranularity</key>
-		<string>1</string>
-		<key>version</key>
-		<string>0.1</string>
-		<key>PreferredLanguage</key>
-		<string>und</string>
-		<key>AudioDUB</key>
-		<false />
-		<key>NotAudioDUB</key>
-		<true />
-		<key>constant_rate_factor</key>
-		<true />
-		<key>WhenComplete</key>
-		<string>notify</string>
-		<key>SrtDir</key>
-		<string></string>
-		<key>window_width</key>
-		<integer>1</integer>
-		<key>window_height</key>
-		<integer>1</integer>
-	</dict>
-	<key>XlatPresets</key>
-	<dict>
-		<key>autoscale</key>
-		<false />
-		<key>vquality_type_bitrate</key>
-		<false />
-		<key>vquality_type_constant</key>
-		<false />
-		<key>VideoFramerateCFR</key>
-		<false />
-		<key>VideoFrameratePFR</key>
-		<false />
-		<key>VideoFramerateVFR</key>
-		<false />
-		<key>PictureDeinterlaceDecomb</key>
-		<false />
-	</dict>
-	<key>Presets</key>
-	<dict>
-		<key>PresetBuildNumber</key>
-		<string></string>
-		<key>PictureAutoCrop</key>
-		<true />
-		<key>ChapterMarkers</key>
-		<true />
-		<key>FileFormat</key>
-		<string>mp4</string>
-		<key>Folder</key>
-		<false />
-		<key>PictureLooseCrop</key>
-		<false />
-		<key>PictureModulus</key>
-		<integer>16</integer>
-		<key>PictureDeblock</key>
-		<integer>0</integer>
-		<key>PictureDecombDeinterlace</key>
-		<true />
-		<key>PictureDecomb</key>
-		<string>off</string>
-		<key>PictureDecombCustom</key>
-		<string></string>
-		<key>Default</key>
-		<false />
-		<key>PictureBottomCrop</key>
-		<integer>0</integer>
-		<key>PictureLeftCrop</key>
-		<integer>0</integer>
-		<key>PictureRightCrop</key>
-		<integer>0</integer>
-		<key>PictureTopCrop</key>
-		<integer>0</integer>
-		<key>PictureDeinterlace</key>
-		<string>off</string>
-		<key>PictureDeinterlaceCustom</key>
-		<string></string>
-		<key>PictureDenoise</key>
-		<string>off</string>
-		<key>PictureDenoiseCustom</key>
-		<string></string>
-		<key>PictureDetelecine</key>
-		<string>off</string>
-		<key>PictureDetelecineCustom</key>
-		<string></string>
-		<key>PicturePAR</key>
-		<integer>2</integer>
-		<key>PicturePARWidth</key>
-		<integer>853</integer>
-		<key>PicturePARHeight</key>
-		<integer>720</integer>
-		<key>PictureHeight</key>
-		<integer>0</integer>
-		<key>PictureWidth</key>
-		<integer>0</integer>
-		<key>VideoFramerate</key>
-		<string>source</string>
-		<key>VideoFramerateMode</key>
-		<string>vfr</string>
-		<key>VideoGrayScale</key>
-		<false />
-		<key>Mp4HttpOptimize</key>
-		<false />
-		<key>Mp4iPodCompatible</key>
-		<false />
-		<key>PictureKeepRatio</key>
-		<true />
-		<key>Mp4LargeFile</key>
-		<false />
-		<key>AudioAllowMP3Pass</key>
-		<true />
-		<key>AudioAllowAACPass</key>
-		<true />
-		<key>AudioAllowAC3Pass</key>
-		<true />
-		<key>AudioAllowDTSPass</key>
-		<true />
-		<key>AudioAllowDTSHDPass</key>
-		<true />
-		<key>AudioEncoderFallback</key>
-		<string>ffac3</string>
-		<key>AudioList</key>
-		<array>
-			<dict>
-				<key>AudioBitrate</key>
-				<string>192</string>
-				<key>AudioEncoder</key>
-				<string>copy:ac3</string>
-				<key>AudioTrack</key>
-				<integer>1</integer>
-				<key>AudioTrackDescription</key>
-				<string></string>
-				<key>AudioTrackQualityEnable</key>
-				<false />
-				<key>AudioTrackQuality</key>
-				<real>-1</real>
-				<key>AudioTrackGain</key>
-				<real>0</real>
-				<key>AudioTrackDRCSlider</key>
-				<real>0</real>
-				<key>AudioMixdown</key>
-				<string>dpl2</string>
-				<key>AudioSamplerate</key>
-				<string>source</string>
-			</dict>
-		</array>
-		<key>PresetDescription</key>
-		<string></string>
-		<key>PresetName</key>
-		<string>Name Missing</string>
-		<key>Type</key>
-		<integer>1</integer>
-		<key>SubtitleList</key>
-		<array>
-			<dict>
-				<key>SubtitleLanguage</key>
-				<string>und</string>
-				<key>SubtitleForced</key>
-				<true />
-				<key>SubtitleSource</key>
-				<integer>0</integer>
-				<key>SubtitleBurned</key>
-				<true />
-				<key>SubtitleDefaultTrack</key>
-				<false />
-			</dict>
-		</array>
-		<key>VideoTurboTwoPass</key>
-		<false />
-		<key>UsesPictureFilters</key>
-		<true />
-		<key>UsesPictureSettings</key>
-		<integer>2</integer>
-		<key>UsesMaxPictureSettings</key>
-		<false />
-		<key>VideoTwoPass</key>
-		<false />
-		<key>VideoAvgBitrate</key>
-		<integer>1800</integer>
-		<key>VideoEncoder</key>
-		<string>x264</string>
-		<key>VideoQualityType</key>
-		<integer>2</integer>
-		<key>VideoQualitySlider</key>
-		<real>0.60</real>
-		<key>VideoTargetSize</key>
-		<integer>700</integer>
-		<key>lavcOption</key>
-		<string></string>
-		<key>x264Option</key>
-		<string></string>
-	</dict>
+    <key>Initialization</key>
+    <dict>
+        <key>AudioTrackName</key>
+        <string></string>
+        <key>AudioEncoderActual</key>
+        <string></string>
+        <key>angle_count</key>
+        <integer>1</integer>
+        <key>angle</key>
+        <integer>1</integer>
+        <key>anamorphic</key>
+        <true />
+        <key>autoscale</key>
+        <false />
+        <key>dest_dir</key>
+        <string></string>
+        <key>dest_file</key>
+        <string>new_video.mp4</string>
+        <key>end_point</key>
+        <integer>100</integer>
+        <key>folder</key>
+        <string></string>
+        <key>MetaName</key>
+        <string></string>
+        <key>MetaArtist</key>
+        <string></string>
+        <key>MetaAlbumArtist</key>
+        <string></string>
+        <key>MetaReleaseDate</key>
+        <string></string>
+        <key>MetaComment</key>
+        <string></string>
+        <key>MetaGenre</key>
+        <string></string>
+        <key>MetaDescription</key>
+        <string></string>
+        <key>MetaLongDescription</key>
+        <string></string>
+        <key>preset</key>
+        <array>
+            <string>Normal</string>
+        </array>
+        <key>preset_selection</key>
+        <array>
+            <string>Normal</string>
+        </array>
+        <key>PictureDisplayWidth</key>
+        <integer>720</integer>
+        <key>PictureDisplayHeight</key>
+        <integer>480</integer>
+        <key>PtoPType</key>
+        <string>chapter</string>
+        <key>scale_height</key>
+        <integer>0</integer>
+        <key>scale_width</key>
+        <integer>0</integer>
+        <key>preview_show_crop</key>
+        <false />
+        <key>hide_settings</key>
+        <false />
+        <key>show_picture</key>
+        <false />
+        <key>single_title</key>
+        <integer>1</integer>
+        <key>start_point</key>
+        <integer>1</integer>
+        <key>start_frame</key>
+        <integer>-1</integer>
+        <key>title_no</key>
+        <integer>0</integer>
+        <key>title</key>
+        <string>none</string>
+        <key>volume_label</key>
+        <string>New Video</string>
+        <key>x264_8x8dct</key>
+        <false />
+        <key>x264_analyse</key>
+        <string>some</string>
+        <key>x264_bframes</key>
+        <integer>0</integer>
+        <key>x264_mbtree</key>
+        <true />
+        <key>x264_bpyramid</key>
+        <false />
+        <key>x264_cabac</key>
+        <true />
+        <key>x264_deblock_alpha</key>
+        <integer>0</integer>
+        <key>x264_deblock_beta</key>
+        <integer>0</integer>
+        <key>x264_direct</key>
+        <string>spatial</string>
+        <key>x264_b_adapt</key>
+        <string>1</string>
+        <key>x264_me</key>
+        <string>hex</string>
+        <key>x264_merange</key>
+        <integer>16</integer>
+        <key>x264_mixed_refs</key>
+        <false />
+        <key>x264_no_dct_decimate</key>
+        <false />
+        <key>x264_no_fast_pskip</key>
+        <false />
+        <key>x264_refs</key>
+        <integer>1</integer>
+        <key>x264_subme</key>
+        <integer>6</integer>
+        <key>x264_trellis</key>
+        <integer>0</integer>
+        <key>x264_weighted_bframes</key>
+        <false />
+        <key>audio_list</key>
+        <array>
+        </array>
+        <key>subtitle_list</key>
+        <array>
+        </array>
+        <key>vquality_type_bitrate</key>
+        <false />
+        <key>vquality_type_constant</key>
+        <false />
+        <key>SrtLanguage</key>
+        <string>und</string>
+        <key>SrtCodeset</key>
+        <string>ISO-8859-1</string>
+        <key>SrtFile</key>
+        <string></string>
+        <key>SrtOffset</key>
+        <integer>0</integer>
+        <key>VideoFramerateCFR</key>
+        <false />
+        <key>VideoFrameratePFR</key>
+        <false />
+        <key>VideoFramerateVFR</key>
+        <false />
+    </dict>
+    <key>Preferences</key>
+    <dict>
+        <key>HideAdvancedVideoSettings</key>
+        <false />
+        <key>AdvancedAutoPassthru</key>
+        <false />
+        <key>AutoScan</key>
+        <false />
+        <key>AddCC</key>
+        <false />
+        <key>EncodeLogLocation</key>
+        <false />
+        <key>show_status</key>
+        <true />
+        <key>allow_tweaks</key>
+        <false />
+        <key>title_no_in_destination</key>
+        <false />
+        <key>last_update_check</key>
+        <integer>0</integer>
+        <key>check_updates</key>
+        <string>weekly</string>
+        <key>chapters_in_destination</key>
+        <false />
+        <key>default_source</key>
+        <string>/dev/dvd</string>
+        <key>ExportDirectory</key>
+        <string></string>
+        <key>destination_dir</key>
+        <string></string>
+        <key>hbfd</key>
+        <false />
+        <key>hbfd_feature</key>
+        <false />
+        <key>live_duration</key>
+        <integer>15</integer>
+        <key>LoggingLevel</key>
+        <string>1</string>
+        <key>LogLongevity</key>
+        <string>immortal</string>
+        <key>nocheckvquality</key>
+        <false />
+        <key>use_dvdnav</key>
+        <true />
+        <key>reduce_hd_preview</key>
+        <true />
+        <key>MinTitleDuration</key>
+        <integer>10</integer>
+        <key>preview_count</key>
+        <integer>10</integer>
+        <key>preview_fullscreen</key>
+        <false />
+        <key>preview_x</key>
+        <integer>-1</integer>
+        <key>preview_y</key>
+        <integer>-1</integer>
+        <key>settings_x</key>
+        <integer>-1</integer>
+        <key>settings_y</key>
+        <integer>-1</integer>
+        <key>show_presets</key>
+        <true />
+        <key>show_preview</key>
+        <true />
+        <key>UseM4v</key>
+        <true />
+        <key>use_source_name</key>
+        <true />
+        <key>update_skip_version</key>
+        <integer>0</integer>
+        <key>VideoQualityGranularity</key>
+        <string>1</string>
+        <key>version</key>
+        <string>0.1</string>
+        <key>PreferredLanguage</key>
+        <string>und</string>
+        <key>AudioDUB</key>
+        <false />
+        <key>NotAudioDUB</key>
+        <true />
+        <key>constant_rate_factor</key>
+        <true />
+        <key>WhenComplete</key>
+        <string>notify</string>
+        <key>SrtDir</key>
+        <string></string>
+        <key>window_width</key>
+        <integer>1</integer>
+        <key>window_height</key>
+        <integer>1</integer>
+    </dict>
+    <key>XlatPresets</key>
+    <dict>
+        <key>autoscale</key>
+        <false />
+        <key>vquality_type_bitrate</key>
+        <false />
+        <key>vquality_type_constant</key>
+        <false />
+        <key>VideoFramerateCFR</key>
+        <false />
+        <key>VideoFrameratePFR</key>
+        <false />
+        <key>VideoFramerateVFR</key>
+        <false />
+        <key>PictureDeinterlaceDecomb</key>
+        <false />
+        <key>x264PresetSlider</key>
+        <integer>0</integer>
+        <key>x264ZeroLatency</key>
+        <false />
+        <key>x264FastDecode</key>
+        <false />
+    </dict>
+    <key>Presets</key>
+    <dict>
+        <key>PresetBuildNumber</key>
+        <string></string>
+        <key>PictureAutoCrop</key>
+        <true />
+        <key>ChapterMarkers</key>
+        <true />
+        <key>FileFormat</key>
+        <string>mp4</string>
+        <key>Folder</key>
+        <false />
+        <key>PictureLooseCrop</key>
+        <false />
+        <key>PictureModulus</key>
+        <integer>16</integer>
+        <key>PictureDeblock</key>
+        <integer>0</integer>
+        <key>PictureDecombDeinterlace</key>
+        <true />
+        <key>PictureDecomb</key>
+        <string>off</string>
+        <key>PictureDecombCustom</key>
+        <string></string>
+        <key>Default</key>
+        <false />
+        <key>PictureBottomCrop</key>
+        <integer>0</integer>
+        <key>PictureLeftCrop</key>
+        <integer>0</integer>
+        <key>PictureRightCrop</key>
+        <integer>0</integer>
+        <key>PictureTopCrop</key>
+        <integer>0</integer>
+        <key>PictureDeinterlace</key>
+        <string>off</string>
+        <key>PictureDeinterlaceCustom</key>
+        <string></string>
+        <key>PictureDenoise</key>
+        <string>off</string>
+        <key>PictureDenoiseCustom</key>
+        <string></string>
+        <key>PictureDetelecine</key>
+        <string>off</string>
+        <key>PictureDetelecineCustom</key>
+        <string></string>
+        <key>PicturePAR</key>
+        <integer>2</integer>
+        <key>PicturePARWidth</key>
+        <integer>853</integer>
+        <key>PicturePARHeight</key>
+        <integer>720</integer>
+        <key>PictureHeight</key>
+        <integer>0</integer>
+        <key>PictureWidth</key>
+        <integer>0</integer>
+        <key>VideoFramerate</key>
+        <string>source</string>
+        <key>VideoFramerateMode</key>
+        <string>vfr</string>
+        <key>VideoGrayScale</key>
+        <false />
+        <key>Mp4HttpOptimize</key>
+        <false />
+        <key>Mp4iPodCompatible</key>
+        <false />
+        <key>PictureKeepRatio</key>
+        <true />
+        <key>Mp4LargeFile</key>
+        <false />
+        <key>AudioAllowMP3Pass</key>
+        <true />
+        <key>AudioAllowAACPass</key>
+        <true />
+        <key>AudioAllowAC3Pass</key>
+        <true />
+        <key>AudioAllowDTSPass</key>
+        <true />
+        <key>AudioAllowDTSHDPass</key>
+        <true />
+        <key>AudioEncoderFallback</key>
+        <string>ffac3</string>
+        <key>AudioList</key>
+        <array>
+            <dict>
+                <key>AudioBitrate</key>
+                <string>192</string>
+                <key>AudioEncoder</key>
+                <string>copy:ac3</string>
+                <key>AudioTrack</key>
+                <integer>1</integer>
+                <key>AudioTrackDescription</key>
+                <string></string>
+                <key>AudioTrackQualityEnable</key>
+                <false />
+                <key>AudioTrackQuality</key>
+                <real>-1</real>
+                <key>AudioTrackGain</key>
+                <real>0</real>
+                <key>AudioTrackDRCSlider</key>
+                <real>0</real>
+                <key>AudioMixdown</key>
+                <string>dpl2</string>
+                <key>AudioSamplerate</key>
+                <string>source</string>
+            </dict>
+        </array>
+        <key>PresetDescription</key>
+        <string></string>
+        <key>PresetName</key>
+        <string>Name Missing</string>
+        <key>Type</key>
+        <integer>1</integer>
+        <key>SubtitleList</key>
+        <array>
+            <dict>
+                <key>SubtitleLanguage</key>
+                <string>und</string>
+                <key>SubtitleForced</key>
+                <true />
+                <key>SubtitleSource</key>
+                <integer>0</integer>
+                <key>SubtitleBurned</key>
+                <true />
+                <key>SubtitleDefaultTrack</key>
+                <false />
+            </dict>
+        </array>
+        <key>VideoTurboTwoPass</key>
+        <false />
+        <key>UsesPictureFilters</key>
+        <true />
+        <key>UsesPictureSettings</key>
+        <integer>2</integer>
+        <key>UsesMaxPictureSettings</key>
+        <false />
+        <key>VideoTwoPass</key>
+        <false />
+        <key>VideoAvgBitrate</key>
+        <integer>1800</integer>
+        <key>VideoEncoder</key>
+        <string>x264</string>
+        <key>VideoQualityType</key>
+        <integer>2</integer>
+        <key>VideoQualitySlider</key>
+        <real>0.60</real>
+        <key>VideoTargetSize</key>
+        <integer>700</integer>
+        <key>lavcOption</key>
+        <string></string>
+        <key>x264Option</key>
+        <string></string>
+        <key>x264Preset</key>
+        <string>custom</string>
+        <key>x264Tune</key>
+        <string></string>
+        <key>h264Profile</key>
+        <string></string>
+        <key>h264Level</key>
+        <string></string>
+        <key>x264UseAdvancedOptions</key>
+        <true />
+        <key>x264OptionExtra</key>
+        <string></string>
+    </dict>
 </dict>
 </plist>

HandBrake-0.9.8.tar.bz2/gtk/src/main.c -> HandBrake-0.9.9.tar.bz2/gtk/src/main.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * main.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * main.c is free software.
  * 
@@ -17,9 +17,9 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with main.c.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <sys/types.h>
@@ -44,7 +44,7 @@
 #else
 #include <windows.h>
 #include <io.h>
-#define pipe(phandles)	_pipe (phandles, 4096, _O_BINARY)
+#define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
 #endif
 
 #if defined(_USE_APP_IND)
@@ -76,9 +76,9 @@
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-#  define _(String) dgettext (PACKAGE, String)
+#  define _(String) dgettext(PACKAGE, String)
 #  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
+#    define N_(String) gettext_noop(String)
 #  else
 #    define N_(String) (String)
 #  endif
@@ -98,24 +98,24 @@
 GtkBuilder*
 create_builder_or_die(const gchar * name)
 {
-	guint res = 0;
-	GValue *gval;
-	GError *error = NULL;
-	const gchar *ghb_ui;
+    guint res = 0;
+    GValue *gval;
+    GError *error = NULL;
+    const gchar *ghb_ui;
 
     const gchar *markup =
         N_("<b><big>Unable to create %s.</big></b>\n"
         "\n"
         "Internal error. Could not parse UI description.\n"
-		"%s");
-	g_debug("create_builder_or_die ()\n");
-	GtkBuilder *xml = gtk_builder_new();
-	gval = ghb_resource_get("ghb-ui");
-	ghb_ui = g_value_get_string(gval);
-	if (xml != NULL)
-		res = gtk_builder_add_from_string(xml, ghb_ui, -1, &error);
+        "%s");
+    g_debug("create_builder_or_die()\n");
+    GtkBuilder *xml = gtk_builder_new();
+    gval = ghb_resource_get("ghb-ui");
+    ghb_ui = g_value_get_string(gval);
+    if (xml != NULL)
+        res = gtk_builder_add_from_string(xml, ghb_ui, -1, &error);
     if (!xml || !res) 
-	{
+    {
         GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL,
             GTK_DIALOG_MODAL,
             GTK_MESSAGE_ERROR,
@@ -145,44 +145,44 @@
 
 static void
 MyConnect(
-	GtkBuilder *builder,
-	GObject *object,
-	const gchar *signal_name,
-	const gchar *handler_name,
-	GObject *connect_object,
-	GConnectFlags flags,
-	gpointer user_data)
+    GtkBuilder *builder,
+    GObject *object,
+    const gchar *signal_name,
+    const gchar *handler_name,
+    GObject *connect_object,
+    GConnectFlags flags,
+    gpointer user_data)
 {
-	GCallback callback;
+    GCallback callback;
 
     g_return_if_fail(object != NULL);
     g_return_if_fail(handler_name != NULL);
     g_return_if_fail(signal_name != NULL);
 
-	//const gchar *name = ghb_get_setting_key((GtkWidget*)object);
-	//g_message("\n\nname %s", name);
-	g_debug("handler_name %s", handler_name);
-	g_debug("signal_name %s", signal_name);
+    //const gchar *name = ghb_get_setting_key((GtkWidget*)object);
+    //g_message("\n\nname %s", name);
+    g_debug("handler_name %s", handler_name);
+    g_debug("signal_name %s", signal_name);
     callback = self_symbol_lookup(handler_name);
     if (!callback) 
-	{
+    {
         g_message("Signal handler (%s) not found", handler_name);
         return;
     }
     if (connect_object) 
-	{
+    {
         g_signal_connect_object(object, signal_name, callback, connect_object, flags);
     }
     else 
-	{
+    {
         if (flags & G_CONNECT_AFTER)
-		{
+        {
             g_signal_connect_after( object, signal_name, callback, user_data);
-		}
+        }
         else
-		{
+        {
             g_signal_connect(object, signal_name, callback, user_data);
-		}
+        }
     }
 }
 
@@ -215,38 +215,36 @@
 // Create and bind the tree model to the tree view for the chapter list
 // Also, connect up the signal that lets us know the selection has changed
 static void
-bind_chapter_tree_model (signal_user_data_t *ud)
+bind_chapter_tree_model(signal_user_data_t *ud)
 {
-	GtkCellRenderer *cell;
-	GtkTreeViewColumn *column;
-	GtkListStore *treestore;
-	GtkTreeView  *treeview;
-	GtkTreeSelection *selection;
-
-	g_debug("bind_chapter_tree_model ()\n");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "chapters_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	treestore = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
-
-	cell = ghb_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Index"), cell, "text", 0, NULL);
+    GtkCellRenderer *cell;
+    GtkTreeViewColumn *column;
+    GtkListStore *treestore;
+    GtkTreeView  *treeview;
+
+    g_debug("bind_chapter_tree_model()\n");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
+    treestore = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
+
+    cell = ghb_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Index"), cell, "text", 0, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-	cell = ghb_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Duration"), cell, "text", 1, NULL);
+    cell = ghb_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Duration"), cell, "text", 1, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-	cell = ghb_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-					_("Title"), cell, "text", 2, "editable", 3, NULL);
+    cell = ghb_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                    _("Title"), cell, "text", 2, "editable", 3, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-	g_signal_connect(cell, "key-press-event", chapter_keypress_cb, ud);
-	g_signal_connect(cell, "edited", chapter_edited_cb, ud);
-	g_debug("Done\n");
+    g_signal_connect(cell, "key-press-event", chapter_keypress_cb, ud);
+    g_signal_connect(cell, "edited", chapter_edited_cb, ud);
+    g_debug("Done\n");
 }
 
 
@@ -259,56 +257,56 @@
 // Create and bind the tree model to the tree view for the queue list
 // Also, connect up the signal that lets us know the selection has changed
 static void
-bind_queue_tree_model (signal_user_data_t *ud)
+bind_queue_tree_model(signal_user_data_t *ud)
 {
-	GtkCellRenderer *cell, *textcell;
-	GtkTreeViewColumn *column;
-	GtkTreeStore *treestore;
-	GtkTreeView  *treeview;
-	GtkTreeSelection *selection;
-	GtkTargetEntry SrcEntry;
-	SrcEntry.target = "DATA";
-	SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
-
-	g_debug("bind_queue_tree_model ()\n");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "queue_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	treestore = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
-
-	column = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title (column, _("Job Information"));
-	cell = gtk_cell_renderer_pixbuf_new();
-	g_object_set(cell, "yalign", 0.0, NULL);
-	gtk_tree_view_column_pack_start (column, cell, FALSE);
-	gtk_tree_view_column_add_attribute (column, cell, "icon-name", 0);
-	textcell = gtk_cell_renderer_text_new();
-	g_object_set(textcell, "wrap-mode", PANGO_WRAP_CHAR, NULL);
-	g_object_set(textcell, "wrap-width", 500, NULL);
-	gtk_tree_view_column_pack_start (column, textcell, TRUE);
-	gtk_tree_view_column_add_attribute (column, textcell, "markup", 1);
+    GtkCellRenderer *cell, *textcell;
+    GtkTreeViewColumn *column;
+    GtkTreeStore *treestore;
+    GtkTreeView  *treeview;
+    GtkTreeSelection *selection;
+    GtkTargetEntry SrcEntry;
+    SrcEntry.target = "DATA";
+    SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
+
+    g_debug("bind_queue_tree_model()\n");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+    selection = gtk_tree_view_get_selection(treeview);
+    treestore = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
+
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _("Job Information"));
+    cell = gtk_cell_renderer_pixbuf_new();
+    g_object_set(cell, "yalign", 0.0, NULL);
+    gtk_tree_view_column_pack_start(column, cell, FALSE);
+    gtk_tree_view_column_add_attribute(column, cell, "icon-name", 0);
+    textcell = gtk_cell_renderer_text_new();
+    g_object_set(textcell, "wrap-mode", PANGO_WRAP_CHAR, NULL);
+    g_object_set(textcell, "wrap-width", 500, NULL);
+    gtk_tree_view_column_pack_start(column, textcell, TRUE);
+    gtk_tree_view_column_add_attribute(column, textcell, "markup", 1);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_expand (column, TRUE);
-	gtk_tree_view_column_set_max_width (column, 550);
-
-	cell = custom_cell_renderer_button_new();
-	g_object_set(cell, "yalign", 0.0, NULL);
-	column = gtk_tree_view_column_new_with_attributes(
-									_(""), cell, "icon-name", 2, NULL);
-	gtk_tree_view_column_set_min_width (column, 24);
+    gtk_tree_view_column_set_expand(column, TRUE);
+    gtk_tree_view_column_set_max_width(column, 550);
+
+    cell = custom_cell_renderer_button_new();
+    g_object_set(cell, "yalign", 0.0, NULL);
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _(""), cell, "icon-name", 2, NULL);
+    gtk_tree_view_column_set_min_width(column, 24);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-	gtk_tree_view_enable_model_drag_dest (treeview, &SrcEntry, 1, 
-											GDK_ACTION_MOVE);
-	gtk_tree_view_enable_model_drag_source (treeview, GDK_BUTTON1_MASK, 
-											&SrcEntry, 1, GDK_ACTION_MOVE);
-
-	g_signal_connect(selection, "changed", queue_list_selection_changed_cb, ud);
-	g_signal_connect(cell, "clicked", queue_remove_clicked_cb, ud);
-	g_signal_connect(treeview, "size-allocate", queue_list_size_allocate_cb, 
-						textcell);
-	g_signal_connect(treeview, "drag_data_received", queue_drag_cb, ud);
-	g_signal_connect(treeview, "drag_motion", queue_drag_motion_cb, ud);
+    gtk_tree_view_enable_model_drag_dest(treeview, &SrcEntry, 1, 
+                                            GDK_ACTION_MOVE);
+    gtk_tree_view_enable_model_drag_source(treeview, GDK_BUTTON1_MASK, 
+                                            &SrcEntry, 1, GDK_ACTION_MOVE);
+
+    g_signal_connect(selection, "changed", queue_list_selection_changed_cb, ud);
+    g_signal_connect(cell, "clicked", queue_remove_clicked_cb, ud);
+    g_signal_connect(treeview, "size-allocate", queue_list_size_allocate_cb, 
+                        textcell);
+    g_signal_connect(treeview, "drag_data_received", queue_drag_cb, ud);
+    g_signal_connect(treeview, "drag_motion", queue_drag_motion_cb, ud);
 }
 
 extern G_MODULE_EXPORT void audio_list_selection_changed_cb(void);
@@ -316,72 +314,72 @@
 // Create and bind the tree model to the tree view for the audio track list
 // Also, connect up the signal that lets us know the selection has changed
 static void
-bind_audio_tree_model (signal_user_data_t *ud)
+bind_audio_tree_model(signal_user_data_t *ud)
 {
-	GtkCellRenderer *cell;
-	GtkTreeViewColumn *column;
-	GtkListStore *treestore;
-	GtkTreeView  *treeview;
-	GtkTreeSelection *selection;
-	GtkWidget *widget;
-
-	g_debug("bind_audio_tree_model ()\n");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "audio_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	// 12 columns in model.  6 are visible, the other 6 are for storing
-	// values that I need
-	treestore = gtk_list_store_new(7, G_TYPE_STRING, G_TYPE_STRING, 
-								   G_TYPE_STRING, G_TYPE_STRING, 
-								   G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
-
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Track"), cell, "text", 0, NULL);
+    GtkCellRenderer *cell;
+    GtkTreeViewColumn *column;
+    GtkListStore *treestore;
+    GtkTreeView  *treeview;
+    GtkTreeSelection *selection;
+    GtkWidget *widget;
+
+    g_debug("bind_audio_tree_model()\n");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+    selection = gtk_tree_view_get_selection(treeview);
+    // 12 columns in model.  6 are visible, the other 6 are for storing
+    // values that I need
+    treestore = gtk_list_store_new(7, G_TYPE_STRING, G_TYPE_STRING, 
+                                   G_TYPE_STRING, G_TYPE_STRING, 
+                                   G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
+
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Track"), cell, "text", 0, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_min_width (column, 200);
-	gtk_tree_view_column_set_max_width (column, 200);
+    gtk_tree_view_column_set_min_width(column, 200);
+    gtk_tree_view_column_set_max_width(column, 200);
 
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Codec"), cell, "text", 1, NULL);
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Codec"), cell, "text", 1, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_min_width (column, 110);
+    gtk_tree_view_column_set_min_width(column, 110);
 
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Bitrate"), cell, "text", 2, NULL);
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Bitrate"), cell, "text", 2, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_min_width (column, 50);
+    gtk_tree_view_column_set_min_width(column, 50);
 
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Sample Rate"), cell, "text", 3, NULL);
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Sample Rate"), cell, "text", 3, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_min_width (column, 100);
+    gtk_tree_view_column_set_min_width(column, 100);
 
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Mix"), cell, "text", 4, NULL);
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Mix"), cell, "text", 4, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_min_width (column, 115);
+    gtk_tree_view_column_set_min_width(column, 115);
 
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Gain"), cell, "text", 5, NULL);
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Gain"), cell, "text", 5, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("DRC"), cell, "text", 6, NULL);
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("DRC"), cell, "text", 6, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-	g_signal_connect(selection, "changed", audio_list_selection_changed_cb, ud);
-	// Need to disable remove and update buttons since there are initially
-	// no selections
-	widget = GHB_WIDGET (ud->builder, "audio_remove");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_debug("Done\n");
+    g_signal_connect(selection, "changed", audio_list_selection_changed_cb, ud);
+    // Need to disable remove and update buttons since there are initially
+    // no selections
+    widget = GHB_WIDGET(ud->builder, "audio_remove");
+    gtk_widget_set_sensitive(widget, FALSE);
+    g_debug("Done\n");
 }
 
 extern G_MODULE_EXPORT void subtitle_list_selection_changed_cb(void);
@@ -392,71 +390,81 @@
 // Create and bind the tree model to the tree view for the subtitle track list
 // Also, connect up the signal that lets us know the selection has changed
 static void
-bind_subtitle_tree_model (signal_user_data_t *ud)
+bind_subtitle_tree_model(signal_user_data_t *ud)
 {
-	GtkCellRenderer *cell;
-	GtkTreeViewColumn *column;
-	GtkListStore *treestore;
-	GtkTreeView  *treeview;
-	GtkTreeSelection *selection;
-	GtkWidget *widget;
-
-	g_debug("bind_subtitle_tree_model ()\n");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	// 6 columns in model.  5 are visible, the other 1 is for storing
-	// values that I need
-	// Track, force, burn, default, type, srt offset, track short, source
-	// force visible, burn visible, offset visible
-	treestore = gtk_list_store_new(10, 
-									G_TYPE_STRING,
-									G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
-									G_TYPE_BOOLEAN,
-									G_TYPE_INT,     G_TYPE_STRING,
-									G_TYPE_INT,
-									G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
-									G_TYPE_BOOLEAN);
-	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
-
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-									_("Track"), cell, "text", 0, NULL);
-	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_min_width (column, 350);
-	gtk_tree_view_column_set_max_width (column, 350);
-
-	cell = gtk_cell_renderer_toggle_new();
-	column = gtk_tree_view_column_new_with_attributes(
-			_("Forced Only"), cell, "active", 1, "visible", 7, NULL);
-	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	g_signal_connect(cell, "toggled", subtitle_forced_toggled_cb, ud);
-
-	cell = gtk_cell_renderer_toggle_new();
-	gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
-	column = gtk_tree_view_column_new_with_attributes(
-			_("Burned In"), cell, "active", 2, "visible", 8, NULL);
-	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	g_signal_connect(cell, "toggled", subtitle_burned_toggled_cb, ud);
-
-	cell = gtk_cell_renderer_toggle_new();
-	gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
-	column = gtk_tree_view_column_new_with_attributes(
-				_("Default"), cell, "active", 3, NULL);
-	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	g_signal_connect(cell, "toggled", subtitle_default_toggled_cb, ud);
-
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-			_("Srt Offset"), cell, "text", 4, "visible", 9, NULL);
-	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-
-
-	g_signal_connect(selection, "changed", subtitle_list_selection_changed_cb, ud);
-	// Need to disable remove and update buttons since there are initially
-	// no selections
-	widget = GHB_WIDGET (ud->builder, "subtitle_remove");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_debug("Done\n");
+    GtkCellRenderer *cell;
+    GtkTreeViewColumn *column;
+    GtkListStore *treestore;
+    GtkTreeView  *treeview;
+    GtkTreeSelection *selection;
+    GtkWidget *widget;
+
+    g_debug("bind_subtitle_tree_model()\n");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection(treeview);
+    // 6 columns in model.  5 are visible, the other 1 is for storing
+    // values that I need
+    // Track, force, burn, default, type, srt offset, track short, source
+    // force visible, burn visible, offset visible
+    treestore = gtk_list_store_new(10, 
+                                    G_TYPE_STRING,
+                                    G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                    G_TYPE_BOOLEAN,
+                                    G_TYPE_INT,     G_TYPE_STRING,
+                                    G_TYPE_INT,
+                                    G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                    G_TYPE_BOOLEAN);
+    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
+
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+                                    _("Track"), cell, "text", 0, NULL);
+    widget = GHB_WIDGET(ud->builder, "SubTrackLabel");
+    gtk_tree_view_column_set_widget(column, widget);
+    gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+    gtk_tree_view_column_set_min_width(column, 350);
+    gtk_tree_view_column_set_max_width(column, 350);
+
+    cell = gtk_cell_renderer_toggle_new();
+    column = gtk_tree_view_column_new_with_attributes(
+            _("Forced Only"), cell, "active", 1, "visible", 7, NULL);
+    widget = GHB_WIDGET(ud->builder, "SubForcedLabel");
+    gtk_tree_view_column_set_widget(column, widget);
+    gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+    g_signal_connect(cell, "toggled", subtitle_forced_toggled_cb, ud);
+
+    cell = gtk_cell_renderer_toggle_new();
+    gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
+    column = gtk_tree_view_column_new_with_attributes(
+            _("Burned In"), cell, "active", 2, "visible", 8, NULL);
+    widget = GHB_WIDGET(ud->builder, "SubBurnedLabel");
+    gtk_tree_view_column_set_widget(column, widget);
+    gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+    g_signal_connect(cell, "toggled", subtitle_burned_toggled_cb, ud);
+
+    cell = gtk_cell_renderer_toggle_new();
+    gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
+    column = gtk_tree_view_column_new_with_attributes(
+                _("Default"), cell, "active", 3, NULL);
+    widget = GHB_WIDGET(ud->builder, "SubDefaultLabel");
+    gtk_tree_view_column_set_widget(column, widget);
+    gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+    g_signal_connect(cell, "toggled", subtitle_default_toggled_cb, ud);
+
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(
+            _("Srt Offset"), cell, "text", 4, "visible", 9, NULL);
+    widget = GHB_WIDGET(ud->builder, "SubSRTOffsetLabel");
+    gtk_tree_view_column_set_widget(column, widget);
+    gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+
+
+    g_signal_connect(selection, "changed", subtitle_list_selection_changed_cb, ud);
+    // Need to disable remove and update buttons since there are initially
+    // no selections
+    widget = GHB_WIDGET(ud->builder, "subtitle_remove");
+    gtk_widget_set_sensitive(widget, FALSE);
+    g_debug("Done\n");
 }
 
 extern G_MODULE_EXPORT void presets_list_selection_changed_cb(void);
@@ -468,210 +476,210 @@
 // Create and bind the tree model to the tree view for the preset list
 // Also, connect up the signal that lets us know the selection has changed
 static void
-bind_presets_tree_model (signal_user_data_t *ud)
+bind_presets_tree_model(signal_user_data_t *ud)
 {
-	GtkCellRenderer *cell;
-	GtkTreeViewColumn *column;
-	GtkTreeStore *treestore;
-	GtkTreeView  *treeview;
-	GtkTreeSelection *selection;
-	GtkWidget *widget;
-	GtkTargetEntry SrcEntry;
-	SrcEntry.target = "DATA";
-	SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
-
-	g_debug("bind_presets_tree_model ()\n");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "presets_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	treestore = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, 
-								  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
-
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell, 
-		"text", 0, "weight", 1, "style", 2, 
-		"foreground", 3, "editable", 5, NULL);
-
-	g_signal_connect(cell, "edited", preset_edited_cb, ud);
+    GtkCellRenderer *cell;
+    GtkTreeViewColumn *column;
+    GtkTreeStore *treestore;
+    GtkTreeView  *treeview;
+    GtkTreeSelection *selection;
+    GtkWidget *widget;
+    GtkTargetEntry SrcEntry;
+    SrcEntry.target = "DATA";
+    SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
+
+    g_debug("bind_presets_tree_model()\n");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    selection = gtk_tree_view_get_selection(treeview);
+    treestore = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, 
+                                  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
+
+    cell = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell, 
+        "text", 0, "weight", 1, "style", 2, 
+        "foreground", 3, "editable", 5, NULL);
+
+    g_signal_connect(cell, "edited", preset_edited_cb, ud);
 
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
-	gtk_tree_view_column_set_expand (column, TRUE);
-	gtk_tree_view_set_tooltip_column (treeview, 4);
-
-	gtk_tree_view_enable_model_drag_dest (treeview, &SrcEntry, 1, 
-											GDK_ACTION_MOVE);
-	gtk_tree_view_enable_model_drag_source (treeview, GDK_BUTTON1_MASK, 
-											&SrcEntry, 1, GDK_ACTION_MOVE);
-
-	g_signal_connect(treeview, "drag_data_received", presets_drag_cb, ud);
-	g_signal_connect(treeview, "drag_motion", presets_drag_motion_cb, ud);
-	g_signal_connect(treeview, "row_expanded", presets_row_expanded_cb, ud);
-	g_signal_connect(treeview, "row_collapsed", presets_row_expanded_cb, ud);
-	g_signal_connect(selection, "changed", presets_list_selection_changed_cb, ud);
-	widget = GHB_WIDGET (ud->builder, "presets_remove");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_debug("Done\n");
+    gtk_tree_view_column_set_expand(column, TRUE);
+    gtk_tree_view_set_tooltip_column(treeview, 4);
+
+    gtk_tree_view_enable_model_drag_dest(treeview, &SrcEntry, 1, 
+                                            GDK_ACTION_MOVE);
+    gtk_tree_view_enable_model_drag_source(treeview, GDK_BUTTON1_MASK, 
+                                            &SrcEntry, 1, GDK_ACTION_MOVE);
+
+    g_signal_connect(treeview, "drag_data_received", presets_drag_cb, ud);
+    g_signal_connect(treeview, "drag_motion", presets_drag_motion_cb, ud);
+    g_signal_connect(treeview, "row_expanded", presets_row_expanded_cb, ud);
+    g_signal_connect(treeview, "row_collapsed", presets_row_expanded_cb, ud);
+    g_signal_connect(selection, "changed", presets_list_selection_changed_cb, ud);
+    widget = GHB_WIDGET(ud->builder, "presets_remove");
+    gtk_widget_set_sensitive(widget, FALSE);
+    g_debug("Done\n");
 }
 
 static void
 clean_old_logs()
 {
 #if !defined(_WIN32)
-	const gchar *file;
-	gchar *config;
-
-	config = ghb_get_user_config_dir(NULL);
-
-	if (g_file_test(config, G_FILE_TEST_IS_DIR))
-	{
-		GDir *gdir = g_dir_open(config, 0, NULL);
-		file = g_dir_read_name(gdir);
-		while (file)
-		{
-			if (strncmp(file, "Activity.log.", 13) == 0)
-			{
-				gchar *path;
-				int fd, lock = 1;
-				int pid;
-
-				sscanf(file, "Activity.log.%d", &pid);
-
-				path = g_strdup_printf("%s/ghb.pid.%d", config, pid);
-				if (g_file_test(path, G_FILE_TEST_EXISTS))
-				{
-					fd = open(path, O_RDWR);
-					if (fd >= 0)
-					{
-						lock = lockf(fd, F_TLOCK, 0);
-					}
-					g_free(path);
-					close(fd);
-					if (lock == 0)
-					{
-						path = g_strdup_printf("%s/%s", config, file);
-						g_unlink(path);
-						g_free(path);
-					}
-				}
-				else
-				{
-					g_free(path);
-					path = g_strdup_printf("%s/%s", config, file);
-					g_unlink(path);
-					g_free(path);
-				}
-			}
-			file = g_dir_read_name(gdir);
-		}
-		g_dir_close(gdir);
-	}
-	g_free(config);
+    const gchar *file;
+    gchar *config;
+
+    config = ghb_get_user_config_dir(NULL);
+
+    if (g_file_test(config, G_FILE_TEST_IS_DIR))
+    {
+        GDir *gdir = g_dir_open(config, 0, NULL);
+        file = g_dir_read_name(gdir);
+        while (file)
+        {
+            if (strncmp(file, "Activity.log.", 13) == 0)
+            {
+                gchar *path;
+                int fd, lock = 1;
+                int pid;
+
+                sscanf(file, "Activity.log.%d", &pid);
+
+                path = g_strdup_printf("%s/ghb.pid.%d", config, pid);
+                if (g_file_test(path, G_FILE_TEST_EXISTS))
+                {
+                    fd = open(path, O_RDWR);
+                    if (fd >= 0)
+                    {
+                        lock = lockf(fd, F_TLOCK, 0);
+                    }
+                    g_free(path);
+                    close(fd);
+                    if (lock == 0)
+                    {
+                        path = g_strdup_printf("%s/%s", config, file);
+                        g_unlink(path);
+                        g_free(path);
+                    }
+                }
+                else
+                {
+                    g_free(path);
+                    path = g_strdup_printf("%s/%s", config, file);
+                    g_unlink(path);
+                    g_free(path);
+                }
+            }
+            file = g_dir_read_name(gdir);
+        }
+        g_dir_close(gdir);
+    }
+    g_free(config);
 #else
-	const gchar *file;
-	gchar *config;
+    const gchar *file;
+    gchar *config;
 
-	config = ghb_get_user_config_dir(NULL);
+    config = ghb_get_user_config_dir(NULL);
 
-	if (g_file_test(config, G_FILE_TEST_IS_DIR))
-	{
-		GDir *gdir = g_dir_open(config, 0, NULL);
-		file = g_dir_read_name(gdir);
-		while (file)
-		{
-			if (strncmp(file, "Activity.log.", 13) == 0)
-			{
-				gchar *path;
-				int pid;
+    if (g_file_test(config, G_FILE_TEST_IS_DIR))
+    {
+        GDir *gdir = g_dir_open(config, 0, NULL);
+        file = g_dir_read_name(gdir);
+        while (file)
+        {
+            if (strncmp(file, "Activity.log.", 13) == 0)
+            {
+                gchar *path;
+                int pid;
 
-				sscanf(file, "Activity.log.%d", &pid);
+                sscanf(file, "Activity.log.%d", &pid);
 
 #if 0
-				int fd, lock = 1;
-
-				path = g_strdup_printf("%s/ghb.pid.%d", config, pid);
-				if (g_file_test(path, G_FILE_TEST_EXISTS))
-				{
-					fd = open(path, O_RDWR);
-					if (fd >= 0)
-					{
-						lock = lockf(fd, F_TLOCK, 0);
-					}
-					g_free(path);
-					close(fd);
-					if (lock == 0)
-					{
-						path = g_strdup_printf("%s/%s", config, file);
-						g_unlink(path);
-						g_free(path);
-					}
-				}
-				else
+                int fd, lock = 1;
+
+                path = g_strdup_printf("%s/ghb.pid.%d", config, pid);
+                if (g_file_test(path, G_FILE_TEST_EXISTS))
+                {
+                    fd = open(path, O_RDWR);
+                    if (fd >= 0)
+                    {
+                        lock = lockf(fd, F_TLOCK, 0);
+                    }
+                    g_free(path);
+                    close(fd);
+                    if (lock == 0)
+                    {
+                        path = g_strdup_printf("%s/%s", config, file);
+                        g_unlink(path);
+                        g_free(path);
+                    }
+                }
+                else
 #endif
-				{
-					//g_free(path);
-					path = g_strdup_printf("%s/%s", config, file);
-					g_unlink(path);
-					g_free(path);
-				}
-			}
-			file = g_dir_read_name(gdir);
-		}
-		g_dir_close(gdir);
-	}
-	g_free(config);
+                {
+                    //g_free(path);
+                    path = g_strdup_printf("%s/%s", config, file);
+                    g_unlink(path);
+                    g_free(path);
+                }
+            }
+            file = g_dir_read_name(gdir);
+        }
+        g_dir_close(gdir);
+    }
+    g_free(config);
 #endif
 }
 
 static void
 IoRedirect(signal_user_data_t *ud)
 {
-	GIOChannel *channel;
-	gint pfd[2];
-	gchar *config, *path, *str;
-	pid_t pid;
-
-	// I'm opening a pipe and attaching the writer end to stderr
-	// The reader end will be polled by main event loop and I'll get
-	// a callback when there is data available.
-	if (pipe( pfd ) < 0)
-	{
-		g_warning("Failed to redirect IO. Logging impaired\n");
-		return;
-	}
-	clean_old_logs();
-	// Open activity log.
-	config = ghb_get_user_config_dir(NULL);
-	pid = getpid();
-	path = g_strdup_printf("%s/Activity.log.%d", config, pid);
-	ud->activity_log = g_io_channel_new_file (path, "w", NULL);
-	ud->job_activity_log = NULL;
-	str = g_strdup_printf("<big><b>%s</b></big>", path);
-	ghb_ui_update(ud, "activity_location", ghb_string_value(str));
-	g_free(str);
-	g_free(path);
-	g_free(config);
-	// Set encoding to raw.
-	g_io_channel_set_encoding (ud->activity_log, NULL, NULL);
-	// redirect stderr to the writer end of the pipe
+    GIOChannel *channel;
+    gint pfd[2];
+    gchar *config, *path, *str;
+    pid_t pid;
+
+    // I'm opening a pipe and attaching the writer end to stderr
+    // The reader end will be polled by main event loop and I'll get
+    // a callback when there is data available.
+    if (pipe( pfd ) < 0)
+    {
+        g_warning("Failed to redirect IO. Logging impaired\n");
+        return;
+    }
+    clean_old_logs();
+    // Open activity log.
+    config = ghb_get_user_config_dir(NULL);
+    pid = getpid();
+    path = g_strdup_printf("%s/Activity.log.%d", config, pid);
+    ud->activity_log = g_io_channel_new_file (path, "w", NULL);
+    ud->job_activity_log = NULL;
+    str = g_strdup_printf("<big><b>%s</b></big>", path);
+    ghb_ui_update(ud, "activity_location", ghb_string_value(str));
+    g_free(str);
+    g_free(path);
+    g_free(config);
+    // Set encoding to raw.
+    g_io_channel_set_encoding(ud->activity_log, NULL, NULL);
+    // redirect stderr to the writer end of the pipe
 #if defined(_WIN32)
-	// dup2 doesn't work on windows for some stupid reason
-	stderr->_file = pfd[1];
+    // dup2 doesn't work on windows for some stupid reason
+    stderr->_file = pfd[1];
 #else
-	dup2(pfd[1], /*stderr*/2);
+    dup2(pfd[1], /*stderr*/2);
 #endif
-	setvbuf(stderr, NULL, _IONBF, 0);
-	channel = g_io_channel_unix_new (pfd[0]);
-	// I was getting an this error:
-	// "Invalid byte sequence in conversion input"
-	// Set disable encoding on the channel.
-	g_io_channel_set_encoding (channel, NULL, NULL);
-	g_io_add_watch (channel, G_IO_IN, ghb_log_cb, (gpointer)ud );
+    setvbuf(stderr, NULL, _IONBF, 0);
+    channel = g_io_channel_unix_new(pfd[0]);
+    // I was getting an this error:
+    // "Invalid byte sequence in conversion input"
+    // Set disable encoding on the channel.
+    g_io_channel_set_encoding(channel, NULL, NULL);
+    g_io_add_watch(channel, G_IO_IN, ghb_log_cb, (gpointer)ud );
 }
 
 typedef struct
 {
-	gchar *filename;
-	gchar *iconname;
+    gchar *filename;
+    gchar *iconname;
 } icon_map_t;
 
 static gchar *dvd_device = NULL;
@@ -680,10 +688,10 @@
 
 static GOptionEntry entries[] = 
 {
-	{ "device", 'd', 0, G_OPTION_ARG_FILENAME, &dvd_device, "The device or file to encode", NULL },
-	{ "preset", 'p', 0, G_OPTION_ARG_STRING, &arg_preset, "The preset values to use for encoding", NULL },
-	{ "debug", 'x', 0, G_OPTION_ARG_NONE, &ghb_debug, "Spam a lot", NULL },
-	{ NULL }
+    { "device", 'd', 0, G_OPTION_ARG_FILENAME, &dvd_device, "The device or file to encode", NULL },
+    { "preset", 'p', 0, G_OPTION_ARG_STRING, &arg_preset, "The preset values to use for encoding", NULL },
+    { "debug", 'x', 0, G_OPTION_ARG_NONE, &ghb_debug, "Spam a lot", NULL },
+    { NULL }
 };
 
 G_MODULE_EXPORT void drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud);
@@ -692,14 +700,14 @@
 G_MODULE_EXPORT GdkFilterReturn
 win_message_cb(GdkXEvent *wmevent, GdkEvent *event, gpointer data)
 {
-	signal_user_data_t *ud = (signal_user_data_t*)data;
-	MSG *msg = (MSG*)wmevent;
-
-	if (msg->message == WM_DEVICECHANGE)
-	{
-		wm_drive_changed(wmevent, ud);
-	}
-	return GDK_FILTER_CONTINUE;
+    signal_user_data_t *ud = (signal_user_data_t*)data;
+    MSG *msg = (MSG*)wmevent;
+
+    if (msg->message == WM_DEVICECHANGE)
+    {
+        wm_drive_changed(wmevent, ud);
+    }
+    return GDK_FILTER_CONTINUE;
 }
 #endif
 
@@ -707,23 +715,97 @@
 watch_volumes(signal_user_data_t *ud)
 {
 #if !defined(_WIN32)
-	GVolumeMonitor *gvm;
-	gvm = g_volume_monitor_get ();
+    GVolumeMonitor *gvm;
+    gvm = g_volume_monitor_get();
 
-	g_signal_connect(gvm, "drive-changed", (GCallback)drive_changed_cb, ud);
+    g_signal_connect(gvm, "drive-changed", (GCallback)drive_changed_cb, ud);
 #else
-	GdkWindow *window;
-	GtkWidget *widget;
+    GdkWindow *window;
+    GtkWidget *widget;
 
-	widget = GHB_WIDGET (ud->builder, "hb_window");
-	window = gtk_widget_get_parent_window(widget);
-	gdk_window_add_filter(window, win_message_cb, ud);
+    widget = GHB_WIDGET(ud->builder, "hb_window");
+    window = gtk_widget_get_parent_window(widget);
+    gdk_window_add_filter(window, win_message_cb, ud);
 #endif
 }
 
 G_MODULE_EXPORT void x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
-void preview_window_expose_cb(void);
+G_MODULE_EXPORT void x264_option_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
+G_MODULE_EXPORT void position_overlay_cb(GtkWidget *widget, signal_user_data_t *ud);
+G_MODULE_EXPORT void preview_hud_size_alloc_cb(GtkWidget *widget, signal_user_data_t *ud);
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+const gchar *MyCSS =
+"                                   \n\
+GtkComboBox {                       \n\
+    padding: 1px;                   \n\
+}                                   \n\
+GtkEntry {                          \n\
+    padding: 4px;                   \n\
+}                                   \n\
+                                    \n\
+@define-color black  #000000;       \n\
+@define-color gray18 #2e2e2e;       \n\
+@define-color gray22 #383838;       \n\
+@define-color gray26 #424242;       \n\
+@define-color gray32 #525252;       \n\
+@define-color gray40 #666666;       \n\
+@define-color gray46 #757575;       \n\
+@define-color white  #ffffff;       \n\
+                                    \n\
+#preview_event_box,                 \n\
+#live_preview_play,                 \n\
+#live_duration,                     \n\
+#preview_fullscreen,                \n\
+#hide_settings                      \n\
+{                                   \n\
+    background: @black;             \n\
+    background-color: @gray18;      \n\
+    color: @white;                  \n\
+}                                   \n\
+                                    \n\
+#preview_show_crop                  \n\
+{                                   \n\
+    background-color: @gray22;      \n\
+    border-color: @white;           \n\
+    color: @white;                  \n\
+}                                   \n\
+                                    \n\
+#live_encode_progress,              \n\
+#live_preview_progress,             \n\
+#preview_frame                      \n\
+{                                   \n\
+    background: @black;             \n\
+    background-color: @gray46;      \n\
+    color: @white;                  \n\
+}                                   \n\
+                                    \n\
+#preview_fullscreen:prelight,       \n\
+#hide_settings:prelight             \n\
+{                                   \n\
+    background: @black;             \n\
+    background-color: @gray32;      \n\
+    color: @white;                  \n\
+}                                   \n\
+                                    \n\
+#preview_fullscreen:active,         \n\
+#hide_settings:selected:focused     \n\
+{                                   \n\
+    background: @black;             \n\
+    background-color: @gray32;      \n\
+    color: @white;                  \n\
+}                                   \n\
+                                    \n\
+#preview_fullscreen:active,         \n\
+#hide_settings:active               \n\
+{                                   \n\
+    background: @black;             \n\
+    background-color: @gray32;      \n\
+    color: @white;                  \n\
+}                                   \n\
+";
 
+#else
 // Some style definitions for the preview window and hud
 const gchar *hud_rcstyle =
 "style \"ghb-entry\" {\n"
@@ -753,373 +835,457 @@
 "widget_class \"*.GtkEntry\" style \"ghb-entry\"\n"
 "widget \"preview_window.*.preview_hud.*\" style \"ghb-hud\"\n"
 "widget \"preview_window\" style \"ghb-preview\"\n";
+#endif
 
 #if GTK_CHECK_VERSION(2, 16, 0)
 extern G_MODULE_EXPORT void status_icon_query_tooltip_cb(void);
 #endif
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-	signal_user_data_t *ud;
-	GValue *preset;
-	GError *error = NULL;
-	GOptionContext *context;
+    signal_user_data_t *ud;
+    GValue *preset;
+    GError *error = NULL;
+    GOptionContext *context;
 
 #ifdef ENABLE_NLS
-	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
+    bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    textdomain(GETTEXT_PACKAGE);
 #endif
 
-	if (!g_thread_supported())
-		g_thread_init(NULL);
-	context = g_option_context_new ("- Transcode media formats");
-	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
+    context = g_option_context_new("- Transcode media formats");
+    g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+    g_option_context_add_group(context, gtk_get_option_group(TRUE));
 #if defined(_ENABLE_GST)
-	g_option_context_add_group (context, gst_init_get_option_group ());
+    g_option_context_add_group(context, gst_init_get_option_group());
+#endif
+    g_option_context_parse(context, &argc, &argv, &error);
+    if (error != NULL)
+    {
+        g_warning("%s: %s", G_STRFUNC, error->message);
+        g_clear_error(&error);
+    }
+    g_option_context_free(context);
+
+    if (argc > 1 && dvd_device == NULL && argv[1][0] != '-')
+    {
+        dvd_device = argv[1];
+    }
+    
+    gtk_init(&argc, &argv);
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+    GtkCssProvider *css = gtk_css_provider_new();
+    error = NULL;
+    gtk_css_provider_load_from_data(css, MyCSS, -1, &error);
+    if (error == NULL)
+    {
+        GdkScreen *ss = gdk_screen_get_default();
+        gtk_style_context_add_provider_for_screen(ss, GTK_STYLE_PROVIDER(css),
+                                    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+    else
+    {
+        g_warning("%s: %s", G_STRFUNC, error->message);
+        g_clear_error(&error);
+    }
+#else
+    gtk_rc_parse_string(hud_rcstyle);
 #endif
-	g_option_context_parse (context, &argc, &argv, &error);
-	g_option_context_free(context);
-
-	if (argc > 1 && dvd_device == NULL && argv[1][0] != '-')
-	{
-		dvd_device = argv[1];
-	}
-	
-	gtk_init (&argc, &argv);
-	gtk_rc_parse_string(hud_rcstyle);
-	g_type_class_unref(g_type_class_ref(GTK_TYPE_BUTTON));
-	g_object_set(gtk_settings_get_default(), "gtk-button-images", TRUE, NULL);
+
+    g_type_class_unref(g_type_class_ref(GTK_TYPE_BUTTON));
+    g_object_set(gtk_settings_get_default(), "gtk-button-images", TRUE, NULL);
 #if !defined(_WIN32)
-	notify_init("HandBrake");
+    notify_init("HandBrake");
 #endif
-	ghb_register_transforms();
-	ghb_resource_init();
-	ghb_load_icons();
+    ghb_register_transforms();
+    ghb_resource_init();
+    ghb_load_icons();
 
 #if !defined(_WIN32)
-	dbus_g_thread_init();
+    dbus_g_thread_init();
 #endif
-	ghb_udev_init();
-
-	ghb_write_pid_file();
-	ud = g_malloc0(sizeof(signal_user_data_t));
-	ud->debug = ghb_debug;
-	g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
-	g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING, warn_log_handler, ud);
-	//g_log_set_handler ("Gtk", G_LOG_LEVEL_CRITICAL, warn_log_handler, ud);
-	ud->settings = ghb_settings_new();
-	ud->builder = create_builder_or_die (BUILDER_NAME);
-	// Enable events that alert us to media change events
-	watch_volumes (ud);
-
-	//GtkWidget *widget = GHB_WIDGET(ud->builder, "PictureDetelecineCustom");
-	//gtk_entry_set_inner_border(widget, 2);
-
-	// Since GtkBuilder no longer assigns object ids to widget names
-	// Assign a few that are necessary for style overrides to work
-	GtkWidget *widget;
+    ghb_udev_init();
+
+    ghb_write_pid_file();
+    ud = g_malloc0(sizeof(signal_user_data_t));
+    ud->debug = ghb_debug;
+    g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
+    g_log_set_handler("Gtk", G_LOG_LEVEL_WARNING, warn_log_handler, ud);
+    //g_log_set_handler("Gtk", G_LOG_LEVEL_CRITICAL, warn_log_handler, ud);
+    ud->settings = ghb_settings_new();
+    ud->builder = create_builder_or_die(BUILDER_NAME);
+    // Enable events that alert us to media change events
+    watch_volumes(ud);
+
+    //GtkWidget *widget = GHB_WIDGET(ud->builder, "PictureDetelecineCustom");
+    //gtk_entry_set_inner_border(widget, 2);
+
+    // Since GtkBuilder no longer assigns object ids to widget names
+    // Assign a few that are necessary for style overrides to work
+    GtkWidget *widget;
 #if defined(_NO_UPDATE_CHECK)
-	widget = GHB_WIDGET(ud->builder, "check_updates_box");
-	gtk_widget_hide(widget);
+    widget = GHB_WIDGET(ud->builder, "check_updates_box");
+    gtk_widget_hide(widget);
+#endif
+
+    // Must set the names of the widgets that I want to modify
+    // style for.
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_event_box"), "preview_event_box");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_frame"), "preview_frame");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_preview_play"), "live_preview_play");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_preview_progress"), "live_preview_progress");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_encode_progress"), "live_encode_progress");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_duration"), "live_duration");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_show_crop"), "preview_show_crop");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_fullscreen"), "preview_fullscreen");
+    gtk_widget_set_name(GHB_WIDGET(ud->builder, "hide_settings"), "hide_settings");
+    widget = GHB_WIDGET(ud->builder, "preview_hud");
+    gtk_widget_set_name(widget, "preview_hud");
+    widget = GHB_WIDGET(ud->builder, "preview_window");
+    gtk_widget_set_name(widget, "preview_window");
+
+    // Set up the "hud" control overlay for the preview window
+    GtkWidget *align, *draw, *hud, *blender;
+
+    align = GHB_WIDGET(ud->builder, "preview_window_alignment");
+    draw = GHB_WIDGET(ud->builder, "preview_image_align");
+    hud = GHB_WIDGET(ud->builder, "preview_hud");
+
+#if 0 // wGTK_CHECK_VERSION(3, 0, 0)
+    // This uses the new GtkOverlay widget.
+    //
+    // Unfortunately, GtkOverlay is broken in a couple of ways.
+    //
+    // First, it doesn't respect gtk_widget_shape_combine_region()
+    // on it's child overlays.  It appears to just ignore the clip
+    // mask of the child.
+    //
+    // Second, it doesn't respect window opacity.
+    //
+    // So for now, I'll just continue using my home-grown overlay
+    // widget (GhbCompositor).
+    blender = gtk_overlay_new();
+    gtk_container_add(GTK_CONTAINER(align), blender);
+    gtk_container_add(GTK_CONTAINER(blender), draw);
+    gtk_widget_set_valign (hud, GTK_ALIGN_END);
+    gtk_widget_set_halign (hud, GTK_ALIGN_CENTER);
+    gtk_overlay_add_overlay(GTK_OVERLAY(blender), hud);
+
+    g_signal_connect(G_OBJECT(blender), "get-child-position",
+                    G_CALLBACK(position_overlay_cb), ud);
+
+    gtk_widget_show(blender);
+#else
+    // Set up compositing for hud
+    blender = ghb_compositor_new();
+
+    gtk_container_add(GTK_CONTAINER(align), blender);
+    ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), draw, 1, 1);
+    ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), hud, 2, .85);
+    gtk_widget_show(blender);
 #endif
 
-	widget = GHB_WIDGET(ud->builder, "preview_hud");
-	gtk_widget_set_name(widget, "preview_hud");
-	widget = GHB_WIDGET(ud->builder, "preview_window");
-	gtk_widget_set_name(widget, "preview_window");
-
-	// Set up the "hud" control overlay for the preview window
-	GtkWidget *draw, *hud, *blender, *align;
-
-	align = GHB_WIDGET(ud->builder, "preview_window_alignment");
-	draw = GHB_WIDGET(ud->builder, "preview_image_align");
-	hud = GHB_WIDGET(ud->builder, "preview_hud");
-
-	// Set up compositing for hud
-	blender = ghb_compositor_new();
-
-	gtk_container_add(GTK_CONTAINER(align), blender);
-	ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), draw, 1, 1);
-	ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), hud, 2, .85);
-	gtk_widget_show(blender);
-
-	// Redirect stderr to the activity window
-	ghb_preview_init(ud);
-	IoRedirect(ud);
-	ghb_log( "%s - %s - %s",
-		HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
-	ghb_init_dep_map();
-
-	// Need to connect x264_options textview buffer to the changed signal
-	// since it can't be done automatically
-	GtkTextView *textview;
-	GtkTextBuffer *buffer;
-	textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264Option"));
-	buffer = gtk_text_view_get_buffer (textview);
-	g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
-
-	ghb_combo_init(ud);
-
-	g_debug("ud %p\n", ud);
-	g_debug("ud->builder %p\n", ud->builder);
-
-	bind_audio_tree_model(ud);
-	bind_subtitle_tree_model(ud);
-	bind_presets_tree_model(ud);
-	bind_queue_tree_model(ud);
-	bind_chapter_tree_model(ud);
-	// Connect up the signals to their callbacks
-	// I wrote my own connector so that I could pass user data
-	// to the callbacks.  Builder's standard autoconnect doesn't all this.
-	gtk_builder_connect_signals_full (ud->builder, MyConnect, ud);
-
-	// Load all internal settings
-	ghb_settings_init(ud);
-	// Load the presets files
-	ghb_presets_load(ud);
-	ghb_prefs_load(ud);
-
-	ghb_prefs_to_ui(ud);
-
-	gint logLevel;
-	logLevel = ghb_settings_get_int(ud->settings, "LoggingLevel");
-	ghb_backend_init(logLevel);
-
-	if (ghb_settings_get_boolean(ud->settings, "hbfd"))
-	{
-		ghb_hbfd(ud, TRUE);
-	}
-	gchar *source = ghb_settings_get_string(ud->settings, "default_source");
-	ghb_dvd_set_current(source, ud);
-	g_free(source);
-
-	// Parsing x264 options "" initializes x264 widgets to proper defaults
-	ghb_x264_parse_options(ud, "");
-
-	// Populate the presets tree view
-	ghb_presets_list_init(ud, NULL, 0);
-	// Get the first preset name
-	if (arg_preset != NULL)
-	{
-		preset = ghb_parse_preset_path(arg_preset);
-		if (preset)
-		{
-			ghb_select_preset(ud->builder, preset);
-			ghb_value_free(preset);
-		}
-	}
-	else
-	{
-		ghb_select_default_preset(ud->builder);
-	}
-
-	// Grey out widgets that are dependent on a disabled feature
-	ghb_check_all_depencencies (ud);
-
-	if (dvd_device != NULL)
-	{
-		// Source overridden from command line option
-		ghb_settings_set_string(ud->settings, "scan_source", dvd_device);
-		g_idle_add((GSourceFunc)ghb_idle_scan, ud);
-	}
-	// Reload and check status of the last saved queue
-	g_idle_add((GSourceFunc)ghb_reload_queue, ud);
-
-	// Start timer for monitoring libhb status, 500ms
-	g_timeout_add (500, ghb_timer_cb, (gpointer)ud);
-
-	// Add dvd devices to File menu
-	ghb_volname_cache_init();
-	g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+    // Redirect stderr to the activity window
+    ghb_preview_init(ud);
+    IoRedirect(ud);
+    ghb_log( "%s - %s - %s",
+        HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
+    ghb_init_dep_map();
+
+    // Need to connect x264_options textview buffer to the changed signal
+    // since it can't be done automatically
+    GtkTextView *textview;
+    GtkTextBuffer *buffer;
+    textview = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "x264Option"));
+    buffer = gtk_text_view_get_buffer(textview);
+    g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
+
+    textview = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+    buffer = gtk_text_view_get_buffer(textview);
+    g_signal_connect(buffer, "changed", (GCallback)x264_option_changed_cb, ud);
+
+    ghb_combo_init(ud);
+
+    g_debug("ud %p\n", ud);
+    g_debug("ud->builder %p\n", ud->builder);
+
+    bind_audio_tree_model(ud);
+    bind_subtitle_tree_model(ud);
+    bind_presets_tree_model(ud);
+    bind_queue_tree_model(ud);
+    bind_chapter_tree_model(ud);
+    // Connect up the signals to their callbacks
+    // I wrote my own connector so that I could pass user data
+    // to the callbacks.  Builder's standard autoconnect doesn't all this.
+    gtk_builder_connect_signals_full(ud->builder, MyConnect, ud);
+
+    GtkWidget *presetSlider = GHB_WIDGET(ud->builder, "x264PresetSlider");
+    const char * const *x264_presets;
+    int count = 0;
+    x264_presets = hb_x264_presets();
+    while (x264_presets && x264_presets[count]) count++;
+    gtk_range_set_range(GTK_RANGE(presetSlider), 0, count-1);
+
+    // Load all internal settings
+    ghb_settings_init(ud);
+    // Load the presets files
+    ghb_presets_load(ud);
+    ghb_prefs_load(ud);
+
+    ghb_prefs_to_ui(ud);
+
+    gint logLevel;
+    logLevel = ghb_settings_get_int(ud->settings, "LoggingLevel");
+    ghb_backend_init(logLevel);
+
+    if (ghb_settings_get_boolean(ud->settings, "hbfd"))
+    {
+        ghb_hbfd(ud, TRUE);
+    }
+    gchar *source = ghb_settings_get_string(ud->settings, "default_source");
+    ghb_dvd_set_current(source, ud);
+    g_free(source);
+
+    // Parsing x264 options "" initializes x264 widgets to proper defaults
+    ghb_x264_parse_options(ud, "");
+
+    // Populate the presets tree view
+    ghb_presets_list_init(ud, NULL, 0);
+    // Get the first preset name
+    if (arg_preset != NULL)
+    {
+        preset = ghb_parse_preset_path(arg_preset);
+        if (preset)
+        {
+            ghb_select_preset(ud->builder, preset);
+            ghb_value_free(preset);
+        }
+    }
+    else
+    {
+        ghb_select_default_preset(ud->builder);
+    }
+
+    // Grey out widgets that are dependent on a disabled feature
+    ghb_check_all_depencencies(ud);
+
+    if (dvd_device != NULL)
+    {
+        // Source overridden from command line option
+        ghb_settings_set_string(ud->settings, "scan_source", dvd_device);
+        g_idle_add((GSourceFunc)ghb_idle_scan, ud);
+    }
+    // Reload and check status of the last saved queue
+    g_idle_add((GSourceFunc)ghb_reload_queue, ud);
+
+    // Start timer for monitoring libhb status, 500ms
+    g_timeout_add(200, ghb_timer_cb, (gpointer)ud);
+
+    // Add dvd devices to File menu
+    ghb_volname_cache_init();
+    GHB_THREAD_NEW("Cache Volume Names", (GThreadFunc)ghb_cache_volnames, ud);
 
 #if defined(_USE_APP_IND)
-	GtkUIManager * uim = GTK_UI_MANAGER(GHB_OBJECT(ud->builder, "uimanager1"));
-
-	GtkMenu *ai_menu = GTK_MENU(gtk_ui_manager_get_widget(uim, "/ui/tray_menu"));
-	ud->ai = app_indicator_new("HandBrake", "hb-icon", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-	app_indicator_set_menu( ud->ai, ai_menu );
-	app_indicator_set_label( ud->ai, "", "99.99%");
-	if (ghb_settings_get_boolean(ud->settings, "show_status"))
-	{
-		app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_ACTIVE );
-	}
-	else
-	{
-		app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_PASSIVE );
-	}
-	GtkStatusIcon *si;
-	si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-
-	gtk_status_icon_set_visible(si, FALSE );
+    GtkUIManager * uim = GTK_UI_MANAGER(GHB_OBJECT(ud->builder, "uimanager1"));
+
+    GtkMenu *ai_menu = GTK_MENU(gtk_ui_manager_get_widget(uim, "/ui/tray_menu"));
+    ud->ai = app_indicator_new("HandBrake", "hb-icon", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+    app_indicator_set_menu( ud->ai, ai_menu );
+    app_indicator_set_label( ud->ai, "", "99.99%");
+    if (ghb_settings_get_boolean(ud->settings, "show_status"))
+    {
+        app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_ACTIVE );
+    }
+    else
+    {
+        app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_PASSIVE );
+    }
+    GtkStatusIcon *si;
+    si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+
+    gtk_status_icon_set_visible(si, FALSE );
 #else
-	GtkStatusIcon *si;
-	si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+    GtkStatusIcon *si;
+    si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
 
-	gtk_status_icon_set_visible(si,
-			ghb_settings_get_boolean(ud->settings, "show_status"));
+    gtk_status_icon_set_visible(si,
+            ghb_settings_get_boolean(ud->settings, "show_status"));
 
 #if GTK_CHECK_VERSION(2, 16, 0)
-	gtk_status_icon_set_has_tooltip(si, TRUE);
-	g_signal_connect(si, "query-tooltip", 
-					status_icon_query_tooltip_cb, ud);
+    gtk_status_icon_set_has_tooltip(si, TRUE);
+    g_signal_connect(si, "query-tooltip", 
+                    status_icon_query_tooltip_cb, ud);
 #else
-	gtk_status_icon_set_tooltip(si, "HandBrake");
+    gtk_status_icon_set_tooltip(si, "HandBrake");
 #endif
 #endif
 
-	// Ugly hack to keep subtitle table from bouncing around as I change
-	// which set of controls are visible
-	GtkRequisition req;
-	gint width, height;
-	
-	widget = GHB_WIDGET(ud->builder, "SrtCodeset");
-	gtk_widget_size_request( widget, &req );
-	height = req.height;
-	widget = GHB_WIDGET(ud->builder, "srt_code_label");
-	gtk_widget_size_request( widget, &req );
-	height += req.height;
-	widget = GHB_WIDGET(ud->builder, "subtitle_table");
-	gtk_widget_set_size_request(widget, -1, height);
-	
-	widget = GHB_WIDGET (ud->builder, "hb_window");
-
-	GdkGeometry geo = { 
-		-1, -1, 1024, 768, -1, -1, 10, 10, 0, 0, GDK_GRAVITY_NORTH_WEST
-	};
-	GdkWindowHints geo_mask;
-	geo_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE;
-	gtk_window_set_geometry_hints( GTK_WINDOW(widget), widget, &geo, geo_mask);
-	width = ghb_settings_get_int(ud->settings, "window_width");
-	height = ghb_settings_get_int(ud->settings, "window_height");
-	gtk_window_resize(GTK_WINDOW(widget), width, height);
-	gtk_widget_show(widget);
-
-	/*
- 	 * Filter objects in GtkBuilder xml
- 	 * Unfortunately, GtkFilter is poorly supported by GtkBuilder,
- 	 * so a lot of the setup must happen in code.
-		SourceFilterAll
-		SourceFilterVideo
-		SourceFilterTS
-		SourceFilterMPG
-		SourceFilterEVO
-		SourceFilterVOB
-		SourceFilterMKV
-		SourceFilterMP4
-		SourceFilterAVI
-		SourceFilterMOV
-		SourceFilterOGG
-		SourceFilterFLV
-		SourceFilterWMV
-	*/
-	// Add filters to source chooser
-	GtkFileFilter *filter;
-	GtkFileChooser *chooser;
-	chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "source_dialog"));
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAll"));
-	gtk_file_filter_set_name(filter, "All");
-	gtk_file_filter_add_pattern(filter, "*");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterVideo"));
-	gtk_file_filter_set_name(filter, "Video");
-	gtk_file_filter_add_mime_type(filter, "video/*");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterTS"));
-	gtk_file_filter_set_name(filter, "TS");
-	gtk_file_filter_add_pattern(filter, "*.ts");
-	gtk_file_filter_add_pattern(filter, "*.TS");
-	gtk_file_filter_add_pattern(filter, "*.m2ts");
-	gtk_file_filter_add_pattern(filter, "*.M2TS");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMPG"));
-	gtk_file_filter_set_name(filter, "MPG");
-	gtk_file_filter_add_pattern(filter, "*.mpg");
-	gtk_file_filter_add_pattern(filter, "*.MPG");
-	gtk_file_filter_add_pattern(filter, "*.mepg");
-	gtk_file_filter_add_pattern(filter, "*.MEPG");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterEVO"));
-	gtk_file_filter_set_name(filter, "EVO");
-	gtk_file_filter_add_pattern(filter, "*.evo");
-	gtk_file_filter_add_pattern(filter, "*.EVO");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterVOB"));
-	gtk_file_filter_set_name(filter, "VOB");
-	gtk_file_filter_add_pattern(filter, "*.vob");
-	gtk_file_filter_add_pattern(filter, "*.VOB");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMKV"));
-	gtk_file_filter_set_name(filter, "MKV");
-	gtk_file_filter_add_pattern(filter, "*.mkv");
-	gtk_file_filter_add_pattern(filter, "*.MKV");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMP4"));
-	gtk_file_filter_set_name(filter, "MP4");
-	gtk_file_filter_add_pattern(filter, "*.mp4");
-	gtk_file_filter_add_pattern(filter, "*.MP4");
-	gtk_file_filter_add_pattern(filter, "*.m4v");
-	gtk_file_filter_add_pattern(filter, "*.M4V");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMOV"));
-	gtk_file_filter_set_name(filter, "MOV");
-	gtk_file_filter_add_pattern(filter, "*.mov");
-	gtk_file_filter_add_pattern(filter, "*.MOV");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAVI"));
-	gtk_file_filter_set_name(filter, "AVI");
-	gtk_file_filter_add_pattern(filter, "*.avi");
-	gtk_file_filter_add_pattern(filter, "*.AVI");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterOGG"));
-	gtk_file_filter_set_name(filter, "OGG");
-	gtk_file_filter_add_pattern(filter, "*.ogg");
-	gtk_file_filter_add_pattern(filter, "*.OGG");
-	gtk_file_filter_add_pattern(filter, "*.ogv");
-	gtk_file_filter_add_pattern(filter, "*.OGV");
-	gtk_file_filter_add_pattern(filter, "*.ogm");
-	gtk_file_filter_add_pattern(filter, "*.OGM");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterFLV"));
-	gtk_file_filter_set_name(filter, "FLV");
-	gtk_file_filter_add_pattern(filter, "*.flv");
-	gtk_file_filter_add_pattern(filter, "*.FLV");
-	gtk_file_chooser_add_filter(chooser, filter);
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterWMV"));
-	gtk_file_filter_set_name(filter, "WMV");
-	gtk_file_filter_add_pattern(filter, "*.wmv");
-	gtk_file_filter_add_pattern(filter, "*.WMV");
-	gtk_file_chooser_add_filter(chooser, filter);
-
-	// Gtk has a really stupid bug.  If the file chooser is showing
-	// hidden files AND there is no filter set, it will not select
-	// the filename when gtk_file_chooser_set_filename is called.
-	// So add a completely unnessary filter to prevent this behavior.
-	filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAll"));
-	gtk_file_chooser_set_filter(chooser, filter);
-
-	PangoFontDescription *font_desc;
-	font_desc = pango_font_description_from_string ("monospace 10");
-	textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "activity_view"));
-	gtk_widget_modify_font(GTK_WIDGET(textview), font_desc);      
-	pango_font_description_free (font_desc);      
-
-	// Everything should be go-to-go.  Lets rock!
-
-	gtk_main ();
-	gtk_status_icon_set_visible(si, FALSE);
-	ghb_backend_close();
-	if (ud->queue)
-		ghb_value_free(ud->queue);
-	ghb_value_free(ud->settings);
-	g_io_channel_unref(ud->activity_log);
-	ghb_settings_close();
+    // Ugly hack to keep subtitle table from bouncing around as I change
+    // which set of controls are visible
+    gint width, height;
+#if GTK_CHECK_VERSION(3, 0, 0)
+    GtkRequisition min_size, size;
+    
+    widget = GHB_WIDGET(ud->builder, "SrtCodeset");
+    gtk_widget_get_preferred_size( widget, &min_size, &size );
+    height = MAX(min_size.height, size.height);
+    widget = GHB_WIDGET(ud->builder, "srt_code_label");
+    gtk_widget_get_preferred_size( widget, &min_size, &size );
+    height += MAX(min_size.height, size.height);
+    widget = GHB_WIDGET(ud->builder, "subtitle_table");
+    gtk_widget_set_size_request(widget, -1, height);
+#else
+    GtkRequisition size;
+    
+    widget = GHB_WIDGET(ud->builder, "SrtCodeset");
+    gtk_widget_size_request( widget, &size );
+    height = size.height;
+    widget = GHB_WIDGET(ud->builder, "srt_code_label");
+    gtk_widget_size_request( widget, &size );
+    height += size.height;
+    widget = GHB_WIDGET(ud->builder, "subtitle_table");
+    gtk_widget_set_size_request(widget, -1, height);
+#endif
+    
+    widget = GHB_WIDGET(ud->builder, "hb_window");
+
+    GdkGeometry geo = { 
+        -1, -1, 1024, 768, -1, -1, 10, 10, 0, 0, GDK_GRAVITY_NORTH_WEST
+    };
+    GdkWindowHints geo_mask;
+    geo_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE;
+    gtk_window_set_geometry_hints( GTK_WINDOW(widget), widget, &geo, geo_mask);
+    width = ghb_settings_get_int(ud->settings, "window_width");
+    height = ghb_settings_get_int(ud->settings, "window_height");
+    gtk_window_resize(GTK_WINDOW(widget), width, height);
+    gtk_widget_show(widget);
+
+    /*
+     * Filter objects in GtkBuilder xml
+     * Unfortunately, GtkFilter is poorly supported by GtkBuilder,
+     * so a lot of the setup must happen in code.
+        SourceFilterAll
+        SourceFilterVideo
+        SourceFilterTS
+        SourceFilterMPG
+        SourceFilterEVO
+        SourceFilterVOB
+        SourceFilterMKV
+        SourceFilterMP4
+        SourceFilterAVI
+        SourceFilterMOV
+        SourceFilterOGG
+        SourceFilterFLV
+        SourceFilterWMV
+    */
+    // Add filters to source chooser
+    GtkFileFilter *filter;
+    GtkFileChooser *chooser;
+    chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "source_dialog"));
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAll"));
+    gtk_file_filter_set_name(filter, "All");
+    gtk_file_filter_add_pattern(filter, "*");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterVideo"));
+    gtk_file_filter_set_name(filter, "Video");
+    gtk_file_filter_add_mime_type(filter, "video/*");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterTS"));
+    gtk_file_filter_set_name(filter, "TS");
+    gtk_file_filter_add_pattern(filter, "*.ts");
+    gtk_file_filter_add_pattern(filter, "*.TS");
+    gtk_file_filter_add_pattern(filter, "*.m2ts");
+    gtk_file_filter_add_pattern(filter, "*.M2TS");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMPG"));
+    gtk_file_filter_set_name(filter, "MPG");
+    gtk_file_filter_add_pattern(filter, "*.mpg");
+    gtk_file_filter_add_pattern(filter, "*.MPG");
+    gtk_file_filter_add_pattern(filter, "*.mepg");
+    gtk_file_filter_add_pattern(filter, "*.MEPG");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterEVO"));
+    gtk_file_filter_set_name(filter, "EVO");
+    gtk_file_filter_add_pattern(filter, "*.evo");
+    gtk_file_filter_add_pattern(filter, "*.EVO");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterVOB"));
+    gtk_file_filter_set_name(filter, "VOB");
+    gtk_file_filter_add_pattern(filter, "*.vob");
+    gtk_file_filter_add_pattern(filter, "*.VOB");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMKV"));
+    gtk_file_filter_set_name(filter, "MKV");
+    gtk_file_filter_add_pattern(filter, "*.mkv");
+    gtk_file_filter_add_pattern(filter, "*.MKV");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMP4"));
+    gtk_file_filter_set_name(filter, "MP4");
+    gtk_file_filter_add_pattern(filter, "*.mp4");
+    gtk_file_filter_add_pattern(filter, "*.MP4");
+    gtk_file_filter_add_pattern(filter, "*.m4v");
+    gtk_file_filter_add_pattern(filter, "*.M4V");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterMOV"));
+    gtk_file_filter_set_name(filter, "MOV");
+    gtk_file_filter_add_pattern(filter, "*.mov");
+    gtk_file_filter_add_pattern(filter, "*.MOV");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAVI"));
+    gtk_file_filter_set_name(filter, "AVI");
+    gtk_file_filter_add_pattern(filter, "*.avi");
+    gtk_file_filter_add_pattern(filter, "*.AVI");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterOGG"));
+    gtk_file_filter_set_name(filter, "OGG");
+    gtk_file_filter_add_pattern(filter, "*.ogg");
+    gtk_file_filter_add_pattern(filter, "*.OGG");
+    gtk_file_filter_add_pattern(filter, "*.ogv");
+    gtk_file_filter_add_pattern(filter, "*.OGV");
+    gtk_file_filter_add_pattern(filter, "*.ogm");
+    gtk_file_filter_add_pattern(filter, "*.OGM");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterFLV"));
+    gtk_file_filter_set_name(filter, "FLV");
+    gtk_file_filter_add_pattern(filter, "*.flv");
+    gtk_file_filter_add_pattern(filter, "*.FLV");
+    gtk_file_chooser_add_filter(chooser, filter);
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterWMV"));
+    gtk_file_filter_set_name(filter, "WMV");
+    gtk_file_filter_add_pattern(filter, "*.wmv");
+    gtk_file_filter_add_pattern(filter, "*.WMV");
+    gtk_file_chooser_add_filter(chooser, filter);
+
+    // Gtk has a really stupid bug.  If the file chooser is showing
+    // hidden files AND there is no filter set, it will not select
+    // the filename when gtk_file_chooser_set_filename is called.
+    // So add a completely unnessary filter to prevent this behavior.
+    filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAll"));
+    gtk_file_chooser_set_filter(chooser, filter);
+
+    PangoFontDescription *font_desc;
+    font_desc = pango_font_description_from_string("monospace 10");
+    textview = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "activity_view"));
+    gtk_widget_modify_font(GTK_WIDGET(textview), font_desc);      
+    pango_font_description_free(font_desc);      
+
+    // Everything should be go-to-go.  Lets rock!
+
+    gtk_main();
+    gtk_status_icon_set_visible(si, FALSE);
+    ghb_backend_close();
+    if (ud->queue)
+        ghb_value_free(ud->queue);
+    ghb_value_free(ud->settings);
+    g_io_channel_unref(ud->activity_log);
+    ghb_settings_close();
 #if !defined(_WIN32)
-	notify_uninit();
+    notify_uninit();
 #endif
-	g_free(ud);
+    g_free(ud);
 
-	return 0;
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/makedeps.py -> HandBrake-0.9.9.tar.bz2/gtk/src/makedeps.py Changed

@@ -5,124 +5,128 @@
 
 DepEntry = collections.namedtuple('DepEntry', 'widget dep enable die hide')
 dep_map = (
-	DepEntry("title", "queue_add", "none", True, False),
-	DepEntry("title", "queue_add_menu", "none", True, False),
-	DepEntry("title", "preview_frame", "none", True, False),
-	DepEntry("title", "picture_label", "none", True, False),
-	DepEntry("title", "picture_tab", "none", True, False),
-	DepEntry("title", "chapters_label", "none", True, False),
-	DepEntry("title", "chapters_tab", "none", True, False),
-	DepEntry("title", "start_point", "none", True, False),
-	DepEntry("title", "end_point", "none", True, False),
-	DepEntry("title", "angle", "none", True, False),
-	DepEntry("title", "angle_label", "1", True, False),
-	DepEntry("use_dvdnav", "angle", "FALSE", True, True),
-	DepEntry("use_dvdnav", "angle_label", "FALSE", True, True),
-	DepEntry("angle_count", "angle", "1", True, True),
-	DepEntry("angle_count", "angle_label", "1", True, True),
-	DepEntry("vquality_type_bitrate", "VideoAvgBitrate", "TRUE", False, False),
-	DepEntry("vquality_type_constant", "VideoQualitySlider", "TRUE", False, False),
-	DepEntry("vquality_type_constant", "VideoTwoPass", "TRUE", True, False),
-	DepEntry("vquality_type_constant", "VideoTurboTwoPass", "TRUE", True, False),
-	DepEntry("VideoFramerate", "VideoFrameratePFR", "source", True, True),
-	DepEntry("VideoFramerate", "VideoFramerateVFR", "source", False, True),
-	DepEntry("VideoTwoPass", "VideoTurboTwoPass", "TRUE", False, False),
-	DepEntry("FileFormat", "Mp4LargeFile", "mp4", False, True),
-	DepEntry("FileFormat", "Mp4HttpOptimize", "mp4", False, True),
-	DepEntry("FileFormat", "Mp4iPodCompatible", "mp4", False, True),
-	DepEntry("PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", True, True),
-	DepEntry("PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", True, True),
-	DepEntry("PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", True, True),
-	DepEntry("PictureDecombDeinterlace", "PictureDecomb", "FALSE", True, True),
-	DepEntry("PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", True, True),
-	DepEntry("PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", True, True),
-	DepEntry("PictureDeinterlace", "PictureDeinterlaceCustom", "custom", False, True),
-	DepEntry("PictureDenoise", "PictureDenoiseCustom", "custom", False, True),
-	DepEntry("PictureDecomb", "PictureDecombCustom", "custom", False, True),
-	DepEntry("PictureDetelecine", "PictureDetelecineCustom", "custom", False, True),
-	DepEntry("PictureWidthEnable", "PictureWidth", "TRUE", False, False),
-	DepEntry("PictureHeightEnable", "PictureHeight", "TRUE", False, False),
-	DepEntry("PictureAutoCrop", "PictureTopCrop", "FALSE", False, False),
-	DepEntry("PictureAutoCrop", "PictureBottomCrop", "FALSE", False, False),
-	DepEntry("PictureAutoCrop", "PictureLeftCrop", "FALSE", False, False),
-	DepEntry("PictureAutoCrop", "PictureRightCrop", "FALSE", False, False),
-	DepEntry("VideoEncoder", "x264_tab", "x264", False, True),
-	DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg|ffmpeg4|ffmpeg2", False, True),
-	DepEntry("VideoEncoder", "Mp4iPodCompatible", "x264", False, False),
-	DepEntry("AudioTrackQualityEnable", "AudioTrackQuality", "FALSE", True, False),
-	DepEntry("AudioTrackQualityEnable", "AudioTrackQualityValue", "FALSE", True, False),
-	DepEntry("AudioTrackQualityEnable", "AudioBitrateLabel", "TRUE", True, False),
-	DepEntry("AudioTrackQualityEnable", "AudioBitrate", "TRUE", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackQualityEnable", "lame|vorbis", False, True),
-	DepEntry("AudioEncoderActual", "AudioTrackQuality", "lame|vorbis", False, True),
-	DepEntry("AudioEncoderActual", "AudioTrackQualityValue", "lame|vorbis", False, True),
-	DepEntry("AudioEncoderActual", "AudioBitrateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioBitrate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioSamplerateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioSamplerate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioMixdownLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioMixdown", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackDRCSliderLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackDRCSlider", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackDRCValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackGainLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackGain", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoderActual", "AudioTrackGainValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
-	DepEntry("AudioEncoder", "AudioAllowMP3Pass", "copy", False, False),
-	DepEntry("AudioEncoder", "AudioAllowAACPass", "copy", False, False),
-	DepEntry("AudioEncoder", "AudioAllowAC3Pass", "copy", False, False),
-	DepEntry("AudioEncoder", "AudioAllowDTSPass", "copy", False, False),
-	DepEntry("AudioEncoder", "AudioAllowDTSHDPass", "copy", False, False),
-	DepEntry("x264_bframes", "x264_bpyramid", "<2", True, False),
-	DepEntry("x264_bframes", "x264_direct", "0", True, False),
-	DepEntry("x264_bframes", "x264_b_adapt", "0", True, False),
-	DepEntry("x264_subme", "x264_psy_rd", "<6", True, False),
-	DepEntry("x264_subme", "x264_psy_trell", "<6", True, False),
-	DepEntry("x264_trellis", "x264_psy_trell", "0", True, False),
-	DepEntry("use_source_name", "chapters_in_destination", "TRUE", False, False),
-	DepEntry("use_source_name", "title_no_in_destination", "TRUE", False, False),
-	)
+    DepEntry("title", "queue_add", "none", True, False),
+    DepEntry("title", "queue_add_menu", "none", True, False),
+    DepEntry("title", "preview_frame", "none", True, False),
+    DepEntry("title", "picture_summary", "none", True, False),
+    DepEntry("title", "picture_summary2", "none", True, False),
+    DepEntry("title", "chapters_label", "none", True, False),
+    DepEntry("title", "chapters_tab", "none", True, False),
+    DepEntry("title", "start_point", "none", True, False),
+    DepEntry("title", "end_point", "none", True, False),
+    DepEntry("title", "angle", "none", True, False),
+    DepEntry("title", "angle_label", "1", True, False),
+    DepEntry("use_dvdnav", "angle", "FALSE", True, True),
+    DepEntry("use_dvdnav", "angle_label", "FALSE", True, True),
+    DepEntry("angle_count", "angle", "1", True, True),
+    DepEntry("angle_count", "angle_label", "1", True, True),
+    DepEntry("vquality_type_bitrate", "VideoAvgBitrate", "TRUE", False, False),
+    DepEntry("vquality_type_constant", "VideoQualitySlider", "TRUE", False, False),
+    DepEntry("vquality_type_constant", "VideoTwoPass", "TRUE", True, False),
+    DepEntry("vquality_type_constant", "VideoTurboTwoPass", "TRUE", True, False),
+    DepEntry("VideoFramerate", "VideoFrameratePFR", "source", True, True),
+    DepEntry("VideoFramerate", "VideoFramerateVFR", "source", False, True),
+    DepEntry("VideoTwoPass", "VideoTurboTwoPass", "TRUE", False, False),
+    DepEntry("FileFormat", "Mp4LargeFile", "mp4", False, True),
+    DepEntry("FileFormat", "Mp4HttpOptimize", "mp4", False, True),
+    DepEntry("FileFormat", "Mp4iPodCompatible", "mp4", False, True),
+    DepEntry("PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", True, True),
+    DepEntry("PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", True, True),
+    DepEntry("PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", True, True),
+    DepEntry("PictureDecombDeinterlace", "PictureDecomb", "FALSE", True, True),
+    DepEntry("PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", True, True),
+    DepEntry("PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", True, True),
+    DepEntry("PictureDeinterlace", "PictureDeinterlaceCustom", "custom", False, True),
+    DepEntry("PictureDenoise", "PictureDenoiseCustom", "custom", False, True),
+    DepEntry("PictureDecomb", "PictureDecombCustom", "custom", False, True),
+    DepEntry("PictureDetelecine", "PictureDetelecineCustom", "custom", False, True),
+    DepEntry("PictureWidthEnable", "PictureWidth", "TRUE", False, False),
+    DepEntry("PictureHeightEnable", "PictureHeight", "TRUE", False, False),
+    DepEntry("PictureAutoCrop", "PictureTopCrop", "FALSE", False, False),
+    DepEntry("PictureAutoCrop", "PictureBottomCrop", "FALSE", False, False),
+    DepEntry("PictureAutoCrop", "PictureLeftCrop", "FALSE", False, False),
+    DepEntry("PictureAutoCrop", "PictureRightCrop", "FALSE", False, False),
+    DepEntry("VideoEncoder", "x264_tab", "x264", False, True),
+    DepEntry("VideoEncoder", "x264VideoSettings", "x264", False, True),
+    DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg|ffmpeg4|ffmpeg2", False, True),
+    DepEntry("VideoEncoder", "Mp4iPodCompatible", "x264", False, False),
+    DepEntry("AudioTrackQualityEnable", "AudioTrackQuality", "FALSE", True, False),
+    DepEntry("AudioTrackQualityEnable", "AudioTrackQualityValue", "FALSE", True, False),
+    DepEntry("AudioTrackQualityEnable", "AudioBitrateLabel", "TRUE", True, False),
+    DepEntry("AudioTrackQualityEnable", "AudioBitrate", "TRUE", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackQualityEnable", "lame|vorbis", False, True),
+    DepEntry("AudioEncoderActual", "AudioTrackQuality", "lame|vorbis", False, True),
+    DepEntry("AudioEncoderActual", "AudioTrackQualityValue", "lame|vorbis", False, True),
+    DepEntry("AudioEncoderActual", "AudioBitrateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioBitrate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioSamplerateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioSamplerate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioMixdownLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioMixdown", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackDRCSliderLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackDRCSlider", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackDRCValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackGainLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackGain", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoderActual", "AudioTrackGainValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+    DepEntry("AudioEncoder", "AudioAllowMP3Pass", "copy", False, False),
+    DepEntry("AudioEncoder", "AudioAllowAACPass", "copy", False, False),
+    DepEntry("AudioEncoder", "AudioAllowAC3Pass", "copy", False, False),
+    DepEntry("AudioEncoder", "AudioAllowDTSPass", "copy", False, False),
+    DepEntry("AudioEncoder", "AudioAllowDTSHDPass", "copy", False, False),
+    DepEntry("x264_bframes", "x264_bpyramid", "<2", True, False),
+    DepEntry("x264_bframes", "x264_direct", "0", True, False),
+    DepEntry("x264_bframes", "x264_b_adapt", "0", True, False),
+    DepEntry("x264_subme", "x264_psy_rd", "<6", True, False),
+    DepEntry("x264_subme", "x264_psy_trell", "<6", True, False),
+    DepEntry("x264_trellis", "x264_psy_trell", "0", True, False),
+    DepEntry("x264UseAdvancedOptions", "x264VideoSettingsTable", "TRUE", True, False),
+    DepEntry("x264UseAdvancedOptions", "x264_tab", "FALSE", True, False),
+    DepEntry("HideAdvancedVideoSettings", "x264UseAdvancedOptions", "TRUE", True, True),
+    DepEntry("use_source_name", "chapters_in_destination", "TRUE", False, False),
+    DepEntry("use_source_name", "title_no_in_destination", "TRUE", False, False),
+    )
 
 def main():
 
-	try:
-		depsfile = open("widget.deps", "w")
-	except Exception, err:
-		print >> sys.stderr, ( "Error: %s"  % str(err) )
-		sys.exit(1)
+    try:
+        depsfile = open("widget.deps", "w")
+    except Exception, err:
+        print >> sys.stderr, ( "Error: %s"  % str(err) )
+        sys.exit(1)
 
-	try:
-		revfile = open("widget_reverse.deps", "w")
-	except Exception, err:
-		print >> sys.stderr, ( "Error: %s"  % str(err))
-		sys.exit(1)
+    try:
+        revfile = open("widget_reverse.deps", "w")
+    except Exception, err:
+        print >> sys.stderr, ( "Error: %s"  % str(err))
+        sys.exit(1)
 
-	top = dict()
-	for ii in dep_map:
-		if ii.widget in top:
-			continue
-		deps = list()
-		for jj in dep_map:
-			if jj.widget == ii.widget:
-				deps.append(jj.dep)
-		top[ii.widget] = deps
-	plistlib.writePlist(top, depsfile)
+    top = dict()
+    for ii in dep_map:
+        if ii.widget in top:
+            continue
+        deps = list()
+        for jj in dep_map:
+            if jj.widget == ii.widget:
+                deps.append(jj.dep)
+        top[ii.widget] = deps
+    plistlib.writePlist(top, depsfile)
 
-	top = dict()
-	for ii in dep_map:
-		if ii.dep in top:
-			continue
-		deps = list()
-		for jj in dep_map:
-			if ii.dep == jj.dep:
-				rec = list()
-				rec.append(jj.widget)
-				rec.append(jj.enable)
-				rec.append(jj.die)
-				rec.append(jj.hide)
-				deps.append(rec)
-		top[ii.dep] = deps
-	plistlib.writePlist(top, revfile)
-	
+    top = dict()
+    for ii in dep_map:
+        if ii.dep in top:
+            continue
+        deps = list()
+        for jj in dep_map:
+            if ii.dep == jj.dep:
+                rec = list()
+                rec.append(jj.widget)
+                rec.append(jj.enable)
+                rec.append(jj.die)
+                rec.append(jj.hide)
+                deps.append(rec)
+        top[ii.dep] = deps
+    plistlib.writePlist(top, revfile)
+    
 main()

HandBrake-0.9.8.tar.bz2/gtk/src/marshalers.c -> HandBrake-0.9.9.tar.bz2/gtk/src/marshalers.c Changed

HandBrake-0.9.8.tar.bz2/gtk/src/marshalers.h -> HandBrake-0.9.9.tar.bz2/gtk/src/marshalers.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/plist.c -> HandBrake-0.9.9.tar.bz2/gtk/src/plist.c Changed

@@ -9,575 +9,575 @@
 #include "plist.h"
 #include "values.h"
 
-#define BUF_SZ	(128*1024)
+#define BUF_SZ  (128*1024)
 
 static gchar *preamble = 
-	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-	"<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-	"<plist version=\"1.0\">\n";
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+    "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+    "<plist version=\"1.0\">\n";
 static gchar *postfix = 
-	"</plist>\n";
+    "</plist>\n";
 
 enum
 {
-	P_NONE = 0,
-	P_PLIST,
-	P_KEY,
-	P_ARRAY,
-	P_DICT,
-	P_INTEGER,
-	P_REAL,
-	P_STRING,
-	P_DATE,
-	P_TRUE,
-	P_FALSE,
-	P_DATA,
+    P_NONE = 0,
+    P_PLIST,
+    P_KEY,
+    P_ARRAY,
+    P_DICT,
+    P_INTEGER,
+    P_REAL,
+    P_STRING,
+    P_DATE,
+    P_TRUE,
+    P_FALSE,
+    P_DATA,
 };
 
 typedef struct
 {
-	gchar *tag;
-	gint id;
+    gchar *tag;
+    gint id;
 } tag_map_t;
 
 static tag_map_t tag_map[] =
 {
-	{"plist", P_PLIST},
-	{"key", P_KEY},
-	{"array", P_ARRAY},
-	{"dict", P_DICT},
-	{"integer", P_INTEGER},
-	{"real", P_REAL},
-	{"string", P_STRING},
-	{"date", P_DATE},
-	{"true", P_TRUE},
-	{"false", P_FALSE},
-	{"data", P_DATA},
+    {"plist", P_PLIST},
+    {"key", P_KEY},
+    {"array", P_ARRAY},
+    {"dict", P_DICT},
+    {"integer", P_INTEGER},
+    {"real", P_REAL},
+    {"string", P_STRING},
+    {"date", P_DATE},
+    {"true", P_TRUE},
+    {"false", P_FALSE},
+    {"data", P_DATA},
 };
-#define TAG_MAP_SZ	(sizeof(tag_map)/sizeof(tag_map_t))
+#define TAG_MAP_SZ  (sizeof(tag_map)/sizeof(tag_map_t))
 
 typedef struct
 {
-	gchar *key;
-	gchar *value;
-	GValue *plist;
-	GQueue *stack;
-	GQueue *tag_stack;
-	gboolean closed_top;
+    gchar *key;
+    gchar *value;
+    GValue *plist;
+    GQueue *stack;
+    GQueue *tag_stack;
+    gboolean closed_top;
 } parse_data_t;
 
 static void
 start_element(
-	GMarkupParseContext *ctx, 
-	const gchar *name, 
-	const gchar **attr_names,
-	const gchar **attr_values,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *name, 
+    const gchar **attr_names,
+    const gchar **attr_values,
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} id;
-	gint ii;
-
-	// Check to see if the first element found has been closed
-	// If so, ignore any junk following it.
-	if (pd->closed_top)
-		return;
-
-	for (ii = 0; ii < TAG_MAP_SZ; ii++)
-	{
-		if (strcmp(name, tag_map[ii].tag) == 0)
-		{
-			id.id = tag_map[ii].id;
-			break;
-		}
-	}
-	if (ii == TAG_MAP_SZ)
-	{
-		g_warning("Unrecognized start tag (%s)", name);
-		return;
-	}
-	g_queue_push_head(pd->tag_stack, id.pid);
-	GType gtype = 0;
-	GValue *gval = NULL;
-	GValue *current = g_queue_peek_head(pd->stack);
-	switch (id.id)
-	{
-		case P_PLIST:
-		{ // Ignore
-		} break;
-		case P_KEY:
-		{
-			if (pd->key) g_free(pd->key);
-			pd->key = NULL;
-		} break;
-		case P_DICT:
-		{
-			gval = ghb_dict_value_new();
-			g_queue_push_head(pd->stack, gval);
-		} break;
-		case P_ARRAY:
-		{
-			gval = ghb_array_value_new(128);
-			g_queue_push_head(pd->stack, gval);
-		} break;
-		case P_INTEGER:
-		{
-		} break;
-		case P_REAL:
-		{
-		} break;
-		case P_STRING:
-		{
-		} break;
-		case P_DATE:
-		{
-		} break;
-		case P_TRUE:
-		{
-		} break;
-		case P_FALSE:
-		{
-		} break;
-		case P_DATA:
-		{
-		} break;
-	}
-	// Add the element to the current container
-	if (gval)
-	{ // There's an element to add
-		if (current == NULL)
-		{
-			pd->plist = gval;
-			return;
-		}
-		gtype = G_VALUE_TYPE(current);
-		if (gtype == ghb_array_get_type())
-		{
-			ghb_array_append(current, gval);
-		}
-		else if (gtype == ghb_dict_get_type())
-		{
-			if (pd->key == NULL)
-			{
-				g_warning("No key for dictionary item");
-				ghb_value_free(gval);
-			}
-			else
-			{
-				ghb_dict_insert(current, g_strdup(pd->key), gval);
-			}
-		}
-		else
-		{
-			g_error("Invalid container type. This shouldn't happen");
-		}
-	}
+    parse_data_t *pd = (parse_data_t*)ud;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } id;
+    gint ii;
+
+    // Check to see if the first element found has been closed
+    // If so, ignore any junk following it.
+    if (pd->closed_top)
+        return;
+
+    for (ii = 0; ii < TAG_MAP_SZ; ii++)
+    {
+        if (strcmp(name, tag_map[ii].tag) == 0)
+        {
+            id.id = tag_map[ii].id;
+            break;
+        }
+    }
+    if (ii == TAG_MAP_SZ)
+    {
+        g_warning("Unrecognized start tag (%s)", name);
+        return;
+    }
+    g_queue_push_head(pd->tag_stack, id.pid);
+    GType gtype = 0;
+    GValue *gval = NULL;
+    GValue *current = g_queue_peek_head(pd->stack);
+    switch (id.id)
+    {
+        case P_PLIST:
+        { // Ignore
+        } break;
+        case P_KEY:
+        {
+            if (pd->key) g_free(pd->key);
+            pd->key = NULL;
+        } break;
+        case P_DICT:
+        {
+            gval = ghb_dict_value_new();
+            g_queue_push_head(pd->stack, gval);
+        } break;
+        case P_ARRAY:
+        {
+            gval = ghb_array_value_new(128);
+            g_queue_push_head(pd->stack, gval);
+        } break;
+        case P_INTEGER:
+        {
+        } break;
+        case P_REAL:
+        {
+        } break;
+        case P_STRING:
+        {
+        } break;
+        case P_DATE:
+        {
+        } break;
+        case P_TRUE:
+        {
+        } break;
+        case P_FALSE:
+        {
+        } break;
+        case P_DATA:
+        {
+        } break;
+    }
+    // Add the element to the current container
+    if (gval)
+    { // There's an element to add
+        if (current == NULL)
+        {
+            pd->plist = gval;
+            return;
+        }
+        gtype = G_VALUE_TYPE(current);
+        if (gtype == ghb_array_get_type())
+        {
+            ghb_array_append(current, gval);
+        }
+        else if (gtype == ghb_dict_get_type())
+        {
+            if (pd->key == NULL)
+            {
+                g_warning("No key for dictionary item");
+                ghb_value_free(gval);
+            }
+            else
+            {
+                ghb_dict_insert(current, g_strdup(pd->key), gval);
+            }
+        }
+        else
+        {
+            g_error("Invalid container type. This shouldn't happen");
+        }
+    }
 }
 
 static void
 end_element(
-	GMarkupParseContext *ctx, 
-	const gchar *name, 
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *name, 
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	gint id;
-	union 
-	{
-		gint id;
-		gpointer pid;
-	} start_id;
-	gint ii;
-
-	// Check to see if the first element found has been closed
-	// If so, ignore any junk following it.
-	if (pd->closed_top)
-		return;
-
-	for (ii = 0; ii < TAG_MAP_SZ; ii++)
-	{
-		if (strcmp(name, tag_map[ii].tag) == 0)
-		{
-			id = tag_map[ii].id;
-			break;
-		}
-	}
-	if (ii == TAG_MAP_SZ)
-	{
-		g_warning("Unrecognized start tag (%s)", name);
-		return;
-	}
-	start_id.pid = g_queue_pop_head(pd->tag_stack);
-	if (start_id.id != id)
-		g_warning("start tag != end tag: (%s %d) %d", name, id, id);
-
-	GValue *gval = NULL;
-	GValue *current = g_queue_peek_head(pd->stack);
-	GType gtype = 0;
-	switch (id)
-	{
-		case P_PLIST:
-		{ // Ignore
-		} break;
-		case P_KEY:
-		{
-			if (pd->key) g_free(pd->key);
-			pd->key = g_strdup(pd->value);
-			return;
-		} break;
-		case P_DICT:
-		{
-			g_queue_pop_head(pd->stack);
-		} break;
-		case P_ARRAY:
-		{
-			g_queue_pop_head(pd->stack);
-		} break;
-		case P_INTEGER:
-		{
-			gint64 val = g_strtod(pd->value, NULL);
-			gval = ghb_int64_value_new(val);
-		} break;
-		case P_REAL:
-		{
-			gdouble val = g_strtod(pd->value, NULL);
-			gval = ghb_double_value_new(val);
-		} break;
-		case P_STRING:
-		{
-			gval = ghb_string_value_new(pd->value);
-		} break;
-		case P_DATE:
-		{
-			GDate date;
-			GTimeVal time;
-			g_time_val_from_iso8601(pd->value, &time);
-			g_date_set_time_val(&date, &time);
-			gval = ghb_date_value_new(&date);
-		} break;
-		case P_TRUE:
-		{
-			gval = ghb_boolean_value_new(TRUE);
-		} break;
-		case P_FALSE:
-		{
-			gval = ghb_boolean_value_new(FALSE);
-		} break;
-		case P_DATA:
-		{
-			ghb_rawdata_t *data;
-			data = g_malloc(sizeof(ghb_rawdata_t));
-			data->data = g_base64_decode(pd->value, &(data->size));
-			gval = ghb_rawdata_value_new(data);
-		} break;
-	}
-	if (gval)
-	{
-		// Get the top of the data structure stack and if it's an array
-		// or dict, add the current element
-		if (current == NULL)
-		{
-			pd->plist = gval;
-			pd->closed_top = TRUE;
-			return;
-		}
-		gtype = G_VALUE_TYPE(current);
-		if (gtype == ghb_array_get_type())
-		{
-			ghb_array_append(current, gval);
-		}
-		else if (gtype == ghb_dict_get_type())
-		{
-			if (pd->key == NULL)
-			{
-				g_warning("No key for dictionary item");
-				ghb_value_free(gval);
-			}
-			else
-			{
-				ghb_dict_insert(current, g_strdup(pd->key), gval);
-			}
-		}
-		else
-		{
-			g_error("Invalid container type. This shouldn't happen");
-		}
-	}
-	if (g_queue_is_empty(pd->stack))
-		pd->closed_top = TRUE;
+    parse_data_t *pd = (parse_data_t*)ud;
+    gint id;
+    union 
+    {
+        gint id;
+        gpointer pid;
+    } start_id;
+    gint ii;
+
+    // Check to see if the first element found has been closed
+    // If so, ignore any junk following it.
+    if (pd->closed_top)
+        return;
+
+    for (ii = 0; ii < TAG_MAP_SZ; ii++)
+    {
+        if (strcmp(name, tag_map[ii].tag) == 0)
+        {
+            id = tag_map[ii].id;
+            break;
+        }
+    }
+    if (ii == TAG_MAP_SZ)
+    {
+        g_warning("Unrecognized start tag (%s)", name);
+        return;
+    }
+    start_id.pid = g_queue_pop_head(pd->tag_stack);
+    if (start_id.id != id)
+        g_warning("start tag != end tag: (%s %d) %d", name, id, id);
+
+    GValue *gval = NULL;
+    GValue *current = g_queue_peek_head(pd->stack);
+    GType gtype = 0;
+    switch (id)
+    {
+        case P_PLIST:
+        { // Ignore
+        } break;
+        case P_KEY:
+        {
+            if (pd->key) g_free(pd->key);
+            pd->key = g_strdup(pd->value);
+            return;
+        } break;
+        case P_DICT:
+        {
+            g_queue_pop_head(pd->stack);
+        } break;
+        case P_ARRAY:
+        {
+            g_queue_pop_head(pd->stack);
+        } break;
+        case P_INTEGER:
+        {
+            gint64 val = g_strtod(pd->value, NULL);
+            gval = ghb_int64_value_new(val);
+        } break;
+        case P_REAL:
+        {
+            gdouble val = g_strtod(pd->value, NULL);
+            gval = ghb_double_value_new(val);
+        } break;
+        case P_STRING:
+        {
+            gval = ghb_string_value_new(pd->value);
+        } break;
+        case P_DATE:
+        {
+            GDate date;
+            GTimeVal time;
+            g_time_val_from_iso8601(pd->value, &time);
+            g_date_set_time_val(&date, &time);
+            gval = ghb_date_value_new(&date);
+        } break;
+        case P_TRUE:
+        {
+            gval = ghb_boolean_value_new(TRUE);
+        } break;
+        case P_FALSE:
+        {
+            gval = ghb_boolean_value_new(FALSE);
+        } break;
+        case P_DATA:
+        {
+            ghb_rawdata_t *data;
+            data = g_malloc(sizeof(ghb_rawdata_t));
+            data->data = g_base64_decode(pd->value, &(data->size));
+            gval = ghb_rawdata_value_new(data);
+        } break;
+    }
+    if (gval)
+    {
+        // Get the top of the data structure stack and if it's an array
+        // or dict, add the current element
+        if (current == NULL)
+        {
+            pd->plist = gval;
+            pd->closed_top = TRUE;
+            return;
+        }
+        gtype = G_VALUE_TYPE(current);
+        if (gtype == ghb_array_get_type())
+        {
+            ghb_array_append(current, gval);
+        }
+        else if (gtype == ghb_dict_get_type())
+        {
+            if (pd->key == NULL)
+            {
+                g_warning("No key for dictionary item");
+                ghb_value_free(gval);
+            }
+            else
+            {
+                ghb_dict_insert(current, g_strdup(pd->key), gval);
+            }
+        }
+        else
+        {
+            g_error("Invalid container type. This shouldn't happen");
+        }
+    }
+    if (g_queue_is_empty(pd->stack))
+        pd->closed_top = TRUE;
 }
 
 static void
 text_data(
-	GMarkupParseContext *ctx, 
-	const gchar *text, 
-	gsize len,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *text, 
+    gsize len,
+    gpointer ud,
+    GError **error)
 {
-	parse_data_t *pd = (parse_data_t*)ud;
-	if (pd->value) g_free(pd->value);
-	pd->value = g_strdup(text);
+    parse_data_t *pd = (parse_data_t*)ud;
+    if (pd->value) g_free(pd->value);
+    pd->value = g_strdup(text);
 }
 
 static void
 passthrough(
-	GMarkupParseContext *ctx, 
-	const gchar *text, 
-	gsize len,
-	gpointer ud,
-	GError **error)
+    GMarkupParseContext *ctx, 
+    const gchar *text, 
+    gsize len,
+    gpointer ud,
+    GError **error)
 {
-	//parse_data_t *pd = (parse_data_t*)ud;
+    //parse_data_t *pd = (parse_data_t*)ud;
 
-	//g_debug("passthrough %s", text);
+    //g_debug("passthrough %s", text);
 }
 
 static void
 parse_error(GMarkupParseContext *ctx, GError *error, gpointer ud)
 {
-	g_warning("Plist parse error: %s", error->message);
+    g_warning("Plist parse error: %s", error->message);
 }
 
 // This is required or the parser crashes
 static void 
 destroy_notify(gpointer data)
 { // Do nothing
-	//g_debug("destroy parser");
+    //g_debug("destroy parser");
 }
 
 GValue*
 ghb_plist_parse(const gchar *buf, gssize len)
 {
-	GMarkupParseContext *ctx;
-	GMarkupParser parser;
-	parse_data_t pd;
-	GError *err = NULL;
-
-	pd.stack = g_queue_new();
-	pd.tag_stack = g_queue_new();
-	pd.key = NULL;
-	pd.value = NULL;
-	pd.plist = NULL;
-	pd.closed_top = FALSE;
-
-	parser.start_element = start_element;
-	parser.end_element = end_element;
-	parser.text = text_data;
-	parser.passthrough = passthrough;
-	parser.error = parse_error;
-	ctx = g_markup_parse_context_new(&parser, 0, &pd, destroy_notify);
-
-	g_markup_parse_context_parse(ctx, buf, len, &err);
-	g_markup_parse_context_end_parse(ctx, &err);
-	g_markup_parse_context_free(ctx);
-	if (pd.key) g_free(pd.key);
-	if (pd.value) g_free(pd.value);
-	g_queue_free(pd.stack);
-	g_queue_free(pd.tag_stack);
-	return pd.plist;
+    GMarkupParseContext *ctx;
+    GMarkupParser parser;
+    parse_data_t pd;
+    GError *err = NULL;
+
+    pd.stack = g_queue_new();
+    pd.tag_stack = g_queue_new();
+    pd.key = NULL;
+    pd.value = NULL;
+    pd.plist = NULL;
+    pd.closed_top = FALSE;
+
+    parser.start_element = start_element;
+    parser.end_element = end_element;
+    parser.text = text_data;
+    parser.passthrough = passthrough;
+    parser.error = parse_error;
+    ctx = g_markup_parse_context_new(&parser, 0, &pd, destroy_notify);
+
+    g_markup_parse_context_parse(ctx, buf, len, &err);
+    g_markup_parse_context_end_parse(ctx, &err);
+    g_markup_parse_context_free(ctx);
+    if (pd.key) g_free(pd.key);
+    if (pd.value) g_free(pd.value);
+    g_queue_free(pd.stack);
+    g_queue_free(pd.tag_stack);
+    return pd.plist;
 }
 
 GValue*
 ghb_plist_parse_file(const gchar *filename)
 {
-	gchar *buffer;
-	size_t size;
-	GValue *gval;
-	FILE *fd;
-
-	fd = g_fopen(filename, "r");
-	if (fd == NULL)
-	{
-		g_warning("Plist parse: failed to open %s", filename);
-		return NULL;
-	}
-	fseek(fd, 0, SEEK_END);
-	size = ftell(fd);
-	fseek(fd, 0, SEEK_SET);
-	buffer = g_malloc(size+1);
-	size = fread(buffer, 1, size, fd);
-	buffer[size] = 0;
-	gval = ghb_plist_parse(buffer, (gssize)size);
-	g_free(buffer);
-	fclose(fd);
-	return gval;
+    gchar *buffer;
+    size_t size;
+    GValue *gval;
+    FILE *fd;
+
+    fd = g_fopen(filename, "r");
+    if (fd == NULL)
+    {
+        g_warning("Plist parse: failed to open %s", filename);
+        return NULL;
+    }
+    fseek(fd, 0, SEEK_END);
+    size = ftell(fd);
+    fseek(fd, 0, SEEK_SET);
+    buffer = g_malloc(size+1);
+    size = fread(buffer, 1, size, fd);
+    buffer[size] = 0;
+    gval = ghb_plist_parse(buffer, (gssize)size);
+    g_free(buffer);
+    fclose(fd);
+    return gval;
 }
 
 static void
 indent_fprintf(FILE *file, gint indent, const gchar *fmt, ...)
 {
-	va_list ap;
+    va_list ap;
 
-	for (; indent; indent--)
-		putc('\t', file);
-	va_start(ap, fmt);
-	vfprintf(file, fmt, ap);
-	va_end(ap);
+    for (; indent; indent--)
+        putc('\t', file);
+    va_start(ap, fmt);
+    vfprintf(file, fmt, ap);
+    va_end(ap);
 }
 
 // Used for sorting dictionaries.
 static gint
 key_cmp(gconstpointer a, gconstpointer b)
 {
-	gchar *stra = (gchar*)a;
-	gchar *strb = (gchar*)b;
+    gchar *stra = (gchar*)a;
+    gchar *strb = (gchar*)b;
 
-	return strcmp(stra, strb);
+    return strcmp(stra, strb);
 }
 
 static void
 gval_write(FILE *file, GValue *gval)
 {
-	static gint indent = 0;
-	gint ii;
-	GType gtype;
-
-	if (gval == NULL) return;
-	gtype = G_VALUE_TYPE(gval);
-	if (gtype == ghb_array_get_type())
-	{
-		GValue *val;
-		gint count;
-
-		indent_fprintf(file, indent, "<array>\n");
-		indent++;
-		count = ghb_array_len(gval);
-		for (ii = 0; ii < count; ii++)
-		{
-			val = ghb_array_get_nth(gval, ii);
-			gval_write(file, val);
-		}
-		indent--;
-		indent_fprintf(file, indent, "</array>\n");
-	}
-	else if (gtype == ghb_dict_get_type())
-	{
-		GValue *val;
-		GHashTable *dict = g_value_get_boxed(gval);
-		GList *link, *keys;
-		keys = g_hash_table_get_keys(dict);
-		// Sort the dictionary.  Not really necessray, but it makes
-		// finding things easier
-		keys = g_list_sort(keys, key_cmp);
-		link = keys;
-		indent_fprintf(file, indent, "<dict>\n");
-		indent++;
-		while (link)
-		{
-			gchar *key = (gchar*)link->data;
-			val = g_hash_table_lookup(dict, key);
-			indent_fprintf(file, indent, "<key>%s</key>\n", key);
-			gval_write(file, val);
-			link = link->next;
-		}
-		indent--;
-		indent_fprintf(file, indent, "</dict>\n");
-		g_list_free(keys);
-	}
-	else if (gtype == G_TYPE_BOOLEAN)
-	{
-		gchar *tag;
-		if (g_value_get_boolean(gval))
-		{
-			tag = "true";
-		}
-		else
-		{
-			tag = "false";
-		}
-		indent_fprintf(file, indent, "<%s />\n", tag);
-	}
-	else if (gtype == g_date_get_type())
-	{
-		GDate *date;
-		date = g_value_get_boxed(gval);
-		indent_fprintf(file, indent, "<date>%d-%d-%d</date>\n", 
-			g_date_get_year(date),
-			g_date_get_month(date),
-			g_date_get_day(date)
-		);
-	}
-	else if (gtype == ghb_rawdata_get_type())
-	{
-		ghb_rawdata_t *data;
-		gchar *base64;
-		data = g_value_get_boxed(gval);
-		base64 = g_base64_encode(data->data, data->size);
-		indent_fprintf(file, indent, "<data>\n");
-		indent_fprintf(file, 0, "%s\n", base64);
-		indent_fprintf(file, indent, "</data>\n");
-		g_free(base64);
-	}
-	else if (gtype == G_TYPE_DOUBLE)
-	{
-		gdouble val = g_value_get_double(gval);
-		indent_fprintf(file, indent, "<real>%.17g</real>\n", val);
-	}
-	else if (gtype == G_TYPE_INT64)
-	{
-		gint val = g_value_get_int64(gval);
-		indent_fprintf(file, indent, "<integer>%d</integer>\n", val);
-	}
-	else if (gtype == G_TYPE_INT)
-	{
-		gint val = g_value_get_int(gval);
-		indent_fprintf(file, indent, "<integer>%d</integer>\n", val);
-	}
-	else if (gtype == G_TYPE_STRING)
-	{
-		const gchar *str = g_value_get_string(gval);
-		gchar *esc = g_markup_escape_text(str, -1);
-		indent_fprintf(file, indent, "<string>%s</string>\n", esc);
-		g_free(esc);
-	}
-	else
-	{
-		// Try to make anything thats unrecognized into a string
-		const gchar *str;
-		GValue val = {0,};
-		g_value_init(&val, G_TYPE_STRING);
-		if (g_value_transform(gval, &val))
-		{
-			str = g_value_get_string(&val);
-			gchar *esc = g_markup_escape_text(str, -1);
-			indent_fprintf(file, indent, "<string>%s</string>\n", esc);
-			g_free(esc);
-		}
-		else
-		{
-			g_message("failed to transform");
-		}
-		g_value_unset(&val);
-	}
+    static gint indent = 0;
+    gint ii;
+    GType gtype;
+
+    if (gval == NULL) return;
+    gtype = G_VALUE_TYPE(gval);
+    if (gtype == ghb_array_get_type())
+    {
+        GValue *val;
+        gint count;
+
+        indent_fprintf(file, indent, "<array>\n");
+        indent++;
+        count = ghb_array_len(gval);
+        for (ii = 0; ii < count; ii++)
+        {
+            val = ghb_array_get_nth(gval, ii);
+            gval_write(file, val);
+        }
+        indent--;
+        indent_fprintf(file, indent, "</array>\n");
+    }
+    else if (gtype == ghb_dict_get_type())
+    {
+        GValue *val;
+        GHashTable *dict = g_value_get_boxed(gval);
+        GList *link, *keys;
+        keys = g_hash_table_get_keys(dict);
+        // Sort the dictionary.  Not really necessray, but it makes
+        // finding things easier
+        keys = g_list_sort(keys, key_cmp);
+        link = keys;
+        indent_fprintf(file, indent, "<dict>\n");
+        indent++;
+        while (link)
+        {
+            gchar *key = (gchar*)link->data;
+            val = g_hash_table_lookup(dict, key);
+            indent_fprintf(file, indent, "<key>%s</key>\n", key);
+            gval_write(file, val);
+            link = link->next;
+        }
+        indent--;
+        indent_fprintf(file, indent, "</dict>\n");
+        g_list_free(keys);
+    }
+    else if (gtype == G_TYPE_BOOLEAN)
+    {
+        gchar *tag;
+        if (g_value_get_boolean(gval))
+        {
+            tag = "true";
+        }
+        else
+        {
+            tag = "false";
+        }
+        indent_fprintf(file, indent, "<%s />\n", tag);
+    }
+    else if (gtype == g_date_get_type())
+    {
+        GDate *date;
+        date = g_value_get_boxed(gval);
+        indent_fprintf(file, indent, "<date>%d-%d-%d</date>\n", 
+            g_date_get_year(date),
+            g_date_get_month(date),
+            g_date_get_day(date)
+        );
+    }
+    else if (gtype == ghb_rawdata_get_type())
+    {
+        ghb_rawdata_t *data;
+        gchar *base64;
+        data = g_value_get_boxed(gval);
+        base64 = g_base64_encode(data->data, data->size);
+        indent_fprintf(file, indent, "<data>\n");
+        indent_fprintf(file, 0, "%s\n", base64);
+        indent_fprintf(file, indent, "</data>\n");
+        g_free(base64);
+    }
+    else if (gtype == G_TYPE_DOUBLE)
+    {
+        gdouble val = g_value_get_double(gval);
+        indent_fprintf(file, indent, "<real>%.17g</real>\n", val);
+    }
+    else if (gtype == G_TYPE_INT64)
+    {
+        gint val = g_value_get_int64(gval);
+        indent_fprintf(file, indent, "<integer>%d</integer>\n", val);
+    }
+    else if (gtype == G_TYPE_INT)
+    {
+        gint val = g_value_get_int(gval);
+        indent_fprintf(file, indent, "<integer>%d</integer>\n", val);
+    }
+    else if (gtype == G_TYPE_STRING)
+    {
+        const gchar *str = g_value_get_string(gval);
+        gchar *esc = g_markup_escape_text(str, -1);
+        indent_fprintf(file, indent, "<string>%s</string>\n", esc);
+        g_free(esc);
+    }
+    else
+    {
+        // Try to make anything thats unrecognized into a string
+        const gchar *str;
+        GValue val = {0,};
+        g_value_init(&val, G_TYPE_STRING);
+        if (g_value_transform(gval, &val))
+        {
+            str = g_value_get_string(&val);
+            gchar *esc = g_markup_escape_text(str, -1);
+            indent_fprintf(file, indent, "<string>%s</string>\n", esc);
+            g_free(esc);
+        }
+        else
+        {
+            g_message("failed to transform");
+        }
+        g_value_unset(&val);
+    }
 }
 
 void
 ghb_plist_write(FILE *file, GValue *gval)
 {
-	fprintf(file, "%s", preamble);
-	gval_write(file, gval);
-	fprintf(file, "%s", postfix);
+    fprintf(file, "%s", preamble);
+    gval_write(file, gval);
+    fprintf(file, "%s", postfix);
 }
 
 void
 ghb_plist_write_file(const gchar *filename, GValue *gval)
 {
-	FILE *file;
+    FILE *file;
 
-	file = fopen(filename, "w");
-	if (file == NULL)
-		return;
+    file = fopen(filename, "w");
+    if (file == NULL)
+        return;
 
-	fprintf(file, "%s", preamble);
-	gval_write(file, gval);
-	fprintf(file, "%s", postfix);
+    fprintf(file, "%s", preamble);
+    gval_write(file, gval);
+    fprintf(file, "%s", postfix);
 }
 
 
@@ -585,17 +585,17 @@
 gint
 main(gint argc, gchar *argv[])
 {
-	GValue *gval;
-
-	g_type_init();
-
-	file = g_fopen(argv[1], "r");
-	gval = ghb_plist_parse_file(file);
-	if (argc > 2)
-		ghb_plist_write_file(argv[2], gval);
-	else
-		ghb_plist_write(stdout, gval);
-	if (file) fclose (file);
-	return 0;
+    GValue *gval;
+
+    g_type_init();
+
+    file = g_fopen(argv[1], "r");
+    gval = ghb_plist_parse_file(file);
+    if (argc > 2)
+        ghb_plist_write_file(argv[2], gval);
+    else
+        ghb_plist_write(stdout, gval);
+    if (file) fclose (file);
+    return 0;
 }
 #endif

HandBrake-0.9.8.tar.bz2/gtk/src/preset_xlat.c -> HandBrake-0.9.9.tar.bz2/gtk/src/preset_xlat.c Changed

@@ -9,499 +9,499 @@
 
 typedef struct
 {
-	gchar *mac_val;
-	gchar *lin_val;
+    gchar *mac_val;
+    gchar *lin_val;
 } value_map_t;
 
 #if 0
 static value_map_t subtitle_xlat[] =
 { 
-	{ "None", "none" },
-	{ "Auto", "auto" },
-	{ "Any", "und" },
-	{ "Afar", "aar" },
-	{ "Abkhazian", "abk" },
-	{ "Afrikaans", "afr" },
-	{ "Akan", "aka" },
-	{ "Albanian", "sqi" },
-	{ "Amharic", "amh" },
-	{ "Arabic", "ara" },
-	{ "Aragonese", "arg" },
-	{ "Armenian", "hye" },
-	{ "Assamese", "asm" },
-	{ "Avaric", "ava" },
-	{ "Avestan", "ave" },
-	{ "Aymara", "aym" },
-	{ "Azerbaijani", "aze" },
-	{ "Bashkir", "bak" },
-	{ "Bambara", "bam" },
-	{ "Basque", "eus" },
-	{ "Belarusian", "bel" },
-	{ "Bengali", "ben" },
-	{ "Bihari", "bih" },
-	{ "Bislama", "bis" },
-	{ "Bosnian", "bos" },
-	{ "Breton", "bre" },
-	{ "Bulgarian", "bul" },
-	{ "Burmese", "mya" },
-	{ "Catalan", "cat" },
-	{ "Chamorro", "cha" },
-	{ "Chechen", "che" },
-	{ "Chinese", "zho" },
-	{ "Church Slavic", "chu" },
-	{ "Chuvash", "chv" },
-	{ "Cornish", "cor" },
-	{ "Corsican", "cos" },
-	{ "Cree", "cre" },
-	{ "Czech", "ces" },
-	{ "Danish", "dan" },
-	{ "Divehi", "div" },
-	{ "Dutch", "nld" },
-	{ "Dzongkha", "dzo" },
-	{ "English", "eng" },
-	{ "Esperanto", "epo" },
-	{ "Estonian", "est" },
-	{ "Ewe", "ewe" },
-	{ "Faroese", "fao" },
-	{ "Fijian", "fij" },
-	{ "Finnish", "fin" },
-	{ "French", "fra" },
-	{ "Western Frisian", "fry" },
-	{ "Fulah", "ful" },
-	{ "Georgian", "kat" },
-	{ "German", "deu" },
-	{ "Gaelic (Scots)", "gla" },
-	{ "Irish", "gle" },
-	{ "Galician", "glg" },
-	{ "Manx", "glv" },
-	{ "Greek, Modern", "ell" },
-	{ "Guarani", "grn" },
-	{ "Gujarati", "guj" },
-	{ "Haitian", "hat" },
-	{ "Hausa", "hau" },
-	{ "Hebrew", "heb" },
-	{ "Herero", "her" },
-	{ "Hindi", "hin" },
-	{ "Hiri Motu", "hmo" },
-	{ "Hungarian", "hun" },
-	{ "Igbo", "ibo" },
-	{ "Icelandic", "isl" },
-	{ "Ido", "ido" },
-	{ "Sichuan Yi", "iii" },
-	{ "Inuktitut", "iku" },
-	{ "Interlingue", "ile" },
-	{ "Interlingua", "ina" },
-	{ "Indonesian", "ind" },
-	{ "Inupiaq", "ipk" },
-	{ "Italian", "ita" },
-	{ "Javanese", "jav" },
-	{ "Japanese", "jpn" },
-	{ "Kalaallisut", "kal" },
-	{ "Kannada", "kan" },
-	{ "Kashmiri", "kas" },
-	{ "Kanuri", "kau" },
-	{ "Kazakh", "kaz" },
-	{ "Central Khmer", "khm" },
-	{ "Kikuyu", "kik" },
-	{ "Kinyarwanda", "kin" },
-	{ "Kirghiz", "kir" },
-	{ "Komi", "kom" },
-	{ "Kongo", "kon" },
-	{ "Korean", "kor" },
-	{ "Kuanyama", "kua" },
-	{ "Kurdish", "kur" },
-	{ "Lao", "lao" },
-	{ "Latin", "lat" },
-	{ "Latvian", "lav" },
-	{ "Limburgan", "lim" },
-	{ "Lingala", "lin" },
-	{ "Lithuanian", "lit" },
-	{ "Luxembourgish", "ltz" },
-	{ "Luba-Katanga", "lub" },
-	{ "Ganda", "lug" },
-	{ "Macedonian", "mkd" },
-	{ "Marshallese", "mah" },
-	{ "Malayalam", "mal" },
-	{ "Maori", "mri" },
-	{ "Marathi", "mar" },
-	{ "Malay", "msa" },
-	{ "Malagasy", "mlg" },
-	{ "Maltese", "mlt" },
-	{ "Moldavian", "mol" },
-	{ "Mongolian", "mon" },
-	{ "Nauru", "nau" },
-	{ "Navajo", "nav" },
-	{ "Ndebele, South", "nbl" },
-	{ "Ndebele, North", "nde" },
-	{ "Ndonga", "ndo" },
-	{ "Nepali", "nep" },
-	{ "Norwegian Nynorsk", "nno" },
-	{ "Norwegian Bokmål", "nob" },
-	{ "Norwegian", "nor" },
-	{ "Chichewa; Nyanja", "nya" },
-	{ "Occitan", "oci" },
-	{ "Ojibwa", "oji" },
-	{ "Oriya", "ori" },
-	{ "Oromo", "orm" },
-	{ "Ossetian", "oss" },
-	{ "Panjabi", "pan" },
-	{ "Persian", "fas" },
-	{ "Pali", "pli" },
-	{ "Polish", "pol" },
-	{ "Portuguese", "por" },
-	{ "Pushto", "pus" },
-	{ "Quechua", "que" },
-	{ "Romansh", "roh" },
-	{ "Romanian", "ron" },
-	{ "Rundi", "run" },
-	{ "Russian", "rus" },
-	{ "Sango", "sag" },
-	{ "Sanskrit", "san" },
-	{ "Serbian", "srp" },
-	{ "Croatian", "hrv" },
-	{ "Sinhala", "sin" },
-	{ "Slovak", "slk" },
-	{ "Slovenian", "slv" },
-	{ "Northern Sami", "sme" },
-	{ "Samoan", "smo" },
-	{ "Shona", "sna" },
-	{ "Sindhi", "snd" },
-	{ "Somali", "som" },
-	{ "Sotho, Southern", "sot" },
-	{ "Spanish", "spa" },
-	{ "Sardinian", "srd" },
-	{ "Swati", "ssw" },
-	{ "Sundanese", "sun" },
-	{ "Swahili", "swa" },
-	{ "Swedish", "swe" },
-	{ "Tahitian", "tah" },
-	{ "Tamil", "tam" },
-	{ "Tatar", "tat" },
-	{ "Telugu", "tel" },
-	{ "Tajik", "tgk" },
-	{ "Tagalog", "tgl" },
-	{ "Thai", "tha" },
-	{ "Tibetan", "bod" },
-	{ "Tigrinya", "tir" },
-	{ "Tonga", "ton" },
-	{ "Tswana", "tsn" },
-	{ "Tsonga", "tso" },
-	{ "Turkmen", "tuk" },
-	{ "Turkish", "tur" },
-	{ "Twi", "twi" },
-	{ "Uighur", "uig" },
-	{ "Ukrainian", "ukr" },
-	{ "Urdu", "urd" },
-	{ "Uzbek", "uzb" },
-	{ "Venda", "ven" },
-	{ "Vietnamese", "vie" },
-	{ "Volapük", "vol" },
-	{ "Welsh", "cym" },
-	{ "Walloon", "wln" },
-	{ "Wolof", "wol" },
-	{ "Xhosa", "xho" },
-	{ "Yiddish", "yid" },
-	{ "Yoruba", "yor" },
-	{ "Zhuang", "zha" },
-	{ "Zulu", "zul" },
-	{NULL, NULL}
+    { "None", "none" },
+    { "Auto", "auto" },
+    { "Any", "und" },
+    { "Afar", "aar" },
+    { "Abkhazian", "abk" },
+    { "Afrikaans", "afr" },
+    { "Akan", "aka" },
+    { "Albanian", "sqi" },
+    { "Amharic", "amh" },
+    { "Arabic", "ara" },
+    { "Aragonese", "arg" },
+    { "Armenian", "hye" },
+    { "Assamese", "asm" },
+    { "Avaric", "ava" },
+    { "Avestan", "ave" },
+    { "Aymara", "aym" },
+    { "Azerbaijani", "aze" },
+    { "Bashkir", "bak" },
+    { "Bambara", "bam" },
+    { "Basque", "eus" },
+    { "Belarusian", "bel" },
+    { "Bengali", "ben" },
+    { "Bihari", "bih" },
+    { "Bislama", "bis" },
+    { "Bosnian", "bos" },
+    { "Breton", "bre" },
+    { "Bulgarian", "bul" },
+    { "Burmese", "mya" },
+    { "Catalan", "cat" },
+    { "Chamorro", "cha" },
+    { "Chechen", "che" },
+    { "Chinese", "zho" },
+    { "Church Slavic", "chu" },
+    { "Chuvash", "chv" },
+    { "Cornish", "cor" },
+    { "Corsican", "cos" },
+    { "Cree", "cre" },
+    { "Czech", "ces" },
+    { "Danish", "dan" },
+    { "Divehi", "div" },
+    { "Dutch", "nld" },
+    { "Dzongkha", "dzo" },
+    { "English", "eng" },
+    { "Esperanto", "epo" },
+    { "Estonian", "est" },
+    { "Ewe", "ewe" },
+    { "Faroese", "fao" },
+    { "Fijian", "fij" },
+    { "Finnish", "fin" },
+    { "French", "fra" },
+    { "Western Frisian", "fry" },
+    { "Fulah", "ful" },
+    { "Georgian", "kat" },
+    { "German", "deu" },
+    { "Gaelic (Scots)", "gla" },
+    { "Irish", "gle" },
+    { "Galician", "glg" },
+    { "Manx", "glv" },
+    { "Greek, Modern", "ell" },
+    { "Guarani", "grn" },
+    { "Gujarati", "guj" },
+    { "Haitian", "hat" },
+    { "Hausa", "hau" },
+    { "Hebrew", "heb" },
+    { "Herero", "her" },
+    { "Hindi", "hin" },
+    { "Hiri Motu", "hmo" },
+    { "Hungarian", "hun" },
+    { "Igbo", "ibo" },
+    { "Icelandic", "isl" },
+    { "Ido", "ido" },
+    { "Sichuan Yi", "iii" },
+    { "Inuktitut", "iku" },
+    { "Interlingue", "ile" },
+    { "Interlingua", "ina" },
+    { "Indonesian", "ind" },
+    { "Inupiaq", "ipk" },
+    { "Italian", "ita" },
+    { "Javanese", "jav" },
+    { "Japanese", "jpn" },
+    { "Kalaallisut", "kal" },
+    { "Kannada", "kan" },
+    { "Kashmiri", "kas" },
+    { "Kanuri", "kau" },
+    { "Kazakh", "kaz" },
+    { "Central Khmer", "khm" },
+    { "Kikuyu", "kik" },
+    { "Kinyarwanda", "kin" },
+    { "Kirghiz", "kir" },
+    { "Komi", "kom" },
+    { "Kongo", "kon" },
+    { "Korean", "kor" },
+    { "Kuanyama", "kua" },
+    { "Kurdish", "kur" },
+    { "Lao", "lao" },
+    { "Latin", "lat" },
+    { "Latvian", "lav" },
+    { "Limburgan", "lim" },
+    { "Lingala", "lin" },
+    { "Lithuanian", "lit" },
+    { "Luxembourgish", "ltz" },
+    { "Luba-Katanga", "lub" },
+    { "Ganda", "lug" },
+    { "Macedonian", "mkd" },
+    { "Marshallese", "mah" },
+    { "Malayalam", "mal" },
+    { "Maori", "mri" },
+    { "Marathi", "mar" },
+    { "Malay", "msa" },
+    { "Malagasy", "mlg" },
+    { "Maltese", "mlt" },
+    { "Moldavian", "mol" },
+    { "Mongolian", "mon" },
+    { "Nauru", "nau" },
+    { "Navajo", "nav" },
+    { "Ndebele, South", "nbl" },
+    { "Ndebele, North", "nde" },
+    { "Ndonga", "ndo" },
+    { "Nepali", "nep" },
+    { "Norwegian Nynorsk", "nno" },
+    { "Norwegian Bokmål", "nob" },
+    { "Norwegian", "nor" },
+    { "Chichewa; Nyanja", "nya" },
+    { "Occitan", "oci" },
+    { "Ojibwa", "oji" },
+    { "Oriya", "ori" },
+    { "Oromo", "orm" },
+    { "Ossetian", "oss" },
+    { "Panjabi", "pan" },
+    { "Persian", "fas" },
+    { "Pali", "pli" },
+    { "Polish", "pol" },
+    { "Portuguese", "por" },
+    { "Pushto", "pus" },
+    { "Quechua", "que" },
+    { "Romansh", "roh" },
+    { "Romanian", "ron" },
+    { "Rundi", "run" },
+    { "Russian", "rus" },
+    { "Sango", "sag" },
+    { "Sanskrit", "san" },
+    { "Serbian", "srp" },
+    { "Croatian", "hrv" },
+    { "Sinhala", "sin" },
+    { "Slovak", "slk" },
+    { "Slovenian", "slv" },
+    { "Northern Sami", "sme" },
+    { "Samoan", "smo" },
+    { "Shona", "sna" },
+    { "Sindhi", "snd" },
+    { "Somali", "som" },
+    { "Sotho, Southern", "sot" },
+    { "Spanish", "spa" },
+    { "Sardinian", "srd" },
+    { "Swati", "ssw" },
+    { "Sundanese", "sun" },
+    { "Swahili", "swa" },
+    { "Swedish", "swe" },
+    { "Tahitian", "tah" },
+    { "Tamil", "tam" },
+    { "Tatar", "tat" },
+    { "Telugu", "tel" },
+    { "Tajik", "tgk" },
+    { "Tagalog", "tgl" },
+    { "Thai", "tha" },
+    { "Tibetan", "bod" },
+    { "Tigrinya", "tir" },
+    { "Tonga", "ton" },
+    { "Tswana", "tsn" },
+    { "Tsonga", "tso" },
+    { "Turkmen", "tuk" },
+    { "Turkish", "tur" },
+    { "Twi", "twi" },
+    { "Uighur", "uig" },
+    { "Ukrainian", "ukr" },
+    { "Urdu", "urd" },
+    { "Uzbek", "uzb" },
+    { "Venda", "ven" },
+    { "Vietnamese", "vie" },
+    { "Volapük", "vol" },
+    { "Welsh", "cym" },
+    { "Walloon", "wln" },
+    { "Wolof", "wol" },
+    { "Xhosa", "xho" },
+    { "Yiddish", "yid" },
+    { "Yoruba", "yor" },
+    { "Zhuang", "zha" },
+    { "Zulu", "zul" },
+    {NULL, NULL}
 };
 
 static value_map_t vcodec_xlat[] =
 {
-	{"MPEG-4 (FFmpeg)", "ffmpeg"},
-	{"MPEG-4 (XviD)", "ffmpeg"},
-	{"H.264 (x264)", "x264"},
-	{"VP3 (Theora)", "theora"},
-	{NULL,NULL}
+    {"MPEG-4 (FFmpeg)", "ffmpeg"},
+    {"MPEG-4 (XviD)", "ffmpeg"},
+    {"H.264 (x264)", "x264"},
+    {"VP3 (Theora)", "theora"},
+    {NULL,NULL}
 };
 
 value_map_t container_xlat[] =
 {
-	{"MP4 file", "mp4"},
-	{"M4V file", "m4v"},
-	{"MKV file", "mkv"},
-	{"AVI file", "avi"},
-	{"OGM file", "ogm"},
-	{NULL, NULL}
+    {"MP4 file", "mp4"},
+    {"M4V file", "m4v"},
+    {"MKV file", "mkv"},
+    {"AVI file", "avi"},
+    {"OGM file", "ogm"},
+    {NULL, NULL}
 };
 
 value_map_t framerate_xlat[] =
 {
-	{"Same as source", "source"},
-	{"5", "5"},
-	{"10", "10"},
-	{"12", "12"},
-	{"15", "15"},
-	{"23.976", "23.976"},
-	{"24", "24"},
-	{"25", "25"},
-	{"29.97", "29.97"},
-	{NULL, NULL}
+    {"Same as source", "source"},
+    {"5", "5"},
+    {"10", "10"},
+    {"12", "12"},
+    {"15", "15"},
+    {"23.976", "23.976"},
+    {"24", "24"},
+    {"25", "25"},
+    {"29.97", "29.97"},
+    {NULL, NULL}
 };
 
 value_map_t deint_xlat[] =
 {
-	{"0", "none"},
-	{"1", "fast"},
-	{"2", "slow"},
-	{"3", "slower"},
-	{NULL, NULL}
+    {"0", "none"},
+    {"1", "fast"},
+    {"2", "slow"},
+    {"3", "slower"},
+    {NULL, NULL}
 };
 
 value_map_t denoise_xlat[] =
 {
-	{"0", "none"},
-	{"1", "weak"},
-	{"2", "medium"},
-	{"3", "strong"},
-	{NULL, NULL}
+    {"0", "none"},
+    {"1", "weak"},
+    {"2", "medium"},
+    {"3", "strong"},
+    {NULL, NULL}
 };
 
 static value_map_t acodec_xlat[] =
 {
-	{"AAC (faac)", "faac"},
-	{"AC3 Passthru", "ac3"},
-	{"MP3 (lame)", "lame"},
-	{"Vorbis (vorbis)", "vorbis"},
-	{NULL,NULL}
+    {"AAC (faac)", "faac"},
+    {"AC3 Passthru", "ac3"},
+    {"MP3 (lame)", "lame"},
+    {"Vorbis (vorbis)", "vorbis"},
+    {NULL,NULL}
 };
 
 value_map_t samplerate_xlat[] =
 {
-	{"Auto", "source"},
-	{"22.05", "22.05"},
-	{"24", "24"},
-	{"32", "32"},
-	{"44.1", "44.1"},
-	{"48", "48"},
-	{NULL, NULL}
+    {"Auto", "source"},
+    {"22.05", "22.05"},
+    {"24", "24"},
+    {"32", "32"},
+    {"44.1", "44.1"},
+    {"48", "48"},
+    {NULL, NULL}
 };
 
 value_map_t mix_xlat[] =
 {
-	{"Mono", "mono"},
-	{"Stereo", "stereo"},
-	{"Dolby Surround", "dpl1"},
-	{"Dolby Pro Logic II", "dpl2"},
-	{"6-channel discrete", "6ch"},
-	{"AC3 Passthru", "none"},
-	{NULL, NULL}
+    {"Mono", "mono"},
+    {"Stereo", "stereo"},
+    {"Dolby Surround", "dpl1"},
+    {"Dolby Pro Logic II", "dpl2"},
+    {"6-channel discrete", "6ch"},
+    {"AC3 Passthru", "none"},
+    {NULL, NULL}
 };
 #endif
 
 typedef struct
 {
-	gchar *mac_key;
-	gchar *lin_key;
-	value_map_t *value_map;
-	gboolean same;
-	gboolean ignore;
+    gchar *mac_key;
+    gchar *lin_key;
+    value_map_t *value_map;
+    gboolean same;
+    gboolean ignore;
 } key_map_t;
 
 key_map_t key_map[] = 
 {
-	{"Audio1Bitrate", NULL, NULL, FALSE, FALSE},
-	{"Audio1Encoder", NULL, NULL, FALSE, FALSE},
-	{"Audio1Mixdown", NULL, NULL, FALSE, FALSE},
-	{"Audio1Samplerate", NULL, NULL, FALSE, FALSE},
-	{"Audio1Track", NULL, NULL, FALSE, FALSE},
-	{"Audio1TrackDescription", NULL, NULL, FALSE, FALSE},
-	{"Audio1TrackDRCSlider", NULL, NULL, FALSE, FALSE},
-	{"Audio2Bitrate", NULL, NULL, FALSE, FALSE},
-	{"Audio2Encoder", NULL, NULL, FALSE, FALSE},
-	{"Audio2Mixdown", NULL, NULL, FALSE, FALSE},
-	{"Audio2Samplerate", NULL, NULL, FALSE, FALSE},
-	{"Audio2Track", NULL, NULL, FALSE, FALSE},
-	{"Audio2TrackDescription", NULL, NULL, FALSE, FALSE},
-	{"Audio2TrackDRCSlider", NULL, NULL, FALSE, FALSE},
-	{"ChapterMarkers", NULL, NULL, TRUE, FALSE},
-	{"Default", NULL, NULL, TRUE, FALSE},
-	{"FileFormat", NULL, NULL, TRUE, FALSE},
-	{"Folder", NULL, NULL, TRUE, FALSE},
-	{"Mp4HttpOptimize", NULL, NULL, TRUE, FALSE},
-	{"Mp4iPodCompatible", NULL, NULL, TRUE, FALSE},
-	{"Mp4LargeFile", NULL, NULL, TRUE, FALSE},
-	{"PictureAutoCrop", NULL, NULL, TRUE, FALSE},
-	{"PictureBottomCrop", NULL, NULL, TRUE, FALSE},
-	{"PictureDeblock", NULL, NULL, TRUE, FALSE},
-	{"PictureDecomb", NULL, NULL, TRUE, FALSE},
-	{"PictureDeinterlace", NULL, NULL, TRUE, FALSE},
-	{"PictureDenoise", NULL, NULL, TRUE, FALSE},
-	{"PictureDetelecine", NULL, NULL, TRUE, FALSE},
-	{"PictureHeight", NULL, NULL, TRUE, FALSE},
-	{"PictureKeepRatio", NULL, NULL, TRUE, FALSE},
-	{"PictureLeftCrop", NULL, NULL, TRUE, FALSE},
-	{"PicturePAR", NULL, NULL, TRUE, FALSE},
-	{"PictureRightCrop", NULL, NULL, TRUE, FALSE},
-	{"PictureTopCrop", NULL, NULL, TRUE, FALSE},
-	{"PictureWidth", NULL, NULL, TRUE, FALSE},
-	{"PresetDescription", NULL, NULL, TRUE, FALSE},
-	{"PresetName", NULL, NULL, TRUE, FALSE},
-	{"Subtitles", NULL, NULL, TRUE, FALSE},
-	{"SubtitlesForced", NULL, NULL, TRUE, FALSE},
-	{"Type", NULL, NULL, TRUE, FALSE},
-	{"UsesMaxPictureSettings", NULL, NULL, TRUE, FALSE},
-	{"UsesPictureFilters", NULL, NULL, TRUE, FALSE},
-	{"UsesPictureSettings", NULL, NULL, TRUE, FALSE},
-	{"VFR", NULL, NULL, FALSE, TRUE},
-	{"VideoAvgBitrate", NULL, NULL, TRUE, FALSE},
-	{"VideoEncoder", NULL, NULL, TRUE, FALSE},
-	{"VideoFramerate", NULL, NULL, TRUE, FALSE},
-	{"VideoGrayScale", NULL, NULL, TRUE, FALSE},
-	{"VideoQualitySlider", NULL, NULL, TRUE, FALSE},
-	{"VideoQualityType", NULL, NULL, TRUE, FALSE},
-	{"VideoTargetSize", NULL, NULL, TRUE, FALSE},
-	{"VideoTwoPass", NULL, NULL, TRUE, FALSE},
-	{"VideoTurboTwoPass", NULL, NULL, TRUE, FALSE},
-	{"x264Option", NULL, NULL, TRUE, FALSE},
-	{NULL, NULL}
+    {"Audio1Bitrate", NULL, NULL, FALSE, FALSE},
+    {"Audio1Encoder", NULL, NULL, FALSE, FALSE},
+    {"Audio1Mixdown", NULL, NULL, FALSE, FALSE},
+    {"Audio1Samplerate", NULL, NULL, FALSE, FALSE},
+    {"Audio1Track", NULL, NULL, FALSE, FALSE},
+    {"Audio1TrackDescription", NULL, NULL, FALSE, FALSE},
+    {"Audio1TrackDRCSlider", NULL, NULL, FALSE, FALSE},
+    {"Audio2Bitrate", NULL, NULL, FALSE, FALSE},
+    {"Audio2Encoder", NULL, NULL, FALSE, FALSE},
+    {"Audio2Mixdown", NULL, NULL, FALSE, FALSE},
+    {"Audio2Samplerate", NULL, NULL, FALSE, FALSE},
+    {"Audio2Track", NULL, NULL, FALSE, FALSE},
+    {"Audio2TrackDescription", NULL, NULL, FALSE, FALSE},
+    {"Audio2TrackDRCSlider", NULL, NULL, FALSE, FALSE},
+    {"ChapterMarkers", NULL, NULL, TRUE, FALSE},
+    {"Default", NULL, NULL, TRUE, FALSE},
+    {"FileFormat", NULL, NULL, TRUE, FALSE},
+    {"Folder", NULL, NULL, TRUE, FALSE},
+    {"Mp4HttpOptimize", NULL, NULL, TRUE, FALSE},
+    {"Mp4iPodCompatible", NULL, NULL, TRUE, FALSE},
+    {"Mp4LargeFile", NULL, NULL, TRUE, FALSE},
+    {"PictureAutoCrop", NULL, NULL, TRUE, FALSE},
+    {"PictureBottomCrop", NULL, NULL, TRUE, FALSE},
+    {"PictureDeblock", NULL, NULL, TRUE, FALSE},
+    {"PictureDecomb", NULL, NULL, TRUE, FALSE},
+    {"PictureDeinterlace", NULL, NULL, TRUE, FALSE},
+    {"PictureDenoise", NULL, NULL, TRUE, FALSE},
+    {"PictureDetelecine", NULL, NULL, TRUE, FALSE},
+    {"PictureHeight", NULL, NULL, TRUE, FALSE},
+    {"PictureKeepRatio", NULL, NULL, TRUE, FALSE},
+    {"PictureLeftCrop", NULL, NULL, TRUE, FALSE},
+    {"PicturePAR", NULL, NULL, TRUE, FALSE},
+    {"PictureRightCrop", NULL, NULL, TRUE, FALSE},
+    {"PictureTopCrop", NULL, NULL, TRUE, FALSE},
+    {"PictureWidth", NULL, NULL, TRUE, FALSE},
+    {"PresetDescription", NULL, NULL, TRUE, FALSE},
+    {"PresetName", NULL, NULL, TRUE, FALSE},
+    {"Subtitles", NULL, NULL, TRUE, FALSE},
+    {"SubtitlesForced", NULL, NULL, TRUE, FALSE},
+    {"Type", NULL, NULL, TRUE, FALSE},
+    {"UsesMaxPictureSettings", NULL, NULL, TRUE, FALSE},
+    {"UsesPictureFilters", NULL, NULL, TRUE, FALSE},
+    {"UsesPictureSettings", NULL, NULL, TRUE, FALSE},
+    {"VFR", NULL, NULL, FALSE, TRUE},
+    {"VideoAvgBitrate", NULL, NULL, TRUE, FALSE},
+    {"VideoEncoder", NULL, NULL, TRUE, FALSE},
+    {"VideoFramerate", NULL, NULL, TRUE, FALSE},
+    {"VideoGrayScale", NULL, NULL, TRUE, FALSE},
+    {"VideoQualitySlider", NULL, NULL, TRUE, FALSE},
+    {"VideoQualityType", NULL, NULL, TRUE, FALSE},
+    {"VideoTargetSize", NULL, NULL, TRUE, FALSE},
+    {"VideoTwoPass", NULL, NULL, TRUE, FALSE},
+    {"VideoTurboTwoPass", NULL, NULL, TRUE, FALSE},
+    {"x264Option", NULL, NULL, TRUE, FALSE},
+    {NULL, NULL}
 };
 
 const gint
 key_xlat(key_map_t *key_map, const gchar *mac_key)
 {
-	gint ii;
-
-	for (ii = 0; key_map[ii].mac_key; ii++)
-	{
-		if (strcmp(mac_key, key_map[ii].mac_key) == 0)
-		{
-			if (key_map[ii].ignore)
-				return -1;
-			return ii;
-		}
-	}
-	g_warning("Unrecognized key: (%s)", mac_key);
-	return -1;
+    gint ii;
+
+    for (ii = 0; key_map[ii].mac_key; ii++)
+    {
+        if (strcmp(mac_key, key_map[ii].mac_key) == 0)
+        {
+            if (key_map[ii].ignore)
+                return -1;
+            return ii;
+        }
+    }
+    g_warning("Unrecognized key: (%s)", mac_key);
+    return -1;
 }
 
 static GValue*
 value_xlat(
-	GValue *defaults, 
-	key_map_t *key_map, 
-	gint key_index, 
-	GValue *mac_val)
+    GValue *defaults, 
+    key_map_t *key_map, 
+    gint key_index, 
+    GValue *mac_val)
 {
-	GValue *gval, *def_val;
-	const gchar *lin_key;
-	if (key_map[key_index].same)
-		lin_key = key_map[key_index].mac_key;
-	else
-		lin_key = key_map[key_index].lin_key;
-	value_map_t *value_map = key_map[key_index].value_map;
-
-	def_val = ghb_dict_lookup(defaults, lin_key);
-	if (def_val)
-	{
-		if (value_map)
-		{
-			gint ii;
-			gchar *str;
-			GValue *sval;
-
-			str = ghb_value_string(mac_val);
-			for (ii = 0; value_map[ii].mac_val; ii++)
-			{
-				if (strcmp(str, value_map[ii].mac_val) == 0)
-				{
-					sval = ghb_string_value_new(value_map[ii].lin_val);
-					g_free(str);
-					gval = ghb_value_new(G_VALUE_TYPE(def_val));
-					if (!g_value_transform(sval, gval))
-					{
-						g_warning("1 can't transform");
-						ghb_value_free(gval);
-						ghb_value_free(sval);
-						return NULL;
-					}
-					ghb_value_free(sval);
-					return gval;
-				}
-			}
-			g_warning("Can't map value: (%s)", str);
-			g_free(str);
-		}
-		else
-		{
-			gval = ghb_value_new(G_VALUE_TYPE(def_val));
-			if (!g_value_transform(mac_val, gval))
-			{
-				g_warning("2 can't transform");
-				ghb_value_free(gval);
-				return NULL;
-			}
-			return gval;
-		}
-	}
-	else
-	{
-		g_warning("Bad key: (%s)", lin_key);
-		return NULL;
-	}
-	return NULL;
+    GValue *gval, *def_val;
+    const gchar *lin_key;
+    if (key_map[key_index].same)
+        lin_key = key_map[key_index].mac_key;
+    else
+        lin_key = key_map[key_index].lin_key;
+    value_map_t *value_map = key_map[key_index].value_map;
+
+    def_val = ghb_dict_lookup(defaults, lin_key);
+    if (def_val)
+    {
+        if (value_map)
+        {
+            gint ii;
+            gchar *str;
+            GValue *sval;
+
+            str = ghb_value_string(mac_val);
+            for (ii = 0; value_map[ii].mac_val; ii++)
+            {
+                if (strcmp(str, value_map[ii].mac_val) == 0)
+                {
+                    sval = ghb_string_value_new(value_map[ii].lin_val);
+                    g_free(str);
+                    gval = ghb_value_new(G_VALUE_TYPE(def_val));
+                    if (!g_value_transform(sval, gval))
+                    {
+                        g_warning("1 can't transform");
+                        ghb_value_free(gval);
+                        ghb_value_free(sval);
+                        return NULL;
+                    }
+                    ghb_value_free(sval);
+                    return gval;
+                }
+            }
+            g_warning("Can't map value: (%s)", str);
+            g_free(str);
+        }
+        else
+        {
+            gval = ghb_value_new(G_VALUE_TYPE(def_val));
+            if (!g_value_transform(mac_val, gval))
+            {
+                g_warning("2 can't transform");
+                ghb_value_free(gval);
+                return NULL;
+            }
+            return gval;
+        }
+    }
+    else
+    {
+        g_warning("Bad key: (%s)", lin_key);
+        return NULL;
+    }
+    return NULL;
 }
 
 key_map_t audio_key_map[] =
 {
-	{"Audio1Bitrate", "AudioBitrate", NULL, FALSE, FALSE},
-	{"Audio1Encoder", "AudioEncoder", NULL, FALSE, FALSE},
-	{"Audio1Mixdown", "AudioMixdown", NULL, FALSE},
-	{"Audio1Samplerate", "AudioSamplerate", NULL, FALSE, FALSE},
-	{"Audio1Track", "AudioTrack", NULL, FALSE, FALSE},
-	{"Audio1TrackDescription", "AudioTrackDescription", NULL, FALSE, FALSE},
-	{"Audio1TrackDRCSlider", "AudioTrackDRCSlider", NULL, FALSE, FALSE},
-	{"Audio2Bitrate", "AudioBitrate", NULL, FALSE, FALSE},
-	{"Audio2Encoder", "AudioEncoder", NULL, FALSE, FALSE},
-	{"Audio2Mixdown", "AudioMixdown", NULL, FALSE, FALSE},
-	{"Audio2Samplerate", "AudioSamplerate", NULL, FALSE, FALSE},
-	{"Audio2Track", "AudioTrack", NULL, FALSE, FALSE},
-	{"Audio2TrackDescription", "AudioTrackDescription", NULL, FALSE, FALSE},
-	{"Audio2TrackDRCSlider", "AudioTrackDRCSlider", NULL, FALSE, FALSE},
-	{NULL, NULL}
+    {"Audio1Bitrate", "AudioBitrate", NULL, FALSE, FALSE},
+    {"Audio1Encoder", "AudioEncoder", NULL, FALSE, FALSE},
+    {"Audio1Mixdown", "AudioMixdown", NULL, FALSE},
+    {"Audio1Samplerate", "AudioSamplerate", NULL, FALSE, FALSE},
+    {"Audio1Track", "AudioTrack", NULL, FALSE, FALSE},
+    {"Audio1TrackDescription", "AudioTrackDescription", NULL, FALSE, FALSE},
+    {"Audio1TrackDRCSlider", "AudioTrackDRCSlider", NULL, FALSE, FALSE},
+    {"Audio2Bitrate", "AudioBitrate", NULL, FALSE, FALSE},
+    {"Audio2Encoder", "AudioEncoder", NULL, FALSE, FALSE},
+    {"Audio2Mixdown", "AudioMixdown", NULL, FALSE, FALSE},
+    {"Audio2Samplerate", "AudioSamplerate", NULL, FALSE, FALSE},
+    {"Audio2Track", "AudioTrack", NULL, FALSE, FALSE},
+    {"Audio2TrackDescription", "AudioTrackDescription", NULL, FALSE, FALSE},
+    {"Audio2TrackDRCSlider", "AudioTrackDRCSlider", NULL, FALSE, FALSE},
+    {NULL, NULL}
 };
 
 static void
 hard_value_xlat(GValue *lin_dict, const gchar *mac_key, GValue *mac_val)
 {
-	{
-		gint key_index;
-		GValue *audio_defaults;
-
-		audio_defaults = ghb_array_get_nth(
-			ghb_dict_lookup(defaults, "AudioList"), 0);
-		key_index = key_xlat(audio_key_map, mac_key);
-		if (key_index >= 0)
-		{
-			gint audio_index, count, ii;
-			GValue *alist, *adict, *val;
-			const gchar *lin_key;
-
-			if (audio_key_map[key_index].same)
-				lin_key = audio_key_map[key_index].mac_key;
-			else
-				lin_key = audio_key_map[key_index].lin_key;
-			audio_index = mac_key[5] - '1';
-			alist = ghb_dict_lookup(lin_dict, "AudioList");
-			if (alist == NULL)
-			{
-				alist = ghb_array_value_new(8);
-				ghb_dict_insert(lin_dict, "AudioList", alist);
-			}
-			count = ghb_array_len(alist);
-			for (ii = count; ii <= audio_index; ii++)
-			{
-				adict = ghb_value_dup(audio_defaults);
-				ghb_array_append(alist, adict);
-			}
-			adict = ghb_array_get_nth(alist, audio_index);
-			val = value_xlat(audio_defaults, audio_key_map, key_index, mac_val);
-			if (val)
-			{
-				ghb_dict_insert(adict, g_strdup(lin_key), val);
-			}
-		}
-	}
+    {
+        gint key_index;
+        GValue *audio_defaults;
+
+        audio_defaults = ghb_array_get_nth(
+            ghb_dict_lookup(defaults, "AudioList"), 0);
+        key_index = key_xlat(audio_key_map, mac_key);
+        if (key_index >= 0)
+        {
+            gint audio_index, count, ii;
+            GValue *alist, *adict, *val;
+            const gchar *lin_key;
+
+            if (audio_key_map[key_index].same)
+                lin_key = audio_key_map[key_index].mac_key;
+            else
+                lin_key = audio_key_map[key_index].lin_key;
+            audio_index = mac_key[5] - '1';
+            alist = ghb_dict_lookup(lin_dict, "AudioList");
+            if (alist == NULL)
+            {
+                alist = ghb_array_value_new(8);
+                ghb_dict_insert(lin_dict, "AudioList", alist);
+            }
+            count = ghb_array_len(alist);
+            for (ii = count; ii <= audio_index; ii++)
+            {
+                adict = ghb_value_dup(audio_defaults);
+                ghb_array_append(alist, adict);
+            }
+            adict = ghb_array_get_nth(alist, audio_index);
+            val = value_xlat(audio_defaults, audio_key_map, key_index, mac_val);
+            if (val)
+            {
+                ghb_dict_insert(adict, g_strdup(lin_key), val);
+            }
+        }
+    }
 }
 
 static void
@@ -514,114 +514,114 @@
     ghb_dict_iter_init(&iter, mac_dict);
     // middle (void*) cast prevents gcc warning "defreferencing type-punned
     // pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&mac_val))
-	{
-		gint key_index;
-
-		key_index = key_xlat(key_map, key);
-		if (key_index >= 0)
-		{ // The simple translations
-			const gchar *lin_key;
-
-			if (key_map[key_index].same)
-				lin_key = key_map[key_index].mac_key;
-			else
-				lin_key = key_map[key_index].lin_key;
-			if (lin_key)
-			{
-				val = value_xlat(defaults, key_map, key_index, mac_val);
-				if (val)
-				{
-					ghb_dict_insert(lin_dict, g_strdup(lin_key), val);
-				}
-			}
-			else
-			{
-				hard_value_xlat(lin_dict, key, mac_val);
-			}
-		}
-	}
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&mac_val))
+    {
+        gint key_index;
+
+        key_index = key_xlat(key_map, key);
+        if (key_index >= 0)
+        { // The simple translations
+            const gchar *lin_key;
+
+            if (key_map[key_index].same)
+                lin_key = key_map[key_index].mac_key;
+            else
+                lin_key = key_map[key_index].lin_key;
+            if (lin_key)
+            {
+                val = value_xlat(defaults, key_map, key_index, mac_val);
+                if (val)
+                {
+                    ghb_dict_insert(lin_dict, g_strdup(lin_key), val);
+                }
+            }
+            else
+            {
+                hard_value_xlat(lin_dict, key, mac_val);
+            }
+        }
+    }
 }
 
 static void
 parse_preset_array(GValue *mac_array, GValue *lin_array)
 {
-	gint count, ii;
-	GValue *mac_dict, *lin_dict, *gval;
-
-	count = ghb_array_len(mac_array);
-	for (ii = 0; ii < count; ii++)
-	{
-		mac_dict = ghb_array_get_nth(mac_array, ii);
-		
-		// Only process builtin types
-		if (ghb_value_int(ghb_dict_lookup(mac_dict, "Type")) != 0)
-			continue;
-
-		lin_dict = ghb_dict_value_new();
-		ghb_array_append(lin_array, lin_dict);
-		gval = ghb_dict_lookup(mac_dict, "PresetName");
-		if (gval)
-		{
-			ghb_dict_insert(lin_dict, g_strdup("PresetName"), 
-							ghb_value_dup(gval));
-		}
-		gval = ghb_dict_lookup(mac_dict, "PresetDescription");
-		if (gval)
-		{
-			ghb_dict_insert(lin_dict, g_strdup("PresetDescription"), 
-							ghb_value_dup(gval));
-		}
-		gval = ghb_dict_lookup(mac_dict, "Folder");
-		if (gval && ghb_value_boolean(gval))
-		{ // Folder
-			GValue *mval, *lval;
-
-			mval = ghb_dict_lookup(mac_dict, "ChildrenArray");
-			lval = ghb_array_value_new(32);
-			ghb_dict_insert(lin_dict, g_strdup("ChildrenArray"), lval);
-			ghb_dict_insert(lin_dict, g_strdup("Folder"), 
-							ghb_boolean_value_new(TRUE));
-			ghb_dict_insert(lin_dict, g_strdup("Type"), 
-							ghb_int_value_new(0));
-			parse_preset_array(mval, lval);
-		}
-		else
-		{ // Normal preset
-			ghb_dict_insert(lin_dict, g_strdup("Type"), 
-							ghb_int_value_new(0));
-			parse_preset_dict(mac_dict, lin_dict);
-		}
-	}
+    gint count, ii;
+    GValue *mac_dict, *lin_dict, *gval;
+
+    count = ghb_array_len(mac_array);
+    for (ii = 0; ii < count; ii++)
+    {
+        mac_dict = ghb_array_get_nth(mac_array, ii);
+        
+        // Only process builtin types
+        if (ghb_value_int(ghb_dict_lookup(mac_dict, "Type")) != 0)
+            continue;
+
+        lin_dict = ghb_dict_value_new();
+        ghb_array_append(lin_array, lin_dict);
+        gval = ghb_dict_lookup(mac_dict, "PresetName");
+        if (gval)
+        {
+            ghb_dict_insert(lin_dict, g_strdup("PresetName"), 
+                            ghb_value_dup(gval));
+        }
+        gval = ghb_dict_lookup(mac_dict, "PresetDescription");
+        if (gval)
+        {
+            ghb_dict_insert(lin_dict, g_strdup("PresetDescription"), 
+                            ghb_value_dup(gval));
+        }
+        gval = ghb_dict_lookup(mac_dict, "Folder");
+        if (gval && ghb_value_boolean(gval))
+        { // Folder
+            GValue *mval, *lval;
+
+            mval = ghb_dict_lookup(mac_dict, "ChildrenArray");
+            lval = ghb_array_value_new(32);
+            ghb_dict_insert(lin_dict, g_strdup("ChildrenArray"), lval);
+            ghb_dict_insert(lin_dict, g_strdup("Folder"), 
+                            ghb_boolean_value_new(TRUE));
+            ghb_dict_insert(lin_dict, g_strdup("Type"), 
+                            ghb_int_value_new(0));
+            parse_preset_array(mval, lval);
+        }
+        else
+        { // Normal preset
+            ghb_dict_insert(lin_dict, g_strdup("Type"), 
+                            ghb_int_value_new(0));
+            parse_preset_dict(mac_dict, lin_dict);
+        }
+    }
 }
 
 static void
 xlat(GValue *mac, GValue *lin)
 {
-	return parse_preset_array(mac, lin);
+    return parse_preset_array(mac, lin);
 }
 
 gint
 main(gint argc, gchar *argv[])
 {
-	GValue *mac_plist, *lin_plist;
-	GValue *internal;
-
-	if (argc < 3)
-	{
-		fprintf(stderr, "Usage: <mac plist> <lin plist>\n");
-		return 1;
-	}
-	g_type_init();
-
-	ghb_register_transforms();
-	internal = ghb_plist_parse_file("internal_defaults.xml");
-	defaults = ghb_dict_lookup(internal, "Presets");
-	mac_plist = ghb_plist_parse_file(argv[1]);
-	lin_plist = ghb_array_value_new(32);
-	xlat(mac_plist, lin_plist);
-	ghb_plist_write_file(argv[2], lin_plist);
-	return 0;
+    GValue *mac_plist, *lin_plist;
+    GValue *internal;
+
+    if (argc < 3)
+    {
+        fprintf(stderr, "Usage: <mac plist> <lin plist>\n");
+        return 1;
+    }
+    g_type_init();
+
+    ghb_register_transforms();
+    internal = ghb_plist_parse_file("internal_defaults.xml");
+    defaults = ghb_dict_lookup(internal, "Presets");
+    mac_plist = ghb_plist_parse_file(argv[1]);
+    lin_plist = ghb_array_value_new(32);
+    xlat(mac_plist, lin_plist);
+    ghb_plist_write_file(argv[2], lin_plist);
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/presets.c -> HandBrake-0.9.9.tar.bz2/gtk/src/presets.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * presets.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * presets.c is free software.
  * 
@@ -36,8 +36,8 @@
 
 enum
 {
-	PRESETS_BUILTIN = 0,
-	PRESETS_CUSTOM
+    PRESETS_BUILTIN = 0,
+    PRESETS_CUSTOM
 };
 
 static GValue *presetsPlist = NULL;
@@ -53,891 +53,919 @@
 gint
 preset_path_cmp(gint *indices1, gint len1, gint *indices2, gint len2)
 {
-	gint ii;
-	for (ii = 0; ii < len1 && ii < len2; ii++)
-	{
-		if (indices1[ii] != indices2[ii])
-			return indices1[ii] - indices2[ii];
-	}
-	return len1 - len2;
+    gint ii;
+    for (ii = 0; ii < len1 && ii < len2; ii++)
+    {
+        if (indices1[ii] != indices2[ii])
+            return indices1[ii] - indices2[ii];
+    }
+    return len1 - len2;
 }
 
 // This only handle limited depth
 GtkTreePath*
 ghb_tree_path_new_from_indices(gint *indices, gint len)
 {
-	switch (len)
-	{
-		case 1:
-			return gtk_tree_path_new_from_indices(
-				indices[0], -1);
-		case 2:
-			return gtk_tree_path_new_from_indices(
-				indices[0], indices[1], -1);
-		case 3:
-			return gtk_tree_path_new_from_indices(
-				indices[0], indices[1], indices[2], -1);
-		case 4:
-			return gtk_tree_path_new_from_indices(
-				indices[0], indices[1], indices[2], indices[3], -1);
-		case 5:
-			return gtk_tree_path_new_from_indices(
-				indices[0], indices[1], indices[2], indices[3], indices[4], -1);
-		default:
-			return NULL;
-	}
+    switch (len)
+    {
+        case 1:
+            return gtk_tree_path_new_from_indices(
+                indices[0], -1);
+        case 2:
+            return gtk_tree_path_new_from_indices(
+                indices[0], indices[1], -1);
+        case 3:
+            return gtk_tree_path_new_from_indices(
+                indices[0], indices[1], indices[2], -1);
+        case 4:
+            return gtk_tree_path_new_from_indices(
+                indices[0], indices[1], indices[2], indices[3], -1);
+        case 5:
+            return gtk_tree_path_new_from_indices(
+                indices[0], indices[1], indices[2], indices[3], indices[4], -1);
+        default:
+            return NULL;
+    }
 }
 
 GValue*
 ghb_parse_preset_path(const gchar *path)
 {
-	gchar **split;
-	GValue *preset;
-	gint ii;
-
-	preset = ghb_array_value_new(MAX_NESTED_PRESET);
-	split = g_strsplit(path, "#", MAX_NESTED_PRESET);
-	for (ii = 0; split[ii] != NULL; ii++)
-	{
-		ghb_array_append(preset, ghb_string_value_new(split[ii]));
-	}
-	g_strfreev(split);
-	return preset;
+    gchar **split;
+    GValue *preset;
+    gint ii;
+
+    preset = ghb_array_value_new(MAX_NESTED_PRESET);
+    split = g_strsplit(path, "#", MAX_NESTED_PRESET);
+    for (ii = 0; split[ii] != NULL; ii++)
+    {
+        ghb_array_append(preset, ghb_string_value_new(split[ii]));
+    }
+    g_strfreev(split);
+    return preset;
 }
 
 static GValue*
 preset_path_from_indices(GValue *presets, gint *indices, gint len)
 {
-	gint ii;
-	GValue *path;
+    gint ii;
+    GValue *path;
 
-	g_debug("preset_path_from_indices");
-	path = ghb_array_value_new(MAX_NESTED_PRESET);
-	for (ii = 0; ii < len; ii++)
-	{
-		GValue *dict;
-		gint count, folder;
-		const GValue *name;
-
-		count = ghb_array_len(presets);
-		if (indices[ii] >= count) break;
-		dict = ghb_array_get_nth(presets, indices[ii]);
-		name = ghb_dict_lookup(dict, "PresetName");
-		if (name)
-			ghb_array_append(path, ghb_value_dup(name));
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (!folder)
-			break;
-		presets = ghb_dict_lookup(dict, "ChildrenArray");
-	}
-	return path;
+    g_debug("preset_path_from_indices");
+    path = ghb_array_value_new(MAX_NESTED_PRESET);
+    for (ii = 0; ii < len; ii++)
+    {
+        GValue *dict;
+        gint count, folder;
+        const GValue *name;
+
+        count = ghb_array_len(presets);
+        if (indices[ii] >= count) break;
+        dict = ghb_array_get_nth(presets, indices[ii]);
+        name = ghb_dict_lookup(dict, "PresetName");
+        if (name)
+            ghb_array_append(path, ghb_value_dup(name));
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (!folder)
+            break;
+        presets = ghb_dict_lookup(dict, "ChildrenArray");
+    }
+    return path;
 }
 
 gchar*
 ghb_preset_path_string(const GValue *path)
 {
-	gint count, ii;
-	GString *gstr;
-	GValue *val;
-	gchar *str;
-
-	gstr = g_string_new("");
-	if (path != NULL)
-	{
-		count = ghb_array_len(path);
-		for (ii = 0; ii < count; ii++)
-		{
-			val = ghb_array_get_nth(path, ii);
-			str = ghb_value_string(val);
-			g_string_append(gstr, str);
-			if (ii < count-1)
-				g_string_append(gstr, "->");
-			g_free(str);
-		}
-	}
-	str = g_string_free(gstr, FALSE);
-	return str;
+    gint count, ii;
+    GString *gstr;
+    GValue *val;
+    gchar *str;
+
+    gstr = g_string_new("");
+    if (path != NULL)
+    {
+        count = ghb_array_len(path);
+        for (ii = 0; ii < count; ii++)
+        {
+            val = ghb_array_get_nth(path, ii);
+            str = ghb_value_string(val);
+            g_string_append(gstr, str);
+            if (ii < count-1)
+                g_string_append(gstr, "->");
+            g_free(str);
+        }
+    }
+    str = g_string_free(gstr, FALSE);
+    return str;
 }
 
 void
 dump_preset_path(const gchar *msg, const GValue *path)
 {
-	gchar *str;
+    gchar *str;
 
-	if (path)
-		debug_show_type (G_VALUE_TYPE(path));
-	str = ghb_preset_path_string(path);
-	g_message("%s path: (%s)", msg, str);
-	g_free(str);
+    if (path)
+        debug_show_type (G_VALUE_TYPE(path));
+    str = ghb_preset_path_string(path);
+    g_message("%s path: (%s)", msg, str);
+    g_free(str);
 }
 
 void
 dump_preset_indices(const gchar *msg, gint *indices, gint len)
 {
-	gint ii;
+    gint ii;
 
-	g_message("%s indices: len %d", msg, len);
-	for (ii = 0; ii < len; ii++)
-	{
-		printf("%d ", indices[ii]);
-	}
-	printf("\n");
+    g_message("%s indices: len %d", msg, len);
+    for (ii = 0; ii < len; ii++)
+    {
+        printf("%d ", indices[ii]);
+    }
+    printf("\n");
 }
 
 #if 0
 static gint
 preset_path_cmp(const GValue *path1, const GValue *path2)
 {
-	gint count, ii;
-	GValue *val;
-	gchar *str1, *str2;
-	gint result;
-
-	count = ghb_array_len(path1);
-	ii = ghb_array_len(path2);
-	if (ii != count)
-		return ii - count;
-	for (ii = 0; ii < count; ii++)
-	{
-		val = ghb_array_get_nth(path1, ii);
-		str1 = ghb_value_string(val);
-		val = ghb_array_get_nth(path2, ii);
-		str2 = ghb_value_string(val);
-		result = strcmp(str1, str2);
-		if (result != 0)
-			return result;
-		g_free(str1);
-		g_free(str2);
-	}
-	return 0;
+    gint count, ii;
+    GValue *val;
+    gchar *str1, *str2;
+    gint result;
+
+    count = ghb_array_len(path1);
+    ii = ghb_array_len(path2);
+    if (ii != count)
+        return ii - count;
+    for (ii = 0; ii < count; ii++)
+    {
+        val = ghb_array_get_nth(path1, ii);
+        str1 = ghb_value_string(val);
+        val = ghb_array_get_nth(path2, ii);
+        str2 = ghb_value_string(val);
+        result = strcmp(str1, str2);
+        if (result != 0)
+            return result;
+        g_free(str1);
+        g_free(str2);
+    }
+    return 0;
 }
 #endif
 
 static GValue*
 presets_get_dict(GValue *presets, gint *indices, gint len)
 {
-	gint ii, count, folder;
-	GValue *dict = NULL;
+    gint ii, count, folder;
+    GValue *dict = NULL;
 
-	g_debug("presets_get_dict ()");
-	for (ii = 0; ii < len; ii++)
-	{
-		count = ghb_array_len(presets);
-		if (indices[ii] >= count) return NULL;
-		dict = ghb_array_get_nth(presets, indices[ii]);
-		if (ii < len-1)
-		{
-			folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-			if (!folder)
-				return NULL;
-			presets = ghb_dict_lookup(dict, "ChildrenArray");
-		}
-	}
-	if (ii < len)
-		return NULL;
-	return dict;
+    g_debug("presets_get_dict ()");
+    for (ii = 0; ii < len; ii++)
+    {
+        count = ghb_array_len(presets);
+        if (indices[ii] >= count) return NULL;
+        dict = ghb_array_get_nth(presets, indices[ii]);
+        if (ii < len-1)
+        {
+            folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+            if (!folder)
+                return NULL;
+            presets = ghb_dict_lookup(dict, "ChildrenArray");
+        }
+    }
+    if (ii < len)
+        return NULL;
+    return dict;
 }
 
 static GValue*
 presets_get_folder(GValue *presets, gint *indices, gint len)
 {
-	gint ii, count, folder;
-	GValue *dict;
+    gint ii, count, folder;
+    GValue *dict;
 
-	g_debug("presets_get_folder ()");
-	for (ii = 0; ii < len; ii++)
-	{
-		count = ghb_array_len(presets);
-		if (indices[ii] >= count) return NULL;
-		dict = ghb_array_get_nth(presets, indices[ii]);
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (!folder)
-			break;
-		presets = ghb_dict_lookup(dict, "ChildrenArray");
-	}
-	if (ii < len)
-		return NULL;
-	return presets;
+    g_debug("presets_get_folder ()");
+    for (ii = 0; ii < len; ii++)
+    {
+        count = ghb_array_len(presets);
+        if (indices[ii] >= count) return NULL;
+        dict = ghb_array_get_nth(presets, indices[ii]);
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (!folder)
+            break;
+        presets = ghb_dict_lookup(dict, "ChildrenArray");
+    }
+    if (ii < len)
+        return NULL;
+    return presets;
 }
 
 static GValue*
 plist_get_dict(GValue *presets, const gchar *name)
 {
-	if (presets == NULL || name == NULL) return NULL;
-	return ghb_dict_lookup(presets, name);
+    if (presets == NULL || name == NULL) return NULL;
+    return ghb_dict_lookup(presets, name);
 }
 
 static const gchar*
 preset_get_name(GValue *dict)
 {
-	return g_value_get_string(preset_dict_get_value(dict, "PresetName"));
+    return g_value_get_string(preset_dict_get_value(dict, "PresetName"));
 }
 
 static gboolean
 preset_folder_is_open(GValue *dict)
 {
-	const GValue *gval;
+    const GValue *gval;
 
-	gval = preset_dict_get_value(dict, "FolderOpen");
-	if (gval != NULL)
-		return g_value_get_boolean(gval);
-	return FALSE;
+    gval = preset_dict_get_value(dict, "FolderOpen");
+    if (gval != NULL)
+        return g_value_get_boolean(gval);
+    return FALSE;
 }
 
 gboolean
 ghb_preset_folder(GValue *dict)
 {
-	return ghb_value_int(preset_dict_get_value(dict, "Folder"));
+    return ghb_value_int(preset_dict_get_value(dict, "Folder"));
 }
 
 gint
 ghb_preset_type(GValue *dict)
 {
-	return ghb_value_int(preset_dict_get_value(dict, "Type"));
+    return ghb_value_int(preset_dict_get_value(dict, "Type"));
 }
 
 static void
 presets_remove_nth(GValue *presets, gint pos)
 {
-	GValue *dict;
-	gint count;
-	
-	if (presets == NULL || pos < 0) return;
-	count = ghb_array_len(presets);
-	if (pos >= count) return;
-	dict = ghb_array_get_nth(presets, pos);
-	ghb_array_remove(presets, pos);
-	ghb_value_free(dict);
+    GValue *dict;
+    gint count;
+    
+    if (presets == NULL || pos < 0) return;
+    count = ghb_array_len(presets);
+    if (pos >= count) return;
+    dict = ghb_array_get_nth(presets, pos);
+    ghb_array_remove(presets, pos);
+    ghb_value_free(dict);
 }
 
 gboolean
 ghb_presets_remove(
-	GValue *presets, 
-	gint *indices,
-	gint len)
-{
-	GValue *folder = NULL;
-
-	folder = presets_get_folder(presets, indices, len-1);
-	if (folder)
-		presets_remove_nth(folder, indices[len-1]);
-	else
-	{
-		g_warning("ghb_presets_remove (): internal preset lookup error");
-		return FALSE;
-	}
-	return TRUE;
+    GValue *presets, 
+    gint *indices,
+    gint len)
+{
+    GValue *folder = NULL;
+
+    folder = presets_get_folder(presets, indices, len-1);
+    if (folder)
+        presets_remove_nth(folder, indices[len-1]);
+    else
+    {
+        g_warning("ghb_presets_remove (): internal preset lookup error");
+        return FALSE;
+    }
+    return TRUE;
 }
 
 static void
 ghb_presets_replace(
-	GValue *presets, 
-	GValue *dict,
-	gint *indices,
-	gint len)
-{
-	GValue *folder = NULL;
-
-	folder = presets_get_folder(presets, indices, len-1);
-	if (folder)
-		ghb_array_replace(folder, indices[len-1], dict);
-	else
-	{
-		g_warning("ghb_presets_replace (): internal preset lookup error");
-	}
+    GValue *presets, 
+    GValue *dict,
+    gint *indices,
+    gint len)
+{
+    GValue *folder = NULL;
+
+    folder = presets_get_folder(presets, indices, len-1);
+    if (folder)
+        ghb_array_replace(folder, indices[len-1], dict);
+    else
+    {
+        g_warning("ghb_presets_replace (): internal preset lookup error");
+    }
 }
 
 static void
 ghb_presets_insert(
-	GValue *presets, 
-	GValue *dict,
-	gint *indices,
-	gint len)
-{
-	GValue *folder = NULL;
-
-	folder = presets_get_folder(presets, indices, len-1);
-	if (folder)
-		ghb_array_insert(folder, indices[len-1], dict);
-	else
-	{
-		g_warning("ghb_presets_insert (): internal preset lookup error");
-	}
+    GValue *presets, 
+    GValue *dict,
+    gint *indices,
+    gint len)
+{
+    GValue *folder = NULL;
+
+    folder = presets_get_folder(presets, indices, len-1);
+    if (folder)
+        ghb_array_insert(folder, indices[len-1], dict);
+    else
+    {
+        g_warning("ghb_presets_insert (): internal preset lookup error");
+    }
 }
 
 static gint
 presets_find_element(GValue *presets, const gchar *name)
 {
-	GValue *dict;
-	gint count, ii;
-	
-	g_debug("presets_find_element () (%s)", name);
-	if (presets == NULL || name == NULL) return -1;
-	count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		const gchar *str;
-		dict = ghb_array_get_nth(presets, ii);
-		str = preset_get_name(dict);
-		if (strcmp(name, str) == 0)
-		{
-			return ii;
-		}
-	}
-	return -1;
+    GValue *dict;
+    gint count, ii;
+    
+    g_debug("presets_find_element () (%s)", name);
+    if (presets == NULL || name == NULL) return -1;
+    count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        const gchar *str;
+        dict = ghb_array_get_nth(presets, ii);
+        str = preset_get_name(dict);
+        if (strcmp(name, str) == 0)
+        {
+            return ii;
+        }
+    }
+    return -1;
 }
 
 static gint
 single_find_pos(GValue *presets, const gchar *name, gint type)
 {
-	GValue *dict;
-	gint count, ii, ptype, last;
-	
-	if (presets == NULL || name == NULL) return -1;
-	last = count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		const gchar *str;
-		dict = ghb_array_get_nth(presets, ii);
-		str = preset_get_name(dict);
-		ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
-		if (strcasecmp(name, str) <= 0 && ptype == type)
-		{
-			return ii;
-		}
-		if (ptype == type)
-			last = ii+1;
-	}
-	return last;
+    GValue *dict;
+    gint count, ii, ptype, last;
+    
+    if (presets == NULL || name == NULL) return -1;
+    last = count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        const gchar *str;
+        dict = ghb_array_get_nth(presets, ii);
+        str = preset_get_name(dict);
+        ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
+        if (strcasecmp(name, str) <= 0 && ptype == type)
+        {
+            return ii;
+        }
+        if (ptype == type)
+            last = ii+1;
+    }
+    return last;
 }
 
 static gint*
 presets_find_pos(const GValue *path, gint type, gint *len)
 {
-	GValue *nested;
-	GValue *val;
-	gint count, ii;
-	gboolean folder;
-	gint *indices = NULL;
-	const gchar *name;
-	GValue *dict;
-
-	g_debug("presets_find_pos () ");
-	nested = presetsPlist;
-	count = ghb_array_len(path);
-	indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint));
-	for (ii = 0; ii < count-1; ii++)
-	{
-		val = ghb_array_get_nth(path, ii);
-		name = g_value_get_string(val);
-		indices[ii] = presets_find_element(nested, name);
-		if (indices[ii] == -1) {
-			g_free(indices);
-			return NULL;
-		}
-		dict = ghb_array_get_nth(nested, indices[ii]);
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		nested = NULL;
-		if (!folder)
-			break;
-		nested = ghb_dict_lookup(dict, "ChildrenArray");
-	}
-	if (nested)
-	{
-		const gchar *name;
-
-		name = g_value_get_string(ghb_array_get_nth(path, count-1));
-		indices[ii] = single_find_pos(nested, name, type);
-		ii++;
-	}
-	*len = ii;
-	return indices;
+    GValue *nested;
+    GValue *val;
+    gint count, ii;
+    gboolean folder;
+    gint *indices = NULL;
+    const gchar *name;
+    GValue *dict;
+
+    g_debug("presets_find_pos () ");
+    nested = presetsPlist;
+    count = ghb_array_len(path);
+    indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint));
+    for (ii = 0; ii < count-1; ii++)
+    {
+        val = ghb_array_get_nth(path, ii);
+        name = g_value_get_string(val);
+        indices[ii] = presets_find_element(nested, name);
+        if (indices[ii] == -1) {
+            g_free(indices);
+            return NULL;
+        }
+        dict = ghb_array_get_nth(nested, indices[ii]);
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        nested = NULL;
+        if (!folder)
+            break;
+        nested = ghb_dict_lookup(dict, "ChildrenArray");
+    }
+    if (nested)
+    {
+        const gchar *name;
+
+        name = g_value_get_string(ghb_array_get_nth(path, count-1));
+        indices[ii] = single_find_pos(nested, name, type);
+        ii++;
+    }
+    *len = ii;
+    return indices;
 }
 
 static gint
 preset_tree_depth(GValue *dict)
 {
-	gboolean folder;
+    gboolean folder;
 
-	folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-	if (folder)
-	{
-		gint depth = 0;
-		gint count, ii;
-		GValue *presets;
-
-		presets = ghb_dict_lookup(dict, "ChildrenArray");
-		count = ghb_array_len(presets);
-		for (ii = 0; ii < count; ii++)
-		{
-			gint tmp;
-
-			dict = ghb_array_get_nth(presets, ii);
-			tmp = preset_tree_depth(dict);
-			depth = MAX(depth, tmp);
-		}
-		return depth + 1;
-	}
-	else
-	{
-		return 1;
-	}
+    folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+    if (folder)
+    {
+        gint depth = 0;
+        gint count, ii;
+        GValue *presets;
+
+        presets = ghb_dict_lookup(dict, "ChildrenArray");
+        count = ghb_array_len(presets);
+        for (ii = 0; ii < count; ii++)
+        {
+            gint tmp;
+
+            dict = ghb_array_get_nth(presets, ii);
+            tmp = preset_tree_depth(dict);
+            depth = MAX(depth, tmp);
+        }
+        return depth + 1;
+    }
+    else
+    {
+        return 1;
+    }
 }
 
 static gboolean
 preset_is_default(GValue *dict)
 {
-	const GValue *val;
+    const GValue *val;
 
-	val = preset_dict_get_value(dict, "Default");
-	return ghb_value_boolean(val);
+    val = preset_dict_get_value(dict, "Default");
+    return ghb_value_boolean(val);
 }
 
 static void
 presets_clear_default(GValue *presets)
 {
-	gint count, ii;
+    gint count, ii;
 
-	count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *dict;
-		gboolean folder;
-
-		dict = ghb_array_get_nth(presets, ii);
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (folder)
-		{
-			GValue *nested;
-
-			nested = ghb_dict_lookup(dict, "ChildrenArray");
-			presets_clear_default(nested);
-		}
-		else
-		{
-			if (preset_is_default(dict))
-			{
-				ghb_dict_insert(dict, g_strdup("Default"), 
-								ghb_boolean_value_new(FALSE));
-			}
-		}
-	}
+    count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *dict;
+        gboolean folder;
+
+        dict = ghb_array_get_nth(presets, ii);
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (folder)
+        {
+            GValue *nested;
+
+            nested = ghb_dict_lookup(dict, "ChildrenArray");
+            presets_clear_default(nested);
+        }
+        else
+        {
+            if (preset_is_default(dict))
+            {
+                ghb_dict_insert(dict, g_strdup("Default"), 
+                                ghb_boolean_value_new(FALSE));
+            }
+        }
+    }
 }
 
 static void
 presets_customize(GValue *presets)
 {
-	gint count, ii;
+    gint count, ii;
 
-	count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *dict;
-		gboolean folder;
-		gint ptype;
-
-		dict = ghb_array_get_nth(presets, ii);
-
-		ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
-		if (ptype != PRESETS_CUSTOM)
-		{
-			ghb_dict_insert(dict, g_strdup("Type"), 
-						ghb_int64_value_new(PRESETS_CUSTOM));
-		}
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (folder)
-		{
-			GValue *nested;
-
-			nested = ghb_dict_lookup(dict, "ChildrenArray");
-			presets_customize(nested);
-		}
-	}
+    count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *dict;
+        gboolean folder;
+        gint ptype;
+
+        dict = ghb_array_get_nth(presets, ii);
+
+        ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
+        if (ptype != PRESETS_CUSTOM)
+        {
+            ghb_dict_insert(dict, g_strdup("Type"), 
+                        ghb_int64_value_new(PRESETS_CUSTOM));
+        }
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (folder)
+        {
+            GValue *nested;
+
+            nested = ghb_dict_lookup(dict, "ChildrenArray");
+            presets_customize(nested);
+        }
+    }
 }
 
 static gint*
 presets_find_default2(GValue *presets, gint *len)
 {
-	gint count, ii;
-	gint *indices;
+    gint count, ii;
+    gint *indices;
 
-	count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *dict;
-		gboolean folder;
-
-		dict = ghb_array_get_nth(presets, ii);
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (folder)
-		{
-			GValue *nested;
-			gint pos = *len;
-
-			nested = ghb_dict_lookup(dict, "ChildrenArray");
-			(*len)++;
-			indices = presets_find_default2(nested, len);
-			if (indices)
-			{
-				indices[pos] = ii;
-				return indices;
-			}
-			else
-				*len = pos;
-		}
-		else
-		{
-			if (preset_is_default(dict))
-			{
-				indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint));
-				indices[*len] = ii;
-				(*len)++;
-				return indices;
-			}
-		}
-	}
-	return NULL;
+    count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *dict;
+        gboolean folder;
+
+        dict = ghb_array_get_nth(presets, ii);
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (folder)
+        {
+            GValue *nested;
+            gint pos = *len;
+
+            nested = ghb_dict_lookup(dict, "ChildrenArray");
+            (*len)++;
+            indices = presets_find_default2(nested, len);
+            if (indices)
+            {
+                indices[pos] = ii;
+                return indices;
+            }
+            else
+                *len = pos;
+        }
+        else
+        {
+            if (preset_is_default(dict))
+            {
+                indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint));
+                indices[*len] = ii;
+                (*len)++;
+                return indices;
+            }
+        }
+    }
+    return NULL;
 }
 
 static gint*
 presets_find_default(GValue *presets, gint *len)
 {
-	*len = 0;
-	return presets_find_default2(presets, len);
+    *len = 0;
+    return presets_find_default2(presets, len);
 }
 
 gint*
 ghb_preset_indices_from_path(
-	GValue *presets, 
-	const GValue *path,
-	gint *len)
-{
-	GValue *nested;
-	GValue *val;
-	gint count, ii;
-	gint *indices = NULL;
-	const gchar *name;
-	GValue *dict;
-	gboolean folder;
-
-	g_debug("ghb_preset_indices_from_path () ");
-	nested = presets;
-	count = ghb_array_len(path);
-	if (count)
-		indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint));
-	*len = 0;
-	for (ii = 0; ii < count; ii++)
-	{
-		val = ghb_array_get_nth(path, ii);
-		name = g_value_get_string(val);
-		indices[ii] = presets_find_element(nested, name);
-		if (indices[ii] == -1)
-		{
-			g_free(indices);
-			return NULL;
-		}
-		if (ii < count-1)
-		{
-			dict = ghb_array_get_nth(nested, indices[ii]);
-			folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-			if (!folder)
-			{
-				g_free(indices);
-				return NULL;
-			}
-			nested = ghb_dict_lookup(dict, "ChildrenArray");
-		}
-	}
-	*len = ii;
-	return indices;
+    GValue *presets, 
+    const GValue *path,
+    gint *len)
+{
+    GValue *nested;
+    GValue *val;
+    gint count, ii;
+    gint *indices = NULL;
+    const gchar *name;
+    GValue *dict;
+    gboolean folder;
+
+    g_debug("ghb_preset_indices_from_path () ");
+    nested = presets;
+    count = ghb_array_len(path);
+    if (count)
+        indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint));
+    *len = 0;
+    for (ii = 0; ii < count; ii++)
+    {
+        val = ghb_array_get_nth(path, ii);
+        name = g_value_get_string(val);
+        indices[ii] = presets_find_element(nested, name);
+        if (indices[ii] == -1)
+        {
+            g_free(indices);
+            return NULL;
+        }
+        if (ii < count-1)
+        {
+            dict = ghb_array_get_nth(nested, indices[ii]);
+            folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+            if (!folder)
+            {
+                g_free(indices);
+                return NULL;
+            }
+            nested = ghb_dict_lookup(dict, "ChildrenArray");
+        }
+    }
+    *len = ii;
+    return indices;
 }
 
 static gint
 ghb_presets_get_type(
-	GValue *presets, 
-	gint *indices,
-	gint len)
-{
-	GValue *dict;
-	gint type = 0;
-
-	dict = presets_get_dict(presets, indices, len);
-	if (dict)
-	{
-		type = ghb_preset_type(dict);
-	}
-	else
-	{
-		g_warning("ghb_presets_get_type (): internal preset lookup error");
-	}
-	return type;
+    GValue *presets, 
+    gint *indices,
+    gint len)
+{
+    GValue *dict;
+    gint type = 0;
+
+    dict = presets_get_dict(presets, indices, len);
+    if (dict)
+    {
+        type = ghb_preset_type(dict);
+    }
+    else
+    {
+        g_warning("ghb_presets_get_type (): internal preset lookup error");
+    }
+    return type;
 }
 
 static gboolean
 ghb_presets_get_folder(
-	GValue *presets, 
-	gint *indices,
-	gint len)
-{
-	GValue *dict;
-	gboolean folder = FALSE;
-
-	dict = presets_get_dict(presets, indices, len);
-	if (dict)
-	{
-		folder = ghb_preset_folder(dict);
-	}
-	else
-	{
-		g_warning("ghb_presets_get_folder (): internal preset lookup error");
-	}
-	return folder;
+    GValue *presets, 
+    gint *indices,
+    gint len)
+{
+    GValue *dict;
+    gboolean folder = FALSE;
+
+    dict = presets_get_dict(presets, indices, len);
+    if (dict)
+    {
+        folder = ghb_preset_folder(dict);
+    }
+    else
+    {
+        g_warning("ghb_presets_get_folder (): internal preset lookup error");
+    }
+    return folder;
 }
 
 void
 presets_set_default(gint *indices, gint len)
 {
-	GValue *dict;
-	
-	g_debug("presets_set_default ()");
-	presets_clear_default(presetsPlist);
-	dict = presets_get_dict(presetsPlist, indices, len);
-	if (dict)
-	{
-		ghb_dict_insert(dict, g_strdup("Default"), ghb_boolean_value_new(TRUE));
-	}
-	store_presets();
+    GValue *dict;
+    
+    g_debug("presets_set_default ()");
+    presets_clear_default(presetsPlist);
+    dict = presets_get_dict(presetsPlist, indices, len);
+    if (dict)
+    {
+        ghb_dict_insert(dict, g_strdup("Default"), ghb_boolean_value_new(TRUE));
+    }
+    store_presets();
 }
 
 static void
 presets_set_folder_open(gboolean open, gint *indices, gint len)
 {
-	GValue *dict;
-	
-	g_debug("presets_set_folder_open ()");
-	dict = presets_get_dict(presetsPlist, indices, len);
-	if (dict)
-	{
-		ghb_dict_insert(dict, g_strdup("FolderOpen"), 
-						ghb_boolean_value_new(open));
-	}
+    GValue *dict;
+    
+    g_debug("presets_set_folder_open ()");
+    dict = presets_get_dict(presetsPlist, indices, len);
+    if (dict)
+    {
+        ghb_dict_insert(dict, g_strdup("FolderOpen"), 
+                        ghb_boolean_value_new(open));
+    }
 }
 
 // Used for sorting dictionaries.
 gint
 key_cmp(gconstpointer a, gconstpointer b)
 {
-	gchar *stra = (gchar*)a;
-	gchar *strb = (gchar*)b;
+    gchar *stra = (gchar*)a;
+    gchar *strb = (gchar*)b;
 
-	return strcmp(stra, strb);
+    return strcmp(stra, strb);
 }
 
 static const GValue*
 preset_dict_get_value(GValue *dict, const gchar *key)
 {
-	const GValue *gval = NULL;
+    const GValue *gval = NULL;
 
-	if (dict)
-	{
-		gval = ghb_dict_lookup(dict, key);
-	}
-	if (internalPlist == NULL) return NULL;
-	if (gval == NULL)
-	{
-		dict = plist_get_dict(internalPlist, "Presets");
-		if (dict == NULL) return NULL;
-		gval = ghb_dict_lookup(dict, key);
-	}
-	return gval;
+    if (dict)
+    {
+        gval = ghb_dict_lookup(dict, key);
+    }
+    if (internalPlist == NULL) return NULL;
+    if (gval == NULL)
+    {
+        dict = plist_get_dict(internalPlist, "Presets");
+        if (dict == NULL) return NULL;
+        gval = ghb_dict_lookup(dict, key);
+    }
+    return gval;
 }
 
 const gchar*
 ghb_presets_get_description(GValue *pdict)
 {
-	const gchar *desc;
+    const gchar *desc;
 
-	if (pdict == NULL) return NULL;
-	desc = g_value_get_string(
-			preset_dict_get_value(pdict, "PresetDescription"));
-	if (desc[0] == 0) return NULL;
-	return desc;
+    if (pdict == NULL) return NULL;
+    desc = g_value_get_string(
+            preset_dict_get_value(pdict, "PresetDescription"));
+    if (desc[0] == 0) return NULL;
+    return desc;
 }
 
 
 static void init_settings_from_dict(
-	GValue *dest, GValue *internal, GValue *dict);
+    GValue *dest, GValue *internal, GValue *dict);
 
 static void
 init_settings_from_array(
-	GValue *dest, 
-	GValue *internal,
-	GValue *array)
-{
-	GValue *gval, *val;
-	gint count, ii;
-	
-	count = ghb_array_len(array);
-	// The first element of the internal version is always the 
-	// template for the allowed values
-	gval = ghb_array_get_nth(internal, 0);
-	for (ii = 0; ii < count; ii++)
-	{
-		val = NULL;
-		val = ghb_array_get_nth(array, ii);
-		if (val == NULL)
-			val = gval;
-		if (G_VALUE_TYPE(gval) == ghb_dict_get_type())
-		{
-			GValue *new_dict;
-			new_dict = ghb_dict_value_new();
-			ghb_array_append(dest, new_dict);
-			if (G_VALUE_TYPE(val) == ghb_dict_get_type())
-				init_settings_from_dict(new_dict, gval, val);
-			else
-				init_settings_from_dict(new_dict, gval, gval);
-		}
-		else if (G_VALUE_TYPE(gval) == ghb_array_get_type())
-		{
-			GValue *new_array;
-			new_array = ghb_array_value_new(8);
-			ghb_array_append(dest, new_array);
-			if (G_VALUE_TYPE(val) == ghb_array_get_type())
-				init_settings_from_array(new_array, gval, val);
-			else
-				init_settings_from_array(new_array, gval, gval);
-		}
-		else
-		{
-			ghb_array_append(dest, val);
-		}
-	}
+    GValue *dest, 
+    GValue *internal,
+    GValue *array)
+{
+    GValue *gval, *val;
+    gint count, ii;
+    
+    count = ghb_array_len(array);
+    // The first element of the internal version is always the 
+    // template for the allowed values
+    gval = ghb_array_get_nth(internal, 0);
+    for (ii = 0; ii < count; ii++)
+    {
+        val = NULL;
+        val = ghb_array_get_nth(array, ii);
+        if (val == NULL)
+            val = gval;
+        if (G_VALUE_TYPE(gval) == ghb_dict_get_type())
+        {
+            GValue *new_dict;
+            new_dict = ghb_dict_value_new();
+            ghb_array_append(dest, new_dict);
+            if (G_VALUE_TYPE(val) == ghb_dict_get_type())
+                init_settings_from_dict(new_dict, gval, val);
+            else
+                init_settings_from_dict(new_dict, gval, gval);
+        }
+        else if (G_VALUE_TYPE(gval) == ghb_array_get_type())
+        {
+            GValue *new_array;
+            new_array = ghb_array_value_new(8);
+            ghb_array_append(dest, new_array);
+            if (G_VALUE_TYPE(val) == ghb_array_get_type())
+                init_settings_from_array(new_array, gval, val);
+            else
+                init_settings_from_array(new_array, gval, gval);
+        }
+        else
+        {
+            ghb_array_append(dest, val);
+        }
+    }
 }
 
 static void
 init_settings_from_dict(
-	GValue *dest, 
-	GValue *internal,
-	GValue *dict)
-{
-	GHashTableIter iter;
-	gchar *key;
-	GValue *gval, *val;
-
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		val = NULL;
-		if (dict)
-			val = ghb_dict_lookup(dict, key);
-		if (val == NULL)
-			val = gval;
-		if (G_VALUE_TYPE(gval) == ghb_dict_get_type())
-		{
-			GValue *new_dict;
-			new_dict = ghb_dict_value_new();
-			ghb_settings_take_value(dest, key, new_dict);
-			if (G_VALUE_TYPE(val) == ghb_dict_get_type())
-				init_settings_from_dict(new_dict, gval, val);
-			else
-				init_settings_from_dict(new_dict, gval, gval);
-		}
-		else if (G_VALUE_TYPE(gval) == ghb_array_get_type())
-		{
-			GValue *new_array;
-			new_array = ghb_array_value_new(8);
-			ghb_settings_take_value(dest, key, new_array);
-			if (G_VALUE_TYPE(val) == ghb_array_get_type())
-				init_settings_from_array(new_array, gval, val);
-			else
-				init_settings_from_array(new_array, gval, gval);
-	
-		}
-		else
-		{
-			ghb_settings_set_value(dest, key, val);
-		}
-	}
+    GValue *dest, 
+    GValue *internal,
+    GValue *dict)
+{
+    GHashTableIter iter;
+    gchar *key;
+    GValue *gval, *val;
+
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        val = NULL;
+        if (dict)
+            val = ghb_dict_lookup(dict, key);
+        if (val == NULL)
+            val = gval;
+        if (G_VALUE_TYPE(gval) == ghb_dict_get_type())
+        {
+            GValue *new_dict;
+            new_dict = ghb_dict_value_new();
+            ghb_settings_take_value(dest, key, new_dict);
+            if (G_VALUE_TYPE(val) == ghb_dict_get_type())
+                init_settings_from_dict(new_dict, gval, val);
+            else
+                init_settings_from_dict(new_dict, gval, gval);
+        }
+        else if (G_VALUE_TYPE(gval) == ghb_array_get_type())
+        {
+            GValue *new_array;
+            new_array = ghb_array_value_new(8);
+            ghb_settings_take_value(dest, key, new_array);
+            if (G_VALUE_TYPE(val) == ghb_array_get_type())
+                init_settings_from_array(new_array, gval, val);
+            else
+                init_settings_from_array(new_array, gval, gval);
+    
+        }
+        else
+        {
+            ghb_settings_set_value(dest, key, val);
+        }
+    }
+}
+
+static const char * dict_get_string(GValue *dict, const char *key)
+{
+    GValue *gval = ghb_dict_lookup(dict, key);
+
+    if (gval == NULL)
+        return NULL;
+    return g_value_get_string(gval);
+}
+
+static gboolean dict_get_boolean(GValue *dict, const char *key)
+{
+    GValue *gval = ghb_dict_lookup(dict, key);
+
+    if (gval == NULL)
+        return FALSE;
+    return g_value_get_boolean(gval);
 }
 
 void
 init_ui_from_dict(
-	signal_user_data_t *ud, 
-	GValue *internal,
-	GValue *dict)
-{
-	GHashTableIter iter;
-	gchar *key;
-	GValue *gval, *val;
-	
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		val = NULL;
-		if (dict)
-			val = ghb_dict_lookup(dict, key);
-		if (val == NULL)
-			val = gval;
-		ghb_ui_update(ud, key, val);
-	}
+    signal_user_data_t *ud, 
+    GValue *internal,
+    GValue *dict)
+{
+    GHashTableIter iter;
+    gchar *key;
+    GValue *gval, *val;
+    
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        if (!strcmp(key, "x264Option"))
+            continue;
+        val = NULL;
+        if (dict)
+            val = ghb_dict_lookup(dict, key);
+        if (val == NULL)
+            val = gval;
+        ghb_ui_update(ud, key, val);
+    }
+
+    if (ghb_value_boolean(preset_dict_get_value(dict, "x264UseAdvancedOptions")))
+
+    {
+        val = ghb_dict_lookup(dict, "x264Option");
+        if (val != NULL)
+            ghb_ui_update(ud, "x264Option", val);
+    }
 }
 
 static void
 preset_to_ui(signal_user_data_t *ud, GValue *dict)
 {
-	g_debug("preset_to_ui()\n");
-	// Initialize the ui from presets file.
-	GValue *internal, *hidden;
-
-	// Get key list from internal default presets.  This way we do not
-	// load any unknown keys.
-	if (internalPlist == NULL) return;
-	internal = plist_get_dict(internalPlist, "Presets");
-	hidden = plist_get_dict(internalPlist, "XlatPresets");
-	// Setting a ui widget will cause the corresponding setting
-	// to be set, but it also triggers a callback that can 
-	// have the side effect of using other settings values
-	// that have not yet been set.  So set *all* settings first
-	// then update the ui.
-	init_settings_from_dict(ud->settings, internal, dict);
-	init_settings_from_dict(ud->settings, hidden, dict);
-	init_ui_from_dict(ud, internal, dict);
-	init_ui_from_dict(ud, hidden, dict);
-
-	if (dict != NULL)
-	{
-		GValue *val;
-		gboolean dd;
-
-		val = ghb_dict_lookup(dict, "PictureDecombDeinterlace");
-		if (val != NULL)
-		{
-			dd = ghb_value_boolean(val);
-			ghb_ui_update(ud, "PictureDeinterlaceDecomb", ghb_boolean_value(!dd));
-		}
-		val = ghb_dict_lookup(dict, "PictureHeight");
-		if (val != NULL)
-		{
-			ghb_ui_update(ud, "scale_height", val);
-		}
-		val = ghb_dict_lookup(dict, "PictureWidth");
-		if (val != NULL)
-		{
-			ghb_ui_update(ud, "scale_width", val);
-		}
-	}
+    g_debug("preset_to_ui()\n");
+    // Initialize the ui from presets file.
+    GValue *internal, *hidden;
+
+    // Get key list from internal default presets.  This way we do not
+    // load any unknown keys.
+    if (internalPlist == NULL) return;
+    internal = plist_get_dict(internalPlist, "Presets");
+    hidden = plist_get_dict(internalPlist, "XlatPresets");
+    // Setting a ui widget will cause the corresponding setting
+    // to be set, but it also triggers a callback that can 
+    // have the side effect of using other settings values
+    // that have not yet been set.  So set *all* settings first
+    // then update the ui.
+    init_settings_from_dict(ud->settings, internal, dict);
+    init_settings_from_dict(ud->settings, hidden, dict);
+    init_ui_from_dict(ud, internal, dict);
+    init_ui_from_dict(ud, hidden, dict);
+
+    if (dict != NULL)
+    {
+        GValue *val;
+        gboolean dd;
+
+        val = ghb_dict_lookup(dict, "PictureDecombDeinterlace");
+        if (val != NULL)
+        {
+            dd = ghb_value_boolean(val);
+            ghb_ui_update(ud, "PictureDeinterlaceDecomb", ghb_boolean_value(!dd));
+        }
+        val = ghb_dict_lookup(dict, "PictureHeight");
+        if (val != NULL)
+        {
+            ghb_ui_update(ud, "scale_height", val);
+        }
+        val = ghb_dict_lookup(dict, "PictureWidth");
+        if (val != NULL)
+        {
+            ghb_ui_update(ud, "scale_width", val);
+        }
+    }
 }
 
 void
 ghb_settings_to_ui(signal_user_data_t *ud, GValue *dict)
 {
-	init_ui_from_dict(ud, dict, dict);
+    init_ui_from_dict(ud, dict, dict);
 }
 
 static GValue *current_preset = NULL;
@@ -945,222 +973,222 @@
 gboolean
 ghb_preset_is_custom()
 {
-	const GValue *val;
+    const GValue *val;
 
-	if (current_preset == NULL) return FALSE;
-	val = preset_dict_get_value(current_preset, "Type");
-	return (ghb_value_int(val) == 1);
+    if (current_preset == NULL) return FALSE;
+    val = preset_dict_get_value(current_preset, "Type");
+    return (ghb_value_int(val) == 1);
 }
 
 void
 ghb_set_preset_from_indices(signal_user_data_t *ud, gint *indices, gint len)
 {
-	GValue *dict = NULL;
-	gint fallback[2] = {0, -1};
+    GValue *dict = NULL;
+    gint fallback[2] = {0, -1};
 
-	if (indices)
-		dict = presets_get_dict(presetsPlist, indices, len);
-	if (dict == NULL)
-	{
-		indices = fallback;
-		len = 1;
-		dict = presets_get_dict(presetsPlist, indices, len);
-	}
-	if (dict == NULL)
-	{
-		preset_to_ui(ud, NULL);
-		current_preset = NULL;
-	}
-	else
-	{
-		GValue *path;
-		gboolean folder;
-
-		current_preset = dict;
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (folder)
-			preset_to_ui(ud, NULL);
-		else
-			preset_to_ui(ud, dict);
-		path = preset_path_from_indices(presetsPlist, indices, len);
-		ghb_settings_set_value(ud->settings, "preset", path);
-		ghb_value_free(path);
-	}
+    if (indices)
+        dict = presets_get_dict(presetsPlist, indices, len);
+    if (dict == NULL)
+    {
+        indices = fallback;
+        len = 1;
+        dict = presets_get_dict(presetsPlist, indices, len);
+    }
+    if (dict == NULL)
+    {
+        preset_to_ui(ud, NULL);
+        current_preset = NULL;
+    }
+    else
+    {
+        GValue *path;
+        gboolean folder;
+
+        current_preset = dict;
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (folder)
+            preset_to_ui(ud, NULL);
+        else
+            preset_to_ui(ud, dict);
+        path = preset_path_from_indices(presetsPlist, indices, len);
+        ghb_settings_set_value(ud->settings, "preset", path);
+        ghb_value_free(path);
+    }
 }
 
 static const GValue*
 curr_preset_get_value(const gchar *key)
 {
-	if (current_preset == NULL) return NULL;
-	return preset_dict_get_value(current_preset, key);
+    if (current_preset == NULL) return NULL;
+    return preset_dict_get_value(current_preset, key);
 }
 
 void
 ghb_update_from_preset(
-	signal_user_data_t *ud, 
-	const gchar *key)
+    signal_user_data_t *ud, 
+    const gchar *key)
 {
-	const GValue *gval;
-	
-	g_debug("ghb_update_from_preset() %s", key);
-	gval = curr_preset_get_value(key);
-	if (gval != NULL)
-	{
-		ghb_ui_update(ud, key, gval);
-	}
+    const GValue *gval;
+    
+    g_debug("ghb_update_from_preset() %s", key);
+    gval = curr_preset_get_value(key);
+    if (gval != NULL)
+    {
+        ghb_ui_update(ud, key, gval);
+    }
 }
 
 static void
 ghb_select_preset2(
-	GtkBuilder *builder, 
-	gint *indices, 
-	gint len)
-{
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	
-	g_debug("ghb_select_preset2()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	store = gtk_tree_view_get_model (treeview);
-	path = ghb_tree_path_new_from_indices(indices, len);
-	if (path)
-	{
-		if (gtk_tree_model_get_iter(store, &iter, path))
-		{
-			gtk_tree_selection_select_iter (selection, &iter);
-		}
-		else
-		{
-			if (gtk_tree_model_get_iter_first(store, &iter))
-				gtk_tree_selection_select_iter (selection, &iter);
-		}
-		gtk_tree_path_free(path);
-	}
+    GtkBuilder *builder, 
+    gint *indices, 
+    gint len)
+{
+    GtkTreeView *treeview;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    GtkTreePath *path;
+    
+    g_debug("ghb_select_preset2()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    store = gtk_tree_view_get_model (treeview);
+    path = ghb_tree_path_new_from_indices(indices, len);
+    if (path)
+    {
+        if (gtk_tree_model_get_iter(store, &iter, path))
+        {
+            gtk_tree_selection_select_iter (selection, &iter);
+        }
+        else
+        {
+            if (gtk_tree_model_get_iter_first(store, &iter))
+                gtk_tree_selection_select_iter (selection, &iter);
+        }
+        gtk_tree_path_free(path);
+    }
 }
 
 void
 ghb_select_preset(GtkBuilder *builder, const GValue *path)
 {
-	gint *indices, len;
+    gint *indices, len;
 
-	g_debug("ghb_select_preset()");
-	indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-	if (indices)
-	{
-		ghb_select_preset2(builder, indices, len);
-		g_free(indices);
-	}
+    g_debug("ghb_select_preset()");
+    indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+    if (indices)
+    {
+        ghb_select_preset2(builder, indices, len);
+        g_free(indices);
+    }
 }
 
 void
 ghb_select_default_preset(GtkBuilder *builder)
 {
-	gint *indices, len;
+    gint *indices, len;
 
-	g_debug("ghb_select_default_preset()");
-	indices = presets_find_default(presetsPlist, &len);
-	if (indices)
-	{
-		ghb_select_preset2(builder, indices, len);
-		g_free(indices);
-	}
+    g_debug("ghb_select_default_preset()");
+    indices = presets_find_default(presetsPlist, &len);
+    if (indices)
+    {
+        ghb_select_preset2(builder, indices, len);
+        g_free(indices);
+    }
 }
 
 gchar*
 ghb_get_user_config_dir(gchar *subdir)
 {
-	const gchar *dir;
-	gchar *config;
+    const gchar *dir;
+    gchar *config;
 
-	dir = g_get_user_config_dir();
-	if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
-	{
-		dir = g_get_home_dir();
-		config = g_strdup_printf ("%s/.ghb", dir);
-		if (!g_file_test(config, G_FILE_TEST_IS_DIR))
-			g_mkdir (config, 0755);
-	}
-	else
-	{
-		config = g_strdup_printf ("%s/ghb", dir);
-		if (!g_file_test(config, G_FILE_TEST_IS_DIR))
-			g_mkdir (config, 0755);
-	}
-	if (subdir)
-	{
-		gchar **split;
-		gint ii;
-
-		split = g_strsplit(subdir, G_DIR_SEPARATOR_S, -1);
-		for (ii = 0; split[ii] != NULL; ii++)
-		{
-			gchar *tmp;
-
-			tmp = g_strdup_printf ("%s/%s", config, split[ii]);
-			g_free(config);
-			config = tmp;
-			if (!g_file_test(config, G_FILE_TEST_IS_DIR))
-				g_mkdir (config, 0755);
-		}
-	}
-	return config;
+    dir = g_get_user_config_dir();
+    if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
+    {
+        dir = g_get_home_dir();
+        config = g_strdup_printf ("%s/.ghb", dir);
+        if (!g_file_test(config, G_FILE_TEST_IS_DIR))
+            g_mkdir (config, 0755);
+    }
+    else
+    {
+        config = g_strdup_printf ("%s/ghb", dir);
+        if (!g_file_test(config, G_FILE_TEST_IS_DIR))
+            g_mkdir (config, 0755);
+    }
+    if (subdir)
+    {
+        gchar **split;
+        gint ii;
+
+        split = g_strsplit(subdir, G_DIR_SEPARATOR_S, -1);
+        for (ii = 0; split[ii] != NULL; ii++)
+        {
+            gchar *tmp;
+
+            tmp = g_strdup_printf ("%s/%s", config, split[ii]);
+            g_free(config);
+            config = tmp;
+            if (!g_file_test(config, G_FILE_TEST_IS_DIR))
+                g_mkdir (config, 0755);
+        }
+    }
+    return config;
 }
 
 static void
 store_plist(GValue *plist, const gchar *name)
 {
-	gchar *config, *path;
-	FILE *file;
+    gchar *config, *path;
+    FILE *file;
 
-	config = ghb_get_user_config_dir(NULL);
-	path = g_strdup_printf ("%s/%s", config, name);
-	file = g_fopen(path, "w");
-	g_free(config);
-	g_free(path);
-	ghb_plist_write(file, plist);
-	fclose(file);
+    config = ghb_get_user_config_dir(NULL);
+    path = g_strdup_printf ("%s/%s", config, name);
+    file = g_fopen(path, "w");
+    g_free(config);
+    g_free(path);
+    ghb_plist_write(file, plist);
+    fclose(file);
 }
 
 static GValue*
 load_plist(const gchar *name)
 {
-	gchar *config, *path;
-	GValue *plist = NULL;
+    gchar *config, *path;
+    GValue *plist = NULL;
 
-	config = ghb_get_user_config_dir(NULL);
-	path = g_strdup_printf ("%s/%s", config, name);
-	if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
-	{
-		plist = ghb_plist_parse_file(path);
-	}
-	g_free(config);
-	g_free(path);
-	return plist;
+    config = ghb_get_user_config_dir(NULL);
+    path = g_strdup_printf ("%s/%s", config, name);
+    if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
+    {
+        plist = ghb_plist_parse_file(path);
+    }
+    g_free(config);
+    g_free(path);
+    return plist;
 }
 
 gboolean
 ghb_lock_file(const gchar *name)
 {
 #if !defined(_WIN32)
-	gchar *config, *path;
-	int fd, lock = 0;
+    gchar *config, *path;
+    int fd, lock = 0;
 
-	config = ghb_get_user_config_dir(NULL);
-	path = g_strdup_printf ("%s/%s", config, name);
-	fd = open(path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-	if (fd >= 0)
-		lock = lockf(fd, F_TLOCK, 0);
-	if (lock)
-		close(fd);
-	g_free(config);
-	g_free(path);
-	return !lock;
+    config = ghb_get_user_config_dir(NULL);
+    path = g_strdup_printf ("%s/%s", config, name);
+    fd = open(path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+    if (fd >= 0)
+        lock = lockf(fd, F_TLOCK, 0);
+    if (lock)
+        close(fd);
+    g_free(config);
+    g_free(path);
+    return !lock;
 #else
-	return 1;
+    return 1;
 #endif
 }
 
@@ -1168,122 +1196,122 @@
 ghb_write_pid_file()
 {
 #if !defined(_WIN32)
-	gchar *config, *path;
-	pid_t pid;
-	FILE *fp;
-	int fd, lock;
+    gchar *config, *path;
+    pid_t pid;
+    FILE *fp;
+    int fd;
 
-	pid = getpid();
+    pid = getpid();
 
-	config = ghb_get_user_config_dir(NULL);
-	path = g_strdup_printf ("%s/ghb.pid.%d", config, pid);
+    config = ghb_get_user_config_dir(NULL);
+    path = g_strdup_printf ("%s/ghb.pid.%d", config, pid);
 
-	fp = g_fopen(path, "w");
-	fprintf(fp, "%d\n", pid);
-	fclose(fp);
+    fp = g_fopen(path, "w");
+    fprintf(fp, "%d\n", pid);
+    fclose(fp);
 
-	fd = open(path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-	lock = lockf(fd, F_TLOCK, 0);
+    fd = open(path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+    lockf(fd, F_TLOCK, 0);
 
-	g_free(config);
-	g_free(path);
+    g_free(config);
+    g_free(path);
 #endif
 }
 
 void
 ghb_unlink_pid_file(int pid)
 {
-	gchar *config, *path;
+    gchar *config, *path;
 
-	config = ghb_get_user_config_dir(NULL);
-	path = g_strdup_printf ("%s/ghb.pid.%d", config, pid);
+    config = ghb_get_user_config_dir(NULL);
+    path = g_strdup_printf ("%s/ghb.pid.%d", config, pid);
 
-	if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
-	{
-		g_unlink(path);
-	}
+    if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
+    {
+        g_unlink(path);
+    }
 
-	g_free(config);
-	g_free(path);
+    g_free(config);
+    g_free(path);
 }
 
 int
 ghb_find_pid_file()
 {
-	const gchar *file;
-	gchar *config;
+    const gchar *file;
+    gchar *config;
 
-	config = ghb_get_user_config_dir(NULL);
+    config = ghb_get_user_config_dir(NULL);
 
-	if (g_file_test(config, G_FILE_TEST_IS_DIR))
-	{
-		GDir *gdir = g_dir_open(config, 0, NULL);
-		file = g_dir_read_name(gdir);
-		while (file)
-		{
-			if (strncmp(file, "ghb.pid.", 8) == 0)
-			{
-				gchar *path;
-				pid_t my_pid;
-				int pid;
-
-				sscanf(file, "ghb.pid.%d", &pid);
-				my_pid = getpid();
-				if (my_pid == pid)
-				{
-					file = g_dir_read_name(gdir);
-					continue;
-				}
-				path = g_strdup_printf("%s/%s", config, file);
+    if (g_file_test(config, G_FILE_TEST_IS_DIR))
+    {
+        GDir *gdir = g_dir_open(config, 0, NULL);
+        file = g_dir_read_name(gdir);
+        while (file)
+        {
+            if (strncmp(file, "ghb.pid.", 8) == 0)
+            {
+                gchar *path;
+                pid_t my_pid;
+                int pid;
+
+                sscanf(file, "ghb.pid.%d", &pid);
+                my_pid = getpid();
+                if (my_pid == pid)
+                {
+                    file = g_dir_read_name(gdir);
+                    continue;
+                }
+                path = g_strdup_printf("%s/%s", config, file);
 
 #if !defined(_WIN32)
-				int fd, lock = 1;
+                int fd, lock = 1;
 
-				fd = open(path, O_RDWR);
-				if (fd >= 0)
-				{
-					lock = lockf(fd, F_TLOCK, 0);
-				}
-				if (lock == 0)
-				{
-					close(fd);
-					g_dir_close(gdir);
-					g_unlink(path);
-					g_free(path);
-					g_free(config);
-					return pid;
-				}
-				g_free(path);
-				close(fd);
+                fd = open(path, O_RDWR);
+                if (fd >= 0)
+                {
+                    lock = lockf(fd, F_TLOCK, 0);
+                }
+                if (lock == 0)
+                {
+                    close(fd);
+                    g_dir_close(gdir);
+                    g_unlink(path);
+                    g_free(path);
+                    g_free(config);
+                    return pid;
+                }
+                g_free(path);
+                close(fd);
 #else
-				g_dir_close(gdir);
-				g_unlink(path);
-				g_free(path);
-				g_free(config);
-				return pid;
+                g_dir_close(gdir);
+                g_unlink(path);
+                g_free(path);
+                g_free(config);
+                return pid;
 #endif
-			}
-			file = g_dir_read_name(gdir);
-		}
-		g_dir_close(gdir);
-	}
-	g_free(config);
-	return -1;
+            }
+            file = g_dir_read_name(gdir);
+        }
+        g_dir_close(gdir);
+    }
+    g_free(config);
+    return -1;
 }
 
 static void
 remove_plist(const gchar *name)
 {
-	gchar *config, *path;
+    gchar *config, *path;
 
-	config = ghb_get_user_config_dir(NULL);
-	path = g_strdup_printf ("%s/%s", config, name);
-	if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
-	{
-		g_unlink(path);
-	}
-	g_free(path);
-	g_free(config);
+    config = ghb_get_user_config_dir(NULL);
+    path = g_strdup_printf ("%s/%s", config, name);
+    if (g_file_test(path, G_FILE_TEST_IS_REGULAR))
+    {
+        g_unlink(path);
+    }
+    g_free(path);
+    g_free(config);
 }
 
 static gboolean prefs_initializing = FALSE;
@@ -1291,831 +1319,862 @@
 void
 ghb_prefs_to_ui(signal_user_data_t *ud)
 {
-	const GValue *gval;
-	gchar *key;
-	gchar *str;
-	GValue *internal, *dict;
-	GHashTableIter iter;
-	
-
-	g_debug("ghb_prefs_to_ui");
-	prefs_initializing = TRUE;
-
-	// Setting a ui widget will cause the corresponding setting
-	// to be set, but it also triggers a callback that can 
-	// have the side effect of using other settings values
-	// that have not yet been set.  So set *all* settings first
-	// then update the ui.
-	internal = plist_get_dict(internalPlist, "Initialization");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		ghb_ui_update(ud, key, gval);
-	}
-
-	dict = plist_get_dict(prefsPlist, "Preferences");
-	internal = plist_get_dict(internalPlist, "Preferences");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		const GValue *value = NULL;
-		if (dict)
-			value = ghb_dict_lookup(dict, key);
-		if (value == NULL)
-			value = gval;
-		ghb_settings_set_value(ud->settings, key, value);
-	}
-	internal = plist_get_dict(internalPlist, "Preferences");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-   	{
-		const GValue *value = NULL;
-		if (dict)
-			value = ghb_dict_lookup(dict, key);
-		if (value == NULL)
-			value = gval;
-		ghb_ui_update(ud, key, value);
-   	}
-	const GValue *val;
-	val = ghb_settings_get_value(ud->settings, "show_presets");
-	ghb_ui_update(ud, "show_presets", val);
-	if (ghb_settings_get_boolean(ud->settings, "hbfd_feature"))
-	{
-		GtkAction *action;
-		val = ghb_settings_get_value(ud->settings, "hbfd");
-		ghb_ui_update(ud, "hbfd", val);
-		action = GHB_ACTION (ud->builder, "hbfd");
-		gtk_action_set_visible(action, TRUE);
-	}
-	else
-	{
-		ghb_ui_update(ud, "hbfd", ghb_int64_value(0));
-	}
-	gval = ghb_settings_get_value(ud->settings, "default_source");
-	ghb_settings_set_value (ud->settings, "scan_source", gval);
-
-	str = ghb_settings_get_string(ud->settings, "destination_dir");
-	ghb_ui_update(ud, "dest_dir", ghb_string_value(str));
-
-	gchar *file = g_strdup_printf ("new_video.mp4");
-	ghb_ui_update(ud, "dest_file", ghb_string_value(file));
-	g_free(str);
-	g_free(file);
+    const GValue *gval;
+    gchar *key;
+    gchar *str;
+    GValue *internal, *dict;
+    GHashTableIter iter;
+    
+
+    g_debug("ghb_prefs_to_ui");
+    prefs_initializing = TRUE;
+
+    // Setting a ui widget will cause the corresponding setting
+    // to be set, but it also triggers a callback that can 
+    // have the side effect of using other settings values
+    // that have not yet been set.  So set *all* settings first
+    // then update the ui.
+    internal = plist_get_dict(internalPlist, "Initialization");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        ghb_ui_update(ud, key, gval);
+    }
+
+    dict = plist_get_dict(prefsPlist, "Preferences");
+    internal = plist_get_dict(internalPlist, "Preferences");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        const GValue *value = NULL;
+        if (dict)
+            value = ghb_dict_lookup(dict, key);
+        if (value == NULL)
+            value = gval;
+        ghb_settings_set_value(ud->settings, key, value);
+    }
+    internal = plist_get_dict(internalPlist, "Preferences");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        const GValue *value = NULL;
+        if (dict)
+            value = ghb_dict_lookup(dict, key);
+        if (value == NULL)
+            value = gval;
+        ghb_ui_update(ud, key, value);
+    }
+    const GValue *val;
+    val = ghb_settings_get_value(ud->settings, "show_presets");
+    ghb_ui_update(ud, "show_presets", val);
+    if (ghb_settings_get_boolean(ud->settings, "hbfd_feature"))
+    {
+        GtkAction *action;
+        val = ghb_settings_get_value(ud->settings, "hbfd");
+        ghb_ui_update(ud, "hbfd", val);
+        action = GHB_ACTION (ud->builder, "hbfd");
+        gtk_action_set_visible(action, TRUE);
+    }
+    else
+    {
+        ghb_ui_update(ud, "hbfd", ghb_int64_value(0));
+    }
+    gval = ghb_settings_get_value(ud->settings, "default_source");
+    ghb_settings_set_value (ud->settings, "scan_source", gval);
+
+    str = ghb_settings_get_string(ud->settings, "destination_dir");
+    ghb_ui_update(ud, "dest_dir", ghb_string_value(str));
+
+    gchar *file = g_strdup_printf ("new_video.mp4");
+    ghb_ui_update(ud, "dest_file", ghb_string_value(file));
+    g_free(str);
+    g_free(file);
 
-	prefs_initializing = FALSE;
+    prefs_initializing = FALSE;
 }
 
 void
 ghb_prefs_save(GValue *settings)
 {
-	GValue *dict;
-	GValue *pref_dict;
-	GHashTableIter iter;
-	gchar *key;
-	const GValue *value;
-	
-	if (prefs_initializing) return;
-	dict = plist_get_dict(internalPlist, "Preferences");
-	if (dict == NULL) return;
-	pref_dict = plist_get_dict(prefsPlist, "Preferences");
-	if (pref_dict == NULL) return;
-	ghb_dict_iter_init(&iter, dict);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
-	{
-		value = ghb_settings_get_value(settings, key);
-		if (value != NULL)
-		{
-			ghb_dict_insert(pref_dict, g_strdup(key), ghb_value_dup(value));
-		}
-	}
-	store_prefs();
-	prefs_modified = FALSE;
+    GValue *dict;
+    GValue *pref_dict;
+    GHashTableIter iter;
+    gchar *key;
+    const GValue *value;
+    
+    if (prefs_initializing) return;
+    dict = plist_get_dict(internalPlist, "Preferences");
+    if (dict == NULL) return;
+    pref_dict = plist_get_dict(prefsPlist, "Preferences");
+    if (pref_dict == NULL) return;
+    ghb_dict_iter_init(&iter, dict);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
+    {
+        value = ghb_settings_get_value(settings, key);
+        if (value != NULL)
+        {
+            ghb_dict_insert(pref_dict, g_strdup(key), ghb_value_dup(value));
+        }
+    }
+    store_prefs();
+    prefs_modified = FALSE;
 }
 
 void
 ghb_pref_set(GValue *settings, const gchar *key)
 {
-	const GValue *value, *value2;
-	
-	if (prefs_initializing) return;
-	value = ghb_settings_get_value(settings, key);
-	if (value != NULL)
-	{
-		GValue *dict;
-		dict = plist_get_dict(prefsPlist, "Preferences");
-		if (dict == NULL) return;
-		value2 = ghb_dict_lookup(dict, key);
-		if (ghb_value_cmp(value, value2) != 0)
-		{
-			ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
-			store_prefs();
-			prefs_modified = TRUE;
-		}
-	}
+    const GValue *value, *value2;
+    
+    if (prefs_initializing) return;
+    value = ghb_settings_get_value(settings, key);
+    if (value != NULL)
+    {
+        GValue *dict;
+        dict = plist_get_dict(prefsPlist, "Preferences");
+        if (dict == NULL) return;
+        value2 = ghb_dict_lookup(dict, key);
+        if (ghb_value_cmp(value, value2) != 0)
+        {
+            ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
+            store_prefs();
+            prefs_modified = TRUE;
+        }
+    }
 }
 
 void
 ghb_pref_save(GValue *settings, const gchar *key)
 {
-	const GValue *value, *value2;
-	
-	if (prefs_initializing) return;
-	value = ghb_settings_get_value(settings, key);
-	if (value != NULL)
-	{
-		GValue *dict;
-		dict = plist_get_dict(prefsPlist, "Preferences");
-		if (dict == NULL) return;
-		value2 = ghb_dict_lookup(dict, key);
-		if (ghb_value_cmp(value, value2) != 0)
-		{
-			ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
-			store_prefs();
-			prefs_modified = FALSE;
-		}
-	}
+    const GValue *value, *value2;
+    
+    if (prefs_initializing) return;
+    value = ghb_settings_get_value(settings, key);
+    if (value != NULL)
+    {
+        GValue *dict;
+        dict = plist_get_dict(prefsPlist, "Preferences");
+        if (dict == NULL) return;
+        value2 = ghb_dict_lookup(dict, key);
+        if (ghb_value_cmp(value, value2) != 0)
+        {
+            ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
+            store_prefs();
+            prefs_modified = FALSE;
+        }
+    }
 }
 
 void
 ghb_prefs_store(void)
 {
-	if (prefs_modified)
-	{
-		store_prefs();
-		prefs_modified = FALSE;
-	}
+    if (prefs_modified)
+    {
+        store_prefs();
+        prefs_modified = FALSE;
+    }
 }
 
 void
 ghb_settings_init(signal_user_data_t *ud)
 {
-	GValue *internal;
-	GHashTableIter iter;
-	gchar *key;
-	GValue *gval;
-
-
-	g_debug("ghb_settings_init");
-	prefs_initializing = TRUE;
-
-	internalPlist = ghb_resource_get("internal-defaults");
-	// Setting a ui widget will cause the corresponding setting
-	// to be set, but it also triggers a callback that can 
-	// have the side effect of using other settings values
-	// that have not yet been set.  So set *all* settings first
-	// then update the ui.
-	internal = plist_get_dict(internalPlist, "Initialization");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		ghb_settings_set_value(ud->settings, key, gval);
-	}
-
-	internal = plist_get_dict(internalPlist, "Presets");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		ghb_settings_set_value(ud->settings, key, gval);
-	}
-
-	internal = plist_get_dict(internalPlist, "Preferences");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-	{
-		ghb_settings_set_value(ud->settings, key, gval);
-	}
-	prefs_initializing = FALSE;
+    GValue *internal;
+    GHashTableIter iter;
+    gchar *key;
+    GValue *gval;
+
+
+    g_debug("ghb_settings_init");
+    prefs_initializing = TRUE;
+
+    internalPlist = ghb_resource_get("internal-defaults");
+    // Setting a ui widget will cause the corresponding setting
+    // to be set, but it also triggers a callback that can 
+    // have the side effect of using other settings values
+    // that have not yet been set.  So set *all* settings first
+    // then update the ui.
+    internal = plist_get_dict(internalPlist, "Initialization");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        ghb_settings_set_value(ud->settings, key, gval);
+    }
+
+    internal = plist_get_dict(internalPlist, "Presets");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        ghb_settings_set_value(ud->settings, key, gval);
+    }
+
+    internal = plist_get_dict(internalPlist, "Preferences");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+    {
+        ghb_settings_set_value(ud->settings, key, gval);
+    }
+    prefs_initializing = FALSE;
 }
 
 void
 ghb_settings_close()
 {
-	if (internalPlist)
-		ghb_value_free(internalPlist);
-	if (presetsPlist)
-		ghb_value_free(presetsPlist);
-	if (prefsPlist)
-		ghb_value_free(prefsPlist);
+    if (internalPlist)
+        ghb_value_free(internalPlist);
+    if (presetsPlist)
+        ghb_value_free(presetsPlist);
+    if (prefsPlist)
+        ghb_value_free(prefsPlist);
 }
 
 #if defined(_WIN32)
 gchar*
 FindFirstCDROM(void)
 {
-	gint ii, drives;
-	gchar drive[5];
+    gint ii, drives;
+    gchar drive[5];
 
-	strcpy(drive, "A:" G_DIR_SEPARATOR_S);
-	drives = GetLogicalDrives();
-	for (ii = 0; ii < 26; ii++)
-	{
-		if (drives & 0x01)
-		{
-			guint dtype;
-
-			drive[0] = 'A' + ii;
-			dtype = GetDriveType(drive);
-			if (dtype == DRIVE_CDROM)
-			{
-				return g_strdup(drive);
-			}
-		}
-		drives >>= 1;
-	}
-	return NULL;
+    strcpy(drive, "A:" G_DIR_SEPARATOR_S);
+    drives = GetLogicalDrives();
+    for (ii = 0; ii < 26; ii++)
+    {
+        if (drives & 0x01)
+        {
+            guint dtype;
+
+            drive[0] = 'A' + ii;
+            dtype = GetDriveType(drive);
+            if (dtype == DRIVE_CDROM)
+            {
+                return g_strdup(drive);
+            }
+        }
+        drives >>= 1;
+    }
+    return NULL;
 }
 #endif
 
 void
 ghb_prefs_load(signal_user_data_t *ud)
 {
-	GValue *dict, *internal;
-	GHashTableIter iter;
-	gchar *key;
-	GValue *gval, *path;
-	
-	g_debug("ghb_prefs_load");
-	prefsPlist = load_plist("preferences");
-	if (prefsPlist == NULL)
-		prefsPlist = ghb_dict_value_new();
-	dict = plist_get_dict(prefsPlist, "Preferences");
-	internal = plist_get_dict(internalPlist, "Preferences");
-	if (dict == NULL && internal)
-	{
-		dict = ghb_dict_value_new();
-		ghb_dict_insert(prefsPlist, g_strdup("Preferences"), dict);
-
-		// Get defaults from internal defaults 
-		ghb_dict_iter_init(&iter, internal);
-		// middle (void*) cast prevents gcc warning "defreferencing type-punned
-		// pointer will break strict-aliasing rules"
-		while (g_hash_table_iter_next(
-				&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
-		{
-			ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
-		}
-
-		const gchar *dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-		if (dir == NULL)
-		{
-			dir = ".";
-		}
-		ghb_dict_insert(dict, 
-			g_strdup("ExportDirectory"), ghb_value_dup(ghb_string_value(dir)));
-
-		dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS);
-		if (dir == NULL)
-		{
-			dir = ".";
-		}
-		ghb_dict_insert(dict, 
-			g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir)));
+    GValue *dict, *internal;
+    GHashTableIter iter;
+    gchar *key;
+    GValue *gval, *path;
+    
+    g_debug("ghb_prefs_load");
+    prefsPlist = load_plist("preferences");
+    if (prefsPlist == NULL)
+        prefsPlist = ghb_dict_value_new();
+    dict = plist_get_dict(prefsPlist, "Preferences");
+    internal = plist_get_dict(internalPlist, "Preferences");
+    if (dict == NULL && internal)
+    {
+        dict = ghb_dict_value_new();
+        ghb_dict_insert(prefsPlist, g_strdup("Preferences"), dict);
+
+        // Get defaults from internal defaults 
+        ghb_dict_iter_init(&iter, internal);
+        // middle (void*) cast prevents gcc warning "defreferencing type-punned
+        // pointer will break strict-aliasing rules"
+        while (g_hash_table_iter_next(
+                &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+        {
+            ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
+        }
+
+        const gchar *dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+        if (dir == NULL)
+        {
+            dir = ".";
+        }
+        ghb_dict_insert(dict, 
+            g_strdup("ExportDirectory"), ghb_value_dup(ghb_string_value(dir)));
+
+        dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS);
+        if (dir == NULL)
+        {
+            dir = ".";
+        }
+        ghb_dict_insert(dict, 
+            g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir)));
 
-		ghb_dict_insert(dict, 
-			g_strdup("SrtDir"), ghb_value_dup(ghb_string_value(dir)));
+        ghb_dict_insert(dict, 
+            g_strdup("SrtDir"), ghb_value_dup(ghb_string_value(dir)));
 #if defined(_WIN32)
-		gchar *source;
+        gchar *source;
 
-		source = FindFirstCDROM();
-		if (source == NULL)
-		{
-			source = g_strdup("C:" G_DIR_SEPARATOR_S);
-		}
-		ghb_dict_insert(dict, g_strdup("default_source"), 
-						ghb_value_dup(ghb_string_value(source)));
-		g_free(source);
+        source = FindFirstCDROM();
+        if (source == NULL)
+        {
+            source = g_strdup("C:" G_DIR_SEPARATOR_S);
+        }
+        ghb_dict_insert(dict, g_strdup("default_source"), 
+                        ghb_value_dup(ghb_string_value(source)));
+        g_free(source);
 #endif
-		store_prefs();
-	}
-	// Read legacy default_preset preference and update accordingly
-	path = ghb_dict_lookup(dict, "default_preset");
-	if (path)
-	{
-		gint *indices, len;
-
-		if (G_VALUE_TYPE(path) == G_TYPE_STRING)
-		{
-			GValue *str = path;
-
-			path = ghb_array_value_new(1);
-			ghb_array_append(path, ghb_value_dup(str));
-			indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-			ghb_value_free(path);
-		}
-		else
-			indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-
-		if (indices)
-		{
-			presets_set_default(indices, len);
-			g_free(indices);
-		}
-		ghb_dict_remove(dict, "default_preset");
-		store_prefs();
-	}
+        store_prefs();
+    }
+    // Read legacy default_preset preference and update accordingly
+    path = ghb_dict_lookup(dict, "default_preset");
+    if (path)
+    {
+        gint *indices, len;
+
+        if (G_VALUE_TYPE(path) == G_TYPE_STRING)
+        {
+            GValue *str = path;
+
+            path = ghb_array_value_new(1);
+            ghb_array_append(path, ghb_value_dup(str));
+            indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+            ghb_value_free(path);
+        }
+        else
+            indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+
+        if (indices)
+        {
+            presets_set_default(indices, len);
+            g_free(indices);
+        }
+        ghb_dict_remove(dict, "default_preset");
+        store_prefs();
+    }
 }
 
 static const gchar*
 get_preset_color(gint type, gboolean folder)
 {
-	const gchar *color;
+    const gchar *color;
 
-	if (type == PRESETS_CUSTOM)
-	{
-		color = "DimGray";
-		if (folder)
-		{
-			color = "black";
-		}
-	}
-	else
-	{
-		color = "blue";
-		if (folder)
-		{
-			color = "Navy";
-		}
-	}
-	return color;
+    if (type == PRESETS_CUSTOM)
+    {
+        color = "DimGray";
+        if (folder)
+        {
+            color = "black";
+        }
+    }
+    else
+    {
+        color = "blue";
+        if (folder)
+        {
+            color = "Navy";
+        }
+    }
+    return color;
 }
 
 void
 ghb_presets_list_init(
-	signal_user_data_t *ud, 
-	gint *indices,
-	gint len)
-{
-	GtkTreeView *treeview;
-	GtkTreeIter iter, titer, *piter;
-	
-	GtkTreeStore *store;
-	const gchar *preset;
-	GtkTreePath *parent_path;
-	const gchar *description;
-	gboolean def;
-	gint count, ii;
-	GValue *dict;
-	gint *more_indices;
-	GValue *presets = NULL;
-	
-	g_debug("ghb_presets_list_init ()");
-	more_indices = g_malloc((len+1)*sizeof(gint));
-	memcpy(more_indices, indices, len*sizeof(gint));
-	presets = presets_get_folder(presetsPlist, indices, len);
-	if (presets == NULL)
-	{
-		g_warning("Failed to find parent folder when adding child.");
-		g_free(more_indices);
-		return;
-	}
-	count = ghb_array_len(presets);
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	parent_path = ghb_tree_path_new_from_indices(indices, len);
-	if (parent_path)
-	{
-		gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &titer, parent_path);
-		piter = &titer;
-		gtk_tree_path_free(parent_path);
-	}
-	else
-	{
-		piter = NULL;
-	}
-	for (ii = 0; ii < count; ii++)
-	{
-		const gchar *color;
-		gint type;
-		gboolean folder;
-
-		// Additional settings, add row
-		dict = ghb_array_get_nth(presets, ii);
-		preset = preset_get_name(dict);
-		more_indices[len] = ii;
-		def = preset_is_default(dict);
-
-		description = ghb_presets_get_description(dict);
-		gtk_tree_store_append(store, &iter, piter);
-		type = ghb_preset_type(dict);
-		folder = ghb_preset_folder(dict);
-		color = get_preset_color(type, folder);
-		gtk_tree_store_set(store, &iter, 0, preset, 
-						   	1, def ? 800 : 400, 
-						   	2, def ? 2 : 0,
-						   	3, color, 
-							4, description,
-							5, type == PRESETS_BUILTIN ? 0 : 1,
-						   	-1);
-		if (def && piter)
-		{
-			GtkTreePath *path;
-			GtkTreeIter ppiter;
-
-			if (gtk_tree_model_iter_parent(
-				GTK_TREE_MODEL(store), &ppiter, piter))
-			{
-				path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &ppiter);
-				gtk_tree_view_expand_row(treeview, path, FALSE);
-				gtk_tree_path_free(path);
-			}
-			path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), piter);
-			gtk_tree_view_expand_row(treeview, path, FALSE);
-			gtk_tree_path_free(path);
-		}
-		if (folder)
-		{
-			ghb_presets_list_init(ud, more_indices, len+1);
-			if (preset_folder_is_open(dict))
-			{
-				GtkTreePath *path;
-
-				if (piter != NULL)
-				{
-					path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), piter);
-					gtk_tree_view_expand_row(treeview, path, FALSE);
-					gtk_tree_path_free(path);
-				}
-				path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
-				gtk_tree_view_expand_row(treeview, path, FALSE);
-				gtk_tree_path_free(path);
-			}
-		}
-	}
-	g_free(more_indices);
+    signal_user_data_t *ud, 
+    gint *indices,
+    gint len)
+{
+    GtkTreeView *treeview;
+    GtkTreeIter iter, titer, *piter;
+    
+    GtkTreeStore *store;
+    const gchar *preset;
+    GtkTreePath *parent_path;
+    const gchar *description;
+    gboolean def;
+    gint count, ii;
+    GValue *dict;
+    gint *more_indices;
+    GValue *presets = NULL;
+    
+    g_debug("ghb_presets_list_init ()");
+    more_indices = g_malloc((len+1)*sizeof(gint));
+    memcpy(more_indices, indices, len*sizeof(gint));
+    presets = presets_get_folder(presetsPlist, indices, len);
+    if (presets == NULL)
+    {
+        g_warning("Failed to find parent folder when adding child.");
+        g_free(more_indices);
+        return;
+    }
+    count = ghb_array_len(presets);
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    parent_path = ghb_tree_path_new_from_indices(indices, len);
+    if (parent_path)
+    {
+        gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &titer, parent_path);
+        piter = &titer;
+        gtk_tree_path_free(parent_path);
+    }
+    else
+    {
+        piter = NULL;
+    }
+    for (ii = 0; ii < count; ii++)
+    {
+        const gchar *color;
+        gint type;
+        gboolean folder;
+
+        // Additional settings, add row
+        dict = ghb_array_get_nth(presets, ii);
+        preset = preset_get_name(dict);
+        more_indices[len] = ii;
+        def = preset_is_default(dict);
+
+        description = ghb_presets_get_description(dict);
+        gtk_tree_store_append(store, &iter, piter);
+        type = ghb_preset_type(dict);
+        folder = ghb_preset_folder(dict);
+        color = get_preset_color(type, folder);
+        gtk_tree_store_set(store, &iter, 0, preset, 
+                            1, def ? 800 : 400, 
+                            2, def ? 2 : 0,
+                            3, color, 
+                            4, description,
+                            5, type == PRESETS_BUILTIN ? 0 : 1,
+                            -1);
+        if (def && piter)
+        {
+            GtkTreePath *path;
+            GtkTreeIter ppiter;
+
+            if (gtk_tree_model_iter_parent(
+                GTK_TREE_MODEL(store), &ppiter, piter))
+            {
+                path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &ppiter);
+                gtk_tree_view_expand_row(treeview, path, FALSE);
+                gtk_tree_path_free(path);
+            }
+            path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), piter);
+            gtk_tree_view_expand_row(treeview, path, FALSE);
+            gtk_tree_path_free(path);
+        }
+        if (folder)
+        {
+            ghb_presets_list_init(ud, more_indices, len+1);
+            if (preset_folder_is_open(dict))
+            {
+                GtkTreePath *path;
+
+                if (piter != NULL)
+                {
+                    path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), piter);
+                    gtk_tree_view_expand_row(treeview, path, FALSE);
+                    gtk_tree_path_free(path);
+                }
+                path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
+                gtk_tree_view_expand_row(treeview, path, FALSE);
+                gtk_tree_path_free(path);
+            }
+        }
+    }
+    g_free(more_indices);
 }
 
 static void
 presets_list_update_item(
-	signal_user_data_t *ud, 
-	gint *indices,
-	gint len,
-	gboolean recurse)
-{
-	GtkTreeView *treeview;
-	GtkTreeStore *store;
-	GtkTreeIter iter;
-	GtkTreePath *treepath;
-	const gchar *name;
-	const gchar *description;
-	gint type;
-	gboolean def, folder;
-	GValue *dict;
-	const gchar *color;
-	
-	g_debug("presets_list_update_item ()");
-	dict = presets_get_dict(presetsPlist, indices, len);
-	if (dict == NULL)
-		return;
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	treepath = ghb_tree_path_new_from_indices(indices, len);
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
-	// Additional settings, add row
-	name = preset_get_name(dict);
-	def = preset_is_default(dict);
-
-	description = ghb_presets_get_description(dict);
-	type = ghb_preset_type(dict);
-	folder = ghb_preset_folder(dict);
-	color = get_preset_color(type, folder);
-	gtk_tree_store_set(store, &iter, 0, name, 
-					   	1, def ? 800 : 400, 
-					   	2, def ? 2 : 0,
-					   	3, color,
-						4, description,
-						5, type == PRESETS_BUILTIN ? 0 : 1,
-					   	-1);
-	if (recurse && folder)
-	{
-		ghb_presets_list_init(ud, indices, len);
-	}
+    signal_user_data_t *ud, 
+    gint *indices,
+    gint len,
+    gboolean recurse)
+{
+    GtkTreeView *treeview;
+    GtkTreeStore *store;
+    GtkTreeIter iter;
+    GtkTreePath *treepath;
+    const gchar *name;
+    const gchar *description;
+    gint type;
+    gboolean def, folder;
+    GValue *dict;
+    const gchar *color;
+    
+    g_debug("presets_list_update_item ()");
+    dict = presets_get_dict(presetsPlist, indices, len);
+    if (dict == NULL)
+        return;
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    treepath = ghb_tree_path_new_from_indices(indices, len);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
+    // Additional settings, add row
+    name = preset_get_name(dict);
+    def = preset_is_default(dict);
+
+    description = ghb_presets_get_description(dict);
+    type = ghb_preset_type(dict);
+    folder = ghb_preset_folder(dict);
+    color = get_preset_color(type, folder);
+    gtk_tree_store_set(store, &iter, 0, name, 
+                        1, def ? 800 : 400, 
+                        2, def ? 2 : 0,
+                        3, color,
+                        4, description,
+                        5, type == PRESETS_BUILTIN ? 0 : 1,
+                        -1);
+    if (recurse && folder)
+    {
+        ghb_presets_list_init(ud, indices, len);
+    }
 }
 
 static void
 presets_list_insert(
-	signal_user_data_t *ud, 
-	gint *indices,
-	gint len)
-{
-	GtkTreeView *treeview;
-	GtkTreeIter iter, titer, *piter;
-	GtkTreeStore *store;
-	const gchar *preset;
-	const gchar *description;
-	gint type;
-	gboolean def, folder;
-	gint count;
-	GValue *presets;
-	GtkTreePath *parent_path;
-	GValue *dict;
-	const gchar *color;
-	
-	g_debug("presets_list_insert ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	presets = presets_get_folder(presetsPlist, indices, len-1);
-	if (presets == NULL)
-	{
-		g_warning("Failed to find parent folder while adding child.");
-		return;
-	}
-	parent_path = ghb_tree_path_new_from_indices(indices, len-1);
-	if (parent_path)
-	{
-		gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &titer, parent_path);
-		piter = &titer;
-		gtk_tree_path_free(parent_path);
-	}
-	else
-	{
-		piter = NULL;
-	}
-	count = ghb_array_len(presets);
-	if (indices[len-1] >= count)
-		return;
-	// Additional settings, add row
-	dict = ghb_array_get_nth(presets, indices[len-1]);
-	preset = preset_get_name(dict);
-	def = preset_is_default(dict);
-
-	description = ghb_presets_get_description(dict);
-	gtk_tree_store_insert(store, &iter, piter, indices[len-1]);
-	type = ghb_preset_type(dict);
-	folder = ghb_preset_folder(dict);
-	color = get_preset_color(type, folder);
-	gtk_tree_store_set(store, &iter, 0, preset, 
-					   	1, def ? 800 : 400, 
-					   	2, def ? 2 : 0,
-					   	3, color,
-						4, description,
-						5, type == PRESETS_BUILTIN ? 0 : 1,
-					   	-1);
-	if (folder)
-	{
-		ghb_presets_list_init(ud, indices, len);
-	}
+    signal_user_data_t *ud, 
+    gint *indices,
+    gint len)
+{
+    GtkTreeView *treeview;
+    GtkTreeIter iter, titer, *piter;
+    GtkTreeStore *store;
+    const gchar *preset;
+    const gchar *description;
+    gint type;
+    gboolean def, folder;
+    gint count;
+    GValue *presets;
+    GtkTreePath *parent_path;
+    GValue *dict;
+    const gchar *color;
+    
+    g_debug("presets_list_insert ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    presets = presets_get_folder(presetsPlist, indices, len-1);
+    if (presets == NULL)
+    {
+        g_warning("Failed to find parent folder while adding child.");
+        return;
+    }
+    parent_path = ghb_tree_path_new_from_indices(indices, len-1);
+    if (parent_path)
+    {
+        gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &titer, parent_path);
+        piter = &titer;
+        gtk_tree_path_free(parent_path);
+    }
+    else
+    {
+        piter = NULL;
+    }
+    count = ghb_array_len(presets);
+    if (indices[len-1] >= count)
+        return;
+    // Additional settings, add row
+    dict = ghb_array_get_nth(presets, indices[len-1]);
+    preset = preset_get_name(dict);
+    def = preset_is_default(dict);
+
+    description = ghb_presets_get_description(dict);
+    gtk_tree_store_insert(store, &iter, piter, indices[len-1]);
+    type = ghb_preset_type(dict);
+    folder = ghb_preset_folder(dict);
+    color = get_preset_color(type, folder);
+    gtk_tree_store_set(store, &iter, 0, preset, 
+                        1, def ? 800 : 400, 
+                        2, def ? 2 : 0,
+                        3, color,
+                        4, description,
+                        5, type == PRESETS_BUILTIN ? 0 : 1,
+                        -1);
+    if (folder)
+    {
+        ghb_presets_list_init(ud, indices, len);
+    }
 }
 
 static void
 presets_list_remove(
-	signal_user_data_t *ud, 
-	gint *indices,
-	gint len)
-{
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeIter iter;
-	GtkTreeStore *store;
-	
-	g_debug("presets_list_remove ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	treepath = ghb_tree_path_new_from_indices(indices, len);
-	if (treepath)
-	{
-		if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
-			gtk_tree_store_remove(store, &iter);
-		gtk_tree_path_free(treepath);
-	}
+    signal_user_data_t *ud, 
+    gint *indices,
+    gint len)
+{
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeIter iter;
+    GtkTreeStore *store;
+    
+    g_debug("presets_list_remove ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    treepath = ghb_tree_path_new_from_indices(indices, len);
+    if (treepath)
+    {
+        if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
+            gtk_tree_store_remove(store, &iter);
+        gtk_tree_path_free(treepath);
+    }
 }
 
 static void
 remove_std_presets(signal_user_data_t *ud)
 {
-	gint count, ii;
-	gint indices = 0;
+    gint count, ii;
+    gint indices = 0;
 
-	count = ghb_array_len(presetsPlist);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		GValue *dict;
-		gint ptype;
-
-		dict = ghb_array_get_nth(presetsPlist, ii);
-		ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
-		if (ptype == PRESETS_BUILTIN)
-		{
-			if (ghb_presets_remove(presetsPlist, &indices, 1))
-			{
-				presets_list_remove(ud, &indices, 1);
-			}
-		}
-	}
+    count = ghb_array_len(presetsPlist);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        GValue *dict;
+        gint ptype;
+
+        dict = ghb_array_get_nth(presetsPlist, ii);
+        ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
+        if (ptype == PRESETS_BUILTIN)
+        {
+            if (ghb_presets_remove(presetsPlist, &indices, 1))
+            {
+                presets_list_remove(ud, &indices, 1);
+            }
+        }
+    }
 }
 
 void
 ghb_save_queue(GValue *queue)
 {
-	pid_t pid;
-	char *path;
+    pid_t pid;
+    char *path;
 
-	pid = getpid();
-	path = g_strdup_printf ("queue.%d", pid);
-	store_plist(queue, path);
-	g_free(path);
+    pid = getpid();
+    path = g_strdup_printf ("queue.%d", pid);
+    store_plist(queue, path);
+    g_free(path);
 }
 
 GValue*
 ghb_load_queue()
 {
-	GValue *queue;
-	pid_t pid;
-	char *path;
-
-	pid = getpid();
-	path = g_strdup_printf ("queue.%d", pid);
-	queue = load_plist(path);
-	g_free(path);
-	return queue;
+    GValue *queue;
+    pid_t pid;
+    char *path;
+
+    pid = getpid();
+    path = g_strdup_printf ("queue.%d", pid);
+    queue = load_plist(path);
+    g_free(path);
+    return queue;
 }
 
 GValue*
 ghb_load_old_queue(int pid)
 {
-	GValue *queue;
-	char *path;
+    GValue *queue;
+    char *path;
 
-	path = g_strdup_printf ("queue.%d", pid);
-	queue = load_plist(path);
-	g_free(path);
-	return queue;
+    path = g_strdup_printf ("queue.%d", pid);
+    queue = load_plist(path);
+    g_free(path);
+    return queue;
 }
 
 void
 ghb_remove_old_queue_file(int pid)
 {
-	char *path;
+    char *path;
 
-	path = g_strdup_printf ("queue.%d", pid);
-	remove_plist(path);
-	g_free(path);
+    path = g_strdup_printf ("queue.%d", pid);
+    remove_plist(path);
+    g_free(path);
 }
 
 void
 ghb_remove_queue_file()
 {
-	pid_t pid;
-	char *path;
+    pid_t pid;
+    char *path;
 
-	pid = getpid();
-	path = g_strdup_printf ("queue.%d", pid);
-	remove_plist(path);
-	g_free(path);
+    pid = getpid();
+    path = g_strdup_printf ("queue.%d", pid);
+    remove_plist(path);
+    g_free(path);
 }
 
 typedef struct
 {
-	gchar *mac_val;
-	gchar *lin_val;
+    const gchar *mac_val;
+    const gchar *lin_val;
 } value_map_t;
 
-static value_map_t vcodec_xlat[] =
+static value_map_t vcodec_xlat_compat[] =
 {
-	{"MPEG-2 (FFmpeg)", "ffmpeg2"},
-	{"MPEG-4 (FFmpeg)", "ffmpeg4"},
-	{"MPEG-4 (FFmpeg)", "ffmpeg"},
-	{"MPEG-4 (XviD)", "ffmpeg4"},
-	{"H.264 (x264)", "x264"},
-	{"VP3 (Theora)", "theora"},
-	{NULL,NULL}
+    {"MPEG-4 (FFmpeg)", "ffmpeg"},
+    {"MPEG-4 (XviD)", "ffmpeg4"},
+    {NULL,NULL}
 };
 
-static value_map_t acodec_xlat[] =
+static value_map_t *vcodec_xlat;
+
+static value_map_t acodec_xlat_compat[] =
 {
-	{"AAC (ffmpeg)", "ffaac"},
-	{"AAC (faac)", "faac"},
-	{"AAC (CoreAudio)", "faac"},
-	{"HE-AAC (CoreAudio)", "faac"},
-	{"AC3 (ffmpeg)", "ffac3"},
-	{"AC3 (ffmpeg)", "ac3"},
-	{"AC3", "ac3"},			// Backwards compatibility with mac ui
-	{"MP3 Passthru", "copy:mp3"},
-	{"MP3 Passthru", "mp3pass"},
-	{"AAC Passthru", "copy:aac"},
-	{"AAC Passthru", "aacpass"},
-	{"AC3 Passthru", "copy:ac3"},
-	{"AC3 Passthru", "ac3pass"},
-	{"DTS Passthru", "copy:dts"},
-	{"DTS Passthru", "dtspass"},
-	{"DTS-HD Passthru", "copy:dtshd"},
-	{"DTS-HD Passthru", "dtshdpass"},
-	{"Auto Passthru", "copy"},
-	{"Auto Passthru", "auto"},
-	{"MP3 (lame)", "lame"},
-	{"FLAC (ffmpeg)", "ffflac"},
-	{"Vorbis (vorbis)", "vorbis"},
-	{NULL,NULL}
+    {"AAC (CoreAudio)", "faac"},
+    {"HE-AAC (CoreAudio)", "faac"},
+    {"AC3 (ffmpeg)", "ac3"},
+    {"AC3", "ac3"},
+    {"MP3 Passthru", "mp3pass"},
+    {"AAC Passthru", "aacpass"},
+    {"AC3 Passthru", "ac3pass"},
+    {"DTS Passthru", "dtspass"},
+    {"DTS-HD Passthru", "dtshdpass"},
+    {"Auto Passthru", "auto"},
+    {NULL,NULL}
 };
 
+static value_map_t *acodec_xlat;
+
+static value_map_t * create_encoder_xlat_tbl(value_map_t *compat, hb_encoder_t *enc, int size)
+{
+    value_map_t *out;
+    int cc, ii;
+
+    for (cc = 0; compat[cc].mac_val != NULL; cc++);
+    
+    out = calloc(cc + size + 1, sizeof(value_map_t));
+
+    for (ii = 0; ii < size; ii++)
+    {
+        out[ii].mac_val = enc[ii].human_readable_name;
+        out[ii].lin_val = enc[ii].short_name;
+    }
+
+    for (ii = 0; ii < cc; ii++)
+        out[ii+size] = compat[ii];
+
+    return out;
+}
+
+static value_map_t * create_mix_xlat_tbl(value_map_t *compat, hb_mixdown_t * mix, int size)
+{
+    value_map_t *out;
+    int cc, ii;
+
+    for (cc = 0; compat[cc].mac_val != NULL; cc++);
+
+    out = calloc(cc + size + 1, sizeof(value_map_t));
+
+    for (ii = 0; ii < size; ii++)
+    {
+        out[ii].mac_val = mix[ii].human_readable_name;
+        out[ii].lin_val = mix[ii].short_name;
+    }
+
+    for (ii = 0; ii < cc; ii++)
+        out[ii+size] = compat[ii];
+
+    return out;
+}
+
 value_map_t container_xlat[] =
 {
-	{"MP4 file", "mp4"},
-	{"M4V file", "mp4"},
-	{"MKV file", "mkv"},
-	{"AVI file", "mkv"},
-	{"OGM file", "mkv"},
-	{NULL, NULL}
+    {"MP4 file", "mp4"},
+    {"M4V file", "mp4"},
+    {"MKV file", "mkv"},
+    {"AVI file", "mkv"},
+    {"OGM file", "mkv"},
+    {NULL, NULL}
 };
 
 value_map_t framerate_xlat[] =
 {
-	{"Same as source", "source"},
-	{"5", "5"},
-	{"10", "10"},
-	{"12", "12"},
-	{"15", "15"},
-	{"23.976 (NTSC Film)", "23.976"},
-	{"24", "24"},
-	{"25 (PAL Film/Video)", "25"},
-	{"29.97 (NTSC Video)", "29.97"},
-	{"30", "30"},
-	{"50", "50"},
-	{"59.94", "59.94"},
-	{"60", "60"},
-	{NULL, NULL}
+    {"Same as source", "source"},
+    {"5", "5"},
+    {"10", "10"},
+    {"12", "12"},
+    {"15", "15"},
+    {"23.976 (NTSC Film)", "23.976"},
+    {"24", "24"},
+    {"25 (PAL Film/Video)", "25"},
+    {"29.97 (NTSC Video)", "29.97"},
+    {"30", "30"},
+    {"50", "50"},
+    {"59.94", "59.94"},
+    {"60", "60"},
+    {NULL, NULL}
 };
 
 value_map_t samplerate_xlat[] =
 {
-	{"Auto", "source"},
-	{"22.05", "22.05"},
-	{"24", "24"},
-	{"32", "32"},
-	{"44.1", "44.1"},
-	{"48", "48"},
-	{NULL, NULL}
+    {"Auto", "source"},
+    {"22.05", "22.05"},
+    {"24", "24"},
+    {"32", "32"},
+    {"44.1", "44.1"},
+    {"48", "48"},
+    {NULL, NULL}
 };
 
-value_map_t mix_xlat[] =
+// mix translation table filed in with hb_audio_mixdowns table contents
+value_map_t *mix_xlat;
+
+// Backwards compatibility mappings for audio mix
+value_map_t mix_xlat_compat[] =
 {
-	{"Mono", "mono"},
-	{"Stereo", "stereo"},
-	{"Dolby Surround", "dpl1"},
-	{"Dolby Pro Logic II", "dpl2"},
-	{"6-channel discrete", "6ch"},
-	{"None", "none"},
-	{"AC3 Passthru", "none"},    // Backwards compatibility with mac ui
-	{"DTS Passthru", "none"},    // Backwards compatibility with mac ui
-	{"DTS-HD Passthru", "none"}, // Backwards compatibility with mac ui
-	{NULL, NULL}
+    {"6-channel discrete", "5point1"},
+    {"AC3 Passthru", "none"},
+    {"DTS Passthru", "none"},
+    {"DTS-HD Passthru", "none"},
+    {NULL, NULL}
 };
 
 value_map_t deint_xlat[] =
 {
-	{"0", "off"},
-	{"1", "custom"},
-	{"2", "fast"},
-	{"3", "slow"},
-	{"4", "slower"},
-	{NULL, NULL}
+    {"0", "off"},
+    {"1", "custom"},
+    {"2", "fast"},
+    {"3", "slow"},
+    {"4", "slower"},
+    {"5", "bob"},
+    {NULL, NULL}
 };
 
 value_map_t denoise_xlat[] =
 {
-	{"0", "off"},
-	{"1", "custom"},
-	{"2", "weak"},
-	{"3", "medium"},
-	{"4", "strong"},
-	{NULL, NULL}
+    {"0", "off"},
+    {"1", "custom"},
+    {"2", "weak"},
+    {"3", "medium"},
+    {"4", "strong"},
+    {NULL, NULL}
 };
 
 value_map_t detel_xlat[] =
 {
-	{"0", "off"},
-	{"1", "custom"},
-	{"2", "default"},
-	{NULL, NULL}
+    {"0", "off"},
+    {"1", "custom"},
+    {"2", "default"},
+    {NULL, NULL}
 };
 
 value_map_t decomb_xlat[] =
 {
-	{"0", "off"},
-	{"1", "custom"},
-	{"2", "default"},
-	{"3", "fast"},
-	{NULL, NULL}
+    {"0", "off"},
+    {"1", "custom"},
+    {"2", "default"},
+    {"3", "fast"},
+    {"4", "bob"},
+    {NULL, NULL}
 };
 
 extern iso639_lang_t ghb_language_table[];
@@ -2123,821 +2182,935 @@
 static GValue*
 export_lang_xlat2(GValue *lin_val)
 {
-	GValue *gval;
+    GValue *gval;
+
+    if (lin_val == NULL) return NULL;
+    gint ii;
+    gchar *str;
+
+    str = ghb_value_string(lin_val);
+    for (ii = 0; ghb_language_table[ii].eng_name; ii++)
+    {
+        if (strcmp(str, ghb_language_table[ii].iso639_2) == 0)
+        {
+            const gchar *lang;
+
+            if (ghb_language_table[ii].native_name[0] != 0)
+                lang = ghb_language_table[ii].native_name;
+            else
+                lang = ghb_language_table[ii].eng_name;
 
-	if (lin_val == NULL) return NULL;
-	gint ii;
-	gchar *str;
-
-	str = ghb_value_string(lin_val);
-	for (ii = 0; ghb_language_table[ii].eng_name; ii++)
-	{
-		if (strcmp(str, ghb_language_table[ii].iso639_2) == 0)
-		{
-			const gchar *lang;
-
-			if (ghb_language_table[ii].native_name[0] != 0)
-				lang = ghb_language_table[ii].native_name;
-			else
-				lang = ghb_language_table[ii].eng_name;
-
-			gval = ghb_string_value_new(lang);
-			g_free(str);
-			return gval;
-		}
-	}
-	g_debug("Can't map language value: (%s)", str);
-	g_free(str);
-	return NULL;
+            gval = ghb_string_value_new(lang);
+            g_free(str);
+            return gval;
+        }
+    }
+    g_debug("Can't map language value: (%s)", str);
+    g_free(str);
+    return NULL;
 }
 
 static GValue*
 export_subtitle_xlat2(GValue *lin_val)
 {
-	gchar *str;
-	GValue *gval;
+    gchar *str;
+    GValue *gval;
 
-	if (lin_val == NULL) return NULL;
-	str = ghb_value_string(lin_val);
-	if (strcmp(str, "none") == 0)
-	{
-		gval = ghb_string_value_new("None");
-	}
-	else if (strcmp(str, "auto") == 0)
-	{
-		gval = ghb_string_value_new("Autoselect");
-	}
-	else
-	{
-		gval = export_lang_xlat2(lin_val);
-	}
-	g_free(str);
-	return gval;
+    if (lin_val == NULL) return NULL;
+    str = ghb_value_string(lin_val);
+    if (strcmp(str, "none") == 0)
+    {
+        gval = ghb_string_value_new("None");
+    }
+    else if (strcmp(str, "auto") == 0)
+    {
+        gval = ghb_string_value_new("Autoselect");
+    }
+    else
+    {
+        gval = export_lang_xlat2(lin_val);
+    }
+    g_free(str);
+    return gval;
 }
 
 static GValue*
 import_lang_xlat2(GValue *mac_val)
 {
-	GValue *gval;
+    GValue *gval;
 
-	if (mac_val == NULL) return NULL;
-	gint ii;
-	gchar *str;
-
-	str = ghb_value_string(mac_val);
-	for (ii = 0; ghb_language_table[ii].eng_name; ii++)
-	{
-		if ((strcmp(str, ghb_language_table[ii].eng_name) == 0) ||
-			(strcmp(str, ghb_language_table[ii].native_name) == 0))
-		{
-			gval = ghb_string_value_new(ghb_language_table[ii].iso639_2);
-			g_free(str);
-			return gval;
-		}
-	}
-	g_debug("Can't map language value: (%s)", str);
-	g_free(str);
-	return NULL;
+    if (mac_val == NULL) return NULL;
+    gint ii;
+    gchar *str;
+
+    str = ghb_value_string(mac_val);
+    for (ii = 0; ghb_language_table[ii].eng_name; ii++)
+    {
+        if ((strcmp(str, ghb_language_table[ii].eng_name) == 0) ||
+            (strcmp(str, ghb_language_table[ii].native_name) == 0))
+        {
+            gval = ghb_string_value_new(ghb_language_table[ii].iso639_2);
+            g_free(str);
+            return gval;
+        }
+    }
+    g_debug("Can't map language value: (%s)", str);
+    g_free(str);
+    return NULL;
 }
 
 static GValue*
 import_subtitle_xlat2(GValue *mac_val)
 {
-	gchar *str;
-	GValue *gval;
+    gchar *str;
+    GValue *gval;
 
-	if (mac_val == NULL) return NULL;
-	str = ghb_value_string(mac_val);
-	if (strcmp(str, "None") == 0)
-	{
-		gval = ghb_string_value_new("none");
-	}
-	else if (strcmp(str, "Autoselect") == 0)
-	{
-		gval = ghb_string_value_new("auto");
-	}
-	else
-	{
-		gval = import_lang_xlat2(mac_val);
-	}
-	g_free(str);
-	return gval;
+    if (mac_val == NULL) return NULL;
+    str = ghb_value_string(mac_val);
+    if (strcmp(str, "None") == 0)
+    {
+        gval = ghb_string_value_new("none");
+    }
+    else if (strcmp(str, "Autoselect") == 0)
+    {
+        gval = ghb_string_value_new("auto");
+    }
+    else
+    {
+        gval = import_lang_xlat2(mac_val);
+    }
+    g_free(str);
+    return gval;
 }
 
 static GValue*
 export_audio_track_xlat2(GValue *lin_val)
 {
-	gchar *str;
-	GValue *gval = NULL;
+    gchar *str;
+    GValue *gval = NULL;
 
-	if (lin_val == NULL) return NULL;
-	str = ghb_value_string(lin_val);
-	if (strcmp(str, "none") == 0)
-	{
-		gval = ghb_int_value_new(1);
-	}
-	else
-	{
-		gint val = ghb_value_int(lin_val) + 1;
-		gval = ghb_int_value_new(val);
-	}
-	g_free(str);
-	return gval;
+    if (lin_val == NULL) return NULL;
+    str = ghb_value_string(lin_val);
+    if (strcmp(str, "none") == 0)
+    {
+        gval = ghb_int_value_new(1);
+    }
+    else
+    {
+        gint val = ghb_value_int(lin_val) + 1;
+        gval = ghb_int_value_new(val);
+    }
+    g_free(str);
+    return gval;
 }
 
 static GValue*
 import_audio_track_xlat2(GValue *mac_val)
 {
-	gint val;
-	gchar *str;
-	GValue *gval;
-
-	if (mac_val == NULL) return NULL;
-	val = ghb_value_int(mac_val);
-	if (val <= 0)
-	{
-		val = 0;
-	}
-	else
-	{
-		val--;
-	}
-	str = g_strdup_printf("%d", val);
-	gval = ghb_string_value_new(str);
-	g_free(str);
-	return gval;
+    gint val;
+    gchar *str;
+    GValue *gval;
+
+    if (mac_val == NULL) return NULL;
+    val = ghb_value_int(mac_val);
+    if (val <= 0)
+    {
+        val = 0;
+    }
+    else
+    {
+        val--;
+    }
+    str = g_strdup_printf("%d", val);
+    gval = ghb_string_value_new(str);
+    g_free(str);
+    return gval;
 }
 
 static GValue*
 export_value_xlat2(value_map_t *value_map, GValue *lin_val, GType mac_type)
 {
-	GValue *gval;
+    GValue *gval;
 
-	if (lin_val == NULL) return NULL;
-	gint ii;
-	gchar *str;
-	GValue *sval;
-
-	str = ghb_value_string(lin_val);
-	for (ii = 0; value_map[ii].mac_val; ii++)
-	{
-		if (strcmp(str, value_map[ii].lin_val) == 0)
-		{
-			sval = ghb_string_value_new(value_map[ii].mac_val);
-			g_free(str);
-			gval = ghb_value_new(mac_type);
-			if (!g_value_transform(sval, gval))
-			{
-				g_warning("can't transform");
-				ghb_value_free(gval);
-				ghb_value_free(sval);
-				return NULL;
-			}
-			ghb_value_free(sval);
-			return gval;
-		}
-	}
-	g_debug("Can't map value: (%s)", str);
-	g_free(str);
-	return NULL;
+    if (lin_val == NULL) return NULL;
+    gint ii;
+    gchar *str;
+    GValue *sval;
+
+    str = ghb_value_string(lin_val);
+    for (ii = 0; value_map[ii].mac_val; ii++)
+    {
+        if (strcmp(str, value_map[ii].lin_val) == 0)
+        {
+            sval = ghb_string_value_new(value_map[ii].mac_val);
+            g_free(str);
+            gval = ghb_value_new(mac_type);
+            if (!g_value_transform(sval, gval))
+            {
+                g_warning("can't transform");
+                ghb_value_free(gval);
+                ghb_value_free(sval);
+                return NULL;
+            }
+            ghb_value_free(sval);
+            return gval;
+        }
+    }
+    g_debug("Can't map value: (%s)", str);
+    g_free(str);
+    return NULL;
 }
 
 static void
 export_value_xlat(GValue *dict)
 {
-	GValue *lin_val, *gval;
-	const gchar *key;
+    GValue *lin_val, *gval;
+    const gchar *key;
 
-	key = "VideoEncoder";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(vcodec_xlat, lin_val, G_TYPE_STRING);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "FileFormat";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(container_xlat, lin_val, G_TYPE_STRING);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "VideoFramerate";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(framerate_xlat, lin_val, G_TYPE_STRING);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDetelecine";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(detel_xlat, lin_val, G_TYPE_INT);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDecomb";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(decomb_xlat, lin_val, G_TYPE_INT);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDeinterlace";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(deint_xlat, lin_val, G_TYPE_INT);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDenoise";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(denoise_xlat, lin_val, G_TYPE_INT);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-
-	GValue *slist;
-	GValue *sdict;
-	gint count, ii;
-
-	slist = ghb_dict_lookup(dict, "SubtitleList");
-	count = ghb_array_len(slist);
-	for (ii = 0; ii < count; ii++)
-	{
-		sdict = ghb_array_get_nth(slist, ii);
-		key = "SubtitleLanguage";
-		lin_val = ghb_dict_lookup(sdict, key);
-		gval = export_subtitle_xlat2(lin_val);
-		if (gval)
-			ghb_dict_insert(sdict, g_strdup(key), gval);
-	}
-
-	GValue *alist;
-	GValue *adict;
-
-	key = "AudioEncoderFallback";
-	lin_val = ghb_dict_lookup(dict, key);
-	gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-
-	alist = ghb_dict_lookup(dict, "AudioList");
-	count = ghb_array_len(alist);
-	for (ii = 0; ii < count; ii++)
-	{
-		adict = ghb_array_get_nth(alist, ii);
-		key = "AudioTrack";
-		lin_val = ghb_dict_lookup(adict, key);
-		gval = export_audio_track_xlat2(lin_val);
-		if (gval)
-			ghb_dict_insert(adict, g_strdup(key), gval);
-		key = "AudioEncoder";
-		lin_val = ghb_dict_lookup(adict, key);
-		gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING);
-		if (gval)
-			ghb_dict_insert(adict, g_strdup(key), gval);
-		key = "AudioSamplerate";
-		lin_val = ghb_dict_lookup(adict, key);
-		gval = export_value_xlat2(samplerate_xlat, lin_val, G_TYPE_STRING);
-		if (gval)
-			ghb_dict_insert(adict, g_strdup(key), gval);
-		key = "AudioMixdown";
-		lin_val = ghb_dict_lookup(adict, key);
-		gval = export_value_xlat2(mix_xlat, lin_val, G_TYPE_STRING);
-		if (gval)
-			ghb_dict_insert(adict, g_strdup(key), gval);
-	}
+    key = "VideoEncoder";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(vcodec_xlat, lin_val, G_TYPE_STRING);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "FileFormat";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(container_xlat, lin_val, G_TYPE_STRING);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "VideoFramerate";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(framerate_xlat, lin_val, G_TYPE_STRING);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDetelecine";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(detel_xlat, lin_val, G_TYPE_INT);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDecomb";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(decomb_xlat, lin_val, G_TYPE_INT);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDeinterlace";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(deint_xlat, lin_val, G_TYPE_INT);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDenoise";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(denoise_xlat, lin_val, G_TYPE_INT);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+
+    GValue *slist;
+    GValue *sdict;
+    gint count, ii;
+
+    slist = ghb_dict_lookup(dict, "SubtitleList");
+    count = ghb_array_len(slist);
+    for (ii = 0; ii < count; ii++)
+    {
+        sdict = ghb_array_get_nth(slist, ii);
+        key = "SubtitleLanguage";
+        lin_val = ghb_dict_lookup(sdict, key);
+        gval = export_subtitle_xlat2(lin_val);
+        if (gval)
+            ghb_dict_insert(sdict, g_strdup(key), gval);
+    }
+
+    GValue *alist;
+    GValue *adict;
+
+    key = "AudioEncoderFallback";
+    lin_val = ghb_dict_lookup(dict, key);
+    gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+
+    alist = ghb_dict_lookup(dict, "AudioList");
+    count = ghb_array_len(alist);
+    for (ii = 0; ii < count; ii++)
+    {
+        adict = ghb_array_get_nth(alist, ii);
+        key = "AudioTrack";
+        lin_val = ghb_dict_lookup(adict, key);
+        gval = export_audio_track_xlat2(lin_val);
+        if (gval)
+            ghb_dict_insert(adict, g_strdup(key), gval);
+        key = "AudioEncoder";
+        lin_val = ghb_dict_lookup(adict, key);
+        gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING);
+        if (gval)
+            ghb_dict_insert(adict, g_strdup(key), gval);
+        key = "AudioSamplerate";
+        lin_val = ghb_dict_lookup(adict, key);
+        gval = export_value_xlat2(samplerate_xlat, lin_val, G_TYPE_STRING);
+        if (gval)
+            ghb_dict_insert(adict, g_strdup(key), gval);
+        key = "AudioMixdown";
+        lin_val = ghb_dict_lookup(adict, key);
+        gval = export_value_xlat2(mix_xlat, lin_val, G_TYPE_STRING);
+        if (gval)
+            ghb_dict_insert(adict, g_strdup(key), gval);
+    }
 }
 
 
 static GValue*
 import_value_xlat2(
-	GValue *defaults, 
-	value_map_t *value_map,
-	const gchar *key, 
-	GValue *mac_val)
-{
-	GValue *gval, *def_val;
-
-	if (mac_val == NULL) return NULL;
-	def_val = ghb_dict_lookup(defaults, key);
-	if (def_val)
-	{
-		gint ii;
-		gchar *str;
-		GValue *sval;
-
-		str = ghb_value_string(mac_val);
-		for (ii = 0; value_map[ii].mac_val; ii++)
-		{
-			if (strcmp(str, value_map[ii].mac_val) == 0 ||
-				strcmp(str, value_map[ii].lin_val) == 0)
-			{
-				sval = ghb_string_value_new(value_map[ii].lin_val);
-				g_free(str);
-				gval = ghb_value_new(G_VALUE_TYPE(def_val));
-				if (!g_value_transform(sval, gval))
-				{
-					g_warning("can't transform");
-					ghb_value_free(gval);
-					ghb_value_free(sval);
-					return NULL;
-				}
-				ghb_value_free(sval);
-				return gval;
-			}
-		}
-		g_free(str);
-		return ghb_value_dup(def_val);
-	}
-	else
-	{
-		gint ii;
-		gchar *str;
-		GValue *sval;
-
-		str = ghb_value_string(mac_val);
-		for (ii = 0; value_map[ii].mac_val; ii++)
-		{
-			if (strcmp(str, value_map[ii].mac_val) == 0 ||
-				strcmp(str, value_map[ii].lin_val) == 0)
-			{
-				sval = ghb_string_value_new(value_map[ii].lin_val);
-				g_free(str);
-				gval = ghb_value_new(G_VALUE_TYPE(mac_val));
-				if (!g_value_transform(sval, gval))
-				{
-					g_warning("can't transform");
-					ghb_value_free(gval);
-					ghb_value_free(sval);
-					return NULL;
-				}
-				ghb_value_free(sval);
-				return gval;
-			}
-		}
-		g_free(str);
-	}
-	return NULL;
+    GValue *defaults, 
+    value_map_t *value_map,
+    const gchar *key, 
+    GValue *mac_val)
+{
+    GValue *gval, *def_val;
+
+    if (mac_val == NULL) return NULL;
+    def_val = ghb_dict_lookup(defaults, key);
+    if (def_val)
+    {
+        gint ii;
+        gchar *str;
+        GValue *sval;
+
+        str = ghb_value_string(mac_val);
+        for (ii = 0; value_map[ii].mac_val; ii++)
+        {
+            if (strcmp(str, value_map[ii].mac_val) == 0 ||
+                strcmp(str, value_map[ii].lin_val) == 0)
+            {
+                sval = ghb_string_value_new(value_map[ii].lin_val);
+                g_free(str);
+                gval = ghb_value_new(G_VALUE_TYPE(def_val));
+                if (!g_value_transform(sval, gval))
+                {
+                    g_warning("can't transform");
+                    ghb_value_free(gval);
+                    ghb_value_free(sval);
+                    return NULL;
+                }
+                ghb_value_free(sval);
+                return gval;
+            }
+        }
+        g_free(str);
+        return ghb_value_dup(def_val);
+    }
+    else
+    {
+        gint ii;
+        gchar *str;
+        GValue *sval;
+
+        str = ghb_value_string(mac_val);
+        for (ii = 0; value_map[ii].mac_val; ii++)
+        {
+            if (strcmp(str, value_map[ii].mac_val) == 0 ||
+                strcmp(str, value_map[ii].lin_val) == 0)
+            {
+                sval = ghb_string_value_new(value_map[ii].lin_val);
+                g_free(str);
+                gval = ghb_value_new(G_VALUE_TYPE(mac_val));
+                if (!g_value_transform(sval, gval))
+                {
+                    g_warning("can't transform");
+                    ghb_value_free(gval);
+                    ghb_value_free(sval);
+                    return NULL;
+                }
+                ghb_value_free(sval);
+                return gval;
+            }
+        }
+        g_free(str);
+    }
+    return NULL;
 }
 
 static void
 import_value_xlat(GValue *dict)
 {
-	GValue *defaults, *mac_val, *gval;
-	const gchar *key;
+    GValue *defaults, *mac_val, *gval;
+    const gchar *key;
 
-	defaults = plist_get_dict(internalPlist, "Presets");
-	key = "VideoEncoder";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, vcodec_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "FileFormat";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, container_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "VideoFramerate";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, framerate_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDetelecine";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, detel_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDecomb";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, decomb_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDeinterlace";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, deint_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-	key = "PictureDenoise";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, denoise_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-
-
-	GValue *sdeflist;
-	GValue *sdefaults;
-	GValue *slist;
-	GValue *sdict;
-	gint count, ii;
-
-	sdeflist = ghb_dict_lookup(defaults, "SubtitleList");
-	if (sdeflist)
-	{
-		slist = ghb_dict_lookup(dict, "SubtitleList");
-		if (slist)
-		{
-			sdefaults = ghb_array_get_nth(sdeflist, 0);
-			count = ghb_array_len(slist);
-			for (ii = 0; ii < count; ii++)
-			{
-				sdict = ghb_array_get_nth(slist, ii);
-				key = "SubtitleLanguage";
-				mac_val = ghb_dict_lookup(sdict, key);
-				gval = import_subtitle_xlat2(mac_val);
-				if (gval)
-					ghb_dict_insert(sdict, g_strdup(key), gval);
-			}
-		
-		}
-		else
-		{
-			key = "Subtitles";
-			mac_val = ghb_dict_lookup(dict, key);
-			slist = ghb_array_value_new(8);
-			ghb_dict_insert(dict, g_strdup("SubtitleList"), slist);
-			if (mac_val)
-			{
-				gchar *lang;
-	
-				gval = import_subtitle_xlat2(mac_val);
-				lang = ghb_value_string(gval);
-				if (lang && strcasecmp(lang, "none") != 0 && !slist)
-				{
-					sdict = ghb_dict_value_new();
-					ghb_array_append(slist, sdict);
-					ghb_dict_insert(sdict, g_strdup("SubtitleLanguage"), gval);
-					gval = ghb_dict_lookup(dict, "SubtitlesForced");
-					if (gval != NULL)
-					{
-						ghb_dict_insert(sdict, g_strdup("SubtitleForced"), 
-										ghb_value_dup(gval));
-					}
-					else
-					{
-						ghb_dict_insert(sdict, g_strdup("SubtitleForced"), 
-										ghb_boolean_value_new(FALSE));
-					}
-					ghb_dict_insert(sdict, g_strdup("SubtitleBurned"),
-									ghb_boolean_value_new(TRUE));
-					ghb_dict_insert(sdict, g_strdup("SubtitleDefaultTrack"),
-									ghb_boolean_value_new(FALSE));
-				}
-				else
-				{
-					ghb_value_free(gval);
-				}
-				if (lang)
-					g_free(lang);
-			}
-		}
-	}
-	ghb_dict_remove(dict, "Subtitles");
-	ghb_dict_remove(dict, "SubtitlesForced");
-
-
-	GValue *alist;
-	GValue *adict;
-	GValue *adefaults;
-	GValue *adeflist;
-
-	key = "AudioEncoderFallback";
-	mac_val = ghb_dict_lookup(dict, key);
-	gval = import_value_xlat2(defaults, acodec_xlat, key, mac_val);
-	if (gval)
-		ghb_dict_insert(dict, g_strdup(key), gval);
-
-	adeflist = ghb_dict_lookup(defaults, "AudioList");
-	if (adeflist)
-	{
-		adefaults = ghb_array_get_nth(adeflist, 0);
-		alist = ghb_dict_lookup(dict, "AudioList");
-		count = ghb_array_len(alist);
-		for (ii = 0; ii < count; ii++)
-		{
-			adict = ghb_array_get_nth(alist, ii);
-			key = "AudioTrack";
-			mac_val = ghb_dict_lookup(adict, key);
-			gval = import_audio_track_xlat2(mac_val);
-			if (gval)
-				ghb_dict_insert(adict, g_strdup(key), gval);
-			key = "AudioEncoder";
-			mac_val = ghb_dict_lookup(adict, key);
-			gval = import_value_xlat2(adefaults, acodec_xlat, key, mac_val);
-			if (gval)
-				ghb_dict_insert(adict, g_strdup(key), gval);
-			key = "AudioSamplerate";
-			mac_val = ghb_dict_lookup(adict, key);
-			gval = import_value_xlat2(adefaults, samplerate_xlat, key, mac_val);
-			if (gval)
-				ghb_dict_insert(adict, g_strdup(key), gval);
-			key = "AudioMixdown";
-			mac_val = ghb_dict_lookup(adict, key);
-			gval = import_value_xlat2(adefaults, mix_xlat, key, mac_val);
-			if (gval)
-				ghb_dict_insert(adict, g_strdup(key), gval);
-
-			mac_val = ghb_dict_lookup(adict, "AudioTrackDRCSlider");
-			if (mac_val != NULL)
-			{
-				gdouble drc;
-				drc = ghb_value_double(mac_val);
-				if (drc < 1.0 && drc > 0.0)
-				{
-					ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), 
-									ghb_double_value_new(0.0));
-				}
-			}
-		}
-	}
+    defaults = plist_get_dict(internalPlist, "Presets");
+    key = "VideoEncoder";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, vcodec_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "FileFormat";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, container_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "VideoFramerate";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, framerate_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDetelecine";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, detel_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDecomb";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, decomb_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDeinterlace";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, deint_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+    key = "PictureDenoise";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, denoise_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+
+    GValue *sdeflist;
+    GValue *slist;
+    GValue *sdict;
+    gint count, ii;
+
+    sdeflist = ghb_dict_lookup(defaults, "SubtitleList");
+    if (sdeflist)
+    {
+        slist = ghb_dict_lookup(dict, "SubtitleList");
+        if (slist)
+        {
+            count = ghb_array_len(slist);
+            for (ii = 0; ii < count; ii++)
+            {
+                sdict = ghb_array_get_nth(slist, ii);
+                key = "SubtitleLanguage";
+                mac_val = ghb_dict_lookup(sdict, key);
+                gval = import_subtitle_xlat2(mac_val);
+                if (gval)
+                    ghb_dict_insert(sdict, g_strdup(key), gval);
+            }
+        
+        }
+        else
+        {
+            key = "Subtitles";
+            mac_val = ghb_dict_lookup(dict, key);
+            slist = ghb_array_value_new(8);
+            ghb_dict_insert(dict, g_strdup("SubtitleList"), slist);
+            if (mac_val)
+            {
+                gchar *lang;
+    
+                gval = import_subtitle_xlat2(mac_val);
+                lang = ghb_value_string(gval);
+                if (lang && strcasecmp(lang, "none") != 0 && !slist)
+                {
+                    sdict = ghb_dict_value_new();
+                    ghb_array_append(slist, sdict);
+                    ghb_dict_insert(sdict, g_strdup("SubtitleLanguage"), gval);
+                    gval = ghb_dict_lookup(dict, "SubtitlesForced");
+                    if (gval != NULL)
+                    {
+                        ghb_dict_insert(sdict, g_strdup("SubtitleForced"), 
+                                        ghb_value_dup(gval));
+                    }
+                    else
+                    {
+                        ghb_dict_insert(sdict, g_strdup("SubtitleForced"), 
+                                        ghb_boolean_value_new(FALSE));
+                    }
+                    ghb_dict_insert(sdict, g_strdup("SubtitleBurned"),
+                                    ghb_boolean_value_new(TRUE));
+                    ghb_dict_insert(sdict, g_strdup("SubtitleDefaultTrack"),
+                                    ghb_boolean_value_new(FALSE));
+                }
+                else
+                {
+                    ghb_value_free(gval);
+                }
+                if (lang)
+                    g_free(lang);
+            }
+        }
+    }
+    ghb_dict_remove(dict, "Subtitles");
+    ghb_dict_remove(dict, "SubtitlesForced");
+
+
+    GValue *alist;
+    GValue *adict;
+    GValue *adefaults;
+    GValue *adeflist;
+
+    key = "AudioEncoderFallback";
+    mac_val = ghb_dict_lookup(dict, key);
+    gval = import_value_xlat2(defaults, acodec_xlat, key, mac_val);
+    if (gval)
+        ghb_dict_insert(dict, g_strdup(key), gval);
+
+    adeflist = ghb_dict_lookup(defaults, "AudioList");
+    if (adeflist)
+    {
+        adefaults = ghb_array_get_nth(adeflist, 0);
+        alist = ghb_dict_lookup(dict, "AudioList");
+        count = ghb_array_len(alist);
+        for (ii = 0; ii < count; ii++)
+        {
+            adict = ghb_array_get_nth(alist, ii);
+            key = "AudioTrack";
+            mac_val = ghb_dict_lookup(adict, key);
+            gval = import_audio_track_xlat2(mac_val);
+            if (gval)
+                ghb_dict_insert(adict, g_strdup(key), gval);
+            key = "AudioEncoder";
+            mac_val = ghb_dict_lookup(adict, key);
+            gval = import_value_xlat2(adefaults, acodec_xlat, key, mac_val);
+            if (gval)
+                ghb_dict_insert(adict, g_strdup(key), gval);
+            key = "AudioSamplerate";
+            mac_val = ghb_dict_lookup(adict, key);
+            gval = import_value_xlat2(adefaults, samplerate_xlat, key, mac_val);
+            if (gval)
+                ghb_dict_insert(adict, g_strdup(key), gval);
+            key = "AudioMixdown";
+            mac_val = ghb_dict_lookup(adict, key);
+            gval = import_value_xlat2(adefaults, mix_xlat, key, mac_val);
+            if (gval)
+                ghb_dict_insert(adict, g_strdup(key), gval);
+
+            mac_val = ghb_dict_lookup(adict, "AudioTrackDRCSlider");
+            if (mac_val != NULL)
+            {
+                gdouble drc;
+                drc = ghb_value_double(mac_val);
+                if (drc < 1.0 && drc > 0.0)
+                {
+                    ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), 
+                                    ghb_double_value_new(0.0));
+                }
+            }
+        }
+    }
 }
 
 static void
 import_xlat_preset(GValue *dict)
 {
-	gboolean uses_max;
-	gint uses_pic;
-	gint par;
-	gint vqtype;
-
-	g_debug("import_xlat_preset ()");
-	uses_max = ghb_value_boolean(
-						preset_dict_get_value(dict, "UsesMaxPictureSettings"));
-	uses_pic = ghb_value_int(
-						preset_dict_get_value(dict, "UsesPictureSettings"));
-	par = ghb_value_int(preset_dict_get_value(dict, "PicturePAR"));
-	vqtype = ghb_value_int(preset_dict_get_value(dict, "VideoQualityType"));
-
-	if (uses_max || uses_pic == 2)
-	{
-		ghb_dict_insert(dict, g_strdup("autoscale"), 
-						ghb_boolean_value_new(TRUE));
-	}
-	switch (par)
-	{
-	case 0:
-	{
-		if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
-			ghb_dict_insert(dict, g_strdup("PictureModulus"), 
-							ghb_int_value_new(16));
-	} break;
-	case 1:
-	{
-		ghb_dict_insert(dict, g_strdup("PictureModulus"), 
-						ghb_int_value_new(1));
-	} break;
-	case 2:
-	{
-		if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
-			ghb_dict_insert(dict, g_strdup("PictureModulus"), 
-							ghb_int_value_new(16));
-	} break;
-	default:
-	{
-		if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
-			ghb_dict_insert(dict, g_strdup("PictureModulus"), 
-							ghb_int_value_new(16));
-	} break;
-	}
-	// VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
-	// *note: target is no longer used
-	switch (vqtype)
-	{
-	case 0:
-	{
-		ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
-						ghb_boolean_value_new(TRUE));
-		ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
-						ghb_boolean_value_new(FALSE));
-	} break;
-	case 1:
-	{
-		ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
-						ghb_boolean_value_new(TRUE));
-		ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
-						ghb_boolean_value_new(FALSE));
-	} break;
-	case 2:
-	{
-		ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
-						ghb_boolean_value_new(FALSE));
-		ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
-						ghb_boolean_value_new(TRUE));
-	} break;
-	default:
-	{
-		ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
-						ghb_boolean_value_new(FALSE));
-		ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
-						ghb_boolean_value_new(TRUE));
-	} break;
-	}
-
-	import_value_xlat(dict);
-
-	GValue *mode = ghb_dict_lookup(dict, "VideoFramerateMode");
-	if (mode == NULL)
-	{
-		GValue *fr = ghb_dict_lookup(dict, "VideoFramerate");
-		if (fr)
-		{
-			gchar *str;
-			gboolean pfr = FALSE;
-			GValue *pfr_val = ghb_dict_lookup(dict, "VideoFrameratePFR");
-			if (pfr_val)
-			{
-				pfr = ghb_value_boolean(pfr_val);
-			}
-			str = ghb_value_string(fr);
-			if (strcmp(str, "source") == 0)
-			{
-				ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
-								ghb_boolean_value_new(FALSE));
-				ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
-								ghb_boolean_value_new(TRUE));
-			}
-			else if (!pfr)
-			{
-				ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
-								ghb_boolean_value_new(TRUE));
-				ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
-								ghb_boolean_value_new(FALSE));
-			}
-			else
-			{
-				ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
-								ghb_boolean_value_new(FALSE));
-				ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
-								ghb_boolean_value_new(FALSE));
-			}
+    gboolean uses_max;
+    gint uses_pic;
+    gint par;
+    gint vqtype;
+
+    g_debug("import_xlat_preset ()");
+
+    uses_max = ghb_value_boolean(
+                        preset_dict_get_value(dict, "UsesMaxPictureSettings"));
+    uses_pic = ghb_value_int(
+                        preset_dict_get_value(dict, "UsesPictureSettings"));
+    par = ghb_value_int(preset_dict_get_value(dict, "PicturePAR"));
+    vqtype = ghb_value_int(preset_dict_get_value(dict, "VideoQualityType"));
+
+    if (uses_max || uses_pic == 2)
+    {
+        ghb_dict_insert(dict, g_strdup("autoscale"), 
+                        ghb_boolean_value_new(TRUE));
+    }
+    switch (par)
+    {
+    case 0:
+    {
+        if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
+            ghb_dict_insert(dict, g_strdup("PictureModulus"), 
+                            ghb_int_value_new(16));
+    } break;
+    case 1:
+    {
+        ghb_dict_insert(dict, g_strdup("PictureModulus"), 
+                        ghb_int_value_new(1));
+    } break;
+    case 2:
+    {
+        if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
+            ghb_dict_insert(dict, g_strdup("PictureModulus"), 
+                            ghb_int_value_new(16));
+    } break;
+    default:
+    {
+        if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
+            ghb_dict_insert(dict, g_strdup("PictureModulus"), 
+                            ghb_int_value_new(16));
+    } break;
+    }
+    // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
+    // *note: target is no longer used
+    switch (vqtype)
+    {
+    case 0:
+    {
+        ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
+                        ghb_boolean_value_new(TRUE));
+        ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
+                        ghb_boolean_value_new(FALSE));
+    } break;
+    case 1:
+    {
+        ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
+                        ghb_boolean_value_new(TRUE));
+        ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
+                        ghb_boolean_value_new(FALSE));
+    } break;
+    case 2:
+    {
+        ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
+                        ghb_boolean_value_new(FALSE));
+        ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
+                        ghb_boolean_value_new(TRUE));
+    } break;
+    default:
+    {
+        ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
+                        ghb_boolean_value_new(FALSE));
+        ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
+                        ghb_boolean_value_new(TRUE));
+    } break;
+    }
+
+    import_value_xlat(dict);
+
+    GValue *mode = ghb_dict_lookup(dict, "VideoFramerateMode");
+    if (mode == NULL)
+    {
+        GValue *fr = ghb_dict_lookup(dict, "VideoFramerate");
+        if (fr)
+        {
+            gchar *str;
+            gboolean pfr = FALSE;
+            GValue *pfr_val = ghb_dict_lookup(dict, "VideoFrameratePFR");
+            if (pfr_val)
+            {
+                pfr = ghb_value_boolean(pfr_val);
+            }
+            str = ghb_value_string(fr);
+            if (strcmp(str, "source") == 0)
+            {
+                ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
+                                ghb_boolean_value_new(FALSE));
+                ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
+                                ghb_boolean_value_new(TRUE));
+            }
+            else if (!pfr)
+            {
+                ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
+                                ghb_boolean_value_new(TRUE));
+                ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
+                                ghb_boolean_value_new(FALSE));
+            }
+            else
+            {
+                ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
+                                ghb_boolean_value_new(FALSE));
+                ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
+                                ghb_boolean_value_new(FALSE));
+            }
             g_free(str);
-		}
-	}
-	else
-	{
-		gchar *str;
-		str = ghb_value_string(mode);
-		if (strcmp(str, "cfr") == 0)
-		{
-				ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
-								ghb_boolean_value_new(TRUE));
-				ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
-								ghb_boolean_value_new(FALSE));
-				ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
-								ghb_boolean_value_new(FALSE));
-		}
-		else if (strcmp(str, "pfr") == 0)
-		{
-				ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
-								ghb_boolean_value_new(FALSE));
-				ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
-								ghb_boolean_value_new(TRUE));
-				ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
-								ghb_boolean_value_new(FALSE));
-		}
-		else
-		{
-				ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
-								ghb_boolean_value_new(FALSE));
-				ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
-								ghb_boolean_value_new(FALSE));
-				ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
-								ghb_boolean_value_new(TRUE));
-		}
-		g_free(str);
-	}
+        }
+    }
+    else
+    {
+        gchar *str;
+        str = ghb_value_string(mode);
+        if (strcmp(str, "cfr") == 0)
+        {
+                ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
+                                ghb_boolean_value_new(TRUE));
+                ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
+                                ghb_boolean_value_new(FALSE));
+                ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
+                                ghb_boolean_value_new(FALSE));
+        }
+        else if (strcmp(str, "pfr") == 0)
+        {
+                ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
+                                ghb_boolean_value_new(FALSE));
+                ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
+                                ghb_boolean_value_new(TRUE));
+                ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
+                                ghb_boolean_value_new(FALSE));
+        }
+        else
+        {
+                ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
+                                ghb_boolean_value_new(FALSE));
+                ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
+                                ghb_boolean_value_new(FALSE));
+                ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
+                                ghb_boolean_value_new(TRUE));
+        }
+        g_free(str);
+    }
+
+    const char * const *preset = hb_x264_presets();
+    if (ghb_value_boolean(preset_dict_get_value(dict, "x264UseAdvancedOptions")))
+    {
+        // Force preset/tune/profile/level/opts to conform to option string
+        ghb_dict_insert(dict, g_strdup("x264Preset"),
+                        ghb_string_value_new("medium"));
+        ghb_dict_insert(dict, g_strdup("x264Tune"),
+                        ghb_string_value_new("none"));
+        ghb_dict_insert(dict, g_strdup("h264Profile"),
+                        ghb_string_value_new("auto"));
+        ghb_dict_insert(dict, g_strdup("h264Level"),
+                        ghb_string_value_new("auto"));
+        GValue *opt = ghb_dict_lookup(dict, "x264Option");
+        ghb_dict_insert(dict, g_strdup("x264OptionExtra"),
+                        ghb_value_dup(opt));
+    }
+
+    GValue *x264Preset = ghb_dict_lookup(dict, "x264Preset");
+    if (x264Preset != NULL)
+    {
+        gchar *str;
+        str = ghb_value_string(x264Preset);
+        int ii;
+        for (ii = 0; preset[ii]; ii++)
+        {
+            if (!strcasecmp(str, preset[ii]))
+            {
+                ghb_dict_insert(dict, g_strdup("x264PresetSlider"),
+                                ghb_int_value_new(ii));
+            }
+        }
+        g_free(str);
+    }
+    else
+    {
+        int ii;
+        for (ii = 0; preset[ii]; ii++)
+        {
+            if (!strcasecmp("medium", preset[ii]))
+            {
+                ghb_dict_insert(dict, g_strdup("x264PresetSlider"),
+                                ghb_int_value_new(ii));
+            }
+        }
+        ghb_dict_insert(dict, g_strdup("x264UseAdvancedOptions"),
+                        ghb_boolean_value_new(TRUE));
+    }
+
+    const char *x264Tune = dict_get_string(dict, "x264Tune");
+    if (x264Tune != NULL)
+    {
+        char *tune = NULL;
+        char *tmp = g_strdup(x264Tune);
+        char *saveptr;
+
+        char * tok = strtok_r(tmp, ",./-+", &saveptr);
+        while (tok != NULL)
+        {
+            if (!strcasecmp(tok, "fastdecode"))
+            {
+                ghb_dict_insert(dict, g_strdup("x264FastDecode"),
+                                ghb_boolean_value_new(TRUE));
+            }
+            else if (!strcasecmp(tok, "zerolatency"))
+            {
+                ghb_dict_insert(dict, g_strdup("x264ZeroLatency"),
+                                ghb_boolean_value_new(TRUE));
+            }
+            else if (tune == NULL)
+            {
+                tune = g_strdup(tok);
+            }
+            else
+            {
+                ghb_log("Superfluous tunes! %s", tok);
+            }
+            tok = strtok_r(NULL, ",./-+", &saveptr);
+        }
+        if (tune != NULL)
+        {
+            ghb_dict_insert(dict, g_strdup("x264Tune"),
+                            ghb_string_value_new(tune));
+            g_free(tune);
+        }
+    }
 }
 
 static void
 import_xlat_presets(GValue *presets)
 {
-	gint count, ii;
-	GValue *dict;
-	gboolean folder;
-
-	g_debug("import_xlat_presets ()");
-	if (presets == NULL) return;
-	count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		dict = ghb_array_get_nth(presets, ii);
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (folder)
-		{
-			GValue *nested;
-
-			nested = ghb_dict_lookup(dict, "ChildrenArray");
-			import_xlat_presets(nested);
-		}
-		else
-		{
-			import_xlat_preset(dict);
-		}
-	}
+    gint count, ii;
+    GValue *dict;
+    gboolean folder;
+
+    g_debug("import_xlat_presets ()");
+    if (presets == NULL) return;
+    count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        dict = ghb_array_get_nth(presets, ii);
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (folder)
+        {
+            GValue *nested;
+
+            nested = ghb_dict_lookup(dict, "ChildrenArray");
+            import_xlat_presets(nested);
+        }
+        else
+        {
+            import_xlat_preset(dict);
+        }
+    }
 }
 
 static void
 export_xlat_preset(GValue *dict)
 {
-	gboolean autoscale, br, constant;
+    gboolean autoscale, br, constant;
 
-	g_debug("export_xlat_prest ()");
-	autoscale = ghb_value_boolean(preset_dict_get_value(dict, "autoscale"));
-	br = ghb_value_boolean(
-				preset_dict_get_value(dict, "vquality_type_bitrate"));
-	constant = ghb_value_boolean(
-				preset_dict_get_value(dict, "vquality_type_constant"));
-
-	if (autoscale)
-		ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
-						ghb_int_value_new(2));
-	else
-		ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
-						ghb_int_value_new(1));
-
-	// VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
-	// *note: target is no longer used
-	if (br)
-	{
-		ghb_dict_insert(dict, g_strdup("VideoQualityType"), 
-						ghb_int_value_new(1));
-	}
-	else if (constant)
-	{
-		ghb_dict_insert(dict, g_strdup("VideoQualityType"), 
-						ghb_int_value_new(2));
-	}
-
-	if (ghb_value_boolean(preset_dict_get_value(dict, "VideoFramerateCFR")))
-	{
-		ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
-						ghb_string_value_new("cfr"));
-	}
-	else if (ghb_value_boolean(preset_dict_get_value(dict, "VideoFrameratePFR")))
-	{
-		ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
-						ghb_string_value_new("pfr"));
-	}
-	else
-	{
-		ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
-						ghb_string_value_new("vfr"));
-	}
-
-	GValue *alist, *adict;
-	gint count, ii;
-
-	alist = ghb_dict_lookup(dict, "AudioList");
-	count = ghb_array_len(alist);
-	for (ii = 0; ii < count; ii++)
-	{
-		gdouble drc;
-
-		adict = ghb_array_get_nth(alist, ii);
-		drc = ghb_value_double(
-				preset_dict_get_value(adict, "AudioTrackDRCSlider"));
-		if (drc < 1.0 && drc > 0.0)
-		{
-			ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), 
-							ghb_double_value_new(0.0));
-		}
-	}
-
-	GValue *internal;
-	GHashTableIter iter;
-	gchar *key;
-	GValue *value;
-	internal = plist_get_dict(internalPlist, "XlatPresets");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
-	{
-		ghb_dict_remove(dict, key);
-	}
-
-	// remove obsolete keys
-	ghb_dict_remove(dict, "UsesMaxPictureSettings");
-	ghb_dict_remove(dict, "VFR");
-	ghb_dict_remove(dict, "VideoFrameratePFR");
+    g_debug("export_xlat_prest ()");
+    autoscale = ghb_value_boolean(preset_dict_get_value(dict, "autoscale"));
+    br = ghb_value_boolean(
+                preset_dict_get_value(dict, "vquality_type_bitrate"));
+    constant = ghb_value_boolean(
+                preset_dict_get_value(dict, "vquality_type_constant"));
+
+    if (autoscale)
+        ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
+                        ghb_int_value_new(2));
+    else
+        ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
+                        ghb_int_value_new(1));
+
+    // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
+    // *note: target is no longer used
+    if (br)
+    {
+        ghb_dict_insert(dict, g_strdup("VideoQualityType"), 
+                        ghb_int_value_new(1));
+    }
+    else if (constant)
+    {
+        ghb_dict_insert(dict, g_strdup("VideoQualityType"), 
+                        ghb_int_value_new(2));
+    }
+
+    if (ghb_value_boolean(preset_dict_get_value(dict, "VideoFramerateCFR")))
+    {
+        ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
+                        ghb_string_value_new("cfr"));
+    }
+    else if (ghb_value_boolean(preset_dict_get_value(dict, "VideoFrameratePFR")))
+    {
+        ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
+                        ghb_string_value_new("pfr"));
+    }
+    else
+    {
+        ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
+                        ghb_string_value_new("vfr"));
+    }
+
+    GValue *alist, *adict;
+    gint count, ii;
+
+    alist = ghb_dict_lookup(dict, "AudioList");
+    count = ghb_array_len(alist);
+    for (ii = 0; ii < count; ii++)
+    {
+        gdouble drc;
+
+        adict = ghb_array_get_nth(alist, ii);
+        drc = ghb_value_double(
+                preset_dict_get_value(adict, "AudioTrackDRCSlider"));
+        if (drc < 1.0 && drc > 0.0)
+        {
+            ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), 
+                            ghb_double_value_new(0.0));
+        }
+    }
+
+    if (ghb_value_boolean(preset_dict_get_value(dict, "x264UseAdvancedOptions")))
+    {
+        ghb_dict_remove(dict, "x264Preset");
+        ghb_dict_remove(dict, "x264Tune");
+        ghb_dict_remove(dict, "h264Profile");
+        ghb_dict_remove(dict, "h264Level");
+        ghb_dict_remove(dict, "x264OptionExtra");
+    }
+    const char *tune = dict_get_string(dict, "x264Tune");
+    if (tune != NULL)
+    {
+        GString *str = g_string_new("");
+        char *tunes;
+
+        g_string_append_printf(str, "%s", tune);
+        if (dict_get_boolean(dict, "x264FastDecode"))
+        {
+            g_string_append_printf(str, ",%s", "fastdecode");
+        }
+        if (dict_get_boolean(dict, "x264ZeroLatency"))
+        {
+            g_string_append_printf(str, ",%s", "zerolatency");
+        }
+        tunes = g_string_free(str, FALSE);
+        ghb_dict_insert(dict, g_strdup("x264Tune"), 
+                        ghb_string_value_new(tunes));
+
+        g_free(tunes);
+    }
+
+    GValue *internal;
+    GHashTableIter iter;
+    gchar *key;
+    GValue *value;
+    internal = plist_get_dict(internalPlist, "XlatPresets");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
+    {
+        ghb_dict_remove(dict, key);
+    }
+
+    // remove obsolete keys
+    ghb_dict_remove(dict, "UsesMaxPictureSettings");
+    ghb_dict_remove(dict, "VFR");
+    ghb_dict_remove(dict, "VideoFrameratePFR");
 
-	export_value_xlat(dict);
+    export_value_xlat(dict);
 }
 
 static void
 export_xlat_presets(GValue *presets)
 {
-	gint count, ii;
-	GValue *dict;
-	gboolean folder;
-
-	if (presets == NULL) return;
-	count = ghb_array_len(presets);
-	for (ii = 0; ii < count; ii++)
-	{
-		dict = ghb_array_get_nth(presets, ii);
-		folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
-		if (folder)
-		{
-			GValue *nested;
-
-			nested = ghb_dict_lookup(dict, "ChildrenArray");
-			export_xlat_presets(nested);
-		}
-		else
-		{
-			export_xlat_preset(dict);
-		}
-	}
+    gint count, ii;
+    GValue *dict;
+    gboolean folder;
+
+    if (presets == NULL) return;
+    count = ghb_array_len(presets);
+    for (ii = 0; ii < count; ii++)
+    {
+        dict = ghb_array_get_nth(presets, ii);
+        folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+        if (folder)
+        {
+            GValue *nested;
+
+            nested = ghb_dict_lookup(dict, "ChildrenArray");
+            export_xlat_presets(nested);
+        }
+        else
+        {
+            export_xlat_preset(dict);
+        }
+    }
 }
 
 static guint prefs_timeout_id = 0;
@@ -2945,1543 +3118,1549 @@
 static gboolean
 delayed_store_prefs(gpointer data)
 {
-	store_plist(prefsPlist, "preferences");
-	prefs_timeout_id = 0;
-	return FALSE;
+    store_plist(prefsPlist, "preferences");
+    prefs_timeout_id = 0;
+    return FALSE;
 }
 
 static void
 store_presets()
 {
-	GValue *export;
+    GValue *export;
 
-	export = ghb_value_dup(presetsPlist);
-	export_xlat_presets(export);
-	store_plist(export, "presets");
-	ghb_value_free(export);
+    export = ghb_value_dup(presetsPlist);
+    export_xlat_presets(export);
+    store_plist(export, "presets");
+    ghb_value_free(export);
 }
 
 static void
 store_prefs(void)
 {
-	if (prefs_timeout_id != 0)
-	{
-		GMainContext *mc;
-		GSource *source;
-
-		mc = g_main_context_default();
-		source = g_main_context_find_source_by_id(mc, prefs_timeout_id);
-		if (source != NULL)
-			g_source_destroy(source);
-	}
-	prefs_timeout_id = g_timeout_add_seconds(1, (GSourceFunc)delayed_store_prefs, NULL);
+    if (prefs_timeout_id != 0)
+    {
+        GMainContext *mc;
+        GSource *source;
+
+        mc = g_main_context_default();
+        source = g_main_context_find_source_by_id(mc, prefs_timeout_id);
+        if (source != NULL)
+            g_source_destroy(source);
+    }
+    prefs_timeout_id = g_timeout_add_seconds(1, (GSourceFunc)delayed_store_prefs, NULL);
 }
 
 void
 ghb_presets_reload(signal_user_data_t *ud)
 {
-	GValue *std_presets;
-	gint count, ii;
-	int *indices, len;
-
-	g_debug("ghb_presets_reload()\n");
-	std_presets = ghb_resource_get("standard-presets");
-	if (std_presets == NULL) return;
-
-	remove_std_presets(ud);
-	indices = presets_find_default(presetsPlist, &len);
-	if (indices)
-	{
-		presets_clear_default(std_presets);
-		g_free(indices);
-	}
-	// Merge the keyfile contents into our presets
-	count = ghb_array_len(std_presets);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		GValue *std_dict;
-		GValue *copy_dict;
-		gint indices = 0;
-
-		std_dict = ghb_array_get_nth(std_presets, ii);
-		copy_dict = ghb_value_dup(std_dict);
-		ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), 
-						ghb_int64_value_new(hb_get_build(NULL)));
-		ghb_presets_insert(presetsPlist, copy_dict, &indices, 1);
-		presets_list_insert(ud, &indices, 1);
-	}
-	import_xlat_presets(presetsPlist);
-	store_presets();
+    GValue *std_presets;
+    gint count, ii;
+    int *indices, len;
+
+    g_debug("ghb_presets_reload()\n");
+    std_presets = ghb_resource_get("standard-presets");
+    if (std_presets == NULL) return;
+
+    remove_std_presets(ud);
+    indices = presets_find_default(presetsPlist, &len);
+    if (indices)
+    {
+        presets_clear_default(std_presets);
+        g_free(indices);
+    }
+    // Merge the keyfile contents into our presets
+    count = ghb_array_len(std_presets);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        GValue *std_dict;
+        GValue *copy_dict;
+        gint indices = 0;
+
+        std_dict = ghb_array_get_nth(std_presets, ii);
+        copy_dict = ghb_value_dup(std_dict);
+        ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), 
+                        ghb_int64_value_new(hb_get_build(NULL)));
+        ghb_presets_insert(presetsPlist, copy_dict, &indices, 1);
+        presets_list_insert(ud, &indices, 1);
+    }
+    import_xlat_presets(presetsPlist);
+    store_presets();
 }
 
 static gboolean
 check_old_presets()
 {
-	gint count, ii;
+    gint count, ii;
 
-	count = ghb_array_len(presetsPlist);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		GValue *dict;
-		GValue *type;
-
-		dict = ghb_array_get_nth(presetsPlist, ii);
-		type = ghb_dict_lookup(dict, "Type");
-		if (type == NULL)
-			return TRUE;
-	}
-	return FALSE;
+    count = ghb_array_len(presetsPlist);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        GValue *dict;
+        GValue *type;
+
+        dict = ghb_array_get_nth(presetsPlist, ii);
+        type = ghb_dict_lookup(dict, "Type");
+        if (type == NULL)
+            return TRUE;
+    }
+    return FALSE;
 }
 
 static void
 replace_standard_presets()
 {
-	GValue *std_presets;
-	int *indices, len;
-	gint count, ii;
-
-	count = ghb_array_len(presetsPlist);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		GValue *dict;
-		gint ptype;
-
-		dict = ghb_array_get_nth(presetsPlist, ii);
-		ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
-		if (ptype == PRESETS_BUILTIN)
-		{
-			gint indices = 0;
-			ghb_presets_remove(presetsPlist, &indices, 1);
-		}
-	}
-
-	std_presets = ghb_resource_get("standard-presets");
-	if (std_presets == NULL) return;
-
-	indices = presets_find_default(presetsPlist, &len);
-	if (indices)
-	{
-		presets_clear_default(std_presets);
-		g_free(indices);
-	}
-	// Merge the keyfile contents into our presets
-	count = ghb_array_len(std_presets);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		GValue *std_dict;
-		GValue *copy_dict;
-		gint indices = 0;
-
-		std_dict = ghb_array_get_nth(std_presets, ii);
-		copy_dict = ghb_value_dup(std_dict);
-		ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), 
-						ghb_int64_value_new(hb_get_build(NULL)));
-		ghb_presets_insert(presetsPlist, copy_dict, &indices, 1);
-	}
-	import_xlat_presets(presetsPlist);
-	store_presets();
+    GValue *std_presets;
+    int *indices, len;
+    gint count, ii;
+
+    count = ghb_array_len(presetsPlist);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        GValue *dict;
+        gint ptype;
+
+        dict = ghb_array_get_nth(presetsPlist, ii);
+        ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
+        if (ptype == PRESETS_BUILTIN)
+        {
+            gint indices = 0;
+            ghb_presets_remove(presetsPlist, &indices, 1);
+        }
+    }
+
+    std_presets = ghb_resource_get("standard-presets");
+    if (std_presets == NULL) return;
+
+    indices = presets_find_default(presetsPlist, &len);
+    if (indices)
+    {
+        presets_clear_default(std_presets);
+        g_free(indices);
+    }
+    // Merge the keyfile contents into our presets
+    count = ghb_array_len(std_presets);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        GValue *std_dict;
+        GValue *copy_dict;
+        gint indices = 0;
+
+        std_dict = ghb_array_get_nth(std_presets, ii);
+        copy_dict = ghb_value_dup(std_dict);
+        ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), 
+                        ghb_int64_value_new(hb_get_build(NULL)));
+        ghb_presets_insert(presetsPlist, copy_dict, &indices, 1);
+    }
+    import_xlat_presets(presetsPlist);
+    store_presets();
 }
 
 static int
 update_standard_presets(signal_user_data_t *ud)
 {
-	gint count, ii;
+    gint count, ii;
 
-	count = ghb_array_len(presetsPlist);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		GValue *dict;
-		const GValue *gval;
-		gint64 build;
-		gint type;
-
-		dict = ghb_array_get_nth(presetsPlist, ii);
-		gval = ghb_dict_lookup(dict, "Type");
-		if (gval == NULL)
-		{
-			// Old preset that doesn't have a Type
-			replace_standard_presets();
-			return 1;
-		}
-			
-		type = ghb_value_int(gval);
-		if (type == 0)
-		{
-			gval = ghb_dict_lookup(dict, "PresetBuildNumber");
-			if (gval == NULL)
-			{
-				// Old preset that doesn't have a build number
-				replace_standard_presets();
-				return 1;
-			}
-
-			build = ghb_value_int64(gval);
-			if (build != hb_get_build(NULL))
-			{
-				// Build number does not match
-				replace_standard_presets();
-				return 1;
-			}
-		}
-	}
-	return 0;
+    count = ghb_array_len(presetsPlist);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        GValue *dict;
+        const GValue *gval;
+        gint64 build;
+        gint type;
+
+        dict = ghb_array_get_nth(presetsPlist, ii);
+        gval = ghb_dict_lookup(dict, "Type");
+        if (gval == NULL)
+        {
+            // Old preset that doesn't have a Type
+            replace_standard_presets();
+            return 1;
+        }
+            
+        type = ghb_value_int(gval);
+        if (type == 0)
+        {
+            gval = ghb_dict_lookup(dict, "PresetBuildNumber");
+            if (gval == NULL)
+            {
+                // Old preset that doesn't have a build number
+                replace_standard_presets();
+                return 1;
+            }
+
+            build = ghb_value_int64(gval);
+            if (build != hb_get_build(NULL))
+            {
+                // Build number does not match
+                replace_standard_presets();
+                return 1;
+            }
+        }
+    }
+    return 0;
 }
 
 void
 ghb_presets_load(signal_user_data_t *ud)
 {
-	presetsPlist = load_plist("presets");
-	if (presetsPlist == NULL)
-	{
-		presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
-		import_xlat_presets(presetsPlist);
-		store_presets();
-	}
-	else if (G_VALUE_TYPE(presetsPlist) == ghb_dict_get_type())
-	{ // Presets is older dictionary format. Convert to array
-		ghb_value_free(presetsPlist);
-		presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
-		import_xlat_presets(presetsPlist);
-		store_presets();
-	}
-	else if (check_old_presets())
-	{
-		ghb_value_free(presetsPlist);
-		presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
-		import_xlat_presets(presetsPlist);
-		store_presets();
-	}
-	else
-	{
-		if (!update_standard_presets(ud))
-			import_xlat_presets(presetsPlist);
-	}
+    // Create translation tables from libhb tables
+    mix_xlat = create_mix_xlat_tbl(mix_xlat_compat, hb_audio_mixdowns, hb_audio_mixdowns_count);
+    acodec_xlat = create_encoder_xlat_tbl(acodec_xlat_compat, hb_audio_encoders, hb_audio_encoders_count);
+    vcodec_xlat = create_encoder_xlat_tbl(vcodec_xlat_compat, hb_video_encoders, hb_video_encoders_count);
+
+    presetsPlist = load_plist("presets");
+    if (presetsPlist == NULL)
+    {
+        presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
+        import_xlat_presets(presetsPlist);
+        store_presets();
+    }
+    else if (G_VALUE_TYPE(presetsPlist) == ghb_dict_get_type())
+    { // Presets is older dictionary format. Convert to array
+        ghb_value_free(presetsPlist);
+        presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
+        import_xlat_presets(presetsPlist);
+        store_presets();
+    }
+    else if (check_old_presets())
+    {
+        ghb_value_free(presetsPlist);
+        presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
+        import_xlat_presets(presetsPlist);
+        store_presets();
+    }
+    else
+    {
+        if (!update_standard_presets(ud))
+            import_xlat_presets(presetsPlist);
+    }
  
 }
 
 static void
 settings_save(signal_user_data_t *ud, const GValue *path)
 {
-	GValue *dict, *internal;
-	GHashTableIter iter;
-	gchar *key;
-	GValue *value;
-	gint *indices, len, count;
-	gint *def_indices, def_len;
-	const gchar *name;
-	gboolean replace = FALSE;
-
-	g_debug("settings_save");
-	if (internalPlist == NULL) return;
-	count = ghb_array_len(path);
-	name = g_value_get_string(ghb_array_get_nth(path, count-1));
-	indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-	if (indices)
-	{
-		if (ghb_presets_get_folder(presetsPlist, indices, len))
-		{
-			gchar *message;
-			message = g_strdup_printf(
-						"%s: Folder already exists.\n"
-						"You can not replace it with a preset.",
-						name);
-			ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-			g_free(message);
-			return;
-		}
-		dict = ghb_dict_value_new();
-		ghb_presets_replace(presetsPlist, dict, indices, len);
-		replace = TRUE;
-	}
-	else
-	{
-		indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
-		if (indices)
-		{
-			dict = ghb_dict_value_new();
-			ghb_presets_insert(presetsPlist, dict, indices, len);
-		}
-		else
-		{
-			g_warning("failed to find insert path");
-			return;
-		}
-	}
-	current_preset = dict;
-	ghb_settings_set_int64(ud->settings, "Type", PRESETS_CUSTOM);
-	ghb_settings_set_int64(ud->settings, "PresetBuildNumber", hb_get_build(NULL));
-
-	internal = plist_get_dict(internalPlist, "Presets");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
-	{
-		const GValue *gval;
-
-		gval = ghb_settings_get_value(ud->settings, key);
-		if (gval == NULL)
-		{
-			continue;
-		}
-		ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
-	}
-	internal = plist_get_dict(internalPlist, "XlatPresets");
-	ghb_dict_iter_init(&iter, internal);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
-	{
-		const GValue *gval;
-
-		gval = ghb_settings_get_value(ud->settings, key);
-		if (gval == NULL)
-		{
-			continue;
-		}
-		ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
-	}
-	ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name));
-	if (replace)
-	{
-		def_indices = presets_find_default(presetsPlist, &def_len);
-		if (def_indices != NULL && 
-			preset_path_cmp(indices, len, def_indices, def_len) != 0)
-		{
-			ghb_dict_insert(dict, g_strdup("Default"), 
-							ghb_boolean_value_new(FALSE));
-		}
-		presets_list_update_item(ud, indices, len, FALSE);
-	}
-	else
-	{
-		ghb_dict_insert(dict, g_strdup("Default"), 
-						ghb_boolean_value_new(FALSE));
-		presets_list_insert(ud, indices, len);
-	}
-	if (!ghb_settings_get_boolean( ud->settings, "PictureWidthEnable"))
-	{
-		ghb_dict_remove(dict, "PictureWidth");
-	}
-	if (!ghb_settings_get_boolean( ud->settings, "PictureHeightEnable"))
-	{
-		ghb_dict_remove(dict, "PictureHeight");
-	}
-	ghb_dict_insert(dict, g_strdup("autoscale"), 
-		ghb_boolean_value_new(
-			!ghb_settings_get_boolean( ud->settings, "PictureWidthEnable") &&
-			!ghb_settings_get_boolean( ud->settings, "PictureHeightEnable")
-		)
-	);
-	store_presets();
-	ud->dont_clear_presets = TRUE;
-	// Make the new preset the selected item
-	ghb_select_preset2(ud->builder, indices, len);
-	g_free(indices);
-	ud->dont_clear_presets = FALSE;
-	return;
+    GValue *dict, *internal;
+    GHashTableIter iter;
+    gchar *key;
+    GValue *value;
+    gint *indices, len, count;
+    gint *def_indices, def_len;
+    const gchar *name;
+    gboolean replace = FALSE;
+
+    g_debug("settings_save");
+    if (internalPlist == NULL) return;
+    count = ghb_array_len(path);
+    name = g_value_get_string(ghb_array_get_nth(path, count-1));
+    indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+    if (indices)
+    {
+        if (ghb_presets_get_folder(presetsPlist, indices, len))
+        {
+            gchar *message;
+            message = g_strdup_printf(
+                        "%s: Folder already exists.\n"
+                        "You can not replace it with a preset.",
+                        name);
+            ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+            g_free(message);
+            return;
+        }
+        dict = ghb_dict_value_new();
+        ghb_presets_replace(presetsPlist, dict, indices, len);
+        replace = TRUE;
+    }
+    else
+    {
+        indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
+        if (indices)
+        {
+            dict = ghb_dict_value_new();
+            ghb_presets_insert(presetsPlist, dict, indices, len);
+        }
+        else
+        {
+            g_warning("failed to find insert path");
+            return;
+        }
+    }
+    current_preset = dict;
+    ghb_settings_set_int64(ud->settings, "Type", PRESETS_CUSTOM);
+    ghb_settings_set_int64(ud->settings, "PresetBuildNumber", hb_get_build(NULL));
+
+    internal = plist_get_dict(internalPlist, "Presets");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
+    {
+        const GValue *gval;
+
+        gval = ghb_settings_get_value(ud->settings, key);
+        if (gval == NULL)
+        {
+            continue;
+        }
+        ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
+    }
+    internal = plist_get_dict(internalPlist, "XlatPresets");
+    ghb_dict_iter_init(&iter, internal);
+    // middle (void*) cast prevents gcc warning "defreferencing type-punned
+    // pointer will break strict-aliasing rules"
+    while (g_hash_table_iter_next(
+            &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
+    {
+        const GValue *gval;
+
+        gval = ghb_settings_get_value(ud->settings, key);
+        if (gval == NULL)
+        {
+            continue;
+        }
+        ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
+    }
+    ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name));
+    if (replace)
+    {
+        def_indices = presets_find_default(presetsPlist, &def_len);
+        if (def_indices != NULL && 
+            preset_path_cmp(indices, len, def_indices, def_len) != 0)
+        {
+            ghb_dict_insert(dict, g_strdup("Default"), 
+                            ghb_boolean_value_new(FALSE));
+        }
+        presets_list_update_item(ud, indices, len, FALSE);
+    }
+    else
+    {
+        ghb_dict_insert(dict, g_strdup("Default"), 
+                        ghb_boolean_value_new(FALSE));
+        presets_list_insert(ud, indices, len);
+    }
+    if (!ghb_settings_get_boolean( ud->settings, "PictureWidthEnable"))
+    {
+        ghb_dict_remove(dict, "PictureWidth");
+    }
+    if (!ghb_settings_get_boolean( ud->settings, "PictureHeightEnable"))
+    {
+        ghb_dict_remove(dict, "PictureHeight");
+    }
+    ghb_dict_insert(dict, g_strdup("autoscale"), 
+        ghb_boolean_value_new(
+            !ghb_settings_get_boolean( ud->settings, "PictureWidthEnable") &&
+            !ghb_settings_get_boolean( ud->settings, "PictureHeightEnable")
+        )
+    );
+
+    store_presets();
+    ud->dont_clear_presets = TRUE;
+    // Make the new preset the selected item
+    ghb_select_preset2(ud->builder, indices, len);
+    g_free(indices);
+    ud->dont_clear_presets = FALSE;
+    return;
 }
 
 static void
 folder_save(signal_user_data_t *ud, const GValue *path)
 {
-	GValue *dict, *folder;
-	gint *indices, len, count;
-	const gchar *name;
-
-	count = ghb_array_len(path);
-	name = g_value_get_string(ghb_array_get_nth(path, count-1));
-	indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-	if (indices)
-	{
-		if (!ghb_presets_get_folder(presetsPlist, indices, len))
-		{
-			gchar *message;
-			message = g_strdup_printf(
-						"%s: Preset already exists.\n"
-						"You can not replace it with a folder.",
-						name);
-			ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
-			g_free(message);
-			g_free(indices);
-			return;
-		}
-		// Already exists, update its description
-		dict = presets_get_dict(presetsPlist, indices, len);
-		ghb_dict_insert(dict, g_strdup("PresetDescription"), 
-			ghb_value_dup(preset_dict_get_value(
-				ud->settings, "PresetDescription")));
-		presets_list_update_item(ud, indices, len, FALSE);
-		g_free(indices);
-		store_presets();
-		return;
-	}
-	else
-	{
-		indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
-		if (indices)
-		{
-			dict = ghb_dict_value_new();
-			ghb_presets_insert(presetsPlist, dict, indices, len);
-		}
-		else
-		{
-			g_warning("failed to find insert path");
-			return;
-		}
-	}
-	ghb_dict_insert(dict, g_strdup("PresetDescription"), 
-		ghb_value_dup(preset_dict_get_value(
-			ud->settings, "PresetDescription")));
-	ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name));
-	folder = ghb_array_value_new(8);
-	ghb_dict_insert(dict, g_strdup("ChildrenArray"), folder);
-	ghb_dict_insert(dict, g_strdup("Type"),
-							ghb_int64_value_new(PRESETS_CUSTOM));
-	ghb_dict_insert(dict, g_strdup("Folder"), ghb_boolean_value_new(TRUE));
-
-	presets_list_insert(ud, indices, len);
-	g_free(indices);
-	store_presets();
-	return;
+    GValue *dict, *folder;
+    gint *indices, len, count;
+    const gchar *name;
+
+    count = ghb_array_len(path);
+    name = g_value_get_string(ghb_array_get_nth(path, count-1));
+    indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+    if (indices)
+    {
+        if (!ghb_presets_get_folder(presetsPlist, indices, len))
+        {
+            gchar *message;
+            message = g_strdup_printf(
+                        "%s: Preset already exists.\n"
+                        "You can not replace it with a folder.",
+                        name);
+            ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+            g_free(message);
+            g_free(indices);
+            return;
+        }
+        // Already exists, update its description
+        dict = presets_get_dict(presetsPlist, indices, len);
+        ghb_dict_insert(dict, g_strdup("PresetDescription"), 
+            ghb_value_dup(preset_dict_get_value(
+                ud->settings, "PresetDescription")));
+        presets_list_update_item(ud, indices, len, FALSE);
+        g_free(indices);
+        store_presets();
+        return;
+    }
+    else
+    {
+        indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
+        if (indices)
+        {
+            dict = ghb_dict_value_new();
+            ghb_presets_insert(presetsPlist, dict, indices, len);
+        }
+        else
+        {
+            g_warning("failed to find insert path");
+            return;
+        }
+    }
+    ghb_dict_insert(dict, g_strdup("PresetDescription"), 
+        ghb_value_dup(preset_dict_get_value(
+            ud->settings, "PresetDescription")));
+    ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name));
+    folder = ghb_array_value_new(8);
+    ghb_dict_insert(dict, g_strdup("ChildrenArray"), folder);
+    ghb_dict_insert(dict, g_strdup("Type"),
+                            ghb_int64_value_new(PRESETS_CUSTOM));
+    ghb_dict_insert(dict, g_strdup("Folder"), ghb_boolean_value_new(TRUE));
+
+    presets_list_insert(ud, indices, len);
+    g_free(indices);
+    store_presets();
+    return;
 }
 
 void
 ghb_presets_list_default(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeIter iter;
-	GtkTreeStore *store;
-	gint *indices, len;
-	
-	g_debug("ghb_presets_list_default ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	indices = presets_find_default(presetsPlist, &len);
-	if (indices == NULL) return;
-	treepath = ghb_tree_path_new_from_indices(indices, len);
-	if (treepath)
-	{
-		if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
-		{
-			gtk_tree_store_set(store, &iter, 
-						1, 800, 
-						2, 2 ,
-						-1);
-		}
-		gtk_tree_path_free(treepath);
-	}
-	g_free(indices);
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeIter iter;
+    GtkTreeStore *store;
+    gint *indices, len;
+    
+    g_debug("ghb_presets_list_default ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    indices = presets_find_default(presetsPlist, &len);
+    if (indices == NULL) return;
+    treepath = ghb_tree_path_new_from_indices(indices, len);
+    if (treepath)
+    {
+        if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
+        {
+            gtk_tree_store_set(store, &iter, 
+                        1, 800, 
+                        2, 2 ,
+                        -1);
+        }
+        gtk_tree_path_free(treepath);
+    }
+    g_free(indices);
 }
 
 void
 ghb_presets_list_clear_default(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeIter iter;
-	GtkTreeStore *store;
-	gint *indices, len;
-	
-	g_debug("ghb_presets_list_clear_default ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	indices = presets_find_default(presetsPlist, &len);
-	if (indices == NULL) return;
-	treepath = ghb_tree_path_new_from_indices(indices, len);
-	if (treepath)
-	{
-		if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
-		{
-			gtk_tree_store_set(store, &iter, 
-						1, 400, 
-						2, 0 ,
-						-1);
-		}
-		gtk_tree_path_free(treepath);
-	}
-	g_free(indices);
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeIter iter;
+    GtkTreeStore *store;
+    gint *indices, len;
+    
+    g_debug("ghb_presets_list_clear_default ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    indices = presets_find_default(presetsPlist, &len);
+    if (indices == NULL) return;
+    treepath = ghb_tree_path_new_from_indices(indices, len);
+    if (treepath)
+    {
+        if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
+        {
+            gtk_tree_store_set(store, &iter, 
+                        1, 400, 
+                        2, 0 ,
+                        -1);
+        }
+        gtk_tree_path_free(treepath);
+    }
+    g_free(indices);
 }
 
 static void
 update_audio_presets(signal_user_data_t *ud)
 {
-	g_debug("update_audio_presets");
-	const GValue *audio_list;
+    g_debug("update_audio_presets");
+    const GValue *audio_list;
 
-	audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-	ghb_settings_set_value(ud->settings, "AudioList", audio_list);
+    audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+    ghb_settings_set_value(ud->settings, "AudioList", audio_list);
 }
 
 static void
 update_subtitle_presets(signal_user_data_t *ud)
 {
-	g_debug("update_subtitle_presets");
-	const GValue *subtitle_list, *subtitle;
-	GValue *slist, *dict;
-	gint count, ii, source;
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	slist = ghb_array_value_new(8);
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		subtitle = ghb_array_get_nth(subtitle_list, ii);
-		source = ghb_settings_get_int(subtitle, "SubtitleSource");
-		if (source != SRTSUB)
-		{
-			dict = ghb_value_dup(subtitle);
-			ghb_array_append(slist, dict);
-		}
-	}
-	ghb_settings_take_value(ud->settings, "SubtitleList", slist);
+    g_debug("update_subtitle_presets");
+    const GValue *subtitle_list, *subtitle;
+    GValue *slist, *dict;
+    gint count, ii, source;
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    slist = ghb_array_value_new(8);
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        subtitle = ghb_array_get_nth(subtitle_list, ii);
+        source = ghb_settings_get_int(subtitle, "SubtitleSource");
+        if (source != SRTSUB)
+        {
+            dict = ghb_value_dup(subtitle);
+            ghb_array_append(slist, dict);
+        }
+    }
+    ghb_settings_take_value(ud->settings, "SubtitleList", slist);
 }
 
 G_MODULE_EXPORT void
 presets_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkMenu *menu;
+    GtkMenu *menu;
 
-	menu = GTK_MENU(GHB_WIDGET(ud->builder, "presets_menu"));
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 1, 
-					gtk_get_current_event_time());
+    menu = GTK_MENU(GHB_WIDGET(ud->builder, "presets_menu"));
+    gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 1, 
+                    gtk_get_current_event_time());
 }
 
 G_MODULE_EXPORT void
 preset_import_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
-	gchar *exportDir;
-	gchar *filename;
-	GtkFileFilter *filter;
-
-	g_debug("preset_import_clicked_cb ()");
-
-	dialog = gtk_file_chooser_dialog_new("Import Preset", NULL,
-				GTK_FILE_CHOOSER_ACTION_OPEN,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-				NULL);
-
-	filter = gtk_file_filter_new();
-	gtk_file_filter_set_name(filter, "All (*)");
-	gtk_file_filter_add_pattern(filter, "*");
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
-
-	filter = gtk_file_filter_new();
-	gtk_file_filter_set_name(filter, "Presets (*.plist)");
-	gtk_file_filter_add_pattern(filter, "*.plist");
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
-	gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
-
-	exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
-	if (exportDir == NULL || exportDir[0] == '\0')
-	{
-		exportDir = g_strdup(".");
-	}
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir);
-	g_free(exportDir);
-
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
-	if (response == GTK_RESPONSE_ACCEPT)
-	{
-		GValue *dict, *array;
-		gchar  *dir;
-		gint count, ii;
-
-		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-
-		// import the preset
-		if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
-		{
-			gtk_widget_destroy(dialog);
-			g_free(filename);
-			return;
-		}
-		array = ghb_plist_parse_file(filename);
-
-		import_xlat_presets(array);
-		presets_clear_default(array);
-		presets_customize(array);
-
-		count = ghb_array_len(array);
-		for (ii = 0; ii < count; ii++)
-		{
-			GValue *path, *name;
-			gint *indices, len;
-			gint index = 1;
-
-			dict = ghb_array_get_nth(array, ii);
-			path = ghb_array_value_new(1);
-			name = ghb_value_dup(ghb_dict_lookup(dict, "PresetName"));
-			ghb_array_append(path, name);
-			indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-			// Modify the preset name till we make it unique
-			while (indices != NULL)
-			{
-				gchar *str = ghb_value_string(name);
-
-				ghb_value_free(path);
-				g_free(indices);
-
-				str = g_strdup_printf("%s %d", str, index);
-				path = ghb_array_value_new(1);
-				name = ghb_string_value_new(str);
-				ghb_array_append(path, name);
-				g_free(str);
-
-				index++;
-				indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
-			}
-			ghb_dict_insert(dict, g_strdup("PresetName"), ghb_value_dup(name));
-			indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
-			ghb_presets_insert(presetsPlist, ghb_value_dup(dict), indices, len);
-			presets_list_insert(ud, indices, len);
-			ghb_value_free(path);
-		}
-		ghb_value_free(array);
-
-		exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
-		dir = g_path_get_dirname(filename);
-		if (strcmp(dir, exportDir) != 0)
-		{
-			ghb_settings_set_string(ud->settings, "ExportDirectory", dir);
-			ghb_pref_save(ud->settings, "ExportDirectory");
-		}
-		g_free(filename);
-		g_free(exportDir);
-		g_free(dir);
-		store_presets();
-	}
-	gtk_widget_destroy(dialog);
+    GtkWidget *dialog;
+    GtkResponseType response;
+    gchar *exportDir;
+    gchar *filename;
+    GtkFileFilter *filter;
+
+    g_debug("preset_import_clicked_cb ()");
+
+    dialog = gtk_file_chooser_dialog_new("Import Preset", NULL,
+                GTK_FILE_CHOOSER_ACTION_OPEN,
+                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                NULL);
+
+    filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, "All (*)");
+    gtk_file_filter_add_pattern(filter, "*");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+    filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, "Presets (*.plist)");
+    gtk_file_filter_add_pattern(filter, "*.plist");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+    gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+    exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+    if (exportDir == NULL || exportDir[0] == '\0')
+    {
+        exportDir = g_strdup(".");
+    }
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir);
+    g_free(exportDir);
+
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_hide(dialog);
+    if (response == GTK_RESPONSE_ACCEPT)
+    {
+        GValue *dict, *array;
+        gchar  *dir;
+        gint count, ii;
+
+        filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+        // import the preset
+        if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+        {
+            gtk_widget_destroy(dialog);
+            g_free(filename);
+            return;
+        }
+        array = ghb_plist_parse_file(filename);
+
+        import_xlat_presets(array);
+        presets_clear_default(array);
+        presets_customize(array);
+
+        count = ghb_array_len(array);
+        for (ii = 0; ii < count; ii++)
+        {
+            GValue *path, *name;
+            gint *indices, len;
+            gint index = 1;
+
+            dict = ghb_array_get_nth(array, ii);
+            path = ghb_array_value_new(1);
+            name = ghb_value_dup(ghb_dict_lookup(dict, "PresetName"));
+            ghb_array_append(path, name);
+            indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+            // Modify the preset name till we make it unique
+            while (indices != NULL)
+            {
+                gchar *str = ghb_value_string(name);
+
+                ghb_value_free(path);
+                g_free(indices);
+
+                str = g_strdup_printf("%s %d", str, index);
+                path = ghb_array_value_new(1);
+                name = ghb_string_value_new(str);
+                ghb_array_append(path, name);
+                g_free(str);
+
+                index++;
+                indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+            }
+            ghb_dict_insert(dict, g_strdup("PresetName"), ghb_value_dup(name));
+            indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
+            ghb_presets_insert(presetsPlist, ghb_value_dup(dict), indices, len);
+            presets_list_insert(ud, indices, len);
+            ghb_value_free(path);
+        }
+        ghb_value_free(array);
+
+        exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+        dir = g_path_get_dirname(filename);
+        if (strcmp(dir, exportDir) != 0)
+        {
+            ghb_settings_set_string(ud->settings, "ExportDirectory", dir);
+            ghb_pref_save(ud->settings, "ExportDirectory");
+        }
+        g_free(filename);
+        g_free(exportDir);
+        g_free(dir);
+        store_presets();
+    }
+    gtk_widget_destroy(dialog);
 }
 
 G_MODULE_EXPORT void
 preset_export_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	GtkResponseType response;
-	GValue *preset;
-	const gchar *name = "";
-	gint count, *indices, len;
-	gchar *exportDir;
-	gchar *filename;
-
-	g_debug("preset_export_clicked_cb ()");
-	preset = ghb_settings_get_value (ud->settings, "preset_selection");
-	if (preset == NULL)
-		return;
-
-	count = ghb_array_len(preset);
-	if (count <= 0)
-		return;
-
-	name = g_value_get_string(ghb_array_get_nth(preset, count-1));
-
-	dialog = gtk_file_chooser_dialog_new("Export Preset", NULL,
-				GTK_FILE_CHOOSER_ACTION_SAVE,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-				NULL);
-
-	exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
-	if (exportDir == NULL || exportDir[0] == '\0')
-	{
-		exportDir = g_strdup(".");
-	}
-	filename = g_strdup_printf("%s.plist", name);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir);
-	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), filename);
-	g_free(filename);
-	g_free(exportDir);
-
-	indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
-	if (indices == NULL)
-		return;
-
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
-	if (response == GTK_RESPONSE_ACCEPT)
-	{
-		GValue *export, *dict, *array;
-		FILE *file;
-		gchar  *dir;
-
-		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-
-		// export the preset
-		dict = presets_get_dict(presetsPlist, indices, len);
-
-		export = ghb_value_dup(dict);
-		array = ghb_array_value_new(1);
-		ghb_array_append(array, export);
-		presets_clear_default(array);
-		presets_customize(array);
-		export_xlat_presets(array);
-
-		file = g_fopen(filename, "w");
-		if (file != NULL)
-		{
-			ghb_plist_write(file, array);
-			fclose(file);
-		}
-		ghb_value_free(array);
-
-		exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
-		dir = g_path_get_dirname(filename);
-		if (strcmp(dir, exportDir) != 0)
-		{
-			ghb_settings_set_string(ud->settings, "ExportDirectory", dir);
-			ghb_pref_save(ud->settings, "ExportDirectory");
-		}
-		g_free(exportDir);
-		g_free(dir);
-		g_free(filename);
-	}
-	gtk_widget_destroy(dialog);
-	g_free(indices);
+    GtkWidget *dialog;
+    GtkResponseType response;
+    GValue *preset;
+    const gchar *name = "";
+    gint count, *indices, len;
+    gchar *exportDir;
+    gchar *filename;
+
+    g_debug("preset_export_clicked_cb ()");
+    preset = ghb_settings_get_value (ud->settings, "preset_selection");
+    if (preset == NULL)
+        return;
+
+    count = ghb_array_len(preset);
+    if (count <= 0)
+        return;
+
+    name = g_value_get_string(ghb_array_get_nth(preset, count-1));
+
+    dialog = gtk_file_chooser_dialog_new("Export Preset", NULL,
+                GTK_FILE_CHOOSER_ACTION_SAVE,
+                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                NULL);
+
+    exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+    if (exportDir == NULL || exportDir[0] == '\0')
+    {
+        exportDir = g_strdup(".");
+    }
+    filename = g_strdup_printf("%s.plist", name);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir);
+    gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), filename);
+    g_free(filename);
+    g_free(exportDir);
+
+    indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
+    if (indices == NULL)
+        return;
+
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_hide(dialog);
+    if (response == GTK_RESPONSE_ACCEPT)
+    {
+        GValue *export, *dict, *array;
+        FILE *file;
+        gchar  *dir;
+
+        filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+        // export the preset
+        dict = presets_get_dict(presetsPlist, indices, len);
+
+        export = ghb_value_dup(dict);
+        array = ghb_array_value_new(1);
+        ghb_array_append(array, export);
+        presets_clear_default(array);
+        presets_customize(array);
+        export_xlat_presets(array);
+
+        file = g_fopen(filename, "w");
+        if (file != NULL)
+        {
+            ghb_plist_write(file, array);
+            fclose(file);
+        }
+        ghb_value_free(array);
+
+        exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+        dir = g_path_get_dirname(filename);
+        if (strcmp(dir, exportDir) != 0)
+        {
+            ghb_settings_set_string(ud->settings, "ExportDirectory", dir);
+            ghb_pref_save(ud->settings, "ExportDirectory");
+        }
+        g_free(exportDir);
+        g_free(dir);
+        g_free(filename);
+    }
+    gtk_widget_destroy(dialog);
+    g_free(indices);
 }
 
 G_MODULE_EXPORT void
 presets_new_folder_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	GtkEntry *entry;
-	GtkTextView *desc;
-	GtkResponseType response;
-	GValue *preset, *dict;
-	const gchar *name = "";
-	const gchar *description = "";
-	gint count, *indices, len;
-
-	g_debug("presets_new_folder_clicked_cb ()");
-	preset = ghb_settings_get_value (ud->settings, "preset_selection");
-
-	count = ghb_array_len(preset);
-	if (count > 0)
-		name = g_value_get_string(ghb_array_get_nth(preset, count-1));
-	else
-		count = 1;
-
-	indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
-	dict = presets_get_dict(presetsPlist, indices, len);
-	if (dict != NULL)
-	{
-		description = g_value_get_string(
-							ghb_dict_lookup(dict, "PresetDescription"));
-		ghb_ui_update(ud, "FolderDescription", ghb_string_value(description));
-	}
-
-	desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "FolderDescription"));
-	dialog = GHB_WIDGET(ud->builder, "preset_new_folder_dialog");
-	entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "FolderName"));
-	gtk_entry_set_text(entry, name);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
-	if (response == GTK_RESPONSE_OK)
-	{
-		// save the preset
-		const gchar *name = gtk_entry_get_text(entry);
-		GValue *dest;
-
-		if (count > MAX_NESTED_PRESET-1)
-			count = MAX_NESTED_PRESET-1;
-
-		dest = ghb_array_value_new(MAX_NESTED_PRESET);
-		if (indices != NULL)
-		{
-			gint ptype;
-
-			ptype = ghb_presets_get_type(presetsPlist, indices, len);
-			if (ptype == PRESETS_CUSTOM)
-			{
-				ghb_array_copy(dest, preset, count-1);
-			}
-		}
-		ghb_array_append(dest, ghb_string_value_new(name));
-		GValue *val = ghb_widget_value(GTK_WIDGET(desc));
-		ghb_settings_set_value(ud->settings, "PresetDescription", val);
-		folder_save(ud, dest);
-		ghb_value_free(dest);
-	}
-	if (indices != NULL)
-		g_free(indices);
+    GtkWidget *dialog;
+    GtkEntry *entry;
+    GtkTextView *desc;
+    GtkResponseType response;
+    GValue *preset, *dict;
+    const gchar *name = "";
+    const gchar *description = "";
+    gint count, *indices, len;
+
+    g_debug("presets_new_folder_clicked_cb ()");
+    preset = ghb_settings_get_value (ud->settings, "preset_selection");
+
+    count = ghb_array_len(preset);
+    if (count > 0)
+        name = g_value_get_string(ghb_array_get_nth(preset, count-1));
+    else
+        count = 1;
+
+    indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
+    dict = presets_get_dict(presetsPlist, indices, len);
+    if (dict != NULL)
+    {
+        description = g_value_get_string(
+                            ghb_dict_lookup(dict, "PresetDescription"));
+        ghb_ui_update(ud, "FolderDescription", ghb_string_value(description));
+    }
+
+    desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "FolderDescription"));
+    dialog = GHB_WIDGET(ud->builder, "preset_new_folder_dialog");
+    entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "FolderName"));
+    gtk_entry_set_text(entry, name);
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_hide(dialog);
+    if (response == GTK_RESPONSE_OK)
+    {
+        // save the preset
+        const gchar *name = gtk_entry_get_text(entry);
+        GValue *dest;
+
+        if (count > MAX_NESTED_PRESET-1)
+            count = MAX_NESTED_PRESET-1;
+
+        dest = ghb_array_value_new(MAX_NESTED_PRESET);
+        if (indices != NULL)
+        {
+            gint ptype;
+
+            ptype = ghb_presets_get_type(presetsPlist, indices, len);
+            if (ptype == PRESETS_CUSTOM)
+            {
+                ghb_array_copy(dest, preset, count-1);
+            }
+        }
+        ghb_array_append(dest, ghb_string_value_new(name));
+        GValue *val = ghb_widget_value(GTK_WIDGET(desc));
+        ghb_settings_set_value(ud->settings, "PresetDescription", val);
+        folder_save(ud, dest);
+        ghb_value_free(dest);
+    }
+    if (indices != NULL)
+        g_free(indices);
 }
 
 G_MODULE_EXPORT void
 presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *dialog;
-	GtkEntry *entry;
-	GtkTextView *desc;
-	GtkResponseType response;
-	GValue *preset;
-	const gchar *name = "";
-	gint count, *indices, len;
-
-	g_debug("presets_save_clicked_cb ()");
-	preset = ghb_settings_get_value (ud->settings, "preset_selection");
-
-	count = ghb_array_len(preset);
-	if (count > 0)
-		name = g_value_get_string(ghb_array_get_nth(preset, count-1));
-	else
-		count = 1;
-
-	desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "PresetDescription"));
-	int width = ghb_settings_get_int(ud->settings, "PictureWidth");
-	int height = ghb_settings_get_int(ud->settings, "PictureHeight");
-	gboolean autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
-	ghb_ui_update(ud, "PictureWidthEnable", 
-		ghb_boolean_value(width!=0&&!autoscale));
-	ghb_ui_update(ud, "PictureHeightEnable", 
-		ghb_boolean_value(height!=0&&!autoscale));
-	if (!width)
-	{
-		width = ghb_settings_get_int(ud->settings, "scale_width");
-		ghb_ui_update(ud, "PictureWidth", ghb_int_value(width));
-	}
-	if (!height)
-	{
-		height = ghb_settings_get_int(ud->settings, "scale_height");
-		ghb_ui_update(ud, "PictureHeight", ghb_int_value(height));
-	}
-	dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
-	entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "PresetName"));
-	gtk_entry_set_text(entry, name);
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_hide(dialog);
-	if (response == GTK_RESPONSE_OK)
-	{
-		// save the preset
-		const gchar *name = gtk_entry_get_text(entry);
-		GValue *dest;
-
-		dest = ghb_array_value_new(MAX_NESTED_PRESET);
-		indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
-		if (indices)
-		{
-			gint ptype;
-
-			ptype = ghb_presets_get_type(presetsPlist, indices, len);
-			if (ptype == PRESETS_CUSTOM)
-			{
-				ghb_array_copy(dest, preset, count-1);
-			}
-			g_free(indices);
-		}
-		ghb_array_append(dest, ghb_string_value_new(name));
-
-		ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
-
-		// Construct the audio settings presets from the current audio list
-		update_audio_presets(ud);
-		update_subtitle_presets(ud);
-		settings_save(ud, dest);
-		ghb_value_free(dest);
-	}
+    GtkWidget *dialog;
+    GtkEntry *entry;
+    GtkTextView *desc;
+    GtkResponseType response;
+    GValue *preset;
+    const gchar *name = "";
+    gint count, *indices, len;
+
+    g_debug("presets_save_clicked_cb ()");
+    preset = ghb_settings_get_value (ud->settings, "preset_selection");
+
+    count = ghb_array_len(preset);
+    if (count > 0)
+        name = g_value_get_string(ghb_array_get_nth(preset, count-1));
+    else
+        count = 1;
+
+    desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "PresetDescription"));
+    int width = ghb_settings_get_int(ud->settings, "PictureWidth");
+    int height = ghb_settings_get_int(ud->settings, "PictureHeight");
+    gboolean autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
+    ghb_ui_update(ud, "PictureWidthEnable", 
+        ghb_boolean_value(width!=0&&!autoscale));
+    ghb_ui_update(ud, "PictureHeightEnable", 
+        ghb_boolean_value(height!=0&&!autoscale));
+    if (!width)
+    {
+        width = ghb_settings_get_int(ud->settings, "scale_width");
+        ghb_ui_update(ud, "PictureWidth", ghb_int_value(width));
+    }
+    if (!height)
+    {
+        height = ghb_settings_get_int(ud->settings, "scale_height");
+        ghb_ui_update(ud, "PictureHeight", ghb_int_value(height));
+    }
+    dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
+    entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "PresetName"));
+    gtk_entry_set_text(entry, name);
+    response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_hide(dialog);
+    if (response == GTK_RESPONSE_OK)
+    {
+        // save the preset
+        const gchar *name = gtk_entry_get_text(entry);
+        GValue *dest;
+
+        dest = ghb_array_value_new(MAX_NESTED_PRESET);
+        indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
+        if (indices)
+        {
+            gint ptype;
+
+            ptype = ghb_presets_get_type(presetsPlist, indices, len);
+            if (ptype == PRESETS_CUSTOM)
+            {
+                ghb_array_copy(dest, preset, count-1);
+            }
+            g_free(indices);
+        }
+        ghb_array_append(dest, ghb_string_value_new(name));
+
+        ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
+
+        // Construct the audio settings presets from the current audio list
+        update_audio_presets(ud);
+        update_subtitle_presets(ud);
+        settings_save(ud, dest);
+        ghb_value_free(dest);
+    }
 }
 
 G_MODULE_EXPORT void
 preset_type_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
+    ghb_widget_to_setting(ud->settings, widget);
 }
 
 G_MODULE_EXPORT void
 presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GValue *preset;
+    GValue *preset;
 
-	g_debug("presets_restore_clicked_cb ()");
-	// Reload only the standard presets
-	ghb_presets_reload(ud);
-	// Updating the presets list shuffles things around
-	// need to make sure the proper preset is selected
-	preset = ghb_settings_get_value (ud->settings, "preset");
-	ghb_select_preset(ud->builder, preset);
+    g_debug("presets_restore_clicked_cb ()");
+    // Reload only the standard presets
+    ghb_presets_reload(ud);
+    // Updating the presets list shuffles things around
+    // need to make sure the proper preset is selected
+    preset = ghb_settings_get_value (ud->settings, "preset");
+    ghb_select_preset(ud->builder, preset);
 }
 
 G_MODULE_EXPORT void
 presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gchar *preset;
-	GtkResponseType response;
-
-	g_debug("presets_remove_clicked_cb ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		GtkWidget *dialog;
-		GtkTreePath *path;
-		gint *indices, len;
-		gboolean folder;
-
-		gtk_tree_model_get(store, &iter, 0, &preset, -1);
-		path = gtk_tree_model_get_path(store, &iter);
-		indices = gtk_tree_path_get_indices(path);
-		len = gtk_tree_path_get_depth(path);
-
-		folder = ghb_presets_get_folder(presetsPlist, indices, len);
-		dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-							GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-							"Confirm deletion of %s:\n\n%s", 
-							folder ? "folder" : "preset",
-							preset);
-		response = gtk_dialog_run(GTK_DIALOG(dialog));
-		gtk_widget_destroy (dialog);
-		if (response == GTK_RESPONSE_YES)
-		{
-			GtkTreeIter nextIter = iter;
-			gboolean valid = TRUE;
-			if (!gtk_tree_model_iter_next(store, &nextIter))
-			{
-				if (!gtk_tree_model_iter_parent(store, &nextIter, &iter))
-				{
-					valid = FALSE;
-				}
-			}
-			// Remove the selected item
-			// First unselect it so that selecting the new item works properly
-			gtk_tree_selection_unselect_iter (selection, &iter);
-			if (ghb_presets_remove(presetsPlist, indices, len))
-			{
-				store_presets();
-				presets_list_remove(ud, indices, len);
-			}
-			if (!valid)
-				valid = gtk_tree_model_get_iter_first(store, &nextIter);
-			if (valid)
-			{
-				gtk_tree_path_free(path);
-				path = gtk_tree_model_get_path(store, &nextIter);
-				indices = gtk_tree_path_get_indices(path);
-				len = gtk_tree_path_get_depth(path);
-				ghb_select_preset2(ud->builder, indices, len);
-			}
-		}
-		g_free(preset);
-		gtk_tree_path_free(path);
-	}
+    GtkTreeView *treeview;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gchar *preset;
+    GtkResponseType response;
+
+    g_debug("presets_remove_clicked_cb ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        GtkWidget *dialog;
+        GtkTreePath *path;
+        gint *indices, len;
+        gboolean folder;
+
+        gtk_tree_model_get(store, &iter, 0, &preset, -1);
+        path = gtk_tree_model_get_path(store, &iter);
+        indices = gtk_tree_path_get_indices(path);
+        len = gtk_tree_path_get_depth(path);
+
+        folder = ghb_presets_get_folder(presetsPlist, indices, len);
+        dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                            GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+                            "Confirm deletion of %s:\n\n%s", 
+                            folder ? "folder" : "preset",
+                            preset);
+        response = gtk_dialog_run(GTK_DIALOG(dialog));
+        gtk_widget_destroy (dialog);
+        if (response == GTK_RESPONSE_YES)
+        {
+            GtkTreeIter nextIter = iter;
+            gboolean valid = TRUE;
+            if (!gtk_tree_model_iter_next(store, &nextIter))
+            {
+                if (!gtk_tree_model_iter_parent(store, &nextIter, &iter))
+                {
+                    valid = FALSE;
+                }
+            }
+            // Remove the selected item
+            // First unselect it so that selecting the new item works properly
+            gtk_tree_selection_unselect_iter (selection, &iter);
+            if (ghb_presets_remove(presetsPlist, indices, len))
+            {
+                store_presets();
+                presets_list_remove(ud, indices, len);
+            }
+            if (!valid)
+                valid = gtk_tree_model_get_iter_first(store, &nextIter);
+            if (valid)
+            {
+                gtk_tree_path_free(path);
+                path = gtk_tree_model_get_path(store, &nextIter);
+                indices = gtk_tree_path_get_indices(path);
+                len = gtk_tree_path_get_depth(path);
+                ghb_select_preset2(ud->builder, indices, len);
+            }
+        }
+        g_free(preset);
+        gtk_tree_path_free(path);
+    }
 }
 
 // controls where valid drop locations are
 G_MODULE_EXPORT gboolean
 presets_drag_motion_cb(
-	GtkTreeView *tv,
-	GdkDragContext *ctx,
-	gint x,
-	gint y,
-	guint time,
-	signal_user_data_t *ud)
-{
-	GtkTreePath *path = NULL;
-	GtkTreeViewDropPosition drop_pos;
-	gint *indices, len;
-	GtkTreeIter iter;
-	GtkTreeView *srctv;
-	GtkTreeModel *model;
-	GtkTreeSelection *select;
-	gint src_ptype, dst_ptype;
-	gboolean src_folder, dst_folder;
-	GValue *preset;
-	gint tree_depth, ii;
-	GtkWidget *widget;
-
-	widget = gtk_drag_get_source_widget(ctx);
-	if (widget == NULL || widget != GTK_WIDGET(tv))
-		return TRUE;
-
-	// Get the type of the object being dragged
-	srctv = GTK_TREE_VIEW(gtk_drag_get_source_widget(ctx));
-	select = gtk_tree_view_get_selection (srctv);
-	gtk_tree_selection_get_selected (select, &model, &iter);
-	path = gtk_tree_model_get_path (model, &iter);
-	indices = gtk_tree_path_get_indices(path);
-	len = gtk_tree_path_get_depth(path);
-
-	preset = presets_get_dict(presetsPlist, indices, len);
-	tree_depth = preset_tree_depth(preset);
-
-	src_ptype = ghb_presets_get_type(presetsPlist, indices, len);
-	src_folder = ghb_presets_get_folder(presetsPlist, indices, len);
-	gtk_tree_path_free(path);
-
-	if (src_folder && tree_depth == 1)
-		tree_depth = 2;
-
-	// The rest checks that the destination is a valid position
-	// in the list.
-	gtk_tree_view_get_dest_row_at_pos (tv, x, y, &path, &drop_pos);
-	if (path == NULL)
-	{
-		gdk_drag_status(ctx, 0, time);
-		return TRUE;
-	}
-	// Don't allow repositioning of builtin presets
-	if (src_ptype != PRESETS_CUSTOM)
-	{
-		gdk_drag_status(ctx, 0, time);
-		return TRUE;
-	}
-
-	len = gtk_tree_path_get_depth(path);
-	if (len+tree_depth-1 >= MAX_NESTED_PRESET)
-	{
-		if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
-			drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
-		if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
-			drop_pos = GTK_TREE_VIEW_DROP_AFTER;
-	}
-	for (ii = len+tree_depth-1; ii > MAX_NESTED_PRESET; ii--)
-		gtk_tree_path_up(path);
-	indices = gtk_tree_path_get_indices(path);
-	len = gtk_tree_path_get_depth(path);
-	dst_ptype = ghb_presets_get_type(presetsPlist, indices, len);
-	dst_folder = ghb_presets_get_folder(presetsPlist, indices, len);
-	// Don't allow mixing custom presets in the builtins
-	if (dst_ptype != PRESETS_CUSTOM)
-	{
-		gdk_drag_status(ctx, 0, time);
-		return TRUE;
-	}
-
-	// Only allow *drop into* for folders
-	if (!dst_folder)
-	{ 
-		if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
-			drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
-		if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
-			drop_pos = GTK_TREE_VIEW_DROP_AFTER;
-	}
-
-	len = gtk_tree_path_get_depth(path);
-	gtk_tree_view_set_drag_dest_row(tv, path, drop_pos);
-	gtk_tree_path_free(path);
-	gdk_drag_status(ctx, GDK_ACTION_MOVE, time);
-	return TRUE;
+    GtkTreeView *tv,
+    GdkDragContext *ctx,
+    gint x,
+    gint y,
+    guint time,
+    signal_user_data_t *ud)
+{
+    GtkTreePath *path = NULL;
+    GtkTreeViewDropPosition drop_pos;
+    gint *indices, len;
+    GtkTreeIter iter;
+    GtkTreeView *srctv;
+    GtkTreeModel *model;
+    GtkTreeSelection *select;
+    gint src_ptype, dst_ptype;
+    gboolean src_folder, dst_folder;
+    GValue *preset;
+    gint tree_depth, ii;
+    GtkWidget *widget;
+
+    widget = gtk_drag_get_source_widget(ctx);
+    if (widget == NULL || widget != GTK_WIDGET(tv))
+        return TRUE;
+
+    // Get the type of the object being dragged
+    srctv = GTK_TREE_VIEW(gtk_drag_get_source_widget(ctx));
+    select = gtk_tree_view_get_selection (srctv);
+    gtk_tree_selection_get_selected (select, &model, &iter);
+    path = gtk_tree_model_get_path (model, &iter);
+    indices = gtk_tree_path_get_indices(path);
+    len = gtk_tree_path_get_depth(path);
+
+    preset = presets_get_dict(presetsPlist, indices, len);
+    tree_depth = preset_tree_depth(preset);
+
+    src_ptype = ghb_presets_get_type(presetsPlist, indices, len);
+    src_folder = ghb_presets_get_folder(presetsPlist, indices, len);
+    gtk_tree_path_free(path);
+
+    if (src_folder && tree_depth == 1)
+        tree_depth = 2;
+
+    // The rest checks that the destination is a valid position
+    // in the list.
+    gtk_tree_view_get_dest_row_at_pos (tv, x, y, &path, &drop_pos);
+    if (path == NULL)
+    {
+        gdk_drag_status(ctx, 0, time);
+        return TRUE;
+    }
+    // Don't allow repositioning of builtin presets
+    if (src_ptype != PRESETS_CUSTOM)
+    {
+        gdk_drag_status(ctx, 0, time);
+        return TRUE;
+    }
+
+    len = gtk_tree_path_get_depth(path);
+    if (len+tree_depth-1 >= MAX_NESTED_PRESET)
+    {
+        if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+            drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+        if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+            drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+    }
+    for (ii = len+tree_depth-1; ii > MAX_NESTED_PRESET; ii--)
+        gtk_tree_path_up(path);
+    indices = gtk_tree_path_get_indices(path);
+    len = gtk_tree_path_get_depth(path);
+    dst_ptype = ghb_presets_get_type(presetsPlist, indices, len);
+    dst_folder = ghb_presets_get_folder(presetsPlist, indices, len);
+    // Don't allow mixing custom presets in the builtins
+    if (dst_ptype != PRESETS_CUSTOM)
+    {
+        gdk_drag_status(ctx, 0, time);
+        return TRUE;
+    }
+
+    // Only allow *drop into* for folders
+    if (!dst_folder)
+    { 
+        if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+            drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+        if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+            drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+    }
+
+    len = gtk_tree_path_get_depth(path);
+    gtk_tree_view_set_drag_dest_row(tv, path, drop_pos);
+    gtk_tree_path_free(path);
+    gdk_drag_status(ctx, GDK_ACTION_MOVE, time);
+    return TRUE;
 }
 
 G_MODULE_EXPORT void 
 presets_drag_cb(
-	GtkTreeView *dstwidget, 
-	GdkDragContext *dc, 
-	gint x, gint y, 
-	GtkSelectionData *selection_data, 
-	guint info, guint t, 
-	signal_user_data_t *ud)
-{
-	GtkTreePath *path = NULL;
-	GtkTreeViewDropPosition drop_pos;
-	GtkTreeIter dstiter, srciter;
-	gint *dst_indices, dst_len, *src_indices, src_len;
-	gint src_ptype;
-	gboolean src_folder, dst_folder;
-	
-	GtkTreeModel *dstmodel = gtk_tree_view_get_model(dstwidget);
-			
-	g_debug("preset_drag_cb ()");
-	// This doesn't work here for some reason...
-	// gtk_tree_view_get_drag_dest_row(dstwidget, &path, &drop_pos);
-	gtk_tree_view_get_dest_row_at_pos (dstwidget, x, y, &path, &drop_pos);
-	// This little hack is needed because attempting to drop after
-	// the last item gives us no path or drop_pos.
-	if (path == NULL)
-	{
-		gint n_children;
-
-		n_children = gtk_tree_model_iter_n_children(dstmodel, NULL);
-		if (n_children)
-		{
-			drop_pos = GTK_TREE_VIEW_DROP_AFTER;
-			path = gtk_tree_path_new_from_indices(n_children-1, -1);
-		}
-		else
-		{
-			drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
-			path = gtk_tree_path_new_from_indices(0, -1);
-		}
-	}
-	if (path)
-	{
-		GtkTreeView *srcwidget;
-		GtkTreeModel *srcmodel;
-		GtkTreeSelection *select;
-		GtkTreePath *srcpath = NULL;
-		GValue *preset;
-		gint tree_depth, ii;
-
-		srcwidget = GTK_TREE_VIEW(gtk_drag_get_source_widget(dc));
-		select = gtk_tree_view_get_selection (srcwidget);
-		gtk_tree_selection_get_selected (select, &srcmodel, &srciter);
-
-		srcpath = gtk_tree_model_get_path (srcmodel, &srciter);
-		src_indices = gtk_tree_path_get_indices(srcpath);
-		src_len = gtk_tree_path_get_depth(srcpath);
-		src_ptype = ghb_presets_get_type(presetsPlist, src_indices, src_len);
-		src_folder = ghb_presets_get_folder(presetsPlist, src_indices, src_len);
-		preset = ghb_value_dup(
-					presets_get_dict(presetsPlist, src_indices, src_len));
-		gtk_tree_path_free(srcpath);
-
-		// Don't allow repositioning of builtin presets
-		if (src_ptype != PRESETS_CUSTOM)
-			return;
-
-		tree_depth = preset_tree_depth(preset);
-		if (src_folder && tree_depth == 1)
-			tree_depth = 2;
-
-		dst_len = gtk_tree_path_get_depth(path);
-		if (dst_len+tree_depth-1 >= MAX_NESTED_PRESET)
-		{
-			if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
-				drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
-			if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
-				drop_pos = GTK_TREE_VIEW_DROP_AFTER;
-		}
-
-		for (ii = dst_len+tree_depth-1; ii > MAX_NESTED_PRESET; ii--)
-			gtk_tree_path_up(path);
-		dst_indices = gtk_tree_path_get_indices(path);
-		dst_len = gtk_tree_path_get_depth(path);
-		dst_folder = ghb_presets_get_folder(presetsPlist, dst_indices, dst_len);
-		// Only allow *drop into* for folders
-		if (!dst_folder)
-		{ 
-			if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
-				drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
-			if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
-				drop_pos = GTK_TREE_VIEW_DROP_AFTER;
-		}
-		if (gtk_tree_model_get_iter (dstmodel, &dstiter, path))
-		{
-			GtkTreeIter iter;
-			GtkTreePath *dstpath = NULL;
-
-			switch (drop_pos)
-			{
-				case GTK_TREE_VIEW_DROP_BEFORE:
-					gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel), 
-												&iter, NULL, &dstiter);
-					break;
-
-				case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-					gtk_tree_store_insert(GTK_TREE_STORE (dstmodel), 
-												&iter, &dstiter, 0);
-					break;
-
-				case GTK_TREE_VIEW_DROP_AFTER:
-					gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), 
-												&iter, NULL, &dstiter);
-					break;
-
-				case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
-					gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), 
-												&iter, &dstiter, 0);
-					break;
-
-				default:
-					break;
-			}
-
-			dstpath = gtk_tree_model_get_path (dstmodel, &iter);
-			dst_indices = gtk_tree_path_get_indices(dstpath);
-			dst_len = gtk_tree_path_get_depth(dstpath);
-			ghb_presets_insert(presetsPlist, preset, dst_indices, dst_len);
-			gtk_tree_path_free(dstpath);
-
-			srcpath = gtk_tree_model_get_path (srcmodel, &srciter);
-			src_indices = gtk_tree_path_get_indices(srcpath);
-			src_len = gtk_tree_path_get_depth(srcpath);
-			ghb_presets_remove(presetsPlist, src_indices, src_len);
-			gtk_tree_path_free(srcpath);
-
-			gtk_tree_store_remove (GTK_TREE_STORE (srcmodel), &srciter);
-
-			dstpath = gtk_tree_model_get_path (dstmodel, &iter);
-			dst_indices = gtk_tree_path_get_indices(dstpath);
-			dst_len = gtk_tree_path_get_depth(dstpath);
-			presets_list_update_item(ud, dst_indices, dst_len, TRUE);
-			gtk_tree_path_free(dstpath);
-
-			store_presets();
-		}
-		gtk_tree_path_free(path);
-	}
+    GtkTreeView *dstwidget, 
+    GdkDragContext *dc, 
+    gint x, gint y, 
+    GtkSelectionData *selection_data, 
+    guint info, guint t, 
+    signal_user_data_t *ud)
+{
+    GtkTreePath *path = NULL;
+    GtkTreeViewDropPosition drop_pos;
+    GtkTreeIter dstiter, srciter;
+    gint *dst_indices, dst_len, *src_indices, src_len;
+    gint src_ptype;
+    gboolean src_folder, dst_folder;
+    
+    GtkTreeModel *dstmodel = gtk_tree_view_get_model(dstwidget);
+            
+    g_debug("preset_drag_cb ()");
+    // This doesn't work here for some reason...
+    // gtk_tree_view_get_drag_dest_row(dstwidget, &path, &drop_pos);
+    gtk_tree_view_get_dest_row_at_pos (dstwidget, x, y, &path, &drop_pos);
+    // This little hack is needed because attempting to drop after
+    // the last item gives us no path or drop_pos.
+    if (path == NULL)
+    {
+        gint n_children;
+
+        n_children = gtk_tree_model_iter_n_children(dstmodel, NULL);
+        if (n_children)
+        {
+            drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+            path = gtk_tree_path_new_from_indices(n_children-1, -1);
+        }
+        else
+        {
+            drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+            path = gtk_tree_path_new_from_indices(0, -1);
+        }
+    }
+    if (path)
+    {
+        GtkTreeView *srcwidget;
+        GtkTreeModel *srcmodel;
+        GtkTreeSelection *select;
+        GtkTreePath *srcpath = NULL;
+        GValue *preset;
+        gint tree_depth, ii;
+
+        srcwidget = GTK_TREE_VIEW(gtk_drag_get_source_widget(dc));
+        select = gtk_tree_view_get_selection (srcwidget);
+        gtk_tree_selection_get_selected (select, &srcmodel, &srciter);
+
+        srcpath = gtk_tree_model_get_path (srcmodel, &srciter);
+        src_indices = gtk_tree_path_get_indices(srcpath);
+        src_len = gtk_tree_path_get_depth(srcpath);
+        src_ptype = ghb_presets_get_type(presetsPlist, src_indices, src_len);
+        src_folder = ghb_presets_get_folder(presetsPlist, src_indices, src_len);
+        preset = ghb_value_dup(
+                    presets_get_dict(presetsPlist, src_indices, src_len));
+        gtk_tree_path_free(srcpath);
+
+        // Don't allow repositioning of builtin presets
+        if (src_ptype != PRESETS_CUSTOM)
+            return;
+
+        tree_depth = preset_tree_depth(preset);
+        if (src_folder && tree_depth == 1)
+            tree_depth = 2;
+
+        dst_len = gtk_tree_path_get_depth(path);
+        if (dst_len+tree_depth-1 >= MAX_NESTED_PRESET)
+        {
+            if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+                drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+            if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+                drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+        }
+
+        for (ii = dst_len+tree_depth-1; ii > MAX_NESTED_PRESET; ii--)
+            gtk_tree_path_up(path);
+        dst_indices = gtk_tree_path_get_indices(path);
+        dst_len = gtk_tree_path_get_depth(path);
+        dst_folder = ghb_presets_get_folder(presetsPlist, dst_indices, dst_len);
+        // Only allow *drop into* for folders
+        if (!dst_folder)
+        { 
+            if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+                drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
+            if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
+                drop_pos = GTK_TREE_VIEW_DROP_AFTER;
+        }
+        if (gtk_tree_model_get_iter (dstmodel, &dstiter, path))
+        {
+            GtkTreeIter iter;
+            GtkTreePath *dstpath = NULL;
+
+            switch (drop_pos)
+            {
+                case GTK_TREE_VIEW_DROP_BEFORE:
+                    gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel), 
+                                                &iter, NULL, &dstiter);
+                    break;
+
+                case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
+                    gtk_tree_store_insert(GTK_TREE_STORE (dstmodel), 
+                                                &iter, &dstiter, 0);
+                    break;
+
+                case GTK_TREE_VIEW_DROP_AFTER:
+                    gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), 
+                                                &iter, NULL, &dstiter);
+                    break;
+
+                case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
+                    gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), 
+                                                &iter, &dstiter, 0);
+                    break;
+
+                default:
+                    break;
+            }
+
+            dstpath = gtk_tree_model_get_path (dstmodel, &iter);
+            dst_indices = gtk_tree_path_get_indices(dstpath);
+            dst_len = gtk_tree_path_get_depth(dstpath);
+            ghb_presets_insert(presetsPlist, preset, dst_indices, dst_len);
+            gtk_tree_path_free(dstpath);
+
+            srcpath = gtk_tree_model_get_path (srcmodel, &srciter);
+            src_indices = gtk_tree_path_get_indices(srcpath);
+            src_len = gtk_tree_path_get_depth(srcpath);
+            ghb_presets_remove(presetsPlist, src_indices, src_len);
+            gtk_tree_path_free(srcpath);
+
+            gtk_tree_store_remove (GTK_TREE_STORE (srcmodel), &srciter);
+
+            dstpath = gtk_tree_model_get_path (dstmodel, &iter);
+            dst_indices = gtk_tree_path_get_indices(dstpath);
+            dst_len = gtk_tree_path_get_depth(dstpath);
+            presets_list_update_item(ud, dst_indices, dst_len, TRUE);
+            gtk_tree_path_free(dstpath);
+
+            store_presets();
+        }
+        gtk_tree_path_free(path);
+    }
 }
 
 void
 presets_row_expanded_cb(
-	GtkTreeView *treeview, 
-	GtkTreeIter *iter, 
-	GtkTreePath *path, 
-	signal_user_data_t *ud)
-{
-	gint *indices, len;
-	gboolean expanded, folder;
-	GValue *dict;
-
-	expanded = gtk_tree_view_row_expanded(treeview, path);
-	indices = gtk_tree_path_get_indices(path);
-	len = gtk_tree_path_get_depth(path);
-	dict = presets_get_dict(presetsPlist, indices, len);
-	if (preset_folder_is_open(dict))
-	{
-		if (expanded)
-			return;
-	}
-	else if (!expanded)
-	{
-		return;
-	}
-	folder = ghb_presets_get_folder(presetsPlist, indices, len);
-	if (folder)
-	{
-		presets_set_folder_open(expanded, indices, len);
-	}
-
-	// Collapsing parent folder collapses all children
-	if (!expanded)
-	{
-		GValue *presets = NULL;
-		gint *more_indices, count, ii;
-
-		more_indices = g_malloc((len+1)*sizeof(gint));
-		memcpy(more_indices, indices, len*sizeof(gint));
-
-		presets = presets_get_folder(presetsPlist, indices, len);
-		count = ghb_array_len(presets);
-		for (ii = 0; ii < count; ii++)
-		{
-			dict = ghb_array_get_nth(presets, ii);
-			folder = ghb_preset_folder(dict);
-			if (folder)
-			{
-				more_indices[len] = ii;
-				presets_set_folder_open(expanded, more_indices, len+1);
-			}
-		}
-		g_free(more_indices);
-	}
-	store_presets();
+    GtkTreeView *treeview, 
+    GtkTreeIter *iter, 
+    GtkTreePath *path, 
+    signal_user_data_t *ud)
+{
+    gint *indices, len;
+    gboolean expanded, folder;
+    GValue *dict;
+
+    expanded = gtk_tree_view_row_expanded(treeview, path);
+    indices = gtk_tree_path_get_indices(path);
+    len = gtk_tree_path_get_depth(path);
+    dict = presets_get_dict(presetsPlist, indices, len);
+    if (preset_folder_is_open(dict))
+    {
+        if (expanded)
+            return;
+    }
+    else if (!expanded)
+    {
+        return;
+    }
+    folder = ghb_presets_get_folder(presetsPlist, indices, len);
+    if (folder)
+    {
+        presets_set_folder_open(expanded, indices, len);
+    }
+
+    // Collapsing parent folder collapses all children
+    if (!expanded)
+    {
+        GValue *presets = NULL;
+        gint *more_indices, count, ii;
+
+        more_indices = g_malloc((len+1)*sizeof(gint));
+        memcpy(more_indices, indices, len*sizeof(gint));
+
+        presets = presets_get_folder(presetsPlist, indices, len);
+        count = ghb_array_len(presets);
+        for (ii = 0; ii < count; ii++)
+        {
+            dict = ghb_array_get_nth(presets, ii);
+            folder = ghb_preset_folder(dict);
+            if (folder)
+            {
+                more_indices[len] = ii;
+                presets_set_folder_open(expanded, more_indices, len+1);
+            }
+        }
+        g_free(more_indices);
+    }
+    store_presets();
 }
 
 static void
-preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo)
+preset_update_title_deps(signal_user_data_t *ud, hb_title_t *title)
 {
-	GtkWidget *widget;
+    GtkWidget *widget;
 
-	ghb_ui_update(ud, "scale_width", 
-			ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
-	// If anamorphic or keep_aspect, the hight will be automatically calculated
-	gboolean keep_aspect;
-	gint pic_par;
-	keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
-	pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
-	if (!(keep_aspect || pic_par) || pic_par == 3)
-	{
-		ghb_ui_update(ud, "scale_height", 
-			ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1]));
-	}
-
-	// Set the limits of cropping.  hb_set_anamorphic_size crashes if
-	// you pass it a cropped width or height == 0.
-	gint bound;
-	bound = tinfo->height / 2 - 2;
-	widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	bound = tinfo->width / 2 - 2;
-	widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-	if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
-	{
-		ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(tinfo->crop[0]));
-		ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(tinfo->crop[1]));
-		ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(tinfo->crop[2]));
-		ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(tinfo->crop[3]));
-	}
+    ghb_ui_update(ud, "scale_width", 
+            ghb_int64_value(title->width - title->crop[2] - title->crop[3]));
+    // If anamorphic or keep_aspect, the hight will be automatically calculated
+    gboolean keep_aspect;
+    gint pic_par;
+    keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+    pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
+    if (!(keep_aspect || pic_par) || pic_par == 3)
+    {
+        ghb_ui_update(ud, "scale_height", 
+            ghb_int64_value(title->height - title->crop[0] - title->crop[1]));
+    }
+
+    // Set the limits of cropping.  hb_set_anamorphic_size crashes if
+    // you pass it a cropped width or height == 0.
+    gint bound;
+    bound = title->height / 2 - 2;
+    widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    bound = title->width / 2 - 2;
+    widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
+    gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
+    if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
+    {
+        ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(title->crop[0]));
+        ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(title->crop[1]));
+        ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(title->crop[2]));
+        ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(title->crop[3]));
+    }
 }
 
 void
 ghb_refresh_preset(signal_user_data_t *ud)
 {
-	ghb_title_info_t tinfo;
-	GValue *preset;
-	gint *indices, len;
-
-	g_debug("ghb_refresh_preset ()");
-	preset = ghb_settings_get_value(ud->settings, "preset_selection");
-	indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
-	if (indices)
-	{
-		gboolean folder;
-
-		folder = ghb_presets_get_folder(presetsPlist, indices, len);
-		if (!folder)
-		{
-			ud->dont_clear_presets = TRUE;
-			ud->scale_busy = TRUE;
-			// Temporarily set the video_quality range to (0,100)
-			// This is needed so the video_quality value does not get
-			// truncated when set.  The range will be readjusted below
-			GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
-			gtk_range_set_range (GTK_RANGE(qp), 0, 100);
-			gtk_scale_set_digits(GTK_SCALE(qp), 3);
-			ghb_set_preset_from_indices(ud, indices, len);
-			gint titleindex;
-			titleindex = ghb_settings_combo_int(ud->settings, "title");
-			ghb_set_pref_audio_settings(titleindex, ud->settings);
-			ghb_set_pref_audio_from_settings(ud, ud->settings);
-			ghb_set_pref_subtitle(titleindex, ud);
-			ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
-			if (ghb_get_title_info (&tinfo, titleindex))
-			{
-				preset_update_title_deps(ud, &tinfo);
-			}
-			ud->scale_busy = FALSE;
-			ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
-			ud->dont_clear_presets = FALSE;
-
-			gdouble vqmin, vqmax, step, page;
-			gint digits;
-			gboolean inverted;
-
-			ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
-								&page, &digits, &inverted);
-			gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-			gtk_range_set_increments (GTK_RANGE(qp), step, page);
-			gtk_scale_set_digits(GTK_SCALE(qp), digits);
-			gtk_range_set_inverted (GTK_RANGE(qp), inverted);
-
-			gchar *text;
-			gint crop[4];
-			GtkWidget *crop_widget;
-			crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
-			crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
-			crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
-			crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
-			crop_widget = GHB_WIDGET (ud->builder, "crop_values");
-			text = g_strdup_printf("%d:%d:%d:%d", 
-									crop[0], crop[1], crop[2], crop[3]);
-			gtk_label_set_text (GTK_LABEL(crop_widget), text);
-			g_free(text);
-		}
-	}
+    GValue *preset;
+    gint *indices, len;
+
+    g_debug("ghb_refresh_preset ()");
+    preset = ghb_settings_get_value(ud->settings, "preset_selection");
+    indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
+    if (indices)
+    {
+        gboolean folder;
+
+        folder = ghb_presets_get_folder(presetsPlist, indices, len);
+        if (!folder)
+        {
+            ud->dont_clear_presets = TRUE;
+            ud->scale_busy = TRUE;
+            // Temporarily set the video_quality range to (0,100)
+            // This is needed so the video_quality value does not get
+            // truncated when set.  The range will be readjusted below
+            GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
+            gtk_range_set_range (GTK_RANGE(qp), 0, 100);
+            gtk_scale_set_digits(GTK_SCALE(qp), 3);
+            ghb_set_preset_from_indices(ud, indices, len);
+            gint titleindex;
+            titleindex = ghb_settings_combo_int(ud->settings, "title");
+            ghb_set_pref_audio_settings(titleindex, ud->settings);
+            ghb_set_pref_audio_from_settings(ud, ud->settings);
+            ghb_set_pref_subtitle(titleindex, ud);
+            ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
+            hb_title_t * title = ghb_get_title_info(titleindex);
+            if (title != NULL)
+            {
+                preset_update_title_deps(ud, title);
+            }
+            ud->scale_busy = FALSE;
+            ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
+            ud->dont_clear_presets = FALSE;
+
+            gdouble vqmin, vqmax, step, page;
+            gint digits;
+            gboolean inverted;
+
+            ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
+                                &page, &digits, &inverted);
+            gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
+            gtk_range_set_increments (GTK_RANGE(qp), step, page);
+            gtk_scale_set_digits(GTK_SCALE(qp), digits);
+            gtk_range_set_inverted (GTK_RANGE(qp), inverted);
+
+            gchar *text;
+            gint crop[4];
+            GtkWidget *crop_widget;
+            crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+            crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+            crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+            crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+            crop_widget = GHB_WIDGET (ud->builder, "crop_values");
+            text = g_strdup_printf("%d:%d:%d:%d", 
+                                    crop[0], crop[1], crop[2], crop[3]);
+            gtk_label_set_text (GTK_LABEL(crop_widget), text);
+            g_free(text);
+        }
+    }
 }
 
 G_MODULE_EXPORT void
 presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
 {
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	ghb_title_info_t tinfo;
-	GtkWidget *widget;
-	
-	g_debug("presets_list_selection_changed_cb ()");
-	widget = GHB_WIDGET (ud->builder, "presets_remove");
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		GtkTreePath *treepath;
-		gint *indices, len;
-		GValue *path;
-		gboolean folder;
-
-		treepath = gtk_tree_model_get_path(store, &iter);
-		indices = gtk_tree_path_get_indices(treepath);
-		len = gtk_tree_path_get_depth(treepath);
-
-		path = preset_path_from_indices(presetsPlist, indices, len);
-		ghb_settings_take_value(ud->settings, "preset_selection", path);
-
-		folder = ghb_presets_get_folder(presetsPlist, indices, len);
-		if (!folder)
-		{
-			ud->dont_clear_presets = TRUE;
-			ud->scale_busy = TRUE;
-			// Temporarily set the video_quality range to (0,100)
-			// This is needed so the video_quality value does not get
-			// truncated when set.  The range will be readjusted below
-			GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
-			gtk_range_set_range (GTK_RANGE(qp), 0, 100);
-			gtk_scale_set_digits(GTK_SCALE(qp), 3);
-			ghb_set_preset_from_indices(ud, indices, len);
-			gint titleindex;
-			titleindex = ghb_settings_combo_int(ud->settings, "title");
-			ghb_set_pref_audio_settings(titleindex, ud->settings);
-			ghb_set_pref_audio_from_settings(ud, ud->settings);
-			ghb_set_pref_subtitle(titleindex, ud);
-			ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
-			if (ghb_get_title_info (&tinfo, titleindex))
-			{
-				preset_update_title_deps(ud, &tinfo);
-			}
-			ud->scale_busy = FALSE;
-			ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
-			ud->dont_clear_presets = FALSE;
-
-			gdouble vqmin, vqmax, step, page;
-			gint digits;
-			gboolean inverted;
-
-			ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
-								&page, &digits, &inverted);
-			gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-			gtk_range_set_increments (GTK_RANGE(qp), step, page);
-			gtk_scale_set_digits(GTK_SCALE(qp), digits);
-			gtk_range_set_inverted (GTK_RANGE(qp), inverted);
-
-			gchar *text;
-			gint crop[4];
-			GtkWidget *crop_widget;
-			crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
-			crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
-			crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
-			crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
-			crop_widget = GHB_WIDGET (ud->builder, "crop_values");
-			text = g_strdup_printf("%d:%d:%d:%d", 
-									crop[0], crop[1], crop[2], crop[3]);
-			gtk_label_set_text (GTK_LABEL(crop_widget), text);
-			g_free(text);
-		}
-		gtk_tree_path_free(treepath);
-		gtk_widget_set_sensitive(widget, TRUE);
-	}
-	else
-	{
-		g_debug("No selection???  Perhaps unselected.");
-		gtk_widget_set_sensitive(widget, FALSE);
-	}
-	if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
-	{
-		gint start, end;
-		start = ghb_settings_get_int(ud->settings, "start_point");
-		end = ghb_settings_get_int(ud->settings, "end_point");
-		widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
-		gtk_widget_set_sensitive(widget, TRUE);
-		if (start == end)
-		{
-			ud->dont_clear_presets = TRUE;
-			ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE));
-			ud->dont_clear_presets = FALSE;
-			gtk_widget_set_sensitive(widget, FALSE);
-		}
-	}
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    GtkWidget *widget;
+    
+    g_debug("presets_list_selection_changed_cb ()");
+    widget = GHB_WIDGET (ud->builder, "presets_remove");
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        GtkTreePath *treepath;
+        gint *indices, len;
+        GValue *path;
+        gboolean folder;
+
+        treepath = gtk_tree_model_get_path(store, &iter);
+        indices = gtk_tree_path_get_indices(treepath);
+        len = gtk_tree_path_get_depth(treepath);
+
+        path = preset_path_from_indices(presetsPlist, indices, len);
+        ghb_settings_take_value(ud->settings, "preset_selection", path);
+
+        folder = ghb_presets_get_folder(presetsPlist, indices, len);
+        if (!folder)
+        {
+            ud->dont_clear_presets = TRUE;
+            ud->scale_busy = TRUE;
+            // Temporarily set the video_quality range to (0,100)
+            // This is needed so the video_quality value does not get
+            // truncated when set.  The range will be readjusted below
+            GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
+            gtk_range_set_range (GTK_RANGE(qp), 0, 100);
+            gtk_scale_set_digits(GTK_SCALE(qp), 3);
+            ghb_set_preset_from_indices(ud, indices, len);
+            gint titleindex;
+            titleindex = ghb_settings_combo_int(ud->settings, "title");
+            ghb_set_pref_audio_settings(titleindex, ud->settings);
+            ghb_set_pref_audio_from_settings(ud, ud->settings);
+            ghb_set_pref_subtitle(titleindex, ud);
+            ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
+            hb_title_t * title = ghb_get_title_info(titleindex);
+            if (title != NULL)
+            {
+                preset_update_title_deps(ud, title);
+            }
+            ud->scale_busy = FALSE;
+            ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
+            ud->dont_clear_presets = FALSE;
+
+            gdouble vqmin, vqmax, step, page;
+            gint digits;
+            gboolean inverted;
+
+            ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
+                                &page, &digits, &inverted);
+            gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
+            gtk_range_set_increments (GTK_RANGE(qp), step, page);
+            gtk_scale_set_digits(GTK_SCALE(qp), digits);
+            gtk_range_set_inverted (GTK_RANGE(qp), inverted);
+
+            gchar *text;
+            gint crop[4];
+            GtkWidget *crop_widget;
+            crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+            crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+            crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+            crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+            crop_widget = GHB_WIDGET (ud->builder, "crop_values");
+            text = g_strdup_printf("%d:%d:%d:%d", 
+                                    crop[0], crop[1], crop[2], crop[3]);
+            gtk_label_set_text (GTK_LABEL(crop_widget), text);
+            g_free(text);
+        }
+        gtk_tree_path_free(treepath);
+        gtk_widget_set_sensitive(widget, TRUE);
+    }
+    else
+    {
+        g_debug("No selection???  Perhaps unselected.");
+        gtk_widget_set_sensitive(widget, FALSE);
+    }
+    if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+    {
+        gint start, end;
+        start = ghb_settings_get_int(ud->settings, "start_point");
+        end = ghb_settings_get_int(ud->settings, "end_point");
+        widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+        gtk_widget_set_sensitive(widget, TRUE);
+        if (start == end)
+        {
+            ud->dont_clear_presets = TRUE;
+            ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE));
+            ud->dont_clear_presets = FALSE;
+            gtk_widget_set_sensitive(widget, FALSE);
+        }
+    }
 }
 
 void
 ghb_clear_presets_selection(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	
-	if (ud->dont_clear_presets) return;
-	g_debug("ghb_clear_presets_selection()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	gtk_tree_selection_unselect_all (selection);
-	ghb_settings_set_boolean(ud->settings, "preset_modified", TRUE);
+    GtkTreeView *treeview;
+    GtkTreeSelection *selection;
+    
+    if (ud->dont_clear_presets) return;
+    g_debug("ghb_clear_presets_selection()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    gtk_tree_selection_unselect_all (selection);
+    ghb_settings_set_boolean(ud->settings, "preset_modified", TRUE);
 }
 
 G_MODULE_EXPORT void
 presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	selection = gtk_tree_view_get_selection(treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		GtkTreePath *path;
-		path = gtk_tree_model_get_path (store, &iter);
-		// Make the parent visible in scroll window if it is not.
-		gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
-		gtk_tree_path_free(path);
-	}
+    GtkTreeView *treeview;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    selection = gtk_tree_view_get_selection(treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        GtkTreePath *path;
+        path = gtk_tree_model_get_path (store, &iter);
+        // Make the parent visible in scroll window if it is not.
+        gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
+        gtk_tree_path_free(path);
+    }
 }
 
 G_MODULE_EXPORT void
 presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GValue *preset;
-	gint *indices, len;
+    GValue *preset;
+    gint *indices, len;
 
-	g_debug("presets_default_clicked_cb ()");
-	preset = ghb_settings_get_value(ud->settings, "preset_selection");
-	indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
-	if (indices)
-	{
-		if (!ghb_presets_get_folder(presetsPlist, indices, len))
-		{
-			ghb_presets_list_clear_default(ud);
-			presets_set_default(indices, len);
-			ghb_presets_list_default(ud);
-		}
-		g_free(indices);
-	}
+    g_debug("presets_default_clicked_cb ()");
+    preset = ghb_settings_get_value(ud->settings, "preset_selection");
+    indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
+    if (indices)
+    {
+        if (!ghb_presets_get_folder(presetsPlist, indices, len))
+        {
+            ghb_presets_list_clear_default(ud);
+            presets_set_default(indices, len);
+            ghb_presets_list_default(ud);
+        }
+        g_free(indices);
+    }
 }
 
 G_MODULE_EXPORT void
 preset_edited_cb(
-	GtkCellRendererText *cell, 
-	gchar *path, 
-	gchar *text, 
-	signal_user_data_t *ud)
-{
-	GtkTreePath *treepath;
-	GtkTreeStore *store;
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	gint *indices, len, count;
-	GValue *dict;
-	GValue *preset, *dest;
-	
-	g_debug("preset_edited_cb ()");
-	g_debug("path (%s)", path);
-	g_debug("text (%s)", text);
-
-	preset = ghb_settings_get_value (ud->settings, "preset_selection");
-	dest = ghb_array_value_new(MAX_NESTED_PRESET);
-	count = ghb_array_len(preset);
-	ghb_array_copy(dest, preset, count-1);
-	ghb_array_append(dest, ghb_string_value_new(text));
-	indices = ghb_preset_indices_from_path(presetsPlist, dest, &len);
-	ghb_value_free(dest);
-	if (indices != NULL)
-	{
-		// Already exists
-		g_free(indices);
-		return;
-	}
-
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-	treepath = gtk_tree_path_new_from_string (path);
-	indices = gtk_tree_path_get_indices(treepath);
-	len = gtk_tree_path_get_depth(treepath);
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
-	gtk_tree_store_set(store, &iter, 0, text, -1);
-
-	dict = presets_get_dict(presetsPlist, indices, len);
-	ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(text));
-	store_presets();
-	gtk_tree_path_free (treepath);
+    GtkCellRendererText *cell, 
+    gchar *path, 
+    gchar *text, 
+    signal_user_data_t *ud)
+{
+    GtkTreePath *treepath;
+    GtkTreeStore *store;
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    gint *indices, len, count;
+    GValue *dict;
+    GValue *preset, *dest;
+    
+    g_debug("preset_edited_cb ()");
+    g_debug("path (%s)", path);
+    g_debug("text (%s)", text);
+
+    preset = ghb_settings_get_value (ud->settings, "preset_selection");
+    dest = ghb_array_value_new(MAX_NESTED_PRESET);
+    count = ghb_array_len(preset);
+    ghb_array_copy(dest, preset, count-1);
+    ghb_array_append(dest, ghb_string_value_new(text));
+    indices = ghb_preset_indices_from_path(presetsPlist, dest, &len);
+    ghb_value_free(dest);
+    if (indices != NULL)
+    {
+        // Already exists
+        g_free(indices);
+        return;
+    }
+
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+    store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+    treepath = gtk_tree_path_new_from_string (path);
+    indices = gtk_tree_path_get_indices(treepath);
+    len = gtk_tree_path_get_depth(treepath);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
+    gtk_tree_store_set(store, &iter, 0, text, -1);
+
+    dict = presets_get_dict(presetsPlist, indices, len);
+    ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(text));
+    store_presets();
+    gtk_tree_path_free (treepath);
 }

HandBrake-0.9.8.tar.bz2/gtk/src/presets.h -> HandBrake-0.9.9.tar.bz2/gtk/src/presets.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/preview.c -> HandBrake-0.9.9.tar.bz2/gtk/src/preview.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * preview.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * preview.c is free software.
  * 
@@ -23,7 +23,11 @@
 
 #if defined(_ENABLE_GST)
 #include <gst/gst.h>
+#if GST_CHECK_VERSION(1, 0, 0)
+#include <gst/video/videooverlay.h>
+#else
 #include <gst/interfaces/xoverlay.h>
+#endif
 #include <gst/video/video.h>
 #include <gst/pbutils/missing-plugins.h>
 #endif
@@ -42,592 +46,774 @@
 struct preview_s
 {
 #if defined(_ENABLE_GST)
-	GstElement *play;
-	gulong xid;
+    GstElement *play;
+    gulong xid;
 #endif
-	gint64 len;
-	gint64 pos;
-	gboolean seek_lock;
-	gboolean progress_lock;
-	gint width;
-	gint height;
-	GtkWidget *view;
-	GdkPixbuf *pix;
-	gint button_width;
-	gint button_height;
-	gint frame;
-	gint state;
-	gboolean pause;
-	gboolean encoded[30];
-	gint encode_frame;
-	gint live_id;
-	gchar *current;
-	gint live_enabled;
+    gint64 len;
+    gint64 pos;
+    gboolean seek_lock;
+    gboolean progress_lock;
+    gint width;
+    gint height;
+    GtkWidget *view;
+    GdkPixbuf *pix;
+    gint button_width;
+    gint button_height;
+    gint frame;
+    gint state;
+    gboolean pause;
+    gboolean encoded[GHB_PREVIEW_MAX];
+    gint encode_frame;
+    gint live_id;
+    gchar *current;
+    gint live_enabled;
 };
 
 #if defined(_ENABLE_GST)
 G_MODULE_EXPORT gboolean live_preview_cb(GstBus *bus, GstMessage *msg, gpointer data);
 static GstBusSyncReply create_window(GstBus *bus, GstMessage *msg, 
-				gpointer data);
+                gpointer data);
 #endif
 
 G_MODULE_EXPORT gboolean preview_expose_cb(GtkWidget *widget, GdkEventExpose *event, 
-				signal_user_data_t *ud);
+                signal_user_data_t *ud);
 
 void
 ghb_screen_par(signal_user_data_t *ud, gint *par_n, gint *par_d)
 {
 #if defined(_ENABLE_GST)
-	GValue disp_par = {0,};
-	GstElement *xover;
-	GObjectClass *klass;
-	GParamSpec *pspec;
-
-	if (!ud->preview->live_enabled)
-		goto fail;
-
-	g_value_init(&disp_par, GST_TYPE_FRACTION);
-	gst_value_set_fraction(&disp_par, 1, 1);
-	g_object_get(ud->preview->play, "video-sink", &xover, NULL);
-	if (xover == NULL)
-		goto fail;
-
-	klass = G_OBJECT_GET_CLASS(xover);
-	if (klass == NULL)
-		goto fail;
-
-	pspec = g_object_class_find_property(klass, "pixel-aspect_ratio");
-	if (pspec)
-	{
-		GValue par_prop = {0,};
-
-		g_value_init(&par_prop, pspec->value_type);
-		g_object_get_property(G_OBJECT(xover), "pixel-aspect-ratio",
-								&par_prop);
-		if (!g_value_transform(&par_prop, &disp_par))
-		{
-			g_warning("transform failed");
-			gst_value_set_fraction(&disp_par, 1, 1);
-		}
-		g_value_unset(&par_prop);
-	}
-	*par_n = gst_value_get_fraction_numerator(&disp_par);
-	*par_d = gst_value_get_fraction_denominator(&disp_par);
-	g_value_unset(&disp_par);
-	return;
+    GValue disp_par = {0,};
+    GstElement *xover;
+    GObjectClass *klass;
+    GParamSpec *pspec;
+
+    if (!ud->preview->live_enabled)
+        goto fail;
+
+    g_value_init(&disp_par, GST_TYPE_FRACTION);
+    gst_value_set_fraction(&disp_par, 1, 1);
+    g_object_get(ud->preview->play, "video-sink", &xover, NULL);
+    if (xover == NULL)
+        goto fail;
+
+    klass = G_OBJECT_GET_CLASS(xover);
+    if (klass == NULL)
+        goto fail;
+
+    pspec = g_object_class_find_property(klass, "pixel-aspect_ratio");
+    if (pspec)
+    {
+        GValue par_prop = {0,};
+
+        g_value_init(&par_prop, pspec->value_type);
+        g_object_get_property(G_OBJECT(xover), "pixel-aspect-ratio",
+                                &par_prop);
+        if (!g_value_transform(&par_prop, &disp_par))
+        {
+            g_warning("transform failed");
+            gst_value_set_fraction(&disp_par, 1, 1);
+        }
+        g_value_unset(&par_prop);
+    }
+    *par_n = gst_value_get_fraction_numerator(&disp_par);
+    *par_d = gst_value_get_fraction_denominator(&disp_par);
+    g_value_unset(&disp_par);
+    return;
 
 fail:
-	*par_n = 1;
-	*par_d = 1;
+    *par_n = 1;
+    *par_d = 1;
 #else
-	*par_n = 1;
-	*par_d = 1;
+    *par_n = 1;
+    *par_d = 1;
 #endif
 }
 
 void
 ghb_par_scale(signal_user_data_t *ud, gint *width, gint *height, gint par_n, gint par_d)
 {
-	gint disp_par_n, disp_par_d;
-	gint64 num, den;
-
-	ghb_screen_par(ud, &disp_par_n, &disp_par_d);
-	if (disp_par_n < 1) disp_par_n = 1;
-	if (disp_par_d < 1) disp_par_d = 1;
-	num = par_n * disp_par_d;
-	den = par_d * disp_par_n;
-
-	if (par_n > par_d)
-		*width = *width * num / den;
-	else
-		*height = *height * den / num;
+    gint disp_par_n, disp_par_d;
+    gint64 num, den;
+
+    ghb_screen_par(ud, &disp_par_n, &disp_par_d);
+    if (disp_par_n < 1) disp_par_n = 1;
+    if (disp_par_d < 1) disp_par_d = 1;
+    num = par_n * disp_par_d;
+    den = par_d * disp_par_n;
+
+    if (par_n > par_d)
+        *width = *width * num / den;
+    else
+        *height = *height * den / num;
 }
 
 void
 ghb_preview_init(signal_user_data_t *ud)
 {
-	GtkWidget *widget;
-
-	ud->preview = g_malloc0(sizeof(preview_t));
-	ud->preview->view = GHB_WIDGET(ud->builder, "preview_image");
-	gtk_widget_realize(ud->preview->view);
-	g_signal_connect(G_OBJECT(ud->preview->view), "expose_event",
-					G_CALLBACK(preview_expose_cb), ud);
-
-	ud->preview->pause = TRUE;
-	ud->preview->encode_frame = -1;
-	ud->preview->live_id = -1;
-	widget = GHB_WIDGET (ud->builder, "preview_button_image");
-	gtk_widget_get_size_request(widget, &ud->preview->button_width, &ud->preview->button_height);
-	
+    GtkWidget *widget;
+
+    ud->preview = g_malloc0(sizeof(preview_t));
+    ud->preview->view = GHB_WIDGET(ud->builder, "preview_image");
+    gtk_widget_realize(ud->preview->view);
+#if GTK_CHECK_VERSION(3, 0, 0)
+    g_signal_connect(G_OBJECT(ud->preview->view), "draw",
+                    G_CALLBACK(preview_expose_cb), ud);
+#else
+    g_signal_connect(G_OBJECT(ud->preview->view), "expose_event",
+                    G_CALLBACK(preview_expose_cb), ud);
+#endif
+
+    ud->preview->pause = TRUE;
+    ud->preview->encode_frame = -1;
+    ud->preview->live_id = -1;
+    widget = GHB_WIDGET (ud->builder, "preview_button_image");
+    gtk_widget_get_size_request(widget, &ud->preview->button_width, &ud->preview->button_height);
+    
 #if defined(_ENABLE_GST)
-	GstBus *bus;
-	GstElement *xover;
+    GstBus *bus;
+    GstElement *xover;
 
 #if GTK_CHECK_VERSION(2,18,0)
-	if (!gdk_window_ensure_native(gtk_widget_get_window(ud->preview->view)))
-	{
-		g_message("Couldn't create native window for GstXOverlay. Disabling live preview.");
-		GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
-		gtk_widget_hide (widget);
-		widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
-		gtk_widget_hide (widget);
-		return;
-	}
+    if (!gdk_window_ensure_native(gtk_widget_get_window(ud->preview->view)))
+    {
+        g_message("Couldn't create native window for GstXOverlay. Disabling live preview.");
+        GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
+        gtk_widget_hide (widget);
+        widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
+        gtk_widget_hide (widget);
+        return;
+    }
 #endif
 
 #if !defined(_WIN32)
-	ud->preview->xid = GDK_WINDOW_XID(gtk_widget_get_window(ud->preview->view));
+    ud->preview->xid = GDK_WINDOW_XID(gtk_widget_get_window(ud->preview->view));
+#else
+    ud->preview->xid = GDK_WINDOW_HWND(gtk_widget_get_window(ud->preview->view));
+#endif
+    ud->preview->play = gst_element_factory_make("playbin", "play");
+    xover = gst_element_factory_make("gconfvideosink", "xover");
+    if (xover == NULL)
+    {
+        xover = gst_element_factory_make("xvimagesink", "xover");
+    }
+    if (xover == NULL)
+    {
+        xover = gst_element_factory_make("ximagesink", "xover");
+    }
+    if (ud->preview->play == NULL || xover == NULL)
+    {
+        g_message("Couldn't initialize gstreamer. Disabling live preview.");
+        GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
+        gtk_widget_hide (widget);
+        widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
+        gtk_widget_hide (widget);
+        return;
+    }
+    else
+    {
+
+        g_object_set(G_OBJECT(ud->preview->play), "video-sink", xover, NULL);
+        g_object_set(ud->preview->play, "subtitle-font-desc", 
+                    "sans bold 20", NULL);
+
+        bus = gst_pipeline_get_bus(GST_PIPELINE(ud->preview->play));
+        gst_bus_add_watch(bus, live_preview_cb, ud);
+#if GST_CHECK_VERSION(1, 0, 0)
+        gst_bus_set_sync_handler(bus, create_window, ud->preview, NULL);
 #else
-	ud->preview->xid = GDK_WINDOW_HWND(gtk_widget_get_window(ud->preview->view));
+        gst_bus_set_sync_handler(bus, create_window, ud->preview);
 #endif
-	ud->preview->play = gst_element_factory_make("playbin", "play");
-	xover = gst_element_factory_make("gconfvideosink", "xover");
-	if (xover == NULL)
-	{
-		xover = gst_element_factory_make("xvimagesink", "xover");
-	}
-	if (xover == NULL)
-	{
-		xover = gst_element_factory_make("ximagesink", "xover");
-	}
-	if (ud->preview->play == NULL || xover == NULL)
-	{
-		g_message("Couldn't initialize gstreamer. Disabling live preview.");
-		GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
-		gtk_widget_hide (widget);
-		widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
-		gtk_widget_hide (widget);
-		return;
-	}
-	else
-	{
-
-		g_object_set(G_OBJECT(ud->preview->play), "video-sink", xover, NULL);
-		g_object_set(ud->preview->play, "subtitle-font-desc", 
-					"sans bold 20", NULL);
-
-		bus = gst_pipeline_get_bus(GST_PIPELINE(ud->preview->play));
-		gst_bus_add_watch(bus, live_preview_cb, ud);
-		gst_bus_set_sync_handler(bus, create_window, ud->preview);
-		gst_object_unref(bus);
-		ud->preview->live_enabled = 1;
-	}
+        gst_object_unref(bus);
+        ud->preview->live_enabled = 1;
+    }
 #else
-	widget = GHB_WIDGET(ud->builder, "live_preview_box");
-	gtk_widget_hide (widget);
-	widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
-	gtk_widget_hide (widget);
+    widget = GHB_WIDGET(ud->builder, "live_preview_box");
+    gtk_widget_hide (widget);
+    widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
+    gtk_widget_hide (widget);
 #endif
 }
 
 void
 ghb_preview_cleanup(signal_user_data_t *ud)
 {
-	if (ud->preview->current)
-	{
-		ud->preview->current = NULL;
-		g_free(ud->preview->current);
-	}
+    if (ud->preview->current)
+    {
+        ud->preview->current = NULL;
+        g_free(ud->preview->current);
+    }
 }
 
 #if defined(_ENABLE_GST)
 static GstBusSyncReply
 create_window(GstBus *bus, GstMessage *msg, gpointer data)
 {
-	preview_t *preview = (preview_t*)data;
-
-	switch (GST_MESSAGE_TYPE(msg))
-	{
-	case GST_MESSAGE_ELEMENT:
-	{
-		if (!gst_structure_has_name(msg->structure, "prepare-xwindow-id"))
-			return GST_BUS_PASS;
+    preview_t *preview = (preview_t*)data;
+
+    switch (GST_MESSAGE_TYPE(msg))
+    {
+    case GST_MESSAGE_ELEMENT:
+    {
+#if GST_CHECK_VERSION(1, 0, 0)
+        if (!gst_is_video_overlay_prepare_window_handle_message(msg))
+            return GST_BUS_PASS;
+        gst_video_overlay_set_window_handle(
+            GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg)), preview->xid);
+#else
+        if (!gst_structure_has_name(msg->structure, "prepare-xwindow-id"))
+            return GST_BUS_PASS;
 #if !defined(_WIN32)
-		gst_x_overlay_set_xwindow_id(
-			GST_X_OVERLAY(GST_MESSAGE_SRC(msg)), preview->xid);
+        gst_x_overlay_set_xwindow_id(
+            GST_X_OVERLAY(GST_MESSAGE_SRC(msg)), preview->xid);
 #else
-		gst_directdraw_sink_set_window_id(
-			GST_X_OVERLAY(GST_MESSAGE_SRC(msg)), preview->xid);
+        gst_directdraw_sink_set_window_id(
+            GST_X_OVERLAY(GST_MESSAGE_SRC(msg)), preview->xid);
 #endif
-		gst_message_unref(msg);
-		return GST_BUS_DROP;
-	} break;
-
-	default:
-	{
-	} break;
-	}
-	return GST_BUS_PASS;
+#endif
+        gst_message_unref(msg);
+        return GST_BUS_DROP;
+    } break;
+
+    default:
+    {
+    } break;
+    }
+    return GST_BUS_PASS;
 }
 
-static GList *
-get_stream_info_objects_for_type (GstElement *play, const gchar *typestr)
+static void
+caps_set(GstCaps *caps, signal_user_data_t *ud)
 {
-	GValueArray *info_arr = NULL;
-	GList *ret = NULL;
-	guint ii;
-
-	if (play == NULL)
-		return NULL;
-
-	g_object_get(play, "stream-info-value-array", &info_arr, NULL);
-	if (info_arr == NULL)
-		return NULL;
-
-	for (ii = 0; ii < info_arr->n_values; ++ii) 
-	{
-		GObject *info_obj;
-		GValue *val;
-
-		val = g_value_array_get_nth(info_arr, ii);
-		info_obj = g_value_get_object(val);
-		if (info_obj) 
-		{
-			GParamSpec *pspec;
-			GEnumValue *value;
-			gint type = -1;
-
-			g_object_get(info_obj, "type", &type, NULL);
-			pspec = g_object_class_find_property(
-						G_OBJECT_GET_CLASS (info_obj), "type");
-			value = g_enum_get_value(
-						G_PARAM_SPEC_ENUM (pspec)->enum_class, type);
-			if (value) 
-			{
-				if (g_ascii_strcasecmp (value->value_nick, typestr) == 0 ||
-					g_ascii_strcasecmp (value->value_name, typestr) == 0) 
-				{
-					ret = g_list_prepend (ret, g_object_ref (info_obj));
-				}
-			}
-		}
-	}
-	g_value_array_free (info_arr);
-	return g_list_reverse (ret);
+    GstStructure *ss;
+
+    ss = gst_caps_get_structure(caps, 0);
+    if (ss)
+    {
+        gint fps_n, fps_d, width, height;
+        guint num, den, par_n, par_d;
+        gint disp_par_n, disp_par_d;
+        const GValue *par;
+
+        gst_structure_get_fraction(ss, "framerate", &fps_n, &fps_d);
+        gst_structure_get_int(ss, "width", &width);
+        gst_structure_get_int(ss, "height", &height);
+        par = gst_structure_get_value(ss, "pixel-aspect-ratio");
+        par_n = gst_value_get_fraction_numerator(par);
+        par_d = gst_value_get_fraction_denominator(par);
+
+        ghb_screen_par(ud, &disp_par_n, &disp_par_d);
+        gst_video_calculate_display_ratio(
+            &num, &den, width, height, par_n, par_d, disp_par_n, disp_par_d);
+
+        if (par_n > par_d)
+            width = gst_util_uint64_scale_int(height, num, den);
+        else
+            height = gst_util_uint64_scale_int(width, den, num);
+
+        if (ghb_settings_get_boolean(ud->settings, "reduce_hd_preview"))
+        {
+            GdkScreen *ss;
+            gint s_w, s_h;
+
+            ss = gdk_screen_get_default();
+            s_w = gdk_screen_get_width(ss);
+            s_h = gdk_screen_get_height(ss);
+
+            if (width > s_w * 80 / 100)
+            {
+                width = s_w * 80 / 100;
+                height = gst_util_uint64_scale_int(width, den, num);
+            }
+            if (height > s_h * 80 / 100)
+            {
+                height = s_h * 80 / 100;
+                width = gst_util_uint64_scale_int(height, num, den);
+            }
+        }
+        
+        if (width != ud->preview->width || height != ud->preview->height)
+        {
+            gtk_widget_set_size_request(ud->preview->view, width, height);
+            ud->preview->width = width;
+            ud->preview->height = height;
+        }
+    }
 }
 
+#if GST_CHECK_VERSION(1, 0, 0)
 static void
-caps_set(GstCaps *caps, signal_user_data_t *ud)
+update_stream_info(signal_user_data_t *ud)
+{
+    GstPad *vpad = NULL;
+    gint n_video;
+
+    g_object_get(G_OBJECT(ud->preview->play), "n-video", &n_video, NULL);
+    if (n_video > 0)
+    {
+        gint ii;
+        for (ii = 0; ii < n_video && vpad == NULL; ii++)
+        {
+            g_signal_emit_by_name(ud->preview->play, "get-video-pad", ii, &vpad);
+        }
+    }
+
+    if (vpad)
+    {
+        GstCaps *caps;
+
+        caps = gst_pad_get_current_caps(vpad);
+        if (caps)
+        {
+            caps_set(caps, ud);
+            gst_caps_unref(caps);
+        }
+        //g_signal_connect(vpad, "notify::caps", G_CALLBACK(caps_set_cb), preview);
+        gst_object_unref(vpad);
+    }
+}
+
+#else
+
+static GList *
+get_stream_info_objects_for_type (GstElement *play, const gchar *typestr)
 {
-	GstStructure *ss;
-
-	ss = gst_caps_get_structure(caps, 0);
-	if (ss)
-	{
-		gint fps_n, fps_d, width, height;
-		guint num, den, par_n, par_d;
-		gint disp_par_n, disp_par_d;
-		const GValue *par;
-
-		gst_structure_get_fraction(ss, "framerate", &fps_n, &fps_d);
-		gst_structure_get_int(ss, "width", &width);
-		gst_structure_get_int(ss, "height", &height);
-		par = gst_structure_get_value(ss, "pixel-aspect-ratio");
-		par_n = gst_value_get_fraction_numerator(par);
-		par_d = gst_value_get_fraction_denominator(par);
-
-		ghb_screen_par(ud, &disp_par_n, &disp_par_d);
-		gst_video_calculate_display_ratio(
-			&num, &den, width, height, par_n, par_d, disp_par_n, disp_par_d);
-
-		if (par_n > par_d)
-			width = gst_util_uint64_scale_int(height, num, den);
-		else
-			height = gst_util_uint64_scale_int(width, den, num);
-
-		if (ghb_settings_get_boolean(ud->settings, "reduce_hd_preview"))
-		{
-			GdkScreen *ss;
-			gint s_w, s_h;
-
-			ss = gdk_screen_get_default();
-			s_w = gdk_screen_get_width(ss);
-			s_h = gdk_screen_get_height(ss);
-
-			if (width > s_w * 80 / 100)
-			{
-				width = s_w * 80 / 100;
-				height = gst_util_uint64_scale_int(width, den, num);
-			}
-			if (height > s_h * 80 / 100)
-			{
-				height = s_h * 80 / 100;
-				width = gst_util_uint64_scale_int(height, num, den);
-			}
-		}
-		
-		if (width != ud->preview->width || height != ud->preview->height)
-		{
-			gtk_widget_set_size_request(ud->preview->view, width, height);
-			ud->preview->width = width;
-			ud->preview->height = height;
-		}
-	}
+    GValueArray *info_arr = NULL;
+    GList *ret = NULL;
+    guint ii;
+
+    if (play == NULL)
+        return NULL;
+
+    g_object_get(play, "stream-info-value-array", &info_arr, NULL);
+    if (info_arr == NULL)
+        return NULL;
+
+    for (ii = 0; ii < info_arr->n_values; ++ii) 
+    {
+        GObject *info_obj;
+        GValue *val;
+
+        val = g_value_array_get_nth(info_arr, ii);
+        //val = &((GValue*)info_arr->values)[ii];
+        info_obj = g_value_get_object(val);
+        if (info_obj) 
+        {
+            GParamSpec *pspec;
+            GEnumValue *value;
+            gint type = -1;
+
+            g_object_get(info_obj, "type", &type, NULL);
+            pspec = g_object_class_find_property(
+                        G_OBJECT_GET_CLASS (info_obj), "type");
+            value = g_enum_get_value(
+                        G_PARAM_SPEC_ENUM (pspec)->enum_class, type);
+            if (value) 
+            {
+                if (g_ascii_strcasecmp (value->value_nick, typestr) == 0 ||
+                    g_ascii_strcasecmp (value->value_name, typestr) == 0) 
+                {
+                    ret = g_list_prepend (ret, g_object_ref (info_obj));
+                }
+            }
+        }
+    }
+    g_value_array_free (info_arr);
+    return g_list_reverse (ret);
 }
 
 static void
 update_stream_info(signal_user_data_t *ud)
 {
-	GList *vstreams, *ll;
-	GstPad *vpad = NULL;
-
-	vstreams = get_stream_info_objects_for_type(ud->preview->play, "video");
-	if (vstreams)
-	{
-		for (ll = vstreams; vpad == NULL && ll != NULL; ll = ll->next)
-		{
-			g_object_get(ll->data, "object", &vpad, NULL);
-		}
-	}
-	if (vpad)
-	{
-		GstCaps *caps;
-
-		caps = gst_pad_get_negotiated_caps(vpad);
-		if (caps)
-		{
-			caps_set(caps, ud);
-			gst_caps_unref(caps);
-		}
-		//g_signal_connect(vpad, "notify::caps", G_CALLBACK(caps_set_cb), preview);
-		gst_object_unref(vpad);
-	}
-	g_list_foreach(vstreams, (GFunc)g_object_unref, NULL);
-	g_list_free(vstreams);
+    GList *vstreams, *ll;
+    GstPad *vpad = NULL;
+
+    vstreams = get_stream_info_objects_for_type(ud->preview->play, "video");
+    if (vstreams)
+    {
+        for (ll = vstreams; vpad == NULL && ll != NULL; ll = ll->next)
+        {
+            g_object_get(ll->data, "object", &vpad, NULL);
+        }
+    }
+    if (vpad)
+    {
+        GstCaps *caps;
+
+        caps = gst_pad_get_negotiated_caps(vpad);
+        if (caps)
+        {
+            caps_set(caps, ud);
+            gst_caps_unref(caps);
+        }
+        //g_signal_connect(vpad, "notify::caps", G_CALLBACK(caps_set_cb), preview);
+        gst_object_unref(vpad);
+    }
+    g_list_foreach(vstreams, (GFunc)g_object_unref, NULL);
+    g_list_free(vstreams);
 }
 
+#endif
+
 G_MODULE_EXPORT gboolean
 live_preview_cb(GstBus *bus, GstMessage *msg, gpointer data)
 {
-	signal_user_data_t *ud = (signal_user_data_t*)data;
-
-	switch (GST_MESSAGE_TYPE(msg))
-	{
-	case GST_MESSAGE_ERROR:
-	{
-		GError *err;
-		gchar *debug;
-
-		gst_message_parse_error(msg, &err, &debug);
-		g_warning("Gstreamer Error: %s", err->message);
-		g_error_free(err);
-		g_free(debug);
-	} break;
-
-	case GST_MESSAGE_ELEMENT:
-	{
-		if (gst_is_missing_plugin_message(msg))
-		{
-			gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
-			gchar *message, *desc;
-			desc = gst_missing_plugin_message_get_description(msg);
-			message = g_strdup_printf(
-						"Missing GStreamer plugin\n"
-						"Audio or Video may not play as expected\n\n%s",
-						desc);
-			ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Ok", NULL);
-			g_free(message);
-			gst_element_set_state(ud->preview->play, GST_STATE_PLAYING);
-		}
-	} break;
-
-	case GST_MESSAGE_STATE_CHANGED:
-	{
-		GstState state, pending;
-		gst_element_get_state(ud->preview->play, &state, &pending, 0);
-		if (state == GST_STATE_PAUSED || state == GST_STATE_PLAYING)
-		{
-			update_stream_info(ud);
-		}
-	} break;
-
-	case GST_MESSAGE_EOS:
-	{
-		// Done
-		GtkImage *img;
-
-		img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
-		gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
-		gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
-		ud->preview->pause = TRUE;
-		gst_element_seek(ud->preview->play, 1.0,
-			GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT,
-			GST_SEEK_TYPE_SET, 0,
-			GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
-	} break;
-
-	default:
-	{
-		// Ignore
-	}
-	}
-	return TRUE;
+    signal_user_data_t *ud = (signal_user_data_t*)data;
+
+    switch (GST_MESSAGE_TYPE(msg))
+    {
+    case GST_MESSAGE_UNKNOWN:
+    {
+        //printf("unknown");
+    } break;
+
+    case GST_MESSAGE_EOS:
+    {
+        // Done
+        GtkImage *img;
+
+        //printf("eos");
+        img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
+        gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+        gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
+        ud->preview->pause = TRUE;
+        gst_element_seek(ud->preview->play, 1.0,
+            GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT,
+            GST_SEEK_TYPE_SET, 0,
+            GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+    } break;
+
+    case GST_MESSAGE_ERROR:
+    {
+        //printf("error\n");
+        GError *err;
+        gchar *debug;
+
+        gst_message_parse_error(msg, &err, &debug);
+        g_warning("Gstreamer Error: %s", err->message);
+        g_error_free(err);
+        g_free(debug);
+    } break;
+
+    case GST_MESSAGE_WARNING:
+    case GST_MESSAGE_INFO:
+    case GST_MESSAGE_TAG:
+    case GST_MESSAGE_BUFFERING:
+    case GST_MESSAGE_STATE_CHANGED:
+    {
+        GstState state, pending;
+        gst_element_get_state(ud->preview->play, &state, &pending, 0);
+        //printf("state change %x\n", state);
+        if (state == GST_STATE_PAUSED || state == GST_STATE_PLAYING)
+        {
+            update_stream_info(ud);
+        }
+    } break;
+
+    case GST_MESSAGE_STATE_DIRTY:
+    {
+        //printf("state dirty\n");
+    } break;
+
+    case GST_MESSAGE_STEP_DONE:
+    {
+        //printf("step done\n");
+    } break;
+
+    case GST_MESSAGE_CLOCK_PROVIDE:
+    {
+        //printf("clock provide\n");
+    } break;
+
+    case GST_MESSAGE_CLOCK_LOST:
+    {
+        //printf("clock lost\n");
+    } break;
+
+    case GST_MESSAGE_NEW_CLOCK:
+    {
+        //printf("new clock\n");
+    } break;
+
+    case GST_MESSAGE_STRUCTURE_CHANGE:
+    {
+        //printf("structure change\n");
+    } break;
+
+    case GST_MESSAGE_STREAM_STATUS:
+    {
+        //printf("stream status\n");
+    } break;
+
+    case GST_MESSAGE_APPLICATION:
+    {
+        //printf("application\n");
+    } break;
+
+    case GST_MESSAGE_ELEMENT:
+    {
+        //printf("element\n");
+        if (gst_is_missing_plugin_message(msg))
+        {
+            gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
+            gchar *message, *desc;
+            desc = gst_missing_plugin_message_get_description(msg);
+            message = g_strdup_printf(
+                        "Missing GStreamer plugin\n"
+                        "Audio or Video may not play as expected\n\n%s",
+                        desc);
+            ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Ok", NULL);
+            g_free(message);
+            gst_element_set_state(ud->preview->play, GST_STATE_PLAYING);
+        }
+    } break;
+
+    case GST_MESSAGE_SEGMENT_START:
+    {
+        //printf("segment start\n");
+    } break;
+
+    case GST_MESSAGE_SEGMENT_DONE:
+    {
+        //printf("segment done\n");
+    } break;
+
+#if GST_CHECK_VERSION(1, 0, 0)
+    case GST_MESSAGE_DURATION_CHANGED:
+    {
+        //printf("duration change\n");
+    };
+#endif
+
+    case GST_MESSAGE_LATENCY:
+    {
+        //printf("latency\n");
+    };
+
+    case GST_MESSAGE_ASYNC_START:
+    {
+        //printf("async start\n");
+    } break;
+
+    case GST_MESSAGE_ASYNC_DONE:
+    {
+        //printf("async done\n");
+    } break;
+
+    case GST_MESSAGE_REQUEST_STATE:
+    {
+        //printf("request state\n");
+    } break;
+
+    case GST_MESSAGE_STEP_START:
+    {
+        //printf("step start\n");
+    } break;
+
+    case GST_MESSAGE_QOS:
+    {
+        //printf("qos\n");
+    } break;
+
+#if GST_CHECK_VERSION(1, 0, 0)
+    case GST_MESSAGE_PROGRESS:
+    {
+        //printf("progress\n");
+    } break;
+
+    case GST_MESSAGE_TOC:
+    {
+        //printf("toc\n");
+    } break;
+
+    case GST_MESSAGE_RESET_TIME:
+    {
+        //printf("reset time\n");
+    } break;
+
+    case GST_MESSAGE_STREAM_START:
+    {
+        //printf("stream start\n");
+    };
+#endif
+
+    case GST_MESSAGE_ANY:
+    {
+        //printf("any\n");
+    } break;
+
+
+    default:
+    {
+        // Ignore
+        //printf("?msg? %x\n", GST_MESSAGE_TYPE(msg));
+    }
+    }
+    return TRUE;
 }
 
 void
 live_preview_start(signal_user_data_t *ud)
 {
-	GtkImage *img;
-	gchar *uri;
-
-	if (!ud->preview->live_enabled)
-		return;
-
-	img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
-	if (!ud->preview->encoded[ud->preview->frame])
-	{
-		gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
-		gst_element_set_state(ud->preview->play, GST_STATE_NULL);
-		ud->preview->pause = TRUE;
-		return;
-	}
-
-	uri = g_strdup_printf("file://%s", ud->preview->current);
-	gtk_image_set_from_stock(img, "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
-	ud->preview->state = PREVIEW_STATE_LIVE;
-	g_object_set(G_OBJECT(ud->preview->play), "uri", uri, NULL);
-	gst_element_set_state(ud->preview->play, GST_STATE_PLAYING);
-	ud->preview->pause = FALSE;
-	g_free(uri);
+    GtkImage *img;
+    gchar *uri;
+
+    if (!ud->preview->live_enabled)
+        return;
+
+    img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
+    if (!ud->preview->encoded[ud->preview->frame])
+    {
+        gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+        gst_element_set_state(ud->preview->play, GST_STATE_NULL);
+        ud->preview->pause = TRUE;
+        return;
+    }
+
+    uri = g_strdup_printf("file://%s", ud->preview->current);
+    gtk_image_set_from_stock(img, "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
+    ud->preview->state = PREVIEW_STATE_LIVE;
+    g_object_set(G_OBJECT(ud->preview->play), "uri", uri, NULL);
+    gst_element_set_state(ud->preview->play, GST_STATE_PLAYING);
+    ud->preview->pause = FALSE;
+    g_free(uri);
 }
 
 void
 live_preview_pause(signal_user_data_t *ud)
 {
-	GtkImage *img;
+    GtkImage *img;
 
-	if (!ud->preview->live_enabled)
-		return;
+    if (!ud->preview->live_enabled)
+        return;
 
-	img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
-	gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
-	gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
-	ud->preview->pause = TRUE;
+    img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
+    gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+    gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
+    ud->preview->pause = TRUE;
 }
 #endif
 
 void
 live_preview_stop(signal_user_data_t *ud)
 {
-	GtkImage *img;
-	GtkRange *progress;
+    GtkImage *img;
+    GtkRange *progress;
 
-	if (!ud->preview->live_enabled)
-		return;
+    if (!ud->preview->live_enabled)
+        return;
 
-	img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
-	gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+    img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
+    gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
 #if defined(_ENABLE_GST)
-	gst_element_set_state(ud->preview->play, GST_STATE_NULL);
+    gst_element_set_state(ud->preview->play, GST_STATE_NULL);
 #endif
-	ud->preview->pause = TRUE;
-	ud->preview->state = PREVIEW_STATE_IMAGE;
+    ud->preview->pause = TRUE;
+    ud->preview->state = PREVIEW_STATE_IMAGE;
 
-	progress = GTK_RANGE(GHB_WIDGET(ud->builder, "live_preview_progress"));
-	gtk_range_set_value(progress, 0);
+    progress = GTK_RANGE(GHB_WIDGET(ud->builder, "live_preview_progress"));
+    gtk_range_set_value(progress, 0);
 }
 
 void
 ghb_live_reset(signal_user_data_t *ud)
 {
-	gboolean encoded;
-
-	if (ud->preview->live_id >= 0)
-	{
-		ghb_stop_live_encode();
-	}
-	ud->preview->live_id = -1;
-	ud->preview->encode_frame = -1;
-	if (!ud->preview->pause)
-		live_preview_stop(ud);
-	if (ud->preview->current)
-	{
-		g_free(ud->preview->current);
-		ud->preview->current = NULL;
-	}
-	encoded = ud->preview->encoded[ud->preview->frame];
-	memset(ud->preview->encoded, 0, sizeof(gboolean) * 10);
-	if (encoded)
-		ghb_set_preview_image(ud);
+    gboolean encoded;
+
+    if (ud->preview->live_id >= 0)
+    {
+        ghb_stop_live_encode();
+    }
+    ud->preview->live_id = -1;
+    ud->preview->encode_frame = -1;
+    if (!ud->preview->pause)
+        live_preview_stop(ud);
+    if (ud->preview->current)
+    {
+        g_free(ud->preview->current);
+        ud->preview->current = NULL;
+    }
+    encoded = ud->preview->encoded[ud->preview->frame];
+    memset(ud->preview->encoded, 0, sizeof(gboolean) * GHB_PREVIEW_MAX);
+    if (encoded)
+        ghb_set_preview_image(ud);
 }
 
 G_MODULE_EXPORT void
 live_preview_start_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	gchar *tmp_dir;
-	gchar *name;
-	gint frame = ud->preview->frame;
-
-	tmp_dir = ghb_get_tmp_dir();
-	name = g_strdup_printf("%s/live%02d", tmp_dir, ud->preview->frame);
-	if (ud->preview->current)
-		g_free(ud->preview->current);
-	ud->preview->current = name;
-
-	if (ud->preview->encoded[frame] &&
-		g_file_test(name, G_FILE_TEST_IS_REGULAR))
-	{
+    gchar *tmp_dir;
+    gchar *name;
+    gint frame = ud->preview->frame;
+
+    tmp_dir = ghb_get_tmp_dir();
+    name = g_strdup_printf("%s/live%02d", tmp_dir, ud->preview->frame);
+    if (ud->preview->current)
+        g_free(ud->preview->current);
+    ud->preview->current = name;
+
+    if (ud->preview->encoded[frame] &&
+        g_file_test(name, G_FILE_TEST_IS_REGULAR))
+    {
 #if defined(_ENABLE_GST)
-		if (ud->preview->pause)
-			live_preview_start(ud);
-		else
-			live_preview_pause(ud);
+        if (ud->preview->pause)
+            live_preview_start(ud);
+        else
+            live_preview_pause(ud);
 #endif
-	}
-	else
-	{
-		GValue *js;
-
-		ud->preview->encode_frame = frame;
-		js = ghb_value_dup(ud->settings);
-		ghb_settings_set_string(js, "destination", name);
-		ghb_settings_set_int(js, "start_frame", ud->preview->frame);
-		ud->preview->live_id = 0;
-		ghb_add_live_job(js, ud->preview->live_id);
-		ghb_start_live_encode();
-		ghb_value_free(js);
-	}
+    }
+    else
+    {
+        GValue *js;
+
+        ud->preview->encode_frame = frame;
+        js = ghb_value_dup(ud->settings);
+        ghb_settings_set_string(js, "destination", name);
+        ghb_settings_set_int(js, "start_frame", ud->preview->frame);
+        ud->preview->live_id = 0;
+        ghb_add_live_job(js, ud->preview->live_id);
+        ghb_start_live_encode();
+        ghb_value_free(js);
+    }
 }
 
 void
 ghb_live_encode_done(signal_user_data_t *ud, gboolean success)
 {
-	GtkWidget *widget;
-	GtkWidget *prog;
-
-	ud->preview->live_id = -1;
-	prog = GHB_WIDGET(ud->builder, "live_encode_progress");
-	if (success && 
-		ud->preview->encode_frame == ud->preview->frame)
-	{
-		gtk_progress_bar_set_text(GTK_PROGRESS_BAR(prog), "Done");
-		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(prog), 1);
-		ud->preview->encoded[ud->preview->encode_frame] = TRUE;
+    GtkWidget *widget;
+    GtkWidget *prog;
+
+    ud->preview->live_id = -1;
+    prog = GHB_WIDGET(ud->builder, "live_encode_progress");
+    if (success && 
+        ud->preview->encode_frame == ud->preview->frame)
+    {
+        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(prog), "Done");
+        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(prog), 1);
+        ud->preview->encoded[ud->preview->encode_frame] = TRUE;
 #if defined(_ENABLE_GST)
-		live_preview_start(ud);
+        live_preview_start(ud);
 #endif
-		widget = GHB_WIDGET(ud->builder, "live_progress_box");
-		gtk_widget_hide (widget);
-		widget = GHB_WIDGET(ud->builder, "live_preview_progress");
-		gtk_widget_show (widget);
-	}
-	else
-	{
-		gtk_progress_bar_set_text(GTK_PROGRESS_BAR(prog), "");
-		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(prog), 0);
-		ud->preview->encoded[ud->preview->encode_frame] = FALSE;
-	}
+        widget = GHB_WIDGET(ud->builder, "live_progress_box");
+        gtk_widget_hide (widget);
+        widget = GHB_WIDGET(ud->builder, "live_preview_progress");
+        gtk_widget_show (widget);
+    }
+    else
+    {
+        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(prog), "");
+        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(prog), 0);
+        ud->preview->encoded[ud->preview->encode_frame] = FALSE;
+    }
 }
 
 #if defined(_ENABLE_GST)
 G_MODULE_EXPORT gboolean
 unlock_progress_cb(signal_user_data_t *ud)
 {
-	ud->preview->progress_lock = FALSE;
-	// This function is initiated by g_idle_add.  Must return false
-	// so that it is not called again
-	return FALSE;
+    ud->preview->progress_lock = FALSE;
+    // This function is initiated by g_idle_add.  Must return false
+    // so that it is not called again
+    return FALSE;
 }
 #endif
 
@@ -635,40 +821,48 @@
 ghb_live_preview_progress(signal_user_data_t *ud)
 {
 #if defined(_ENABLE_GST)
-	GstFormat fmt = GST_FORMAT_TIME;
-	gint64 len = -1, pos = -1;
-
-	if (!ud->preview->live_enabled)
-		return;
-
-	if (ud->preview->state != PREVIEW_STATE_LIVE || ud->preview->seek_lock)
-		return;
-
-	ud->preview->progress_lock = TRUE;
-	if (gst_element_query_duration(ud->preview->play, &fmt, &len))
-	{
-		if (len != -1 && fmt == GST_FORMAT_TIME)
-		{
-			ud->preview->len = len / GST_MSECOND;
-		}
-	}
-	if (gst_element_query_position(ud->preview->play, &fmt, &pos))
-	{
-		if (pos != -1 && fmt == GST_FORMAT_TIME)
-		{
-			ud->preview->pos = pos / GST_MSECOND;
-		}
-	}
-	if (ud->preview->len > 0)
-	{
-		GtkRange *progress;
-		gdouble percent;
-
-		percent = (gdouble)ud->preview->pos * 100 / ud->preview->len;
-		progress = GTK_RANGE(GHB_WIDGET(ud->builder, "live_preview_progress"));
-		gtk_range_set_value(progress, percent);
-	}
-	g_idle_add((GSourceFunc)unlock_progress_cb, ud);
+    GstFormat fmt = GST_FORMAT_TIME;
+    gint64 len = -1, pos = -1;
+
+    if (!ud->preview->live_enabled)
+        return;
+
+    if (ud->preview->state != PREVIEW_STATE_LIVE || ud->preview->seek_lock)
+        return;
+
+    ud->preview->progress_lock = TRUE;
+#if GST_CHECK_VERSION(1, 0, 0)
+    if (gst_element_query_duration(ud->preview->play, fmt, &len))
+#else
+    if (gst_element_query_duration(ud->preview->play, &fmt, &len))
+#endif
+    {
+        if (len != -1 && fmt == GST_FORMAT_TIME)
+        {
+            ud->preview->len = len / GST_MSECOND;
+        }
+    }
+#if GST_CHECK_VERSION(1, 0, 0)
+    if (gst_element_query_position(ud->preview->play, fmt, &pos))
+#else
+    if (gst_element_query_position(ud->preview->play, &fmt, &pos))
+#endif
+    {
+        if (pos != -1 && fmt == GST_FORMAT_TIME)
+        {
+            ud->preview->pos = pos / GST_MSECOND;
+        }
+    }
+    if (ud->preview->len > 0)
+    {
+        GtkRange *progress;
+        gdouble percent;
+
+        percent = (gdouble)ud->preview->pos * 100 / ud->preview->len;
+        progress = GTK_RANGE(GHB_WIDGET(ud->builder, "live_preview_progress"));
+        gtk_range_set_value(progress, percent);
+    }
+    g_idle_add((GSourceFunc)unlock_progress_cb, ud);
 #endif
 }
 
@@ -676,10 +870,10 @@
 G_MODULE_EXPORT gboolean
 unlock_seek_cb(signal_user_data_t *ud)
 {
-	ud->preview->seek_lock = FALSE;
-	// This function is initiated by g_idle_add.  Must return false
-	// so that it is not called again
-	return FALSE;
+    ud->preview->seek_lock = FALSE;
+    // This function is initiated by g_idle_add.  Must return false
+    // so that it is not called again
+    return FALSE;
 }
 #endif
 
@@ -687,23 +881,23 @@
 live_preview_seek_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 #if defined(_ENABLE_GST)
-	gdouble dval;
-	gint64 pos;
-
-	if (!ud->preview->live_enabled)
-		return;
-
-	if (ud->preview->progress_lock)
-		return;
-
-	ud->preview->seek_lock = TRUE;
-	dval = gtk_range_get_value(GTK_RANGE(widget));
-	pos = ((ud->preview->len * dval) / 100) * GST_MSECOND;
-	gst_element_seek(ud->preview->play, 1.0,
-		GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
-		GST_SEEK_TYPE_SET, pos,
-		GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
-	g_idle_add((GSourceFunc)unlock_seek_cb, ud);
+    gdouble dval;
+    gint64 pos;
+
+    if (!ud->preview->live_enabled)
+        return;
+
+    if (ud->preview->progress_lock)
+        return;
+
+    ud->preview->seek_lock = TRUE;
+    dval = gtk_range_get_value(GTK_RANGE(widget));
+    pos = ((ud->preview->len * dval) / 100) * GST_MSECOND;
+    gst_element_seek(ud->preview->play, 1.0,
+        GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
+        GST_SEEK_TYPE_SET, pos,
+        GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+    g_idle_add((GSourceFunc)unlock_seek_cb, ud);
 #endif
 }
 
@@ -714,372 +908,444 @@
     cr = gdk_cairo_create(window);
     gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
     cairo_paint(cr);
-	cairo_destroy(cr);
+    cairo_destroy(cr);
 }
 
 void
 ghb_set_preview_image(signal_user_data_t *ud)
 {
-	GtkWidget *widget;
-	gint preview_width, preview_height, target_height, width, height;
-
-	g_debug("set_preview_button_image ()");
-	gint titleindex;
-
-	live_preview_stop(ud);
-
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	if (titleindex < 0) return;
-	widget = GHB_WIDGET (ud->builder, "preview_frame");
-	ud->preview->frame = ghb_widget_int(widget) - 1;
-	if (ud->preview->encoded[ud->preview->frame])
-	{
-		widget = GHB_WIDGET(ud->builder, "live_progress_box");
-		gtk_widget_hide (widget);
-		widget = GHB_WIDGET(ud->builder, "live_preview_progress");
-		gtk_widget_show (widget);
-	}
-	else
-	{
-		widget = GHB_WIDGET(ud->builder, "live_preview_progress");
-		gtk_widget_hide (widget);
-		widget = GHB_WIDGET(ud->builder, "live_progress_box");
-		gtk_widget_show (widget);
-		widget = GHB_WIDGET(ud->builder, "live_encode_progress");
-		gtk_progress_bar_set_text(GTK_PROGRESS_BAR(widget), "");
-		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(widget), 0);
-	}
-	if (ud->preview->pix != NULL)
-		g_object_unref(ud->preview->pix);
-
-	ud->preview->pix = 
-		ghb_get_preview_image(titleindex, ud->preview->frame, 
-								ud, &width, &height);
-	if (ud->preview->pix == NULL) return;
-	preview_width = gdk_pixbuf_get_width(ud->preview->pix);
-	preview_height = gdk_pixbuf_get_height(ud->preview->pix);
-	widget = GHB_WIDGET (ud->builder, "preview_image");
-	if (preview_width != ud->preview->width || 
-		preview_height != ud->preview->height)
-	{
-		gtk_widget_set_size_request(widget, preview_width, preview_height);
-		ud->preview->width = preview_width;
-		ud->preview->height = preview_height;
-	}
+    GtkWidget *widget;
+    gint preview_width, preview_height, target_height, width, height;
+
+    g_debug("set_preview_button_image ()");
+    gint titleindex;
+
+    live_preview_stop(ud);
+
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+    if (titleindex < 0) return;
+    widget = GHB_WIDGET (ud->builder, "preview_frame");
+    ud->preview->frame = ghb_widget_int(widget) - 1;
+    if (ud->preview->encoded[ud->preview->frame])
+    {
+        widget = GHB_WIDGET(ud->builder, "live_progress_box");
+        gtk_widget_hide (widget);
+        widget = GHB_WIDGET(ud->builder, "live_preview_progress");
+        gtk_widget_show (widget);
+    }
+    else
+    {
+        widget = GHB_WIDGET(ud->builder, "live_preview_progress");
+        gtk_widget_hide (widget);
+        widget = GHB_WIDGET(ud->builder, "live_progress_box");
+        gtk_widget_show (widget);
+        widget = GHB_WIDGET(ud->builder, "live_encode_progress");
+        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(widget), "");
+        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(widget), 0);
+    }
+    if (ud->preview->pix != NULL)
+        g_object_unref(ud->preview->pix);
+
+    ud->preview->pix = 
+        ghb_get_preview_image(titleindex, ud->preview->frame, 
+                                ud, &width, &height);
+    if (ud->preview->pix == NULL) return;
+    preview_width = gdk_pixbuf_get_width(ud->preview->pix);
+    preview_height = gdk_pixbuf_get_height(ud->preview->pix);
+    widget = GHB_WIDGET (ud->builder, "preview_image");
+    if (preview_width != ud->preview->width || 
+        preview_height != ud->preview->height)
+    {
+        gtk_widget_set_size_request(widget, preview_width, preview_height);
+        ud->preview->width = preview_width;
+        ud->preview->height = preview_height;
+    }
     _draw_pixbuf(gtk_widget_get_window(widget), ud->preview->pix);
 
-	gchar *text = g_strdup_printf("%d x %d", width, height);
-	widget = GHB_WIDGET (ud->builder, "preview_dims");
-	gtk_label_set_text(GTK_LABEL(widget), text);
-	g_free(text);
-	
-	g_debug("preview %d x %d", preview_width, preview_height);
-	target_height = MIN(ud->preview->button_height, 200);
-	height = target_height;
-	width = preview_width * height / preview_height;
-	if (width > 400)
-	{
-		width = 400;
-		height = preview_height * width / preview_width;
-	}
-
-	if ((height >= 16) && (width >= 16))
-	{
-		GdkPixbuf *scaled_preview;
-		scaled_preview = gdk_pixbuf_scale_simple (ud->preview->pix, width, 
-												height, GDK_INTERP_NEAREST);
-		if (scaled_preview != NULL)
-		{
-			widget = GHB_WIDGET (ud->builder, "preview_button_image");
-			gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview);
-			g_object_unref (scaled_preview);
-		}
-	}
+    gchar *text = g_strdup_printf("%d x %d", width, height);
+    widget = GHB_WIDGET (ud->builder, "preview_dims");
+    gtk_label_set_text(GTK_LABEL(widget), text);
+    g_free(text);
+    
+    g_debug("preview %d x %d", preview_width, preview_height);
+    target_height = MIN(ud->preview->button_height, 200);
+    height = target_height;
+    width = preview_width * height / preview_height;
+    if (width > 400)
+    {
+        width = 400;
+        height = preview_height * width / preview_width;
+    }
+
+    if ((height >= 16) && (width >= 16))
+    {
+        GdkPixbuf *scaled_preview;
+        scaled_preview = gdk_pixbuf_scale_simple (ud->preview->pix, width, 
+                                                height, GDK_INTERP_NEAREST);
+        if (scaled_preview != NULL)
+        {
+            widget = GHB_WIDGET (ud->builder, "preview_button_image");
+            gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview);
+            g_object_unref (scaled_preview);
+        }
+    }
 }
 
 #if defined(_ENABLE_GST)
+#if GST_CHECK_VERSION(1, 0, 0)
+G_MODULE_EXPORT gboolean
+delayed_expose_cb(signal_user_data_t *ud)
+{
+    GstElement *vsink;
+    GstVideoOverlay *vover;
+
+    if (!ud->preview->live_enabled)
+        return FALSE;
+
+    g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
+    if (vsink == NULL)
+        return FALSE;
+
+    if (GST_IS_BIN(vsink))
+        vover = GST_VIDEO_OVERLAY(gst_bin_get_by_interface(
+                                GST_BIN(vsink), GST_TYPE_VIDEO_OVERLAY));
+    else
+        vover = GST_VIDEO_OVERLAY(vsink);
+    gst_video_overlay_expose(vover);
+    // This function is initiated by g_idle_add.  Must return false
+    // so that it is not called again
+    return FALSE;
+}
+#else
 G_MODULE_EXPORT gboolean
 delayed_expose_cb(signal_user_data_t *ud)
 {
-	GstElement *vsink;
-	GstXOverlay *xover;
-
-	if (!ud->preview->live_enabled)
-		return FALSE;
-
-	g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
-	if (vsink == NULL)
-		return FALSE;
-
-	if (GST_IS_BIN(vsink))
-		xover = GST_X_OVERLAY(gst_bin_get_by_interface(
-								GST_BIN(vsink), GST_TYPE_X_OVERLAY));
-	else
-		xover = GST_X_OVERLAY(vsink);
-	gst_x_overlay_expose(xover);
-	// This function is initiated by g_idle_add.  Must return false
-	// so that it is not called again
-	return FALSE;
+    GstElement *vsink;
+    GstXOverlay *xover;
+
+    if (!ud->preview->live_enabled)
+        return FALSE;
+
+    g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
+    if (vsink == NULL)
+        return FALSE;
+
+    if (GST_IS_BIN(vsink))
+        xover = GST_X_OVERLAY(gst_bin_get_by_interface(
+                                GST_BIN(vsink), GST_TYPE_X_OVERLAY));
+    else
+        xover = GST_X_OVERLAY(vsink);
+    gst_x_overlay_expose(xover);
+    // This function is initiated by g_idle_add.  Must return false
+    // so that it is not called again
+    return FALSE;
+}
+#endif
+#endif
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+G_MODULE_EXPORT gboolean
+position_overlay_cb(
+    GtkWidget *overlay,
+    GtkWidget *widget, 
+    GdkRectangle *rect, 
+    signal_user_data_t *ud)
+{
+    GtkRequisition min_size, size;
+    gtk_widget_get_preferred_size(widget, &min_size, &size);
+
+    rect->width = MAX(min_size.width, size.width);
+    rect->height = MAX(min_size.height, size.height);
+    rect->x = MAX(0, ud->preview->width / 2 - rect->width / 2);
+    rect->y = MAX(0, ud->preview->height - rect->height - 50);
+
+    return TRUE;
 }
 #endif
 
 G_MODULE_EXPORT gboolean
 preview_expose_cb(
-	GtkWidget *widget, 
-	GdkEventExpose *event, 
-	signal_user_data_t *ud)
+    GtkWidget *widget, 
+    GdkEventExpose *event, 
+    signal_user_data_t *ud)
 {
 #if defined(_ENABLE_GST)
-	if (ud->preview->live_enabled && ud->preview->state == PREVIEW_STATE_LIVE)
-	{
-		if (GST_STATE(ud->preview->play) >= GST_STATE_PAUSED)
-		{
-			GstElement *vsink;
-			GstXOverlay *xover;
-
-			g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
-			if (GST_IS_BIN(vsink))
-				xover = GST_X_OVERLAY(gst_bin_get_by_interface(
-										GST_BIN(vsink), GST_TYPE_X_OVERLAY));
-			else
-				xover = GST_X_OVERLAY(vsink);
-			gst_x_overlay_expose(xover);
-			// For some reason, the exposed region doesn't always get
-			// cleaned up here. But a delayed gst_x_overlay_expose()
-			// takes care of it.
-			g_idle_add((GSourceFunc)delayed_expose_cb, ud);
-			return FALSE;
-		}
-		return TRUE;
-	}
+#if GST_CHECK_VERSION(1, 0, 0)
+    if (ud->preview->live_enabled && ud->preview->state == PREVIEW_STATE_LIVE)
+    {
+        if (GST_STATE(ud->preview->play) >= GST_STATE_PAUSED)
+        {
+            GstElement *vsink;
+            GstVideoOverlay *vover;
+
+            g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
+            if (GST_IS_BIN(vsink))
+                vover = GST_VIDEO_OVERLAY(gst_bin_get_by_interface(
+                                    GST_BIN(vsink), GST_TYPE_VIDEO_OVERLAY));
+            else
+                vover = GST_VIDEO_OVERLAY(vsink);
+            gst_video_overlay_expose(vover);
+            // For some reason, the exposed region doesn't always get
+            // cleaned up here. But a delayed gst_x_overlay_expose()
+            // takes care of it.
+            g_idle_add((GSourceFunc)delayed_expose_cb, ud);
+            return FALSE;
+        }
+        return TRUE;
+    }
+#else
+    if (ud->preview->live_enabled && ud->preview->state == PREVIEW_STATE_LIVE)
+    {
+        if (GST_STATE(ud->preview->play) >= GST_STATE_PAUSED)
+        {
+            GstElement *vsink;
+            GstXOverlay *xover;
+
+            g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
+            if (GST_IS_BIN(vsink))
+                xover = GST_X_OVERLAY(gst_bin_get_by_interface(
+                                        GST_BIN(vsink), GST_TYPE_X_OVERLAY));
+            else
+                xover = GST_X_OVERLAY(vsink);
+            gst_x_overlay_expose(xover);
+            // For some reason, the exposed region doesn't always get
+            // cleaned up here. But a delayed gst_x_overlay_expose()
+            // takes care of it.
+            g_idle_add((GSourceFunc)delayed_expose_cb, ud);
+            return FALSE;
+        }
+        return TRUE;
+    }
+#endif
 #endif
 
-	if (ud->preview->pix != NULL)
-	{
-        _draw_pixbuf(gtk_widget_get_window(widget), ud->preview->pix);
-	}
-	return TRUE;
+    if (ud->preview->pix != NULL)
+    {
+        _draw_pixbuf(gtk_widget_get_window(ud->preview->view), ud->preview->pix);
+        //_draw_pixbuf(gtk_widget_get_window(widget), ud->preview->pix);
+    }
+    return TRUE;
 }
 
 G_MODULE_EXPORT void
 preview_button_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
 {
-	g_debug("allocate %d x %d", allocation->width, allocation->height);
-	if (ud->preview->button_width == allocation->width &&
-		ud->preview->button_height == allocation->height)
-	{
-		// Nothing to do. Bug out.
-		g_debug("nothing to do");
-		return;
-	}
-	g_debug("prev allocate %d x %d", ud->preview->button_width, 
-			ud->preview->button_height);
-	ud->preview->button_width = allocation->width;
-	ud->preview->button_height = allocation->height;
-	ghb_set_preview_image(ud);
+    g_debug("allocate %d x %d", allocation->width, allocation->height);
+    if (ud->preview->button_width == allocation->width &&
+        ud->preview->button_height == allocation->height)
+    {
+        // Nothing to do. Bug out.
+        g_debug("nothing to do");
+        return;
+    }
+    g_debug("prev allocate %d x %d", ud->preview->button_width, 
+            ud->preview->button_height);
+    ud->preview->button_width = allocation->width;
+    ud->preview->button_height = allocation->height;
+    ghb_set_preview_image(ud);
 }
 
 static void
 set_visible(GtkWidget *widget, gboolean visible)
 {
-	if (visible)
-	{
-		gtk_widget_show_now(widget);
-	}
-	else
-	{
-		gtk_widget_hide(widget);
-	}
+    if (visible)
+    {
+        gtk_widget_show_now(widget);
+    }
+    else
+    {
+        gtk_widget_hide(widget);
+    }
 }
 
 void
 ghb_preview_set_visible(signal_user_data_t *ud)
 {
-	gint titleindex;
-	GtkWidget *widget;
-	gboolean settings_active;
-
-	settings_active = ghb_settings_get_boolean(ud->settings, "show_picture");
-	widget = GHB_WIDGET (ud->builder, "preview_window");
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	if (settings_active && titleindex >= 0)
-	{
-		gint x, y;
-		x = ghb_settings_get_int(ud->settings, "preview_x");
-		y = ghb_settings_get_int(ud->settings, "preview_y");
-		if (x >= 0 && y >= 0)
-			gtk_window_move(GTK_WINDOW(widget), x, y);
-		set_visible(widget, 
-					ghb_settings_get_boolean(ud->settings, "show_preview"));
-	}
-	else
-	{
-		set_visible(widget, FALSE);
-	}
+    gint titleindex;
+    GtkWidget *widget;
+    gboolean settings_active;
+
+    settings_active = ghb_settings_get_boolean(ud->settings, "show_picture");
+    widget = GHB_WIDGET (ud->builder, "preview_window");
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+    if (settings_active && titleindex >= 0)
+    {
+        gint x, y;
+        x = ghb_settings_get_int(ud->settings, "preview_x");
+        y = ghb_settings_get_int(ud->settings, "preview_y");
+        if (x >= 0 && y >= 0)
+            gtk_window_move(GTK_WINDOW(widget), x, y);
+        set_visible(widget, 
+                    ghb_settings_get_boolean(ud->settings, "show_preview"));
+    }
+    else
+    {
+        set_visible(widget, FALSE);
+    }
 }
 
 G_MODULE_EXPORT void
 preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	g_debug("preview_button_clicked_cb()");
-	ghb_widget_to_setting (ud->settings, xwidget);
-	ghb_preview_set_visible(ud);
-	ghb_check_dependency(ud, xwidget, NULL);
-	const gchar *name = ghb_get_setting_key(xwidget);
-	ghb_pref_save(ud->settings, name);
+    g_debug("preview_button_clicked_cb()");
+    ghb_widget_to_setting (ud->settings, xwidget);
+    ghb_preview_set_visible(ud);
+    ghb_check_dependency(ud, xwidget, NULL);
+    const gchar *name = ghb_get_setting_key(xwidget);
+    ghb_pref_save(ud->settings, name);
 }
 
 G_MODULE_EXPORT void
 picture_settings_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *widget;
-	gboolean active, hide_settings;
-	gint x, y;
-
-	g_debug("picture_settings_clicked_cb()");
-	ghb_widget_to_setting (ud->settings, xwidget);
-
-	hide_settings = ghb_settings_get_boolean(ud->settings, "hide_settings");
-
-	active = ghb_settings_get_boolean(ud->settings, "show_picture");
-	widget = GHB_WIDGET (ud->builder, "settings_window");
-	x = ghb_settings_get_int(ud->settings, "settings_x");
-	y = ghb_settings_get_int(ud->settings, "settings_y");
-	if (x >= 0 && y >= 0)
-		gtk_window_move(GTK_WINDOW(widget), x, y);
-	set_visible(widget, active && !hide_settings);
-	ghb_preview_set_visible(ud);
+    GtkWidget *widget;
+    gboolean active, hide_settings;
+    gint x, y;
+
+    g_debug("picture_settings_clicked_cb()");
+    ghb_widget_to_setting (ud->settings, xwidget);
+
+    hide_settings = ghb_settings_get_boolean(ud->settings, "hide_settings");
+
+    active = ghb_settings_get_boolean(ud->settings, "show_picture");
+    widget = GHB_WIDGET (ud->builder, "settings_window");
+    x = ghb_settings_get_int(ud->settings, "settings_x");
+    y = ghb_settings_get_int(ud->settings, "settings_y");
+    if (x >= 0 && y >= 0)
+        gtk_window_move(GTK_WINDOW(widget), x, y);
+    set_visible(widget, active && !hide_settings);
+    ghb_preview_set_visible(ud);
 }
 
 G_MODULE_EXPORT void
 picture_settings_alt_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *toggle;
-	gboolean active;
+    GtkWidget *toggle;
+    gboolean active;
 
-	g_debug("picture_settings_alt_clicked_cb()");
-	toggle = GHB_WIDGET (ud->builder, "show_picture");
-	active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toggle));
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(toggle), !active);
+    g_debug("picture_settings_alt_clicked_cb()");
+    toggle = GHB_WIDGET (ud->builder, "show_picture");
+    active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toggle));
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(toggle), !active);
 }
 
 static gboolean
 go_full(signal_user_data_t *ud)
 {
-	GtkWindow *window;
-	window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window"));
-	gtk_window_fullscreen(window);
-	ghb_set_preview_image(ud);
-	return FALSE;
+    GtkWindow *window;
+    window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window"));
+    gtk_window_fullscreen(window);
+    ghb_set_preview_image(ud);
+    return FALSE;
 }
 
 G_MODULE_EXPORT void
 fullscreen_clicked_cb(GtkWidget *toggle, signal_user_data_t *ud)
 {
-	gboolean active;
-	GtkWindow *window;
-
-	g_debug("fullscreen_clicked_cb()");
-	ghb_widget_to_setting (ud->settings, toggle);
-	ghb_check_dependency(ud, toggle, NULL);
-	const gchar *name = ghb_get_setting_key(toggle);
-	ghb_pref_save(ud->settings, name);
-
-	window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window"));
-	active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
-	if (active)
-	{
-		gtk_window_set_resizable(window, TRUE);
-		gtk_button_set_label(GTK_BUTTON(toggle), "Windowed");
-		// Changing resizable property doesn't take effect immediately
-		// need to delay fullscreen till after this callback returns
-		// to mainloop
-		g_idle_add((GSourceFunc)go_full, ud);
-	}
-	else
-	{
-		gtk_window_unfullscreen(window);
-		gtk_window_set_resizable(window, FALSE);
-		gtk_button_set_label(GTK_BUTTON(toggle), "Fullscreen");
-		ghb_set_preview_image(ud);
-	}
+    gboolean active;
+    GtkWindow *window;
+
+    g_debug("fullscreen_clicked_cb()");
+    ghb_widget_to_setting (ud->settings, toggle);
+    ghb_check_dependency(ud, toggle, NULL);
+    const gchar *name = ghb_get_setting_key(toggle);
+    ghb_pref_save(ud->settings, name);
+
+    window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window"));
+    active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
+    if (active)
+    {
+        gtk_window_set_resizable(window, TRUE);
+        gtk_button_set_label(GTK_BUTTON(toggle), "Windowed");
+        // Changing resizable property doesn't take effect immediately
+        // need to delay fullscreen till after this callback returns
+        // to mainloop
+        g_idle_add((GSourceFunc)go_full, ud);
+    }
+    else
+    {
+        gtk_window_unfullscreen(window);
+        gtk_window_set_resizable(window, FALSE);
+        gtk_button_set_label(GTK_BUTTON(toggle), "Fullscreen");
+        ghb_set_preview_image(ud);
+    }
 }
 
 G_MODULE_EXPORT void
 picture_settings_alt2_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	GtkWidget *toggle;
-	gboolean active;
-	GtkWidget *window;
-
-	g_debug("picture_settings_alt2_clicked_cb()");
-	ghb_widget_to_setting (ud->settings, xwidget);
-	active = ghb_settings_get_boolean(ud->settings, "hide_settings");
-
-	toggle = GHB_WIDGET (ud->builder, "hide_settings");
-	window = GHB_WIDGET(ud->builder, "settings_window");
-	if (!active)
-	{
-		gtk_button_set_label(GTK_BUTTON(toggle), "Hide Settings");
-		gtk_widget_set_tooltip_text(toggle, 
-			"Hide the picture settings window while "
-			"leaving the preview visible.");
-		gtk_widget_show(window);
-	}
-	else
-	{
-		gtk_button_set_label(GTK_BUTTON(toggle), "Show Settings");
-		gtk_widget_set_tooltip_text(toggle, "Show picture settings.");
-		gtk_widget_hide(window);
-	}
+    GtkWidget *toggle;
+    gboolean active;
+    GtkWidget *window;
+
+    g_debug("picture_settings_alt2_clicked_cb()");
+    ghb_widget_to_setting (ud->settings, xwidget);
+    active = ghb_settings_get_boolean(ud->settings, "hide_settings");
+
+    toggle = GHB_WIDGET (ud->builder, "hide_settings");
+    window = GHB_WIDGET(ud->builder, "settings_window");
+    if (!active)
+    {
+        gtk_button_set_label(GTK_BUTTON(toggle), "Hide Settings");
+        gtk_widget_set_tooltip_text(toggle, 
+            "Hide the picture settings window while "
+            "leaving the preview visible.");
+        gtk_widget_show(window);
+    }
+    else
+    {
+        gtk_button_set_label(GTK_BUTTON(toggle), "Show Settings");
+        gtk_widget_set_tooltip_text(toggle, "Show picture settings.");
+        gtk_widget_hide(window);
+    }
 }
 
 G_MODULE_EXPORT void
 preview_frame_value_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	if (ud->preview->live_id >= 0)
-	{
-		ghb_stop_live_encode();
-		ud->preview->live_id = -1;
-		ud->preview->encode_frame = -1;
-	}
-	ghb_set_preview_image(ud);
+    if (ud->preview->live_id >= 0)
+    {
+        ghb_stop_live_encode();
+        ud->preview->live_id = -1;
+        ud->preview->encode_frame = -1;
+    }
+    ghb_set_preview_image(ud);
 }
 
 G_MODULE_EXPORT gboolean
 preview_window_delete_cb(
-	GtkWidget *widget, 
-	GdkEvent *event, 
-	signal_user_data_t *ud)
+    GtkWidget *widget, 
+    GdkEvent *event, 
+    signal_user_data_t *ud)
 {
-	live_preview_stop(ud);
-	widget = GHB_WIDGET (ud->builder, "show_picture");
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
-	return TRUE;
+    live_preview_stop(ud);
+    widget = GHB_WIDGET (ud->builder, "show_picture");
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+    return TRUE;
 }
 
 G_MODULE_EXPORT gboolean
 settings_window_delete_cb(
-	GtkWidget *widget, 
-	GdkEvent *event, 
-	signal_user_data_t *ud)
+    GtkWidget *widget, 
+    GdkEvent *event, 
+    signal_user_data_t *ud)
 {
-	live_preview_stop(ud);
-	widget = GHB_WIDGET (ud->builder, "show_picture");
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+    live_preview_stop(ud);
+    widget = GHB_WIDGET (ud->builder, "show_picture");
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
 
-	return TRUE;
+    return TRUE;
 }
 
 G_MODULE_EXPORT void
 preview_duration_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("preview_duration_changed_cb ()");
-	ghb_live_reset(ud);
-	ghb_widget_to_setting (ud->settings, widget);
-	ghb_check_dependency(ud, widget, NULL);
-	const gchar *name = ghb_get_setting_key(widget);
-	ghb_pref_save(ud->settings, name);
+    g_debug("preview_duration_changed_cb ()");
+    ghb_live_reset(ud);
+    ghb_widget_to_setting (ud->settings, widget);
+    ghb_check_dependency(ud, widget, NULL);
+    const gchar *name = ghb_get_setting_key(widget);
+    ghb_pref_save(ud->settings, name);
 }
 
 static guint hud_timeout_id = 0;
@@ -1087,192 +1353,252 @@
 static gboolean
 hud_timeout(signal_user_data_t *ud)
 {
-	GtkWidget *widget;
+    GtkWidget *widget;
 
-	g_debug("hud_timeout()");
-	widget = GHB_WIDGET(ud->builder, "preview_hud");
-	gtk_widget_hide(widget);
-	hud_timeout_id = 0;
-	return FALSE;
+    g_debug("hud_timeout()");
+    widget = GHB_WIDGET(ud->builder, "preview_hud");
+    gtk_widget_hide(widget);
+    hud_timeout_id = 0;
+    return FALSE;
 }
 
 G_MODULE_EXPORT gboolean
 hud_enter_cb(
-	GtkWidget *widget,
-	GdkEventCrossing *event,
-	signal_user_data_t *ud)
+    GtkWidget *widget,
+    GdkEventCrossing *event,
+    signal_user_data_t *ud)
 {
-	g_debug("hud_enter_cb()");
-	if (hud_timeout_id != 0)
-	{
-		GMainContext *mc;
-		GSource *source;
-
-		mc = g_main_context_default();
-		source = g_main_context_find_source_by_id(mc, hud_timeout_id);
-		if (source != NULL)
-			g_source_destroy(source);
-	}
-	widget = GHB_WIDGET(ud->builder, "preview_hud");
-	gtk_widget_show(widget);
-	hud_timeout_id = 0;
-	return FALSE;
+    g_debug("hud_enter_cb()");
+    if (hud_timeout_id != 0)
+    {
+        GMainContext *mc;
+        GSource *source;
+
+        mc = g_main_context_default();
+        source = g_main_context_find_source_by_id(mc, hud_timeout_id);
+        if (source != NULL)
+            g_source_destroy(source);
+    }
+    widget = GHB_WIDGET(ud->builder, "preview_hud");
+    gtk_widget_show(widget);
+    hud_timeout_id = 0;
+    return FALSE;
 }
 
 G_MODULE_EXPORT gboolean
 preview_leave_cb(
-	GtkWidget *widget,
-	GdkEventCrossing *event,
-	signal_user_data_t *ud)
+    GtkWidget *widget,
+    GdkEventCrossing *event,
+    signal_user_data_t *ud)
 {
-	g_debug("hud_leave_cb()");
-	if (hud_timeout_id != 0)
-	{
-		GMainContext *mc;
-		GSource *source;
-
-		mc = g_main_context_default();
-		source = g_main_context_find_source_by_id(mc, hud_timeout_id);
-		if (source != NULL)
-			g_source_destroy(source);
-	}
-	hud_timeout_id = g_timeout_add(300, (GSourceFunc)hud_timeout, ud);
-	return FALSE;
+    g_debug("hud_leave_cb()");
+    if (hud_timeout_id != 0)
+    {
+        GMainContext *mc;
+        GSource *source;
+
+        mc = g_main_context_default();
+        source = g_main_context_find_source_by_id(mc, hud_timeout_id);
+        if (source != NULL)
+            g_source_destroy(source);
+    }
+    hud_timeout_id = g_timeout_add(300, (GSourceFunc)hud_timeout, ud);
+    return FALSE;
 }
 
 G_MODULE_EXPORT gboolean
 preview_motion_cb(
-	GtkWidget *widget,
-	GdkEventMotion *event,
-	signal_user_data_t *ud)
+    GtkWidget *widget,
+    GdkEventMotion *event,
+    signal_user_data_t *ud)
 {
-	//g_debug("hud_motion_cb %d", hud_timeout_id);
-	if (hud_timeout_id != 0)
-	{
-		GMainContext *mc;
-		GSource *source;
-
-		mc = g_main_context_default();
-		source = g_main_context_find_source_by_id(mc, hud_timeout_id);
-		if (source != NULL)
-			g_source_destroy(source);
-	}
-	widget = GHB_WIDGET(ud->builder, "preview_hud");
-	if (!gtk_widget_get_visible(widget))
-	{
-		gtk_widget_show(widget);
-	}
-	hud_timeout_id = g_timeout_add_seconds(4, (GSourceFunc)hud_timeout, ud);
-	return FALSE;
+    //g_debug("hud_motion_cb %d", hud_timeout_id);
+    if (hud_timeout_id != 0)
+    {
+        GMainContext *mc;
+        GSource *source;
+
+        mc = g_main_context_default();
+        source = g_main_context_find_source_by_id(mc, hud_timeout_id);
+        if (source != NULL)
+            g_source_destroy(source);
+    }
+    widget = GHB_WIDGET(ud->builder, "preview_hud");
+    if (!gtk_widget_get_visible(widget))
+    {
+        gtk_widget_show(widget);
+    }
+    hud_timeout_id = g_timeout_add_seconds(4, (GSourceFunc)hud_timeout, ud);
+    return FALSE;
 }
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+cairo_region_t*
+ghb_curved_rect_mask(gint width, gint height, gint radius)
+{
+    cairo_region_t *shape;
+    cairo_surface_t *surface;
+    cairo_t *cr;
+    double w, h;
+
+    if (!width || !height)
+        return NULL;
+
+    surface = cairo_image_surface_create(CAIRO_FORMAT_A8, width, height);
+    cr = cairo_create (surface);
+
+    w = width;
+    h = height;
+    if (radius > width / 2)
+        radius = width / 2;
+    if (radius > height / 2)
+        radius = height / 2;
+
+    // fill shape with black
+    cairo_save(cr);
+    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+    cairo_fill (cr);
+    cairo_restore (cr);
+
+    cairo_move_to  (cr, 0, radius);
+    cairo_curve_to (cr, 0 , 0, 0 , 0, radius, 0);
+    cairo_line_to (cr, w - radius, 0);
+    cairo_curve_to (cr, w, 0, w, 0, w, radius);
+    cairo_line_to (cr, w , h - radius);
+    cairo_curve_to (cr, w, h, w, h, w - radius, h);
+    cairo_line_to (cr, 0 + radius, h);
+    cairo_curve_to (cr, 0, h, 0, h, 0, h - radius);
+
+    cairo_close_path(cr);
+
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_fill(cr);
+
+    cairo_destroy(cr);
+    shape = gdk_cairo_region_create_from_surface(surface);
+    cairo_surface_destroy(surface);
+
+    return shape;
+}
+#else
 GdkDrawable*
 ghb_curved_rect_mask(gint width, gint height, gint radius)
 {
-	GdkDrawable *shape;
-	cairo_t *cr;
-	double w, h;
+    GdkDrawable *shape;
+    cairo_t *cr;
+    double w, h;
 
-	if (!width || !height)
-		return NULL;
+    if (!width || !height)
+        return NULL;
 
-	shape = (GdkDrawable *)gdk_pixmap_new (NULL, width, height, 1);
+    shape = (GdkDrawable *)gdk_pixmap_new (NULL, width, height, 1);
 
-  	cr = gdk_cairo_create (shape);
+    cr = gdk_cairo_create (shape);
 
-	w = width;
-	h = height;
-	if (radius > width / 2)
-		radius = width / 2;
-	if (radius > height / 2)
-		radius = height / 2;
+    w = width;
+    h = height;
+    if (radius > width / 2)
+        radius = width / 2;
+    if (radius > height / 2)
+        radius = height / 2;
 
-	// fill shape with black
-	cairo_save(cr);
-	cairo_rectangle (cr, 0, 0, width, height);
-	cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-	cairo_fill (cr);
-	cairo_restore (cr);
+    // fill shape with black
+    cairo_save(cr);
+    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+    cairo_fill (cr);
+    cairo_restore (cr);
 
-	cairo_move_to  (cr, 0, radius);
-	cairo_curve_to (cr, 0 , 0, 0 , 0, radius, 0);
-	cairo_line_to (cr, w - radius, 0);
-	cairo_curve_to (cr, w, 0, w, 0, w, radius);
-	cairo_line_to (cr, w , h - radius);
-	cairo_curve_to (cr, w, h, w, h, w - radius, h);
-	cairo_line_to (cr, 0 + radius, h);
-	cairo_curve_to (cr, 0, h, 0, h, 0, h - radius);
+    cairo_move_to  (cr, 0, radius);
+    cairo_curve_to (cr, 0 , 0, 0 , 0, radius, 0);
+    cairo_line_to (cr, w - radius, 0);
+    cairo_curve_to (cr, w, 0, w, 0, w, radius);
+    cairo_line_to (cr, w , h - radius);
+    cairo_curve_to (cr, w, h, w, h, w - radius, h);
+    cairo_line_to (cr, 0 + radius, h);
+    cairo_curve_to (cr, 0, h, 0, h, 0, h - radius);
 
-	cairo_close_path(cr);
+    cairo_close_path(cr);
 
-	cairo_set_source_rgb(cr, 1, 1, 1);
-	cairo_fill(cr);
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_fill(cr);
 
-	cairo_destroy(cr);
+    cairo_destroy(cr);
 
-	return shape;
+    return shape;
 }
+#endif
 
 G_MODULE_EXPORT void
 preview_hud_size_alloc_cb(
-	GtkWidget *widget,
-	GtkAllocation *allocation,
-	signal_user_data_t *ud)
+    GtkWidget *widget,
+    GtkAllocation *allocation,
+    signal_user_data_t *ud)
 {
-	GdkDrawable *shape;
-
-	//g_message("preview_hud_size_alloc_cb()");
-	if (gtk_widget_get_visible(widget) && allocation->height > 50)
-	{
-		shape = ghb_curved_rect_mask(allocation->width, 
-									allocation->height, allocation->height/4);
-		if (shape != NULL)
-		{
-			gtk_widget_shape_combine_mask(widget, shape, 0, 0);
-			gdk_pixmap_unref(shape);
-		}
-	}
+#if GTK_CHECK_VERSION(3, 0, 0)
+    cairo_region_t *shape;
+#else
+    GdkDrawable *shape;
+#endif
+
+    //g_message("preview_hud_size_alloc_cb()");
+    if (gtk_widget_get_visible(widget) && allocation->height > 50)
+    {
+        shape = ghb_curved_rect_mask(allocation->width, 
+                                    allocation->height, allocation->height/4);
+        if (shape != NULL)
+        {
+#if GTK_CHECK_VERSION(3, 0, 0)
+            gtk_widget_shape_combine_region(widget, shape);
+            cairo_region_destroy(shape);
+#else
+            gtk_widget_shape_combine_mask(widget, shape, 0, 0);
+            gdk_pixmap_unref(shape);
+#endif
+        }
+    }
 }
 
 G_MODULE_EXPORT gboolean
 preview_configure_cb(
-	GtkWidget *widget,
-	GdkEventConfigure *event,
-	signal_user_data_t *ud)
+    GtkWidget *widget,
+    GdkEventConfigure *event,
+    signal_user_data_t *ud)
 {
-	gint x, y;
-
-	//g_message("preview_configure_cb()");
-	if (gtk_widget_get_visible(widget))
-	{
-		gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
-		ghb_settings_set_int(ud->settings, "preview_x", x);
-		ghb_settings_set_int(ud->settings, "preview_y", y);
-		ghb_pref_set(ud->settings, "preview_x");
-		ghb_pref_set(ud->settings, "preview_y");
-		ghb_prefs_store();
-	}
-	return FALSE;
+    gint x, y;
+
+    //g_message("preview_configure_cb()");
+    if (gtk_widget_get_visible(widget))
+    {
+        gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
+        ghb_settings_set_int(ud->settings, "preview_x", x);
+        ghb_settings_set_int(ud->settings, "preview_y", y);
+        ghb_pref_set(ud->settings, "preview_x");
+        ghb_pref_set(ud->settings, "preview_y");
+        ghb_prefs_store();
+    }
+    return FALSE;
 }
 
 G_MODULE_EXPORT gboolean
 settings_configure_cb(
-	GtkWidget *widget,
-	GdkEventConfigure *event,
-	signal_user_data_t *ud)
+    GtkWidget *widget,
+    GdkEventConfigure *event,
+    signal_user_data_t *ud)
 {
-	gint x, y;
-
-	//g_message("settings_configure_cb()");
-	if (gtk_widget_get_visible(widget))
-	{
-		gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
-		ghb_settings_set_int(ud->settings, "settings_x", x);
-		ghb_settings_set_int(ud->settings, "settings_y", y);
-		ghb_pref_set(ud->settings, "settings_x");
-		ghb_pref_set(ud->settings, "settings_y");
-		ghb_prefs_store();
-	}
-	return FALSE;
+    gint x, y;
+
+    //g_message("settings_configure_cb()");
+    if (gtk_widget_get_visible(widget))
+    {
+        gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
+        ghb_settings_set_int(ud->settings, "settings_x", x);
+        ghb_settings_set_int(ud->settings, "settings_y", y);
+        ghb_pref_set(ud->settings, "settings_x");
+        ghb_pref_set(ud->settings, "settings_y");
+        ghb_prefs_store();
+    }
+    return FALSE;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/preview.h -> HandBrake-0.9.9.tar.bz2/gtk/src/preview.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/queuehandler.c -> HandBrake-0.9.9.tar.bz2/gtk/src/queuehandler.c Changed

HandBrake-0.9.8.tar.bz2/gtk/src/queuehandler.h -> HandBrake-0.9.9.tar.bz2/gtk/src/queuehandler.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/quotestring.c -> HandBrake-0.9.9.tar.bz2/gtk/src/quotestring.c Changed

@@ -35,44 +35,44 @@
     }
     while (fgets(in_buffer, BUF_SIZE, infile) != NULL)
     {
-		int ii, jj;
+        int ii, jj;
         int len;
-		int eol = 0;
+        int eol = 0;
         // Step on any CR LF at end of line
         len = strlen(in_buffer);
-       	if (len > 1 && in_buffer[len-1] == '\n' && in_buffer[len-2] == '\r')
-		{
-			in_buffer[len-1] = 0;
-			in_buffer[len-2] = 0;
-			eol = 1;
-		}
-       	else if (len > 0 && in_buffer[len-1] == '\n')
-		{
-			in_buffer[len-1] = 0;
-			eol = 1;
-		}
-		for (jj = 0, ii = 0; ii < len; ii++)
-		{
-			if (in_buffer[ii] == '"')
-			{
-				out_buffer[jj++] = '\\';
-				out_buffer[jj++] = in_buffer[ii];
-			}
-        	else if (in_buffer[ii] == '\r')
-			{ // Skip it
-			}
-			else
-			{
-				out_buffer[jj++] = in_buffer[ii];
-			}
-		}
-		out_buffer[jj] = 0;
-		if (eol)
-        	fprintf(outfile, "\"%s\\n\"\n", out_buffer);
-		else
-        	fprintf(outfile, "\"%s\"\n", out_buffer);
+        if (len > 1 && in_buffer[len-1] == '\n' && in_buffer[len-2] == '\r')
+        {
+            in_buffer[len-1] = 0;
+            in_buffer[len-2] = 0;
+            eol = 1;
+        }
+        else if (len > 0 && in_buffer[len-1] == '\n')
+        {
+            in_buffer[len-1] = 0;
+            eol = 1;
+        }
+        for (jj = 0, ii = 0; ii < len; ii++)
+        {
+            if (in_buffer[ii] == '"')
+            {
+                out_buffer[jj++] = '\\';
+                out_buffer[jj++] = in_buffer[ii];
+            }
+            else if (in_buffer[ii] == '\r')
+            { // Skip it
+            }
+            else
+            {
+                out_buffer[jj++] = in_buffer[ii];
+            }
+        }
+        out_buffer[jj] = 0;
+        if (eol)
+            fprintf(outfile, "\"%s\\n\"\n", out_buffer);
+        else
+            fprintf(outfile, "\"%s\"\n", out_buffer);
     }
     fclose(infile);
     fclose(outfile);
-	return 0;
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/quotestring.py -> HandBrake-0.9.9.tar.bz2/gtk/src/quotestring.py Changed

@@ -5,59 +5,59 @@
 import sys
 
 def usage():
-	print >> sys.stderr, (
-		"Usage: %s <input> [output]\n"
-		"Summary:\n"
-		"    Creates a quoted string suitable for inclusion in a C char*\n\n"
-		"Options:\n"
-		"    <input>   Input file to quote\n"
-		"    <output>  Output quoted string [stdout]\n"
-		% sys.argv[0]
-	)
+    print >> sys.stderr, (
+        "Usage: %s <input> [output]\n"
+        "Summary:\n"
+        "    Creates a quoted string suitable for inclusion in a C char*\n\n"
+        "Options:\n"
+        "    <input>   Input file to quote\n"
+        "    <output>  Output quoted string [stdout]\n"
+        % sys.argv[0]
+    )
 
 def main():
-	global inc_list
-
-	OPTS = ""
-	try:
-		opts, args = getopt.gnu_getopt(sys.argv[1:], OPTS)
-	except getopt.GetoptError, err:
-		print >> sys.stderr, str(err)
-		usage()
-		sys.exit(2)
-
-	for o, a in opts:
-		usage()
-		assert False, "unhandled option"
-
-	if len(args) > 2 or len(args) < 1:
-		usage()
-		sys.exit(2)
-
-	try:
-		infile = open(args[0])
-	except Exception, err:
-		print >> sys.stderr, ( "Error: %s"  % str(err) )
-		sys.exit(1)
-
-	if len(args) > 1:
-		try:
-			outfile = open(args[1], "w")
-		except Exception, err:
-			print >> sys.stderr, ( "Error: %s"  % str(err))
-			sys.exit(1)
-	else:
-		outfile = sys.stdout
-
-	ss = infile.read()
-	ss = re.sub("\"", "\\\"", ss)
-	pattern = re.compile("$", re.M)
-	# the replacement string below seems a bit strange, but it seems to be
-	# the only way to get the litteral chars '\' 'n' inserted into the string
-	ss = re.sub(pattern, "\\\\n\"", ss)
-	pattern = re.compile("^", re.M)
-	ss = re.sub(pattern, "\"", ss)
-	outfile.write(ss)
+    global inc_list
+
+    OPTS = ""
+    try:
+        opts, args = getopt.gnu_getopt(sys.argv[1:], OPTS)
+    except getopt.GetoptError, err:
+        print >> sys.stderr, str(err)
+        usage()
+        sys.exit(2)
+
+    for o, a in opts:
+        usage()
+        assert False, "unhandled option"
+
+    if len(args) > 2 or len(args) < 1:
+        usage()
+        sys.exit(2)
+
+    try:
+        infile = open(args[0])
+    except Exception, err:
+        print >> sys.stderr, ( "Error: %s"  % str(err) )
+        sys.exit(1)
+
+    if len(args) > 1:
+        try:
+            outfile = open(args[1], "w")
+        except Exception, err:
+            print >> sys.stderr, ( "Error: %s"  % str(err))
+            sys.exit(1)
+    else:
+        outfile = sys.stdout
+
+    ss = infile.read()
+    ss = re.sub("\"", "\\\"", ss)
+    pattern = re.compile("$", re.M)
+    # the replacement string below seems a bit strange, but it seems to be
+    # the only way to get the litteral chars '\' 'n' inserted into the string
+    ss = re.sub(pattern, "\\\\n\"", ss)
+    pattern = re.compile("^", re.M)
+    ss = re.sub(pattern, "\"", ss)
+    outfile.write(ss)
 
 main()

HandBrake-0.9.8.tar.bz2/gtk/src/renderer_button.c -> HandBrake-0.9.9.tar.bz2/gtk/src/renderer_button.c Changed

@@ -1,6 +1,12 @@
 #include "marshalers.h"
 #include "renderer_button.h"
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#define MyGdkRectangle const GdkRectangle
+#else
+#define MyGdkRectangle GdkRectangle
+#endif
+
 /* Some boring function declarations: GObject type system stuff */
 static void     custom_cell_renderer_button_init       (CustomCellRendererButton      *cellprogress);
 static void     custom_cell_renderer_button_class_init (CustomCellRendererButtonClass *klass);
@@ -16,13 +22,14 @@
 
 // My customized part that adds "clicked" signal
 static gboolean
-custom_cell_renderer_button_activate (GtkCellRenderer      *cell,
-				   GdkEvent             *event,
-				   GtkWidget            *widget,
-				   const gchar          *path,
-				   GdkRectangle   *background_area,
-				   GdkRectangle   *cell_area,
-				   GtkCellRendererState  flags);
+custom_cell_renderer_button_activate (
+                    GtkCellRenderer      *cell,
+                    GdkEvent             *event,
+                    GtkWidget            *widget,
+                    const gchar          *path,
+                    MyGdkRectangle       *background_area,
+                    MyGdkRectangle       *cell_area,
+                    GtkCellRendererState flags);
 
 enum {
   CLICKED,
@@ -44,31 +51,31 @@
 GType
 custom_cell_renderer_button_get_type (void)
 {
-	static GType cell_button_type = 0;
-
-	if (cell_button_type == 0)
-	{
-		static const GTypeInfo cell_button_info =
-		{
-			sizeof (CustomCellRendererButtonClass),
-			NULL,                                                     /* base_init */
-			NULL,                                                     /* base_finalize */
-			(GClassInitFunc) custom_cell_renderer_button_class_init,
-			NULL,                                                     /* class_finalize */
-			NULL,                                                     /* class_data */
-			sizeof (CustomCellRendererButton),
-			0,                                                        /* n_preallocs */
-			(GInstanceInitFunc) custom_cell_renderer_button_init,
-		};
-
-		/* Derive from GtkCellRendererPixbuf */
-		cell_button_type = g_type_register_static (GTK_TYPE_CELL_RENDERER_PIXBUF,
-													 "CustomCellRendererButton",
-													  &cell_button_info,
-													  0);
-	}
-
-	return cell_button_type;
+    static GType cell_button_type = 0;
+
+    if (cell_button_type == 0)
+    {
+        static const GTypeInfo cell_button_info =
+        {
+            sizeof (CustomCellRendererButtonClass),
+            NULL,                                                     /* base_init */
+            NULL,                                                     /* base_finalize */
+            (GClassInitFunc) custom_cell_renderer_button_class_init,
+            NULL,                                                     /* class_finalize */
+            NULL,                                                     /* class_data */
+            sizeof (CustomCellRendererButton),
+            0,                                                        /* n_preallocs */
+            (GInstanceInitFunc) custom_cell_renderer_button_init,
+        };
+
+        /* Derive from GtkCellRendererPixbuf */
+        cell_button_type = g_type_register_static (GTK_TYPE_CELL_RENDERER_PIXBUF,
+                                                     "CustomCellRendererButton",
+                                                      &cell_button_info,
+                                                      0);
+    }
+
+    return cell_button_type;
 }
 
 /***************************************************************************
@@ -80,9 +87,9 @@
 static void
 custom_cell_renderer_button_init (CustomCellRendererButton *cellbutton)
 {
-	g_object_set(cellbutton, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
-	g_object_set(cellbutton, "xpad", 2, NULL);
-	g_object_set(cellbutton, "ypad", 2, NULL);
+    g_object_set(cellbutton, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
+    g_object_set(cellbutton, "xpad", 2, NULL);
+    g_object_set(cellbutton, "ypad", 2, NULL);
 }
 
 /***************************************************************************
@@ -99,29 +106,29 @@
 static void
 custom_cell_renderer_button_class_init (CustomCellRendererButtonClass *klass)
 {
-	GtkCellRendererClass *cell_class   = GTK_CELL_RENDERER_CLASS(klass);
-	GObjectClass         *object_class = G_OBJECT_CLASS(klass);
-
-	parent_class           = g_type_class_peek_parent (klass);
-	object_class->finalize = custom_cell_renderer_button_finalize;
-
-	/* Hook up functions to set and get our
-	 *   custom cell renderer properties */
-	object_class->get_property = custom_cell_renderer_button_get_property;
-	object_class->set_property = custom_cell_renderer_button_set_property;
-
-	// Override activate
-	cell_class->activate = custom_cell_renderer_button_activate;
-
-	button_cell_signals[CLICKED] =
-		g_signal_new (g_intern_static_string ("clicked"),
-			  G_OBJECT_CLASS_TYPE (object_class),
-			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (CustomCellRendererButtonClass, clicked),
-			  NULL, NULL,
-			  ghb_marshal_VOID__STRING,
-			  G_TYPE_NONE, 1,
-			  G_TYPE_STRING);
+    GtkCellRendererClass *cell_class   = GTK_CELL_RENDERER_CLASS(klass);
+    GObjectClass         *object_class = G_OBJECT_CLASS(klass);
+
+    parent_class           = g_type_class_peek_parent (klass);
+    object_class->finalize = custom_cell_renderer_button_finalize;
+
+    /* Hook up functions to set and get our
+     *   custom cell renderer properties */
+    object_class->get_property = custom_cell_renderer_button_get_property;
+    object_class->set_property = custom_cell_renderer_button_set_property;
+
+    // Override activate
+    cell_class->activate = custom_cell_renderer_button_activate;
+
+    button_cell_signals[CLICKED] =
+        g_signal_new (g_intern_static_string ("clicked"),
+              G_OBJECT_CLASS_TYPE (object_class),
+              G_SIGNAL_RUN_LAST,
+              G_STRUCT_OFFSET (CustomCellRendererButtonClass, clicked),
+              NULL, NULL,
+              ghb_marshal_VOID__STRING,
+              G_TYPE_NONE, 1,
+              G_TYPE_STRING);
 }
 
 /***************************************************************************
@@ -132,14 +139,14 @@
 static void
 custom_cell_renderer_button_finalize (GObject *object)
 {
-	/*
-	If you need to do anyting with the renderer button ...
-	CustomCellRendererProgress *cellrendererbutton = CUSTOM_CELL_RENDERER_BUTTON(object);
-	*/
+    /*
+    If you need to do anyting with the renderer button ...
+    CustomCellRendererProgress *cellrendererbutton = CUSTOM_CELL_RENDERER_BUTTON(object);
+    */
 
-	/* Free any dynamically allocated resources here */
+    /* Free any dynamically allocated resources here */
 
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 /***************************************************************************
@@ -153,14 +160,14 @@
                                           GValue     *value,
                                           GParamSpec *psec)
 {
-	//CustomCellRendererButton  *cellbutton = CUSTOM_CELL_RENDERER_BUTTON(object);
-
-	switch (param_id)
-	{
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, psec);
-			break;
-	}
+    //CustomCellRendererButton  *cellbutton = CUSTOM_CELL_RENDERER_BUTTON(object);
+
+    switch (param_id)
+    {
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, psec);
+            break;
+    }
 }
 
 /***************************************************************************
@@ -174,14 +181,14 @@
                                           const GValue *value,
                                           GParamSpec   *pspec)
 {
-	//CustomCellRendererButton *cellbutton = CUSTOM_CELL_RENDERER_BUTTON(object);
-
-	switch (param_id)
-	{
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
-			break;
-	}
+    //CustomCellRendererButton *cellbutton = CUSTOM_CELL_RENDERER_BUTTON(object);
+
+    switch (param_id)
+    {
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
+            break;
+    }
 }
 
 /***************************************************************************
@@ -192,22 +199,20 @@
 GtkCellRenderer *
 custom_cell_renderer_button_new (void)
 {
-	return g_object_new(CUSTOM_TYPE_CELL_RENDERER_BUTTON, NULL);
+    return g_object_new(CUSTOM_TYPE_CELL_RENDERER_BUTTON, NULL);
 }
 
 static gboolean
-custom_cell_renderer_button_activate (GtkCellRenderer      *cell,
-				   GdkEvent             *event,
-				   GtkWidget            *widget,
-				   const gchar          *path,
-				   GdkRectangle   *background_area,
-				   GdkRectangle   *cell_area,
-				   GtkCellRendererState  flags)
+custom_cell_renderer_button_activate (
+        GtkCellRenderer         *cell,
+        GdkEvent                *event,
+        GtkWidget               *widget,
+        const gchar             *path,
+        MyGdkRectangle          *background_area,
+        MyGdkRectangle          *cell_area,
+        GtkCellRendererState    flags)
 {
-	CustomCellRendererButton *cellbutton;
-  
-	g_debug("custom_cell_renderer_button_activate ()\n");
-	cellbutton = CUSTOM_CELL_RENDERER_BUTTON (cell);
-	g_signal_emit (cell, button_cell_signals[CLICKED], 0, path);
-	return TRUE;
+    g_debug("custom_cell_renderer_button_activate ()\n");
+    g_signal_emit (cell, button_cell_signals[CLICKED], 0, path);
+    return TRUE;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/renderer_button.h -> HandBrake-0.9.9.tar.bz2/gtk/src/renderer_button.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/resources.c -> HandBrake-0.9.9.tar.bz2/gtk/src/resources.c Changed

HandBrake-0.9.8.tar.bz2/gtk/src/resources.list -> HandBrake-0.9.9.tar.bz2/gtk/src/resources.list Changed

@@ -1,37 +1,51 @@
 <resources>
-	<section name="icons">
-		<icon name="hb-activity" file="hb-activity.32.png" />
-		<icon name="hb-add-queue" file="hb-add-queue.32.png" />
-		<icon name="hb-canceled" file="hb-canceled.16.png" />
-		<icon name="hb-complete" file="hb-complete.16.png" />
-		<icon name="hb-drawer" file="hb-drawer.32.png" />
-		<icon name="hb-icon" file="hb-icon.128.png" />
-		<icon name="hb-status" file="hb-status.32.png" />
-		<icon name="hb-status-empty" file="hb-status-empty.32.png" />
-		<icon name="hb-pause" file="hb-pause.32.png" />
-		<icon name="hb-play" file="hb-play.32.png" />
-		<icon name="hb-pref" file="hb-pref.32.png" />
-		<icon name="hb-picture" file="hb-picture.32.png" />
-		<icon name="hb-queue" file="hb-queue.32.png" />
-		<icon name="hb-queue-delete" file="hb-queue-delete.16.png" />
-		<icon name="hb-queue-job" file="hb-queue-job.16.png" />
-		<icon name="hb-queue-pass1" file="hb-queue-pass1.16.png" />
-		<icon name="hb-queue-pass2" file="hb-queue-pass2.16.png" />
-		<icon name="hb-queue-subtitle" file="hb-queue-subtitle.16.png" />
-		<icon name="hb-remove" file="hb-remove.32.png" />
-		<icon name="hb-source" file="hb-source.32.png" />
-		<icon name="hb-stop" file="hb-stop.32.png" />
-		<icon name="hb-edit" file="hb-edit.32.png" />
-		<icon name="hb-working0" file="hb-working0.16.png" />
-		<icon name="hb-working1" file="hb-working1.16.png" />
-		<icon name="hb-working2" file="hb-working2.16.png" />
-		<icon name="hb-working3" file="hb-working3.16.png" />
-		<icon name="hb-working4" file="hb-working4.16.png" />
-		<icon name="hb-working5" file="hb-working5.16.png" />
-	</section>
-	<plist name="internal-defaults" file="internal_defaults.xml" />
-	<plist name="standard-presets" file="standard_presets.xml" />
-	<plist name="widget-deps" file="widget.deps" />
-	<plist name="widget-reverse-deps" file="widget_reverse.deps" />
-	<string name="ghb-ui" file="ghb.ui" />
+    <section name="icons">
+        <icon name="hb-activity.32" file="hb-activity.32.png" />
+        <icon name="hb-activity.64" file="hb-activity.64.png" />
+        <icon name="hb-add-queue.32" file="hb-add-queue.32.png" />
+        <icon name="hb-add-queue.64" file="hb-add-queue.64.png" />
+        <icon name="hb-canceled" file="hb-canceled.16.png" />
+        <icon name="hb-complete" file="hb-complete.16.png" />
+        <icon name="hb-icon.256" file="hb-icon.256.png" />
+        <icon name="hb-icon.128" file="hb-icon.128.png" />
+        <icon name="hb-icon.64" file="hb-icon.64.png" />
+        <icon name="hb-icon.48" file="hb-icon.48.png" />
+        <icon name="hb-icon.32" file="hb-icon.32.png" />
+        <icon name="hb-icon.24" file="hb-icon.24.png" />
+        <icon name="hb-icon.22" file="hb-icon.22.png" />
+        <icon name="hb-icon.16" file="hb-icon.16.png" />
+        <icon name="hb-status" file="hb-status.32.png" />
+        <icon name="hb-status-empty" file="hb-status-empty.32.png" />
+        <icon name="hb-pause.32" file="hb-pause.32.png" />
+        <icon name="hb-pause.64" file="hb-pause.64.png" />
+        <icon name="hb-start.32" file="hb-start.32.png" />
+        <icon name="hb-start.64" file="hb-start.64.png" />
+        <icon name="hb-pref" file="hb-pref.32.png" />
+        <icon name="hb-picture.32" file="hb-picture.32.png" />
+        <icon name="hb-picture.64" file="hb-picture.64.png" />
+        <icon name="hb-queue.32" file="hb-showqueue.32.png" />
+        <icon name="hb-queue.64" file="hb-showqueue.32.png" />
+        <icon name="hb-queue-delete" file="hb-remove.24.png" />
+        <icon name="hb-queue-job" file="hb-queue-job.16.png" />
+        <icon name="hb-queue-pass1" file="hb-queue-pass1.16.png" />
+        <icon name="hb-queue-pass2" file="hb-queue-pass2.16.png" />
+        <icon name="hb-queue-subtitle" file="hb-queue-subtitle.16.png" />
+        <icon name="hb-remove" file="hb-remove.48.png" />
+        <icon name="hb-source.32" file="hb-source.32.png" />
+        <icon name="hb-source.64" file="hb-source.64.png" />
+        <icon name="hb-stop.32" file="hb-stop.32.png" />
+        <icon name="hb-stop.64" file="hb-stop.64.png" />
+        <icon name="hb-edit" file="hb-edit.32.png" />
+        <icon name="hb-working0" file="hb-working0.16.png" />
+        <icon name="hb-working1" file="hb-working1.16.png" />
+        <icon name="hb-working2" file="hb-working2.16.png" />
+        <icon name="hb-working3" file="hb-working3.16.png" />
+        <icon name="hb-working4" file="hb-working4.16.png" />
+        <icon name="hb-working5" file="hb-working5.16.png" />
+    </section>
+    <plist name="internal-defaults" file="internal_defaults.xml" />
+    <plist name="standard-presets" file="standard_presets.xml" />
+    <plist name="widget-deps" file="widget.deps" />
+    <plist name="widget-reverse-deps" file="widget_reverse.deps" />
+    <string name="ghb-ui" file="ghb.ui" />
 </resources>

HandBrake-0.9.8.tar.bz2/gtk/src/settings.c -> HandBrake-0.9.9.tar.bz2/gtk/src/settings.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * settings.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * settings.c is free software.
  * 
@@ -27,153 +27,153 @@
 GObject*
 debug_get_object(GtkBuilder* b, const gchar *n)
 {
-	g_message("name %s\n", n);
-	return gtk_builder_get_object(b, n);
+    g_message("name %s\n", n);
+    return gtk_builder_get_object(b, n);
 }
 
 GValue*
 ghb_settings_new()
 {
-	return ghb_dict_value_new();
+    return ghb_dict_value_new();
 }
 
 void
 ghb_settings_set_value(
-	GValue *settings, 
-	const gchar *key, 
-	const GValue *value)
+    GValue *settings, 
+    const gchar *key, 
+    const GValue *value)
 {
-	if (key == NULL || value == NULL)
-		return;
-	ghb_dict_insert(settings, g_strdup(key), ghb_value_dup(value));
+    if (key == NULL || value == NULL)
+        return;
+    ghb_dict_insert(settings, g_strdup(key), ghb_value_dup(value));
 }
 
 void
 ghb_settings_take_value(GValue *settings, const gchar *key, GValue *value)
 {
-	ghb_dict_insert(settings, g_strdup(key), value);
+    ghb_dict_insert(settings, g_strdup(key), value);
 }
 
 void
 ghb_settings_set_string(
-	GValue *settings, 
-	const gchar *key, 
-	const gchar *sval)
+    GValue *settings, 
+    const gchar *key, 
+    const gchar *sval)
 {
-	GValue *value;
-	value = ghb_string_value_new(sval);
-	ghb_dict_insert(settings, g_strdup(key), value);
+    GValue *value;
+    value = ghb_string_value_new(sval);
+    ghb_dict_insert(settings, g_strdup(key), value);
 }
 
 void
 ghb_settings_set_double(GValue *settings, const gchar *key, gdouble dval)
 {
-	GValue *value;
-	value = ghb_double_value_new(dval);
-	ghb_dict_insert(settings, g_strdup(key), value);
+    GValue *value;
+    value = ghb_double_value_new(dval);
+    ghb_dict_insert(settings, g_strdup(key), value);
 }
 
 void
 ghb_settings_set_int64(GValue *settings, const gchar *key, gint64 ival)
 {
-	GValue *value;
-	value = ghb_int64_value_new(ival);
-	ghb_dict_insert(settings, g_strdup(key), value);
+    GValue *value;
+    value = ghb_int64_value_new(ival);
+    ghb_dict_insert(settings, g_strdup(key), value);
 }
 
 void
 ghb_settings_set_int(GValue *settings, const gchar *key, gint ival)
 {
-	GValue *value;
-	value = ghb_int64_value_new((gint64)ival);
-	ghb_dict_insert(settings, g_strdup(key), value);
+    GValue *value;
+    value = ghb_int64_value_new((gint64)ival);
+    ghb_dict_insert(settings, g_strdup(key), value);
 }
 
 void
 ghb_settings_set_boolean(GValue *settings, const gchar *key, gboolean bval)
 {
-	GValue *value;
-	value = ghb_boolean_value_new(bval);
-	ghb_dict_insert(settings, g_strdup(key), value);
+    GValue *value;
+    value = ghb_boolean_value_new(bval);
+    ghb_dict_insert(settings, g_strdup(key), value);
 }
 
 GValue*
 ghb_settings_get_value(const GValue *settings, const gchar *key)
 {
-	GValue *value;
-	value = ghb_dict_lookup(settings, key);
-	if (value == NULL)
-		g_warning("returning null (%s)", key);
-	return value;
+    GValue *value;
+    value = ghb_dict_lookup(settings, key);
+    if (value == NULL)
+        g_warning("returning null (%s)", key);
+    return value;
 }
 
 gboolean
 ghb_settings_get_boolean(const GValue *settings, const gchar *key)
 {
-	const GValue* value;
-	value = ghb_settings_get_value(settings, key);
-	if (value == NULL) return FALSE;
-	return ghb_value_boolean(value);
+    const GValue* value;
+    value = ghb_settings_get_value(settings, key);
+    if (value == NULL) return FALSE;
+    return ghb_value_boolean(value);
 }
 
 gint64
 ghb_settings_get_int64(const GValue *settings, const gchar *key)
 {
-	const GValue* value;
-	value = ghb_settings_get_value(settings, key);
-	if (value == NULL) return 0;
-	return ghb_value_int64(value);
+    const GValue* value;
+    value = ghb_settings_get_value(settings, key);
+    if (value == NULL) return 0;
+    return ghb_value_int64(value);
 }
 
 gint
 ghb_settings_get_int(const GValue *settings, const gchar *key)
 {
-	const GValue* value;
-	value = ghb_settings_get_value(settings, key);
-	if (value == NULL) return 0;
-	return ghb_value_int(value);
+    const GValue* value;
+    value = ghb_settings_get_value(settings, key);
+    if (value == NULL) return 0;
+    return ghb_value_int(value);
 }
 
 gdouble
 ghb_settings_get_double(const GValue *settings, const gchar *key)
 {
-	const GValue* value;
-	value = ghb_settings_get_value(settings, key);
-	if (value == NULL) return 0;
-	return ghb_value_double(value);
+    const GValue* value;
+    value = ghb_settings_get_value(settings, key);
+    if (value == NULL) return 0;
+    return ghb_value_double(value);
 }
 
 gchar*
 ghb_settings_get_string(const GValue *settings, const gchar *key)
 {
-	const GValue* value;
-	value = ghb_settings_get_value(settings, key);
-	if (value == NULL) return g_strdup("");
-	return ghb_value_string(value);
+    const GValue* value;
+    value = ghb_settings_get_value(settings, key);
+    if (value == NULL) return g_strdup("");
+    return ghb_value_string(value);
 }
 
 gint
 ghb_settings_combo_int(const GValue *settings, const gchar *key)
 {
-	return ghb_lookup_combo_int(key, ghb_settings_get_value(settings, key));
+    return ghb_lookup_combo_int(key, ghb_settings_get_value(settings, key));
 }
 
 gdouble
 ghb_settings_combo_double(const GValue *settings, const gchar *key)
 {
-	return ghb_lookup_combo_double(key, ghb_settings_get_value(settings, key));
+    return ghb_lookup_combo_double(key, ghb_settings_get_value(settings, key));
 }
 
 const gchar*
 ghb_settings_combo_option(const GValue *settings, const gchar *key)
 {
-	return ghb_lookup_combo_option(key, ghb_settings_get_value(settings, key));
+    return ghb_lookup_combo_option(key, ghb_settings_get_value(settings, key));
 }
 
 const gchar*
 ghb_settings_combo_string(const GValue *settings, const gchar *key)
 {
-	return ghb_lookup_combo_string(key, ghb_settings_get_value(settings, key));
+    return ghb_lookup_combo_string(key, ghb_settings_get_value(settings, key));
 }
 
 // Map widget names to setting keys
@@ -182,570 +182,524 @@
 const gchar*
 ghb_get_setting_key(GtkWidget *widget)
 {
-	const gchar *name;
-	
-	g_debug("get_setting_key ()\n");
-	if (widget == NULL) return NULL;
-	name = gtk_buildable_get_name(GTK_BUILDABLE(widget));
-		
-	if (name == NULL)
-	{
-		// Bad widget pointer?  Should never happen.
-		g_debug("Bad widget\n");
-		return NULL;
-	}
-	return name;
+    const gchar *name;
+    
+    g_debug("get_setting_key ()\n");
+    if (widget == NULL) return NULL;
+    name = gtk_buildable_get_name(GTK_BUILDABLE(widget));
+        
+    if (name == NULL)
+    {
+        // Bad widget pointer?  Should never happen.
+        g_debug("Bad widget\n");
+        return NULL;
+    }
+    return name;
 }
 
 GValue*
 ghb_widget_value(GtkWidget *widget)
 {
-	GValue *value = NULL;
-	const gchar *name;
-	GType type;
-	
-	if (widget == NULL)
-	{
-		g_debug("NULL widget\n");
-		return NULL;
-	}
-
-	type = G_OBJECT_TYPE(widget);
-	name = ghb_get_setting_key(widget);
-	g_debug("ghb_widget_value widget (%s)\n", name);
-	if (type == GTK_TYPE_ENTRY)
-	{
-		const gchar *str = gtk_entry_get_text(GTK_ENTRY(widget));
-		value = ghb_string_value_new(str);
-	}
-	else if (type == GTK_TYPE_RADIO_BUTTON)
-	{
-		g_debug("\tradio_button");
-		gboolean bval;
-		bval = gtk_toggle_button_get_inconsistent(GTK_TOGGLE_BUTTON(widget));
-		if (bval)
-		{
-			value = ghb_boolean_value_new(FALSE);
-		}
-		else
-		{
-			bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-			value = ghb_boolean_value_new(bval);
-		}
-	}
-	else if (type == GTK_TYPE_CHECK_BUTTON)
-	{
-		g_debug("\tcheck_button");
-		gboolean bval;
-		bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-		value = ghb_boolean_value_new(bval);
-	}
-	else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
-	{
-		g_debug("\ttoggle_tool_button");
-		gboolean bval;
-		bval = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget));
-		value = ghb_boolean_value_new(bval);
-	}
-	else if (type == GTK_TYPE_TOGGLE_BUTTON)
-	{
-		g_debug("\ttoggle_button");
-		gboolean bval;
-		bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-		value = ghb_boolean_value_new(bval);
-	}
-	else if (type == GTK_TYPE_TOGGLE_ACTION)
-	{
-		g_debug("\ttoggle action");
-		gboolean bval;
-		bval = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(widget));
-		value = ghb_boolean_value_new(bval);
-	}
-	else if (type == GTK_TYPE_CHECK_MENU_ITEM)
-	{
-		g_debug("\tcheck_menu_item");
-		gboolean bval;
-		bval = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
-		value = ghb_boolean_value_new(bval);
-	}
-	else if (type == GTK_TYPE_COMBO_BOX)
-	{
-		g_debug("\tcombo_box");
-		GtkTreeModel *store;
-		GtkTreeIter iter;
-		gchar *shortOpt;
-
-		store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-		if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
-		{
-			gtk_tree_model_get(store, &iter, 2, &shortOpt, -1);
-			value = ghb_string_value_new(shortOpt);
-			g_free(shortOpt);
-		}
-		else
-		{
-			value = ghb_string_value_new("");
-		}
-	}
-	else if (type == GTK_TYPE_COMBO_BOX_ENTRY)
-	{
-		GtkTreeModel *store;
-		GtkTreeIter iter;
-		gchar *shortOpt;
-
-		g_debug("\tcombo_box_entry");
-		store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-		if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
-		{
-			gtk_tree_model_get(store, &iter, 2, &shortOpt, -1);
-			value = ghb_string_value_new(shortOpt);
-			g_free(shortOpt);
-		}
-		else
-		{
-			const gchar *str;
-			str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget));
-			if (str == NULL) str = "";
-			value = ghb_string_value_new(str);
-		}
-	}
-	else if (type == GTK_TYPE_SPIN_BUTTON)
-	{
-		gint ival;
-		ival = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
-		value = ghb_int64_value_new(ival);
-	}
-	else if (type == GTK_TYPE_HSCALE)
-	{
-		gdouble dval;
-		gint digits;
-
-		digits = gtk_scale_get_digits(GTK_SCALE(widget));
-		dval = gtk_range_get_value(GTK_RANGE(widget));
-		if (digits)
-		{
-			value = ghb_double_value_new(dval);
-		}
-		else
-		{
-			value = ghb_int_value_new(dval);
-		}
-	}
-	else if (type == GTK_TYPE_SCALE_BUTTON)
-	{
-		gdouble dval;
-
-		dval = gtk_scale_button_get_value(GTK_SCALE_BUTTON(widget));
-		value = ghb_double_value_new(dval);
-	}
-	else if (type == GTK_TYPE_TEXT_VIEW)
-	{
-		GtkTextBuffer *buffer;
-		GtkTextIter start, end;
-		gchar *str;
-
-		buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(widget));
-		gtk_text_buffer_get_bounds(buffer, &start, &end);
-		str = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
-		value = ghb_string_value_new(str);
-		g_free(str);
-	}
-	else if (type == GTK_TYPE_LABEL)
-	{
-		const gchar *str;
-		str = gtk_label_get_text (GTK_LABEL(widget));
-		value = ghb_string_value_new(str);
-	}
-	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
-	{
-		gchar *str;
-		str = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
-		if (str == NULL)
-			str = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
-		value = ghb_string_value_new(str);
-		if (str != NULL)
-			g_free(str);
-	}
-	else
-	{
-		g_debug("Attempt to set unknown widget type: %s\n", name);
-		g_free(value);
-		value = NULL;
-	}
-	return value;
+    GValue *value = NULL;
+    const gchar *name;
+    GType type;
+    
+    if (widget == NULL)
+    {
+        g_debug("NULL widget\n");
+        return NULL;
+    }
+
+    type = G_OBJECT_TYPE(widget);
+    name = ghb_get_setting_key(widget);
+    g_debug("ghb_widget_value widget (%s)\n", name);
+    if (type == GTK_TYPE_ENTRY)
+    {
+        const gchar *str = gtk_entry_get_text(GTK_ENTRY(widget));
+        value = ghb_string_value_new(str);
+    }
+    else if (type == GTK_TYPE_RADIO_BUTTON)
+    {
+        g_debug("\tradio_button");
+        gboolean bval;
+        bval = gtk_toggle_button_get_inconsistent(GTK_TOGGLE_BUTTON(widget));
+        if (bval)
+        {
+            value = ghb_boolean_value_new(FALSE);
+        }
+        else
+        {
+            bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+            value = ghb_boolean_value_new(bval);
+        }
+    }
+    else if (type == GTK_TYPE_CHECK_BUTTON)
+    {
+        g_debug("\tcheck_button");
+        gboolean bval;
+        bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+        value = ghb_boolean_value_new(bval);
+    }
+    else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
+    {
+        g_debug("\ttoggle_tool_button");
+        gboolean bval;
+        bval = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget));
+        value = ghb_boolean_value_new(bval);
+    }
+    else if (type == GTK_TYPE_TOGGLE_BUTTON)
+    {
+        g_debug("\ttoggle_button");
+        gboolean bval;
+        bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+        value = ghb_boolean_value_new(bval);
+    }
+    else if (type == GTK_TYPE_TOGGLE_ACTION)
+    {
+        g_debug("\ttoggle action");
+        gboolean bval;
+        bval = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(widget));
+        value = ghb_boolean_value_new(bval);
+    }
+    else if (type == GTK_TYPE_CHECK_MENU_ITEM)
+    {
+        g_debug("\tcheck_menu_item");
+        gboolean bval;
+        bval = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+        value = ghb_boolean_value_new(bval);
+    }
+    else if (type == GTK_TYPE_COMBO_BOX)
+    {
+        g_debug("\tcombo_box");
+        GtkTreeModel *store;
+        GtkTreeIter iter;
+        gchar *shortOpt;
+
+        store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+        if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
+        {
+            gtk_tree_model_get(store, &iter, 2, &shortOpt, -1);
+            value = ghb_string_value_new(shortOpt);
+            g_free(shortOpt);
+        }
+        else if (gtk_combo_box_get_has_entry(GTK_COMBO_BOX(widget)))
+        {
+            const gchar *str;
+            str = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))));
+            if (str == NULL) str = "";
+            value = ghb_string_value_new(str);
+        }
+        else
+        {
+            value = ghb_string_value_new("");
+        }
+    }
+    else if (type == GTK_TYPE_SPIN_BUTTON)
+    {
+        gint ival;
+        ival = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
+        value = ghb_int64_value_new(ival);
+    }
+    else if (type == GTK_TYPE_HSCALE)
+    {
+        gdouble dval;
+        gint digits;
+
+        digits = gtk_scale_get_digits(GTK_SCALE(widget));
+        dval = gtk_range_get_value(GTK_RANGE(widget));
+        if (digits)
+        {
+            value = ghb_double_value_new(dval);
+        }
+        else
+        {
+            value = ghb_int_value_new(dval);
+        }
+    }
+    else if (type == GTK_TYPE_SCALE_BUTTON)
+    {
+        gdouble dval;
+
+        dval = gtk_scale_button_get_value(GTK_SCALE_BUTTON(widget));
+        value = ghb_double_value_new(dval);
+    }
+    else if (type == GTK_TYPE_TEXT_VIEW)
+    {
+        GtkTextBuffer *buffer;
+        GtkTextIter start, end;
+        gchar *str;
+
+        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(widget));
+        gtk_text_buffer_get_bounds(buffer, &start, &end);
+        str = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+        value = ghb_string_value_new(str);
+        g_free(str);
+    }
+    else if (type == GTK_TYPE_LABEL)
+    {
+        const gchar *str;
+        str = gtk_label_get_text (GTK_LABEL(widget));
+        value = ghb_string_value_new(str);
+    }
+    else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
+    {
+        gchar *str = NULL;
+        str = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
+        if (str == NULL)
+        {
+            str = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
+        }
+        value = ghb_string_value_new(str);
+        if (str != NULL)
+            g_free(str);
+    }
+    else
+    {
+        g_debug("Attempt to set unknown widget type: %s\n", name);
+        g_free(value);
+        value = NULL;
+    }
+    return value;
 }
 
 gchar*
 ghb_widget_string(GtkWidget *widget)
 {
-	GValue *value;
-	gchar *sval;
-	
-	value = ghb_widget_value(widget);
-	sval = ghb_value_string(value);
-	ghb_value_free(value);
-	return sval;
+    GValue *value;
+    gchar *sval;
+    
+    value = ghb_widget_value(widget);
+    sval = ghb_value_string(value);
+    ghb_value_free(value);
+    return sval;
 }
 
 gdouble
 ghb_widget_double(GtkWidget *widget)
 {
-	GValue *value;
-	gdouble dval;
-	
-	value = ghb_widget_value(widget);
-	dval = ghb_value_double(value);
-	ghb_value_free(value);
-	return dval;
+    GValue *value;
+    gdouble dval;
+    
+    value = ghb_widget_value(widget);
+    dval = ghb_value_double(value);
+    ghb_value_free(value);
+    return dval;
 }
 
 gint64
 ghb_widget_int64(GtkWidget *widget)
 {
-	GValue *value;
-	gint64 ival;
-	
-	value = ghb_widget_value(widget);
-	ival = ghb_value_int64(value);
-	ghb_value_free(value);
-	return ival;
+    GValue *value;
+    gint64 ival;
+    
+    value = ghb_widget_value(widget);
+    ival = ghb_value_int64(value);
+    ghb_value_free(value);
+    return ival;
 }
 
 gint
 ghb_widget_int(GtkWidget *widget)
 {
-	GValue *value;
-	gint ival;
-	
-	value = ghb_widget_value(widget);
-	ival = (gint)ghb_value_int64(value);
-	ghb_value_free(value);
-	return ival;
+    GValue *value;
+    gint ival;
+    
+    value = ghb_widget_value(widget);
+    ival = (gint)ghb_value_int64(value);
+    ghb_value_free(value);
+    return ival;
 }
 
 gint
 ghb_widget_boolean(GtkWidget *widget)
 {
-	GValue *value;
-	gboolean bval;
-	
-	value = ghb_widget_value(widget);
-	bval = ghb_value_boolean(value);
-	ghb_value_free(value);
-	return bval;
+    GValue *value;
+    gboolean bval;
+    
+    value = ghb_widget_value(widget);
+    bval = ghb_value_boolean(value);
+    ghb_value_free(value);
+    return bval;
 }
 
 static void check_radio_consistency(GValue *settings, GtkWidget *widget)
 {
-	const gchar *key = NULL;
-	GValue *value;
-
-	if (widget == NULL) return;
-	if (G_OBJECT_TYPE(widget) == GTK_TYPE_RADIO_BUTTON)
-	{
-		// Find corresponding setting
-		key = ghb_get_setting_key(widget);
-		if (key == NULL) return;
-		value = ghb_widget_value(widget);
-		if (value == NULL) return;
-		if (ghb_value_boolean(value) == ghb_settings_get_boolean(settings, key))
-		{
-			gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), FALSE);
-		}
-	}
+    const gchar *key = NULL;
+    GValue *value;
+
+    if (widget == NULL) return;
+    if (G_OBJECT_TYPE(widget) == GTK_TYPE_RADIO_BUTTON)
+    {
+        // Find corresponding setting
+        key = ghb_get_setting_key(widget);
+        if (key == NULL) return;
+        value = ghb_widget_value(widget);
+        if (value == NULL) return;
+        if (ghb_value_boolean(value) == ghb_settings_get_boolean(settings, key))
+        {
+            gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), FALSE);
+        }
+    }
 }
 
 void
 ghb_widget_to_setting(GValue *settings, GtkWidget *widget)
 {
-	const gchar *key = NULL;
-	GValue *value;
-	
-	if (widget == NULL) return;
-	g_debug("ghb_widget_to_setting");
-	// Find corresponding setting
-	key = ghb_get_setting_key(widget);
-	if (key == NULL) return;
-	value = ghb_widget_value(widget);
-	if (value != NULL)
-	{
-		check_radio_consistency(settings, widget);
-		ghb_settings_take_value(settings, key, value);
-	}
-	else
-	{
-		g_debug("No value found for %s\n", key);
-	}
+    const gchar *key = NULL;
+    GValue *value;
+    
+    if (widget == NULL) return;
+    g_debug("ghb_widget_to_setting");
+    // Find corresponding setting
+    key = ghb_get_setting_key(widget);
+    if (key == NULL) return;
+    value = ghb_widget_value(widget);
+    if (value != NULL)
+    {
+        check_radio_consistency(settings, widget);
+        ghb_settings_take_value(settings, key, value);
+    }
+    else
+    {
+        g_debug("No value found for %s\n", key);
+    }
 }
 
 static void
 update_widget(GtkWidget *widget, const GValue *value)
 {
-	GType type;
-	gchar *str;
-	gint ival;
-	gdouble dval;
-
-	g_debug("update_widget");
-	type = G_VALUE_TYPE(value);
-	if (type == ghb_array_get_type() || type == ghb_dict_get_type())
-		return;
-	if (value == NULL) return;
-	str = ghb_value_string(value);
-	ival = ghb_value_int(value);
-	dval = ghb_value_double(value);
-	type = G_OBJECT_TYPE(widget);
-	if (type == GTK_TYPE_ENTRY)
-	{
-		g_debug("entry");
-		gtk_entry_set_text((GtkEntry*)widget, str);
-	}
-	else if (type == GTK_TYPE_RADIO_BUTTON)
-	{
-		g_debug("radio button");
-		int cur_val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-		if (cur_val && !ival)
-		{
-			gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), TRUE);
-		}
-		else
-		{
-			gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), FALSE);
-			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
-		}
-	}
-	else if (type == GTK_TYPE_CHECK_BUTTON)
-	{
-		g_debug("check button");
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
-	}
-	else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
-	{
-		g_debug("toggle button");
-		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), ival);
-	}
-	else if (type == GTK_TYPE_TOGGLE_BUTTON)
-	{
-		g_debug("toggle button");
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
-	}
-	else if (type == GTK_TYPE_TOGGLE_ACTION)
-	{
-		g_debug("toggle action");
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(widget), ival);
-	}
-	else if (type == GTK_TYPE_CHECK_MENU_ITEM)
-	{
-		g_debug("check menu item");
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), ival);
-	}
-	else if (type == GTK_TYPE_COMBO_BOX)
-	{
-		GtkTreeModel *store;
-		GtkTreeIter iter;
-		gchar *shortOpt;
-		gdouble ivalue;
-		gboolean foundit = FALSE;
-
-		g_debug("combo (%s)", str);
-		store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-		if (gtk_tree_model_get_iter_first (store, &iter))
-		{
-			do
-			{
-				gtk_tree_model_get(store, &iter, 2, &shortOpt, -1);
-				if (strcmp(shortOpt, str) == 0)
-				{
-					gtk_combo_box_set_active_iter (
-						GTK_COMBO_BOX(widget), &iter);
-					g_free(shortOpt);
-					foundit = TRUE;
-					break;
-				}
-				g_free(shortOpt);
-			} while (gtk_tree_model_iter_next (store, &iter));
-		}
-		if (!foundit && gtk_tree_model_get_iter_first (store, &iter))
-		{
-			do
-			{
-				gtk_tree_model_get(store, &iter, 3, &ivalue, -1);
-				if ((gint)ivalue == ival || ivalue == dval)
-				{
-					gtk_combo_box_set_active_iter (
-						GTK_COMBO_BOX(widget), &iter);
-					foundit = TRUE;
-					break;
-				}
-			} while (gtk_tree_model_iter_next (store, &iter));
-		}
-		if (!foundit)
-		{
-			gtk_combo_box_set_active (GTK_COMBO_BOX(widget), 0);
-		}
-	}
-	else if (type == GTK_TYPE_COMBO_BOX_ENTRY)
-	{
-		GtkTreeModel *store;
-		GtkTreeIter iter;
-		gchar *shortOpt;
-		gdouble ivalue;
-		gboolean foundit = FALSE;
-
-		g_debug("GTK_COMBO_BOX_ENTRY");
-		store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-		if (gtk_tree_model_get_iter_first (store, &iter))
-		{
-			do
-			{
-				gtk_tree_model_get(store, &iter, 2, &shortOpt, -1);
-				if (strcmp(shortOpt, str) == 0)
-				{
-					gtk_combo_box_set_active_iter (
-						GTK_COMBO_BOX(widget), &iter);
-					g_free(shortOpt);
-					foundit = TRUE;
-					break;
-				}
-				g_free(shortOpt);
-			} while (gtk_tree_model_iter_next (store, &iter));
-		}
-		if (!foundit && gtk_tree_model_get_iter_first (store, &iter))
-		{
-			do
-			{
-				gtk_tree_model_get(store, &iter, 3, &ivalue, -1);
-				if ((gint)ivalue == ival || ivalue == dval)
-				{
-					gtk_combo_box_set_active_iter (
-						GTK_COMBO_BOX(widget), &iter);
-					foundit = TRUE;
-					break;
-				}
-			} while (gtk_tree_model_iter_next (store, &iter));
-		}
-		if (!foundit)
-		{
-			GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)));
-			if (entry)
-			{
-				gtk_entry_set_text (entry, str);
-			}
-		}
-	}
-	else if (type == GTK_TYPE_SPIN_BUTTON)
-	{
-		g_debug("spin (%s)", str);
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), dval);
-	}
-	else if (type == GTK_TYPE_HSCALE)
-	{
-		g_debug("hscale");
-		gtk_range_set_value(GTK_RANGE(widget), dval);
-	}
-	else if (type == GTK_TYPE_SCALE_BUTTON)
-	{
-		g_debug("scale_button");
-		gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), dval);
-	}
-	else if (type == GTK_TYPE_TEXT_VIEW)
-	{
-		g_debug("textview (%s)", str);
-		GtkTextBuffer *buffer = gtk_text_view_get_buffer(
-												GTK_TEXT_VIEW(widget));
-		gtk_text_buffer_set_text (buffer, str, -1);
-	}
-	else if (type == GTK_TYPE_LABEL)
-	{
-		gtk_label_set_markup (GTK_LABEL(widget), str);
-	}
-	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
-	{
-		GtkFileChooserAction act;
-		act = gtk_file_chooser_get_action(GTK_FILE_CHOOSER(widget));
-		if (str[0] == 0)
-		{
-			// Do nothing
-			;
-		}
-		else if (act == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
-			act == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-		{
-			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(widget), str);
-		}
-		else if (act == GTK_FILE_CHOOSER_ACTION_SAVE)
-		{
-			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
-		}
-		else
-		{
-			if (g_file_test(str, G_FILE_TEST_IS_DIR))
-			{
-				gtk_file_chooser_set_current_folder(
-					GTK_FILE_CHOOSER(widget), str);
-			}
-			else if (g_file_test(str, G_FILE_TEST_EXISTS))
-			{
-				gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
-			}
-			else
-			{
-				gchar *dirname;
-
-				dirname = g_path_get_dirname(str);
-				gtk_file_chooser_set_current_folder(
-					GTK_FILE_CHOOSER(widget), dirname);
-				g_free(dirname);
-			}
-		}
-	}
-	else
-	{
-		g_debug("Attempt to set unknown widget type");
-	}
-	g_free(str);
+    GType type;
+    gchar *str;
+    gint ival;
+    gdouble dval;
+
+    g_debug("update_widget");
+    type = G_VALUE_TYPE(value);
+    if (type == ghb_array_get_type() || type == ghb_dict_get_type())
+        return;
+    if (value == NULL) return;
+    str = ghb_value_string(value);
+    ival = ghb_value_int(value);
+    dval = ghb_value_double(value);
+    type = G_OBJECT_TYPE(widget);
+    if (type == GTK_TYPE_ENTRY)
+    {
+        g_debug("entry");
+        gtk_entry_set_text((GtkEntry*)widget, str);
+    }
+    else if (type == GTK_TYPE_RADIO_BUTTON)
+    {
+        g_debug("radio button");
+        int cur_val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+        if (cur_val && !ival)
+        {
+            gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), TRUE);
+        }
+        else
+        {
+            gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), FALSE);
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
+        }
+    }
+    else if (type == GTK_TYPE_CHECK_BUTTON)
+    {
+        g_debug("check button");
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
+    }
+    else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
+    {
+        g_debug("toggle button");
+        gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), ival);
+    }
+    else if (type == GTK_TYPE_TOGGLE_BUTTON)
+    {
+        g_debug("toggle button");
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
+    }
+    else if (type == GTK_TYPE_TOGGLE_ACTION)
+    {
+        g_debug("toggle action");
+        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(widget), ival);
+    }
+    else if (type == GTK_TYPE_CHECK_MENU_ITEM)
+    {
+        g_debug("check menu item");
+        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), ival);
+    }
+    else if (type == GTK_TYPE_COMBO_BOX)
+    {
+        GtkTreeModel *store;
+        GtkTreeIter iter;
+        gchar *shortOpt;
+        gdouble ivalue;
+        gboolean foundit = FALSE;
+
+        g_debug("combo (%s)", str);
+        store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+        if (gtk_tree_model_get_iter_first (store, &iter))
+        {
+            do
+            {
+                gtk_tree_model_get(store, &iter, 2, &shortOpt, -1);
+                if (strcasecmp(shortOpt, str) == 0)
+                {
+                    gtk_combo_box_set_active_iter (
+                        GTK_COMBO_BOX(widget), &iter);
+                    g_free(shortOpt);
+                    foundit = TRUE;
+                    break;
+                }
+                g_free(shortOpt);
+            } while (gtk_tree_model_iter_next (store, &iter));
+        }
+        if (!foundit && gtk_tree_model_get_iter_first (store, &iter))
+        {
+            do
+            {
+                gtk_tree_model_get(store, &iter, 3, &ivalue, -1);
+                if ((gint)ivalue == ival || ivalue == dval)
+                {
+                    gtk_combo_box_set_active_iter (
+                        GTK_COMBO_BOX(widget), &iter);
+                    foundit = TRUE;
+                    break;
+                }
+            } while (gtk_tree_model_iter_next (store, &iter));
+        }
+        if (!foundit)
+        {
+            if (gtk_combo_box_get_has_entry(GTK_COMBO_BOX(widget)))
+            {
+                GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)));
+                if (entry)
+                {
+                    gtk_entry_set_text (entry, str);
+                }
+                else
+                {
+                    gtk_combo_box_set_active (GTK_COMBO_BOX(widget), 0);
+                }
+            }
+            else
+            {
+                gtk_combo_box_set_active (GTK_COMBO_BOX(widget), 0);
+            }
+        }
+    }
+    else if (type == GTK_TYPE_SPIN_BUTTON)
+    {
+        g_debug("spin (%s)", str);
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), dval);
+    }
+    else if (type == GTK_TYPE_HSCALE)
+    {
+        g_debug("hscale");
+        gtk_range_set_value(GTK_RANGE(widget), dval);
+    }
+    else if (type == GTK_TYPE_SCALE_BUTTON)
+    {
+        g_debug("scale_button");
+        gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), dval);
+    }
+    else if (type == GTK_TYPE_TEXT_VIEW)
+    {
+        g_debug("textview (%s)", str);
+        GtkTextBuffer *buffer = gtk_text_view_get_buffer(
+                                                GTK_TEXT_VIEW(widget));
+        gtk_text_buffer_set_text (buffer, str, -1);
+    }
+    else if (type == GTK_TYPE_LABEL)
+    {
+        gtk_label_set_markup (GTK_LABEL(widget), str);
+    }
+    else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
+    {
+        GtkFileChooserAction act;
+        act = gtk_file_chooser_get_action(GTK_FILE_CHOOSER(widget));
+
+        if (str[0] == 0)
+        {
+            // Do nothing
+            ;
+        }
+        else if (act == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+                 act == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+        {
+            gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
+        }
+        else if (act == GTK_FILE_CHOOSER_ACTION_SAVE)
+        {
+            gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
+        }
+        else
+        {
+            if (g_file_test(str, G_FILE_TEST_IS_DIR))
+            {
+                gtk_file_chooser_set_current_folder(
+                    GTK_FILE_CHOOSER(widget), str);
+            }
+            else if (g_file_test(str, G_FILE_TEST_EXISTS))
+            {
+                gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
+            }
+            else
+            {
+                gchar *dirname;
+
+                dirname = g_path_get_dirname(str);
+                gtk_file_chooser_set_current_folder(
+                    GTK_FILE_CHOOSER(widget), dirname);
+                g_free(dirname);
+            }
+        }
+    }
+    else
+    {
+        g_debug("Attempt to set unknown widget type");
+    }
+    g_free(str);
 }
 
 int
 ghb_ui_update_from_settings(GtkBuilder *builder, const gchar *name, const GValue *settings)
 {
-	GObject *object;
-	GValue * value;
-
-	g_debug("ghb_ui_update_from_settings() %s", name);
-	if (name == NULL)
-		return 0;
-	value = ghb_settings_get_value(settings, name);
-	if (value == NULL)
-		return 0;
-	object = GHB_OBJECT(builder, name);
-	if (object == NULL)
-	{
-		g_debug("Failed to find widget for key: %s\n", name);
-		return -1;
-	}
-	update_widget((GtkWidget*)object, value);
-	return 0;
+    GObject *object;
+    GValue * value;
+
+    g_debug("ghb_ui_update_from_settings() %s", name);
+    if (name == NULL)
+        return 0;
+    value = ghb_settings_get_value(settings, name);
+    if (value == NULL)
+        return 0;
+    object = GHB_OBJECT(builder, name);
+    if (object == NULL)
+    {
+        g_debug("Failed to find widget for key: %s\n", name);
+        return -1;
+    }
+    update_widget((GtkWidget*)object, value);
+    return 0;
 }
 
 int
 ghb_ui_update(signal_user_data_t *ud, const gchar *name, const GValue *value)
 {
-	GObject *object;
-
-	g_debug("ghb_ui_update() %s", name);
-	if (name == NULL || value == NULL)
-		return 0;
-	object = GHB_OBJECT(ud->builder, name);
-	if (object == NULL)
-	{
-		g_debug("Failed to find widget for key: %s\n", name);
-		return -1;
-	}
-	update_widget((GtkWidget*)object, value);
-	// Its possible the value hasn't changed. Since settings are only
-	// updated when the value changes, I'm initializing settings here as well.
-	ghb_widget_to_setting(ud->settings, (GtkWidget*)object);
-	return 0;
+    GObject *object;
+
+    g_debug("ghb_ui_update() %s", name);
+    if (name == NULL || value == NULL)
+        return 0;
+    object = GHB_OBJECT(ud->builder, name);
+    if (object == NULL)
+    {
+        g_debug("Failed to find widget for key: %s\n", name);
+        return -1;
+    }
+    update_widget((GtkWidget*)object, value);
+    // Its possible the value hasn't changed. Since settings are only
+    // updated when the value changes, I'm initializing settings here as well.
+    ghb_widget_to_setting(ud->settings, (GtkWidget*)object);
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/settings.h -> HandBrake-0.9.9.tar.bz2/gtk/src/settings.h Changed

@@ -21,79 +21,79 @@
 #include <libappindicator/app-indicator.h>
 #endif
 
-#define GHB_WIDGET(b,n)	GTK_WIDGET(gtk_builder_get_object ((b), (n)))
-//#define GHB_WIDGET(b,n)	GTK_WIDGET(debug_get_object((b), (n)))
-#define GHB_ACTION(b,n)	GTK_ACTION(gtk_builder_get_object ((b), (n)))
-#define GHB_OBJECT(b,n)	gtk_builder_get_object ((b), (n))
+#define GHB_WIDGET(b,n) GTK_WIDGET(gtk_builder_get_object ((b), (n)))
+//#define GHB_WIDGET(b,n)   GTK_WIDGET(debug_get_object((b), (n)))
+#define GHB_ACTION(b,n) GTK_ACTION(gtk_builder_get_object ((b), (n)))
+#define GHB_OBJECT(b,n) gtk_builder_get_object ((b), (n))
 
 GObject* debug_get_object(GtkBuilder *b, const gchar *n);
 
 enum
 {
-	GHB_STATE_IDLE 		= 0x00,
-	GHB_STATE_SCANNING 	= 0x02,
-	GHB_STATE_SCANDONE 	= 0x04,
-	GHB_STATE_WORKING 	= 0x08,
-	GHB_STATE_WORKDONE 	= 0x10,
-	GHB_STATE_PAUSED 	= 0x20,
-	GHB_STATE_MUXING 	= 0x40,
-	GHB_STATE_SEARCHING	= 0x80,
+    GHB_STATE_IDLE      = 0x00,
+    GHB_STATE_SCANNING  = 0x02,
+    GHB_STATE_SCANDONE  = 0x04,
+    GHB_STATE_WORKING   = 0x08,
+    GHB_STATE_WORKDONE  = 0x10,
+    GHB_STATE_PAUSED    = 0x20,
+    GHB_STATE_MUXING    = 0x40,
+    GHB_STATE_SEARCHING = 0x80,
 };
 
 enum
 {
-	GHB_CANCEL_NONE,
-	GHB_CANCEL_ALL,
-	GHB_CANCEL_CURRENT,
-	GHB_CANCEL_FINISH
+    GHB_CANCEL_NONE,
+    GHB_CANCEL_ALL,
+    GHB_CANCEL_CURRENT,
+    GHB_CANCEL_FINISH
 };
 
 typedef struct preview_s preview_t;
 
 typedef struct
 {
-	gchar *current_dvd_device;
-	gboolean debug;
-	gboolean dont_clear_presets;
-	gboolean scale_busy;
-	gint cancel_encode;
-	GtkBuilder *builder;
-	GValue *settings;
-	GValue *queue;
-	GValue *current_job;
-	GIOChannel *activity_log;
-	GIOChannel *job_activity_log;
-	preview_t *preview;
-	gchar *appcast;
-	gint appcast_len;
-	GdkVisibilityState hb_visibility;
+    gchar *current_dvd_device;
+    gboolean debug;
+    gboolean dont_clear_presets;
+    gboolean scale_busy;
+    gint cancel_encode;
+    GtkBuilder *builder;
+    GValue *settings;
+    GValue *queue;
+    GValue *current_job;
+    GIOChannel *activity_log;
+    GIOChannel *job_activity_log;
+    preview_t *preview;
+    gchar *appcast;
+    gint appcast_len;
+    GdkVisibilityState hb_visibility;
 #if defined(_USE_APP_IND)
-	AppIndicator *ai;
+    AppIndicator *ai;
 #endif
 } signal_user_data_t;
 
 enum
 {
-	GHB_QUEUE_PENDING,
-	GHB_QUEUE_RUNNING,
-	GHB_QUEUE_CANCELED,
-	GHB_QUEUE_DONE,
+    GHB_QUEUE_PENDING,
+    GHB_QUEUE_RUNNING,
+    GHB_QUEUE_CANCELED,
+    GHB_QUEUE_DONE,
 };
 
 GValue* ghb_settings_new(void);
 void ghb_settings_take_value(
-	GValue *settings, const gchar *key, GValue *value);
+    GValue *settings, const gchar *key, GValue *value);
 void ghb_settings_set_value(
-	GValue *settings, const gchar *key, const GValue *value);
+    GValue *settings, const gchar *key, const GValue *value);
 void ghb_settings_set_string(
-	GValue *settings, const gchar *key, const gchar *sval);
+    GValue *settings, const gchar *key, const gchar *sval);
 void ghb_settings_set_double(GValue *settings, const gchar *key, gdouble dval);
 void ghb_settings_set_int64(GValue *settings, const gchar *key, gint64 ival);
 void ghb_settings_set_int(GValue *settings, const gchar *key, gint ival);
 void ghb_settings_set_boolean(
-	GValue *settings, const gchar *key, gboolean bval);
+    GValue *settings, const gchar *key, gboolean bval);
 void ghb_settings_copy(
-	GValue *settings, const gchar *key, const GValue *value);
+    GValue *settings, const gchar *key, const GValue *value);
 GValue* ghb_settings_get_value(const GValue *settings, const gchar *key);
 gboolean ghb_settings_get_boolean(const GValue *settings, const gchar *key);
 gint64 ghb_settings_get_int64(const GValue *settings, const gchar *key);
@@ -114,9 +114,9 @@
 
 void ghb_widget_to_setting(GValue *settings, GtkWidget *widget);
 int ghb_ui_update(
-	signal_user_data_t *ud, const gchar *name, const GValue *value);
+    signal_user_data_t *ud, const gchar *name, const GValue *value);
 int ghb_ui_update_from_settings(
-	GtkBuilder *builder, const gchar *name, const GValue *settings);
+    GtkBuilder *builder, const gchar *name, const GValue *settings);
 const gchar* ghb_get_setting_key(GtkWidget *widget);
 
 #endif // _SETTINGS_H_

HandBrake-0.9.8.tar.bz2/gtk/src/standard_presets.xml -> HandBrake-0.9.9.tar.bz2/gtk/src/standard_presets.xml Changed

@@ -6,6 +6,18 @@
 		<key>ChildrenArray</key>
 		<array>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -21,6 +33,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 					<dict>
 						<key>AudioBitrate</key>
@@ -35,6 +49,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -45,26 +61,44 @@
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>0</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>576</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -74,7 +108,7 @@
 				<key>PictureWidth</key>
 				<integer>720</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs</string>
+				<string>HandBrake's settings for compatibility with all Apple devices (including the iPod 6G and later). Includes Dolby Digital audio for surround sound.</string>
 				<key>PresetName</key>
 				<string>Universal</string>
 				<key>Subtitles</key>
@@ -85,28 +119,54 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
 				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>Same as source</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
-				<string>vfr</string>
+				<string>pfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
 				<real>20</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.0</string>
+				<key>h264Profile</key>
+				<string>baseline</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>fast</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -122,6 +182,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -130,6 +192,12 @@
 				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
+				<key>Mp4LargeFile</key>
+				<integer>0</integer>
 				<key>Mp4iPodCompatible</key>
 				<integer>1</integer>
 				<key>PictureAutoCrop</key>
@@ -138,18 +206,32 @@
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>240</integer>
 				<key>PictureKeepRatio</key>
 				<integer>1</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>0</integer>
 				<key>PictureRightCrop</key>
@@ -159,7 +241,7 @@
 				<key>PictureWidth</key>
 				<integer>320</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size.</string>
+				<string>HandBrake's settings for playback on the iPod with Video (all generations).</string>
 				<key>PresetName</key>
 				<string>iPod</string>
 				<key>Subtitles</key>
@@ -170,31 +252,59 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>700</string>
+				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>Same as source</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
-				<string>vfr</string>
+				<string>pfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>22</real>
 				<key>VideoQualityType</key>
-				<integer>1</integer>
+				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>1.3</string>
+				<key>h264Profile</key>
+				<string>baseline</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
 						<key>AudioBitrate</key>
-						<string>128</string>
+						<string>160</string>
 						<key>AudioEncoder</key>
 						<string>AAC (faac)</string>
 						<key>AudioMixdown</key>
@@ -205,6 +315,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -213,6 +325,12 @@
 				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
+				<key>Mp4LargeFile</key>
+				<integer>1</integer>
 				<key>Mp4iPodCompatible</key>
 				<integer>0</integer>
 				<key>PictureAutoCrop</key>
@@ -221,30 +339,44 @@
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>640</integer>
 				<key>PictureKeepRatio</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
-				<integer>0</integer>
+				<integer>2</integer>
 				<key>PictureRightCrop</key>
 				<integer>0</integer>
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>480</integer>
+				<integer>960</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's settings for all iPhones and iPod Touches going back to the original iPhone 2G.</string>
+				<string>HandBrake's settings for handheld iOS devices (iPhone 4, iPod touch 3G and later).</string>
 				<key>PresetName</key>
-				<string>iPhone &amp; iPod Touch</string>
+				<string>iPhone &amp; iPod touch</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -253,28 +385,54 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>960</string>
+				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>Same as source</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
-				<string>vfr</string>
+				<string>pfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
-				<real>20</real>
+				<real>22</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.1</string>
+				<key>h264Profile</key>
+				<string>high</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -290,6 +448,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -300,26 +460,44 @@
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>1</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>720</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -327,11 +505,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>960</integer>
+				<integer>1280</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's preset for the iPhone 4 is optimized for viewing on its 960x480 display.</string>
+				<string>HandBrake's settings for playback on the iPad (all generations).</string>
 				<key>PresetName</key>
-				<string>iPhone 4</string>
+				<string>iPad</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -340,14 +518,12 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
 				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>29.97 (NTSC Video)</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
 				<string>pfr</string>
 				<key>VideoGrayScale</key>
@@ -356,12 +532,40 @@
 				<real>20</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.1</string>
+				<key>h264Profile</key>
+				<string>high</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
 				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -377,6 +581,24 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
+					</dict>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AC3 Passthru</string>
+						<key>AudioMixdown</key>
+						<string>None</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -387,26 +609,44 @@
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>1</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>720</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -414,11 +654,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>1280</integer>
+				<integer>960</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's preset for the iPad (all generations) is optimized for a good balance between quality and filesize.</string>
+				<string>HandBrake's settings for the original AppleTV. Includes Dolby Digital audio for surround sound. Also compatible with iOS devices released since 2009.</string>
 				<key>PresetName</key>
-				<string>iPad</string>
+				<string>AppleTV</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -427,14 +667,12 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
 				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>29.97 (NTSC Video)</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
 				<string>pfr</string>
 				<key>VideoGrayScale</key>
@@ -443,12 +681,40 @@
 				<real>20</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.1</string>
+				<key>h264Profile</key>
+				<string>high</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
 				<string></string>
+				<key>x264OptionExtra</key>
+				<string>qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -464,6 +730,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 					<dict>
 						<key>AudioBitrate</key>
@@ -478,6 +746,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -488,26 +758,44 @@
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>1</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>720</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -515,11 +803,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>960</integer>
+				<integer>1280</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's settings for the AppleTV and 2009's iPhone and iPod Touch lineup. Provides a good balance between quality and file size, and pushes the devices to their limits. Includes Dolby Digital 5.1 AC3 sound for the AppleTV.</string>
+				<string>HandBrake's settings for the second-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV.</string>
 				<key>PresetName</key>
-				<string>AppleTV</string>
+				<string>AppleTV 2</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -528,28 +816,54 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
 				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>Same as source</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
-				<string>vfr</string>
+				<string>pfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
 				<real>20</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.1</string>
+				<key>h264Profile</key>
+				<string>high</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -565,6 +879,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 					<dict>
 						<key>AudioBitrate</key>
@@ -579,6 +895,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -589,26 +907,44 @@
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>1</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>3</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>1080</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -616,11 +952,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>1280</integer>
+				<integer>1920</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's preset for the Apple TV (2nd gen) is optimized for viewing on its 1280x720 display.</string>
+				<string>HandBrake's settings for the third-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV. May stutter on the second-generation AppleTV.</string>
 				<key>PresetName</key>
-				<string>AppleTV 2</string>
+				<string>AppleTV 3</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -629,14 +965,12 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
 				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>29.97 (NTSC Video)</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
 				<string>pfr</string>
 				<key>VideoGrayScale</key>
@@ -645,17 +979,45 @@
 				<real>20</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>4.0</string>
+				<key>h264Profile</key>
+				<string>high</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
 				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
 						<key>AudioBitrate</key>
-						<string>160</string>
+						<string>128</string>
 						<key>AudioEncoder</key>
 						<string>AAC (faac)</string>
 						<key>AudioMixdown</key>
@@ -666,32 +1028,24 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
-					</dict>
-					<dict>
-						<key>AudioBitrate</key>
-						<string>160</string>
-						<key>AudioEncoder</key>
-						<string>AC3 Passthru</string>
-						<key>AudioMixdown</key>
-						<string>None</string>
-						<key>AudioSamplerate</key>
-						<string>Auto</string>
-						<key>AudioTrack</key>
-						<integer>1</integer>
-						<key>AudioTrackDRCSlider</key>
+						<key>AudioTrackGainSlider</key>
 						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>Default</key>
 				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
-				<integer>1</integer>
+				<integer>0</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
@@ -699,17 +1053,25 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDecomb</key>
-				<integer>3</integer>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
 				<key>PictureDecombDeinterlace</key>
 				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>576</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
@@ -723,11 +1085,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>1920</integer>
+				<integer>720</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's preset for the Apple TV (3rd gen) is optimized for up to 1080p playback.</string>
+				<string>HandBrake's settings for midrange devices running Android 2.3 or later.</string>
 				<key>PresetName</key>
-				<string>AppleTV 3</string>
+				<string>Android</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -747,102 +1109,43 @@
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
-				<real>20</real>
+				<real>22</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.0</string>
+				<key>h264Profile</key>
+				<string>main</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>b-adapt=2</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
-				<key>AudioList</key>
-				<array>
-					<dict>
-						<key>AudioBitrate</key>
-						<string>128</string>
-						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
-						<key>AudioMixdown</key>
-						<string>Dolby Pro Logic II</string>
-						<key>AudioSamplerate</key>
-						<string>Auto</string>
-						<key>AudioTrack</key>
-						<integer>1</integer>
-						<key>AudioTrackDRCSlider</key>
-						<real>0.0</real>
-					</dict>
-				</array>
-				<key>ChapterMarkers</key>
-				<integer>0</integer>
-				<key>Default</key>
-				<integer>0</integer>
-				<key>FileFormat</key>
-				<string>MP4 file</string>
-				<key>Mp4LargeFile</key>
-				<integer>0</integer>
-				<key>Mp4iPodCompatible</key>
-				<integer>0</integer>
-				<key>PictureAutoCrop</key>
+				<key>AudioAllowAACPass</key>
 				<integer>1</integer>
-				<key>PictureBottomCrop</key>
-				<integer>0</integer>
-				<key>PictureDeblock</key>
-				<integer>0</integer>
-				<key>PictureDeinterlace</key>
-				<integer>0</integer>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
-				<key>PictureDetelecine</key>
-				<integer>0</integer>
-				<key>PictureHeight</key>
-				<integer>0</integer>
-				<key>PictureKeepRatio</key>
+				<key>AudioAllowAC3Pass</key>
 				<integer>1</integer>
-				<key>PictureLeftCrop</key>
-				<integer>0</integer>
-				<key>PicturePAR</key>
-				<integer>0</integer>
-				<key>PictureRightCrop</key>
-				<integer>0</integer>
-				<key>PictureTopCrop</key>
-				<integer>0</integer>
-				<key>PictureWidth</key>
-				<integer>480</integer>
-				<key>PresetDescription</key>
-				<string>HandBrake's settings for Mid-range Android 2.3 or better devices.</string>
-				<key>PresetName</key>
-				<string>Android Mid</string>
-				<key>Subtitles</key>
-				<string>None</string>
-				<key>Type</key>
-				<integer>0</integer>
-				<key>UsesPictureFilters</key>
+				<key>AudioAllowDTSHDPass</key>
 				<integer>1</integer>
-				<key>UsesPictureSettings</key>
+				<key>AudioAllowDTSPass</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
-				<key>VideoAvgBitrate</key>
-				<string>960</string>
-				<key>VideoEncoder</key>
-				<string>H.264 (x264)</string>
-				<key>VideoFramerate</key>
-				<string>29.97 (NTSC Video)</string>
-				<key>VideoFramerateMode</key>
-				<string>pfr</string>
-				<key>VideoGrayScale</key>
-				<integer>0</integer>
-				<key>VideoQualitySlider</key>
-				<real>22</real>
-				<key>VideoQualityType</key>
-				<integer>2</integer>
-				<key>VideoTwoPass</key>
-				<integer>0</integer>
-				<key>x264Option</key>
-				<string>cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0</string>
-			</dict>
-			<dict>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -858,6 +1161,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -868,26 +1173,44 @@
 				<string>MP4 file</string>
 				<key>Folder</key>
 				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>0</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
-				<integer>0</integer>
+				<integer>720</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -895,11 +1218,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>720</integer>
+				<integer>1280</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's preset for the Higher end Anroid 2.3 or better devices.</string>
+				<string>HandBrake's preset for tablets running Android 2.3 or later.</string>
 				<key>PresetName</key>
-				<string>Android High</string>
+				<string>Android Tablet</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -908,14 +1231,12 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
 				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>29.97 (NTSC Video)</string>
+				<string>30</string>
 				<key>VideoFramerateMode</key>
 				<string>pfr</string>
 				<key>VideoGrayScale</key>
@@ -924,10 +1245,26 @@
 				<real>22</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>3.1</string>
+				<key>h264Profile</key>
+				<string>main</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>weightp=0:cabac=0</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 		</array>
 		<key>Default</key>
@@ -935,7 +1272,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2012041101</integer>
+		<integer>2013030401</integer>
 		<key>PresetName</key>
 		<string>Devices</string>
 		<key>Type</key>
@@ -945,6 +1282,18 @@
 		<key>ChildrenArray</key>
 		<array>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -960,6 +1309,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -968,26 +1319,48 @@
 				<integer>1</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
+				<key>Mp4LargeFile</key>
+				<integer>0</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>PictureRightCrop</key>
 				<integer>0</integer>
 				<key>PictureTopCrop</key>
@@ -1005,11 +1378,9 @@
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>2</integer>
-				<key>VFR</key>
-				<integer>0</integer>
+				<integer>1</integer>
 				<key>VideoAvgBitrate</key>
-				<string>1500</string>
+				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
@@ -1026,10 +1397,36 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
+				<key>h264Level</key>
+				<string>4.0</string>
+				<key>h264Profile</key>
+				<string>main</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
-				<string>ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0</string>
+				<string></string>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>veryfast</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
 			</dict>
 			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
 				<key>AudioList</key>
 				<array>
 					<dict>
@@ -1045,6 +1442,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 					<dict>
 						<key>AudioBitrate</key>
@@ -1059,6 +1458,8 @@
 						<integer>1</integer>
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
@@ -1067,8 +1468,14 @@
 				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
 				<key>Mp4LargeFile</key>
 				<integer>1</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
@@ -1077,20 +1484,30 @@
 				<integer>0</integer>
 				<key>PictureDecomb</key>
 				<integer>2</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
 				<key>PictureDecombDeinterlace</key>
 				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
 				<key>PictureDetelecine</key>
 				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
 				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
 				<key>PicturePAR</key>
 				<integer>2</integer>
 				<key>PictureRightCrop</key>
@@ -1100,7 +1517,7 @@
 				<key>PictureWidth</key>
 				<integer>0</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles.</string>
+				<string>HandBrake's general-purpose preset for High Profile H.264 video.</string>
 				<key>PresetName</key>
 				<string>High Profile</string>
 				<key>Subtitles</key>
@@ -1110,9 +1527,9 @@
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>2</integer>
+				<integer>1</integer>
 				<key>VideoAvgBitrate</key>
-				<string>1800</string>
+				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
@@ -1129,187 +1546,22 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>x264Option</key>
-				<string>b-adapt=2:rc-lookahead=50</string>
-			</dict>
-		</array>
-		<key>Default</key>
-		<integer>0</integer>
-		<key>Folder</key>
-		<true/>
-		<key>PresetBuildNumber</key>
-		<integer>2012041101</integer>
-		<key>PresetName</key>
-		<string>Regular</string>
-		<key>Type</key>
-		<integer>0</integer>
-	</dict>
-	<dict>
-		<key>ChildrenArray</key>
-		<array>
-			<dict>
-				<key>AudioList</key>
-				<array>
-					<dict>
-						<key>AudioBitrate</key>
-						<string>160</string>
-						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
-						<key>AudioMixdown</key>
-						<string>Dolby Pro Logic II</string>
-						<key>AudioSamplerate</key>
-						<string>Auto</string>
-						<key>AudioTrack</key>
-						<integer>1</integer>
-						<key>AudioTrackDRCSlider</key>
-						<real>0.0</real>
-					</dict>
-				</array>
-				<key>ChapterMarkers</key>
-				<integer>0</integer>
-				<key>Default</key>
-				<integer>0</integer>
-				<key>FileFormat</key>
-				<string>MP4 file</string>
-				<key>PictureAutoCrop</key>
-				<integer>1</integer>
-				<key>PictureBottomCrop</key>
-				<integer>0</integer>
-				<key>PictureDeblock</key>
-				<integer>0</integer>
-				<key>PictureDeinterlace</key>
-				<integer>0</integer>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
-				<key>PictureDetelecine</key>
-				<integer>0</integer>
-				<key>PictureHeight</key>
-				<integer>0</integer>
-				<key>PictureKeepRatio</key>
-				<integer>1</integer>
-				<key>PictureLeftCrop</key>
-				<integer>0</integer>
-				<key>PicturePAR</key>
-				<integer>0</integer>
-				<key>PictureRightCrop</key>
-				<integer>0</integer>
-				<key>PictureTopCrop</key>
-				<integer>0</integer>
-				<key>PictureWidth</key>
-				<integer>0</integer>
-				<key>PresetDescription</key>
-				<string>HandBrake's traditional, faster, lower-quality settings.</string>
-				<key>PresetName</key>
-				<string>Classic</string>
-				<key>Subtitles</key>
-				<string>None</string>
-				<key>Type</key>
-				<integer>0</integer>
-				<key>UsesPictureFilters</key>
-				<integer>1</integer>
-				<key>UsesPictureSettings</key>
-				<integer>2</integer>
-				<key>VFR</key>
-				<integer>0</integer>
-				<key>VideoAvgBitrate</key>
-				<string>1000</string>
-				<key>VideoEncoder</key>
-				<string>MPEG-4 (FFmpeg)</string>
-				<key>VideoFramerate</key>
-				<string>Same as source</string>
-				<key>VideoFramerateMode</key>
-				<string>vfr</string>
-				<key>VideoGrayScale</key>
-				<integer>0</integer>
-				<key>VideoQualityType</key>
-				<integer>1</integer>
-				<key>VideoTwoPass</key>
-				<integer>0</integer>
+				<key>h264Level</key>
+				<string>4.1</string>
+				<key>h264Profile</key>
+				<string>high</string>
+				<key>lavcOption</key>
+				<string></string>
 				<key>x264Option</key>
 				<string></string>
-			</dict>
-			<dict>
-				<key>AudioList</key>
-				<array>
-					<dict>
-						<key>AudioBitrate</key>
-						<string>160</string>
-						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
-						<key>AudioMixdown</key>
-						<string>Dolby Pro Logic II</string>
-						<key>AudioSamplerate</key>
-						<string>Auto</string>
-						<key>AudioTrack</key>
-						<integer>1</integer>
-						<key>AudioTrackDRCSlider</key>
-						<real>0.0</real>
-					</dict>
-				</array>
-				<key>ChapterMarkers</key>
-				<integer>1</integer>
-				<key>Default</key>
-				<integer>0</integer>
-				<key>FileFormat</key>
-				<string>MP4 file</string>
-				<key>Mp4iPodCompatible</key>
-				<integer>1</integer>
-				<key>PictureAutoCrop</key>
-				<integer>1</integer>
-				<key>PictureBottomCrop</key>
-				<integer>0</integer>
-				<key>PictureDeblock</key>
-				<integer>0</integer>
-				<key>PictureDeinterlace</key>
-				<integer>0</integer>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
-				<key>PictureDetelecine</key>
-				<integer>0</integer>
-				<key>PictureHeight</key>
-				<integer>0</integer>
-				<key>PictureKeepRatio</key>
-				<integer>1</integer>
-				<key>PictureLeftCrop</key>
-				<integer>0</integer>
-				<key>PicturePAR</key>
-				<integer>0</integer>
-				<key>PictureRightCrop</key>
-				<integer>0</integer>
-				<key>PictureTopCrop</key>
-				<integer>0</integer>
-				<key>PictureWidth</key>
-				<integer>640</integer>
-				<key>PresetDescription</key>
-				<string>HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2.</string>
-				<key>PresetName</key>
-				<string>iPod Legacy</string>
-				<key>Subtitles</key>
-				<string>None</string>
-				<key>Type</key>
-				<integer>0</integer>
-				<key>UsesPictureFilters</key>
-				<integer>1</integer>
-				<key>UsesPictureSettings</key>
-				<integer>1</integer>
-				<key>VFR</key>
-				<integer>0</integer>
-				<key>VideoAvgBitrate</key>
-				<string>1500</string>
-				<key>VideoEncoder</key>
-				<string>H.264 (x264)</string>
-				<key>VideoFramerate</key>
-				<string>Same as source</string>
-				<key>VideoFramerateMode</key>
-				<string>vfr</string>
-				<key>VideoGrayScale</key>
-				<integer>0</integer>
-				<key>VideoQualityType</key>
-				<integer>1</integer>
-				<key>VideoTwoPass</key>
+				<key>x264OptionExtra</key>
+				<string></string>
+				<key>x264Preset</key>
+				<string>medium</string>
+				<key>x264Tune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
-				<key>x264Option</key>
-				<string>level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0</string>
 			</dict>
 		</array>
 		<key>Default</key>
@@ -1317,9 +1569,9 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2012041101</integer>
+		<integer>2013030401</integer>
 		<key>PresetName</key>
-		<string>Legacy</string>
+		<string>Regular</string>
 		<key>Type</key>
 		<integer>0</integer>
 	</dict>

HandBrake-0.9.8.tar.bz2/gtk/src/subtitlehandler.c -> HandBrake-0.9.9.tar.bz2/gtk/src/subtitlehandler.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * subtitlehandler.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * subtitlehandler.c is free software.
  * 
@@ -32,1368 +32,1419 @@
 static void
 free_subtitle_index_list(gpointer data)
 {
-	g_free(data);
+    g_free(data);
 }
 
 static void
 free_subtitle_key(gpointer data)
 {
-	if (data != NULL)
-		g_free(data);
+    if (data != NULL)
+        g_free(data);
 }
 
-static gboolean
-canBurn(int source)
+gboolean
+ghb_canPassSub(int source, int mux)
 {
-	return (source == VOBSUB || source == SSASUB);
+    return hb_subtitle_can_pass(source, mux);
 }
 
-static gboolean
-canForce(int source)
+gboolean
+ghb_canBurnSub(int source)
+{
+    return hb_subtitle_can_burn(source);
+}
+
+gboolean
+ghb_canForceSub(int source)
 {
-	return (source == VOBSUB);
+    return hb_subtitle_can_force(source);
 }
 
 gboolean
 ghb_soft_in_subtitle_list(GValue *subtitle_list)
 {
-	gint count, ii;
-	GValue *settings;
-
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		settings = ghb_array_get_nth(subtitle_list, ii);
-		if (!ghb_settings_get_boolean(settings, "SubtitleBurned"))
-		{
-			return TRUE;
-		}
-	}
-	return FALSE;
+    gint count, ii;
+    GValue *settings;
+
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        settings = ghb_array_get_nth(subtitle_list, ii);
+        if (!ghb_settings_get_boolean(settings, "SubtitleBurned"))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
 }
 
 void
 ghb_subtitle_exclusive_burn_settings(GValue *settings, gint index)
 {
-	GValue *subtitle_list;
-	GValue *subsettings;
-	gint ii, count;
-
-	g_debug("ghb_subtitle_exclusive_burn_settings");
-	subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		if (ii != index)
-		{
-printf("settings burn %d also %d\n", index, ii);
-			subsettings = ghb_array_get_nth(subtitle_list, ii);
-			ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
-		}
-	}
+    GValue *subtitle_list;
+    GValue *subsettings;
+    gint ii, count;
+
+    g_debug("ghb_subtitle_exclusive_burn_settings");
+    subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        if (ii != index)
+        {
+            subsettings = ghb_array_get_nth(subtitle_list, ii);
+            ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
+        }
+    }
 }
 
 void
 ghb_subtitle_exclusive_burn(signal_user_data_t *ud, gint index)
 {
-	GValue *subtitle_list;
-	GValue *subsettings;
-	gint ii, count;
-	GtkTreeView  *tv;
-	GtkTreeModel *tm;
-	GtkTreeIter   ti;
-
-	g_debug("ghb_subtitle_exclusive_burn");
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-		g_return_if_fail(tv != NULL);
-		tm = gtk_tree_view_get_model(tv);
-		gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
-		if (ii != index)
-		{
-printf("ui burn %d also %d\n", index, ii);
-			subsettings = ghb_array_get_nth(subtitle_list, ii);
-			ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
-			gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, FALSE, -1);
-		}
-	}
+    GValue *subtitle_list;
+    GValue *subsettings;
+    gint ii, count;
+    GtkTreeView  *tv;
+    GtkTreeModel *tm;
+    GtkTreeIter   ti;
+
+    g_debug("ghb_subtitle_exclusive_burn");
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+        g_return_if_fail(tv != NULL);
+        tm = gtk_tree_view_get_model(tv);
+        gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+        if (ii != index)
+        {
+            subsettings = ghb_array_get_nth(subtitle_list, ii);
+            ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
+            gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, FALSE, -1);
+        }
+    }
 }
 
 void
 ghb_subtitle_exclusive_default_settings(GValue *settings, gint index)
 {
-	GValue *subtitle_list;
-	GValue *subtitle;
-	gint ii, count;
-
-	g_debug("ghb_subtitle_exclusive_default");
-	subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		if (ii != index)
-		{
-		    subtitle = ghb_array_get_nth(subtitle_list, ii);
-			ghb_settings_set_boolean(subtitle, "SubtitleDefaultTrack", FALSE);
-		}
-	}
+    GValue *subtitle_list;
+    GValue *subtitle;
+    gint ii, count;
+
+    g_debug("ghb_subtitle_exclusive_default");
+    subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        if (ii != index)
+        {
+            subtitle = ghb_array_get_nth(subtitle_list, ii);
+            ghb_settings_set_boolean(subtitle, "SubtitleDefaultTrack", FALSE);
+        }
+    }
 }
 
 void
 ghb_subtitle_exclusive_default(signal_user_data_t *ud, gint index)
 {
-	GValue *subtitle_list;
-	GValue *settings;
-	gint ii, count;
-	GtkTreeView  *tv;
-	GtkTreeModel *tm;
-	GtkTreeIter   ti;
-	gboolean def;
-
-	g_debug("ghb_subtitle_exclusive_default");
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		settings = ghb_array_get_nth(subtitle_list, ii);
-		def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
-		tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-		g_return_if_fail(tv != NULL);
-		tm = gtk_tree_view_get_model(tv);
-		gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
-		if (def && ii != index)
-		{
-
-			ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", FALSE);
-			gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, FALSE, -1);
-		}
-	}
+    GValue *subtitle_list;
+    GValue *settings;
+    gint ii, count;
+    GtkTreeView  *tv;
+    GtkTreeModel *tm;
+    GtkTreeIter   ti;
+    gboolean def;
+
+    g_debug("ghb_subtitle_exclusive_default");
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        settings = ghb_array_get_nth(subtitle_list, ii);
+        def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+
+        tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+        g_return_if_fail(tv != NULL);
+        tm = gtk_tree_view_get_model(tv);
+        gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+        if (def && ii != index)
+        {
+
+            ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", FALSE);
+            gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, FALSE, -1);
+        }
+    }
 }
 
 void
 ghb_add_srt(signal_user_data_t *ud, GValue *settings)
 {
-	// Add the current subtitle settings to the list.
-	GValue *subtitle_list;
-	gint count;
-	const gchar *lang;
-	
-	g_debug("ghb_add_srt ()");
-
-	ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE);
-	// Add the long track description so the queue can access it
-	// when a different title is selected.
-	lang = ghb_settings_combo_option(settings, "SrtLanguage");
-	ghb_settings_set_string(settings, "SubtitleTrackDescription", lang);
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	if (subtitle_list == NULL)
-	{
-		subtitle_list = ghb_array_value_new(8);
-		ghb_settings_set_value(ud->settings, "subtitle_list", subtitle_list);
-	}
-	count = ghb_array_len(subtitle_list);
-
-	// Don't allow more than 99
-	// This is a had limit imposed by libhb/sync.c:GetFifoForId()
-	if (count >= 99)
-	{
-		ghb_value_free(settings);
-		return;
-	}
-
-	ghb_array_append(subtitle_list, settings);
-	add_to_srt_list(ud, settings);
-
-	if (count == 98)
-	{
-		GtkWidget *widget;
-		widget = GHB_WIDGET (ud->builder, "subtitle_add");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = GHB_WIDGET (ud->builder, "srt_add");
-		gtk_widget_set_sensitive(widget, FALSE);
-	}
-	ghb_live_reset(ud);
+    // Add the current subtitle settings to the list.
+    GValue *subtitle_list;
+    gint count;
+    const gchar *lang;
+    
+    g_debug("ghb_add_srt ()");
+
+    ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE);
+    // Add the long track description so the queue can access it
+    // when a different title is selected.
+    lang = ghb_settings_combo_option(settings, "SrtLanguage");
+    ghb_settings_set_string(settings, "SubtitleTrackDescription", lang);
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    if (subtitle_list == NULL)
+    {
+        subtitle_list = ghb_array_value_new(8);
+        ghb_settings_set_value(ud->settings, "subtitle_list", subtitle_list);
+    }
+    count = ghb_array_len(subtitle_list);
+
+    // Don't allow more than 99
+    // This is a had limit imposed by libhb/sync.c:GetFifoForId()
+    if (count >= 99)
+    {
+        ghb_value_free(settings);
+        return;
+    }
+
+    ghb_array_append(subtitle_list, settings);
+    add_to_srt_list(ud, settings);
+
+    if (count == 98)
+    {
+        GtkWidget *widget;
+        widget = GHB_WIDGET (ud->builder, "subtitle_add");
+        gtk_widget_set_sensitive(widget, FALSE);
+        widget = GHB_WIDGET (ud->builder, "srt_add");
+        gtk_widget_set_sensitive(widget, FALSE);
+    }
+    ghb_live_reset(ud);
 }
 
 static gboolean
 ghb_add_subtitle_to_settings(GValue *settings, GValue *subsettings)
 {
-	// Add the current subtitle settings to the list.
-	GValue *subtitle_list;
-	gint count;
-	gboolean burned;
-	const gchar *track;
-	const gchar *lang;
-	
-	g_debug("ghb_add_subtitle_to_settings ()");
-
-	subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
-	if (subtitle_list == NULL)
-	{
-		subtitle_list = ghb_array_value_new(8);
-		ghb_settings_set_value(settings, "subtitle_list", subtitle_list);
-	}
-
-	count = ghb_array_len(subtitle_list);
-	// Don't allow more than 99
-	// This is a hard limit imposed by libhb/reader.c:GetFifoForId()
-	if (count >= 99)
-	{
-		ghb_value_free(subsettings);
-		return FALSE;
-	}
-
-	// Add the long track description so the queue can access it
-	// when a different title is selected.
-	track = ghb_settings_combo_option(subsettings, "SubtitleTrack");
-	ghb_settings_set_string(subsettings, "SubtitleTrackDescription", track);
-
-	lang = ghb_settings_combo_string(subsettings, "SubtitleTrack");
-	ghb_settings_set_string(subsettings, "SubtitleLanguage", lang);
-
-	ghb_array_append(subtitle_list, subsettings);
-
-	burned = ghb_settings_get_boolean(subsettings, "SubtitleBurned");
-	if (burned)
-		ghb_subtitle_exclusive_burn_settings(settings, count);
-	return TRUE;
+    // Add the current subtitle settings to the list.
+    GValue *subtitle_list;
+    gint count;
+    gboolean burned, forced;
+    gint source, mux;
+    const gchar *track;
+    const gchar *lang;
+    
+    g_debug("ghb_add_subtitle_to_settings ()");
+
+    subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
+    if (subtitle_list == NULL)
+    {
+        subtitle_list = ghb_array_value_new(8);
+        ghb_settings_set_value(settings, "subtitle_list", subtitle_list);
+    }
+
+    count = ghb_array_len(subtitle_list);
+    // Don't allow more than 99
+    // This is a hard limit imposed by libhb/reader.c:GetFifoForId()
+    if (count >= 99)
+    {
+        ghb_value_free(subsettings);
+        return FALSE;
+    }
+
+    // Add the long track description so the queue can access it
+    // when a different title is selected.
+    track = ghb_settings_combo_option(subsettings, "SubtitleTrack");
+    ghb_settings_set_string(subsettings, "SubtitleTrackDescription", track);
+
+    lang = ghb_settings_combo_string(subsettings, "SubtitleTrack");
+    ghb_settings_set_string(subsettings, "SubtitleLanguage", lang);
+
+    mux = ghb_settings_combo_int(settings, "FileFormat");
+    source = ghb_settings_get_int(subsettings, "SubtitleSource");
+    burned = ghb_settings_get_boolean(subsettings, "SubtitleBurned");
+    if (burned && !ghb_canBurnSub(source))
+    {
+        burned = FALSE;
+        ghb_settings_set_boolean(subsettings, "SubtitleBurned", burned);
+    }
+    if (!burned && !ghb_canPassSub(source, mux))
+    {
+        burned = TRUE;
+        ghb_settings_set_boolean(subsettings, "SubtitleBurned", burned);
+        ghb_settings_set_boolean(subsettings, "SubtitleDefaultTrack", FALSE);
+    }
+    forced = ghb_settings_get_boolean(subsettings, "SubtitleForced");
+    if (forced && !ghb_canForceSub(source))
+    {
+        forced = FALSE;
+        ghb_settings_set_boolean(subsettings, "SubtitleForced", forced);
+    }
+
+    ghb_array_append(subtitle_list, subsettings);
+
+    if (burned)
+        ghb_subtitle_exclusive_burn_settings(settings, count);
+    return TRUE;
 }
 
 static void
 ghb_add_subtitle_to_ui(signal_user_data_t *ud, GValue *subsettings)
 {
-	// Add the current subtitle settings to the list.
-	GValue *subtitle_list;
-	gint count;
-	
-	g_debug("ghb_add_subtitle_to_ui ()");
-	add_to_subtitle_list(ud, subsettings);
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	if (count == 99)
-	{
-		GtkWidget *widget;
-		widget = GHB_WIDGET (ud->builder, "subtitle_add");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = GHB_WIDGET (ud->builder, "srt_add");
-		gtk_widget_set_sensitive(widget, FALSE);
-	}
-	ghb_live_reset(ud);
+    // Add the current subtitle settings to the list.
+    GValue *subtitle_list;
+    gint count;
+    
+    g_debug("ghb_add_subtitle_to_ui ()");
+    add_to_subtitle_list(ud, subsettings);
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    if (count == 99)
+    {
+        GtkWidget *widget;
+        widget = GHB_WIDGET (ud->builder, "subtitle_add");
+        gtk_widget_set_sensitive(widget, FALSE);
+        widget = GHB_WIDGET (ud->builder, "srt_add");
+        gtk_widget_set_sensitive(widget, FALSE);
+    }
+    ghb_live_reset(ud);
 }
 
 static void
 add_all_pref_subtitles(signal_user_data_t *ud)
 {
-	const GValue *pref_subtitle;
-	GValue *subtitle;
-	gint count, ii, track;
-	char *lang;
-
-	pref_subtitle = ghb_settings_get_value(ud->settings, "SubtitleList");
-	count = ghb_array_len(pref_subtitle);
-	for (ii = 0; ii < count; ii++)
-	{
-		subtitle = ghb_value_dup(ghb_array_get_nth(pref_subtitle, ii));
-		lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
-		// If there are multiple subtitles using the same language, then
-		// select sequential tracks for each.  The hash keeps track 
-		// of the tracks used for each language.
-		track = ghb_find_pref_subtitle_track(lang);
-		g_free(lang);
-		if (track >= -1)
-		{
-			int source;
-
-			// Add to subtitle list
-			ghb_settings_set_int(subtitle, "SubtitleTrack", track);
-			source = ghb_subtitle_track_source(ud->settings, track);
-			ghb_settings_set_int(subtitle, "SubtitleSource", source);
-
-			if (!ghb_add_subtitle_to_settings(ud->settings, subtitle))
-				return;
-
-			ghb_add_subtitle_to_ui(ud, subtitle);
-		}
-	}
+    const GValue *pref_subtitle;
+    GValue *subtitle;
+    gint count, ii, track;
+    char *lang;
+
+    pref_subtitle = ghb_settings_get_value(ud->settings, "SubtitleList");
+    count = ghb_array_len(pref_subtitle);
+    for (ii = 0; ii < count; ii++)
+    {
+        subtitle = ghb_value_dup(ghb_array_get_nth(pref_subtitle, ii));
+        lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
+        // If there are multiple subtitles using the same language, then
+        // select sequential tracks for each.  The hash keeps track 
+        // of the tracks used for each language.
+        track = ghb_find_pref_subtitle_track(lang);
+        g_free(lang);
+        if (track >= -1)
+        {
+            int source;
+
+            // Add to subtitle list
+            ghb_settings_set_int(subtitle, "SubtitleTrack", track);
+            source = ghb_subtitle_track_source(ud->settings, track);
+            ghb_settings_set_int(subtitle, "SubtitleSource", source);
+
+            if (!ghb_add_subtitle_to_settings(ud->settings, subtitle))
+                return;
+
+            ghb_add_subtitle_to_ui(ud, subtitle);
+        }
+    }
 }
 
 void
 ghb_set_pref_subtitle_settings(gint titleindex, GValue *settings)
 {
-	gint track;
-	GHashTable *track_indices;
-	gchar *lang, *pref_lang = NULL;
-	gchar *audio_lang;
-	gint foreign_lang_index = -1;
-	gboolean found_cc = FALSE;
-
-	const GValue *pref_subtitle;
-	GValue *subtitle;
-	gint count, ii, jj;
-	
-	g_debug("ghb_set_pref_subtitle %d", titleindex);
-
-	// Check to see if we need to add a subtitle track for foreign audio
-	// language films. A subtitle track will be added if:
-	//
-	// The first (default) audio track language does NOT match the users
-	// chosen Preferred Language AND the Preferred Language is NOT Any (und).
-	//
-	audio_lang = ghb_get_user_audio_lang(settings, titleindex, 0);
-	pref_lang = ghb_settings_get_string(settings, "PreferredLanguage");
-
-	if (audio_lang != NULL && pref_lang != NULL &&
-		(strcmp(audio_lang, pref_lang) == 0 || strcmp("und", pref_lang) == 0))
-	{
-		g_free(pref_lang);
-		pref_lang = NULL;
-	}
-
-	track_indices = g_hash_table_new_full(g_str_hash, g_str_equal, 
-											free_subtitle_key, free_subtitle_index_list);
-
-	ghb_settings_set_int(settings, "SubtitleTrack", 0);
-
-	// Clear the subtitle list
-	ghb_clear_subtitle_list_settings(settings);
-	if (titleindex < 0)
-	{
-		return;
-	}
-
-	// Find "best" subtitle based on subtitle preferences
-	pref_subtitle = ghb_settings_get_value(settings, "SubtitleList");
-
-	count = ghb_array_len(pref_subtitle);
-	jj = 0;
-	for (ii = 0; ii < count; ii++)
-	{
-		gint source;
-		gboolean force, burn;
-
-		subtitle = ghb_array_get_nth(pref_subtitle, ii);
-		lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
-		source = ghb_settings_get_int(subtitle, "SubtitleSource");
-		burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
-		force = ghb_settings_get_boolean(subtitle, "SubtitleForced");
-		// If there are multiple subtitles using the same language, then
-		// select sequential tracks for each.  The hash keeps track 
-		// of the tracks used for each language.
-		track = ghb_find_subtitle_track(titleindex, lang, burn, 
-										force, source, track_indices);
-		g_free(lang);
-		if (track >= -1)
-		{
-			GValue *dup = ghb_value_dup(subtitle);
-			lang = ghb_subtitle_track_lang(settings, track);
-			ghb_settings_set_int(dup, "SubtitleTrack", track);
-			if (foreign_lang_index < 0 && pref_lang != NULL &&
-				strcmp(lang, pref_lang) == 0)
-			{
-				foreign_lang_index = jj;
-				ghb_settings_take_value(dup, "SubtitleForced", 
-								ghb_boolean_value_new(FALSE));
-				ghb_settings_take_value(dup, "SubtitleDefaultTrack", 
-								ghb_boolean_value_new(TRUE));
-			}
-			source = ghb_subtitle_track_source(settings, track);
-			ghb_settings_set_int(dup, "SubtitleSource", source);
-			if (source == CC608SUB || source == CC708SUB)
-				found_cc = TRUE;
-			ghb_add_subtitle_to_settings(settings, dup);
-			jj++;
-			g_free(lang);
-		}
-	}
-	if (foreign_lang_index < 0 && pref_lang != NULL)
-	{
-		// Subtitle for foreign language audio not added yet
-		GValue *subsettings;
-		gboolean burn;
-
-		track = ghb_find_subtitle_track(titleindex, pref_lang, FALSE, FALSE, VOBSUB, track_indices);
-		if (track >= -1)
-		{
-			int source;
-
-			subsettings = ghb_dict_value_new();
-			ghb_settings_set_int(subsettings, "SubtitleTrack", track);
-			source = ghb_subtitle_track_source(settings, track);
-			ghb_settings_set_int(subsettings, "SubtitleSource", source);
-			burn = FALSE;
-			ghb_settings_take_value(subsettings, "SubtitleForced", 
-							ghb_boolean_value_new(FALSE));
-			ghb_settings_take_value(subsettings, "SubtitleBurned", 
-							ghb_boolean_value_new(burn));
-			ghb_settings_take_value(subsettings, "SubtitleDefaultTrack", 
-							ghb_boolean_value_new(TRUE));
-
-			ghb_add_subtitle_to_settings(settings, subsettings);
-			foreign_lang_index = jj;
-		}
-	}
-	if (foreign_lang_index >= 0)
-	{
-		GValue *subtitle_list;
-		gboolean burn, def;
-
-		subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
-		subtitle = ghb_array_get_nth(subtitle_list, foreign_lang_index);
-
-		burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
-		def = ghb_settings_get_boolean(subtitle, "SubtitleDefaultTrack");
-		if (burn)
-			ghb_subtitle_exclusive_burn_settings(settings, foreign_lang_index);
-		if (def)
-			ghb_subtitle_exclusive_default_settings(settings, foreign_lang_index);
-		ghb_log("adding subtitle for foreign language audio: %s", audio_lang);
-	}
-	if (ghb_settings_get_boolean(settings, "AddCC") && !found_cc)
-	{
-		// Subtitle for foreign language audio not added yet
-		GValue *subsettings;
-
-		track = ghb_find_cc_track(titleindex);
-		if (track >= 0)
-		{
-			int source;
-
-			subsettings = ghb_dict_value_new();
-			ghb_settings_set_int(subsettings, "SubtitleTrack", track);
-			source = ghb_subtitle_track_source(settings, track);
-			ghb_settings_set_int(subsettings, "SubtitleSource", source);
-			ghb_settings_take_value(subsettings, "SubtitleForced", 
-							ghb_boolean_value_new(FALSE));
-			ghb_settings_take_value(subsettings, "SubtitleBurned", 
-							ghb_boolean_value_new(FALSE));
-			ghb_settings_take_value(subsettings, "SubtitleDefaultTrack", 
-							ghb_boolean_value_new(FALSE));
-
-			ghb_add_subtitle_to_settings(settings, subsettings);
-			ghb_log("adding Closed Captions: %s", audio_lang);
-		}
-	}
-	if (pref_lang != NULL)
-		g_free(pref_lang);
-	if (audio_lang != NULL)
-		g_free(audio_lang);
-	g_hash_table_destroy(track_indices);
+    gint track;
+    GHashTable *track_indices;
+    gchar *lang, *pref_lang = NULL;
+    const gchar *audio_lang;
+    gint foreign_lang_index = -1;
+    gboolean found_cc = FALSE;
+
+    const GValue *pref_subtitle;
+    GValue *subtitle;
+    gint count, ii, jj;
+    
+    g_debug("ghb_set_pref_subtitle %d", titleindex);
+
+    // Check to see if we need to add a subtitle track for foreign audio
+    // language films. A subtitle track will be added if:
+    //
+    // The first (default) audio track language does NOT match the users
+    // chosen Preferred Language AND the Preferred Language is NOT Any (und).
+    //
+    audio_lang = ghb_get_user_audio_lang(settings, titleindex, 0);
+    pref_lang = ghb_settings_get_string(settings, "PreferredLanguage");
+
+    if (audio_lang != NULL && pref_lang != NULL &&
+        (strcmp(audio_lang, pref_lang) == 0 || strcmp("und", pref_lang) == 0))
+    {
+        g_free(pref_lang);
+        pref_lang = NULL;
+    }
+
+    track_indices = g_hash_table_new_full(g_str_hash, g_str_equal, 
+                                            free_subtitle_key, free_subtitle_index_list);
+
+    ghb_settings_set_int(settings, "SubtitleTrack", 0);
+
+    // Clear the subtitle list
+    ghb_clear_subtitle_list_settings(settings);
+    if (titleindex < 0)
+    {
+        return;
+    }
+
+    // Find "best" subtitle based on subtitle preferences
+    pref_subtitle = ghb_settings_get_value(settings, "SubtitleList");
+
+    count = ghb_array_len(pref_subtitle);
+    jj = 0;
+    for (ii = 0; ii < count; ii++)
+    {
+        gint source;
+        gboolean force, burn;
+
+        subtitle = ghb_array_get_nth(pref_subtitle, ii);
+        lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
+        source = ghb_settings_get_int(subtitle, "SubtitleSource");
+        burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
+        force = ghb_settings_get_boolean(subtitle, "SubtitleForced");
+        // If there are multiple subtitles using the same language, then
+        // select sequential tracks for each.  The hash keeps track 
+        // of the tracks used for each language.
+        track = ghb_find_subtitle_track(titleindex, lang, burn, 
+                                        force, source, track_indices);
+        g_free(lang);
+        if (track >= -1)
+        {
+            const gchar *track_lang;
+            GValue *dup = ghb_value_dup(subtitle);
+            track_lang = ghb_subtitle_track_lang(settings, track);
+            ghb_settings_set_int(dup, "SubtitleTrack", track);
+            if (foreign_lang_index < 0 && pref_lang != NULL &&
+                strcmp(track_lang, pref_lang) == 0 &&
+                !ghb_settings_get_boolean(dup, "SubtitleBurned"))
+            {
+                foreign_lang_index = jj;
+                ghb_settings_take_value(dup, "SubtitleForced", 
+                                ghb_boolean_value_new(FALSE));
+                ghb_settings_take_value(dup, "SubtitleDefaultTrack", 
+                                ghb_boolean_value_new(TRUE));
+            }
+            source = ghb_subtitle_track_source(settings, track);
+            ghb_settings_set_int(dup, "SubtitleSource", source);
+            if (source == CC608SUB || source == CC708SUB)
+                found_cc = TRUE;
+            ghb_add_subtitle_to_settings(settings, dup);
+            jj++;
+        }
+    }
+    if (foreign_lang_index < 0 && pref_lang != NULL)
+    {
+        // Subtitle for foreign language audio not added yet
+        GValue *subsettings;
+        gboolean burn;
+
+        track = ghb_find_subtitle_track(titleindex, pref_lang, FALSE, FALSE, PGSSUB, track_indices);
+        if (track >= -1)
+        {
+            int source;
+
+            subsettings = ghb_dict_value_new();
+            ghb_settings_set_int(subsettings, "SubtitleTrack", track);
+            source = ghb_subtitle_track_source(settings, track);
+            ghb_settings_set_int(subsettings, "SubtitleSource", source);
+            burn = FALSE;
+            ghb_settings_take_value(subsettings, "SubtitleForced", 
+                            ghb_boolean_value_new(FALSE));
+            ghb_settings_take_value(subsettings, "SubtitleBurned", 
+                            ghb_boolean_value_new(burn));
+            ghb_settings_take_value(subsettings, "SubtitleDefaultTrack", 
+                            ghb_boolean_value_new(TRUE));
+
+            ghb_add_subtitle_to_settings(settings, subsettings);
+            foreign_lang_index = jj;
+        }
+    }
+    if (foreign_lang_index >= 0)
+    {
+        GValue *subtitle_list;
+        gboolean burn, def;
+
+        subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
+        subtitle = ghb_array_get_nth(subtitle_list, foreign_lang_index);
+
+        burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
+        def = ghb_settings_get_boolean(subtitle, "SubtitleDefaultTrack");
+        if (burn)
+            ghb_subtitle_exclusive_burn_settings(settings, foreign_lang_index);
+        if (def)
+            ghb_subtitle_exclusive_default_settings(settings, foreign_lang_index);
+        ghb_log("adding subtitle for foreign language audio: %s", audio_lang);
+    }
+    if (ghb_settings_get_boolean(settings, "AddCC") && !found_cc)
+    {
+        // Subtitle for foreign language audio not added yet
+        GValue *subsettings;
+
+        track = ghb_find_cc_track(titleindex);
+        if (track >= 0)
+        {
+            int source;
+            subsettings = ghb_dict_value_new();
+            ghb_settings_set_int(subsettings, "SubtitleTrack", track);
+            source = ghb_subtitle_track_source(settings, track);
+            ghb_settings_set_int(subsettings, "SubtitleSource", source);
+            ghb_settings_take_value(subsettings, "SubtitleForced", 
+                            ghb_boolean_value_new(FALSE));
+            ghb_settings_take_value(subsettings, "SubtitleBurned", 
+                            ghb_boolean_value_new(FALSE));
+            ghb_settings_take_value(subsettings, "SubtitleDefaultTrack", 
+                            ghb_boolean_value_new(FALSE));
+
+            ghb_add_subtitle_to_settings(settings, subsettings);
+            ghb_log("adding Closed Captions: %s", audio_lang);
+        }
+    }
+    if (pref_lang != NULL)
+        g_free(pref_lang);
+    g_hash_table_destroy(track_indices);
 }
 
 void
 ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud)
 {
-	ghb_set_pref_subtitle_settings(titleindex, ud->settings);
-	ghb_clear_subtitle_list(ud);
-	if (titleindex < 0)
-	{
-		add_all_pref_subtitles(ud);
-		return;
-	}
-
-	gint count, ii;
-	GValue *subtitle_list;
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	for (ii = 0; ii < count; ii++)
-	{
-		GValue *subtitle;
-		subtitle = ghb_array_get_nth(subtitle_list, ii);
-		ghb_add_subtitle_to_ui(ud, subtitle);
-	}
+    ghb_set_pref_subtitle_settings(titleindex, ud->settings);
+    ghb_clear_subtitle_list(ud);
+    if (titleindex < 0)
+    {
+        add_all_pref_subtitles(ud);
+        return;
+    }
+
+    gint count, ii;
+    GValue *subtitle_list;
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    for (ii = 0; ii < count; ii++)
+    {
+        GValue *subtitle;
+        subtitle = ghb_array_get_nth(subtitle_list, ii);
+        ghb_add_subtitle_to_ui(ud, subtitle);
+    }
 }
 
 gint
 ghb_selected_subtitle_row(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gint *indices;
-	gint row = -1;
-	
-	g_debug("ghb_selected_subtitle_row ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-	}
-	return row;
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gint *indices;
+    gint row = -1;
+    
+    g_debug("ghb_selected_subtitle_row ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+    }
+    return row;
 }
 
 GValue*
 ghb_selected_subtitle_settings(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gint *indices;
-	gint row;
-	GValue *settings = NULL;
-	const GValue *subtitle_list;
-	
-	g_debug("get_selected_settings ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		// find subtitle settings
-		if (row < 0) return NULL;
-		subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-		if (row >= ghb_array_len(subtitle_list))
-			return NULL;
-		settings = ghb_array_get_nth(subtitle_list, row);
-	}
-	return settings;
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gint *indices;
+    gint row;
+    GValue *settings = NULL;
+    const GValue *subtitle_list;
+    
+    g_debug("get_selected_settings ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        // find subtitle settings
+        if (row < 0) return NULL;
+        subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+        if (row >= ghb_array_len(subtitle_list))
+            return NULL;
+        settings = ghb_array_get_nth(subtitle_list, row);
+    }
+    return settings;
 }
 
 G_MODULE_EXPORT void
 subtitle_forced_toggled_cb(
-	GtkCellRendererToggle *cell, 
-	gchar                 *path,
-	signal_user_data_t    *ud)
+    GtkCellRendererToggle *cell, 
+    gchar                 *path,
+    signal_user_data_t    *ud)
 {
-	GtkTreeView  *tv;
-	GtkTreeModel *tm;
-	GtkTreeIter   ti;
-	gboolean      active;
-	gint          row;
-	GtkTreePath  *tp;
-	gint *indices;
-	GValue *subtitle_list, *settings;
-	gint source;
-
-	g_debug("forced toggled");
-	tp = gtk_tree_path_new_from_string (path);
-	tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	g_return_if_fail(tv != NULL);
-	tm = gtk_tree_view_get_model(tv);
-	g_return_if_fail(tm != NULL);
-	gtk_tree_model_get_iter(tm, &ti, tp);
-	gtk_tree_model_get(tm, &ti, 1, &active, -1);
-	active ^= 1;
-
-	// Get the row number
-	indices = gtk_tree_path_get_indices (tp);
-	row = indices[0];
-	gtk_tree_path_free(tp);
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-
-	if (row < 0 || row >= ghb_array_len(subtitle_list))
-		return;
-
-	settings = ghb_array_get_nth(subtitle_list, row);
-
-	source = ghb_settings_get_int(settings, "SubtitleSource");
-	if (!canForce(source))
-		return;
-
-	ghb_settings_set_boolean(settings, "SubtitleForced", active);
-	gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 1, active, -1);
-	ghb_live_reset(ud);
+    GtkTreeView  *tv;
+    GtkTreeModel *tm;
+    GtkTreeIter   ti;
+    gboolean      active;
+    gint          row;
+    GtkTreePath  *tp;
+    gint *indices;
+    GValue *subtitle_list, *settings;
+    gint source;
+
+    g_debug("forced toggled");
+    tp = gtk_tree_path_new_from_string (path);
+    tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    g_return_if_fail(tv != NULL);
+    tm = gtk_tree_view_get_model(tv);
+    g_return_if_fail(tm != NULL);
+    gtk_tree_model_get_iter(tm, &ti, tp);
+    gtk_tree_model_get(tm, &ti, 1, &active, -1);
+    active ^= 1;
+
+    // Get the row number
+    indices = gtk_tree_path_get_indices (tp);
+    row = indices[0];
+    gtk_tree_path_free(tp);
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+
+    if (row < 0 || row >= ghb_array_len(subtitle_list))
+        return;
+
+    settings = ghb_array_get_nth(subtitle_list, row);
+
+    source = ghb_settings_get_int(settings, "SubtitleSource");
+    if (!ghb_canForceSub(source))
+    {
+        return;
+    }
+
+    ghb_settings_set_boolean(settings, "SubtitleForced", active);
+    gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 1, active, -1);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 subtitle_burned_toggled_cb(
-	GtkCellRendererToggle *cell, 
-	gchar                 *path,
-	signal_user_data_t    *ud)
+    GtkCellRendererToggle *cell, 
+    gchar                 *path,
+    signal_user_data_t    *ud)
 {
-	GtkTreeView  *tv;
-	GtkTreeModel *tm;
-	GtkTreeIter   ti;
-	GtkTreePath  *tp;
-	gboolean      active;
-	gint          row;
-	gint *indices;
-	GValue *subtitle_list;
-	gint count;
-	GValue *settings;
-	gint source;
-
-	g_debug("burned toggled");
-	tp = gtk_tree_path_new_from_string (path);
-	tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	g_return_if_fail(tv != NULL);
-	tm = gtk_tree_view_get_model(tv);
-	g_return_if_fail(tm != NULL);
-	gtk_tree_model_get_iter(tm, &ti, tp);
-	gtk_tree_model_get(tm, &ti, 2, &active, -1);
-	active ^= 1;
-
-	// Get the row number
-	indices = gtk_tree_path_get_indices (tp);
-	row = indices[0];
-	gtk_tree_path_free(tp);
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	if (row < 0 || row >= count)
-		return;
-
-	settings = ghb_array_get_nth(subtitle_list, row);
-	source = ghb_settings_get_int(settings, "SubtitleSource");
-	if (!canBurn(source))
-		return;
-
-	ghb_settings_set_boolean(settings, "SubtitleBurned", active);
-	gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, active, -1);
-
-	if (active)
-	{
-		ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", !active);
-		gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, !active, -1);
-	}
-
-	// Unburn the rest
-	if (active)
-		ghb_subtitle_exclusive_burn(ud, row);
-	ghb_live_reset(ud);
+    GtkTreeView  *tv;
+    GtkTreeModel *tm;
+    GtkTreeIter   ti;
+    GtkTreePath  *tp;
+    gboolean      active;
+    gint          row;
+    gint *indices;
+    GValue *subtitle_list;
+    gint count;
+    GValue *settings;
+    gint source, mux;
+
+    g_debug("burned toggled");
+    tp = gtk_tree_path_new_from_string (path);
+    tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    g_return_if_fail(tv != NULL);
+    tm = gtk_tree_view_get_model(tv);
+    g_return_if_fail(tm != NULL);
+    gtk_tree_model_get_iter(tm, &ti, tp);
+    gtk_tree_model_get(tm, &ti, 2, &active, -1);
+    active ^= 1;
+
+    // Get the row number
+    indices = gtk_tree_path_get_indices (tp);
+    row = indices[0];
+    gtk_tree_path_free(tp);
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    if (row < 0 || row >= count)
+        return;
+
+    settings = ghb_array_get_nth(subtitle_list, row);
+    source = ghb_settings_get_int(settings, "SubtitleSource");
+    if (!ghb_canBurnSub(source))
+        return;
+    mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+    if (!active && !hb_subtitle_can_pass(source, mux))
+        return;
+
+    ghb_settings_set_boolean(settings, "SubtitleBurned", active);
+    gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, active, -1);
+
+    if (active)
+    {
+        ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", !active);
+        gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, !active, -1);
+    }
+
+    // Unburn the rest
+    if (active)
+        ghb_subtitle_exclusive_burn(ud, row);
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 subtitle_default_toggled_cb(
-	GtkCellRendererToggle *cell, 
-	gchar                 *path,
-	signal_user_data_t    *ud)
+    GtkCellRendererToggle *cell, 
+    gchar                 *path,
+    signal_user_data_t    *ud)
 {
-	GtkTreeView  *tv;
-	GtkTreeModel *tm;
-	GtkTreeIter   ti;
-	GtkTreePath  *tp;
-	gboolean      active;
-	gint          row;
-	gint *indices;
-	GValue *subtitle_list;
-	gint count;
-	GValue *settings;
-
-	g_debug("default toggled");
-	tp = gtk_tree_path_new_from_string (path);
-	tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	g_return_if_fail(tv != NULL);
-	tm = gtk_tree_view_get_model(tv);
-	g_return_if_fail(tm != NULL);
-	gtk_tree_model_get_iter(tm, &ti, tp);
-	gtk_tree_model_get(tm, &ti, 3, &active, -1);
-	active ^= 1;
-
-	// Get the row number
-	indices = gtk_tree_path_get_indices (tp);
-	row = indices[0];
-	gtk_tree_path_free(tp);
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	count = ghb_array_len(subtitle_list);
-	if (row < 0 || row >= count)
-		return;
-
-	settings = ghb_array_get_nth(subtitle_list, row);
-
-	ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", active);
-	gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, active, -1);
-
-	if (active)
-	{
-		ghb_settings_set_boolean(settings, "SubtitleBurned", !active);
-		gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, !active, -1);
-	}
-	// allow only one default
-	ghb_subtitle_exclusive_default(ud, row);
-	ghb_live_reset(ud);
+    GtkTreeView  *tv;
+    GtkTreeModel *tm;
+    GtkTreeIter   ti;
+    GtkTreePath  *tp;
+    gboolean      active;
+    gint          row;
+    gint *indices;
+    GValue *subtitle_list;
+    gint count;
+    GValue *settings;
+
+    g_debug("default toggled");
+    tp = gtk_tree_path_new_from_string (path);
+    tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    g_return_if_fail(tv != NULL);
+    tm = gtk_tree_view_get_model(tv);
+    g_return_if_fail(tm != NULL);
+    gtk_tree_model_get_iter(tm, &ti, tp);
+    gtk_tree_model_get(tm, &ti, 3, &active, -1);
+    active ^= 1;
+
+    // Get the row number
+    indices = gtk_tree_path_get_indices (tp);
+    row = indices[0];
+    gtk_tree_path_free(tp);
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    count = ghb_array_len(subtitle_list);
+    if (row < 0 || row >= count)
+        return;
+
+    settings = ghb_array_get_nth(subtitle_list, row);
+
+    int source, mux;
+    source = ghb_settings_get_int(settings, "SubtitleSource");
+    mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+    if (active && !hb_subtitle_can_pass(source, mux))
+        return;
+
+    ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", active);
+    gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, active, -1);
+
+    if (active)
+    {
+        ghb_settings_set_boolean(settings, "SubtitleBurned", !active);
+        gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, !active, -1);
+    }
+    // allow only one default
+    ghb_subtitle_exclusive_default(ud, row);
+    ghb_live_reset(ud);
 }
 
-static void
-subtitle_list_refresh_selected(signal_user_data_t *ud)
+void
+ghb_subtitle_list_refresh_selected(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gint *indices;
-	gint row;
-	GValue *settings = NULL;
-	const GValue *subtitle_list;
-	gboolean allow_force = FALSE;
-	gboolean allow_burn = FALSE;
-	
-	g_debug("subtitle_list_refresh_selected ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		gchar *track, *source;
-		gboolean forced, burned, def;
-		gchar *s_track;
-		gint offset = 0;
-	
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		if (row < 0) return;
-		subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-		if (row >= ghb_array_len(subtitle_list))
-			return;
-		settings = ghb_array_get_nth(subtitle_list, row);
-
-		def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
-		gint i_source;
-		i_source = ghb_settings_get_int(settings, "SubtitleSource");
-		if (!canBurn(i_source))
-		{
-			burned = FALSE;
-			ghb_settings_set_boolean(settings, "SubtitleBurned", burned);
-		}
-		if (!canForce(i_source))
-		{
-			// Force only apply to VOBSUBS
-			forced = FALSE;
-			ghb_settings_set_boolean(settings, "SubtitleForced", forced);
-		}
-
-		if (i_source == SRTSUB)
-		{
-			const gchar *lang;
-			gchar *code;
-
-			lang = ghb_settings_combo_option(settings, "SrtLanguage");
-			code = ghb_settings_get_string(settings, "SrtCodeset");
-
-			s_track = ghb_settings_get_string(settings, "SrtFile");
-			if (g_file_test(s_track, G_FILE_TEST_IS_REGULAR))
-			{
-				gchar *basename;
-
-				basename = g_path_get_basename(s_track);
-				track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
-				source = g_strdup_printf("SRT (%s)", basename);
-				g_free(basename);
-			}
-			else
-			{
-				track = g_strdup_printf("%s (%s)(SRT)", lang, code);
-				source = g_strdup_printf("SRT (none)");
-			}
-			g_free(code);
-			offset = ghb_settings_get_int(settings, "SrtOffset");
-
-			forced = FALSE;
-			burned = FALSE;
-		}
-		else
-		{
-			track = g_strdup(
-				ghb_settings_combo_option(settings, "SubtitleTrack"));
-			source = g_strdup(ghb_subtitle_source_name(i_source));
-			s_track = ghb_settings_get_string(settings, "SubtitleTrack");
-
-			forced = ghb_settings_get_boolean(settings, "SubtitleForced");
-			burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
-		}
-
-		if (canBurn(i_source))
-			allow_burn = TRUE;
-		if (canForce(i_source))
-			allow_force = TRUE;
-
-		gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-			// These are displayed in list
-			0, track,
-			1, forced,
-			2, burned,
-			3, def,
-			4, offset,
-			// These are used to set combo box values when a list item is selected
-			5, s_track,
-			6, i_source,
-			7, allow_force,
-			8, allow_burn,
-			-1);
-		g_free(track);
-		g_free(source);
-		g_free(s_track);
-		if (burned)
-			ghb_subtitle_exclusive_burn(ud, row);
-	}
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gint *indices;
+    gint row;
+    GValue *settings = NULL;
+    const GValue *subtitle_list;
+    gboolean allow_force = FALSE;
+    gboolean allow_burn = FALSE;
+    
+    g_debug("subtitle_list_refresh_selected ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        gchar *track, *source;
+        gboolean forced, burned, def;
+        gchar *s_track;
+        gint offset = 0;
+    
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        if (row < 0) return;
+        subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+        if (row >= ghb_array_len(subtitle_list))
+            return;
+        settings = ghb_array_get_nth(subtitle_list, row);
+
+        burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+
+        gint i_source;
+        i_source = ghb_settings_get_int(settings, "SubtitleSource");
+        if (!ghb_canBurnSub(i_source))
+        {
+            burned = FALSE;
+            ghb_settings_set_boolean(settings, "SubtitleBurned", burned);
+        }
+
+        gint i_mux;
+        i_mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+        if (!burned && !ghb_canPassSub(i_source, i_mux))
+        {
+            burned = TRUE;
+            ghb_settings_set_boolean(settings, "SubtitleBurned", burned);
+            ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", FALSE);
+        }
+
+        forced = ghb_settings_get_boolean(settings, "SubtitleForced");
+        if (!ghb_canForceSub(i_source))
+        {
+            forced = FALSE;
+            ghb_settings_set_boolean(settings, "SubtitleForced", forced);
+        }
+
+        def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+
+        if (i_source == SRTSUB)
+        {
+            const gchar *lang;
+            gchar *code;
+
+            lang = ghb_settings_combo_option(settings, "SrtLanguage");
+            code = ghb_settings_get_string(settings, "SrtCodeset");
+
+            s_track = ghb_settings_get_string(settings, "SrtFile");
+            if (g_file_test(s_track, G_FILE_TEST_IS_REGULAR))
+            {
+                gchar *basename;
+
+                basename = g_path_get_basename(s_track);
+                track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
+                source = g_strdup_printf("SRT (%s)", basename);
+                g_free(basename);
+            }
+            else
+            {
+                track = g_strdup_printf("%s (%s)(SRT)", lang, code);
+                source = g_strdup_printf("SRT (none)");
+            }
+            g_free(code);
+            offset = ghb_settings_get_int(settings, "SrtOffset");
+        }
+        else
+        {
+            track = g_strdup(
+                ghb_settings_combo_option(settings, "SubtitleTrack"));
+            source = g_strdup(hb_subsource_name(i_source));
+            s_track = ghb_settings_get_string(settings, "SubtitleTrack");
+        }
+
+        if (ghb_canBurnSub(i_source))
+            allow_burn = TRUE;
+        if (ghb_canForceSub(i_source))
+            allow_force = TRUE;
+
+        gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
+            // These are displayed in list
+            0, track,
+            1, forced,
+            2, burned,
+            3, def,
+            4, offset,
+            // These are used to set combo box values when a list item is selected
+            5, s_track,
+            6, i_source,
+            7, allow_force,
+            8, allow_burn,
+            -1);
+        g_free(track);
+        g_free(source);
+        g_free(s_track);
+        if (burned)
+            ghb_subtitle_exclusive_burn(ud, row);
+    }
 }
 
 G_MODULE_EXPORT void
 subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *settings;
-
-	g_debug("subtitle_track_changed_cb ()");
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_widget_to_setting(ud->settings, widget);
-	settings = ghb_selected_subtitle_settings(ud);
-	if (settings != NULL)
-	{
-		const gchar *track, *lang;
-		gint tt, source;
-
-		ghb_widget_to_setting(settings, widget);
-		track = ghb_settings_combo_option(settings, "SubtitleTrack");
-		ghb_settings_set_string(settings, "SubtitleTrackDescription", track);
-		tt = ghb_settings_get_int(settings, "SubtitleTrack");
-		source = ghb_subtitle_track_source(ud->settings, tt);
-		ghb_settings_set_int(settings, "SubtitleSource", source);
-		lang = ghb_settings_combo_string(settings, "SubtitleTrack");
-		ghb_settings_set_string(settings, "SubtitleLanguage", lang);
-		subtitle_list_refresh_selected(ud);
-		ghb_live_reset(ud);
-	}
-	ghb_live_reset(ud);
+    GValue *settings;
+
+    g_debug("subtitle_track_changed_cb ()");
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_widget_to_setting(ud->settings, widget);
+    settings = ghb_selected_subtitle_settings(ud);
+    if (settings != NULL)
+    {
+        const gchar *track, *lang;
+        gint tt, source;
+
+        ghb_widget_to_setting(settings, widget);
+        track = ghb_settings_combo_option(settings, "SubtitleTrack");
+        ghb_settings_set_string(settings, "SubtitleTrackDescription", track);
+        tt = ghb_settings_get_int(settings, "SubtitleTrack");
+        source = ghb_subtitle_track_source(ud->settings, tt);
+        ghb_settings_set_int(settings, "SubtitleSource", source);
+        lang = ghb_settings_combo_string(settings, "SubtitleTrack");
+        ghb_settings_set_string(settings, "SubtitleLanguage", lang);
+        ghb_subtitle_list_refresh_selected(ud);
+        ghb_live_reset(ud);
+    }
+    ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
 srt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *settings;
-
-	g_debug("srt_changed_cb ()");
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_widget_to_setting(ud->settings, widget);
-	settings = ghb_selected_subtitle_settings(ud);
-	if (settings != NULL)
-	{
-		ghb_widget_to_setting(settings, widget);
-		subtitle_list_refresh_selected(ud);
-
-		ghb_live_reset(ud);
-	}
+    GValue *settings;
+
+    g_debug("srt_changed_cb ()");
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_widget_to_setting(ud->settings, widget);
+    settings = ghb_selected_subtitle_settings(ud);
+    if (settings != NULL)
+    {
+        ghb_widget_to_setting(settings, widget);
+        ghb_subtitle_list_refresh_selected(ud);
+
+        ghb_live_reset(ud);
+    }
 }
 
 G_MODULE_EXPORT void
 srt_file_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *settings;
-
-	g_debug("srt_file_changed_cb ()");
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_widget_to_setting(ud->settings, widget);
-	settings = ghb_selected_subtitle_settings(ud);
-	if (settings != NULL)
-	{
-		gchar *filename, *dirname;
-
-		ghb_widget_to_setting(settings, widget);
-		subtitle_list_refresh_selected(ud);
-
-		ghb_live_reset(ud);
-
-		filename = ghb_settings_get_string(settings, "SrtFile");
-		if (g_file_test(filename, G_FILE_TEST_IS_DIR))
-		{
-			ghb_settings_set_string(ud->settings, "SrtDir", filename);
-		}
-		else
-		{
-			dirname = g_path_get_dirname(filename);
-			ghb_settings_set_string(ud->settings, "SrtDir", dirname);
-			g_free(dirname);
-		}
-		ghb_pref_save(ud->settings, "SrtDir");
-		g_free(filename);
-	}
+    GValue *settings;
+
+    g_debug("srt_file_changed_cb ()");
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_widget_to_setting(ud->settings, widget);
+    settings = ghb_selected_subtitle_settings(ud);
+    if (settings != NULL)
+    {
+        gchar *filename, *dirname;
+
+        ghb_widget_to_setting(settings, widget);
+        ghb_subtitle_list_refresh_selected(ud);
+
+        ghb_live_reset(ud);
+
+        filename = ghb_settings_get_string(settings, "SrtFile");
+        if (g_file_test(filename, G_FILE_TEST_IS_DIR))
+        {
+            ghb_settings_set_string(ud->settings, "SrtDir", filename);
+        }
+        else
+        {
+            dirname = g_path_get_dirname(filename);
+            ghb_settings_set_string(ud->settings, "SrtDir", dirname);
+            g_free(dirname);
+        }
+        ghb_pref_save(ud->settings, "SrtDir");
+        g_free(filename);
+    }
 }
 
 G_MODULE_EXPORT void
 srt_lang_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GValue *settings;
+    GValue *settings;
 
-	g_debug("srt_lang_changed_cb ()");
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_widget_to_setting(ud->settings, widget);
-	settings = ghb_selected_subtitle_settings(ud);
-	if (settings != NULL)
-	{
-		const gchar *lang;
+    g_debug("srt_lang_changed_cb ()");
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_widget_to_setting(ud->settings, widget);
+    settings = ghb_selected_subtitle_settings(ud);
+    if (settings != NULL)
+    {
+        const gchar *lang;
 
-		ghb_widget_to_setting(settings, widget);
-		subtitle_list_refresh_selected(ud);
+        ghb_widget_to_setting(settings, widget);
+        ghb_subtitle_list_refresh_selected(ud);
 
-		ghb_live_reset(ud);
+        ghb_live_reset(ud);
 
-		lang = ghb_settings_combo_option(settings, "SrtLanguage");
-		ghb_settings_set_string(settings, "SubtitleTrackDescription", lang);
-	}
+        lang = ghb_settings_combo_option(settings, "SrtLanguage");
+        ghb_settings_set_string(settings, "SubtitleTrackDescription", lang);
+    }
 }
 
 static void
 ghb_clear_subtitle_list_settings(GValue *settings)
 {
-	GValue *subtitle_list;
-
-	g_debug("clear_subtitle_list ()");
-	subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
-	if (subtitle_list == NULL)
-	{
-		subtitle_list = ghb_array_value_new(8);
-		ghb_settings_set_value(settings, "subtitle_list", subtitle_list);
-	}
-	else
-		ghb_array_value_reset(subtitle_list, 8);
+    GValue *subtitle_list;
+
+    g_debug("clear_subtitle_list ()");
+    subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
+    if (subtitle_list == NULL)
+    {
+        subtitle_list = ghb_array_value_new(8);
+        ghb_settings_set_value(settings, "subtitle_list", subtitle_list);
+    }
+    else
+        ghb_array_value_reset(subtitle_list, 8);
 }
 
 static void
 ghb_clear_subtitle_list(signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkListStore *store;
-	
-	g_debug("clear_subtitle_list ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-	gtk_list_store_clear (store);
+    GtkTreeView *treeview;
+    GtkListStore *store;
+    
+    g_debug("clear_subtitle_list ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+    gtk_list_store_clear (store);
 }
 
 static void
 add_to_subtitle_list(
-	signal_user_data_t *ud, 
-	GValue *settings)
+    signal_user_data_t *ud, 
+    GValue *settings)
 {
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	GtkTreeSelection *selection;
-	const gchar *track, *source;
-	gboolean forced, burned, def;
-	gchar *s_track;
-	gint i_source;
-	gboolean allow_force = FALSE;
-	gboolean allow_burn = FALSE;
-	
-	g_debug("add_to_subtitle_list ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
-	track = ghb_settings_combo_option(settings, "SubtitleTrack");
-	forced = ghb_settings_get_boolean(settings, "SubtitleForced");
-	burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
-	def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
-	s_track = ghb_settings_get_string(settings, "SubtitleTrack");
-	i_source = ghb_settings_get_int(settings, "SubtitleSource");
-	source = ghb_subtitle_source_name(i_source);
-
-	if (canBurn(i_source))
-		allow_burn = TRUE;
-	if (canForce(i_source))
-		allow_force = TRUE;
-
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 
-		// These are displayed in list
-		0, track,
-		1, forced,
-		2, burned,
-		3, def,
-		// These are used to set combo box values when a list item is selected
-		5, s_track,
-		6, i_source,
-		7, allow_force,
-		8, allow_burn,
-		9, FALSE,
-		-1);
-	gtk_tree_selection_select_iter(selection, &iter);
-	g_free(s_track);
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    GtkTreeSelection *selection;
+    const gchar *track;
+    gboolean forced, burned, def;
+    gchar *s_track;
+    gint i_source;
+    gboolean allow_force = FALSE;
+    gboolean allow_burn = FALSE;
+    
+    g_debug("add_to_subtitle_list ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+
+    track = ghb_settings_combo_option(settings, "SubtitleTrack");
+    forced = ghb_settings_get_boolean(settings, "SubtitleForced");
+    burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+    def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+
+    s_track = ghb_settings_get_string(settings, "SubtitleTrack");
+    i_source = ghb_settings_get_int(settings, "SubtitleSource");
+
+    if (ghb_canBurnSub(i_source))
+        allow_burn = TRUE;
+    if (ghb_canForceSub(i_source))
+        allow_force = TRUE;
+
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+        // These are displayed in list
+        0, track,
+        1, forced,
+        2, burned,
+        3, def,
+        // These are used to set combo box values when a list item is selected
+        5, s_track,
+        6, i_source,
+        7, allow_force,
+        8, allow_burn,
+        9, FALSE,
+        -1);
+    gtk_tree_selection_select_iter(selection, &iter);
+    g_free(s_track);
 }
 
 static void
 add_to_srt_list(
-	signal_user_data_t *ud, 
-	GValue *settings)
+    signal_user_data_t *ud, 
+    GValue *settings)
 {
-	GtkTreeView *treeview;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	GtkTreeSelection *selection;
-	const gchar *lang;
-	gboolean forced, burned, def;
-	gchar *filename, *code, *track, *source;
-	gint i_source, offset;
-	
-	g_debug("add_to_srt_list ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
-	lang = ghb_settings_combo_option(settings, "SrtLanguage");
-	code = ghb_settings_get_string(settings, "SrtCodeset");
-	forced = FALSE;
-	burned = FALSE;
-	def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
-	filename = ghb_settings_get_string(settings, "SrtFile");
-	if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
-	{
-		gchar *basename;
-
-		basename = g_path_get_basename(filename);
-		track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
-		source = g_strdup_printf("SRT (%s)", basename);
-		g_free(basename);
-	}
-	else
-	{
-		track = g_strdup_printf("%s (%s)(SRT)", lang, code);
-		source = g_strdup_printf("SRT (none)");
-	}
-	i_source = SRTSUB;
-	offset = ghb_settings_get_int(settings, "SrtOffset");
-
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 
-		// These are displayed in list
-		0, track,
-		1, forced,
-		2, burned,
-		3, def,
-		4, offset,
-		// These are used to set combo box values when a list item is selected
-		5, filename,
-		6, i_source,
-		7, FALSE,
-		8, FALSE,
-		9, TRUE,
-		-1);
-	gtk_tree_selection_select_iter(selection, &iter);
-	g_free(code);
-	g_free(track);
-	g_free(filename);
-	g_free(source);
+    GtkTreeView *treeview;
+    GtkTreeIter iter;
+    GtkListStore *store;
+    GtkTreeSelection *selection;
+    const gchar *lang;
+    gboolean forced, burned, def;
+    gchar *filename, *code, *track, *source;
+    gint i_source, offset;
+    
+    g_debug("add_to_srt_list ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+
+    lang = ghb_settings_combo_option(settings, "SrtLanguage");
+    code = ghb_settings_get_string(settings, "SrtCodeset");
+    forced = FALSE;
+    burned = FALSE;
+    def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+
+    filename = ghb_settings_get_string(settings, "SrtFile");
+    if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+    {
+        gchar *basename;
+
+        basename = g_path_get_basename(filename);
+        track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
+        source = g_strdup_printf("SRT (%s)", basename);
+        g_free(basename);
+    }
+    else
+    {
+        track = g_strdup_printf("%s (%s)(SRT)", lang, code);
+        source = g_strdup_printf("SRT (none)");
+    }
+    i_source = SRTSUB;
+    offset = ghb_settings_get_int(settings, "SrtOffset");
+
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 
+        // These are displayed in list
+        0, track,
+        1, forced,
+        2, burned,
+        3, def,
+        4, offset,
+        // These are used to set combo box values when a list item is selected
+        5, filename,
+        6, i_source,
+        7, FALSE,
+        8, FALSE,
+        9, TRUE,
+        -1);
+    gtk_tree_selection_select_iter(selection, &iter);
+    g_free(code);
+    g_free(track);
+    g_free(filename);
+    g_free(source);
 }
 
 G_MODULE_EXPORT void
 subtitle_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
 {
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	GtkWidget *widget;
-	
-	g_debug("subtitle_list_selection_changed_cb ()");
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		gint source;
-		GtkTreePath *treepath;
-		gint *indices, row;
-		GValue *subtitle_list, *settings;
-
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-
-		subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-		if (row >= ghb_array_len(subtitle_list))
-			return;
-
-		settings = ghb_array_get_nth(subtitle_list, row);
-
-		source = ghb_settings_get_int(settings, "SubtitleSource");
-		if (source == SRTSUB)
-		{
-			gchar *str;
-			gint offset;
-
-			str = ghb_settings_get_string(settings, "SrtLanguage");
-			ghb_ui_update(ud, "SrtLanguage", ghb_string_value(str));
-			g_free(str);
-
-			str = ghb_settings_get_string(settings, "SrtCodeset");
-			ghb_ui_update(ud, "SrtCodeset", ghb_string_value(str));
-			g_free(str);
-
-			str = ghb_settings_get_string(settings, "SrtFile");
-			ghb_ui_update(ud, "SrtFile", ghb_string_value(str));
-			g_free(str);
-
-			offset = ghb_settings_get_int(settings, "SrtOffset");
-			ghb_ui_update(ud, "SrtOffset", ghb_int_value(offset));
-
-			widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_lang_label");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_code_label");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_file_label");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_offset_label");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtLanguage");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtCodeset");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtFile");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtOffset");
-			gtk_widget_show(widget);
-		}
-		else
-		{
-			gchar *track;
-
-			track = ghb_settings_get_string(settings, "SubtitleTrack");
-			ghb_ui_update(ud, "SubtitleTrack", ghb_string_value(track));
-			g_free(track);
-
-			widget = GHB_WIDGET(ud->builder, "srt_lang_label");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_code_label");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_file_label");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "srt_offset_label");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtLanguage");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtCodeset");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtFile");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "SrtOffset");
-			gtk_widget_hide(widget);
-			widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
-			gtk_widget_show(widget);
-			widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
-			gtk_widget_show(widget);
-		}
-		widget = GHB_WIDGET (ud->builder, "subtitle_remove");
-		gtk_widget_set_sensitive(widget, TRUE);
-	}
-	else
-	{
-		widget = GHB_WIDGET(ud->builder, "srt_lang_label");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "srt_code_label");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "srt_file_label");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "srt_offset_label");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "SrtLanguage");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "SrtCodeset");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "SrtFile");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "SrtOffset");
-		gtk_widget_hide(widget);
-		widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
-		gtk_widget_show(widget);
-		widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
-		gtk_widget_show(widget);
-	}
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    GtkWidget *widget;
+    
+    g_debug("subtitle_list_selection_changed_cb ()");
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        gint source;
+        GtkTreePath *treepath;
+        gint *indices, row;
+        GValue *subtitle_list, *settings;
+
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+
+        subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+        if (row >= ghb_array_len(subtitle_list))
+            return;
+
+        settings = ghb_array_get_nth(subtitle_list, row);
+
+        source = ghb_settings_get_int(settings, "SubtitleSource");
+        if (source == SRTSUB)
+        {
+            gchar *str;
+            gint offset;
+
+            str = ghb_settings_get_string(settings, "SrtLanguage");
+            ghb_ui_update(ud, "SrtLanguage", ghb_string_value(str));
+            g_free(str);
+
+            str = ghb_settings_get_string(settings, "SrtCodeset");
+            ghb_ui_update(ud, "SrtCodeset", ghb_string_value(str));
+            g_free(str);
+
+            str = ghb_settings_get_string(settings, "SrtFile");
+            ghb_ui_update(ud, "SrtFile", ghb_string_value(str));
+            g_free(str);
+
+            offset = ghb_settings_get_int(settings, "SrtOffset");
+            ghb_ui_update(ud, "SrtOffset", ghb_int_value(offset));
+
+            widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_lang_label");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_code_label");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_file_label");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_offset_label");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtLanguage");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtCodeset");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtFile");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtOffset");
+            gtk_widget_show(widget);
+        }
+        else
+        {
+            gchar *track;
+
+            track = ghb_settings_get_string(settings, "SubtitleTrack");
+            ghb_ui_update(ud, "SubtitleTrack", ghb_string_value(track));
+            g_free(track);
+
+            widget = GHB_WIDGET(ud->builder, "srt_lang_label");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_code_label");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_file_label");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "srt_offset_label");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtLanguage");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtCodeset");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtFile");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "SrtOffset");
+            gtk_widget_hide(widget);
+            widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
+            gtk_widget_show(widget);
+            widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
+            gtk_widget_show(widget);
+        }
+        widget = GHB_WIDGET (ud->builder, "subtitle_remove");
+        gtk_widget_set_sensitive(widget, TRUE);
+    }
+    else
+    {
+        widget = GHB_WIDGET(ud->builder, "srt_lang_label");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "srt_code_label");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "srt_file_label");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "srt_offset_label");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "SrtLanguage");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "SrtCodeset");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "SrtFile");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "SrtOffset");
+        gtk_widget_hide(widget);
+        widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
+        gtk_widget_show(widget);
+        widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
+        gtk_widget_show(widget);
+    }
 }
 
 G_MODULE_EXPORT void
 srt_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	// Add the current subtitle settings to the list.
-	GValue *settings;
-	gchar *dir, *filename, *lang;
-	
-	g_debug("subtitle_add_clicked_cb ()");
-
-	settings = ghb_dict_value_new();
-	ghb_settings_set_int(settings, "SubtitleSource", SRTSUB);
-	lang = ghb_settings_get_string(ud->settings, "PreferredLanguage");
-	ghb_settings_set_string(settings, "SrtLanguage", lang);
-	g_free(lang);
-	ghb_settings_set_string(settings, "SrtCodeset", "UTF-8");
-
-	dir = ghb_settings_get_string(ud->settings, "SrtDir");
-	filename = g_strdup_printf("%s/none", dir);
-	ghb_settings_set_string(settings, "SrtFile", filename);
-	g_free(dir);
-	g_free(filename);
-
-	ghb_settings_set_int(settings, "SrtOffset", 0);
-	ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
-							ghb_boolean_value_new(FALSE));
-
-	ghb_add_srt(ud, settings);
+    // Add the current subtitle settings to the list.
+    GValue *settings;
+    gchar *dir, *filename, *lang;
+    
+    g_debug("subtitle_add_clicked_cb ()");
+
+    settings = ghb_dict_value_new();
+    ghb_settings_set_int(settings, "SubtitleSource", SRTSUB);
+    lang = ghb_settings_get_string(ud->settings, "PreferredLanguage");
+    ghb_settings_set_string(settings, "SrtLanguage", lang);
+    g_free(lang);
+    ghb_settings_set_string(settings, "SrtCodeset", "UTF-8");
+
+    dir = ghb_settings_get_string(ud->settings, "SrtDir");
+    filename = g_strdup_printf("%s/none", dir);
+    ghb_settings_set_string(settings, "SrtFile", filename);
+    g_free(dir);
+    g_free(filename);
+
+    ghb_settings_set_int(settings, "SrtOffset", 0);
+    ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
+                            ghb_boolean_value_new(FALSE));
+
+    ghb_add_srt(ud, settings);
 }
 
 G_MODULE_EXPORT void
 subtitle_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-	// Add the current subtitle settings to the list.
-	GValue *settings;
-	gboolean burned = FALSE;
-	gint track, source;
-	
-	g_debug("subtitle_add_clicked_cb ()");
-
-	track = ghb_settings_get_int(ud->settings, "SubtitleTrack");
-
-	settings = ghb_dict_value_new();
-	ghb_settings_set_int(settings, "SubtitleTrack", track);
-	source = ghb_subtitle_track_source(ud->settings, track);
-	ghb_settings_set_int(settings, "SubtitleSource", source);
-	ghb_settings_take_value(settings, "SubtitleForced", 
-							ghb_boolean_value_new(FALSE));
-	ghb_settings_take_value(settings, "SubtitleBurned", 
-							ghb_boolean_value_new(burned));
-	ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
-							ghb_boolean_value_new(FALSE));
-
-	if (!ghb_add_subtitle_to_settings(ud->settings, settings))
-		return;
-
-	ghb_add_subtitle_to_ui(ud, settings);
+    // Add the current subtitle settings to the list.
+    GValue *settings;
+    gboolean burned = FALSE;
+    gint track, source, mux;
+    
+    g_debug("subtitle_add_clicked_cb ()");
+
+    track = ghb_settings_get_int(ud->settings, "SubtitleTrack");
+
+    settings = ghb_dict_value_new();
+    ghb_settings_set_int(settings, "SubtitleTrack", track);
+    source = ghb_subtitle_track_source(ud->settings, track);
+
+    // Initialize to passthru if possible, else burn
+    mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+    burned = !hb_subtitle_can_pass(source, mux);
+
+    ghb_settings_set_int(settings, "SubtitleSource", source);
+    ghb_settings_take_value(settings, "SubtitleForced", 
+                            ghb_boolean_value_new(FALSE));
+    ghb_settings_take_value(settings, "SubtitleBurned", 
+                            ghb_boolean_value_new(burned));
+    ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
+                            ghb_boolean_value_new(FALSE));
+
+    if (!ghb_add_subtitle_to_settings(ud->settings, settings))
+        return;
+
+    ghb_add_subtitle_to_ui(ud, settings);
 }
 
 G_MODULE_EXPORT void
 subtitle_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	GtkTreeView *treeview;
-	GtkTreePath *treepath;
-	GtkTreeSelection *selection;
-	GtkTreeModel *store;
-	GtkTreeIter iter, nextIter;
-	gint *indices;
-	gint row;
-	GValue *subtitle_list;
-
-	g_debug("subtitle_remove_clicked_cb ()");
-	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	selection = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected(selection, &store, &iter))
-	{
-		nextIter = iter;
-		if (!gtk_tree_model_iter_next(store, &nextIter))
-		{
-			nextIter = iter;
-			if (gtk_tree_model_get_iter_first(store, &nextIter))
-			{
-				gtk_tree_selection_select_iter (selection, &nextIter);
-			}
-		}
-		else
-		{
-			gtk_tree_selection_select_iter (selection, &nextIter);
-		}
-		// Get the row number
-		treepath = gtk_tree_model_get_path (store, &iter);
-		indices = gtk_tree_path_get_indices (treepath);
-		row = indices[0];
-		gtk_tree_path_free(treepath);
-		// Remove the selected item
-		gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
-		// remove from subtitle settings list
-		if (row < 0) return;
-		widget = GHB_WIDGET (ud->builder, "subtitle_add");
-		gtk_widget_set_sensitive(widget, TRUE);
-		widget = GHB_WIDGET (ud->builder, "srt_add");
-		gtk_widget_set_sensitive(widget, TRUE);
-		subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-		if (row >= ghb_array_len(subtitle_list))
-			return;
-		GValue *old = ghb_array_get_nth(subtitle_list, row);
-		ghb_value_free(old);
-		ghb_array_remove(subtitle_list, row);
-		ghb_live_reset(ud);
-	}
+    GtkTreeView *treeview;
+    GtkTreePath *treepath;
+    GtkTreeSelection *selection;
+    GtkTreeModel *store;
+    GtkTreeIter iter, nextIter;
+    gint *indices;
+    gint row;
+    GValue *subtitle_list;
+
+    g_debug("subtitle_remove_clicked_cb ()");
+    treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_get_selected(selection, &store, &iter))
+    {
+        nextIter = iter;
+        if (!gtk_tree_model_iter_next(store, &nextIter))
+        {
+            nextIter = iter;
+            if (gtk_tree_model_get_iter_first(store, &nextIter))
+            {
+                gtk_tree_selection_select_iter (selection, &nextIter);
+            }
+        }
+        else
+        {
+            gtk_tree_selection_select_iter (selection, &nextIter);
+        }
+
+        // Get the row number
+        treepath = gtk_tree_model_get_path (store, &iter);
+        indices = gtk_tree_path_get_indices (treepath);
+        row = indices[0];
+        gtk_tree_path_free(treepath);
+        if (row < 0) return;
+
+        subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+        if (row >= ghb_array_len(subtitle_list))
+            return;
+
+        // Update our settings list before removing the row from the
+        // treeview.  Removing from the treeview sometimes provokes an
+        // immediate selection change, so the list needs to be up to date
+        // when this happens.
+        GValue *old = ghb_array_get_nth(subtitle_list, row);
+        ghb_value_free(old);
+        ghb_array_remove(subtitle_list, row);
+
+        // Remove the selected item
+        gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
+        // remove from subtitle settings list
+        widget = GHB_WIDGET (ud->builder, "subtitle_add");
+        gtk_widget_set_sensitive(widget, TRUE);
+        widget = GHB_WIDGET (ud->builder, "srt_add");
+        gtk_widget_set_sensitive(widget, TRUE);
+
+        ghb_live_reset(ud);
+    }
 }
 
 void
 ghb_subtitle_prune(signal_user_data_t *ud)
 {
-	GtkTreeView  *tv;
-	GtkTreeModel *tm;
-	GValue *subtitle_list;
-	gint count, ii;
-	gint first_track = 0, one_burned = 0;
-
-	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-	if (subtitle_list == NULL)
-		return;
-	count = ghb_array_len(subtitle_list);
-
-	tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-	g_return_if_fail(tv != NULL);
-	tm = gtk_tree_view_get_model(tv);
-	for (ii = count-1; ii >= 0; ii--)
-	{
-		gboolean burned;
-		GValue *settings;
-
-		settings = ghb_array_get_nth(subtitle_list, ii);
-		burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
-		if (burned)
-		{
-			first_track = ii;
-			one_burned++;
-		}
-	}
-	if (one_burned)
-	{
-		ghb_subtitle_exclusive_burn(ud, first_track);
-	}
+    GtkTreeView  *tv;
+    GValue *subtitle_list;
+    gint count, ii;
+    gint first_track = 0, one_burned = 0;
+
+    subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+    if (subtitle_list == NULL)
+        return;
+    count = ghb_array_len(subtitle_list);
+
+    tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+    g_return_if_fail(tv != NULL);
+    for (ii = count-1; ii >= 0; ii--)
+    {
+        gboolean burned;
+        GValue *settings;
+
+        settings = ghb_array_get_nth(subtitle_list, ii);
+        burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+        if (burned)
+        {
+            first_track = ii;
+            one_burned++;
+        }
+    }
+    if (one_burned)
+    {
+        ghb_subtitle_exclusive_burn(ud, first_track);
+    }
 }
 
 void
 ghb_reset_subtitles(signal_user_data_t *ud, GValue *settings)
 {
-	GValue *slist;
-	GValue *subtitle;
-	gint count, ii;
-	gint titleindex;
-	
-	g_debug("ghb_reset_subtitles");
-	ghb_clear_subtitle_list_settings(ud->settings);
-	ghb_clear_subtitle_list(ud);
-	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	if (titleindex < 0)
-		return;
-
-	slist = ghb_settings_get_value(settings, "subtitle_list");
-	count = ghb_array_len(slist);
-	for (ii = 0; ii < count; ii++)
-	{
-		int source;
-
-		subtitle = ghb_value_dup(ghb_array_get_nth(slist, ii));
-		source = ghb_settings_get_int(subtitle, "SubtitleSource");
-		if (source == SRTSUB)
-			ghb_add_srt(ud, subtitle);
-		else
-		{
-			if (!ghb_add_subtitle_to_settings(ud->settings, subtitle))
-				return;
-			ghb_add_subtitle_to_ui(ud, subtitle);
-		}
-	}
+    GValue *slist;
+    GValue *subtitle;
+    gint count, ii;
+    gint titleindex;
+    
+    g_debug("ghb_reset_subtitles");
+    ghb_clear_subtitle_list_settings(ud->settings);
+    ghb_clear_subtitle_list(ud);
+    titleindex = ghb_settings_combo_int(ud->settings, "title");
+    if (titleindex < 0)
+        return;
+
+    slist = ghb_settings_get_value(settings, "subtitle_list");
+    count = ghb_array_len(slist);
+    for (ii = 0; ii < count; ii++)
+    {
+        int source;
+
+        subtitle = ghb_value_dup(ghb_array_get_nth(slist, ii));
+        source = ghb_settings_get_int(subtitle, "SubtitleSource");
+        if (source == SRTSUB)
+            ghb_add_srt(ud, subtitle);
+        else
+        {
+            if (!ghb_add_subtitle_to_settings(ud->settings, subtitle))
+                return;
+            ghb_add_subtitle_to_ui(ud, subtitle);
+        }
+    }
 }

HandBrake-0.9.8.tar.bz2/gtk/src/subtitlehandler.h -> HandBrake-0.9.9.tar.bz2/gtk/src/subtitlehandler.h Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * subtitlehandler.h
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * audiohandler.h is free software.
  * 
@@ -17,9 +17,9 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with callbacks.h.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #if !defined(_SUBTITLEHANDLER_H_)
@@ -35,5 +35,9 @@
 void ghb_reset_subtitles(signal_user_data_t *ud, GValue *settings);
 void ghb_subtitle_prune(signal_user_data_t *ud);
 gboolean ghb_soft_in_subtitle_list(GValue *subtitle_list);
+gboolean ghb_canBurnSub(int source);
+gboolean ghb_canForceSub(int source);
+gboolean ghb_canPassSub(int source, int mux);
+void ghb_subtitle_list_refresh_selected(signal_user_data_t *ud);
 
 #endif // _SUBTITLEHANDLER_H_

HandBrake-0.9.8.tar.bz2/gtk/src/values.c -> HandBrake-0.9.9.tar.bz2/gtk/src/values.c Changed

HandBrake-0.9.8.tar.bz2/gtk/src/values.h -> HandBrake-0.9.9.tar.bz2/gtk/src/values.h Changed

HandBrake-0.9.8.tar.bz2/gtk/src/widgetdeps.c -> HandBrake-0.9.9.tar.bz2/gtk/src/widgetdeps.c Changed

@@ -7,136 +7,136 @@
 
 typedef struct
 {
-	const gchar *widget_name;
-	const gchar *dep_name;
-	const gchar *enable_value;
-	const gboolean disable_if_equal;
-	const gboolean hide;
+    const gchar *widget_name;
+    const gchar *dep_name;
+    const gchar *enable_value;
+    const gboolean disable_if_equal;
+    const gboolean hide;
 } dependency_t;
 
 static dependency_t dep_map[] =
 {
-	{"title", "queue_add", "none", TRUE, FALSE},
-	{"title", "queue_add_menu", "none", TRUE, FALSE},
-	{"title", "preview_frame", "none", TRUE, FALSE},
-	{"title", "picture_label", "none", TRUE, FALSE},
-	{"title", "picture_tab", "none", TRUE, FALSE},
-	{"title", "chapters_label", "none", TRUE, FALSE},
-	{"title", "chapters_tab", "none", TRUE, FALSE},
-	{"title", "start_point", "none", TRUE, FALSE},
-	{"title", "end_point", "none", TRUE, FALSE},
-	{"title", "angle", "none", TRUE, FALSE},
-	{"title", "angle_label", "1", TRUE, FALSE},
-	{"use_dvdnav", "angle", "FALSE", TRUE, TRUE},
-	{"use_dvdnav", "angle_label", "FALSE", TRUE, TRUE},
-	{"angle_count", "angle", "1", TRUE, TRUE},
-	{"angle_count", "angle_label", "1", TRUE, TRUE},
-	{"vquality_type_bitrate", "VideoAvgBitrate", "TRUE", FALSE, FALSE},
-	{"vquality_type_target", "VideoTargetSize", "TRUE", FALSE, FALSE},
-	{"vquality_type_constant", "VideoQualitySlider", "TRUE", FALSE, FALSE},
-	{"vquality_type_constant", "VideoTwoPass", "TRUE", TRUE, FALSE},
-	{"vquality_type_constant", "VideoTurboTwoPass", "TRUE", TRUE, FALSE},
-	{"VideoTwoPass", "VideoTurboTwoPass", "TRUE", FALSE, FALSE},
-	{"FileFormat", "Mp4LargeFile", "mp4", FALSE, TRUE},
-	{"FileFormat", "Mp4HttpOptimize", "mp4", FALSE, TRUE},
-	{"FileFormat", "Mp4iPodCompatible", "mp4", FALSE, TRUE},
-	{"PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", TRUE, TRUE},
-	{"PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", TRUE, TRUE},
-	{"PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", TRUE, TRUE},
-	{"PictureDecombDeinterlace", "PictureDecomb", "FALSE", TRUE, TRUE},
-	{"PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", TRUE, TRUE},
-	{"PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", TRUE, TRUE},
-	{"PictureDeinterlace", "PictureDeinterlaceCustom", "custom", FALSE, TRUE},
-	{"PictureDenoise", "PictureDenoiseCustom", "custom", FALSE, TRUE},
-	{"PictureDecomb", "PictureDecombCustom", "custom", FALSE, TRUE},
-	{"PictureDetelecine", "PictureDetelecineCustom", "custom", FALSE, TRUE},
-	{"PictureAutoCrop", "PictureTopCrop", "FALSE", FALSE, FALSE},
-	{"PictureAutoCrop", "PictureBottomCrop", "FALSE", FALSE, FALSE},
-	{"PictureAutoCrop", "PictureLeftCrop", "FALSE", FALSE, FALSE},
-	{"PictureAutoCrop", "PictureRightCrop", "FALSE", FALSE, FALSE},
-	{"VideoEncoder", "x264_tab", "x264", FALSE, FALSE},
-	{"VideoEncoder", "x264_tab_label", "x264", FALSE, FALSE},
-	{"VideoEncoder", "Mp4iPodCompatible", "x264", FALSE, FALSE},
-	{"AudioEncoderActual", "AudioBitrate", "ac3|dts", TRUE, FALSE},
-	{"AudioEncoderActual", "AudioSamplerate", "ac3|dts", TRUE, FALSE},
-	{"AudioEncoderActual", "AudioMixdown", "ac3|dts", TRUE, FALSE},
-	{"AudioEncoderActual", "AudioTrackDRCSlider", "ac3|dts", TRUE, FALSE},
-	{"AudioEncoderActual", "drc_label", "ac3|dts", TRUE, FALSE},
-	{"x264_bframes", "x264_bpyramid", "<2", TRUE, FALSE},
-	{"x264_bframes", "x264_direct", "0", TRUE, FALSE},
-	{"x264_bframes", "x264_b_adapt", "0", TRUE, FALSE},
-	{"x264_cabac", "x264_trellis", "TRUE", FALSE, FALSE},
-	{"x264_subme", "x264_psy_rd", "<6", TRUE, FALSE},
-	{"x264_subme", "x264_psy_trell", "<6", TRUE, FALSE},
-	{"x264_cabac", "x264_psy_trell", "TRUE", FALSE, FALSE},
-	{"x264_trellis", "x264_psy_trell", "0", TRUE, FALSE},
-	{"ChapterMarkers", "chapters_list", "TRUE", FALSE, FALSE},
-	{"use_source_name", "chapters_in_destination", "TRUE", FALSE, FALSE},
-	{"use_source_name", "title_no_in_destination", "TRUE", FALSE, FALSE},
+    {"title", "queue_add", "none", TRUE, FALSE},
+    {"title", "queue_add_menu", "none", TRUE, FALSE},
+    {"title", "preview_frame", "none", TRUE, FALSE},
+    {"title", "picture_label", "none", TRUE, FALSE},
+    {"title", "picture_tab", "none", TRUE, FALSE},
+    {"title", "chapters_label", "none", TRUE, FALSE},
+    {"title", "chapters_tab", "none", TRUE, FALSE},
+    {"title", "start_point", "none", TRUE, FALSE},
+    {"title", "end_point", "none", TRUE, FALSE},
+    {"title", "angle", "none", TRUE, FALSE},
+    {"title", "angle_label", "1", TRUE, FALSE},
+    {"use_dvdnav", "angle", "FALSE", TRUE, TRUE},
+    {"use_dvdnav", "angle_label", "FALSE", TRUE, TRUE},
+    {"angle_count", "angle", "1", TRUE, TRUE},
+    {"angle_count", "angle_label", "1", TRUE, TRUE},
+    {"vquality_type_bitrate", "VideoAvgBitrate", "TRUE", FALSE, FALSE},
+    {"vquality_type_target", "VideoTargetSize", "TRUE", FALSE, FALSE},
+    {"vquality_type_constant", "VideoQualitySlider", "TRUE", FALSE, FALSE},
+    {"vquality_type_constant", "VideoTwoPass", "TRUE", TRUE, FALSE},
+    {"vquality_type_constant", "VideoTurboTwoPass", "TRUE", TRUE, FALSE},
+    {"VideoTwoPass", "VideoTurboTwoPass", "TRUE", FALSE, FALSE},
+    {"FileFormat", "Mp4LargeFile", "mp4", FALSE, TRUE},
+    {"FileFormat", "Mp4HttpOptimize", "mp4", FALSE, TRUE},
+    {"FileFormat", "Mp4iPodCompatible", "mp4", FALSE, TRUE},
+    {"PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", TRUE, TRUE},
+    {"PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", TRUE, TRUE},
+    {"PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", TRUE, TRUE},
+    {"PictureDecombDeinterlace", "PictureDecomb", "FALSE", TRUE, TRUE},
+    {"PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", TRUE, TRUE},
+    {"PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", TRUE, TRUE},
+    {"PictureDeinterlace", "PictureDeinterlaceCustom", "custom", FALSE, TRUE},
+    {"PictureDenoise", "PictureDenoiseCustom", "custom", FALSE, TRUE},
+    {"PictureDecomb", "PictureDecombCustom", "custom", FALSE, TRUE},
+    {"PictureDetelecine", "PictureDetelecineCustom", "custom", FALSE, TRUE},
+    {"PictureAutoCrop", "PictureTopCrop", "FALSE", FALSE, FALSE},
+    {"PictureAutoCrop", "PictureBottomCrop", "FALSE", FALSE, FALSE},
+    {"PictureAutoCrop", "PictureLeftCrop", "FALSE", FALSE, FALSE},
+    {"PictureAutoCrop", "PictureRightCrop", "FALSE", FALSE, FALSE},
+    {"VideoEncoder", "x264_tab", "x264", FALSE, FALSE},
+    {"VideoEncoder", "x264_tab_label", "x264", FALSE, FALSE},
+    {"VideoEncoder", "Mp4iPodCompatible", "x264", FALSE, FALSE},
+    {"AudioEncoderActual", "AudioBitrate", "ac3|dts", TRUE, FALSE},
+    {"AudioEncoderActual", "AudioSamplerate", "ac3|dts", TRUE, FALSE},
+    {"AudioEncoderActual", "AudioMixdown", "ac3|dts", TRUE, FALSE},
+    {"AudioEncoderActual", "AudioTrackDRCSlider", "ac3|dts", TRUE, FALSE},
+    {"AudioEncoderActual", "drc_label", "ac3|dts", TRUE, FALSE},
+    {"x264_bframes", "x264_bpyramid", "<2", TRUE, FALSE},
+    {"x264_bframes", "x264_direct", "0", TRUE, FALSE},
+    {"x264_bframes", "x264_b_adapt", "0", TRUE, FALSE},
+    {"x264_cabac", "x264_trellis", "TRUE", FALSE, FALSE},
+    {"x264_subme", "x264_psy_rd", "<6", TRUE, FALSE},
+    {"x264_subme", "x264_psy_trell", "<6", TRUE, FALSE},
+    {"x264_cabac", "x264_psy_trell", "TRUE", FALSE, FALSE},
+    {"x264_trellis", "x264_psy_trell", "0", TRUE, FALSE},
+    {"ChapterMarkers", "chapters_list", "TRUE", FALSE, FALSE},
+    {"use_source_name", "chapters_in_destination", "TRUE", FALSE, FALSE},
+    {"use_source_name", "title_no_in_destination", "TRUE", FALSE, FALSE},
 };
 
 int
 main(gint argc, gchar *argv[])
 {
-	gint ii, jj;
-	GValue *top;
-	gint count = sizeof(dep_map) / sizeof(dependency_t);
+    gint ii, jj;
+    GValue *top;
+    gint count = sizeof(dep_map) / sizeof(dependency_t);
 
-	g_type_init();
+    g_type_init();
 
-	top = ghb_dict_value_new();
-	for (ii = 0; ii < count; ii++)
-	{
-		const gchar *name;
-		GValue *array;
+    top = ghb_dict_value_new();
+    for (ii = 0; ii < count; ii++)
+    {
+        const gchar *name;
+        GValue *array;
 
-		name = dep_map[ii].widget_name;
-		if (ghb_dict_lookup(top, name))
-			continue;
-		array = ghb_array_value_new(8);
-		for (jj = 0; jj < count; jj++)
-		{
-			if (strcmp(name, dep_map[jj].widget_name) == 0)
-			{
-				ghb_array_append(array,
-					ghb_value_dup(ghb_string_value(dep_map[jj].dep_name)));
-			}
-		}
-		ghb_dict_insert(top, g_strdup(name), array);
-	}
-	ghb_plist_write_file("widget.deps", top);
+        name = dep_map[ii].widget_name;
+        if (ghb_dict_lookup(top, name))
+            continue;
+        array = ghb_array_value_new(8);
+        for (jj = 0; jj < count; jj++)
+        {
+            if (strcmp(name, dep_map[jj].widget_name) == 0)
+            {
+                ghb_array_append(array,
+                    ghb_value_dup(ghb_string_value(dep_map[jj].dep_name)));
+            }
+        }
+        ghb_dict_insert(top, g_strdup(name), array);
+    }
+    ghb_plist_write_file("widget.deps", top);
 
-	// reverse map
-	top = ghb_dict_value_new();
-	for (ii = 0; ii < count; ii++)
-	{
-		const gchar *name;
-		GValue *array;
+    // reverse map
+    top = ghb_dict_value_new();
+    for (ii = 0; ii < count; ii++)
+    {
+        const gchar *name;
+        GValue *array;
 
-		name = dep_map[ii].dep_name;
-		if (ghb_dict_lookup(top, name))
-			continue;
-		array = ghb_array_value_new(8);
-		for (jj = 0; jj < count; jj++)
-		{
-			if (strcmp(name, dep_map[jj].dep_name) == 0)
-			{
-				GValue *data;
-				data = ghb_array_value_new(3);
-				ghb_array_append(data, ghb_value_dup(
-					ghb_string_value(dep_map[jj].widget_name)));
-				ghb_array_append(data, ghb_value_dup(
-					ghb_string_value(dep_map[jj].enable_value)));
-				ghb_array_append(data, ghb_value_dup(
-					ghb_boolean_value(dep_map[jj].disable_if_equal)));
-				ghb_array_append(data, ghb_value_dup(
-					ghb_boolean_value(dep_map[jj].hide)));
-				ghb_array_append(array, data);
-			}
-		}
-		ghb_dict_insert(top, g_strdup(name), array);
-	}
-	ghb_plist_write_file("widget_reverse.deps", top);
-	return 0;
+        name = dep_map[ii].dep_name;
+        if (ghb_dict_lookup(top, name))
+            continue;
+        array = ghb_array_value_new(8);
+        for (jj = 0; jj < count; jj++)
+        {
+            if (strcmp(name, dep_map[jj].dep_name) == 0)
+            {
+                GValue *data;
+                data = ghb_array_value_new(3);
+                ghb_array_append(data, ghb_value_dup(
+                    ghb_string_value(dep_map[jj].widget_name)));
+                ghb_array_append(data, ghb_value_dup(
+                    ghb_string_value(dep_map[jj].enable_value)));
+                ghb_array_append(data, ghb_value_dup(
+                    ghb_boolean_value(dep_map[jj].disable_if_equal)));
+                ghb_array_append(data, ghb_value_dup(
+                    ghb_boolean_value(dep_map[jj].hide)));
+                ghb_array_append(array, data);
+            }
+        }
+        ghb_dict_insert(top, g_strdup(name), array);
+    }
+    ghb_plist_write_file("widget_reverse.deps", top);
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/gtk/src/x264handler.c -> HandBrake-0.9.9.tar.bz2/gtk/src/x264handler.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * x264handler.c
- * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
  * 
  * x264handler.c is free software.
  * 
@@ -27,206 +27,423 @@
 // Flag needed to prevent x264 options processing from chasing its tail
 static gboolean ignore_options_update = FALSE;
 
+void ghb_show_hide_advanced_video( signal_user_data_t *ud )
+{
+    GtkWidget *nb = GHB_WIDGET(ud->builder, "SettingsNotebook");
+    GtkWidget *at = GHB_WIDGET(ud->builder, "advanced_tab");
+
+    int pgn = gtk_notebook_page_num(GTK_NOTEBOOK(nb), at);
+
+    GtkWidget *pg;
+    pg = gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb), pgn);
+    if (ghb_settings_get_boolean(ud->settings, "HideAdvancedVideoSettings"))
+    {
+        gtk_widget_hide(pg);
+        ghb_ui_update(ud, "x264UseAdvancedOptions", ghb_boolean_value(FALSE));
+    }
+    else
+    {
+        gtk_widget_show(pg);
+    }
+}
+
+G_MODULE_EXPORT void
+x264_use_advanced_options_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+    ghb_widget_to_setting(ud->settings, widget);
+
+    if (ghb_settings_get_boolean(ud->settings, "HideAdvancedVideoSettings") &&
+        ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+    {
+        ghb_ui_update(ud, "x264UseAdvancedOptions", ghb_boolean_value(FALSE));
+        return;
+    }
+
+    if (ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+    {
+        ghb_ui_update(ud, "x264PresetSlider", ghb_int_value(5));
+        ghb_ui_update(ud, "x264Tune", ghb_string_value("none"));
+        ghb_ui_update(ud, "h264Profile", ghb_string_value("auto"));
+        ghb_ui_update(ud, "h264Level", ghb_string_value("auto"));
+
+        char *options = ghb_settings_get_string(ud->settings, "x264Option");
+        ghb_ui_update(ud, "x264OptionExtra", ghb_string_value(options));
+        g_free(options);
+    }
+
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+x264_setting_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+    static char *tt = NULL;
+
+
+    if (tt == NULL)
+    {
+        GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+        tt = gtk_widget_get_tooltip_text(eo);
+    }
+
+    ghb_widget_to_setting(ud->settings, widget);
+
+    int x264Preset = ghb_settings_get_int(ud->settings, "x264PresetSlider");
+    const char * preset = hb_x264_presets()[x264Preset];
+    ghb_settings_set_string(ud->settings, "x264Preset", preset);
+
+    if (!ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+    {
+        GString *str = g_string_new("");
+        char *preset;
+        char *tune;
+        char *profile;
+        char *level;
+        char *opts;
+        char *tunes;
+
+        preset = ghb_settings_get_string(ud->settings, "x264Preset");
+        tune = ghb_settings_get_string(ud->settings, "x264Tune");
+        profile = ghb_settings_get_string(ud->settings, "h264Profile");
+        level = ghb_settings_get_string(ud->settings, "h264Level");
+        opts = ghb_settings_get_string(ud->settings, "x264OptionExtra");
+
+        if (tune[0] && strcmp(tune, "none"))
+        {
+            g_string_append_printf(str, "%s", tune);
+        }
+        if (ghb_settings_get_boolean(ud->settings, "x264FastDecode"))
+        {
+            g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "fastdecode");
+        }
+        if (ghb_settings_get_boolean(ud->settings, "x264ZeroLatency"))
+        {
+            g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "zerolatency");
+        }
+        tunes = g_string_free(str, FALSE);
+
+        char * new_opts;
+
+        int w = ghb_settings_get_int(ud->settings, "scale_width");
+        int h = ghb_settings_get_int(ud->settings, "scale_height");
+
+        if (w == 0 || h == 0)
+        {
+            if (!ghb_settings_get_boolean(ud->settings, "autoscale"))
+            {
+                w = ghb_settings_get_int(ud->settings, "PictureWidth");
+                h = ghb_settings_get_int(ud->settings, "PictureHeight");
+
+                if (h == 0 && w != 0)
+                {
+                    h = w * 9 / 16;
+                }
+                if (w == 0 && h != 0)
+                {
+                    w = h * 16 / 9;
+                }
+            }
+            if (w == 0 || h == 0)
+            {
+                w = 1280;
+                h = 720;
+            }
+        }
+
+        if (!strcasecmp(profile, "auto"))
+        {
+            profile[0] = 0;
+        }
+        if (!strcasecmp(level, "auto"))
+        {
+            level[0] = 0;
+        }
+        new_opts = hb_x264_param_unparse(
+                        preset, tunes, opts, profile, level, w, h);
+        if (new_opts)
+            ghb_ui_update(ud, "x264Option", ghb_string_value(new_opts));
+        else
+            ghb_ui_update(ud, "x264Option", ghb_string_value(""));
+
+        GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+
+        char * new_tt;
+        if (new_opts)
+            new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"%s\"", tt, new_opts);
+        else
+            new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"\"", tt);
+        gtk_widget_set_tooltip_text(eo, new_tt);
+
+        g_free(new_tt);
+        g_free(new_opts);
+
+        g_free(preset);
+        g_free(tune);
+        g_free(profile);
+        g_free(level);
+        g_free(opts);
+        g_free(tunes);
+    }
+    else
+    {
+        char *opts = ghb_settings_get_string(ud->settings, "x264Option");
+
+        GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+        char * new_tt;
+        if (opts)
+            new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"%s\"", tt, opts);
+        else
+            new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"\"", tt);
+        gtk_widget_set_tooltip_text(eo, new_tt);
+
+        g_free(opts);
+    }
+
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+x264_option_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+    GtkWidget *textview;
+
+    textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+    x264_setting_changed_cb(textview, ud);
+}
+
 G_MODULE_EXPORT void
 x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
-	if (!ignore_options_update)
-	{
-		ignore_options_update = TRUE;
-		x264_opt_update(ud, widget);
-		ignore_options_update = FALSE;
-	}
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
+    ghb_widget_to_setting(ud->settings, widget);
+    if (!ignore_options_update)
+    {
+        ignore_options_update = TRUE;
+        x264_opt_update(ud, widget);
+        ignore_options_update = FALSE;
+    }
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
 }
 
 G_MODULE_EXPORT void
 x264_slider_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
-
-	// Lock slider values to multiples of step_increment
-	GtkAdjustment * adj = gtk_range_get_adjustment(GTK_RANGE(widget));
-	gdouble step = gtk_adjustment_get_step_increment(adj);
-	gdouble val = gtk_range_get_value(GTK_RANGE(widget));
-	gdouble new_val = ((int)((val + step / 2) / step)) * step;
-	gdouble diff = val - new_val;
-	if ( diff > 0.0001 || diff < -0.0001 )
-	{
-		gtk_range_set_value(GTK_RANGE(widget), new_val);
-	}
-	else if (!ignore_options_update)
-	{
-		ignore_options_update = TRUE;
-		x264_opt_update(ud, widget);
-		ignore_options_update = FALSE;
-	}
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
+    ghb_widget_to_setting(ud->settings, widget);
+
+    // Lock slider values to multiples of step_increment
+    GtkAdjustment * adj = gtk_range_get_adjustment(GTK_RANGE(widget));
+    gdouble step = gtk_adjustment_get_step_increment(adj);
+    gdouble val = gtk_range_get_value(GTK_RANGE(widget));
+    gdouble new_val = ((int)((val + step / 2) / step)) * step;
+    gdouble diff = val - new_val;
+    if ( diff > 0.0001 || diff < -0.0001 )
+    {
+        gtk_range_set_value(GTK_RANGE(widget), new_val);
+    }
+    else if (!ignore_options_update)
+    {
+        ignore_options_update = TRUE;
+        x264_opt_update(ud, widget);
+        ignore_options_update = FALSE;
+    }
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
 }
 
 G_MODULE_EXPORT gchar*
 x264_format_slider_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-	return g_strdup_printf("%-6.6g", val);
+    return g_strdup_printf("%-6.6g", val);
 }
 
 
 G_MODULE_EXPORT void
 x264_me_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	gint me;
-
-	ghb_widget_to_setting(ud->settings, widget);
-	if (!ignore_options_update)
-	{
-		ignore_options_update = TRUE;
-		x264_opt_update(ud, widget);
-		ignore_options_update = FALSE;
-	}
-	ghb_check_dependency(ud, widget, NULL);
-	ghb_clear_presets_selection(ud);
-	widget = GHB_WIDGET(ud->builder, "x264_merange");
-	me = ghb_settings_combo_int(ud->settings, "x264_me");
-	if (me < 2)
-	{	// me < umh
-		// me_range 4 - 16
-		gtk_spin_button_set_range(GTK_SPIN_BUTTON(widget), 4, 16);
-	}
-	else
-	{
-		// me_range 4 - 64
-		gtk_spin_button_set_range(GTK_SPIN_BUTTON(widget), 4, 64);
-	}
+    gint me;
+
+    ghb_widget_to_setting(ud->settings, widget);
+    if (!ignore_options_update)
+    {
+        ignore_options_update = TRUE;
+        x264_opt_update(ud, widget);
+        ignore_options_update = FALSE;
+    }
+    ghb_check_dependency(ud, widget, NULL);
+    ghb_clear_presets_selection(ud);
+    widget = GHB_WIDGET(ud->builder, "x264_merange");
+    me = ghb_settings_combo_int(ud->settings, "x264_me");
+    if (me < 2)
+    {   // me < umh
+        // me_range 4 - 16
+        gtk_spin_button_set_range(GTK_SPIN_BUTTON(widget), 4, 16);
+    }
+    else
+    {
+        // me_range 4 - 64
+        gtk_spin_button_set_range(GTK_SPIN_BUTTON(widget), 4, 64);
+    }
 }
 
 G_MODULE_EXPORT void
 x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("x264_entry_changed_cb ()");
-	if (!ignore_options_update)
-	{
-		GtkWidget *textview;
-		gchar *options;
-
-		textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264Option"));
-		ghb_widget_to_setting(ud->settings, textview);
-		options = ghb_settings_get_string(ud->settings, "x264Option");
-		ignore_options_update = TRUE;
-		ghb_x264_parse_options(ud, options);
-		if (!gtk_widget_has_focus(textview))
-		{
-			gchar *sopts;
-
-			sopts = sanitize_x264opts(ud, options);
-			ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
-			ghb_x264_parse_options(ud, sopts);
-			g_free(sopts);
-		}
-		g_free(options);
-		ignore_options_update = FALSE;
-	}
+    g_debug("x264_entry_changed_cb ()");
+
+    static char *tt = NULL;
+
+    if (tt == NULL)
+    {
+        GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+        tt = gtk_widget_get_tooltip_text(eo);
+    }
+
+    if (!ignore_options_update)
+    {
+        GtkWidget *textview;
+        gchar *options;
+
+        textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264Option"));
+        ghb_widget_to_setting(ud->settings, textview);
+        options = ghb_settings_get_string(ud->settings, "x264Option");
+
+        ignore_options_update = TRUE;
+        ghb_x264_parse_options(ud, options);
+        if (!gtk_widget_has_focus(textview))
+        {
+            gchar *sopts;
+
+            sopts = sanitize_x264opts(ud, options);
+            ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
+            ghb_x264_parse_options(ud, sopts);
+
+            GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+            char * new_tt;
+            if (sopts)
+                new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"%s\"", tt, sopts);
+            else
+                new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"\"", tt);
+            gtk_widget_set_tooltip_text(eo, new_tt);
+
+            g_free(options);
+            options = sopts;
+        }
+#if 0
+        if (ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+        {
+            ghb_ui_update(ud, "x264PresetSlider", ghb_int_value(5));
+            ghb_ui_update(ud, "x264Tune", ghb_string_value("none"));
+            ghb_ui_update(ud, "h264Profile", ghb_string_value("auto"));
+            ghb_ui_update(ud, "h264Level", ghb_string_value("auto"));
+
+            ghb_ui_update(ud, "x264OptionExtra", ghb_string_value(options));
+        }
+#endif
+        g_free(options);
+        ignore_options_update = FALSE;
+    }
 }
 
 G_MODULE_EXPORT gboolean
 x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-	signal_user_data_t *ud)
+    signal_user_data_t *ud)
 {
-	gchar *options, *sopts;
-
-	ghb_widget_to_setting(ud->settings, widget);
-	options = ghb_settings_get_string(ud->settings, "x264Option");
-	sopts = sanitize_x264opts(ud, options);
-	ignore_options_update = TRUE;
-	if (sopts != NULL && strcmp(sopts, options) != 0)
-	{
-		ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
-		ghb_x264_parse_options(ud, sopts);
-	}
-	g_free(options);
-	g_free(sopts);
-	ignore_options_update = FALSE;
-	return FALSE;
+    gchar *options, *sopts;
+
+    ghb_widget_to_setting(ud->settings, widget);
+    options = ghb_settings_get_string(ud->settings, "x264Option");
+    sopts = sanitize_x264opts(ud, options);
+    ignore_options_update = TRUE;
+    if (sopts != NULL && strcmp(sopts, options) != 0)
+    {
+        ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
+        ghb_x264_parse_options(ud, sopts);
+    }
+    g_free(options);
+    g_free(sopts);
+    ignore_options_update = FALSE;
+    return FALSE;
 }
 
 enum
 {
-	X264_OPT_NONE,
-	X264_OPT_BOOL_NONE,
-	X264_OPT_INT_NONE,
-	X264_OPT_DEBLOCK,
-	X264_OPT_PSY,
-	X264_OPT_INT,
-	X264_OPT_DOUBLE,
-	X264_OPT_COMBO,
-	X264_OPT_BOOL,
-	X264_OPT_TRANS,
+    X264_OPT_NONE,
+    X264_OPT_BOOL_NONE,
+    X264_OPT_INT_NONE,
+    X264_OPT_DEBLOCK,
+    X264_OPT_PSY,
+    X264_OPT_INT,
+    X264_OPT_DOUBLE,
+    X264_OPT_COMBO,
+    X264_OPT_BOOL,
+    X264_OPT_TRANS,
 };
 
 typedef struct
 {
-	gchar *x264_val;
-	char *ui_val;
+    gchar *x264_val;
+    char *ui_val;
 } trans_entry_t;
 
 typedef struct
 {
-	gint count;
-	gint x264_type;
-	gint ui_type;
-	trans_entry_t *map;
+    gint count;
+    gint x264_type;
+    gint ui_type;
+    trans_entry_t *map;
 } trans_table_t;
 
 static gchar *
 trans_x264_val(trans_table_t *trans, char *val)
 {
-	int ii;
-
-	if (val == NULL)
-		return NULL;
-	for (ii = 0; ii < trans->count; ii++)
-	{
-		if (strcmp(val, trans->map[ii].x264_val) == 0)
-		{
-			return trans->map[ii].ui_val;
-		}
-	}
-	return NULL;
+    int ii;
+
+    if (val == NULL)
+        return NULL;
+    for (ii = 0; ii < trans->count; ii++)
+    {
+        if (strcmp(val, trans->map[ii].x264_val) == 0)
+        {
+            return trans->map[ii].ui_val;
+        }
+    }
+    return NULL;
 }
 
 static gchar *
 trans_ui_val(trans_table_t *trans, char *val)
 {
-	int ii;
-
-	if (val == NULL)
-		return NULL;
-	for (ii = 0; ii < trans->count; ii++)
-	{
-		if (strcmp(val, trans->map[ii].ui_val) == 0)
-		{
-			return trans->map[ii].x264_val;
-		}
-	}
-	return NULL;
+    int ii;
+
+    if (val == NULL)
+        return NULL;
+    for (ii = 0; ii < trans->count; ii++)
+    {
+        if (strcmp(val, trans->map[ii].ui_val) == 0)
+        {
+            return trans->map[ii].x264_val;
+        }
+    }
+    return NULL;
 }
 
 struct x264_opt_map_s
 {
-	gchar **opt_syns;
-	gchar *name;
-	gchar *def_val;
-	gint type;
-	trans_table_t *translation;
-	gboolean found;
+    gchar **opt_syns;
+    gchar *name;
+    gchar *def_val;
+    gint type;
+    trans_table_t *translation;
+    gboolean found;
 };
 
 static gchar *x264_ref_syns[] = {"ref", "frameref", NULL};
 static gchar *x264_bframes_syns[] = {"bframes", NULL};
 static gchar *x264_badapt_syns[] = {"b-adapt", "b_adapt", NULL};
 static gchar *x264_direct_syns[] = 
-	{"direct", "direct-pred", "direct_pred", NULL};
+    {"direct", "direct-pred", "direct_pred", NULL};
 static gchar *x264_weightp_syns[] = {"weightp", NULL};
 static gchar *x264_bpyramid_syns[] = {"b-pyramid", "b_pyramid", NULL};
 static gchar *x264_me_syns[] = {"me", NULL};
@@ -242,734 +459,734 @@
 static gchar *x264_aq_strength_syns[] = {"aq-strength", "aq_strength", NULL};
 static gchar *x264_mbtree_syns[] = {"mbtree", NULL};
 static gchar *x264_decimate_syns[] = 
-	{"no-dct-decimate", "no_dct_decimate", NULL};
+    {"no-dct-decimate", "no_dct_decimate", NULL};
 static gchar *x264_cabac_syns[] = {"cabac", NULL};
 
 static gint
 find_syn_match(const gchar *opt, gchar **syns)
 {
-	gint ii;
-	for (ii = 0; syns[ii] != NULL; ii++)
-	{
-		if (strcmp(opt, syns[ii]) == 0)
-			return ii;
-	}
-	return -1;
+    gint ii;
+    for (ii = 0; syns[ii] != NULL; ii++)
+    {
+        if (strcmp(opt, syns[ii]) == 0)
+            return ii;
+    }
+    return -1;
 }
 
 struct x264_opt_map_s x264_opt_map[] =
 {
-	{x264_ref_syns, "x264_refs", "3", X264_OPT_INT},
-	{x264_bframes_syns, "x264_bframes", "3", X264_OPT_INT},
-	{x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO},
-	{x264_badapt_syns, "x264_b_adapt", "1", X264_OPT_COMBO},
-	{x264_weightp_syns, "x264_weighted_pframes", "2", X264_OPT_COMBO},
-	{x264_bpyramid_syns, "x264_bpyramid", "normal", X264_OPT_COMBO},
-	{x264_me_syns, "x264_me", "hex", X264_OPT_COMBO},
-	{x264_merange_syns, "x264_merange", "16", X264_OPT_INT},
-	{x264_subme_syns, "x264_subme", "7", X264_OPT_COMBO},
-	{x264_aqmode_syns, "x264_aqmode", "1", X264_OPT_INT_NONE},
-	{x264_analyse_syns, "x264_analyse", "p8x8,b8x8,i8x8,i4x4", X264_OPT_COMBO},
-	{x264_8x8dct_syns, "x264_8x8dct", "1", X264_OPT_BOOL},
-	{x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK},
-	{x264_deblock_syns, "x264_deblock_beta", "0,0", X264_OPT_DEBLOCK},
-	{x264_trellis_syns, "x264_trellis", "1", X264_OPT_COMBO},
-	{x264_pskip_syns, "x264_no_fast_pskip", "0", X264_OPT_BOOL},
-	{x264_decimate_syns, "x264_no_dct_decimate", "0", X264_OPT_BOOL},
-	{x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL},
-	{x264_aq_strength_syns, "x264_aq_strength", "1", X264_OPT_DOUBLE},
-	{x264_psy_syns, "x264_psy_rd", "1|0", X264_OPT_PSY},
-	{x264_psy_syns, "x264_psy_trell", "1|0", X264_OPT_PSY},
-	{x264_mbtree_syns, "x264_mbtree", "1", X264_OPT_BOOL_NONE},
+    {x264_ref_syns, "x264_refs", "3", X264_OPT_INT},
+    {x264_bframes_syns, "x264_bframes", "3", X264_OPT_INT},
+    {x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO},
+    {x264_badapt_syns, "x264_b_adapt", "1", X264_OPT_COMBO},
+    {x264_weightp_syns, "x264_weighted_pframes", "2", X264_OPT_COMBO},
+    {x264_bpyramid_syns, "x264_bpyramid", "normal", X264_OPT_COMBO},
+    {x264_me_syns, "x264_me", "hex", X264_OPT_COMBO},
+    {x264_merange_syns, "x264_merange", "16", X264_OPT_INT},
+    {x264_subme_syns, "x264_subme", "7", X264_OPT_COMBO},
+    {x264_aqmode_syns, "x264_aqmode", "1", X264_OPT_INT_NONE},
+    {x264_analyse_syns, "x264_analyse", "p8x8,b8x8,i8x8,i4x4", X264_OPT_COMBO},
+    {x264_8x8dct_syns, "x264_8x8dct", "1", X264_OPT_BOOL},
+    {x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK},
+    {x264_deblock_syns, "x264_deblock_beta", "0,0", X264_OPT_DEBLOCK},
+    {x264_trellis_syns, "x264_trellis", "1", X264_OPT_COMBO},
+    {x264_pskip_syns, "x264_no_fast_pskip", "0", X264_OPT_BOOL},
+    {x264_decimate_syns, "x264_no_dct_decimate", "0", X264_OPT_BOOL},
+    {x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL},
+    {x264_aq_strength_syns, "x264_aq_strength", "1", X264_OPT_DOUBLE},
+    {x264_psy_syns, "x264_psy_rd", "1|0", X264_OPT_PSY},
+    {x264_psy_syns, "x264_psy_trell", "1|0", X264_OPT_PSY},
+    {x264_mbtree_syns, "x264_mbtree", "1", X264_OPT_BOOL_NONE},
 };
 #define X264_OPT_MAP_SIZE (sizeof(x264_opt_map)/sizeof(struct x264_opt_map_s))
 
 static const gchar*
 x264_opt_get_default(const gchar *opt)
 {
-	gint jj;
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-	{
-		if (find_syn_match(opt, x264_opt_map[jj].opt_syns) >= 0)
-		{
-			return x264_opt_map[jj].def_val;
-		}
-	}
-	return "";
+    gint jj;
+    for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
+    {
+        if (find_syn_match(opt, x264_opt_map[jj].opt_syns) >= 0)
+        {
+            return x264_opt_map[jj].def_val;
+        }
+    }
+    return "";
 }
 
 static void
 x264_update_double(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
-	gdouble dval;
+    gdouble dval;
 
-	if (val == NULL) return;
-	dval = g_strtod (val, NULL);
-	ghb_ui_update(ud, name, ghb_double_value(dval));
+    if (val == NULL) return;
+    dval = g_strtod (val, NULL);
+    ghb_ui_update(ud, name, ghb_double_value(dval));
 }
 
 static void
 x264_update_int(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
-	gint ival;
+    gint ival;
 
-	if (val == NULL) return;
-	ival = g_strtod (val, NULL);
-	ghb_ui_update(ud, name, ghb_int64_value(ival));
+    if (val == NULL) return;
+    ival = g_strtod (val, NULL);
+    ghb_ui_update(ud, name, ghb_int64_value(ival));
 }
 
 static void
 x264_update_int_setting(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
-	gint ival;
+    gint ival;
 
-	if (val == NULL) return;
-	ival = g_strtod (val, NULL);
-	ghb_settings_set_value(ud->settings, name, ghb_int64_value(ival));
-	ghb_check_dependency(ud, NULL, name);
+    if (val == NULL) return;
+    ival = g_strtod (val, NULL);
+    ghb_settings_set_value(ud->settings, name, ghb_int64_value(ival));
+    ghb_check_dependency(ud, NULL, name);
 }
 
 static gchar *true_str[] =
 {
-	"true",
-	"yes",
-	"1",
-	NULL
+    "true",
+    "yes",
+    "1",
+    NULL
 };
 
 static gboolean 
 str_is_true(const gchar *str)
 {
-	gint ii;
-	for (ii = 0; true_str[ii]; ii++)
-	{
-		if (g_ascii_strcasecmp(str, true_str[ii]) == 0)
-			return TRUE;
-	}
-	return FALSE;
+    gint ii;
+    for (ii = 0; true_str[ii]; ii++)
+    {
+        if (g_ascii_strcasecmp(str, true_str[ii]) == 0)
+            return TRUE;
+    }
+    return FALSE;
 }
 
 static void
 x264_update_bool(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
-	if (val == NULL)
-		ghb_ui_update(ud, name, ghb_boolean_value(1));
-	else
-		ghb_ui_update(ud, name, ghb_boolean_value(str_is_true(val)));
+    if (val == NULL)
+        ghb_ui_update(ud, name, ghb_boolean_value(1));
+    else
+        ghb_ui_update(ud, name, ghb_boolean_value(str_is_true(val)));
 }
 
 static void
 x264_update_bool_setting(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
-	if (val == NULL)
-		ghb_settings_set_value(ud->settings, name, ghb_boolean_value(1));
-	else
-		ghb_settings_set_value(ud->settings, name, ghb_boolean_value(str_is_true(val)));
+    if (val == NULL)
+        ghb_settings_set_value(ud->settings, name, ghb_boolean_value(1));
+    else
+        ghb_settings_set_value(ud->settings, name, ghb_boolean_value(str_is_true(val)));
 
-	ghb_check_dependency(ud, NULL, name);
+    ghb_check_dependency(ud, NULL, name);
 }
 
 static void
 x264_update_combo(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gchar *shortOpt;
-	gdouble ivalue;
-	gboolean foundit = FALSE;
-	GtkWidget *widget;
-
-	if (val == NULL) return;
-	widget = GHB_WIDGET(ud->builder, name);
-	if (widget == NULL)
-	{
-		g_debug("Failed to find widget for key: %s\n", name);
-		return;
-	}
-	store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-	if (gtk_tree_model_get_iter_first (store, &iter))
-	{
-		do
-		{
-			gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
-			if (strcmp(shortOpt, val) == 0)
-			{
-				gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
-				g_free(shortOpt);
-				foundit = TRUE;
-				break;
-			}
-			g_free(shortOpt);
-		} while (gtk_tree_model_iter_next (store, &iter));
-	}
-	if (!foundit)
-	{
-		if (gtk_tree_model_get_iter_first (store, &iter))
-		{
-			do
-			{
-				gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
-				if (strcmp(shortOpt, "custom") == 0)
-				{
-					gtk_list_store_set(GTK_LIST_STORE(store), &iter, 4, val, -1);
-					gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
-					g_free(shortOpt);
-					foundit = TRUE;
-					break;
-				}
-				g_free(shortOpt);
-			} while (gtk_tree_model_iter_next (store, &iter));
-		}
-	}
-	// Its possible the value hasn't changed. Since settings are only
-	// updated when the value changes, I'm initializing settings here as well.
-	ghb_widget_to_setting(ud->settings, widget);
+    GtkTreeModel *store;
+    GtkTreeIter iter;
+    gchar *shortOpt;
+    gdouble ivalue;
+    gboolean foundit = FALSE;
+    GtkWidget *widget;
+
+    if (val == NULL) return;
+    widget = GHB_WIDGET(ud->builder, name);
+    if (widget == NULL)
+    {
+        g_debug("Failed to find widget for key: %s\n", name);
+        return;
+    }
+    store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+    if (gtk_tree_model_get_iter_first (store, &iter))
+    {
+        do
+        {
+            gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
+            if (strcmp(shortOpt, val) == 0)
+            {
+                gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
+                g_free(shortOpt);
+                foundit = TRUE;
+                break;
+            }
+            g_free(shortOpt);
+        } while (gtk_tree_model_iter_next (store, &iter));
+    }
+    if (!foundit)
+    {
+        if (gtk_tree_model_get_iter_first (store, &iter))
+        {
+            do
+            {
+                gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
+                if (strcmp(shortOpt, "custom") == 0)
+                {
+                    gtk_list_store_set(GTK_LIST_STORE(store), &iter, 4, val, -1);
+                    gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
+                    g_free(shortOpt);
+                    foundit = TRUE;
+                    break;
+                }
+                g_free(shortOpt);
+            } while (gtk_tree_model_iter_next (store, &iter));
+        }
+    }
+    // Its possible the value hasn't changed. Since settings are only
+    // updated when the value changes, I'm initializing settings here as well.
+    ghb_widget_to_setting(ud->settings, widget);
 }
 
 static void
 x264_update_deblock(signal_user_data_t *ud, const gchar *xval)
 {
-	gdouble avalue, bvalue;
-	gchar *end;
-	gchar *val;
-	gchar *bval = NULL;
-
-	if (xval == NULL) return;
-	val = g_strdup(xval);
-	bvalue = avalue = 0;
-	if (val != NULL) 
-	{
-		gchar *pos = strchr(val, ',');
-		if (pos != NULL)
-		{
-			bval = pos + 1;
-			*pos = 0;
-		}
-		avalue = g_strtod (val, &end);
-		if (bval != NULL)
-		{
-			bvalue = g_strtod (bval, &end);
-		}
-	}
-	g_free(val);
-	ghb_ui_update(ud, "x264_deblock_alpha", ghb_int64_value(avalue));
-	ghb_ui_update(ud, "x264_deblock_beta", ghb_int64_value(bvalue));
+    gdouble avalue, bvalue;
+    gchar *end;
+    gchar *val;
+    gchar *bval = NULL;
+
+    if (xval == NULL) return;
+    val = g_strdup(xval);
+    bvalue = avalue = 0;
+    if (val != NULL) 
+    {
+        gchar *pos = strchr(val, ',');
+        if (pos != NULL)
+        {
+            bval = pos + 1;
+            *pos = 0;
+        }
+        avalue = g_strtod (val, &end);
+        if (bval != NULL)
+        {
+            bvalue = g_strtod (bval, &end);
+        }
+    }
+    g_free(val);
+    ghb_ui_update(ud, "x264_deblock_alpha", ghb_int64_value(avalue));
+    ghb_ui_update(ud, "x264_deblock_beta", ghb_int64_value(bvalue));
 }
 
 static void
 x264_parse_psy(const gchar *psy, gdouble *psy_rd, gdouble *psy_trell)
 {
-	*psy_rd = 0.;
-	*psy_trell = 0.;
-	if (psy == NULL) return;
-	if (2 == sscanf(psy, "%lf|%lf", psy_rd, psy_trell) ||
-	    2 == sscanf(psy, "%lf,%lf", psy_rd, psy_trell))
-	{
-	}
+    *psy_rd = 0.;
+    *psy_trell = 0.;
+    if (psy == NULL) return;
+    if (2 == sscanf(psy, "%lf|%lf", psy_rd, psy_trell) ||
+        2 == sscanf(psy, "%lf,%lf", psy_rd, psy_trell))
+    {
+    }
 }
 
 static void
 x264_update_psy(signal_user_data_t *ud, const gchar *xval)
 {
-	gdouble rd_value, trell_value;
+    gdouble rd_value, trell_value;
 
-	if (xval == NULL) return;
-	x264_parse_psy(xval, &rd_value, &trell_value);
-	ghb_ui_update(ud, "x264_psy_rd", ghb_double_value(rd_value));
-	ghb_ui_update(ud, "x264_psy_trell", ghb_double_value(trell_value));
+    if (xval == NULL) return;
+    x264_parse_psy(xval, &rd_value, &trell_value);
+    ghb_ui_update(ud, "x264_psy_rd", ghb_double_value(rd_value));
+    ghb_ui_update(ud, "x264_psy_trell", ghb_double_value(trell_value));
 }
 
 static void do_update(signal_user_data_t *ud, char *name, gint type, char *val)
 {
-	switch(type)
-	{
-	case X264_OPT_INT:
-		x264_update_int(ud, name, val);
-		break;
-	case X264_OPT_DOUBLE:
-		x264_update_double(ud, name, val);
-		break;
-	case X264_OPT_BOOL:
-		x264_update_bool(ud, name, val);
-		break;
-	case X264_OPT_COMBO:
-		x264_update_combo(ud, name, val);
-		break;
-	case X264_OPT_BOOL_NONE:
-		x264_update_bool_setting(ud, name, val);
-		break;
-	case X264_OPT_INT_NONE:
-		x264_update_int_setting(ud, name, val);
-		break;
-	}
+    switch(type)
+    {
+    case X264_OPT_INT:
+        x264_update_int(ud, name, val);
+        break;
+    case X264_OPT_DOUBLE:
+        x264_update_double(ud, name, val);
+        break;
+    case X264_OPT_BOOL:
+        x264_update_bool(ud, name, val);
+        break;
+    case X264_OPT_COMBO:
+        x264_update_combo(ud, name, val);
+        break;
+    case X264_OPT_BOOL_NONE:
+        x264_update_bool_setting(ud, name, val);
+        break;
+    case X264_OPT_INT_NONE:
+        x264_update_int_setting(ud, name, val);
+        break;
+    }
 }
 
 void
 ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options)
 {
-	gchar **split = g_strsplit(options, ":", -1);
-	if (split == NULL) return;
-
-	gint ii;
-	gint jj;
-
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-		x264_opt_map[jj].found = FALSE;
-
-	for (ii = 0; split[ii] != NULL; ii++)
-	{
-		gchar *val = NULL;
-		gchar *pos = strchr(split[ii], '=');
-		if (pos != NULL)
-		{
-			val = pos + 1;
-			*pos = 0;
-		}
-		for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-		{
-			if (find_syn_match(split[ii], x264_opt_map[jj].opt_syns) >= 0)
-			{
-				x264_opt_map[jj].found = TRUE;
-				switch(x264_opt_map[jj].type)
-				{
-				case X264_OPT_INT:
-					x264_update_int(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_DOUBLE:
-					x264_update_double(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_BOOL:
-					x264_update_bool(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_COMBO:
-					x264_update_combo(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_DEBLOCK:
-					// dirty little hack.  mark deblock_beta found as well
-					x264_opt_map[jj+1].found = TRUE;
-					x264_update_deblock(ud, val);
-					break;
-				case X264_OPT_PSY:
-					// dirty little hack.  mark psy_trell found as well
-					x264_opt_map[jj+1].found = TRUE;
-					x264_update_psy(ud, val);
-					break;
-				case X264_OPT_BOOL_NONE:
-					x264_update_bool_setting(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_INT_NONE:
-					x264_update_int_setting(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_TRANS:
-					if (x264_opt_map[jj].translation == NULL)
-						break;
-					val = trans_x264_val(x264_opt_map[jj].translation, val);
-					if (val != NULL)
-					{
-						do_update(ud, x264_opt_map[jj].name, 
-							x264_opt_map[jj].translation->ui_type, val);
-						// TODO un-grey the ui control
-					}
-					else
-					{
-						// TODO grey out the ui control
-					}
-					break;
-				}
-				break;
-			}
-		}
-	}
-	// For any options not found in the option string, set ui to
-	// default values
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-	{
-		if (!x264_opt_map[jj].found)
-		{
-			gchar *val = strdup(x264_opt_map[jj].def_val);
-			switch(x264_opt_map[jj].type)
-			{
-			case X264_OPT_INT:
-				x264_update_int(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_DOUBLE:
-				x264_update_double(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_BOOL:
-				x264_update_bool(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_COMBO:
-				x264_update_combo(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_DEBLOCK:
-				x264_update_deblock(ud, val);
-				break;
-			case X264_OPT_PSY:
-				x264_update_psy(ud, val);
-				break;
-			case X264_OPT_BOOL_NONE:
-				x264_update_bool_setting(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_INT_NONE:
-				x264_update_int_setting(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_TRANS:
-				if (x264_opt_map[jj].translation == NULL)
-					break;
-				val = g_strdup(trans_x264_val(x264_opt_map[jj].translation, val));
-				if (val != NULL)
-				{
-					do_update(ud, x264_opt_map[jj].name, 
-						x264_opt_map[jj].translation->ui_type, val);
-					// TODO un-grey the ui control
-				}
-				else
-				{
-					// TODO grey out the ui control
-				}
-				break;
-			}
-			x264_opt_map[jj].found = TRUE;
-			g_free(val);
-		}
-	}
-	g_strfreev(split);
+    gchar **split = g_strsplit(options, ":", -1);
+    if (split == NULL) return;
+
+    gint ii;
+    gint jj;
+
+    for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
+        x264_opt_map[jj].found = FALSE;
+
+    for (ii = 0; split[ii] != NULL; ii++)
+    {
+        gchar *val = NULL;
+        gchar *pos = strchr(split[ii], '=');
+        if (pos != NULL)
+        {
+            val = pos + 1;
+            *pos = 0;
+        }
+        for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
+        {
+            if (find_syn_match(split[ii], x264_opt_map[jj].opt_syns) >= 0)
+            {
+                x264_opt_map[jj].found = TRUE;
+                switch(x264_opt_map[jj].type)
+                {
+                case X264_OPT_INT:
+                    x264_update_int(ud, x264_opt_map[jj].name, val);
+                    break;
+                case X264_OPT_DOUBLE:
+                    x264_update_double(ud, x264_opt_map[jj].name, val);
+                    break;
+                case X264_OPT_BOOL:
+                    x264_update_bool(ud, x264_opt_map[jj].name, val);
+                    break;
+                case X264_OPT_COMBO:
+                    x264_update_combo(ud, x264_opt_map[jj].name, val);
+                    break;
+                case X264_OPT_DEBLOCK:
+                    // dirty little hack.  mark deblock_beta found as well
+                    x264_opt_map[jj+1].found = TRUE;
+                    x264_update_deblock(ud, val);
+                    break;
+                case X264_OPT_PSY:
+                    // dirty little hack.  mark psy_trell found as well
+                    x264_opt_map[jj+1].found = TRUE;
+                    x264_update_psy(ud, val);
+                    break;
+                case X264_OPT_BOOL_NONE:
+                    x264_update_bool_setting(ud, x264_opt_map[jj].name, val);
+                    break;
+                case X264_OPT_INT_NONE:
+                    x264_update_int_setting(ud, x264_opt_map[jj].name, val);
+                    break;
+                case X264_OPT_TRANS:
+                    if (x264_opt_map[jj].translation == NULL)
+                        break;
+                    val = trans_x264_val(x264_opt_map[jj].translation, val);
+                    if (val != NULL)
+                    {
+                        do_update(ud, x264_opt_map[jj].name, 
+                            x264_opt_map[jj].translation->ui_type, val);
+                        // TODO un-grey the ui control
+                    }
+                    else
+                    {
+                        // TODO grey out the ui control
+                    }
+                    break;
+                }
+                break;
+            }
+        }
+    }
+    // For any options not found in the option string, set ui to
+    // default values
+    for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
+    {
+        if (!x264_opt_map[jj].found)
+        {
+            gchar *val = strdup(x264_opt_map[jj].def_val);
+            switch(x264_opt_map[jj].type)
+            {
+            case X264_OPT_INT:
+                x264_update_int(ud, x264_opt_map[jj].name, val);
+                break;
+            case X264_OPT_DOUBLE:
+                x264_update_double(ud, x264_opt_map[jj].name, val);
+                break;
+            case X264_OPT_BOOL:
+                x264_update_bool(ud, x264_opt_map[jj].name, val);
+                break;
+            case X264_OPT_COMBO:
+                x264_update_combo(ud, x264_opt_map[jj].name, val);
+                break;
+            case X264_OPT_DEBLOCK:
+                x264_update_deblock(ud, val);
+                break;
+            case X264_OPT_PSY:
+                x264_update_psy(ud, val);
+                break;
+            case X264_OPT_BOOL_NONE:
+                x264_update_bool_setting(ud, x264_opt_map[jj].name, val);
+                break;
+            case X264_OPT_INT_NONE:
+                x264_update_int_setting(ud, x264_opt_map[jj].name, val);
+                break;
+            case X264_OPT_TRANS:
+                if (x264_opt_map[jj].translation == NULL)
+                    break;
+                val = g_strdup(trans_x264_val(x264_opt_map[jj].translation, val));
+                if (val != NULL)
+                {
+                    do_update(ud, x264_opt_map[jj].name, 
+                        x264_opt_map[jj].translation->ui_type, val);
+                    // TODO un-grey the ui control
+                }
+                else
+                {
+                    // TODO grey out the ui control
+                }
+                break;
+            }
+            x264_opt_map[jj].found = TRUE;
+            g_free(val);
+        }
+    }
+    g_strfreev(split);
 }
 
 gchar*
 get_deblock_val(signal_user_data_t *ud)
 {
-	gchar *alpha, *beta;
-	gchar *result;
-	alpha = ghb_settings_get_string(ud->settings, "x264_deblock_alpha");
-	beta = ghb_settings_get_string(ud->settings, "x264_deblock_beta");
-	result = g_strdup_printf("%s,%s", alpha, beta);
-	g_free(alpha);
-	g_free(beta);
-	return result;
+    gchar *alpha, *beta;
+    gchar *result;
+    alpha = ghb_settings_get_string(ud->settings, "x264_deblock_alpha");
+    beta = ghb_settings_get_string(ud->settings, "x264_deblock_beta");
+    result = g_strdup_printf("%s,%s", alpha, beta);
+    g_free(alpha);
+    g_free(beta);
+    return result;
 }
 
 gchar*
 get_psy_val(signal_user_data_t *ud)
 {
-	gdouble rd, trell;
-	gchar *result;
-	rd = ghb_settings_get_double(ud->settings, "x264_psy_rd");
-	trell = ghb_settings_get_double(ud->settings, "x264_psy_trell");
-	result = g_strdup_printf("%g|%g", rd, trell);
-	return result;
+    gdouble rd, trell;
+    gchar *result;
+    rd = ghb_settings_get_double(ud->settings, "x264_psy_rd");
+    trell = ghb_settings_get_double(ud->settings, "x264_psy_trell");
+    result = g_strdup_printf("%g|%g", rd, trell);
+    return result;
 }
 
 static void
 x264_opt_update(signal_user_data_t *ud, GtkWidget *widget)
 {
-	gint jj;
-	const gchar *name = ghb_get_setting_key(widget);
-	gchar **opt_syns = NULL;
-	const gchar *def_val = NULL;
-	gint type;
-	trans_table_t *trans;
-
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-	{
-		if (strcmp(name, x264_opt_map[jj].name) == 0)
-		{
-			// found the options that needs updating
-			opt_syns = x264_opt_map[jj].opt_syns;
-			def_val = x264_opt_map[jj].def_val;
-			type = x264_opt_map[jj].type;
-			trans = x264_opt_map[jj].translation;
-			break;
-		}
-	}
-	if (opt_syns != NULL)
-	{
-		GString *x264opts = g_string_new("");
-		gchar *options;
-		gchar **split = NULL;
-		gint ii;
-		gboolean foundit = FALSE;
-
-		options = ghb_settings_get_string(ud->settings, "x264Option");
-		if (options)
-		{
-			split = g_strsplit(options, ":", -1);
-			g_free(options);
-		}
-		for (ii = 0; split && split[ii] != NULL; ii++)
-		{
-			gint syn;
-			gchar *val = NULL;
-			gchar *pos = strchr(split[ii], '=');
-			if (pos != NULL)
-			{
-				val = pos + 1;
-				*pos = 0;
-			}
-			syn = find_syn_match(split[ii], opt_syns);
-			if (syn >= 0)
-			{ // Updating this option
-				gchar *val;
-				foundit = TRUE;
-				if (type == X264_OPT_DEBLOCK)
-					val = get_deblock_val(ud);
-				else if (type == X264_OPT_PSY)
-					val = get_psy_val(ud);
-				else
-				{
-					GValue *gval;
-					gval = ghb_widget_value(widget);
-					if (G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN)
-					{
-						if (ghb_value_boolean(gval))
-							val = g_strdup("1");
-						else
-							val = g_strdup("0");
-					}
-					else
-					{
-						val = ghb_widget_string(widget);
-					}
-					ghb_value_free(gval);
-				}
-				if (type == X264_OPT_TRANS)
-				{
-					gchar *tmp;
-					tmp = g_strdup(trans_ui_val(trans, val));
-					if (tmp)
-					{
-						g_free(val);
-						val = tmp;
-					}
-				}
-				if (strcmp(def_val, val) != 0)
-				{
-					g_string_append_printf(x264opts, "%s=%s:", opt_syns[syn], val);
-				}
-				g_free(val);
-			}
-			else if (val != NULL)
-				g_string_append_printf(x264opts, "%s=%s:", split[ii], val);
-			else
-				g_string_append_printf(x264opts, "%s:", split[ii]);
-
-		}
-		if (split) g_strfreev(split);
-		if (!foundit)
-		{
-			gchar *val;
-			if (type == X264_OPT_DEBLOCK)
-				val = get_deblock_val(ud);
-			else if (type == X264_OPT_PSY)
-				val = get_psy_val(ud);
-			else
-			{
-				GValue *gval;
-				gval = ghb_widget_value(widget);
-				if (G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN)
-				{
-					if (ghb_value_boolean(gval))
-						val = g_strdup("1");
-					else
-						val = g_strdup("0");
-				}
-				else
-				{
-					val = ghb_widget_string(widget);
-				}
-				ghb_value_free(gval);
-			}
-			if (type == X264_OPT_TRANS)
-			{
-				gchar *tmp;
-				tmp = g_strdup(trans_ui_val(trans, val));
-				if (tmp)
-				{
-					g_free(val);
-					val = tmp;
-				}
-			}
-			if (strcmp(def_val, val) != 0)
-			{
-				g_string_append_printf(x264opts, "%s=%s:", opt_syns[0], val);
-			}
-			g_free(val);
-		}
-		// Update the options value
-		// strip the trailing ":"
-		gchar *result;
-		gint len;
-		result = g_string_free(x264opts, FALSE);
-		len = strlen(result);
-		if (len > 0) result[len - 1] = 0;
-		gchar *sopts;
-		sopts = sanitize_x264opts(ud, result);
-		ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
-		ghb_x264_parse_options(ud, sopts);
-		g_free(sopts);
-		g_free(result);
-	}
+    gint jj;
+    const gchar *name = ghb_get_setting_key(widget);
+    gchar **opt_syns = NULL;
+    const gchar *def_val = NULL;
+    gint type;
+    trans_table_t *trans;
+
+    for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
+    {
+        if (strcmp(name, x264_opt_map[jj].name) == 0)
+        {
+            // found the options that needs updating
+            opt_syns = x264_opt_map[jj].opt_syns;
+            def_val = x264_opt_map[jj].def_val;
+            type = x264_opt_map[jj].type;
+            trans = x264_opt_map[jj].translation;
+            break;
+        }
+    }
+    if (opt_syns != NULL)
+    {
+        GString *x264opts = g_string_new("");
+        gchar *options;
+        gchar **split = NULL;
+        gint ii;
+        gboolean foundit = FALSE;
+
+        options = ghb_settings_get_string(ud->settings, "x264Option");
+        if (options)
+        {
+            split = g_strsplit(options, ":", -1);
+            g_free(options);
+        }
+        for (ii = 0; split && split[ii] != NULL; ii++)
+        {
+            gint syn;
+            gchar *val = NULL;
+            gchar *pos = strchr(split[ii], '=');
+            if (pos != NULL)
+            {
+                val = pos + 1;
+                *pos = 0;
+            }
+            syn = find_syn_match(split[ii], opt_syns);
+            if (syn >= 0)
+            { // Updating this option
+                gchar *val;
+                foundit = TRUE;
+                if (type == X264_OPT_DEBLOCK)
+                    val = get_deblock_val(ud);
+                else if (type == X264_OPT_PSY)
+                    val = get_psy_val(ud);
+                else
+                {
+                    GValue *gval;
+                    gval = ghb_widget_value(widget);
+                    if (G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN)
+                    {
+                        if (ghb_value_boolean(gval))
+                            val = g_strdup("1");
+                        else
+                            val = g_strdup("0");
+                    }
+                    else
+                    {
+                        val = ghb_widget_string(widget);
+                    }
+                    ghb_value_free(gval);
+                }
+                if (type == X264_OPT_TRANS)
+                {
+                    gchar *tmp;
+                    tmp = g_strdup(trans_ui_val(trans, val));
+                    if (tmp)
+                    {
+                        g_free(val);
+                        val = tmp;
+                    }
+                }
+                if (strcmp(def_val, val) != 0)
+                {
+                    g_string_append_printf(x264opts, "%s=%s:", opt_syns[syn], val);
+                }
+                g_free(val);
+            }
+            else if (val != NULL)
+                g_string_append_printf(x264opts, "%s=%s:", split[ii], val);
+            else
+                g_string_append_printf(x264opts, "%s:", split[ii]);
+
+        }
+        if (split) g_strfreev(split);
+        if (!foundit)
+        {
+            gchar *val;
+            if (type == X264_OPT_DEBLOCK)
+                val = get_deblock_val(ud);
+            else if (type == X264_OPT_PSY)
+                val = get_psy_val(ud);
+            else
+            {
+                GValue *gval;
+                gval = ghb_widget_value(widget);
+                if (G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN)
+                {
+                    if (ghb_value_boolean(gval))
+                        val = g_strdup("1");
+                    else
+                        val = g_strdup("0");
+                }
+                else
+                {
+                    val = ghb_widget_string(widget);
+                }
+                ghb_value_free(gval);
+            }
+            if (type == X264_OPT_TRANS)
+            {
+                gchar *tmp;
+                tmp = g_strdup(trans_ui_val(trans, val));
+                if (tmp)
+                {
+                    g_free(val);
+                    val = tmp;
+                }
+            }
+            if (strcmp(def_val, val) != 0)
+            {
+                g_string_append_printf(x264opts, "%s=%s:", opt_syns[0], val);
+            }
+            g_free(val);
+        }
+        // Update the options value
+        // strip the trailing ":"
+        gchar *result;
+        gint len;
+        result = g_string_free(x264opts, FALSE);
+        len = strlen(result);
+        if (len > 0) result[len - 1] = 0;
+        gchar *sopts;
+        sopts = sanitize_x264opts(ud, result);
+        ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
+        ghb_x264_parse_options(ud, sopts);
+        g_free(sopts);
+        g_free(result);
+    }
 }
 
 static gint
 x264_find_opt(gchar **opts, gchar **opt_syns)
 {
-	gint ii;
-	for (ii = 0; opts[ii] != NULL; ii++)
-	{
-		gchar *opt;
-		opt = g_strdup(opts[ii]);
-		gchar *pos = strchr(opt, '=');
-		if (pos != NULL)
-		{
-			*pos = 0;
-		}
-		if (find_syn_match(opt, opt_syns) >= 0)
-		{
-			g_free(opt);
-			return ii;
-		}
-		g_free(opt);
-	}
-	return -1;
+    gint ii;
+    for (ii = 0; opts[ii] != NULL; ii++)
+    {
+        gchar *opt;
+        opt = g_strdup(opts[ii]);
+        gchar *pos = strchr(opt, '=');
+        if (pos != NULL)
+        {
+            *pos = 0;
+        }
+        if (find_syn_match(opt, opt_syns) >= 0)
+        {
+            g_free(opt);
+            return ii;
+        }
+        g_free(opt);
+    }
+    return -1;
 }
 
 static void
 x264_remove_opt(gchar **opts, gchar **opt_syns)
 {
-	gint ii;
-	for (ii = 0; opts[ii] != NULL; ii++)
-	{
-		gchar *opt;
-		opt = g_strdup(opts[ii]);
-		gchar *pos = strchr(opt, '=');
-		if (pos != NULL)
-		{
-			*pos = 0;
-		}
-		if (find_syn_match(opt, opt_syns) >= 0)
-		{
-			// Mark as deleted
-			opts[ii][0] = 0;
-		}
-		g_free(opt);
-	}
+    gint ii;
+    for (ii = 0; opts[ii] != NULL; ii++)
+    {
+        gchar *opt;
+        opt = g_strdup(opts[ii]);
+        gchar *pos = strchr(opt, '=');
+        if (pos != NULL)
+        {
+            *pos = 0;
+        }
+        if (find_syn_match(opt, opt_syns) >= 0)
+        {
+            // Mark as deleted
+            opts[ii][0] = 0;
+        }
+        g_free(opt);
+    }
 }
 
 static gchar*
 x264_lookup_value(gchar **opts, gchar **opt_syns)
 {
-	gchar *ret = NULL;
-	gint pos;
-
-	const gchar *def_val = x264_opt_get_default(opt_syns[0]);
-
-	pos = x264_find_opt(opts, opt_syns);
-	if (pos >= 0)
-	{
-		gchar *cpos = strchr(opts[pos], '=');
-		if (cpos != NULL)
-		{
-			ret = g_strdup(cpos+1);
-		}
-		else
-		{
-			ret = g_strdup("");
-		}
-	}
-	else if (def_val != NULL)
-	{
-		ret = g_strdup(def_val);
-	}
-	return ret;
+    gchar *ret = NULL;
+    gint pos;
+
+    const gchar *def_val = x264_opt_get_default(opt_syns[0]);
+
+    pos = x264_find_opt(opts, opt_syns);
+    if (pos >= 0)
+    {
+        gchar *cpos = strchr(opts[pos], '=');
+        if (cpos != NULL)
+        {
+            ret = g_strdup(cpos+1);
+        }
+        else
+        {
+            ret = g_strdup("");
+        }
+    }
+    else if (def_val != NULL)
+    {
+        ret = g_strdup(def_val);
+    }
+    return ret;
 }
 
 gint
 ghb_lookup_badapt(const gchar *options)
 {
-	gint ret = 0;
-	gchar *result;
-	gchar **split;
-	
-	if (options == NULL)
-		options = "";
-
-	split = g_strsplit(options, ":", -1);
-
-	result = x264_lookup_value(split, x264_badapt_syns);
-	g_strfreev(split);
-	if (result != NULL)
-	{
-		ret = g_strtod(result, NULL);
-		g_free(result);
-	}
-	return ret;
+    gint ret = 0;
+    gchar *result;
+    gchar **split;
+    
+    if (options == NULL)
+        options = "";
+
+    split = g_strsplit(options, ":", -1);
+
+    result = x264_lookup_value(split, x264_badapt_syns);
+    g_strfreev(split);
+    if (result != NULL)
+    {
+        ret = g_strtod(result, NULL);
+        g_free(result);
+    }
+    return ret;
 }
 
 gint
 ghb_lookup_aqmode(const gchar *options)
 {
-	gint ret = 0;
-	gchar *result;
-	gchar **split;
-	
-	if (options == NULL)
-		options = "";
-
-	split = g_strsplit(options, ":", -1);
-
-	result = x264_lookup_value(split, x264_aqmode_syns);
-	g_strfreev(split);
-	if (result != NULL)
-	{
-		ret = g_strtod(result, NULL);
-		g_free(result);
-	}
-	return ret;
+    gint ret = 0;
+    gchar *result;
+    gchar **split;
+    
+    if (options == NULL)
+        options = "";
+
+    split = g_strsplit(options, ":", -1);
+
+    result = x264_lookup_value(split, x264_aqmode_syns);
+    g_strfreev(split);
+    if (result != NULL)
+    {
+        ret = g_strtod(result, NULL);
+        g_free(result);
+    }
+    return ret;
 }
 
 gint
 ghb_lookup_bframes(const gchar *options)
 {
-	gint ret = 0;
-	gchar *result;
-	gchar **split;
-	
-	if (options == NULL)
-		options = "";
-
-	split = g_strsplit(options, ":", -1);
-
-	result = x264_lookup_value(split, x264_bframes_syns);
-	g_strfreev(split);
-	if (result != NULL)
-	{
-		ret = g_strtod(result, NULL);
-		g_free(result);
-	}
-	return ret;
+    gint ret = 0;
+    gchar *result;
+    gchar **split;
+    
+    if (options == NULL)
+        options = "";
+
+    split = g_strsplit(options, ":", -1);
+
+    result = x264_lookup_value(split, x264_bframes_syns);
+    g_strfreev(split);
+    if (result != NULL)
+    {
+        ret = g_strtod(result, NULL);
+        g_free(result);
+    }
+    return ret;
 }
 
 gint
 ghb_lookup_mbtree(const gchar *options)
 {
-	gint ret = ghb_lookup_bframes(options) != 0;
-	gchar *result;
-	gchar **split;
-	
-	if (options == NULL)
-		options = "";
-
-	split = g_strsplit(options, ":", -1);
-
-	result = x264_lookup_value(split, x264_mbtree_syns);
-	g_strfreev(split);
-	if (result != NULL)
-	{
-		ret = g_strtod(result, NULL);
-		g_free(result);
-	}
-	return ret;
+    gint ret = ghb_lookup_bframes(options) != 0;
+    gchar *result;
+    gchar **split;
+    
+    if (options == NULL)
+        options = "";
+
+    split = g_strsplit(options, ":", -1);
+
+    result = x264_lookup_value(split, x264_mbtree_syns);
+    g_strfreev(split);
+    if (result != NULL)
+    {
+        ret = g_strtod(result, NULL);
+        g_free(result);
+    }
+    return ret;
 }
 
 // Construct the x264 options string
@@ -977,116 +1194,129 @@
 static gchar*
 sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
 {
-	GString *x264opts = g_string_new("");
-	gchar **split = g_strsplit(options, ":", -1);
-	gint ii;
-
-	// Fix up option dependencies
-	gint subme = ghb_settings_combo_int(ud->settings, "x264_subme");
-	if (subme < 6)
-	{
-		x264_remove_opt(split, x264_psy_syns);
-	}
-	gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis");
-	if (subme >= 10)
-	{
-		gint aqmode = ghb_lookup_aqmode(options);
-		if (trell != 2 || aqmode == 0)
-		{
-			gint pos = x264_find_opt(split, x264_subme_syns);
-			g_free(split[pos]);
-			split[pos] = g_strdup_printf("subme=9");
-		}
-	}
-	if (trell < 1)
-	{
-		gint psy;
-		gdouble psy_rd = 0., psy_trell;
-
-		psy = x264_find_opt(split, x264_psy_syns);
-		if (psy >= 0)
-		{
-			gchar *pos = strchr(split[psy], '=');
-			if (pos != NULL)
-			{
-				x264_parse_psy(pos+1, &psy_rd, &psy_trell);
-			}
-			g_free(split[psy]);
-			split[psy] = g_strdup_printf("psy-rd=%g|0", psy_rd);
-		}
-	}
-	gint bframes = ghb_settings_get_int(ud->settings, "x264_bframes");
-	if (bframes == 0)
-	{
-		x264_remove_opt(split, x264_direct_syns);
-		x264_remove_opt(split, x264_badapt_syns);
-	}
-	if (bframes <= 1)
-	{
-		x264_remove_opt(split, x264_bpyramid_syns);
-	}
-	// Remove entries that match the defaults
-	for (ii = 0; split[ii] != NULL; ii++)
-	{
-		gchar *val = NULL;
-		gchar *opt = g_strdup(split[ii]);
-		gchar *pos = strchr(opt, '=');
-		if (pos != NULL)
-		{
-			val = pos + 1;
-			*pos = 0;
-		}
-		else
-		{
-			val = "1";
-		}
-		const gchar *def_val;
-		def_val = x264_opt_get_default(opt);
-		if (strcmp(val, def_val) == 0)
-		{
-			// Matches the default, so remove it
-			split[ii][0] = 0;
-		}
-		g_free(opt);
-	}
-	for (ii = 0; split[ii] != NULL; ii++)
-	{
-		if (split[ii][0] != 0)
-			g_string_append_printf(x264opts, "%s:", split[ii]);
-	}
-	g_strfreev(split);
-	// strip the trailing ":"
-	gchar *result;
-	gint len;
-	result = g_string_free(x264opts, FALSE);
-	len = strlen(result);
-	if (len > 0) result[len - 1] = 0;
-	return result;
+    GString *x264opts = g_string_new("");
+    gchar **split = g_strsplit(options, ":", -1);
+    gint ii;
+
+    // Fix up option dependencies
+    gint subme = ghb_settings_combo_int(ud->settings, "x264_subme");
+    if (subme < 6)
+    {
+        x264_remove_opt(split, x264_psy_syns);
+    }
+    gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis");
+    if (subme >= 10)
+    {
+        gint aqmode = ghb_lookup_aqmode(options);
+        if (trell != 2 || aqmode == 0)
+        {
+            gint pos = x264_find_opt(split, x264_subme_syns);
+            g_free(split[pos]);
+            split[pos] = g_strdup_printf("subme=9");
+        }
+    }
+    if (trell < 1)
+    {
+        gint psy;
+        gdouble psy_rd = 0., psy_trell;
+
+        psy = x264_find_opt(split, x264_psy_syns);
+        if (psy >= 0)
+        {
+            gchar *pos = strchr(split[psy], '=');
+            if (pos != NULL)
+            {
+                x264_parse_psy(pos+1, &psy_rd, &psy_trell);
+            }
+            g_free(split[psy]);
+            split[psy] = g_strdup_printf("psy-rd=%g|0", psy_rd);
+        }
+    }
+    gint bframes = ghb_settings_get_int(ud->settings, "x264_bframes");
+    if (bframes == 0)
+    {
+        x264_remove_opt(split, x264_direct_syns);
+        x264_remove_opt(split, x264_badapt_syns);
+    }
+    if (bframes <= 1)
+    {
+        x264_remove_opt(split, x264_bpyramid_syns);
+    }
+    // Remove entries that match the defaults
+    for (ii = 0; split[ii] != NULL; ii++)
+    {
+        gchar *val = NULL;
+        gchar *opt = g_strdup(split[ii]);
+        gchar *pos = strchr(opt, '=');
+        if (pos != NULL)
+        {
+            val = pos + 1;
+            *pos = 0;
+        }
+        else
+        {
+            val = "1";
+        }
+        const gchar *def_val;
+        def_val = x264_opt_get_default(opt);
+        if (strcmp(val, def_val) == 0)
+        {
+            // Matches the default, so remove it
+            split[ii][0] = 0;
+        }
+        g_free(opt);
+    }
+    for (ii = 0; split[ii] != NULL; ii++)
+    {
+        if (split[ii][0] != 0)
+            g_string_append_printf(x264opts, "%s:", split[ii]);
+    }
+    g_strfreev(split);
+    // strip the trailing ":"
+    gchar *result;
+    gint len;
+    result = g_string_free(x264opts, FALSE);
+    len = strlen(result);
+    if (len > 0) result[len - 1] = 0;
+    return result;
 }
 
 G_MODULE_EXPORT gboolean
 lavc_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-	signal_user_data_t *ud)
+    signal_user_data_t *ud)
 {
-	ghb_widget_to_setting(ud->settings, widget);
+    ghb_widget_to_setting(ud->settings, widget);
 
 #if 0
-	gchar *options, *sopts;
-	****************************************************************
-	When there are lavc widget in the future, this will be populated
-	****************************************************************
-	options = ghb_settings_get_string(ud->settings, "x264Option");
-	sopts = sanitize_x264opts(ud, options);
-	ignore_options_update = TRUE;
-	if (sopts != NULL && strcmp(sopts, options) != 0)
-	{
-		ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
-		ghb_x264_parse_options(ud, sopts);
-	}
-	g_free(options);
-	g_free(sopts);
-	ignore_options_update = FALSE;
+    gchar *options, *sopts;
+    ****************************************************************
+    When there are lavc widget in the future, this will be populated
+    ****************************************************************
+    options = ghb_settings_get_string(ud->settings, "x264Option");
+    sopts = sanitize_x264opts(ud, options);
+    ignore_options_update = TRUE;
+    if (sopts != NULL && strcmp(sopts, options) != 0)
+    {
+        ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
+        ghb_x264_parse_options(ud, sopts);
+    }
+    g_free(options);
+    g_free(sopts);
+    ignore_options_update = FALSE;
 #endif
-	return FALSE;
+    return FALSE;
+}
+
+G_MODULE_EXPORT gchar*
+format_x264_preset_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+    const char * const *x264_presets;
+    const char *preset = "medium";
+
+    x264_presets = hb_x264_presets();
+
+    preset = x264_presets[(int)val];
+
+    return g_strdup_printf(" %-12s", preset);
 }

HandBrake-0.9.8.tar.bz2/gtk/src/x264handler.h -> HandBrake-0.9.9.tar.bz2/gtk/src/x264handler.h Changed

HandBrake-0.9.9.tar.bz2/libhb/audio_remap.c Added

@@ -0,0 +1,349 @@
+/* audio_remap.c
+ *
+ * Copyright (c) 2003-2013 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "common.h"
+#include "hbffmpeg.h"
+#include "audio_remap.h"
+
+// source: libavutil/channel_layout.h
+hb_chan_map_t hb_libav_chan_map =
+{
+    {
+        AV_CH_FRONT_LEFT,
+        AV_CH_FRONT_RIGHT,
+        AV_CH_FRONT_CENTER,
+        AV_CH_LOW_FREQUENCY,
+        AV_CH_BACK_LEFT,
+        AV_CH_BACK_RIGHT,
+        AV_CH_FRONT_LEFT_OF_CENTER,
+        AV_CH_FRONT_RIGHT_OF_CENTER,
+        AV_CH_BACK_CENTER,
+        AV_CH_SIDE_LEFT,
+        AV_CH_SIDE_RIGHT,
+        0
+    }
+};
+
+// source: liba52 documentation
+hb_chan_map_t hb_liba52_chan_map =
+{
+    {
+        AV_CH_LOW_FREQUENCY,
+        AV_CH_FRONT_LEFT,
+        AV_CH_FRONT_CENTER,
+        AV_CH_FRONT_RIGHT,
+        AV_CH_BACK_CENTER,
+        AV_CH_SIDE_LEFT,
+        AV_CH_SIDE_RIGHT,
+        0
+    }
+};
+
+// source: http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9
+hb_chan_map_t hb_vorbis_chan_map =
+{
+    {
+        AV_CH_FRONT_LEFT,
+        AV_CH_FRONT_CENTER,
+        AV_CH_FRONT_RIGHT,
+        AV_CH_SIDE_LEFT,
+        AV_CH_SIDE_RIGHT,
+        AV_CH_BACK_LEFT,
+        AV_CH_BACK_CENTER,
+        AV_CH_BACK_RIGHT,
+        AV_CH_LOW_FREQUENCY,
+        0
+    }
+};
+
+// source: https://developer.apple.com/library/mac/#documentation/musicaudio/reference/CoreAudioDataTypesRef/Reference/reference.html
+hb_chan_map_t hb_aac_chan_map =
+{
+    {
+        AV_CH_FRONT_CENTER,
+        AV_CH_FRONT_LEFT_OF_CENTER,
+        AV_CH_FRONT_RIGHT_OF_CENTER,
+        AV_CH_FRONT_LEFT,
+        AV_CH_FRONT_RIGHT,
+        AV_CH_SIDE_LEFT,
+        AV_CH_SIDE_RIGHT,
+        AV_CH_BACK_LEFT,
+        AV_CH_BACK_RIGHT,
+        AV_CH_BACK_CENTER,
+        AV_CH_LOW_FREQUENCY,
+        0
+    }
+};
+
+static void remap_planar(uint8_t **samples, int nsamples,
+                         int nchannels, int *remap_table)
+{
+    int ii;
+    uint8_t *tmp_buf[HB_AUDIO_REMAP_MAX_CHANNELS];
+    memcpy(tmp_buf, samples, nchannels * sizeof(uint8_t*));
+    for (ii = 0; ii < nchannels; ii++)
+    {
+        samples[ii] = tmp_buf[remap_table[ii]];
+    }
+}
+
+static void remap_u8_interleaved(uint8_t **samples, int nsamples,
+                                 int nchannels, int *remap_table)
+{
+    int ii, jj;
+    uint8_t *samples_u8 = (*samples);
+    uint8_t tmp_buf[HB_AUDIO_REMAP_MAX_CHANNELS];
+    for (ii = 0; ii < nsamples; ii++)
+    {
+        memcpy(tmp_buf, samples_u8, nchannels * sizeof(uint8_t));
+        for (jj = 0; jj < nchannels; jj++)
+        {
+            samples_u8[jj] = tmp_buf[remap_table[jj]];
+        }
+        samples_u8 += nchannels;
+    }
+}
+
+static void remap_s16_interleaved(uint8_t **samples, int nsamples,
+                                  int nchannels, int *remap_table)
+{
+    int ii, jj;
+    int16_t *samples_s16 = (int16_t*)(*samples);
+    int16_t tmp_buf[HB_AUDIO_REMAP_MAX_CHANNELS];
+    for (ii = 0; ii < nsamples; ii++)
+    {
+        memcpy(tmp_buf, samples_s16, nchannels * sizeof(int16_t));
+        for (jj = 0; jj < nchannels; jj++)
+        {
+            samples_s16[jj] = tmp_buf[remap_table[jj]];
+        }
+        samples_s16 += nchannels;
+    }
+}
+
+static void remap_s32_interleaved(uint8_t **samples, int nsamples,
+                                  int nchannels, int *remap_table)
+{
+    int ii, jj;
+    int32_t *samples_s32 = (int32_t*)(*samples);
+    int32_t tmp_buf[HB_AUDIO_REMAP_MAX_CHANNELS];
+    for (ii = 0; ii < nsamples; ii++)
+    {
+        memcpy(tmp_buf, samples_s32, nchannels * sizeof(int32_t));
+        for (jj = 0; jj < nchannels; jj++)
+        {
+            samples_s32[jj] = tmp_buf[remap_table[jj]];
+        }
+        samples_s32 += nchannels;
+    }
+}
+
+static void remap_flt_interleaved(uint8_t **samples, int nsamples,
+                                  int nchannels, int *remap_table)
+{
+    int ii, jj;
+    float *samples_flt = (float*)(*samples);
+    float tmp_buf[HB_AUDIO_REMAP_MAX_CHANNELS];
+    for (ii = 0; ii < nsamples; ii++)
+    {
+        memcpy(tmp_buf, samples_flt, nchannels * sizeof(float));
+        for (jj = 0; jj < nchannels; jj++)
+        {
+            samples_flt[jj] = tmp_buf[remap_table[jj]];
+        }
+        samples_flt += nchannels;
+    }
+}
+
+static void remap_dbl_interleaved(uint8_t **samples, int nsamples,
+                                  int nchannels, int *remap_table)
+{
+    int ii, jj;
+    double *samples_dbl = (double*)(*samples);
+    double tmp_buf[HB_AUDIO_REMAP_MAX_CHANNELS];
+    for (ii = 0; ii < nsamples; ii++)
+    {
+        memcpy(tmp_buf, samples_dbl, nchannels * sizeof(double));
+        for (jj = 0; jj < nchannels; jj++)
+        {
+            samples_dbl[jj] = tmp_buf[remap_table[jj]];
+        }
+        samples_dbl += nchannels;
+    }
+}
+
+hb_audio_remap_t* hb_audio_remap_init(enum AVSampleFormat sample_fmt,
+                                      hb_chan_map_t *channel_map_out,
+                                      hb_chan_map_t *channel_map_in)
+{
+    hb_audio_remap_t *remap = calloc(1, sizeof(hb_audio_remap_t));
+    if (remap == NULL)
+    {
+        hb_error("hb_audio_remap_init: failed to allocate remap");
+        goto fail;
+    }
+
+    // sample format
+    switch (sample_fmt)
+    {
+        case AV_SAMPLE_FMT_U8P:
+        case AV_SAMPLE_FMT_S16P:
+        case AV_SAMPLE_FMT_S32P:
+        case AV_SAMPLE_FMT_FLTP:
+        case AV_SAMPLE_FMT_DBLP:
+            remap->remap = &remap_planar;
+            break;
+
+        case AV_SAMPLE_FMT_U8:
+            remap->remap = &remap_u8_interleaved;
+            break;
+
+        case AV_SAMPLE_FMT_S16:
+            remap->remap = &remap_s16_interleaved;
+            break;
+
+        case AV_SAMPLE_FMT_S32:
+            remap->remap = &remap_s32_interleaved;
+            break;
+
+        case AV_SAMPLE_FMT_FLT:
+            remap->remap = &remap_flt_interleaved;
+            break;
+
+        case AV_SAMPLE_FMT_DBL:
+            remap->remap = &remap_dbl_interleaved;
+            break;
+
+        default:
+            hb_error("hb_audio_remap_init: unsupported sample format '%s'",
+                     av_get_sample_fmt_name(sample_fmt));
+            goto fail;
+    }
+
+    // input/output channel order
+    if (channel_map_in == NULL || channel_map_out == NULL)
+    {
+        hb_error("hb_audio_remap_init: invalid channel map(s)");
+        goto fail;
+    }
+    remap->channel_map_in  = channel_map_in;
+    remap->channel_map_out = channel_map_out;
+
+    // remap can't be done until the channel layout has been set
+    remap->remap_needed = 0;
+
+    return remap;
+
+fail:
+    hb_audio_remap_free(remap);
+    return NULL;
+}
+
+void hb_audio_remap_set_channel_layout(hb_audio_remap_t *remap,
+                                       uint64_t channel_layout,
+                                       int channels)
+{
+    if (remap != NULL)
+    {
+        int ii;
+        remap->remap_needed = 0;
+
+        // in some cases, remapping is not necessary and/or supported
+        if (channels > HB_AUDIO_REMAP_MAX_CHANNELS)
+        {
+            hb_log("hb_audio_remap_set_channel_layout: too many channels (%d)",
+                   channels);
+            return;
+        }
+        if (remap->channel_map_in == remap->channel_map_out)
+        {
+            return;
+        }
+
+        // sanitize the layout
+        channel_layout = hb_ff_layout_xlat(channel_layout, channels);
+        if (channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
+        {
+            channel_layout = AV_CH_LAYOUT_STEREO;
+        }
+        remap->nchannels = av_get_channel_layout_nb_channels(channel_layout);
+
+        // build the table and check whether remapping is necessary
+        hb_audio_remap_build_table(remap->channel_map_out,
+                                   remap->channel_map_in, channel_layout,
+                                   remap->table);
+        for (ii = 0; ii < remap->nchannels; ii++)
+        {
+            if (remap->table[ii] != ii)
+            {
+                remap->remap_needed = 1;
+                break;
+            }
+        }
+    }
+}
+
+
+void hb_audio_remap_free(hb_audio_remap_t *remap)
+{
+    if (remap != NULL)
+    {
+        free(remap);
+    }
+}
+
+void hb_audio_remap(hb_audio_remap_t *remap, uint8_t **samples, int nsamples)
+{
+    if (remap != NULL && remap->remap_needed)
+    {
+        remap->remap(samples, nsamples, remap->nchannels, remap->table);
+    }
+}
+
+void hb_audio_remap_build_table(hb_chan_map_t *channel_map_out,
+                                hb_chan_map_t *channel_map_in,
+                                uint64_t channel_layout,
+                                int *remap_table)
+{
+    int ii, jj, nchannels, out_chan_idx, remap_idx;
+    uint64_t *channels_in, *channels_out;
+
+    if (channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
+    {
+        // Dolby Surround is Stereo when it comes to remapping
+        channel_layout = AV_CH_LAYOUT_STEREO;
+    }
+    nchannels = av_get_channel_layout_nb_channels(channel_layout);
+
+    // clear remap table before (re-)building it
+    memset(remap_table, 0, nchannels * sizeof(int));
+
+    out_chan_idx = 0;
+    channels_in  = channel_map_in ->channel_order_map;
+    channels_out = channel_map_out->channel_order_map;
+    for (ii = 0; channels_out[ii] && out_chan_idx < nchannels; ii++)
+    {
+        if (channel_layout & channels_out[ii])
+        {
+            remap_idx = 0;
+            for (jj = 0; channels_in[jj] && remap_idx < nchannels; jj++)
+            {
+                if (channels_out[ii] == channels_in[jj])
+                {
+                    remap_table[out_chan_idx++] = remap_idx++;
+                    break;
+                }
+                else if (channel_layout & channels_in[jj])
+                {
+                    remap_idx++;
+                }
+            }
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/libhb/audio_remap.h Added

@@ -0,0 +1,105 @@
+/* audio_remap.h
+ *
+ * Copyright (c) 2003-2013 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+/* This file handles the following two scenarios:
+ *
+ * 1) remapping audio from decoder order to libav order (for downmixing)
+ *
+ * 2) remapping audio from libav order to encoder order (for encoding)
+ *
+ * We only need to support:
+ *
+ * a) channels found in our non-libavcodec audio decoders' layouts
+ * b) channels found in HB_AMIXDOWN_* layouts
+ *
+ * We consider that:
+ *
+ * Left/Right Surround == Side Left/Right
+ * Left/Right Rear Surround == Back Left/Right */
+
+#ifndef AUDIO_REMAP_H
+#define AUDIO_REMAP_H
+
+#include <stdint.h>
+#include "libavutil/samplefmt.h"
+
+/* we only need to support the 11 "most common" channels */
+#define HB_AUDIO_REMAP_MAX_CHANNELS 11
+
+typedef struct
+{
+    uint64_t channel_order_map[HB_AUDIO_REMAP_MAX_CHANNELS + 1];
+} hb_chan_map_t;
+
+typedef struct
+{
+    int nchannels;
+    int remap_needed;
+    hb_chan_map_t *channel_map_in;
+    hb_chan_map_t *channel_map_out;
+    int table[HB_AUDIO_REMAP_MAX_CHANNELS];
+
+    void (*remap)(uint8_t **samples, int nsamples,
+                  int nchannels, int *remap_table);
+} hb_audio_remap_t;
+
+/*
+ * Predefined channel maps for common channel orders.
+ */
+extern hb_chan_map_t hb_libav_chan_map;
+extern hb_chan_map_t hb_liba52_chan_map;
+extern hb_chan_map_t hb_vorbis_chan_map;
+extern hb_chan_map_t hb_aac_chan_map;
+
+/*
+ * Initialize an hb_audio_remap_t to remap audio with the specified sample
+ * format, from the input to the output channel order (indicated by
+ * channel_map_in and channel_map_out, respectively).
+ */
+hb_audio_remap_t* hb_audio_remap_init(enum AVSampleFormat sample_fmt,
+                                      hb_chan_map_t *channel_map_out,
+                                      hb_chan_map_t *channel_map_in);
+
+/*
+ * Updates an hb_audio_remap_t's number of channels and remap table to work with
+ * the specified channel layout.
+ *
+ * Must be called at least once before remapping.
+ */
+void              hb_audio_remap_set_channel_layout(hb_audio_remap_t *remap,
+                                                    uint64_t channel_layout,
+                                                    int channels);
+
+/*
+ * Free an hb_audio_remap_t.
+ */
+void              hb_audio_remap_free(hb_audio_remap_t *remap);
+
+/*
+ * Remap audio between 2 different channel orders, using the settings specified
+ * in the remap paremeter. Remapping is only done when necessary.
+ *
+ * The remap parameter can be NULL (no remapping).
+ */
+void              hb_audio_remap(hb_audio_remap_t *remap, uint8_t **samples,
+                                 int nsamples);
+
+/*
+ * Generate a table used to remap audio between 2 different channel orders.
+ *
+ * Usage: output_sample[channel_idx] = input_sample[remap_table[channel_idx]]
+ *
+ * remap_table is allocated by the caller.
+ */
+void              hb_audio_remap_build_table(hb_chan_map_t *channel_map_out,
+                                             hb_chan_map_t *channel_map_in,
+                                             uint64_t channel_layout,
+                                             int *remap_table);
+
+#endif /* AUDIO_REMAP_H */

HandBrake-0.9.9.tar.bz2/libhb/audio_resample.c Added

@@ -0,0 +1,278 @@
+/* audio_resample.c
+ *
+ * Copyright (c) 2003-2013 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "common.h"
+#include "hbffmpeg.h"
+#include "audio_resample.h"
+
+hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt,
+                                            int hb_amixdown, int normalize_mix)
+{
+    hb_audio_resample_t *resample = calloc(1, sizeof(hb_audio_resample_t));
+    if (resample == NULL)
+    {
+        hb_error("hb_audio_resample_init: failed to allocate resample");
+        goto fail;
+    }
+
+    // avresample context, initialized in hb_audio_resample_update()
+    resample->avresample = NULL;
+
+    // we don't support planar output yet
+    if (av_sample_fmt_is_planar(sample_fmt))
+    {
+        hb_error("hb_audio_resample_init: planar output not supported ('%s')",
+                 av_get_sample_fmt_name(sample_fmt));
+        goto fail;
+    }
+
+    // convert mixdown to channel_layout/matrix_encoding combo
+    int matrix_encoding;
+    uint64_t channel_layout = hb_ff_mixdown_xlat(hb_amixdown, &matrix_encoding);
+
+    /*
+     * When downmixing, Dual Mono to Mono is a special case:
+     * the audio must remain 2-channel until all conversions are done.
+     */
+    if (hb_amixdown == HB_AMIXDOWN_LEFT || hb_amixdown == HB_AMIXDOWN_RIGHT)
+    {
+        channel_layout                 = AV_CH_LAYOUT_STEREO;
+        resample->dual_mono_downmix    = 1;
+        resample->dual_mono_right_only = (hb_amixdown == HB_AMIXDOWN_RIGHT);
+    }
+    else
+    {
+        resample->dual_mono_downmix = 0;
+    }
+
+    // requested output channel_layout, sample_fmt
+    resample->out.channels = av_get_channel_layout_nb_channels(channel_layout);
+    resample->out.channel_layout      = channel_layout;
+    resample->out.matrix_encoding     = matrix_encoding;
+    resample->out.normalize_mix_level = normalize_mix;
+    resample->out.sample_fmt          = sample_fmt;
+    resample->out.sample_size         = av_get_bytes_per_sample(sample_fmt);
+
+    // set default input characteristics
+    resample->in.sample_fmt         = resample->out.sample_fmt;
+    resample->in.channel_layout     = resample->out.channel_layout;
+    resample->in.center_mix_level   = HB_MIXLEV_DEFAULT;
+    resample->in.surround_mix_level = HB_MIXLEV_DEFAULT;
+
+    // by default, no conversion needed
+    resample->resample_needed = 0;
+    return resample;
+
+fail:
+    hb_audio_resample_free(resample);
+    return NULL;
+}
+
+void hb_audio_resample_set_channel_layout(hb_audio_resample_t *resample,
+                                          uint64_t channel_layout,
+                                          int channels)
+{
+    if (resample != NULL)
+    {
+        channel_layout = hb_ff_layout_xlat(channel_layout, channels);
+        if (channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
+        {
+            // Dolby Surround is Stereo when it comes to remixing
+            channel_layout = AV_CH_LAYOUT_STEREO;
+        }
+        resample->in.channel_layout = channel_layout;
+    }
+}
+
+void hb_audio_resample_set_mix_levels(hb_audio_resample_t *resample,
+                                      double surround_mix_level,
+                                      double center_mix_level)
+{
+    if (resample != NULL)
+    {
+        resample->in.center_mix_level   = center_mix_level;
+        resample->in.surround_mix_level = surround_mix_level;
+    }
+}
+
+void hb_audio_resample_set_sample_fmt(hb_audio_resample_t *resample,
+                                      enum AVSampleFormat sample_fmt)
+{
+    if (resample != NULL)
+    {
+        resample->in.sample_fmt = sample_fmt;
+    }
+}
+
+int hb_audio_resample_update(hb_audio_resample_t *resample)
+{
+    if (resample == NULL)
+    {
+        hb_error("hb_audio_resample_update: resample is NULL");
+        return 1;
+    }
+
+    int ret, resample_changed;
+
+    resample->resample_needed =
+        (resample->out.sample_fmt != resample->in.sample_fmt ||
+         resample->out.channel_layout != resample->in.channel_layout);
+
+    resample_changed =
+        (resample->resample_needed &&
+         (resample->resample.sample_fmt != resample->in.sample_fmt ||
+          resample->resample.channel_layout != resample->in.channel_layout ||
+          resample->resample.center_mix_level != resample->in.center_mix_level ||
+          resample->resample.surround_mix_level != resample->in.surround_mix_level));
+
+    if (resample_changed || (resample->resample_needed &&
+                             resample->avresample == NULL))
+    {
+        if (resample->avresample == NULL)
+        {
+            resample->avresample = avresample_alloc_context();
+            if (resample->avresample == NULL)
+            {
+                hb_error("hb_audio_resample_update: avresample_alloc_context() failed");
+                return 1;
+            }
+
+            av_opt_set_int(resample->avresample, "out_sample_fmt",
+                           resample->out.sample_fmt, 0);
+            av_opt_set_int(resample->avresample, "out_channel_layout",
+                           resample->out.channel_layout, 0);
+            av_opt_set_int(resample->avresample, "matrix_encoding",
+                           resample->out.matrix_encoding, 0);
+            av_opt_set_int(resample->avresample, "normalize_mix_level",
+                           resample->out.normalize_mix_level, 0);
+        }
+        else if (resample_changed)
+        {
+            avresample_close(resample->avresample);
+        }
+
+        av_opt_set_int(resample->avresample, "in_sample_fmt",
+                       resample->in.sample_fmt, 0);
+        av_opt_set_int(resample->avresample, "in_channel_layout",
+                       resample->in.channel_layout, 0);
+        av_opt_set_double(resample->avresample, "center_mix_level",
+                          resample->in.center_mix_level, 0);
+        av_opt_set_double(resample->avresample, "surround_mix_level",
+                          resample->in.surround_mix_level, 0);
+
+        if ((ret = avresample_open(resample->avresample)))
+        {
+            char err_desc[64];
+            av_strerror(ret, err_desc, 63);
+            hb_error("hb_audio_resample_update: avresample_open() failed (%s)",
+                     err_desc);
+            // avresample won't open, start over
+            avresample_free(&resample->avresample);
+            return ret;
+        }
+
+        resample->resample.sample_fmt         = resample->in.sample_fmt;
+        resample->resample.channel_layout     = resample->in.channel_layout;
+        resample->resample.channels           =
+            av_get_channel_layout_nb_channels(resample->in.channel_layout);
+        resample->resample.center_mix_level   = resample->in.center_mix_level;
+        resample->resample.surround_mix_level = resample->in.surround_mix_level;
+    }
+
+    return 0;
+}
+
+void hb_audio_resample_free(hb_audio_resample_t *resample)
+{
+    if (resample != NULL)
+    {
+        if (resample->avresample != NULL)
+        {
+            avresample_free(&resample->avresample);
+        }
+        free(resample);
+    }
+}
+
+hb_buffer_t* hb_audio_resample(hb_audio_resample_t *resample,
+                               uint8_t **samples, int nsamples)
+{
+    if (resample == NULL)
+    {
+        hb_error("hb_audio_resample: resample is NULL");
+        return NULL;
+    }
+    if (resample->resample_needed && resample->avresample == NULL)
+    {
+        hb_error("hb_audio_resample: resample needed but libavresample context "
+                 "is NULL");
+        return NULL;
+    }
+
+    hb_buffer_t *out;
+    int out_size, out_samples;
+
+    if (resample->resample_needed)
+    {
+        int in_linesize, out_linesize;
+        // set in/out linesize and out_size
+        av_samples_get_buffer_size(&in_linesize,
+                                   resample->resample.channels, nsamples,
+                                   resample->resample.sample_fmt, 0);
+        out_size = av_samples_get_buffer_size(&out_linesize,
+                                              resample->out.channels, nsamples,
+                                              resample->out.sample_fmt, 0);
+        out = hb_buffer_init(out_size);
+
+        out_samples = avresample_convert(resample->avresample,
+                                         &out->data, out_linesize, nsamples,
+                                         samples,     in_linesize, nsamples);
+
+        if (out_samples <= 0)
+        {
+            if (out_samples < 0)
+                hb_log("hb_audio_resample: avresample_convert() failed");
+            // don't send empty buffers downstream (EOF)
+            hb_buffer_close(&out);
+            return NULL;
+        }
+        out->size = (out_samples *
+                     resample->out.sample_size * resample->out.channels);
+    }
+    else
+    {
+        out_samples = nsamples;
+        out_size = (out_samples *
+                    resample->out.sample_size * resample->out.channels);
+        out = hb_buffer_init(out_size);
+        memcpy(out->data, samples[0], out_size);
+    }
+
+    /*
+     * Dual Mono to Mono.
+     *
+     * Copy all left or right samples to the first half of the buffer and halve
+     * the buffer size.
+     */
+    if (resample->dual_mono_downmix)
+    {
+        int ii, jj = !!resample->dual_mono_right_only;
+        int sample_size = resample->out.sample_size;
+        uint8_t *audio_samples = out->data;
+        for (ii = 0; ii < out_samples; ii++)
+        {
+            memcpy(audio_samples + (ii * sample_size),
+                   audio_samples + (jj * sample_size), sample_size);
+            jj += 2;
+        }
+        out->size = out_samples * sample_size;
+    }
+
+    return out;
+}

HandBrake-0.9.9.tar.bz2/libhb/audio_resample.h Added

@@ -0,0 +1,111 @@
+/* audio_resample.h
+ *
+ * Copyright (c) 2003-2013 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+/* Implements a libavresample wrapper for convenience.
+ *
+ * Supports sample_fmt and channel_layout conversion.
+ *
+ * sample_rate conversion will come later (libavresample doesn't support
+ * sample_rate conversion with float samples yet). */
+
+#ifndef AUDIO_RESAMPLE_H
+#define AUDIO_RESAMPLE_H
+
+#include <math.h>
+#include <stdint.h>
+#include "libavutil/channel_layout.h"
+#include "libavresample/avresample.h"
+
+/* Default mix level for center and surround channels */
+#define HB_MIXLEV_DEFAULT ((double)M_SQRT1_2)
+
+typedef struct
+{
+    int dual_mono_downmix;
+    int dual_mono_right_only;
+
+    int resample_needed;
+    AVAudioResampleContext *avresample;
+
+    struct
+    {
+        uint64_t channel_layout;
+        double center_mix_level;
+        double surround_mix_level;
+        enum AVSampleFormat sample_fmt;
+    } in;
+
+    struct
+    {
+        int channels;
+        uint64_t channel_layout;
+        double center_mix_level;
+        double surround_mix_level;
+        enum AVSampleFormat sample_fmt;
+    } resample;
+
+    struct
+    {
+        int channels;
+        int sample_size;
+        int normalize_mix_level;
+        uint64_t channel_layout;
+        enum AVSampleFormat sample_fmt;
+        enum AVMatrixEncoding matrix_encoding;
+    } out;
+} hb_audio_resample_t;
+
+/* Initialize an hb_audio_resample_t for converting audio to the requested
+ * sample_fmt and mixdown.
+ *
+ * Also sets the default audio input characteristics, so that they are the same
+ * as the output characteristics (no conversion needed).
+ */
+hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt,
+                                            int hb_amixdown, int normalize_mix);
+
+/* The following functions set the audio input characteristics.
+ *
+ * They should be called whenever the relevant characteristic(s) differ from the
+ * requested output characteristics, or if they may have changed in the source.
+ *
+ * Note: channel_layout is automatically sanitized.
+ */
+
+void                 hb_audio_resample_set_channel_layout(hb_audio_resample_t *resample,
+                                                          uint64_t channel_layout,
+                                                          int channels);
+
+void                 hb_audio_resample_set_mix_levels(hb_audio_resample_t *resample,
+                                                      double surround_mix_level,
+                                                      double center_mix_level);
+
+void                 hb_audio_resample_set_sample_fmt(hb_audio_resample_t *resample,
+                                                      enum AVSampleFormat sample_fmt);
+
+/* Update an hb_audio_resample_t.
+ *
+ * Must be called after using any of the above functions.
+ */
+int                  hb_audio_resample_update(hb_audio_resample_t *resample);
+
+/* Free an hb_audio_remsample_t. */
+void                 hb_audio_resample_free(hb_audio_resample_t *resample);
+
+/* Convert input samples to the requested output characteristics
+ * (sample_fmt and channel_layout + matrix_encoding).
+ *
+ * Returns an hb_buffer_t with the converted output.
+ *
+ * resampling is only done when necessary.
+ */
+hb_buffer_t*         hb_audio_resample(hb_audio_resample_t *resample,
+                                       uint8_t **samples, int nsamples);
+
+#endif /* AUDIO_RESAMPLE_H */

HandBrake-0.9.8.tar.bz2/libhb/batch.c -> HandBrake-0.9.9.tar.bz2/libhb/batch.c Changed

HandBrake-0.9.8.tar.bz2/libhb/bd.c -> HandBrake-0.9.9.tar.bz2/libhb/bd.c Changed

@@ -1,8 +1,11 @@
-/* $Id: dvd.c,v 1.12 2005/11/25 15:05:25 titer Exp $
+/* dvd.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "lang.h"
@@ -51,7 +54,7 @@
         goto fail;
     }
 
-    d->title_count = bd_get_titles( d->bd, TITLES_RELEVANT );
+    d->title_count = bd_get_titles( d->bd, TITLES_RELEVANT, 0 );
     if ( d->title_count == 0 )
     {
         hb_log( "bd: not a bd - trying as a stream/file instead" );
@@ -60,7 +63,7 @@
     d->title_info = calloc( sizeof( BLURAY_TITLE_INFO* ) , d->title_count );
     for ( ii = 0; ii < d->title_count; ii++ )
     {
-        d->title_info[ii] = bd_get_title_info( d->bd, ii );
+        d->title_info[ii] = bd_get_title_info( d->bd, ii, 0 );
     }
     qsort(d->title_info, d->title_count, sizeof( BLURAY_TITLE_INFO* ), title_info_compare_mpls );
     d->path = strdup( path );
@@ -81,47 +84,119 @@
     return d->title_count;
 }
 
+static void add_subtitle(int track, hb_list_t *list_subtitle, BLURAY_STREAM_INFO *bdsub, uint32_t codec)
+{
+    hb_subtitle_t * subtitle;
+    iso639_lang_t * lang;
+
+    subtitle = calloc( sizeof( hb_subtitle_t ), 1 );
+
+    subtitle->track = track;
+    subtitle->id = bdsub->pid;
+    lang = lang_for_code2( (char*)bdsub->lang );
+    snprintf( subtitle->lang, sizeof( subtitle->lang ), "%s",
+              strlen(lang->native_name) ? lang->native_name : lang->eng_name);
+    snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "%s",
+              lang->iso639_2);
+
+    switch ( bdsub->coding_type )
+    {
+        case BLURAY_STREAM_TYPE_SUB_PG:
+            subtitle->source = PGSSUB;
+            subtitle->format = PICTURESUB;
+            subtitle->config.dest = RENDERSUB;
+            break;
+        default:
+            // Unrecognized, don't add to list
+            free( subtitle );
+            return;
+    }
+    subtitle->reg_desc = STR4_TO_UINT32("HDMV");
+    subtitle->stream_type = bdsub->coding_type;
+    subtitle->codec = codec;
+
+    hb_log( "bd: subtitle id=0x%x, lang=%s, 3cc=%s", subtitle->id,
+            subtitle->lang, subtitle->iso639_2 );
+
+    hb_list_add( list_subtitle, subtitle );
+    return;
+}
+
 static void add_audio(int track, hb_list_t *list_audio, BLURAY_STREAM_INFO *bdaudio, int substream_type, uint32_t codec, uint32_t codec_param)
 {
+    const char * codec_name;
     hb_audio_t * audio;
     iso639_lang_t * lang;
 
     audio = calloc( sizeof( hb_audio_t ), 1 );
 
     audio->id = (substream_type << 16) | bdaudio->pid;
+    audio->config.in.reg_desc = STR4_TO_UINT32("HDMV");
     audio->config.in.stream_type = bdaudio->coding_type;
     audio->config.in.substream_type = substream_type;
     audio->config.in.codec = codec;
     audio->config.in.codec_param = codec_param;
-    audio->config.lang.type = 0;
+
+    switch( audio->config.in.codec )
+    {
+        case HB_ACODEC_AC3:
+            codec_name = "AC3";
+            break;
+        case HB_ACODEC_DCA:
+            codec_name = "DTS";
+            break;
+        default:
+        {
+            if( audio->config.in.codec & HB_ACODEC_FF_MASK )
+            {
+                switch( bdaudio->coding_type )
+                {
+                    case BLURAY_STREAM_TYPE_AUDIO_AC3PLUS:
+                        codec_name = "E-AC3";
+                        break;
+                    case BLURAY_STREAM_TYPE_AUDIO_DTSHD:
+                        codec_name = "DTS-HD HRA";
+                        break;
+                    case BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER:
+                        codec_name = "DTS-HD MA";
+                        break;
+                    case BLURAY_STREAM_TYPE_AUDIO_LPCM:
+                        codec_name = "BD LPCM";
+                        break;
+                    case BLURAY_STREAM_TYPE_AUDIO_MPEG1:
+                        codec_name = "MPEG1";
+                        break;
+                    case BLURAY_STREAM_TYPE_AUDIO_MPEG2:
+                        codec_name = "MPEG2";
+                        break;
+                    case BLURAY_STREAM_TYPE_AUDIO_TRUHD:
+                        codec_name = "TrueHD";
+                        break;
+                    default:
+                        codec_name = "Unknown FFmpeg";
+                        break;
+                }
+            }
+            else
+            {
+                codec_name = "Unknown";
+            }
+        }
+        break;
+    }
 
     lang = lang_for_code2( (char*)bdaudio->lang );
 
-    int stream_type = bdaudio->coding_type;
-    snprintf( audio->config.lang.description, 
-        sizeof( audio->config.lang.description ), "%s (%s)",
-        strlen(lang->native_name) ? lang->native_name : lang->eng_name,
-        audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : 
-        ( audio->config.in.codec == HB_ACODEC_DCA ? "DTS" : 
-        ( ( audio->config.in.codec & HB_ACODEC_FF_MASK ) ? 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_LPCM ? "BD LPCM" : 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_AC3PLUS ? "E-AC3" : 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_TRUHD ? "TrueHD" : 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_DTSHD ? "DTS-HD HRA" : 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER ? "DTS-HD MA" : 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_MPEG1 ? "MPEG1" : 
-            ( stream_type == BLURAY_STREAM_TYPE_AUDIO_MPEG2 ? "MPEG2" : 
-                                                           "Unknown FFmpeg" 
-            ) ) ) ) ) ) ) : "Unknown" 
-        ) ) );
+    audio->config.lang.type = 0;
 
     snprintf( audio->config.lang.simple, 
               sizeof( audio->config.lang.simple ), "%s",
-              strlen(lang->native_name) ? lang->native_name : 
-                                          lang->eng_name );
-
+              strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
     snprintf( audio->config.lang.iso639_2, 
-              sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2);
+              sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
+    snprintf( audio->config.lang.description,
+              sizeof( audio->config.lang.description ), "%s (%s)",
+              audio->config.lang.simple, codec_name );
 
     hb_log( "bd: audio id=0x%x, lang=%s, 3cc=%s", audio->id,
             audio->config.lang.description, audio->config.lang.iso639_2 );
@@ -138,6 +213,9 @@
     if ( a->audio_stream_count != b->audio_stream_count )
         return 0;
 
+    if ( a->audio_stream_count == 0 )
+        return 0;
+
     for ( ii = 0; ii < a->audio_stream_count; ii++ )
     {
         BLURAY_STREAM_INFO * s = &a->audio_streams[ii];
@@ -277,12 +355,12 @@
 
         case BLURAY_STREAM_TYPE_VIDEO_VC1:
             title->video_codec = WORK_DECAVCODECV;
-            title->video_codec_param = CODEC_ID_VC1;
+            title->video_codec_param = AV_CODEC_ID_VC1;
             break;
 
         case BLURAY_STREAM_TYPE_VIDEO_H264:
             title->video_codec = WORK_DECAVCODECV;
-            title->video_codec_param = CODEC_ID_H264;
+            title->video_codec_param = AV_CODEC_ID_H264;
             title->flags |= HBTF_NO_IDR;
             break;
 
@@ -334,61 +412,82 @@
     }
 
     // Add all the audios found in the above clip.
-    for ( ii = 0; ii < ti->clips[audio_clip_index].audio_stream_count; ii++ )
+    for (ii = 0; ii < ti->clips[audio_clip_index].audio_stream_count; ii++)
     {
         BLURAY_STREAM_INFO * bdaudio;
 
         bdaudio = &ti->clips[audio_clip_index].audio_streams[ii];
 
-        switch( bdaudio->coding_type )
+        switch (bdaudio->coding_type)
         {
             case BLURAY_STREAM_TYPE_AUDIO_TRUHD:
                 // Add 2 audio tracks.  One for TrueHD and one for AC-3
-                add_audio(ii, title->list_audio, bdaudio, 
-                          HB_SUBSTREAM_BD_AC3, HB_ACODEC_AC3, 0);
-                add_audio(ii, title->list_audio, bdaudio, 
-                    HB_SUBSTREAM_BD_TRUEHD, HB_ACODEC_FFMPEG, CODEC_ID_TRUEHD);
+                add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_AC3,
+                          HB_ACODEC_AC3, 0);
+                add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_TRUEHD,
+                          HB_ACODEC_FFMPEG, AV_CODEC_ID_TRUEHD);
                 break;
 
             case BLURAY_STREAM_TYPE_AUDIO_DTS:
-                add_audio(ii, title->list_audio, bdaudio, 0, HB_ACODEC_DCA, 0);
+                add_audio(ii, title->list_audio, bdaudio, 0,
+                          HB_ACODEC_DCA, AV_CODEC_ID_DTS);
                 break;
 
             case BLURAY_STREAM_TYPE_AUDIO_MPEG2:
             case BLURAY_STREAM_TYPE_AUDIO_MPEG1:
-                add_audio(ii, title->list_audio, bdaudio, 0, 
-                          HB_ACODEC_FFMPEG, CODEC_ID_MP2);
+                add_audio(ii, title->list_audio, bdaudio, 0,
+                          HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2);
                 break;
 
             case BLURAY_STREAM_TYPE_AUDIO_AC3PLUS:
-                add_audio(ii, title->list_audio, bdaudio, 0, 
-                          HB_ACODEC_FFMPEG, CODEC_ID_EAC3);
+                add_audio(ii, title->list_audio, bdaudio, 0,
+                          HB_ACODEC_FFMPEG, AV_CODEC_ID_EAC3);
                 break;
 
             case BLURAY_STREAM_TYPE_AUDIO_LPCM:
-                add_audio(ii, title->list_audio, bdaudio, 0, 
-                          HB_ACODEC_FFMPEG, CODEC_ID_PCM_BLURAY);
+                add_audio(ii, title->list_audio, bdaudio, 0,
+                          HB_ACODEC_FFMPEG, AV_CODEC_ID_PCM_BLURAY);
                 break;
 
             case BLURAY_STREAM_TYPE_AUDIO_AC3:
-                add_audio(ii, title->list_audio, bdaudio, 0, HB_ACODEC_AC3, 0);
+                add_audio(ii, title->list_audio, bdaudio, 0,
+                          HB_ACODEC_AC3, 0);
                 break;
 
             case BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER:
             case BLURAY_STREAM_TYPE_AUDIO_DTSHD:
                 // Add 2 audio tracks.  One for DTS-HD and one for DTS
-                add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_DTS, 
-                          HB_ACODEC_DCA, 0);
+                add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_DTS,
+                          HB_ACODEC_DCA, AV_CODEC_ID_DTS);
                 // DTS-HD is special.  The substreams must be concatinated
                 // DTS-core followed by DTS-hd-extensions.  Setting
                 // a substream id of 0 says use all substreams.
                 add_audio(ii, title->list_audio, bdaudio, 0,
-                          HB_ACODEC_DCA_HD, CODEC_ID_DTS);
+                          HB_ACODEC_DCA_HD, AV_CODEC_ID_DTS);
+                break;
+
+            default:
+                hb_log("scan: unknown audio pid 0x%x codec 0x%x", bdaudio->pid,
+                       bdaudio->coding_type);
                 break;
+        }
+    }
 
+    // Add all the subtitles found in the above clip.
+    for ( ii = 0; ii < ti->clips[audio_clip_index].pg_stream_count; ii++ )
+    {
+        BLURAY_STREAM_INFO * bdpgs;
+
+        bdpgs = &ti->clips[audio_clip_index].pg_streams[ii];
+
+        switch( bdpgs->coding_type )
+        {
+            case BLURAY_STREAM_TYPE_SUB_PG:
+                add_subtitle(ii, title->list_subtitle, bdpgs, WORK_DECPGSSUB);
+                break;
             default:
-                hb_log( "scan: unknown audio pid 0x%x codec 0x%x",
-                        bdaudio->pid, bdaudio->coding_type );
+                hb_log( "scan: unknown subtitle pid 0x%x codec 0x%x",
+                        bdpgs->pid, bdpgs->coding_type );
                 break;
         }
     }
@@ -396,17 +495,20 @@
     /* Chapters */
     for ( ii = 0; ii < ti->chapter_count; ii++ )
     {
+        char chapter_title[80];
         chapter = calloc( sizeof( hb_chapter_t ), 1 );
 
         chapter->index = ii + 1;
+        sprintf( chapter_title, "Chapter %d", chapter->index );
+        hb_chapter_set_title( chapter, chapter_title );
+
         chapter->duration = ti->chapters[ii].duration;
         chapter->block_start = ti->chapters[ii].offset;
 
-        int seconds;
-        seconds            = ( chapter->duration + 45000 ) / 90000;
-        chapter->hours     = seconds / 3600;
-        chapter->minutes   = ( seconds % 3600 ) / 60;
-        chapter->seconds   = seconds % 60;
+        int seconds      = ( chapter->duration + 45000 ) / 90000;
+        chapter->hours   = ( seconds / 3600 );
+        chapter->minutes = ( seconds % 3600 ) / 60;
+        chapter->seconds = ( seconds % 60 );
 
         hb_log( "bd: chap %d packet=%"PRIu64", %"PRId64" ms",
                 chapter->index,
@@ -535,9 +637,8 @@
 
 int hb_bd_seek_chapter( hb_bd_t * d, int c )
 {
-    int64_t pos;
     d->next_chap = c;
-    pos = bd_seek_chapter( d->bd, c - 1 );
+    bd_seek_chapter( d->bd, c - 1 );
     hb_ts_stream_reset(d->stream);
     return 1;
 }
@@ -612,8 +713,8 @@
         b = hb_ts_decode_pkt( d->stream, buf+4 );
         if ( b )
         {
-            b->discontinuity = discontinuity;
-            b->new_chap = new_chap;
+            b->s.discontinuity = discontinuity;
+            b->s.new_chap = new_chap;
             return b;
         }
     }

HandBrake-0.9.9.tar.bz2/libhb/bits.h Added

@@ -0,0 +1,90 @@
+/* bits.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef HB_BITS_H
+#define HB_BITS_H
+
+static inline int
+allbits_set(uint32_t *bitmap, int num_words)
+{
+    unsigned int i;
+    for( i = 0; i < num_words; i++ )
+    {
+        if( bitmap[i] != 0xFFFFFFFF )
+            return (0);
+    }
+    return (1);
+}
+
+static inline int
+bit_is_set( uint32_t *bit_map, int bit_pos )
+{
+    return( ( bit_map[bit_pos >> 5] & (0x1 << (bit_pos & 0x1F) ) ) != 0 );
+}
+
+static inline int
+bit_is_clear( uint32_t *bit_map, int bit_pos )
+{
+    return( ( bit_map[bit_pos >> 5] & ( 0x1 << (bit_pos & 0x1F) )  ) == 0 );
+}
+
+static inline void
+bit_set( uint32_t *bit_map, int bit_pos )
+{
+    bit_map[bit_pos >> 5] |= 0x1 << (bit_pos & 0x1F);
+}
+
+static inline void
+bit_clear(uint32_t *bit_map, int bit_pos)
+{
+    bit_map[bit_pos >> 5] &= ~( 0x1 << ( bit_pos & 0x1F ) );
+}
+
+static inline void
+bit_nclear(uint32_t *bit_map, int start_pos, int stop_pos)
+{
+    int start_word = start_pos >> 5;
+    int stop_word  = stop_pos >> 5;
+
+    if ( start_word == stop_word )
+    {
+
+        bit_map[start_word] &= ( ( 0x7FFFFFFF >> ( 31 - (start_pos & 0x1F ) ) )
+                             |  ( 0xFFFFFFFE << ( stop_pos & 0x1F ) ) );
+    }
+    else
+    {
+        bit_map[start_word] &= ( 0x7FFFFFFF >> ( 31 - ( start_pos & 0x1F ) ) );
+        while (++start_word < stop_word)
+            bit_map[start_word] = 0;
+        bit_map[stop_word]  &= 0xFFFFFFFE << ( stop_pos & 0x1F );
+    }
+}
+
+static inline void
+bit_nset(uint32_t *bit_map, int start_pos, int stop_pos)
+{
+    int start_word = start_pos >> 5;
+    int stop_word  = stop_pos >> 5;
+
+    if ( start_word == stop_word )
+    {
+        bit_map[start_word] |= ( ( 0xFFFFFFFF << ( start_pos & 0x1F ) )
+                             &  ( 0xFFFFFFFF >> ( 31 - ( stop_pos & 0x1F ) ) ) );
+    }
+    else
+    {
+        bit_map[start_word] |= 0xFFFFFFFF << ( start_pos & 0x1F );
+        while (++start_word < stop_word)
+            bit_map[start_word] = 0xFFFFFFFF;
+        bit_map[stop_word]  |= 0xFFFFFFFF >> ( 31 - ( stop_pos & 0x1F ) );
+    }
+}
+
+#endif /* HB_BITS_H */

HandBrake-0.9.8.tar.bz2/libhb/common.c -> HandBrake-0.9.9.tar.bz2/libhb/common.c Changed

@@ -1,8 +1,11 @@
-/* $Id: common.c,v 1.15 2005/03/17 19:22:47 titer Exp $
+/* common.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include <stdarg.h>
 #include <time.h>
@@ -17,91 +20,335 @@
  * Global variables
  *********************************************************************/
 hb_rate_t hb_video_rates[] =
-{ { "5",  5400000 }, { "10",     2700000 }, { "12", 2250000 },
-  { "15", 1800000 }, { "23.976", 1126125 }, { "24", 1125000 },
-  { "25", 1080000 }, { "29.97",  900900  }, { "30", 900000  },
-  { "50", 540000  }, { "59.94",  450450  }, { "60", 450000  } };
-int hb_video_rates_count = sizeof( hb_video_rates ) /
-                           sizeof( hb_rate_t );
+{
+    {  "5",     5400000 },
+    { "10",     2700000 },
+    { "12",     2250000 },
+    { "15",     1800000 },
+    { "23.976", 1126125 },
+    { "24",     1125000 },
+    { "25",     1080000 },
+    { "29.97",   900900 },
+    { "30",      900000 },
+    { "50",      540000 },
+    { "59.94",   450450 },
+    { "60",      450000 },
+};
+int hb_video_rates_count = sizeof(hb_video_rates) / sizeof(hb_rate_t);
 
 hb_rate_t hb_audio_rates[] =
-{ { "22.05", 22050 }, { "24", 24000 }, { "32", 32000 },
-  { "44.1",  44100 }, { "48", 48000 } };
-int hb_audio_rates_count   = sizeof( hb_audio_rates ) /
-                             sizeof( hb_rate_t );
-int hb_audio_rates_default = 3; /* 44100 Hz */
+{
+    {  "8",      8000 },
+    { "11.025", 11025 },
+    { "12",     12000 },
+    { "16",     16000 },
+    { "22.05",  22050 },
+    { "24",     24000 },
+    { "32",     32000 },
+    { "44.1",   44100 },
+    { "48",     48000 },
+};
+int hb_audio_rates_count = sizeof(hb_audio_rates) / sizeof(hb_rate_t);
 
 hb_rate_t hb_audio_bitrates[] =
-{ {  "32",  32 }, {  "40",  40 }, {  "48",  48 }, {  "56",  56 },
-  {  "64",  64 }, {  "80",  80 }, {  "96",  96 }, { "112", 112 },
-  { "128", 128 }, { "160", 160 }, { "192", 192 }, { "224", 224 },
-  { "256", 256 }, { "320", 320 }, { "384", 384 }, { "448", 448 },
-  { "512", 512 }, { "576", 576 }, { "640", 640 }, { "768", 768 } };
-int hb_audio_bitrates_count = sizeof( hb_audio_bitrates ) /
-                              sizeof( hb_rate_t );
+{
+    // AC3-compatible bitrates
+    {   "32",   32 },
+    {   "40",   40 },
+    {   "48",   48 },
+    {   "56",   56 },
+    {   "64",   64 },
+    {   "80",   80 },
+    {   "96",   96 },
+    {  "112",  112 },
+    {  "128",  128 },
+    {  "160",  160 },
+    {  "192",  192 },
+    {  "224",  224 },
+    {  "256",  256 },
+    {  "320",  320 },
+    {  "384",  384 },
+    {  "448",  448 },
+    {  "512",  512 },
+    {  "576",  576 },
+    {  "640",  640 },
+    // additional bitrates
+    {  "768",  768 },
+    {  "960",  960 },
+    { "1152", 1152 },
+    { "1344", 1344 },
+    { "1536", 1536 },
+};
+int hb_audio_bitrates_count = sizeof(hb_audio_bitrates) / sizeof(hb_rate_t);
 
 static hb_error_handler_t *error_handler = NULL;
 
+hb_dither_t hb_audio_dithers[] =
+{
+    { "default",                       "auto",          AV_RESAMPLE_DITHER_NONE - 1,      },
+    { "none",                          "none",          AV_RESAMPLE_DITHER_NONE,          },
+    { "rectangular",                   "rectangular",   AV_RESAMPLE_DITHER_RECTANGULAR,   },
+    { "triangular",                    "triangular",    AV_RESAMPLE_DITHER_TRIANGULAR,    },
+    { "triangular with high pass",     "triangular_hp", AV_RESAMPLE_DITHER_TRIANGULAR_HP, },
+    { "triangular with noise shaping", "triangular_ns", AV_RESAMPLE_DITHER_TRIANGULAR_NS, },
+};
+int hb_audio_dithers_count = sizeof(hb_audio_dithers) / sizeof(hb_dither_t);
+
 hb_mixdown_t hb_audio_mixdowns[] =
-{ { "None",               "HB_AMIXDOWN_NONE",      "none",   HB_AMIXDOWN_NONE      },
-  { "Mono",               "HB_AMIXDOWN_MONO",      "mono",   HB_AMIXDOWN_MONO      },
-  { "Stereo",             "HB_AMIXDOWN_STEREO",    "stereo", HB_AMIXDOWN_STEREO    },
-  { "Dolby Surround",     "HB_AMIXDOWN_DOLBY",     "dpl1",   HB_AMIXDOWN_DOLBY     },
-  { "Dolby Pro Logic II", "HB_AMIXDOWN_DOLBYPLII", "dpl2",   HB_AMIXDOWN_DOLBYPLII },
-  { "6-channel discrete", "HB_AMIXDOWN_6CH",       "6ch",    HB_AMIXDOWN_6CH       } };
-int hb_audio_mixdowns_count = sizeof( hb_audio_mixdowns ) /
-                              sizeof( hb_mixdown_t );
+{
+    { "None",               "HB_AMIXDOWN_NONE",      "none",       HB_AMIXDOWN_NONE      },
+    { "Mono",               "HB_AMIXDOWN_MONO",      "mono",       HB_AMIXDOWN_MONO      },
+    { "Mono (Left Only)",   "HB_AMIXDOWN_LEFT",      "left_only",  HB_AMIXDOWN_LEFT      },
+    { "Mono (Right Only)",  "HB_AMIXDOWN_RIGHT",     "right_only", HB_AMIXDOWN_RIGHT     },
+    { "Stereo",             "HB_AMIXDOWN_STEREO",    "stereo",     HB_AMIXDOWN_STEREO    },
+    { "Dolby Surround",     "HB_AMIXDOWN_DOLBY",     "dpl1",       HB_AMIXDOWN_DOLBY     },
+    { "Dolby Pro Logic II", "HB_AMIXDOWN_DOLBYPLII", "dpl2",       HB_AMIXDOWN_DOLBYPLII },
+    { "5.1 Channels",       "HB_AMIXDOWN_5POINT1",   "5point1",    HB_AMIXDOWN_5POINT1   },
+    { "6.1 Channels",       "HB_AMIXDOWN_6POINT1",   "6point1",    HB_AMIXDOWN_6POINT1   },
+    { "7.1 Channels",       "HB_AMIXDOWN_7POINT1",   "7point1",    HB_AMIXDOWN_7POINT1   },
+    { "7.1 (5F/2R/LFE)",    "HB_AMIXDOWN_5_2_LFE",   "5_2_lfe",    HB_AMIXDOWN_5_2_LFE   },
+};
+int hb_audio_mixdowns_count = sizeof(hb_audio_mixdowns) / sizeof(hb_mixdown_t);
 
 hb_encoder_t hb_video_encoders[] =
-{ { "H.264 (x264)",       "x264",       HB_VCODEC_X264,         HB_MUX_MP4|HB_MUX_MKV },
-  { "MPEG-4 (FFmpeg)",    "ffmpeg4",    HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MP4|HB_MUX_MKV },
-  { "MPEG-2 (FFmpeg)",    "ffmpeg2",    HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MP4|HB_MUX_MKV },
-  { "VP3 (Theora)",       "theora",     HB_VCODEC_THEORA,                  HB_MUX_MKV } };
-int hb_video_encoders_count = sizeof( hb_video_encoders ) /
-                              sizeof( hb_encoder_t );
+{
+    { "H.264 (x264)",    "x264",    HB_VCODEC_X264,         HB_MUX_MP4|HB_MUX_MKV },
+    { "MPEG-4 (FFmpeg)", "ffmpeg4", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MP4|HB_MUX_MKV },
+    { "MPEG-2 (FFmpeg)", "ffmpeg2", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MP4|HB_MUX_MKV },
+    { "VP3 (Theora)",    "theora",  HB_VCODEC_THEORA,                  HB_MUX_MKV },
+};
+int hb_video_encoders_count = sizeof(hb_video_encoders) / sizeof(hb_encoder_t);
 
+// note: the first encoder in the list must be AAC
 hb_encoder_t hb_audio_encoders[] =
 {
 #ifdef __APPLE__
-  { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
-  { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
+    { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
+    { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
+#endif
+    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },
+#ifdef USE_FDK_AAC
+    { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MP4|HB_MUX_MKV },
+    { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MP4|HB_MUX_MKV },
 #endif
-  { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },
-  { "AAC (ffmpeg)",       "ffaac",      HB_ACODEC_FFAAC,        HB_MUX_MP4|HB_MUX_MKV },
-  { "AAC Passthru",       "copy:aac",   HB_ACODEC_AAC_PASS,     HB_MUX_MP4|HB_MUX_MKV },
-  { "AC3 (ffmpeg)",       "ffac3",      HB_ACODEC_AC3,          HB_MUX_MP4|HB_MUX_MKV },
-  { "AC3 Passthru",       "copy:ac3",   HB_ACODEC_AC3_PASS,     HB_MUX_MP4|HB_MUX_MKV },
-  { "DTS Passthru",       "copy:dts",   HB_ACODEC_DCA_PASS,     HB_MUX_MP4|HB_MUX_MKV },
-  { "DTS-HD Passthru",    "copy:dtshd", HB_ACODEC_DCA_HD_PASS,  HB_MUX_MP4|HB_MUX_MKV },
-  { "MP3 (lame)",         "lame",       HB_ACODEC_LAME,         HB_MUX_MP4|HB_MUX_MKV },
-  { "MP3 Passthru",       "copy:mp3",   HB_ACODEC_MP3_PASS,     HB_MUX_MP4|HB_MUX_MKV },
-  { "Vorbis (vorbis)",    "vorbis",     HB_ACODEC_VORBIS,                  HB_MUX_MKV },
-  { "FLAC (ffmpeg)",      "ffflac",     HB_ACODEC_FFFLAC,                  HB_MUX_MKV },
-  { "Auto Passthru",      "copy",       HB_ACODEC_AUTO_PASS,    HB_MUX_MP4|HB_MUX_MKV } };
-int hb_audio_encoders_count = sizeof( hb_audio_encoders ) /
-                              sizeof( hb_encoder_t );
+    { "AAC (ffmpeg)",       "ffaac",      HB_ACODEC_FFAAC,        HB_MUX_MP4|HB_MUX_MKV },
+    { "AAC Passthru",       "copy:aac",   HB_ACODEC_AAC_PASS,     HB_MUX_MP4|HB_MUX_MKV },
+    { "AC3 (ffmpeg)",       "ffac3",      HB_ACODEC_AC3,          HB_MUX_MP4|HB_MUX_MKV },
+    { "AC3 Passthru",       "copy:ac3",   HB_ACODEC_AC3_PASS,     HB_MUX_MP4|HB_MUX_MKV },
+    { "DTS Passthru",       "copy:dts",   HB_ACODEC_DCA_PASS,     HB_MUX_MP4|HB_MUX_MKV },
+    { "DTS-HD Passthru",    "copy:dtshd", HB_ACODEC_DCA_HD_PASS,  HB_MUX_MP4|HB_MUX_MKV },
+    { "MP3 (lame)",         "lame",       HB_ACODEC_LAME,         HB_MUX_MP4|HB_MUX_MKV },
+    { "MP3 Passthru",       "copy:mp3",   HB_ACODEC_MP3_PASS,     HB_MUX_MP4|HB_MUX_MKV },
+    { "Vorbis (vorbis)",    "vorbis",     HB_ACODEC_VORBIS,                  HB_MUX_MKV },
+    { "FLAC (ffmpeg)",      "ffflac",     HB_ACODEC_FFFLAC,                  HB_MUX_MKV },
+    { "FLAC (24-bit)",      "ffflac24",   HB_ACODEC_FFFLAC24,                HB_MUX_MKV },
+    { "Auto Passthru",      "copy",       HB_ACODEC_AUTO_PASS,    HB_MUX_MP4|HB_MUX_MKV },
+};
+int hb_audio_encoders_count = sizeof(hb_audio_encoders) / sizeof(hb_encoder_t);
 
 /* Expose values for PInvoke */
-hb_rate_t* hb_get_video_rates() { return hb_video_rates; }
-int hb_get_video_rates_count() { return hb_video_rates_count; }
-hb_rate_t* hb_get_audio_rates() { return hb_audio_rates; }
-int hb_get_audio_rates_count() { return hb_audio_rates_count; }
-int hb_get_audio_rates_default() { return hb_audio_rates_default; }
-hb_rate_t* hb_get_audio_bitrates() { return hb_audio_bitrates; }
-int hb_get_audio_bitrates_count() { return hb_audio_bitrates_count; }
-hb_mixdown_t* hb_get_audio_mixdowns() { return hb_audio_mixdowns; }
-int hb_get_audio_mixdowns_count() { return hb_audio_mixdowns_count; }
-hb_encoder_t* hb_get_video_encoders() { return hb_video_encoders; }
-int hb_get_video_encoders_count() { return hb_video_encoders_count; }
-hb_encoder_t* hb_get_audio_encoders() { return hb_audio_encoders; }
-int hb_get_audio_encoders_count() { return hb_audio_encoders_count; }
-
-int hb_mixdown_get_mixdown_from_short_name( const char * short_name )
+hb_rate_t*    hb_get_video_rates()          { return hb_video_rates;          }
+int           hb_get_video_rates_count()    { return hb_video_rates_count;    }
+hb_rate_t*    hb_get_audio_rates()          { return hb_audio_rates;          }
+int           hb_get_audio_rates_count()    { return hb_audio_rates_count;    }
+hb_rate_t*    hb_get_audio_bitrates()       { return hb_audio_bitrates;       }
+int           hb_get_audio_bitrates_count() { return hb_audio_bitrates_count; }
+hb_dither_t*  hb_get_audio_dithers()        { return hb_audio_dithers;        }
+int           hb_get_audio_dithers_count()  { return hb_audio_dithers_count;  }
+hb_mixdown_t* hb_get_audio_mixdowns()       { return hb_audio_mixdowns;       }
+int           hb_get_audio_mixdowns_count() { return hb_audio_mixdowns_count; }
+hb_encoder_t* hb_get_video_encoders()       { return hb_video_encoders;       }
+int           hb_get_video_encoders_count() { return hb_video_encoders_count; }
+hb_encoder_t* hb_get_audio_encoders()       { return hb_audio_encoders;       }
+int           hb_get_audio_encoders_count() { return hb_audio_encoders_count; }
+
+int hb_audio_dither_get_default()
+{
+    // "auto"
+    return hb_audio_dithers[0].method;
+}
+
+int hb_audio_dither_get_default_method()
+{
+    /*
+     * input could be s16 (possibly already dithered) converted to flt, so
+     * let's use a "low-risk" dither algorithm (standard triangular).
+     */
+    return AV_RESAMPLE_DITHER_TRIANGULAR;
+}
+
+int hb_audio_dither_is_supported(uint32_t codec)
+{
+    // encoder's input sample format must be s16(p)
+    switch (codec)
+    {
+        case HB_ACODEC_FFFLAC:
+        case HB_ACODEC_FDK_AAC:
+        case HB_ACODEC_FDK_HAAC:
+            return 1;
+        default:
+            return 0;
+    }
+}
+
+const char* hb_audio_dither_get_description(int method)
+{
+    int i;
+    for (i = 0; i < hb_audio_dithers_count; i++)
+    {
+        if (hb_audio_dithers[i].method == method)
+        {
+            return hb_audio_dithers[i].description;
+        }
+    }
+    return "";
+}
+
+
+int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout)
+{
+    return (hb_mixdown_has_codec_support(mixdown, codec) &&
+            hb_mixdown_has_remix_support(mixdown, layout));
+}
+
+int hb_mixdown_has_codec_support(int mixdown, uint32_t codec)
+{
+    // Passthru, only "None" mixdown is supported
+    if (codec & HB_ACODEC_PASS_FLAG)
+        return (mixdown == HB_AMIXDOWN_NONE);
+
+    // Not passthru, "None" mixdown never supported
+    if (mixdown == HB_AMIXDOWN_NONE)
+        return 0;
+
+    switch (codec)
+    {
+        case HB_ACODEC_VORBIS:
+        case HB_ACODEC_FFFLAC:
+        case HB_ACODEC_FFFLAC24:
+            return (mixdown <= HB_AMIXDOWN_7POINT1);
+
+        case HB_ACODEC_LAME:
+        case HB_ACODEC_FFAAC:
+            return (mixdown <= HB_AMIXDOWN_DOLBYPLII);
+
+        case HB_ACODEC_FAAC:
+        case HB_ACODEC_CA_AAC:
+        case HB_ACODEC_CA_HAAC:
+            return ((mixdown <= HB_AMIXDOWN_5POINT1) ||
+                    (mixdown == HB_AMIXDOWN_5_2_LFE));
+
+        default:
+            return (mixdown <= HB_AMIXDOWN_5POINT1);
+    }
+}
+
+int hb_mixdown_has_remix_support(int mixdown, uint64_t layout)
+{
+    switch (mixdown)
+    {
+        // stereo + front left/right of center
+        case HB_AMIXDOWN_5_2_LFE:
+            return ((layout & AV_CH_FRONT_LEFT_OF_CENTER) &&
+                    (layout & AV_CH_FRONT_RIGHT_OF_CENTER) &&
+                    (layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO);
+
+        // 7.0 or better
+        case HB_AMIXDOWN_7POINT1:
+            return ((layout & AV_CH_LAYOUT_7POINT0) == AV_CH_LAYOUT_7POINT0);
+
+        // 6.0 or better
+        case HB_AMIXDOWN_6POINT1:
+            return ((layout & AV_CH_LAYOUT_7POINT0) == AV_CH_LAYOUT_7POINT0 ||
+                    (layout & AV_CH_LAYOUT_6POINT0) == AV_CH_LAYOUT_6POINT0 ||
+                    (layout & AV_CH_LAYOUT_HEXAGONAL) == AV_CH_LAYOUT_HEXAGONAL);
+
+        // stereo + either of front center, side or back left/right, back center
+        case HB_AMIXDOWN_5POINT1:
+            return ((layout & AV_CH_LAYOUT_2_1) == AV_CH_LAYOUT_2_1 ||
+                    (layout & AV_CH_LAYOUT_2_2) == AV_CH_LAYOUT_2_2 ||
+                    (layout & AV_CH_LAYOUT_QUAD) == AV_CH_LAYOUT_QUAD ||
+                    (layout & AV_CH_LAYOUT_SURROUND) == AV_CH_LAYOUT_SURROUND);
+
+        // stereo + either of side or back left/right, back center
+        // also, allow Dolby Surrounbd output if the input is already Dolby
+        case HB_AMIXDOWN_DOLBY:
+        case HB_AMIXDOWN_DOLBYPLII:
+            return ((layout & AV_CH_LAYOUT_2_1) == AV_CH_LAYOUT_2_1 ||
+                    (layout & AV_CH_LAYOUT_2_2) == AV_CH_LAYOUT_2_2 ||
+                    (layout & AV_CH_LAYOUT_QUAD) == AV_CH_LAYOUT_QUAD ||
+                    (layout == AV_CH_LAYOUT_STEREO_DOWNMIX &&
+                     mixdown == HB_AMIXDOWN_DOLBY));
+
+        // more than 1 channel
+        case HB_AMIXDOWN_STEREO:
+            return (av_get_channel_layout_nb_channels(layout) > 1);
+
+        // regular stereo (not Dolby)
+        case HB_AMIXDOWN_LEFT:
+        case HB_AMIXDOWN_RIGHT:
+            return (layout == AV_CH_LAYOUT_STEREO);
+
+        // mono remix always supported
+        // HB_AMIXDOWN_NONE always supported (for Passthru)
+        case HB_AMIXDOWN_MONO:
+        case HB_AMIXDOWN_NONE:
+            return 1;
+
+        // unknown mixdown, should never happen
+        default:
+            return 0;
+    }
+}
+
+int hb_mixdown_get_discrete_channel_count(int amixdown)
+{
+    switch (amixdown)
+    {
+        case HB_AMIXDOWN_5_2_LFE:
+        case HB_AMIXDOWN_7POINT1:
+            return 8;
+
+        case HB_AMIXDOWN_6POINT1:
+            return 7;
+
+        case HB_AMIXDOWN_5POINT1:
+            return 6;
+
+        case HB_AMIXDOWN_MONO:
+        case HB_AMIXDOWN_LEFT:
+        case HB_AMIXDOWN_RIGHT:
+            return 1;
+
+        case HB_AMIXDOWN_NONE:
+            return 0;
+
+        default:
+            return 2;
+    }
+}
+
+int hb_mixdown_get_low_freq_channel_count(int amixdown)
+{
+    switch (amixdown)
+    {
+        case HB_AMIXDOWN_5POINT1:
+        case HB_AMIXDOWN_6POINT1:
+        case HB_AMIXDOWN_7POINT1:
+        case HB_AMIXDOWN_5_2_LFE:
+            return 1;
+
+        default:
+            return 0;
+    }
+}
+
+int hb_mixdown_get_mixdown_from_short_name(const char *short_name)
 {
     int i;
     for (i = 0; i < hb_audio_mixdowns_count; i++)
     {
-        if (strcmp(hb_audio_mixdowns[i].short_name, short_name) == 0)
+        if (!strcmp(hb_audio_mixdowns[i].short_name, short_name))
         {
             return hb_audio_mixdowns[i].amixdown;
         }
@@ -109,7 +356,7 @@
     return 0;
 }
 
-const char * hb_mixdown_get_short_name_from_mixdown( int amixdown )
+const char* hb_mixdown_get_short_name_from_mixdown(int amixdown)
 {
     int i;
     for (i = 0; i < hb_audio_mixdowns_count; i++)
@@ -122,13 +369,13 @@
     return "";
 }
 
-void hb_autopassthru_apply_settings( hb_job_t * job, hb_title_t * title )
+void hb_autopassthru_apply_settings( hb_job_t * job )
 {
     int i, j, already_printed;
     hb_audio_t * audio;
-    for( i = 0, already_printed = 0; i < hb_list_count( title->list_audio ); )
+    for( i = 0, already_printed = 0; i < hb_list_count( job->list_audio ); )
     {
-        audio = hb_list_item( title->list_audio, i );
+        audio = hb_list_item( job->list_audio, i );
         if( audio->config.out.codec == HB_ACODEC_AUTO_PASS )
         {
             if( !already_printed )
@@ -143,8 +390,8 @@
             {
                 hb_log( "Auto Passthru: passthru not possible and no valid fallback specified, dropping track %d",
                         audio->config.out.track );
-                hb_list_rem( title->list_audio, audio );
-                free( audio );
+                hb_list_rem( job->list_audio, audio );
+                hb_audio_close( &audio );
                 continue;
             }
             audio->config.out.samplerate = audio->config.in.samplerate;
@@ -191,7 +438,8 @@
 void hb_autopassthru_print_settings( hb_job_t * job )
 {
     int i, codec_len;
-    char *mask = NULL, *tmp, *fallback = NULL;
+    char *mask = NULL, *tmp;
+    const char *fallback = NULL;
     for( i = 0; i < hb_audio_encoders_count; i++ )
     {
         if( ( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) &&
@@ -245,13 +493,7 @@
         {
             // fallback not possible with current muxer
             // use the default audio encoder instead
-#ifndef __APPLE__
-            if( muxer == HB_MUX_MKV )
-                // Lame is the default for MKV
-                fallback = HB_ACODEC_LAME;
-            else
-#endif          // Core Audio or faac
-                fallback = hb_audio_encoders[0].encoder;
+            fallback = hb_get_default_audio_encoder(muxer);
             break;
         }
     }
@@ -270,20 +512,29 @@
     return out_codec;
 }
 
+int hb_get_default_audio_encoder(int muxer)
+{
+#ifndef __APPLE__
+    if (muxer == HB_MUX_MKV)
+    {
+        return HB_ACODEC_LAME;
+    }
+#endif
+    return hb_audio_encoders[0].encoder;
+}
+
 // Given an input bitrate, find closest match in the set of allowed bitrates
 int hb_find_closest_audio_bitrate(int bitrate)
 {
-    int ii;
-    int result;
-
     // Check if bitrate mode was disabled
-    if( bitrate <= 0 )
+    if (bitrate <= 0)
         return bitrate;
 
+    int ii, result;
     // result is highest rate if none found during search.
     // rate returned will always be <= rate asked for.
     result = hb_audio_bitrates[0].rate;
-    for (ii = hb_audio_bitrates_count-1; ii >= 0; ii--)
+    for (ii = hb_audio_bitrates_count - 1; ii > 0; ii--)
     {
         if (bitrate >= hb_audio_bitrates[ii].rate)
         {
@@ -294,257 +545,305 @@
     return result;
 }
 
-// Get the bitrate low and high limits for a codec/samplerate/mixdown triplet
-// The limits have been empirically determined through testing.  Max bitrates
-// in table below. Numbers in parenthesis are the target bitrate chosen.
-/*
-Encoder     1 channel           2 channels          6 channels
-
-faac
-24kHz       86 (128)            173 (256)           460 (768)
-48kHz       152 (160)           304 (320)           759 (768)
+/* Get the bitrate low and high limits for a codec/samplerate/mixdown triplet.
 
-Vorbis
-24kHz       97 (80)             177 (160)           527 (512)
-48kHz       241 (224)           465 (448)           783 (768)
+Encoder    1.0 channel    2.0 channels    5.1 channels    6.1 channels    7.1 channels
+--------------------------------------------------------------------------------------
 
-Lame
-24kHz       146 (768)           138 (768)
-48kHz       318 (768)           318 (768)
+faac
+----
+supported samplerates: 8 - 48 kHz
+libfaac/util.c defines the bitrate limits:
+MinBitrate() -> 8000 bps (per channel, incl. LFE).
+MaxBitrate() -> (6144 * samplerate / 1024) bps (per channel, incl. LFE).
+But output bitrates don't go as high as the theoretical maximums:
+12 kHz        43  (72)        87 (144)      260  (432)      303  (504)      342  (576)
+24 kHz        87 (144)       174 (288)      514  (864)      595 (1008)      669 (1152)
+48 kHz       174 (288)       347 (576)      970 (1728)     1138 (2016)     1287 (2304)
+Also, faac isn't a great encoder, so you don't want to allow too low a bitrate.
+Limits: minimum of  32 Kbps per channel
+        maximum of 192 Kbps per channel at 32-48 kHz, adjusted for sr_shift
+
+
+ffaac
+-----
+supported samplerates: 8 - 48 kHz
+libavcodec/aacenc.c defines a maximum bitrate:
+-> 6144 * samplerate / 1024 bps (per channel, incl. LFE).
+But output bitrates don't go as high as the theoretical maximums:
+12 kHz        61  (72)       123 (144)
+24 kHz       121 (144)       242 (288)
+48 kHz       236 (288)       472 (576)
+Also, ffaac isn't a great encoder, so you don't want to allow too low a bitrate.
+Limits: minimum of  32 Kbps per channel
+        maximum of 192 Kbps per channel at 32 kHz, adjusted for sr_shift
+        maximum of 256 Kbps per channel at 44.1-48 kHz, adjusted for sr_shift
+
+vorbis
+------
+supported samplerates: 8 - 48 kHz
+lib/modes/setup_*.h provides a range of allowed bitrates for various configurations.
+for each samplerate, the highest minimums and lowest maximums are:
+ 8 kHz        Minimum  8 Kbps, maximum  32 Kbps (per channel, incl. LFE).
+12 kHz        Minimum 14 Kbps, maximum  44 Kbps (per channel, incl. LFE).
+16 kHz        Minimum 16 Kbps, maximum  86 Kbps (per channel, incl. LFE).
+24 kHz        Minimum 22 Kbps, maximum  86 Kbps (per channel, incl. LFE).
+32 kHz        Minimum 26 Kbps, maximum 190 Kbps (per channel, incl. LFE).
+48 kHz        Minimum 28 Kbps, maximum 240 Kbps (per channel, incl. LFE).
+Limits: minimum of 14/22/28 Kbps per channel (8-12, 16-24, 32-48 kHz)
+        maximum of 32/86/190/240 Kbps per channel (8-12, 16-24, 32, 44.1-48 kHz)
+
+lame
+----
+supported samplerates: 8 - 48 kHz
+lame_init_params() allows the following bitrates:
+12 kHz        Minimum  8 Kbps, maximum  64 Kbps
+24 kHz        Minimum  8 Kbps, maximum 160 Kbps
+48 kHz        Minimum 32 Kbps, maximum 320 Kbps
+Limits: minimum of 8/8/32 Kbps (8-12, 16-24, 32-48 kHz)
+        maximum of 64/160/320 Kbps (8-12, 16-24, 32-48 kHz)
 
 ffac3
-24kHz       318 (320)           318 (320)           318 (320)
-48kHz       636 (640)           636 (640)           636 (640)
-
-Core Audio AAC (core audio api provides range of allowed bitrates)
-24kHz       16-64               32-128              80-320
-32kHz       24-96               48-192              128-448
-48kHz       32-256              64-320              160-768
-
-Core Audio HE-AAC (core audio api provides range of allowed bitrates)
-32kHz       12-40               24-80               64-192
-48kHz       16-40               32-80               80-192
+-----
+supported samplerates: 32 - 48 kHz (< 32 kHz disabled for compatibility reasons)
+Dolby's encoder has a min. of 224 Kbps for 5 full-bandwidth channels (5.0, 5.1)
+The maximum AC3 bitrate is 640 Kbps
+Limits: minimum of 224/5 Kbps per full-bandwidth channel, maximum of 640 Kbps
+
+ca_aac
+------
+supported samplerates: 8 - 48 kHz
+Core Audio API provides a range of allowed bitrates:
+ 8 kHz         8 -  24        16 -  48        40 - 112        48 - 144        56 - 160
+12 kHz        12 -  32        24 -  64        64 - 160        72 - 192        96 - 224
+16 kHz        12 -  48        24 -  96        64 - 224        72 - 288        96 - 320
+24 kHz        16 -  64        32 - 128        80 - 320        96 - 384       112 - 448
+32 kHz        24 -  96        48 - 192       128 - 448       144 - 576       192 - 640
+48 kHz        32 - 256        64 - 320       160 - 768       192 - 960       224 - 960
+Limits:
+ 8 kHz -> minimum of  8 Kbps and maximum of  24 Kbps per full-bandwidth channel
+12 kHz -> minimum of 12 Kbps and maximum of  32 Kbps per full-bandwidth channel
+16 kHz -> minimum of 12 Kbps and maximum of  48 Kbps per full-bandwidth channel
+24 kHz -> minimum of 16 Kbps and maximum of  64 Kbps per full-bandwidth channel
+32 kHz -> minimum of 24 Kbps and maximum of  96 Kbps per full-bandwidth channel
+48 kHz -> minimum of 32 Kbps and maximum of 160 Kbps per full-bandwidth channel
+48 kHz ->                        maximum of +96 Kbps for Mono
+Note: encCoreAudioInit() will sanitize any mistake made here.
+
+ca_haac
+-------
+supported samplerates: 32 - 48 kHz
+Core Audio API provides a range of allowed bitrates:
+32 kHz         12 - 40         24 - 80        64 - 192          N/A           96 - 256
+48 kHz         16 - 40         32 - 80        80 - 192          N/A          112 - 256
+Limits: minimum of 12 Kbps per full-bandwidth channel (<= 32 kHz)
+        minimum of 16 Kbps per full-bandwidth channel ( > 32 kHz)
+        maximum of 40 Kbps per full-bandwidth channel
+Note: encCoreAudioInit() will sanitize any mistake made here.
+
+fdk_aac
+-------
+supported samplerates: 8 - 48 kHz
+libfdk limits the bitrate to the following values:
+ 8 kHz              48              96             240
+12 kHz              72             144             360
+16 kHz              96             192             480
+24 kHz             144             288             720
+32 kHz             192             384             960
+48 kHz             288             576            1440
+Limits: minimum of samplerate * 2/3 Kbps per full-bandwidth channel (see ca_aac)
+        maximum of samplerate * 6.0 Kbps per full-bandwidth channel
+ 
+fdk_haac
+--------
+supported samplerates: 16 - 48 kHz
+libfdk limits the bitrate to the following values:
+16 kHz         8 -  48        16 -  96        45 - 199
+24 kHz         8 -  63        16 - 127        45 - 266
+32 kHz         8 -  63        16 - 127        45 - 266
+48 kHz        12 -  63        16 - 127        50 - 266
+Limits: minimum of 12 Kbps per full-bandwidth channel  (<= 32 kHz) (see ca_haac)
+        minimum of 16 Kbps per full-bandwidth channel  ( > 32 kHz) (see ca_haac)
+        maximum of 48,  96 or 192 Kbps (1.0, 2.0, 5.1) (<= 16 kHz)
+        maximum of 64, 128 or 256 Kbps (1.0, 2.0, 5.1) ( > 16 kHz)
 */
 
-void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high)
+void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown,
+                                 int *low, int *high)
 {
-    int channels;
-
-    channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(mixdown);
-    if( codec & HB_ACODEC_PASS_FLAG )
+    if (codec & HB_ACODEC_PASS_FLAG)
     {
-        // Bitrates don't apply to "lossless" audio (Passthru, FLAC)
-        *low = *high = -1;
+        // Bitrates don't apply to passthrough audio, but may apply if we
+        // fallback to an encoder when the source can't be passed through.
+        *low = hb_audio_bitrates[0].rate;
+        *high = hb_audio_bitrates[hb_audio_bitrates_count-1].rate;
         return;
     }
-    switch( codec )
+
+    /* samplerate, sr_shift */
+    int sr_shift;
+    samplerate = hb_get_best_samplerate(codec, samplerate, &sr_shift);
+
+    /* LFE, full-bandwidth channels */
+    int lfe_count, nchannels;
+    lfe_count = hb_mixdown_get_low_freq_channel_count(mixdown);
+    nchannels = hb_mixdown_get_discrete_channel_count(mixdown) - lfe_count;
+
+    switch (codec)
     {
+        // Bitrates don't apply to "lossless" audio
         case HB_ACODEC_FFFLAC:
-            // Bitrates don't apply to "lossless" audio (Passthru, FLAC)
-            *high = *low = -1;
-            break;
+        case HB_ACODEC_FFFLAC24:
+            *low = *high = -1;
+            return;
 
         case HB_ACODEC_AC3:
-            *low = 32 * channels;
-            if (samplerate > 24000)
-            {
-                *high = 640;
-            }
-            else
-            {
-                *high = 320;
-            }
+            *low  = 224 * nchannels / 5;
+            *high = 640;
             break;
 
         case HB_ACODEC_CA_AAC:
-            if (samplerate > 32000)
-            {
-                *low = channels * 32;
-                if (channels == 1)
-                    *high = 256;
-                if (channels == 2)
-                    *high = 320;
-                if (channels == 6)
-                {
-                    *low = 160;
-                    *high = 768;
-                }
-            }
-            else if (samplerate > 24000)
-            {
-                *low = channels * 24;
-                *high = channels * 96;
-                if (channels == 6)
-                {
-                    *low = 128;
-                    *high = 448;
-                }
-            }
-            else
+        {
+            switch (samplerate)
             {
-                *low = channels * 16;
-                *high = channels * 64;
-                if (channels == 6)
-                {
-                    *low = 80;
-                    *high = 320;
-                }
+                case 8000:
+                    *low  = nchannels *  8;
+                    *high = nchannels * 24;
+                    break;
+                case 11025:
+                case 12000:
+                    *low  = nchannels * 12;
+                    *high = nchannels * 32;
+                    break;
+                case 16000:
+                    *low  = nchannels * 12;
+                    *high = nchannels * 48;
+                    break;
+                case 22050:
+                case 24000:
+                    *low  = nchannels * 16;
+                    *high = nchannels * 64;
+                    break;
+                case 32000:
+                    *low  = nchannels * 24;
+                    *high = nchannels * 96;
+                    break;
+                case 44100:
+                case 48000:
+                default:
+                    *low  = nchannels * 32;
+                    *high = nchannels * (160 + (96 * (nchannels == 1)));
+                    break;
             }
-            break;
+        } break;
 
         case HB_ACODEC_CA_HAAC:
-            if (samplerate > 32000)
-            {
-                *low = channels * 16;
-                *high = channels * 40;
-                if (channels == 6)
-                {
-                    *low = 80;
-                    *high = 192;
-                }
-            }
-            else
-            {
-                *low = channels * 12;
-                *high = channels * 40;
-                if (channels == 6)
-                {
-                    *low = 64;
-                    *high = 192;
-                }
-            }
+            *low  = nchannels * (12 + (4 * (samplerate >= 44100)));
+            *high = nchannels * 40;
+            break;
+
+        case HB_ACODEC_FDK_AAC:
+            *low  = nchannels * samplerate * 2 / 3000;
+            *high = nchannels * samplerate * 6 / 1000;
+            break;
+
+        case HB_ACODEC_FDK_HAAC:
+            *low  = (nchannels * (12 + (4 * (samplerate >= 44100))));
+            *high = (nchannels - (nchannels > 2)) * (48 +
+                                                     (16 *
+                                                      (samplerate >= 22050)));
             break;
 
         case HB_ACODEC_FAAC:
-            *low = 32 * channels;
-            if (samplerate > 24000)
-            {
-                *high = 160 * channels;
-                if (*high > 768)
-                    *high = 768;
-            }
-            else
-            {
-                *high = 96 * channels;
-                if (*high > 480)
-                    *high = 480;
-            }
+            *low  = (nchannels + lfe_count) * 32;
+            *high = (nchannels + lfe_count) * (192 >> sr_shift);
             break;
 
         case HB_ACODEC_FFAAC:
-            *low = 32 * channels;
-            if (samplerate > 24000)
-            {
-                *high = 160 * channels;
-                if (*high > 768)
-                    *high = 768;
-            }
-            else
-            {
-                *high = 96 * channels;
-                if (*high > 480)
-                    *high = 480;
-            }
+            *low  = ((nchannels + lfe_count) * 32);
+            *high = ((nchannels + lfe_count) *
+                     ((192 + (64 * ((samplerate << sr_shift) >= 44100)))
+                      >> sr_shift));
             break;
 
-        case HB_ACODEC_VORBIS:
-            *high = channels * 80;
-            if (samplerate > 24000)
-            {
-                if (channels > 2)
-                {
-                    // Vorbis minimum is around 30kbps/ch for 6ch 
-                    // at rates > 24k (32k/44.1k/48k) 
-                    *low = 32 * channels;
-                    *high = 128 * channels;
-                }
-                else
-                {
-                    // Allow 24kbps mono and 48kbps stereo at rates > 24k 
-                    // (32k/44.1k/48k)
-                    *low = 24 * channels;
-                    if (samplerate > 32000)
-                        *high = channels * 224;
-                    else
-                        *high = channels * 160;
-                }
-            }
-            else
-            {
-                *low = channels * 16;
-                *high = 80 * channels;
-            }
+        case HB_ACODEC_LAME:
+            *low  =  8 + (24 * (sr_shift < 1));
+            *high = 64 + (96 * (sr_shift < 2)) + (160 * (sr_shift < 1));
             break;
 
-        case HB_ACODEC_LAME:
-            *low = hb_audio_bitrates[0].rate;
-            if (samplerate > 24000)
-                *high = 320;
-            else
-                *high = 160;
+        case HB_ACODEC_VORBIS:
+            *low  = (nchannels + lfe_count) * (14 +
+                                               (8 * (sr_shift < 2)) +
+                                               (6 * (sr_shift < 1)));
+            *high = (nchannels + lfe_count) * (32 +
+                                               ( 54 * (sr_shift < 2)) +
+                                               (104 * (sr_shift < 1)) +
+                                               ( 50 * (samplerate >= 44100)));
             break;
-        
+
         default:
-            *low = hb_audio_bitrates[0].rate;
+            *low  = hb_audio_bitrates[0].rate;
             *high = hb_audio_bitrates[hb_audio_bitrates_count-1].rate;
             break;
     }
+    // sanitize max. bitrate
+    if (*high < hb_audio_bitrates[0].rate)
+        *high = hb_audio_bitrates[0].rate;
+    if (*high > hb_audio_bitrates[hb_audio_bitrates_count-1].rate)
+        *high = hb_audio_bitrates[hb_audio_bitrates_count-1].rate;
 }
 
-// Given an input bitrate, sanitize it.  Check low and high limits and
-// make sure it is in the set of allowed bitrates.
-int hb_get_best_audio_bitrate( uint32_t codec, int bitrate, int samplerate, int mixdown)
+// Given an input bitrate, sanitize it.
+// Check low and high limits and make sure it is in the set of allowed bitrates.
+int hb_get_best_audio_bitrate(uint32_t codec, int bitrate, int samplerate,
+                              int mixdown)
 {
     int low, high;
-
     hb_get_audio_bitrate_limits(codec, samplerate, mixdown, &low, &high);
     if (bitrate > high)
         bitrate = high;
     if (bitrate < low)
         bitrate = low;
-    bitrate = hb_find_closest_audio_bitrate(bitrate);
-    return bitrate;
+    return hb_find_closest_audio_bitrate(bitrate);
 }
 
 // Get the default bitrate for a given codec/samplerate/mixdown triplet.
-int hb_get_default_audio_bitrate( uint32_t codec, int samplerate, int mixdown )
+int hb_get_default_audio_bitrate(uint32_t codec, int samplerate, int mixdown)
 {
-    int bitrate, channels;
-    int sr_shift;
-
-    if( codec & HB_ACODEC_PASS_FLAG )
+    if (codec & HB_ACODEC_PASS_FLAG)
+    {
         return -1;
+    }
 
-    channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(mixdown);
-
-    // Min bitrate is established such that we get good quality
-    // audio as a minimum.
-    sr_shift = (samplerate <= 24000) ? 1 : 0;
+    int bitrate, nchannels, sr_shift;
+    /* full-bandwidth channels, sr_shift */
+    nchannels = (hb_mixdown_get_discrete_channel_count(mixdown) -
+                 hb_mixdown_get_low_freq_channel_count(mixdown));
+    hb_get_best_samplerate(codec, samplerate, &sr_shift);
 
-    switch ( codec )
+    switch (codec)
     {
         case HB_ACODEC_FFFLAC:
-            bitrate = -1;
-            sr_shift = 0;
-            break;
+        case HB_ACODEC_FFFLAC24:
+            return -1;
+
+        // 96, 224, 640 Kbps
         case HB_ACODEC_AC3:
-            if (channels == 1)
-                bitrate = 96;
-            else if (channels <= 2)
-                bitrate = 224;
-            else
-                bitrate = 640;
+            bitrate = (nchannels * 128) - (32 * (nchannels < 5));
             break;
+
         case HB_ACODEC_CA_HAAC:
-            bitrate = channels * 32;
+        case HB_ACODEC_FDK_HAAC:
+            bitrate = nchannels * 32;
             break;
+
         default:
-            bitrate = channels * 80;
+            bitrate = nchannels * 80;
             break;
     }
+    // sample_rate adjustment
     bitrate >>= sr_shift;
-    bitrate = hb_get_best_audio_bitrate( codec, bitrate, samplerate, mixdown );
-    return bitrate;
+    return hb_get_best_audio_bitrate(codec, bitrate, samplerate, mixdown);
 }
 
 // Get limits and hints for the UIs.
@@ -554,9 +853,10 @@
 //
 // direction says whether 'low' limit is highest or lowest 
 // quality (direction 0 == lowest value is worst quality)
-void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction)
+void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high,
+                                 float *granularity, int *direction)
 {
-    switch( codec )
+    switch (codec)
     {
         case HB_ACODEC_LAME:
             *direction = 1;
@@ -587,11 +887,10 @@
     }
 }
 
-float hb_get_best_audio_quality( uint32_t codec, float quality)
+float hb_get_best_audio_quality(uint32_t codec, float quality)
 {
     float low, high, granularity;
     int direction;
-
     hb_get_audio_quality_limits(codec, &low, &high, &granularity, &direction);
     if (quality > high)
         quality = high;
@@ -631,11 +930,13 @@
 //
 // direction says whether 'low' limit is highest or lowest 
 // compression level (direction 0 == lowest value is worst compression level)
-void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction)
+void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high,
+                                     float *granularity, int *direction)
 {
-    switch( codec )
+    switch (codec)
     {
         case HB_ACODEC_FFFLAC:
+        case HB_ACODEC_FFFLAC24:
             *direction = 0;
             *granularity = 1;
             *high = 12;
@@ -657,12 +958,11 @@
     }
 }
 
-float hb_get_best_audio_compression( uint32_t codec, float compression)
+float hb_get_best_audio_compression(uint32_t codec, float compression)
 {
     float low, high, granularity;
     int direction;
-
-    hb_get_audio_compression_limits( codec, &low, &high, &granularity, &direction );
+    hb_get_audio_compression_limits(codec, &low, &high, &granularity, &direction);
     if( compression > high )
         compression = high;
     if( compression < low )
@@ -670,110 +970,55 @@
     return compression;
 }
 
-float hb_get_default_audio_compression( uint32_t codec )
+float hb_get_default_audio_compression(uint32_t codec)
 {
-    float compression;
-    switch( codec )
+    switch (codec)
     {
         case HB_ACODEC_FFFLAC:
-            compression = 5;
-            break;
+        case HB_ACODEC_FFFLAC24:
+            return 5.;
 
         case HB_ACODEC_LAME:
-            compression = 2;
-            break;
+            return 2.;
 
         default:
-            compression = -1;
-            break;
+            return -1.;
     }
-    return compression;
 }
 
-int hb_get_best_mixdown( uint32_t codec, int layout, int mixdown )
+int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown)
 {
-
-    int best_mixdown;
-    
+    // Passthru, only "None" mixdown is supported
     if (codec & HB_ACODEC_PASS_FLAG)
-    {
-        // Audio pass-thru.  No mixdown.
         return HB_AMIXDOWN_NONE;
-    }
-    switch (layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK)
-    {
-        // stereo input or something not handled below
-        default:
-        case HB_INPUT_CH_LAYOUT_STEREO:
-            // mono gets mixed up to stereo & more than stereo gets mixed down
-            best_mixdown = HB_AMIXDOWN_STEREO;
-            break;
-
-        // mono input
-        case HB_INPUT_CH_LAYOUT_MONO:
-            // everything else passes through
-            best_mixdown = HB_AMIXDOWN_MONO;
-            break;
 
-        // dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input
-        // the A52 flags don't allow for a way to distinguish between DPL1 and
-        // DPL2 on a DVD so we always assume a DPL1 source for A52_DOLBY.
-        case HB_INPUT_CH_LAYOUT_DOLBY:
-            best_mixdown = HB_AMIXDOWN_DOLBY;
-            break;
-
-        // 4 channel discrete
-        case HB_INPUT_CH_LAYOUT_2F2R:
-        case HB_INPUT_CH_LAYOUT_3F1R:
-            // a52dec and libdca can't upmix to 6ch, 
-            // so we must downmix these.
-            best_mixdown = HB_AMIXDOWN_DOLBYPLII;
-            break;
-
-        // 5, 6, 7, or 8 channel discrete
-        case HB_INPUT_CH_LAYOUT_4F2R:
-        case HB_INPUT_CH_LAYOUT_3F4R:
-        case HB_INPUT_CH_LAYOUT_3F2R:
-            if ( ! ( layout & HB_INPUT_CH_LAYOUT_HAS_LFE ) )
-            {
-                // we don't do 5 channel discrete so mixdown to DPLII
-                // a52dec and libdca can't upmix to 6ch, 
-                // so we must downmix this.
-                best_mixdown = HB_AMIXDOWN_DOLBYPLII;
-            }
-            else
-            {
-                switch (codec)
-                {
-                    case HB_ACODEC_LAME:
-                    case HB_ACODEC_FFAAC:
-                        best_mixdown = HB_AMIXDOWN_DOLBYPLII;
-                        break;
+    // caller requested the best available mixdown
+    if (mixdown == HB_INVALID_AMIXDOWN)
+        mixdown  = hb_audio_mixdowns[hb_audio_mixdowns_count - 1].amixdown;
 
-                    default:
-                        best_mixdown = HB_AMIXDOWN_6CH;
-                        break;
-                }
-            }
+    int ii;
+    // test all mixdowns until an authorized, supported mixdown is found
+    // stop before we reach the "worst" non-None mixdown (index == 1)
+    for (ii = hb_audio_mixdowns_count - 1; ii > 1; ii--)
+        if (hb_audio_mixdowns[ii].amixdown <= mixdown &&
+            hb_mixdown_is_supported(hb_audio_mixdowns[ii].amixdown, codec, layout))
             break;
-    }
-    // return the best that is not greater than the requested mixdown
-    // 0 means the caller requested the best available mixdown
-    if( best_mixdown > mixdown && mixdown > 0 )
-        best_mixdown = mixdown;
-    
-    return best_mixdown;
+    return hb_audio_mixdowns[ii].amixdown;
 }
 
-int hb_get_default_mixdown( uint32_t codec, int layout )
+int hb_get_default_mixdown(uint32_t codec, uint64_t layout)
 {
     int mixdown;
     switch (codec)
     {
-        // the AC3 encoder defaults to the best mixdown up to 6-channel
+        // the FLAC encoder defaults to the best mixdown up to 7.1
         case HB_ACODEC_FFFLAC:
+        case HB_ACODEC_FFFLAC24:
+            mixdown = HB_AMIXDOWN_7POINT1;
+            break;
+        // the AC3 encoder defaults to the best mixdown up to 5.1
         case HB_ACODEC_AC3:
-            mixdown = HB_AMIXDOWN_6CH;
+            mixdown = HB_AMIXDOWN_5POINT1;
             break;
         // other encoders default to the best mixdown up to DPLII
         default:
@@ -781,7 +1026,59 @@
             break;
     }
     // return the best available mixdown up to the selected default
-    return hb_get_best_mixdown( codec, layout, mixdown );
+    return hb_get_best_mixdown(codec, layout, mixdown);
+}
+
+int hb_get_best_samplerate(uint32_t codec, int samplerate, int *sr_shift)
+{
+    int ii, best_samplerate, samplerate_shift;
+    if ((samplerate < 32000) &&
+        (codec == HB_ACODEC_CA_HAAC || codec == HB_ACODEC_AC3))
+    {
+        // ca_haac can't do samplerates < 32 kHz
+        // AC-3 < 32 kHz suffers from poor hardware compatibility
+        best_samplerate  = 32000;
+        samplerate_shift = 0;
+    }
+    else if (samplerate < 16000 && codec == HB_ACODEC_FDK_HAAC)
+    {
+        // fdk_haac can't do samplerates < 16 kHz
+        best_samplerate  = 16000;
+        samplerate_shift = 1;
+    }
+    else
+    {
+        best_samplerate = samplerate;
+        for (ii = hb_audio_rates_count - 1; ii >= 0; ii--)
+        {
+            // valid samplerate
+            if (best_samplerate == hb_audio_rates[ii].rate)
+                break;
+
+            // samplerate is higher than the next valid samplerate,
+            // or lower than the lowest valid samplerate
+            if (best_samplerate > hb_audio_rates[ii].rate || ii == 0)
+            {
+                best_samplerate = hb_audio_rates[ii].rate;
+                break;
+            }
+        }
+        /* sr_shift: 0 -> 48000, 44100, 32000 Hz
+         *           1 -> 24000, 22050, 16000 Hz
+         *           2 -> 12000, 11025,  8000 Hz
+         *
+         * also, since samplerates are sanitized downwards:
+         *
+         * (samplerate < 32000) implies (samplerate <= 24000)
+         */
+        samplerate_shift = ((best_samplerate < 16000) ? 2 :
+                            (best_samplerate < 32000) ? 1 : 0);
+    }
+    if (sr_shift != NULL)
+    {
+        *sr_shift = samplerate_shift;
+    }
+    return best_samplerate;
 }
 
 /**********************************************************************
@@ -980,7 +1277,7 @@
  **********************************************************************
  * Returns the number of items currently in the list
  *********************************************************************/
-int hb_list_count( hb_list_t * l )
+int hb_list_count( const hb_list_t * l )
 {
     return l->items_count;
 }
@@ -1059,15 +1356,14 @@
     {
         if( l->items[i] == p )
         {
+            /* Shift all items after it sizeof( void * ) bytes earlier */
+            memmove( &l->items[i], &l->items[i+1],
+                     ( l->items_count - i - 1 ) * sizeof( void * ) );
+
+            (l->items_count)--;
             break;
         }
     }
-
-    /* Shift all items after it sizeof( void * ) bytes earlier */
-    memmove( &l->items[i], &l->items[i+1],
-             ( l->items_count - i - 1 ) * sizeof( void * ) );
-
-    (l->items_count)--;
 }
 
 /**********************************************************************
@@ -1076,7 +1372,7 @@
  * Returns item at position i, or NULL if there are not that many
  * items in the list
  *********************************************************************/
-void * hb_list_item( hb_list_t * l, int i )
+void * hb_list_item( const hb_list_t * l, int i )
 {
     if( i < 0 || i >= l->items_count )
     {
@@ -1102,7 +1398,7 @@
     for( i = 0; i < hb_list_count( l ); i++ )
     {
         buf  = hb_list_item( l, i );
-        ret += buf->size - buf->cur;
+        ret += buf->size - buf->offset;
     }
 
     return ret;
@@ -1124,8 +1420,8 @@
     for( i = 0, copied = 0; copied < size; i++ )
     {
         buf     = hb_list_item( l, i );
-        copying = MIN( buf->size - buf->cur, size - copied );
-        memcpy( &dst[copied], &buf->data[buf->cur], copying );
+        copying = MIN( buf->size - buf->offset, size - copied );
+        memcpy( &dst[copied], &buf->data[buf->offset], copying );
         copied += copying;
     }
 }
@@ -1157,18 +1453,18 @@
     for( copied = 0, has_pts = 0; copied < size;  )
     {
         buf     = hb_list_item( l, 0 );
-        copying = MIN( buf->size - buf->cur, size - copied );
-        memcpy( &dst[copied], &buf->data[buf->cur], copying );
+        copying = MIN( buf->size - buf->offset, size - copied );
+        memcpy( &dst[copied], &buf->data[buf->offset], copying );
 
         if( !has_pts )
         {
-            *pts    = buf->start;
-            *pos    = buf->cur;
+            *pts    = buf->s.start;
+            *pos    = buf->offset;
             has_pts = 1;
         }
 
-        buf->cur += copying;
-        if( buf->cur >= buf->size )
+        buf->offset += copying;
+        if( buf->offset >= buf->size )
         {
             hb_list_rem( l, buf );
             hb_buffer_close( &buf );
@@ -1399,6 +1695,19 @@
     error_handler = handler;
 }
 
+static void hb_update_str( char **dst, const char *src )
+{
+    if ( dst )
+    {
+        free( *dst );
+        *dst = NULL;
+        if ( src )
+        {
+            *dst = strdup( src );
+        }
+    }
+}
+
 /**********************************************************************
  * hb_title_init
  **********************************************************************
@@ -1416,6 +1725,7 @@
     t->list_chapter  = hb_list_init();
     t->list_subtitle = hb_list_init();
     t->list_attachment = hb_list_init();
+    t->metadata      = hb_metadata_init();
     strcat( t->path, path );
     // default to decoding mpeg2
     t->video_id      = 0xE0;
@@ -1440,65 +1750,400 @@
     hb_subtitle_t * subtitle;
     hb_attachment_t * attachment;
 
-    while( ( audio = hb_list_item( t->list_audio, 0 ) ) )
+    while( ( chapter = hb_list_item( t->list_chapter, 0 ) ) )
     {
-        hb_list_rem( t->list_audio, audio );
-        free( audio );
+        hb_list_rem( t->list_chapter, chapter );
+        hb_chapter_close( &chapter );
     }
-    hb_list_close( &t->list_audio );
+    hb_list_close( &t->list_chapter );
 
-    while( ( chapter = hb_list_item( t->list_chapter, 0 ) ) )
+    while( ( audio = hb_list_item( t->list_audio, 0 ) ) )
     {
-        hb_list_rem( t->list_chapter, chapter );
-        free( chapter );
+        hb_list_rem( t->list_audio, audio );
+        hb_audio_close( &audio );
     }
-    hb_list_close( &t->list_chapter );
+    hb_list_close( &t->list_audio );
 
     while( ( subtitle = hb_list_item( t->list_subtitle, 0 ) ) )
     {
         hb_list_rem( t->list_subtitle, subtitle );
-        if ( subtitle->extradata )
-        {
-            free( subtitle->extradata );
-            subtitle->extradata = NULL;
-        }
-        free( subtitle );
+        hb_subtitle_close( &subtitle );
     }
     hb_list_close( &t->list_subtitle );
     
     while( ( attachment = hb_list_item( t->list_attachment, 0 ) ) )
     {
         hb_list_rem( t->list_attachment, attachment );
-        if ( attachment->name )
+        hb_attachment_close( &attachment );
+    }
+    hb_list_close( &t->list_attachment );
+
+    hb_metadata_close( &t->metadata );
+
+    free( t->video_codec_name );
+    free(t->container_name);
+
+#if defined(HB_TITLE_JOBS)
+    hb_job_close( &t->job );
+#endif
+
+    free( t );
+    *_t = NULL;
+}
+
+// The mac ui expects certain fields of the job struct to be cleaned up
+// and others to remain untouched.
+// e.g. picture settings like cropping, width, height, should remain untouched.
+//
+// So only initialize job elements that we know get set up by prepareJob and
+// prepareJobForPreview.
+//
+// This should all get resolved in some future mac ui refactoring.
+static void job_reset_for_mac_ui( hb_job_t * job, hb_title_t * title )
+{
+    if ( job == NULL || title == NULL )
+        return;
+
+    job->title = title;
+
+    /* Set defaults settings */
+    job->chapter_start = 1;
+    job->chapter_end   = hb_list_count( title->list_chapter );
+    job->list_chapter = hb_chapter_list_copy( title->list_chapter );
+
+    job->vcodec     = HB_VCODEC_FFMPEG_MPEG4;
+    job->vquality   = -1.0;
+    job->vbitrate   = 1000;
+    job->pass       = 0;
+    job->vrate      = title->rate;
+    job->vrate_base = title->rate_base;
+
+    job->list_audio = hb_list_init();
+    job->list_subtitle = hb_list_init();
+    job->list_filter = hb_list_init();
+
+    job->list_attachment = hb_attachment_list_copy( title->list_attachment );
+    job->metadata = hb_metadata_copy( title->metadata );
+}
+
+static void job_setup( hb_job_t * job, hb_title_t * title )
+{
+    if ( job == NULL || title == NULL )
+        return;
+
+    job->title = title;
+
+    /* Set defaults settings */
+    job->chapter_start = 1;
+    job->chapter_end   = hb_list_count( title->list_chapter );
+    job->list_chapter = hb_chapter_list_copy( title->list_chapter );
+
+    /* Autocrop by default. Gnark gnark */
+    memcpy( job->crop, title->crop, 4 * sizeof( int ) );
+
+    /* Preserve a source's pixel aspect, if it's available. */
+    if( title->pixel_aspect_width && title->pixel_aspect_height )
+    {
+        job->anamorphic.par_width  = title->pixel_aspect_width;
+        job->anamorphic.par_height = title->pixel_aspect_height;
+    }
+
+    if( title->aspect != 0 && title->aspect != 1. &&
+        !job->anamorphic.par_width && !job->anamorphic.par_height)
+    {
+        hb_reduce( &job->anamorphic.par_width, &job->anamorphic.par_height,
+                   (int)(title->aspect * title->height + 0.5), title->width );
+    }
+
+    job->width = title->width - job->crop[2] - job->crop[3];
+    hb_fix_aspect( job, HB_KEEP_WIDTH );
+    if( job->height > title->height - job->crop[0] - job->crop[1] )
+    {
+        job->height = title->height - job->crop[0] - job->crop[1];
+        hb_fix_aspect( job, HB_KEEP_HEIGHT );
+    }
+
+    job->keep_ratio = 1;
+
+    job->vcodec     = HB_VCODEC_FFMPEG_MPEG4;
+    job->vquality   = -1.0;
+    job->vbitrate   = 1000;
+    job->pass       = 0;
+    job->vrate      = title->rate;
+    job->vrate_base = title->rate_base;
+
+    job->mux = HB_MUX_MP4;
+
+    job->list_audio = hb_list_init();
+    job->list_subtitle = hb_list_init();
+    job->list_filter = hb_list_init();
+
+    job->list_attachment = hb_attachment_list_copy( title->list_attachment );
+    job->metadata = hb_metadata_copy( title->metadata );
+}
+
+static void job_clean( hb_job_t * job )
+{
+    if (job)
+    {
+        hb_chapter_t *chapter;
+        hb_audio_t *audio;
+        hb_subtitle_t *subtitle;
+        hb_filter_object_t *filter;
+        hb_attachment_t *attachment;
+
+        free(job->file);
+        job->file = NULL;
+        free(job->advanced_opts);
+        job->advanced_opts = NULL;
+        free(job->x264_preset);
+        job->x264_preset = NULL;
+        free(job->x264_tune);
+        job->x264_tune = NULL;
+        free(job->h264_profile);
+        job->h264_profile = NULL;
+        free(job->h264_level);
+        job->h264_level = NULL;
+
+        // clean up chapter list
+        while( ( chapter = hb_list_item( job->list_chapter, 0 ) ) )
+        {
+            hb_list_rem( job->list_chapter, chapter );
+            hb_chapter_close( &chapter );
+        }
+        hb_list_close( &job->list_chapter );
+
+        // clean up audio list
+        while( ( audio = hb_list_item( job->list_audio, 0 ) ) )
+        {
+            hb_list_rem( job->list_audio, audio );
+            hb_audio_close( &audio );
+        }
+        hb_list_close( &job->list_audio );
+
+        // clean up subtitle list
+        while( ( subtitle = hb_list_item( job->list_subtitle, 0 ) ) )
         {
-            free( attachment->name );
-            attachment->name = NULL;
+            hb_list_rem( job->list_subtitle, subtitle );
+            hb_subtitle_close( &subtitle );
         }
-        if ( attachment->data )
+        hb_list_close( &job->list_subtitle );
+
+        // clean up filter list
+        while( ( filter = hb_list_item( job->list_filter, 0 ) ) )
+        {
+            hb_list_rem( job->list_filter, filter );
+            hb_filter_close( &filter );
+        }
+        hb_list_close( &job->list_filter );
+
+        // clean up attachment list
+        while( ( attachment = hb_list_item( job->list_attachment, 0 ) ) )
         {
-            free( attachment->data );
-            attachment->data = NULL;
+            hb_list_rem( job->list_attachment, attachment );
+            hb_attachment_close( &attachment );
         }
-        free( attachment );
+        hb_list_close( &job->list_attachment );
+
+        // clean up metadata
+        hb_metadata_close( &job->metadata );
     }
-    hb_list_close( &t->list_attachment );
+}
+
+/*
+ * Create a pristine job structure from a title
+ * title_index is 1 based
+ */
+hb_job_t * hb_job_init_by_index( hb_handle_t * h, int title_index )
+{
+    hb_title_set_t *title_set = hb_get_title_set( h );
+    hb_title_t * title = hb_list_item( title_set->list_title,
+                                       title_index - 1 );
+    return hb_job_init( title );
+}
 
-    if( t->metadata )
+hb_job_t * hb_job_init( hb_title_t * title )
+{
+    hb_job_t * job;
+
+    if ( title == NULL )
+        return NULL;
+
+    job = calloc( sizeof( hb_job_t ), 1 );
+    job_setup(job, title);
+
+    return job;
+}
+
+/**
+ * Clean up the job structure so that is is ready for setting up a new job.
+ * Should be called by front-ends after hb_add().
+ */
+/**********************************************************************
+ * hb_job_reset
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_job_reset( hb_job_t * job )
+{
+    if ( job )
     {
-        if( t->metadata->coverart )
+        hb_title_t * title = job->title;
+        job_clean(job);
+        job_reset_for_mac_ui(job, title);
+    }
+}
+
+/**********************************************************************
+ * hb_job_close
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_job_close( hb_job_t ** _j )
+{
+    if (_j && *_j)
+    {
+        job_clean(*_j);
+        free( *_j );
+        _j = NULL;
+    }
+}
+
+void hb_job_set_file( hb_job_t *job, const char *file )
+{
+    if ( job )
+    {
+        hb_update_str( &job->file, file );
+    }
+}
+
+void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts )
+{
+    if ( job )
+    {
+        hb_update_str( &job->advanced_opts, advanced_opts );
+    }
+}
+
+void hb_job_set_x264_preset( hb_job_t *job, const char *preset )
+{
+    if ( job )
+    {
+        hb_update_str( &job->x264_preset, preset );
+    }
+}
+
+void hb_job_set_x264_tune( hb_job_t *job, const char *tune )
+{
+    if ( job )
+    {
+        hb_update_str( &job->x264_tune, tune );
+    }
+}
+
+void hb_job_set_h264_profile( hb_job_t *job, const char *profile )
+{
+    if ( job )
+    {
+        hb_update_str( &job->h264_profile, profile );
+    }
+}
+
+void hb_job_set_h264_level( hb_job_t *job, const char *level )
+{
+    if ( job )
+    {
+        hb_update_str( &job->h264_level, level );
+    }
+}
+
+hb_filter_object_t * hb_filter_copy( hb_filter_object_t * filter )
+{
+    if( filter == NULL )
+        return NULL;
+
+    hb_filter_object_t * filter_copy = malloc( sizeof( hb_filter_object_t ) );
+    memcpy( filter_copy, filter, sizeof( hb_filter_object_t ) );
+    if( filter->settings )
+        filter_copy->settings = strdup( filter->settings );
+    return filter_copy;
+}
+
+/**********************************************************************
+ * hb_filter_list_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_list_t *hb_filter_list_copy(const hb_list_t *src)
+{
+    hb_list_t *list = hb_list_init();
+    hb_filter_object_t *filter = NULL;
+    int i;
+
+    if( src )
+    {
+        for( i = 0; i < hb_list_count(src); i++ )
         {
-            free( t->metadata->coverart );
+            if( ( filter = hb_list_item( src, i ) ) )
+            {
+                hb_list_add( list, hb_filter_copy(filter) );
+            }
         }
-        free( t->metadata );
     }
+    return list;
+}
 
-    if ( t->video_codec_name )
+/**
+ * Gets a filter object with the given type
+ * @param filter_id The type of filter to get.
+ * @returns The requested filter object.
+ */
+hb_filter_object_t * hb_filter_init( int filter_id )
+{
+    hb_filter_object_t * filter;
+    switch( filter_id )
     {
-        free( t->video_codec_name );
-    }
+        case HB_FILTER_DETELECINE:
+            filter = &hb_filter_detelecine;
+            break;
 
-    free( t );
-    *_t = NULL;
+        case HB_FILTER_DECOMB:
+            filter = &hb_filter_decomb;
+            break;
+
+        case HB_FILTER_DEINTERLACE:
+            filter = &hb_filter_deinterlace;
+            break;
+
+        case HB_FILTER_VFR:
+            filter = &hb_filter_vfr;
+            break;
+
+        case HB_FILTER_DEBLOCK:
+            filter = &hb_filter_deblock;
+            break;
+
+        case HB_FILTER_DENOISE:
+            filter = &hb_filter_denoise;
+            break;
+
+        case HB_FILTER_RENDER_SUB:
+            filter = &hb_filter_render_sub;
+            break;
+
+        case HB_FILTER_CROP_SCALE:
+            filter = &hb_filter_crop_scale;
+            break;
+
+        case HB_FILTER_ROTATE:
+            filter = &hb_filter_rotate;
+            break;
+
+        default:
+            filter = NULL;
+            break;
+    }
+    return hb_filter_copy( filter );
 }
 
 /**********************************************************************
@@ -1510,10 +2155,6 @@
 {
     hb_filter_object_t * f = *_f;
 
-    f->close( f->private_data );
-
-    if( f->name )
-        free( f->name );
     if( f->settings )
         free( f->settings );
 
@@ -1522,6 +2163,93 @@
 }
 
 /**********************************************************************
+ * hb_chapter_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_chapter_t *hb_chapter_copy(const hb_chapter_t *src)
+{
+    hb_chapter_t *chap = NULL;
+
+    if ( src )
+    {
+        chap = calloc( 1, sizeof(*chap) );
+        memcpy( chap, src, sizeof(*chap) );
+        if ( src->title )
+        {
+            chap->title = strdup( src->title );
+        }
+    }
+    return chap;
+}
+
+/**********************************************************************
+ * hb_chapter_list_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_list_t *hb_chapter_list_copy(const hb_list_t *src)
+{
+    hb_list_t *list = hb_list_init();
+    hb_chapter_t *chapter = NULL;
+    int i;
+
+    if( src )
+    {
+        for( i = 0; i < hb_list_count(src); i++ )
+        {
+            if( ( chapter = hb_list_item( src, i ) ) )
+            {
+                hb_list_add( list, hb_chapter_copy(chapter) );
+            }
+        }
+    }
+    return list;
+}
+
+/**********************************************************************
+ * hb_chapter_close
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_chapter_close(hb_chapter_t **chap)
+{
+    if ( chap && *chap )
+    {
+        free((*chap)->title);
+        free(*chap);
+        *chap = NULL;
+    }
+}
+
+/**********************************************************************
+ * hb_chapter_set_title
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_chapter_set_title( hb_chapter_t *chapter, const char *title )
+{
+    if ( chapter )
+    {
+        hb_update_str( &chapter->title, title );
+    }
+}
+
+/**********************************************************************
+ * hb_chapter_set_title_by_index
+ **********************************************************************
+ * Applies information from the given job to the official job instance.
+ * @param job Handle to hb_job_t.
+ * @param chapter The chapter to apply the name to (1-based).
+ * @param titel to apply.
+ *********************************************************************/
+void hb_chapter_set_title_by_index( hb_job_t * job, int chapter_index, const char * title )
+{
+    hb_chapter_t * chapter = hb_list_item( job->list_chapter, chapter_index - 1 );
+    hb_chapter_set_title( chapter, title );
+}
+
+/**********************************************************************
  * hb_audio_copy
  **********************************************************************
  *
@@ -1534,41 +2262,92 @@
     {
         audio = calloc(1, sizeof(*audio));
         memcpy(audio, src, sizeof(*audio));
+        if ( src->config.out.name )
+        {
+            audio->config.out.name = strdup(src->config.out.name);
+        }
     }
     return audio;
 }
 
 /**********************************************************************
+ * hb_audio_list_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_list_t *hb_audio_list_copy(const hb_list_t *src)
+{
+    hb_list_t *list = hb_list_init();
+    hb_audio_t *audio = NULL;
+    int i;
+
+    if( src )
+    {
+        for( i = 0; i < hb_list_count(src); i++ )
+        {
+            if( ( audio = hb_list_item( src, i ) ) )
+            {
+                hb_list_add( list, hb_audio_copy(audio) );
+            }
+        }
+    }
+    return list;
+}
+
+/**********************************************************************
+ * hb_audio_close
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_audio_close( hb_audio_t **audio )
+{
+    if ( audio && *audio )
+    {
+        free((*audio)->config.out.name);
+        free(*audio);
+        *audio = NULL;
+    }
+}
+
+/**********************************************************************
  * hb_audio_new
  **********************************************************************
  *
  *********************************************************************/
 void hb_audio_config_init(hb_audio_config_t * audiocfg)
 {
-    /* Set read only paramaters to invalid values */
-    audiocfg->in.codec = 0xDEADBEEF;
-    audiocfg->in.bitrate = -1;
-    audiocfg->in.samplerate = -1;
-    audiocfg->in.channel_layout = 0;
-    audiocfg->in.channel_map = NULL;
+    /* Set read-only paramaters to invalid values */
+    audiocfg->in.codec = 0;
+    audiocfg->in.codec_param = 0;
+    audiocfg->in.reg_desc = 0;
+    audiocfg->in.stream_type = 0;
+    audiocfg->in.substream_type = 0;
     audiocfg->in.version = 0;
+    audiocfg->in.flags = 0;
     audiocfg->in.mode = 0;
-    audiocfg->flags.ac3 = 0;
+    audiocfg->in.samplerate = -1;
+    audiocfg->in.samples_per_frame = -1;
+    audiocfg->in.bitrate = -1;
+    audiocfg->in.channel_layout = -1;
+    audiocfg->in.channel_map = NULL;
     audiocfg->lang.description[0] = 0;
     audiocfg->lang.simple[0] = 0;
     audiocfg->lang.iso639_2[0] = 0;
 
-    /* Initalize some sensable defaults */
+    /* Initalize some sensible defaults */
     audiocfg->in.track = audiocfg->out.track = 0;
-    audiocfg->out.codec = HB_ACODEC_FAAC;
+    audiocfg->out.codec = hb_audio_encoders[0].encoder;
+    audiocfg->out.samplerate = -1;
+    audiocfg->out.samples_per_frame = -1;
     audiocfg->out.bitrate = -1;
     audiocfg->out.quality = HB_INVALID_AUDIO_QUALITY;
     audiocfg->out.compression_level = -1;
-    audiocfg->out.samplerate = -1;
-    audiocfg->out.mixdown = -1;
+    audiocfg->out.mixdown = HB_INVALID_AMIXDOWN;
     audiocfg->out.dynamic_range_compression = 0;
+    audiocfg->out.gain = 0;
+    audiocfg->out.normalize_mix_level = 0;
+    audiocfg->out.dither_method = hb_audio_dither_get_default();
     audiocfg->out.name = NULL;
-
 }
 
 /**********************************************************************
@@ -1612,11 +2391,13 @@
         /* Pass-through, copy from input. */
         audio->config.out.samplerate = audio->config.in.samplerate;
         audio->config.out.bitrate = audio->config.in.bitrate;
-        audio->config.out.mixdown = 0;
+        audio->config.out.mixdown = HB_AMIXDOWN_NONE;
         audio->config.out.dynamic_range_compression = 0;
         audio->config.out.gain = 0;
+        audio->config.out.normalize_mix_level = 0;
         audio->config.out.compression_level = -1;
         audio->config.out.quality = HB_INVALID_AUDIO_QUALITY;
+        audio->config.out.dither_method = hb_audio_dither_get_default();
     }
     else
     {
@@ -1629,10 +2410,12 @@
         audio->config.out.dynamic_range_compression = audiocfg->out.dynamic_range_compression;
         audio->config.out.mixdown = audiocfg->out.mixdown;
         audio->config.out.gain = audiocfg->out.gain;
+        audio->config.out.normalize_mix_level = audiocfg->out.normalize_mix_level;
+        audio->config.out.dither_method = audiocfg->out.dither_method;
     }
     if (audiocfg->out.name && *audiocfg->out.name)
     {
-        audio->config.out.name = audiocfg->out.name;
+        audio->config.out.name = strdup(audiocfg->out.name);
     }
 
     hb_list_add(job->list_audio, audio);
@@ -1672,6 +2455,45 @@
 }
 
 /**********************************************************************
+ * hb_subtitle_list_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_list_t *hb_subtitle_list_copy(const hb_list_t *src)
+{
+    hb_list_t *list = hb_list_init();
+    hb_subtitle_t *subtitle = NULL;
+    int i;
+
+    if( src )
+    {
+        for( i = 0; i < hb_list_count(src); i++ )
+        {
+            if( ( subtitle = hb_list_item( src, i ) ) )
+            {
+                hb_list_add( list, hb_subtitle_copy(subtitle) );
+            }
+        }
+    }
+    return list;
+}
+
+/**********************************************************************
+ * hb_subtitle_close
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_subtitle_close( hb_subtitle_t **sub )
+{
+    if ( sub && *sub )
+    {
+        free ((*sub)->extradata);
+        free(*sub);
+        *sub = NULL;
+    }
+}
+
+/**********************************************************************
  * hb_subtitle_add
  **********************************************************************
  *
@@ -1688,6 +2510,7 @@
         return 0;
     }
     subtitle->config = *subtitlecfg;
+    subtitle->out_track = hb_list_count(job->list_subtitle) + 1;
     hb_list_add(job->list_subtitle, subtitle);
     return 1;
 }
@@ -1705,6 +2528,7 @@
     subtitle->id = (hb_list_count(job->list_subtitle) << 8) | 0xFF;
     subtitle->format = TEXTSUB;
     subtitle->source = SRTSUB;
+    subtitle->codec = WORK_DECSRTSUB;
 
     language = lang_for_code2( lang );
 
@@ -1723,6 +2547,293 @@
     return retval;
 }
 
+int hb_subtitle_can_force( int source )
+{
+    return source == VOBSUB || source == PGSSUB;
+}
+
+int hb_subtitle_can_burn( int source )
+{
+    return source == VOBSUB || source == PGSSUB || source == SSASUB;
+}
+
+int hb_subtitle_can_pass( int source, int mux )
+{
+    if ( mux == HB_MUX_MKV )
+    {
+        switch( source )
+        {
+            case PGSSUB:
+            case VOBSUB:
+            case SSASUB:
+            case SRTSUB:
+            case UTF8SUB:
+            case TX3GSUB:
+            case CC608SUB:
+            case CC708SUB:
+                return 1;
+
+            default:
+                return 0;
+        }
+    }
+    else if ( mux == HB_MUX_MP4 )
+    {
+        switch( source )
+        {
+            case VOBSUB:
+            case SSASUB:
+            case SRTSUB:
+            case UTF8SUB:
+            case TX3GSUB:
+            case CC608SUB:
+            case CC708SUB:
+                return 1;
+
+            default:
+                return 0;
+        }
+    }
+    else
+    {
+        // Internal error. Should never get here.
+        hb_error("internel error.  Bad mux %d\n", mux);
+        return 0;
+    }
+}
+
+/**********************************************************************
+ * hb_metadata_init
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_metadata_t *hb_metadata_init()
+{
+    hb_metadata_t *metadata = calloc( 1, sizeof(*metadata) );
+    return metadata;
+}
+
+/**********************************************************************
+ * hb_metadata_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_metadata_t *hb_metadata_copy( const hb_metadata_t *src )
+{
+    hb_metadata_t *metadata = NULL;
+
+    if ( src )
+    {
+        metadata = calloc( 1, sizeof(*metadata) );
+        if ( src->name )
+        {
+            metadata->name = strdup(src->name);
+        }
+        if ( src->artist )
+        {
+            metadata->artist = strdup(src->artist);
+        }
+        if ( src->album_artist )
+        {
+            metadata->album_artist = strdup(src->album_artist);
+        }
+        if ( src->composer )
+        {
+            metadata->composer = strdup(src->composer);
+        }
+        if ( src->release_date )
+        {
+            metadata->release_date = strdup(src->release_date);
+        }
+        if ( src->comment )
+        {
+            metadata->comment = strdup(src->comment);
+        }
+        if ( src->album )
+        {
+            metadata->album = strdup(src->album);
+        }
+        if ( src->genre )
+        {
+            metadata->genre = strdup(src->genre);
+        }
+        if ( src->description )
+        {
+            metadata->description = strdup(src->description);
+        }
+        if ( src->long_description )
+        {
+            metadata->long_description = strdup(src->long_description);
+        }
+        if ( src->list_coverart )
+        {
+            int ii;
+            for ( ii = 0; ii < hb_list_count( src->list_coverart ); ii++ )
+            {
+                hb_coverart_t *art = hb_list_item( src->list_coverart, ii );
+                hb_metadata_add_coverart(
+                        metadata, art->data, art->size, art->type );
+            }
+        }
+    }
+    return metadata;
+}
+
+/**********************************************************************
+ * hb_metadata_close
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_metadata_close( hb_metadata_t **_m )
+{
+    if ( _m && *_m )
+    {
+        hb_metadata_t *m = *_m;
+        hb_coverart_t *art;
+
+        free( m->name );
+        free( m->artist );
+        free( m->composer );
+        free( m->release_date );
+        free( m->comment );
+        free( m->album );
+        free( m->album_artist );
+        free( m->genre );
+        free( m->description );
+        free( m->long_description );
+
+        if ( m->list_coverart )
+        {
+            while( ( art = hb_list_item( m->list_coverart, 0 ) ) )
+            {
+                hb_list_rem( m->list_coverart, art );
+                free( art->data );
+                free( art );
+            }
+            hb_list_close( &m->list_coverart );
+        }
+
+        free( m );
+        *_m = NULL;
+    }
+}
+
+/**********************************************************************
+ * hb_metadata_set_*
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_metadata_set_name( hb_metadata_t *metadata, const char *name )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->name, name );
+    }
+}
+
+void hb_metadata_set_artist( hb_metadata_t *metadata, const char *artist )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->artist, artist );
+    }
+}
+
+void hb_metadata_set_composer( hb_metadata_t *metadata, const char *composer )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->composer, composer );
+    }
+}
+
+void hb_metadata_set_release_date( hb_metadata_t *metadata, const char *release_date )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->release_date, release_date );
+    }
+}
+
+void hb_metadata_set_comment( hb_metadata_t *metadata, const char *comment )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->comment, comment );
+    }
+}
+
+void hb_metadata_set_genre( hb_metadata_t *metadata, const char *genre )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->genre, genre );
+    }
+}
+
+void hb_metadata_set_album( hb_metadata_t *metadata, const char *album )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->album, album );
+    }
+}
+
+void hb_metadata_set_album_artist( hb_metadata_t *metadata, const char *album_artist )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->album_artist, album_artist );
+    }
+}
+
+void hb_metadata_set_description( hb_metadata_t *metadata, const char *description )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->description, description );
+    }
+}
+
+void hb_metadata_set_long_description( hb_metadata_t *metadata, const char *long_description )
+{
+    if ( metadata )
+    {
+        hb_update_str( &metadata->long_description, long_description );
+    }
+}
+
+void hb_metadata_add_coverart( hb_metadata_t *metadata, const uint8_t *data, int size, int type )
+{
+    if ( metadata )
+    {
+        if ( metadata->list_coverart == NULL )
+        {
+            metadata->list_coverart = hb_list_init();
+        }
+        hb_coverart_t *art = calloc( 1, sizeof(hb_coverart_t) );
+        art->data = malloc( size );
+        memcpy( art->data, data, size );
+        art->size = size;
+        art->type = type;
+        hb_list_add( metadata->list_coverart, art );
+    }
+}
+
+void hb_metadata_rem_coverart( hb_metadata_t *metadata, int idx )
+{
+    if ( metadata )
+    {
+        hb_coverart_t *art = hb_list_item( metadata->list_coverart, idx );
+        if ( art )
+        {
+            hb_list_rem( metadata->list_coverart, art );
+            free( art->data );
+            free( art );
+        }
+    }
+}
+
 char * hb_strdup_printf( const char * fmt, ... )
 {
     int       len;
@@ -1816,6 +2927,46 @@
 }
 
 /**********************************************************************
+ * hb_attachment_list_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_list_t *hb_attachment_list_copy(const hb_list_t *src)
+{
+    hb_list_t *list = hb_list_init();
+    hb_attachment_t *attachment = NULL;
+    int i;
+
+    if( src )
+    {
+        for( i = 0; i < hb_list_count(src); i++ )
+        {
+            if( ( attachment = hb_list_item( src, i ) ) )
+            {
+                hb_list_add( list, hb_attachment_copy(attachment) );
+            }
+        }
+    }
+    return list;
+}
+
+/**********************************************************************
+ * hb_attachment_close
+ **********************************************************************
+ *
+ *********************************************************************/
+void hb_attachment_close( hb_attachment_t **attachment )
+{
+    if ( attachment && *attachment )
+    {
+        free((*attachment)->data);
+        free((*attachment)->name);
+        free(*attachment);
+        *attachment = NULL;
+    }
+}
+
+/**********************************************************************
  * hb_yuv2rgb
  **********************************************************************
  * Converts a YCrCb pixel to an RGB pixel.
@@ -1901,6 +3052,8 @@
             return "TX3G";
         case SSASUB:
             return "SSA";
+        case PGSSUB:
+            return "PGS";
         default:
             return "Unknown";
     }
@@ -1948,4 +3101,3 @@
         hb_deep_log( level, "    %-50s%20s", line, ascii );
     }
 }
-

HandBrake-0.9.8.tar.bz2/libhb/common.h -> HandBrake-0.9.9.tar.bz2/libhb/common.h Changed

@@ -1,9 +1,12 @@
-/* $Id: common.h,v 1.51 2005/11/04 13:09:40 titer Exp $
+/* common.h
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
 #ifndef HB_COMMON_H
 #define HB_COMMON_H
 
@@ -59,6 +62,7 @@
 #define EVEN( a )        ( (a) + ( (a) & 1 ) )
 #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) )
 #define MULTIPLE_MOD( a, b ) ((b==1)?a:( b * ( ( (a) + (b / 2) - 1) / b ) ))
+#define MULTIPLE_MOD_UP( a, b ) ((b==1)?a:( b * ( ( (a) + (b) - 1) / b ) ))
 #define MULTIPLE_MOD_DOWN( a, b ) ((b==1)?a:( b * ( (a) / b ) ))
 
 #define HB_DVD_READ_BUFFER_SIZE 2048
@@ -66,9 +70,11 @@
 typedef struct hb_handle_s hb_handle_t;
 typedef struct hb_list_s hb_list_t;
 typedef struct hb_rate_s hb_rate_t;
+typedef struct hb_dither_s hb_dither_t;
 typedef struct hb_mixdown_s hb_mixdown_t;
 typedef struct hb_encoder_s hb_encoder_t;
 typedef struct hb_job_s  hb_job_t;
+typedef struct hb_title_set_s hb_title_set_t;
 typedef struct hb_title_s hb_title_t;
 typedef struct hb_chapter_s hb_chapter_t;
 typedef struct hb_audio_s hb_audio_t;
@@ -77,6 +83,7 @@
 typedef struct hb_subtitle_config_s hb_subtitle_config_t;
 typedef struct hb_attachment_s hb_attachment_t;
 typedef struct hb_metadata_s hb_metadata_t;
+typedef struct hb_coverart_s hb_coverart_t;
 typedef struct hb_state_s hb_state_t;
 typedef union  hb_esconfig_u     hb_esconfig_t;
 typedef struct hb_work_private_s hb_work_private_t;
@@ -94,14 +101,15 @@
 #else
 #define PRIVATE const
 #endif
-#include "downmix.h"
+#include "audio_remap.h"
+#include "libavutil/channel_layout.h"
 
 hb_list_t * hb_list_init();
-int         hb_list_count( hb_list_t * );
+int         hb_list_count( const hb_list_t * );
 void        hb_list_add( hb_list_t *, void * );
 void        hb_list_insert( hb_list_t * l, int pos, void * p );
 void        hb_list_rem( hb_list_t *, void * );
-void      * hb_list_item( hb_list_t *, int );
+void      * hb_list_item( const hb_list_t *, int );
 void        hb_list_close( hb_list_t ** );
 
 void hb_reduce( int *x, int *y, int num, int den );
@@ -112,38 +120,82 @@
 #define HB_KEEP_HEIGHT 1
 void hb_fix_aspect( hb_job_t * job, int keep );
 
+void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts );
+void hb_job_set_x264_preset( hb_job_t *job, const char *preset );
+void hb_job_set_x264_tune( hb_job_t *job, const char *tune );
+void hb_job_set_h264_profile( hb_job_t *job, const char *profile );
+void hb_job_set_h264_level( hb_job_t *job, const char *level );
+void hb_job_set_file( hb_job_t *job, const char *file );
+
 hb_audio_t *hb_audio_copy(const hb_audio_t *src);
+hb_list_t *hb_audio_list_copy(const hb_list_t *src);
+void hb_audio_close(hb_audio_t **audio);
 void hb_audio_config_init(hb_audio_config_t * audiocfg);
 int hb_audio_add(const hb_job_t * job, const hb_audio_config_t * audiocfg);
 hb_audio_config_t * hb_list_audio_config_item(hb_list_t * list, int i);
 
 hb_subtitle_t *hb_subtitle_copy(const hb_subtitle_t *src);
+hb_list_t *hb_subtitle_list_copy(const hb_list_t *src);
+void hb_subtitle_close( hb_subtitle_t **sub );
 int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, int track);
 int hb_srt_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, 
                const char *lang);
+int hb_subtitle_can_force( int source );
+int hb_subtitle_can_burn( int source );
+int hb_subtitle_can_pass( int source, int mux );
 
 hb_attachment_t *hb_attachment_copy(const hb_attachment_t *src);
+hb_list_t *hb_attachment_list_copy(const hb_list_t *src);
+void hb_attachment_close(hb_attachment_t **attachment);
+
+hb_metadata_t * hb_metadata_init();
+hb_metadata_t * hb_metadata_copy(const hb_metadata_t *src);
+void hb_metadata_close(hb_metadata_t **metadata);
+void hb_metadata_set_name( hb_metadata_t *metadata, const char *name );
+void hb_metadata_set_artist( hb_metadata_t *metadata, const char *artist );
+void hb_metadata_set_composer( hb_metadata_t *metadata, const char *composer );
+void hb_metadata_set_release_date( hb_metadata_t *metadata, const char *release_date );
+void hb_metadata_set_comment( hb_metadata_t *metadata, const char *comment );
+void hb_metadata_set_genre( hb_metadata_t *metadata, const char *genre );
+void hb_metadata_set_album( hb_metadata_t *metadata, const char *album );
+void hb_metadata_set_album_artist( hb_metadata_t *metadata, const char *album_artist );
+void hb_metadata_set_description( hb_metadata_t *metadata, const char *description );
+void hb_metadata_set_long_description( hb_metadata_t *metadata, const char *long_description );
+void hb_metadata_add_coverart( hb_metadata_t *metadata, const uint8_t *data, int size, int type );
+void hb_metadata_rem_coverart( hb_metadata_t *metadata, int ii );
+
+hb_chapter_t *hb_chapter_copy(const hb_chapter_t *src);
+hb_list_t *hb_chapter_list_copy(const hb_list_t *src);
+void hb_chapter_close(hb_chapter_t **chapter);
+void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
 
 struct hb_rate_s
 {
-    char * string;
-    int    rate;
+    const char *string;
+    int         rate;
+};
+
+struct hb_dither_s
+{
+    const char *description;
+    const char *short_name;
+    int         method;
 };
 
 struct hb_mixdown_s
 {
-    char * human_readable_name;
-    char * internal_name;
-    char * short_name;
-    int    amixdown;
+    const char *human_readable_name;
+    const char *internal_name;
+    const char *short_name;
+    int         amixdown;
 };
 
 struct hb_encoder_s
 {
-    char * human_readable_name; // note: used in presets
-    char * short_name;          // note: used in CLI
-    int    encoder;             // HB_*CODEC_* define
-    int    muxers;              // supported muxers
+    const char *human_readable_name; // note: used in presets
+    const char *short_name;          // note: used in CLI
+    int         encoder;             // HB_*CODEC_* define
+    int         muxers;              // supported muxers
 };
 
 struct hb_subtitle_config_s
@@ -167,6 +219,8 @@
 extern int          hb_audio_rates_default;
 extern hb_rate_t    hb_audio_bitrates[];
 extern int          hb_audio_bitrates_count;
+extern hb_dither_t  hb_audio_dithers[];
+extern int          hb_audio_dithers_count;
 extern hb_mixdown_t hb_audio_mixdowns[];
 extern int          hb_audio_mixdowns_count;
 extern hb_encoder_t hb_video_encoders[];
@@ -182,6 +236,8 @@
 int           hb_get_audio_rates_default();
 hb_rate_t*    hb_get_audio_bitrates();
 int           hb_get_audio_bitrates_count();
+hb_dither_t*  hb_get_audio_dithers();
+int           hb_get_audio_dithers_count();
 hb_mixdown_t* hb_get_audio_mixdowns();
 int           hb_get_audio_mixdowns_count();
 hb_encoder_t* hb_get_video_encoders();
@@ -189,23 +245,48 @@
 hb_encoder_t* hb_get_audio_encoders();
 int           hb_get_audio_encoders_count();
 
-int hb_mixdown_get_mixdown_from_short_name( const char * short_name );
-const char * hb_mixdown_get_short_name_from_mixdown( int amixdown );
-void hb_autopassthru_apply_settings( hb_job_t * job, hb_title_t * title );
-void hb_autopassthru_print_settings( hb_job_t * job );
-int hb_autopassthru_get_encoder( int in_codec, int copy_mask, int fallback, int muxer );
-int hb_get_best_mixdown( uint32_t codec, int layout, int mixdown );
-int hb_get_default_mixdown( uint32_t codec, int layout );
-int hb_find_closest_audio_bitrate(int bitrate);
+int         hb_audio_dither_get_default();
+int         hb_audio_dither_get_default_method();
+int         hb_audio_dither_is_supported(uint32_t codec);
+const char* hb_audio_dither_get_description(int method);
+
+int         hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout);
+int         hb_mixdown_has_codec_support(int mixdown, uint32_t codec);
+int         hb_mixdown_has_remix_support(int mixdown, uint64_t layout);
+int         hb_mixdown_get_discrete_channel_count(int amixdown);
+int         hb_mixdown_get_low_freq_channel_count(int amixdown);
+int         hb_mixdown_get_mixdown_from_short_name(const char *short_name);
+const char* hb_mixdown_get_short_name_from_mixdown(int amixdown);
+
+void hb_autopassthru_apply_settings(hb_job_t *job);
+void hb_autopassthru_print_settings(hb_job_t *job);
+int  hb_autopassthru_get_encoder(int in_codec, int copy_mask, int fallback, int muxer);
+
+int hb_get_default_audio_encoder(int muxer);
+
+int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown);
+int hb_get_default_mixdown(uint32_t codec, uint64_t layout);
+
+int hb_get_best_samplerate(uint32_t codec, int samplerate, int *sr_shift);
+
+int  hb_find_closest_audio_bitrate(int bitrate);
 void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high);
-int hb_get_best_audio_bitrate( uint32_t codec, int bitrate, int samplerate, int mixdown);
-int hb_get_default_audio_bitrate( uint32_t codec, int samplerate, int mixdown );
-void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
-float hb_get_best_audio_quality( uint32_t codec, float quality);
-float hb_get_default_audio_quality( uint32_t codec );
-void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
-float hb_get_best_audio_compression( uint32_t codec, float compression);
-float hb_get_default_audio_compression( uint32_t codec );
+int  hb_get_best_audio_bitrate(uint32_t codec, int bitrate, int samplerate, int mixdown);
+int  hb_get_default_audio_bitrate(uint32_t codec, int samplerate, int mixdown);
+
+void  hb_get_audio_quality_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
+float hb_get_best_audio_quality(uint32_t codec, float quality);
+float hb_get_default_audio_quality(uint32_t codec);
+
+void  hb_get_audio_compression_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
+float hb_get_best_audio_compression(uint32_t codec, float compression);
+float hb_get_default_audio_compression(uint32_t codec);
+
+struct hb_title_set_s
+{
+    hb_list_t   * list_title;
+    int           feature;    // Detected DVD feature title
+};
 
 /******************************************************************************
  * hb_job_t: settings to be filled by the UI
@@ -241,7 +322,7 @@
          maxHeight:           keep height below this */
     int             crop[4];
     int             deinterlace;
-    hb_list_t     * filters;
+    hb_list_t     * list_filter;
     int             width;
     int             height;
     int             keep_ratio;
@@ -264,22 +345,19 @@
 
     /* Video settings:
          vcodec:            output codec
-         vquality:          output quality (0.0..1.0)
-                            if < 0.0 or > 1.0, bitrate is used instead,
-                            except with x264, to use its real QP/RF scale
-         vbitrate:          output bitrate (kbps)
+         vquality:          output quality (if < 0.0, bitrate is used instead)
+         vbitrate:          output bitrate (Kbps)
          vrate, vrate_base: output framerate is vrate / vrate_base
          cfr:               0 (vfr), 1 (cfr), 2 (pfr) [see render.c]
          pass:              0, 1 or 2 (or -1 for scan)
          advanced_opts:     string of extra advanced encoder options
          areBframes:        boolean to note if b-frames are included in advanced_opts */
-#define HB_VCODEC_MASK   0x0000FF
-#define HB_VCODEC_X264   0x000001
-#define HB_VCODEC_THEORA 0x000002
-#define HB_VCODEC_FFMPEG_MPEG4 0x000010
-#define HB_VCODEC_FFMPEG       HB_VCODEC_FFMPEG_MPEG4
-#define HB_VCODEC_FFMPEG_MPEG2 0x000020
-#define HB_VCODEC_FFMPEG_MASK  0x0000F0
+#define HB_VCODEC_MASK         0x00000FF
+#define HB_VCODEC_X264         0x0000001
+#define HB_VCODEC_THEORA       0x0000002
+#define HB_VCODEC_FFMPEG_MPEG4 0x0000010
+#define HB_VCODEC_FFMPEG_MPEG2 0x0000020
+#define HB_VCODEC_FFMPEG_MASK  0x00000F0
 
     int             vcodec;
     float           vquality;
@@ -290,15 +368,35 @@
     int             vrate_base;
     int             cfr;
     int             pass;
-    char            *advanced_opts;
-    char            *x264_profile;
+    int             fastfirstpass;
     char            *x264_preset;
     char            *x264_tune;
+    char            *advanced_opts;
+    char            *h264_profile;
+    char            *h264_level;
     int             areBframes;
+
     int             color_matrix_code;
     int             color_prim;
     int             color_transfer;
     int             color_matrix;
+// see https://developer.apple.com/quicktime/icefloe/dispatch019.html#colr
+#define HB_COLR_PRI_BT709     1
+#define HB_COLR_PRI_UNDEF     2
+#define HB_COLR_PRI_EBUTECH   5 // use for bt470bg
+#define HB_COLR_PRI_SMPTEC    6 // smpte170m; also use for bt470m and smpte240m
+// 0, 3-4, 7-65535: reserved
+#define HB_COLR_TRA_BT709     1 // also use for bt470m, bt470bg and smpte170m
+#define HB_COLR_TRA_UNDEF     2
+#define HB_COLR_TRA_SMPTE240M 7
+// 0, 3-6, 8-65535: reserved
+#define HB_COLR_MAT_BT709     1
+#define HB_COLR_MAT_UNDEF     2
+#define HB_COLR_MAT_SMPTE170M 6 // also use for fcc and bt470bg
+#define HB_COLR_MAT_SMPTE240M 7
+// 0, 3-5, 8-65535: reserved
+
+    hb_list_t     * list_chapter;
 
     /* List of audio settings. */
     hb_list_t     * list_audio;
@@ -308,6 +406,10 @@
     /* Subtitles */
     hb_list_t     * list_subtitle;
 
+    hb_list_t     * list_attachment;
+
+    hb_metadata_t * metadata;
+
     /* Muxer settings
          mux:  output file format
          file: file path */
@@ -316,7 +418,7 @@
 #define HB_MUX_MKV  0x200000
 
     int             mux;
-    const char          * file;
+    char          * file;
 
     /* Allow MP4 files > 4 gigs */
     int             largeFileSize;
@@ -366,7 +468,7 @@
 
 /* Audio starts here */
 /* Audio Codecs */
-#define HB_ACODEC_MASK      0x001FFF00
+#define HB_ACODEC_MASK      0x00FFFF00
 #define HB_ACODEC_FAAC      0x00000100
 #define HB_ACODEC_LAME      0x00000200
 #define HB_ACODEC_VORBIS    0x00000400
@@ -380,7 +482,10 @@
 #define HB_ACODEC_DCA_HD    0x00040000
 #define HB_ACODEC_MP3       0x00080000
 #define HB_ACODEC_FFFLAC    0x00100000
-#define HB_ACODEC_FF_MASK   0x001f0000
+#define HB_ACODEC_FFFLAC24  0x00200000
+#define HB_ACODEC_FDK_AAC   0x00400000
+#define HB_ACODEC_FDK_HAAC  0x00800000
+#define HB_ACODEC_FF_MASK   0x00FF2000
 #define HB_ACODEC_PASS_FLAG 0x40000000
 #define HB_ACODEC_PASS_MASK (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA)
 #define HB_ACODEC_AUTO_PASS (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG)
@@ -396,66 +501,6 @@
 #define HB_SUBSTREAM_BD_DTSHD   0x72
 #define HB_SUBSTREAM_BD_DTS     0x71
 
-/* Audio Mixdown */
-/* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */
-#define HB_AMIXDOWN_DCA_FORMAT_MASK             0x00FFF000
-#define HB_AMIXDOWN_A52_FORMAT_MASK             0x00000FF0
-#define HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK 0x0000000F
-/* define the HB_AMIXDOWN_XXXX values */
-#define HB_AMIXDOWN_NONE                        0x00000000
-#define HB_AMIXDOWN_MONO                        0x01000011
-// DCA_FORMAT of DCA_MONO                  = 0    = 0x000
-// A52_FORMAT of A52_MONO                  = 1    = 0x01
-// discrete channel count of 1
-#define HB_AMIXDOWN_STEREO                      0x02002022
-// DCA_FORMAT of DCA_STEREO                = 2    = 0x002
-// A52_FORMAT of A52_STEREO                = 2    = 0x02
-// discrete channel count of 2
-#define HB_AMIXDOWN_DOLBY                       0x042070A2
-// DCA_FORMAT of DCA_3F1R | DCA_OUT_DPLI   = 519  = 0x207
-// A52_FORMAT of A52_DOLBY                 = 10   = 0x0A
-// discrete channel count of 2
-#define HB_AMIXDOWN_DOLBYPLII                   0x084094A2
-// DCA_FORMAT of DCA_3F2R | DCA_OUT_DPLII  = 1033 = 0x409
-// A52_FORMAT of A52_DOLBY | A52_USE_DPLII = 74   = 0x4A
-// discrete channel count of 2
-#define HB_AMIXDOWN_6CH                         0x10089176
-// DCA_FORMAT of DCA_3F2R | DCA_LFE        = 137  = 0x089
-// A52_FORMAT of A52_3F2R | A52_LFE        = 23   = 0x17
-// discrete channel count of 6
-/* define some macros to extract the various information from the HB_AMIXDOWN_XXXX values */
-#define HB_AMIXDOWN_GET_DCA_FORMAT( a ) ( ( a & HB_AMIXDOWN_DCA_FORMAT_MASK ) >> 12 )
-#define HB_AMIXDOWN_GET_A52_FORMAT( a ) ( ( a & HB_AMIXDOWN_A52_FORMAT_MASK ) >> 4 )
-#define HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT( a ) ( ( a & HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK ) )
-
-/* Input Channel Layout */
-/* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */
-#define HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK  0x00F0000
-#define HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK   0x000F000
-#define HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK    0x0000F00
-#define HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK 0xFFFF0FF
-#define HB_INPUT_CH_LAYOUT_ENCODED_FRONT_MASK   0x00000F0
-#define HB_INPUT_CH_LAYOUT_ENCODED_REAR_MASK    0x000000F
-/* define the input channel layouts used to describe the channel layout of this audio */
-#define HB_INPUT_CH_LAYOUT_MONO    0x0110010
-#define HB_INPUT_CH_LAYOUT_STEREO  0x0220020
-#define HB_INPUT_CH_LAYOUT_DOLBY   0x0320031
-#define HB_INPUT_CH_LAYOUT_3F      0x0430030
-#define HB_INPUT_CH_LAYOUT_2F1R    0x0521021
-#define HB_INPUT_CH_LAYOUT_3F1R    0x0631031
-#define HB_INPUT_CH_LAYOUT_2F2R    0x0722022
-#define HB_INPUT_CH_LAYOUT_3F2R    0x0832032
-#define HB_INPUT_CH_LAYOUT_4F2R    0x0942042
-#define HB_INPUT_CH_LAYOUT_3F4R    0x0a34034
-#define HB_INPUT_CH_LAYOUT_HAS_LFE 0x0000100
-/* define some macros to extract the various information from the HB_AMIXDOWN_XXXX values */
-#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK ) >> 16 )
-#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_REAR_COUNT( a )  ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK ) >> 12 )
-#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_LFE_COUNT( a )   ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK ) >> 8 )
-#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( a ) ( ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK ) >> 16 ) + ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK ) >> 12 ) + ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK ) >> 8 ) )
-#define HB_INPUT_CH_LAYOUT_GET_ENCODED_FRONT_COUNT( a )   ( ( a & HB_INPUT_CH_LAYOUT_ENCODED_FRONT_MASK ) >> 4 )
-#define HB_INPUT_CH_LAYOUT_GET_ENCODED_REAR_COUNT( a )   ( ( a & HB_INPUT_CH_LAYOUT_ENCODED_REAR_MASK ) )
-
 /* define an invalid VBR quality compatible with all VBR-capable codecs */
 #define HB_INVALID_AUDIO_QUALITY (-3.)
 
@@ -464,55 +509,61 @@
     /* Output */
     struct
     {
-            int track;      /* Output track number */
-            uint32_t codec;  /* Output audio codec.
-                                 * HB_ACODEC_AC3 means pass-through, then bitrate and samplerate
-                                 * are ignored.
-                                 */
-            int samplerate;         /* Output sample rate (Hz) */
-            int samples_per_frame;  /* Number of samples per frame */
-            int bitrate;            /* Output bitrate (kbps) */
-            float quality;          /* Output quality */
-            float compression_level;  /* Output compression level */
-            int mixdown;            /* The mixdown format to be used for this audio track (see HB_AMIXDOWN_*) */
-            double dynamic_range_compression; /* Amount of DRC that gets applied to this track */
-            double gain;    /* Gain in dB. negative is quieter */
-            char * name;    /* Output track name */
+        enum
+        {
+            // make sure audio->config.out.mixdown isn't treated as unsigned
+            HB_INVALID_AMIXDOWN = -1,
+            HB_AMIXDOWN_NONE = 0,
+            HB_AMIXDOWN_MONO,
+            HB_AMIXDOWN_LEFT,
+            HB_AMIXDOWN_RIGHT,
+            HB_AMIXDOWN_STEREO,
+            HB_AMIXDOWN_DOLBY,
+            HB_AMIXDOWN_DOLBYPLII,
+            HB_AMIXDOWN_5POINT1,
+            HB_AMIXDOWN_6POINT1,
+            HB_AMIXDOWN_7POINT1,
+            HB_AMIXDOWN_5_2_LFE,
+        } mixdown; /* Audio mixdown */
+        int      track; /* Output track number */
+        uint32_t codec; /* Output audio codec */
+        int      samplerate; /* Output sample rate (Hz) */
+        int      samples_per_frame; /* Number of samples per frame */
+        int      bitrate; /* Output bitrate (Kbps) */
+        float    quality; /* Output quality (encoder-specific) */
+        float    compression_level;  /* Output compression level (encoder-specific) */
+        double   dynamic_range_compression; /* Amount of DRC applied to this track */
+        double   gain; /* Gain (in dB), negative is quieter */
+        int      normalize_mix_level; /* mix level normalization (boolean) */
+        int      dither_method; /* dither algorithm */
+        char *   name; /* Output track name */
     } out;
 
     /* Input */
     struct
     {
-        int track;                /* Input track number */
-        PRIVATE uint32_t codec;   /* Input audio codec */
-        PRIVATE uint32_t reg_desc; /* registration descriptor of source */
-        PRIVATE uint32_t stream_type; /* stream type from source stream */
-        PRIVATE uint32_t substream_type; /* substream for multiplexed streams */
-        PRIVATE uint32_t codec_param; /* per-codec config info */
+        int track; /* Input track number */
+        PRIVATE uint32_t codec; /* Input audio codec */
+        PRIVATE uint32_t codec_param; /* Per-codec config info */
+        PRIVATE uint32_t reg_desc; /* Registration descriptor of source */
+        PRIVATE uint32_t stream_type; /* Stream type from source stream */
+        PRIVATE uint32_t substream_type; /* Substream type for multiplexed streams */
         PRIVATE uint32_t version; /* Bitsream version */
-        PRIVATE uint32_t mode;    /* Bitstream mode, codec dependent encoding */
+        PRIVATE uint32_t flags; /* Bitstream flags, codec-specific */
+        PRIVATE uint32_t mode; /* Bitstream mode, codec-specific */
         PRIVATE int samplerate; /* Input sample rate (Hz) */
         PRIVATE int samples_per_frame; /* Number of samples per frame */
-        PRIVATE int bitrate;    /* Input bitrate (kbps) */
-        PRIVATE int channel_layout; /* channel_layout is the channel layout of this audio this is used to
-                                     * provide a common way of describing the source audio */
-        PRIVATE hb_chan_map_t * channel_map; /* source channel map, set by the audio decoder */
+        PRIVATE int bitrate; /* Input bitrate (bps) */
+        PRIVATE uint64_t channel_layout; /* Source channel layout, set by the audio decoder */
+        PRIVATE hb_chan_map_t * channel_map; /* Source channel map, set by the audio decoder */
     } in;
 
-    /* Misc. */
-    union
-    {
-        PRIVATE int ac3;    /* flags.ac3 is only set when the source audio format is HB_ACODEC_AC3 */
-        PRIVATE int dca;    /* flags.dca is only set when the source audio format is HB_ACODEC_DCA */
-    } flags;
-#define AUDIO_F_DOLBY (1 << 31)  /* set if source uses Dolby Surround */
-
     struct
     {
         PRIVATE char description[1024];
         PRIVATE char simple[1024];
         PRIVATE char iso639_2[4];
-        PRIVATE uint8_t type; /* normal, visually impared, directors */
+        PRIVATE uint8_t type; /* normal, visually impaired, director's commentary */
     } lang;
 };
 
@@ -556,7 +607,7 @@
     uint64_t duration;
 
     /* Optional chapter title */
-    char     title[1024];
+    char     *title;
 };
 
 /*
@@ -591,11 +642,12 @@
 {
     int  id;
     int  track;
+    int  out_track;
 
     hb_subtitle_config_t config;
 
     enum subtype { PICTURESUB, TEXTSUB } format;
-    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB, SSASUB } source;
+    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB, SSASUB, PGSSUB } source;
     char lang[1024];
     char iso639_2[4];
     uint8_t type; /* Closed Caption, Childrens, Directors etc */
@@ -603,6 +655,7 @@
     // Color lookup table for VOB subtitle tracks. Each entry is in YCbCr format.
     // Must be filled out by the demuxer for VOB subtitle tracks.
     uint32_t    palette[16];
+    uint8_t     palette_set;
     int         width;
     int         height;
     
@@ -615,6 +668,11 @@
 
 #ifdef __LIBHB__
     /* Internal data */
+    PRIVATE uint32_t codec;         /* Input "codec" */
+    PRIVATE uint32_t reg_desc;      /* registration descriptor of source */
+    PRIVATE uint32_t stream_type;   /* stream type from source stream */
+    PRIVATE uint32_t substream_type;/* substream for multiplexed streams */
+
     hb_fifo_t * fifo_in;  /* SPU ES */
     hb_fifo_t * fifo_raw; /* Decoded SPU */
     hb_fifo_t * fifo_sync;/* Synced */
@@ -630,23 +688,38 @@
  */
 struct hb_attachment_s
 {
-    enum attachtype { FONT_TTF_ATTACH } type;
+    enum attachtype { FONT_TTF_ATTACH, HB_ART_ATTACH } type;
     char *  name;
     char *  data;
     int     size;
 };
 
+struct hb_coverart_s
+{
+    uint8_t *data;
+    uint32_t size;
+    enum arttype {
+        HB_ART_UNDEFINED,
+        HB_ART_BMP,
+        HB_ART_GIF,
+        HB_ART_PNG,
+        HB_ART_JPEG
+    } type;
+};
+
 struct hb_metadata_s 
 {
-    char  name[255];
-    char  artist[255];
-    char  composer[255];
-    char  release_date[255];
-    char  comment[1024];
-    char  album[255];
-    char  genre[255];
-    uint32_t coverart_size;
-    uint8_t *coverart;
+    char  *name;
+    char  *artist;          // Actors
+    char  *composer;
+    char  *release_date;
+    char  *comment;
+    char  *album;           // DVD
+    char  *album_artist;    // Director
+    char  *genre;
+    char  *description;
+    char  *long_description;
+    hb_list_t * list_coverart;
 };
 
 struct hb_title_s
@@ -682,6 +755,9 @@
     int         height;
     int         pixel_aspect_width;
     int         pixel_aspect_height;
+    int         color_prim;
+    int         color_transfer;
+    int         color_matrix;
     int         rate;
     int         rate_base;
     int         crop[4];
@@ -694,7 +770,7 @@
     int         video_codec_param;      /* codec specific config */
     char        *video_codec_name;
     int         video_bitrate;
-    const char  *container_name;
+    char        *container_name;
     int         data_rate;
 
     hb_metadata_t *metadata;
@@ -704,12 +780,15 @@
     hb_list_t * list_subtitle;
     hb_list_t * list_attachment;
 
-    /* Job template for this title */
+#define HB_TITLE_JOBS
+#if defined(HB_TITLE_JOBS)
     hb_job_t  * job;
+#endif
 
     uint32_t    flags;
                 // set if video stream doesn't have IDR frames
 #define         HBTF_NO_IDR (1 << 0)
+#define         HBTF_SCAN_COMPLETE (1 << 0)
 };
 
 
@@ -730,6 +809,9 @@
         struct
         {
             /* HB_STATE_SCANNING */
+            float progress;
+            int preview_cur;
+            int preview_count;
             int title_cur;
             int title_count;
         } scanning;
@@ -767,24 +849,30 @@
 
 typedef struct hb_work_info_s
 {
-    const char *name;
-    int     profile;
-    int     level;
-    int     bitrate;
-    int     rate;
-    int     rate_base;
-    int     flags;
-    int     version;
-    int     mode;
-    union {
-        struct {    // info only valid for video decoders
-            int     width;
-            int     height;
-            int     pixel_aspect_width;
-            int     pixel_aspect_height;
+    const char * name;
+    int          profile;
+    int          level;
+    int          bitrate;
+    int          rate;
+    int          rate_base;
+    uint32_t     version;
+    uint32_t     flags;
+    uint32_t     mode;
+    union
+    {
+        struct
+        {    // info only valid for video decoders
+            int width;
+            int height;
+            int pixel_aspect_width;
+            int pixel_aspect_height;
+            int color_prim;
+            int color_transfer;
+            int color_matrix;
         };
-        struct {    // info only valid for audio decoders
-            int     channel_layout;
+        struct
+        {    // info only valid for audio decoders
+            uint64_t channel_layout;
             hb_chan_map_t * channel_map;
             int samples_per_frame;
         };
@@ -848,7 +936,7 @@
 extern hb_work_object_t hb_decutf8sub;
 extern hb_work_object_t hb_dectx3gsub;
 extern hb_work_object_t hb_decssasub;
-extern hb_work_object_t hb_render;
+extern hb_work_object_t hb_decpgssub;
 extern hb_work_object_t hb_encavcodec;
 extern hb_work_object_t hb_encx264;
 extern hb_work_object_t hb_enctheora;
@@ -866,43 +954,89 @@
 extern hb_work_object_t hb_encavcodeca;
 extern hb_work_object_t hb_reader;
 
-#define FILTER_OK      0
-#define FILTER_DELAY   1
-#define FILTER_FAILED  2
-#define FILTER_DROP    3
+#define HB_FILTER_OK      0
+#define HB_FILTER_DELAY   1
+#define HB_FILTER_FAILED  2
+#define HB_FILTER_DROP    3
+#define HB_FILTER_DONE    4
+
+typedef struct hb_filter_init_s
+{
+    hb_job_t    * job;
+    int           pix_fmt;
+    int           width;
+    int           height;
+    int           par_width;
+    int           par_height;
+    int           crop[4];
+    int           vrate_base;
+    int           vrate;
+    int           pfr_vrate_base;
+    int           pfr_vrate;
+    int           cfr;
+} hb_filter_init_t;
+
+typedef struct hb_filter_info_s
+{
+    char               human_readable_desc[128];
+    hb_filter_init_t   out;
+} hb_filter_info_t;
 
 struct hb_filter_object_s
 {
     int                     id;
+    int                     enforce_order;
     char                  * name;
     char                  * settings;
 
 #ifdef __LIBHB__
-    hb_filter_private_t* (* init)  ( int, int, int, char * );
+    int         (* init)  ( hb_filter_object_t *, hb_filter_init_t * );
+
+    int         (* work)  ( hb_filter_object_t *,
+                            hb_buffer_t **, hb_buffer_t ** );
 
-    int                  (* work)  ( const hb_buffer_t *, hb_buffer_t **,
-                                     int, int, int, hb_filter_private_t * );
+    void        (* close) ( hb_filter_object_t * );
+    int         (* info)  ( hb_filter_object_t *, hb_filter_info_t * );
 
-    void                 (* close) ( hb_filter_private_t * );
+    hb_fifo_t   * fifo_in;
+    hb_fifo_t   * fifo_out;
+
+    hb_subtitle_t     * subtitle;
 
-    hb_filter_private_t   * private_data;
-    //hb_buffer_t           * buffer;
+    hb_filter_private_t * private_data;
+
+    hb_thread_t       * thread;
+    volatile int      * done;
+    int                 status;
+
+    // Filters can drop frames and thus chapter marks
+    // These are used to bridge the chapter to the next buffer
+    int                 chapter_val;
+    int64_t             chapter_time;
 #endif
 };
 
-#define HB_FILTER_DETELECINE    1
-#define HB_FILTER_DEINTERLACE   2
-#define HB_FILTER_DEBLOCK       3
-#define HB_FILTER_DENOISE       4
-#define HB_FILTER_DECOMB        5
-#define HB_FILTER_ROTATE        6
+enum
+{
+    // First, filters that may change the framerate (drop or dup frames)
+    HB_FILTER_DETELECINE = 1,
+    HB_FILTER_DECOMB,
+    HB_FILTER_DEINTERLACE,
+    HB_FILTER_VFR,
+    // Filters that must operate on the original source image are next
+    HB_FILTER_DEBLOCK,
+    HB_FILTER_DENOISE,
+    HB_FILTER_RENDER_SUB,
+    HB_FILTER_CROP_SCALE,
+    // Finally filters that don't care what order they are in,
+    // except that they must be after the above filters
+    HB_FILTER_ROTATE,
+};
 
-extern hb_filter_object_t hb_filter_detelecine;
-extern hb_filter_object_t hb_filter_deinterlace;
-extern hb_filter_object_t hb_filter_deblock;
-extern hb_filter_object_t hb_filter_denoise;
-extern hb_filter_object_t hb_filter_decomb;
-extern hb_filter_object_t hb_filter_rotate;
+hb_filter_object_t * hb_filter_init( int filter_id );
+hb_filter_object_t * hb_filter_copy( hb_filter_object_t * filter );
+hb_list_t *hb_filter_list_copy(const hb_list_t *src);
+void hb_filter_close( hb_filter_object_t ** );
 
 typedef void hb_error_handler_t( const char *errmsg );
 
@@ -916,9 +1050,18 @@
 
 const char * hb_subsource_name( int source );
 
-// x264 preset/tune/profile helpers
+// unparse a set of x264 settings to an HB encopts string
+char * hb_x264_param_unparse(const char *x264_preset,  const char *x264_tune,
+                             const char *x264_encopts, const char *h264_profile,
+                             const char *h264_level, int width, int height);
+
+// x264 preset/tune & h264 profile/level helpers
 const char * const * hb_x264_presets();
 const char * const * hb_x264_tunes();
-const char * const * hb_x264_profiles();
+const char * const * hb_h264_profiles();
+const char * const * hb_h264_levels();
+
+// x264 option name/synonym helper
+const char * hb_x264_encopt_name( const char * name );
 
 #endif

HandBrake-0.9.9.tar.bz2/libhb/cropscale.c Added

@@ -0,0 +1,212 @@
+/* cropscale.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+   
+#include "hb.h"
+#include "hbffmpeg.h"
+
+struct hb_filter_private_s
+{
+    int                 width_in;
+    int                 height_in;
+    int                 pix_fmt;
+    int                 pix_fmt_out;
+    int                 width_out;
+    int                 height_out;
+    int                 crop[4];
+    struct SwsContext * context;
+};
+
+static int hb_crop_scale_init( hb_filter_object_t * filter,
+                               hb_filter_init_t * init );
+
+static int hb_crop_scale_work( hb_filter_object_t * filter,
+                               hb_buffer_t ** buf_in,
+                               hb_buffer_t ** buf_out );
+
+static int hb_crop_scale_info( hb_filter_object_t * filter,
+                               hb_filter_info_t * info );
+
+static void hb_crop_scale_close( hb_filter_object_t * filter );
+
+hb_filter_object_t hb_filter_crop_scale =
+{
+    .id            = HB_FILTER_CROP_SCALE,
+    .enforce_order = 1,
+    .name          = "Crop and Scale",
+    .settings      = NULL,
+    .init          = hb_crop_scale_init,
+    .work          = hb_crop_scale_work,
+    .close         = hb_crop_scale_close,
+    .info          = hb_crop_scale_info,
+};
+
+static int hb_crop_scale_init( hb_filter_object_t * filter,
+                               hb_filter_init_t * init )
+{
+    filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+    hb_filter_private_t * pv = filter->private_data;
+
+    // TODO: add pix format option to settings
+    pv->pix_fmt_out = init->pix_fmt;
+    pv->width_in = init->width;
+    pv->height_in = init->height;
+    pv->width_out = init->width;
+    pv->height_out = init->height;
+    memcpy( pv->crop, init->crop, sizeof( int[4] ) );
+    if( filter->settings )
+    {
+        sscanf( filter->settings, "%d:%d:%d:%d:%d:%d",
+                &pv->width_out, &pv->height_out,
+                &pv->crop[0], &pv->crop[1], &pv->crop[2], &pv->crop[3] );
+    }
+    // Set init values so the next stage in the pipline
+    // knows what it will be getting
+    init->pix_fmt = pv->pix_fmt;
+    init->width = pv->width_out;
+    init->height = pv->height_out;
+    memcpy( init->crop, pv->crop, sizeof( int[4] ) );
+
+    return 0;
+}
+
+static int hb_crop_scale_info( hb_filter_object_t * filter,
+                               hb_filter_info_t * info )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if( !pv )
+        return 0;
+
+    // Set init values so the next stage in the pipline
+    // knows what it will be getting
+    memset( info, 0, sizeof( hb_filter_info_t ) );
+    info->out.pix_fmt = pv->pix_fmt;
+    info->out.width = pv->width_out;
+    info->out.height = pv->height_out;
+    memcpy( info->out.crop, pv->crop, sizeof( int[4] ) );
+
+    int cropped_width = pv->width_in - ( pv->crop[2] + pv->crop[3] );
+    int cropped_height = pv->height_in - ( pv->crop[0] + pv->crop[1] );
+
+    sprintf( info->human_readable_desc, 
+        "source: %d * %d, crop (%d/%d/%d/%d): %d * %d, scale: %d * %d",
+        pv->width_in, pv->height_in,
+        pv->crop[0], pv->crop[1], pv->crop[2], pv->crop[3],
+        cropped_width, cropped_height, pv->width_out, pv->height_out );
+
+    return 0;
+}
+
+static void hb_crop_scale_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if ( !pv )
+    {
+        return;
+    }
+
+    if ( pv->context )
+    {
+        sws_freeContext( pv->context );
+    }
+
+    free( pv );
+    filter->private_data = NULL;
+}
+
+static hb_buffer_t* crop_scale( hb_filter_private_t * pv, hb_buffer_t * in )
+{
+    AVPicture           pic_in;
+    AVPicture           pic_out;
+    AVPicture           pic_crop;
+    hb_buffer_t * out;
+    out = hb_video_buffer_init( pv->width_out, pv->height_out );
+
+    hb_avpicture_fill( &pic_in, in );
+    hb_avpicture_fill( &pic_out, out );
+
+    // Crop; this alters the pointer to the data to point to the
+    // correct place for cropped frame
+    av_picture_crop( &pic_crop, &pic_in, in->f.fmt,
+                     pv->crop[0], pv->crop[2] );
+
+    if ( !pv->context ||
+         pv->width_in   != in->f.width  ||
+         pv->height_in  != in->f.height ||
+         pv->pix_fmt != in->f.fmt )
+    {
+        // Something changed, need a new scaling context.
+        if( pv->context )
+            sws_freeContext( pv->context );
+
+        pv->context = hb_sws_get_context(
+                                in->f.width  - (pv->crop[2] + pv->crop[3]),
+                                in->f.height - (pv->crop[0] + pv->crop[1]),
+                                in->f.fmt,
+                                out->f.width, out->f.height, out->f.fmt,
+                                SWS_LANCZOS | SWS_ACCURATE_RND );
+        pv->width_in = in->f.width;
+        pv->height_in = in->f.height;
+        pv->pix_fmt = in->f.fmt;
+    }
+
+    // Scale pic_crop into pic_render according to the
+    // context set up above
+    sws_scale(pv->context,
+              (const uint8_t* const*)pic_crop.data,
+              pic_crop.linesize,
+              0, in->f.height - (pv->crop[0] + pv->crop[1]),
+              pic_out.data,  pic_out.linesize);
+
+    out->s = in->s;
+    hb_buffer_move_subs( out, in );
+    return out;
+}
+
+static int hb_crop_scale_work( hb_filter_object_t * filter,
+                               hb_buffer_t ** buf_in,
+                               hb_buffer_t ** buf_out )
+{
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+
+    if ( in->size <= 0 )
+    {
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
+    }
+
+    if ( !pv )
+    {
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_OK;
+    }
+
+    // If width or height were not set, set them now based on the
+    // input width & height
+    if ( pv->width_out <= 0 || pv->height_out <= 0 )
+    {
+        pv->width_out = in->f.width - (pv->crop[2] + pv->crop[3]);
+        pv->height_out = in->f.height - (pv->crop[0] + pv->crop[1]);
+    }
+    if ( in->f.fmt == pv->pix_fmt_out &&
+         !pv->crop[0] && !pv->crop[1] && !pv->crop[2] && !pv->crop[3] &&
+         in->f.width == pv->width_out && in->f.height == pv->height_out )
+    {
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_OK;
+    }
+    *buf_out = crop_scale( pv, in );
+
+    return HB_FILTER_OK;
+}

HandBrake-0.9.8.tar.bz2/libhb/deblock.c -> HandBrake-0.9.9.tar.bz2/libhb/deblock.c Changed

@@ -43,43 +43,31 @@
 
 struct hb_filter_private_s
 {
-    int           pix_fmt;
-    int           width[3];
-    int           height[3];
-
     int           pp7_qp;
     int           pp7_mode;
     int           pp7_mpeg2;
     int           pp7_temp_stride;
     uint8_t     * pp7_src;
-
-    AVPicture     pic_in;
-    AVPicture     pic_out;
-    hb_buffer_t * buf_out;
 };
 
-hb_filter_private_t * hb_deblock_init( int pix_fmt,
-                                       int width,
-                                       int height,
-                                       char * settings );
+static int hb_deblock_init( hb_filter_object_t * filter,
+                            hb_filter_init_t * init );
 
-int hb_deblock_work( const hb_buffer_t * buf_in,
-                     hb_buffer_t ** buf_out,
-                     int pix_fmt,
-                     int width,
-                     int height,
-                     hb_filter_private_t * pv );
+static int hb_deblock_work( hb_filter_object_t * filter,
+                            hb_buffer_t ** buf_in,
+                            hb_buffer_t ** buf_out );
 
-void hb_deblock_close( hb_filter_private_t * pv );
+static void hb_deblock_close( hb_filter_object_t * filter );
 
 hb_filter_object_t hb_filter_deblock =
 {
-    FILTER_DEBLOCK,
-    "Deblock (pp7)",
-    NULL,
-    hb_deblock_init,
-    hb_deblock_work,
-    hb_deblock_close,
+    .id            = HB_FILTER_DEBLOCK,
+    .enforce_order = 1,
+    .name          = "Deblock (pp7)",
+    .settings      = NULL,
+    .init          = hb_deblock_init,
+    .work          = hb_deblock_work,
+    .close         = hb_deblock_close,
 };
 
 static inline void pp7_dct_a( DCTELEM * dst, uint8_t * src, int stride )
@@ -349,34 +337,19 @@
     }
 }
 
-hb_filter_private_t * hb_deblock_init( int pix_fmt,
-                                       int width,
-                                       int height,
-                                       char * settings )
+static int hb_deblock_init( hb_filter_object_t * filter, 
+                            hb_filter_init_t * init )
 {
-    if( pix_fmt != PIX_FMT_YUV420P )
-    {
-        return 0;
-    }
-
-    hb_filter_private_t * pv = malloc( sizeof(struct hb_filter_private_s) );
-
-    pv->pix_fmt = pix_fmt;
-
-    pv->width[0] = width;
-    pv->height[0] = height;
-
-    pv->width[1] = pv->width[2] = width >> 1;
-    pv->height[1] = pv->height[2] = height >> 1;
-
+    filter->private_data = calloc( sizeof(struct hb_filter_private_s), 1 );
+    hb_filter_private_t * pv = filter->private_data;
 
     pv->pp7_qp    = PP7_QP_DEFAULT;
     pv->pp7_mode  = PP7_MODE_DEFAULT;
     pv->pp7_mpeg2 = 1; /*mpi->qscale_type;*/
 
-    if( settings )
+    if( filter->settings )
     {
-        sscanf( settings, "%d:%d", &pv->pp7_qp, &pv->pp7_mode );
+        sscanf( filter->settings, "%d:%d", &pv->pp7_qp, &pv->pp7_mode );
     }
 
     if( pv->pp7_qp < 0 )
@@ -399,92 +372,83 @@
             break;
     }
 
-    int h = (height+16+15)&(~15);
+    int h = (init->height+16+15)&(~15);
 
-    pv->pp7_temp_stride = (width+16+15)&(~15);
+    pv->pp7_temp_stride = (init->width+16+15)&(~15);
 
     pv->pp7_src = (uint8_t*)malloc( pv->pp7_temp_stride*(h+8)*sizeof(uint8_t) );
 
-    pv->buf_out = hb_video_buffer_init( width, height );
-
-    return pv;
+    return 0;
 }
 
-void hb_deblock_close( hb_filter_private_t * pv )
+static void hb_deblock_close( hb_filter_object_t * filter )
 {
+    hb_filter_private_t * pv = filter->private_data;
+
     if( !pv )
     {
         return;
     }
 
-    if( pv->buf_out )
-    {
-        hb_buffer_close( &pv->buf_out );
-    }
-
     free( pv );
+    filter->private_data = NULL;
 }
 
-int hb_deblock_work( const hb_buffer_t * buf_in,
-                     hb_buffer_t ** buf_out,
-                     int pix_fmt,
-                     int width,
-                     int height,
-                     hb_filter_private_t * pv )
+static int hb_deblock_work( hb_filter_object_t * filter,
+                            hb_buffer_t ** buf_in,
+                            hb_buffer_t ** buf_out )
 {
-    if( !pv ||
-        pix_fmt != pv->pix_fmt ||
-        width != pv->width[0] ||
-        height != pv->height[0] )
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in, * out;
+
+    if ( in->size <= 0 )
     {
-        return FILTER_FAILED;
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
     }
 
-    avpicture_fill( &pv->pic_in, buf_in->data,
-                    pix_fmt, width, height );
-
-    avpicture_fill( &pv->pic_out, pv->buf_out->data,
-                    pix_fmt, width, height );
-
     if( /*TODO: mpi->qscale ||*/ pv->pp7_qp )
     {
+        out = hb_video_buffer_init( in->f.width, in->f.height );
+
         pp7_filter( pv,
-                pv->pic_out.data[0],
-                pv->pic_in.data[0],
-                pv->width[0],
-                pv->height[0],
+                out->plane[0].data,
+                in->plane[0].data,
+                in->plane[0].stride,
+                in->plane[0].height,
                 NULL, /* TODO: mpi->qscale*/
                 0,    /* TODO: mpi->qstride*/
                 1 );
 
         pp7_filter( pv,
-                pv->pic_out.data[1],
-                pv->pic_in.data[1],
-                pv->width[1],
-                pv->height[1],
+                out->plane[1].data,
+                in->plane[1].data,
+                in->plane[1].stride,
+                in->plane[1].height,
                 NULL, /* TODO: mpi->qscale*/
                 0,    /* TODO: mpi->qstride*/
                 0 );
 
         pp7_filter( pv,
-                pv->pic_out.data[2],
-                pv->pic_in.data[2],
-                pv->width[2],
-                pv->height[2],
+                out->plane[2].data,
+                in->plane[2].data,
+                in->plane[2].stride,
+                in->plane[2].height,
                 NULL, /* TODO: mpi->qscale*/
                 0,    /* TODO: mpi->qstride*/
                 0 );
+
+        out->s = in->s;
+        hb_buffer_move_subs( out, in );
+
+        *buf_out = out;
     }
     else
     {
-        memcpy( pv->buf_out->data, buf_in->data, buf_in->size );
+        *buf_in = NULL;
+        *buf_out = in;
     }
 
-    hb_buffer_copy_settings( pv->buf_out, buf_in );
-
-    *buf_out = pv->buf_out;
-
-    return FILTER_OK;
+    return HB_FILTER_OK;
 }
-
-

HandBrake-0.9.8.tar.bz2/libhb/deca52.c -> HandBrake-0.9.9.tar.bz2/libhb/deca52.c Changed

@@ -1,11 +1,15 @@
-/* $Id: deca52.c,v 1.14 2005/03/03 17:21:57 titer Exp $
+/* deca52.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
-#include "downmix.h"
+#include "audio_remap.h"
+#include "audio_resample.h"
 
 #include "a52dec/a52.h"
 #include "libavutil/crc.h"
@@ -17,11 +21,9 @@
     /* liba52 handle */
     a52_state_t * state;
 
-    int           flags_in;
-    int           flags_out;
+    int           flags;
     int           rate;
     int           bitrate;
-    int           out_discrete_channels;
     int           error;
     int           frames;                   // number of good frames decoded
     int           crc_errors;               // number of frames with crc errors
@@ -33,6 +35,14 @@
     hb_list_t    *list;
     const AVCRC  *crc_table;
     uint8_t       frame[3840];
+    uint8_t       buf[6][6][256 * sizeof(float)]; // decoded frame (up to 6 channels, 6 blocks * 256 samples)
+    uint8_t      *samples[6];                     // pointers to the start of each plane (1 per channel)
+
+    int                 nchannels;
+    int                 use_mix_levels;
+    uint64_t            channel_layout;
+    hb_audio_remap_t    *remap;
+    hb_audio_resample_t *resample;
 };
 
 static int  deca52Init( hb_work_object_t *, hb_job_t * );
@@ -52,6 +62,33 @@
     deca52BSInfo
 };
 
+/* Translate acmod and lfeon on AV_CH_LAYOUT */
+static const uint64_t acmod2layout[] =
+{
+    AV_CH_LAYOUT_STEREO,         // A52_CHANNEL   (0)
+    AV_CH_LAYOUT_MONO,           // A52_MONO      (1)
+    AV_CH_LAYOUT_STEREO,         // A52_STEREO    (2)
+    AV_CH_LAYOUT_SURROUND,       // A52_3F        (3)
+    AV_CH_LAYOUT_2_1,            // A52_2F1R      (4)
+    AV_CH_LAYOUT_4POINT0,        // A52_3F1R      (5)
+    AV_CH_LAYOUT_2_2,            // A52_2F2R      (6)
+    AV_CH_LAYOUT_5POINT0,        // A52_3F2R      (7)
+    AV_CH_LAYOUT_MONO,           // A52_CHANNEL1  (8)
+    AV_CH_LAYOUT_MONO,           // A52_CHANNEL2  (9)
+    AV_CH_LAYOUT_STEREO_DOWNMIX, // A52_DOLBY    (10)
+    AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_STEREO,     // A52_CHANNEL_MASK (15)
+};
+
+static const uint64_t lfeon2layout[] =
+{
+    0,
+    AV_CH_LOW_FREQUENCY,
+};
+
 /***********************************************************************
  * Local prototypes
  **********************************************************************/
@@ -86,29 +123,69 @@
  ***********************************************************************
  * Allocate the work object, initialize liba52
  **********************************************************************/
-static int deca52Init( hb_work_object_t * w, hb_job_t * job )
+static int deca52Init(hb_work_object_t *w, hb_job_t *job)
 {
-    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
-    hb_audio_t * audio = w->audio;
+    hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+    hb_audio_t *audio = w->audio;
     w->private_data = pv;
 
-    pv->job   = job;
-
-    pv->crc_table = av_crc_get_table( AV_CRC_16_ANSI );
+    pv->job       = job;
+    pv->state     = a52_init(0);
     pv->list      = hb_list_init();
-    pv->state     = a52_init( 0 );
-
-    /* Decide what format we want out of a52dec
-    work.c has already done some of this deduction for us in do_job() */
+    pv->crc_table = av_crc_get_table(AV_CRC_16_ANSI);
 
-    pv->flags_out = HB_AMIXDOWN_GET_A52_FORMAT(audio->config.out.mixdown);
-
-    /* pass the number of channels used into the private work data */
-    /* will only be actually used if we're not doing AC3 passthru */
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
+    /*
+     * Decoding, remapping, downmixing
+     */
+    if (audio->config.out.codec != HB_ACODEC_AC3_PASS)
+    {
+        /*
+         * Output AV_SAMPLE_FMT_FLT samples
+         */
+        pv->resample =
+            hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
+                                   audio->config.out.mixdown,
+                                   audio->config.out.normalize_mix_level);
+        if (pv->resample == NULL)
+        {
+            hb_error("deca52Init: hb_audio_resample_init() failed");
+            return 1;
+        }
 
-    pv->level     = 1.0;
-    pv->dynamic_range_compression = audio->config.out.dynamic_range_compression;
+        /*
+         * Decode to AV_SAMPLE_FMT_FLTP
+         */
+        pv->level = 1.0;
+        pv->dynamic_range_compression =
+            audio->config.out.dynamic_range_compression;
+        hb_audio_resample_set_sample_fmt(pv->resample, AV_SAMPLE_FMT_FLTP);
+
+        /*
+         * liba52 doesn't provide Lt/Rt mix levels, only Lo/Ro.
+         *
+         * When doing an Lt/Rt downmix, ignore mix levels
+         * (this matches what liba52's own downmix code does).
+         */
+        pv->use_mix_levels =
+            !(audio->config.out.mixdown == HB_AMIXDOWN_DOLBY ||
+              audio->config.out.mixdown == HB_AMIXDOWN_DOLBYPLII);
+
+        /*
+         * Remap from liba52 to Libav channel order
+         */
+        pv->remap = hb_audio_remap_init(AV_SAMPLE_FMT_FLTP, &hb_libav_chan_map,
+                                        &hb_liba52_chan_map);
+        if (pv->remap == NULL)
+        {
+            hb_error("deca52Init: hb_audio_remap_init() failed");
+            return 1;
+        }
+    }
+    else
+    {
+        pv->remap    = NULL;
+        pv->resample = NULL;
+    }
 
     return 0;
 }
@@ -118,19 +195,22 @@
  ***********************************************************************
  * Free memory
  **********************************************************************/
-static void deca52Close( hb_work_object_t * w )
+static void deca52Close(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
+    hb_work_private_t *pv = w->private_data;
+    w->private_data = NULL;
 
-    if ( pv->crc_errors )
+    if (pv->crc_errors)
     {
-        hb_log( "deca52: %d frames decoded, %d crc errors, %d bytes dropped",
-                pv->frames, pv->crc_errors, pv->bytes_dropped );
+        hb_log("deca52: %d frames decoded, %d crc errors, %d bytes dropped",
+               pv->frames, pv->crc_errors, pv->bytes_dropped);
     }
-    a52_free( pv->state );
-    hb_list_empty( &pv->list );
-    free( pv );
-    w->private_data = NULL;
+
+    hb_audio_resample_free(pv->resample);
+    hb_audio_remap_free(pv->remap);
+    hb_list_empty(&pv->list);
+    a52_free(pv->state);
+    free(pv);
 }
 
 /***********************************************************************
@@ -153,7 +233,7 @@
         return HB_WORK_DONE;
     }
 
-    if ( (*buf_in)->start < -1 && pv->next_expected_pts == 0 )
+    if ( (*buf_in)->s.start < -1 && pv->next_expected_pts == 0 )
     {
         // discard buffers that start before video time 0
         *buf_out = NULL;
@@ -179,13 +259,12 @@
  ***********************************************************************
  *
  **********************************************************************/
-static hb_buffer_t * Decode( hb_work_object_t * w )
+static hb_buffer_t* Decode(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
-    hb_buffer_t * buf;
-    hb_audio_t  * audio = w->audio;
-    int           i, j, k;
-    int           size = 0;
+    hb_work_private_t *pv = w->private_data;
+    hb_audio_t *audio = w->audio;
+    hb_buffer_t *out;
+    int size = 0;
 
     // check that we're at the start of a valid frame and align to the
     // start of a valid frame if we're not.
@@ -195,7 +274,7 @@
     {
         /* check if this is a valid header */
         hb_list_seebytes( pv->list, pv->frame, 7 );
-        size = a52_syncinfo( pv->frame, &pv->flags_in, &pv->rate, &pv->bitrate );
+        size = a52_syncinfo(pv->frame, &pv->flags, &pv->rate, &pv->bitrate);
         if ( size > 0 )
         {
             // header looks valid - check the crc1
@@ -256,65 +335,104 @@
         ipts = -1;
     }
 
-    double pts = ( ipts != -1 ) ? ipts : pv->next_expected_pts;
     double frame_dur = (6. * 256. * 90000.) / pv->rate;
+    double pts       = (ipts != -1) ? (double)ipts : pv->next_expected_pts;
 
     /* AC3 passthrough: don't decode the AC3 frame */
-    if( audio->config.out.codec == HB_ACODEC_AC3_PASS )
-    {
-        buf = hb_buffer_init( size );
-        memcpy( buf->data, pv->frame, size );
-        buf->start = pts;
-        buf->duration = frame_dur;
-        pts += frame_dur;
-        buf->stop  = pts;
-        pv->next_expected_pts = pts;
-        return buf;
-    }
-
-    /* Feed liba52 */
-    a52_frame( pv->state, pv->frame, &pv->flags_out, &pv->level, 0 );
-
-    /* If a user specifies strong dynamic range compression (>1), adjust it.
-       If a user specifies default dynamic range compression (1), leave it alone.
-       If a user specifies no dynamic range compression (0), call a null function. */
-    if( pv->dynamic_range_compression > 1.0 )
+    if (audio->config.out.codec == HB_ACODEC_AC3_PASS)
     {
-        a52_dynrng( pv->state, dynrng_call, &pv->dynamic_range_compression );
+        out = hb_buffer_init(size);
+        memcpy(out->data, pv->frame, size);
     }
-    else if( !pv->dynamic_range_compression )
+    else
     {
-        a52_dynrng( pv->state, NULL, NULL );
-    }
-
-    /* 6 blocks per frame, 256 samples per block, channelsused channels */
-    buf        = hb_buffer_init( 6 * 256 * pv->out_discrete_channels * sizeof( float ) );
-    buf->start = pts;
-    buf->duration = frame_dur;
-    pts += frame_dur;
-    buf->stop  = pts;
-    pv->next_expected_pts = pts;
+        int i, j;
+        float *block_samples;
+
+        /*
+         * Feed liba52
+         */
+        a52_frame(pv->state, pv->frame, &pv->flags, &pv->level, 0);
+
+        /*
+         * If the user requested strong  DRC (>1), adjust it.
+         * If the user requested default DRC  (1), leave it alone.
+         * If the user requested no      DRC  (0), call a null function.
+         *
+         * a52_frame() resets the callback so it must be called for each frame.
+         */
+        if (pv->dynamic_range_compression > 1.0)
+        {
+            a52_dynrng(pv->state, dynrng_call, &pv->dynamic_range_compression);
+        }
+        else if (!pv->dynamic_range_compression)
+        {
+            a52_dynrng(pv->state, NULL, NULL);
+        }
 
-    for( i = 0; i < 6; i++ )
-    {
-        sample_t * samples_in;
-        float    * samples_out;
+        /*
+         * Update input channel layout, prepare remapping and downmixing
+         */
+        uint64_t new_layout = (acmod2layout[(pv->flags & A52_CHANNEL_MASK)] |
+                               lfeon2layout[(pv->flags & A52_LFE) != 0]);
 
-        a52_block( pv->state );
-        samples_in  = a52_samples( pv->state );
-        samples_out = ((float *) buf->data) + 256 * pv->out_discrete_channels * i;
+        if (new_layout != pv->channel_layout)
+        {
+            pv->channel_layout = new_layout;
+            pv->nchannels      = av_get_channel_layout_nb_channels(new_layout);
+            hb_audio_remap_set_channel_layout(pv->remap,
+                                              pv->channel_layout,
+                                              pv->nchannels);
+            hb_audio_resample_set_channel_layout(pv->resample,
+                                                 pv->channel_layout,
+                                                 pv->nchannels);
+        }
+        if (pv->use_mix_levels)
+        {
+            hb_audio_resample_set_mix_levels(pv->resample,
+                                             (double)pv->state->slev,
+                                             (double)pv->state->clev);
+        }
+        if (hb_audio_resample_update(pv->resample))
+        {
+            hb_log("deca52: hb_audio_resample_update() failed");
+            return NULL;
+        }
 
-        /* Interleave */
-        for( j = 0; j < 256; j++ )
+        /*
+         * decode all blocks before downmixing
+         */
+        for (i = 0; i < 6; i++)
         {
-            for ( k = 0; k < pv->out_discrete_channels; k++ )
+            a52_block(pv->state);
+            block_samples = (float*)a52_samples(pv->state);
+
+            /*
+             * reset pv->samples (may have been modified by hb_audio_remap)
+             *
+             * copy samples to our internal buffer
+             */
+            for (j = 0; j < pv->nchannels; j++)
             {
-                samples_out[(pv->out_discrete_channels*j)+k]   = samples_in[(256*k)+j];
+                pv->samples[j] = (uint8_t*)pv->buf[j];
+                memcpy(pv->buf[j][i], block_samples, 256 * sizeof(float));
+                block_samples += 256;
             }
         }
 
+        hb_audio_remap(pv->remap, pv->samples, 1536);
+        out = hb_audio_resample(pv->resample, pv->samples, 1536);
     }
-    return buf;
+
+    if (out != NULL)
+    {
+        out->s.start          = pts;
+        out->s.duration       = frame_dur;
+        pts                  += frame_dur;
+        out->s.stop           = pts;
+        pv->next_expected_pts = pts;
+    }
+    return out;
 }
 
 static int find_sync( const uint8_t *buf, int len )
@@ -376,7 +494,7 @@
             // discard enough bytes from the front of the buffer to make
             // room for the new stuff
             int newlen = sizeof(w->audio->priv.config.a52.buf) - blen;
-            memcpy( buf, buf + len - newlen, newlen );
+            memmove( buf, buf + len - newlen, newlen );
             len = newlen;
         }
     }
@@ -418,57 +536,11 @@
     info->mode = raw & 0x7;      /* bsmod is the following 3 bits */
     info->samples_per_frame = 1536;
 
-    if ( (flags & A52_CHANNEL_MASK) == A52_DOLBY )
-    {
-        info->flags |= AUDIO_F_DOLBY;
-    }
-
-    switch( flags & A52_CHANNEL_MASK )
-    {
-        /* mono sources */
-        case A52_MONO:
-        case A52_CHANNEL1:
-        case A52_CHANNEL2:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_MONO;
-            break;
-        /* stereo input */
-        case A52_CHANNEL:
-        case A52_STEREO:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
-            break;
-        /* dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input */
-        case A52_DOLBY:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_DOLBY;
-            break;
-        /* 3F/2R input */
-        case A52_3F2R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_3F2R;
-            break;
-        /* 3F/1R input */
-        case A52_3F1R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_3F1R;
-            break;
-        /* other inputs */
-        case A52_3F:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_3F;
-            break;
-        case A52_2F1R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_2F1R;
-            break;
-        case A52_2F2R:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_2F2R;
-            break;
-        /* unknown */
-        default:
-            info->channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
-    }
-
-    if (flags & A52_LFE)
-    {
-        info->channel_layout |= HB_INPUT_CH_LAYOUT_HAS_LFE;
-    }
+    info->channel_layout = (acmod2layout[(flags & A52_CHANNEL_MASK)] |
+                            lfeon2layout[(flags & A52_LFE) != 0]);
 
-    info->channel_map = &hb_ac3_chan_map;
+    // we remap to Libav order in Decode()
+    info->channel_map = &hb_libav_chan_map;
 
     return 1;
 }

HandBrake-0.9.8.tar.bz2/libhb/decavcodec.c -> HandBrake-0.9.9.tar.bz2/libhb/decavcodec.c Changed

@@ -1,8 +1,11 @@
-/* $Id: decavcodec.c,v 1.6 2005/03/06 04:08:54 titer Exp $
+/* decavcodec.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 /* This module is Handbrake's interface to the ffmpeg decoder library
    (libavcodec & small parts of libavformat). It contains four Handbrake
@@ -37,8 +40,7 @@
 
 #include "hb.h"
 #include "hbffmpeg.h"
-#include "downmix.h"
-#include "libavcodec/audioconvert.h"
+#include "audio_resample.h"
 
 static void compute_frame_duration( hb_work_private_t *pv );
 static void flushDelayQueue( hb_work_private_t *pv );
@@ -95,9 +97,10 @@
     int             sws_width;
     int             sws_height;
     int             sws_pix_fmt;
-    hb_downmix_t    *downmix;
     int cadence[12];
     int wait_for_keyframe;
+
+    hb_audio_resample_t *resample;
 };
 
 static void decodeAudio( hb_audio_t * audio, hb_work_private_t *pv, uint8_t *data, int size, int64_t pts );
@@ -175,69 +178,79 @@
     hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
     w->private_data = pv;
 
-    pv->job   = job;
-    if ( job )
+    pv->job = job;
+    if (job)
         pv->title = job->title;
     else
         pv->title = w->title;
-    pv->list  = hb_list_init();
+    pv->list = hb_list_init();
 
-    int codec_id = w->codec_param;
-    /*XXX*/
-    if ( codec_id == 0 )
-        codec_id = CODEC_ID_MP2;
+    codec       = avcodec_find_decoder(w->codec_param);
+    pv->context = avcodec_alloc_context3(codec);
 
-    codec = avcodec_find_decoder( codec_id );
-    if ( pv->title->opaque_priv )
+    if (pv->title->opaque_priv != NULL)
     {
         AVFormatContext *ic = (AVFormatContext*)pv->title->opaque_priv;
-        pv->context = avcodec_alloc_context3(codec);
-        avcodec_copy_context( pv->context, ic->streams[w->audio->id]->codec);
-        hb_ff_set_sample_fmt( pv->context, codec );
+        avcodec_copy_context(pv->context, ic->streams[w->audio->id]->codec);
+        // libav's eac3 parser toggles the codec_id in the context as
+        // it reads eac3 data between AV_CODEC_ID_AC3 and AV_CODEC_ID_EAC3.
+        // It detects an AC3 sync pattern sometimes in ac3_sync() which
+        // causes it to eventually set avctx->codec_id to AV_CODEC_ID_AC3
+        // in ff_aac_ac3_parse(). Since we are parsing some data before
+        // we get here, the codec_id may have flipped.  This will cause an
+        // error in hb_avcodec_open().  So flip it back!
+        pv->context->codec_id = w->codec_param;
     }
     else
     {
-        pv->parser = av_parser_init( codec_id );
-
-        pv->context = avcodec_alloc_context3(codec);
-        hb_ff_set_sample_fmt( pv->context, codec );
-    }
-    if ( hb_avcodec_open( pv->context, codec, NULL, 0 ) )
-    {
-        hb_log( "decavcodecaInit: avcodec_open failed" );
-        return 1;
+        pv->parser = av_parser_init(w->codec_param);
     }
+    hb_ff_set_sample_fmt(pv->context, codec, AV_SAMPLE_FMT_FLT);
 
-    // DTS: work around lack of 6.0/6.1 support in libhb
-    if( hb_ff_dts_disable_xch( pv->context ) )
-    {
-        hb_deep_log( 2, "decavcodecaInit: found DTS-ES, requesting DTS core" );
-    }
-    else if( ( !pv->context->channels || !pv->context->channel_layout ) &&
-             ( w->audio->config.in.codec == HB_ACODEC_DCA_HD ) &&
-             ( ( w->audio->config.in.channel_layout & ~HB_INPUT_CH_LAYOUT_HAS_LFE ) == HB_INPUT_CH_LAYOUT_3F2R ) )
+    /* Downmixing & sample_fmt conversion */
+    if (!(w->audio->config.out.codec & HB_ACODEC_PASS_FLAG))
     {
-        /* XXX: when we are demuxing the stream ourselves, it seems we have no
-         * channel count/layout info in the context until we decode audio for
-         * the first time. If the scan info says the source is 5.0 or 5.1,
-         * make sure XCh processing is disabled in Libav before decoding. */
-        pv->context->request_channels = pv->context->channels =
-            HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( w->audio->config.in.channel_layout );
-        pv->context->channel_layout = AV_CH_LAYOUT_5POINT0;
-        if( w->audio->config.in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE )
-            pv->context->channel_layout |= AV_CH_LOW_FREQUENCY;
-        hb_deep_log( 2, "decavcodecaInit: scan detected DTS 5.0/5.1, disabling XCh processing" );
+        pv->resample =
+            hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
+                                   w->audio->config.out.mixdown,
+                                   w->audio->config.out.normalize_mix_level);
+        if (pv->resample == NULL)
+        {
+            hb_error("decavcodecaInit: hb_audio_resample_init() failed");
+            return 1;
+        }
+        // some decoders can downmix using embedded coefficients,
+        // or dedicated audio substreams for a specific channel layout
+        switch (w->audio->config.out.mixdown)
+        {
+            case HB_AMIXDOWN_MONO:
+                if (w->codec_param == AV_CODEC_ID_TRUEHD)
+                {
+                    // libavcodec can't decode TrueHD Mono (bug #356)
+                    // work around it by requesting Stereo and downmixing
+                    pv->context->request_channels       = 2;
+                    pv->context->request_channel_layout = AV_CH_LAYOUT_STEREO;
+                    break;
+                }
+                pv->context->request_channel_layout = AV_CH_LAYOUT_MONO;
+                break;
+            // request 5.1 before downmixing to dpl1/dpl2
+            case HB_AMIXDOWN_DOLBY:
+            case HB_AMIXDOWN_DOLBYPLII:
+                pv->context->request_channel_layout = AV_CH_LAYOUT_5POINT1;
+                break;
+            // request the layout corresponding to the selected mixdown
+            default:
+                pv->context->request_channel_layout =
+                    hb_ff_mixdown_xlat(w->audio->config.out.mixdown, NULL);
+                break;
+        }
     }
 
-    if ( w->audio != NULL )
+    if (hb_avcodec_open(pv->context, codec, NULL, 0))
     {
-        if ( hb_need_downmix( w->audio->config.in.channel_layout, 
-                              w->audio->config.out.mixdown) )
-        {
-            pv->downmix = hb_downmix_init(w->audio->config.in.channel_layout, 
-                                          w->audio->config.out.mixdown);
-            hb_downmix_set_chan_map( pv->downmix, &hb_smpte_chan_map, &hb_smpte_chan_map );
-        }
+        hb_log("decavcodecaInit: avcodec_open failed");
+        return 1;
     }
 
     return 0;
@@ -276,21 +289,14 @@
         }
         if ( pv->context )
         {
+            av_freep( &pv->context->extradata );
             av_free( pv->context );
         }
         if ( pv->list )
         {
             hb_list_empty( &pv->list );
         }
-        if ( pv->buffer )
-        {
-            av_free( pv->buffer );
-            pv->buffer = NULL;
-        }
-        if ( pv->downmix )
-        {
-            hb_downmix_close( &(pv->downmix) );
-        }
+        hb_audio_resample_free(pv->resample);
         free( pv );
     }
     *ppv = NULL;
@@ -328,7 +334,7 @@
 
     *buf_out = NULL;
 
-    if ( in->start < -1 && pv->pts_next <= 0 )
+    if ( in->s.start < -1 && pv->pts_next <= 0 )
     {
         // discard buffers that start before video time 0
         return HB_WORK_OK;
@@ -341,7 +347,7 @@
         int pout_len;
         int64_t cur;
 
-        cur = in->start;
+        cur = in->s.start;
 
         if ( pv->parser != NULL )
         {
@@ -365,10 +371,9 @@
             // total samples to per-channel samples. 'sample_rate' converts
             // per-channel samples to seconds per sample and the 90000
             // is mpeg ticks per second.
-            if ( pv->context->sample_rate && pv->context->channels )
+            if ( pv->context->sample_rate )
             {
-                pv->duration = 90000. /
-                    (double)( pv->context->sample_rate * pv->context->channels );
+                pv->duration = 90000. / (double)( pv->context->sample_rate );
             }
             decodeAudio( w->audio, pv, pout, pout_len, cur );
         }
@@ -408,11 +413,8 @@
     {
         return decavcodecaInfo( w, info );
     }
-    // XXX
-    // We should parse the bitstream to find its parameters but for right
-    // now we just return dummy values if there's a codec that will handle it.
-    AVCodec *codec = avcodec_find_decoder( w->codec_param? w->codec_param :
-                                                           CODEC_ID_MP2 );
+
+    AVCodec *codec = avcodec_find_decoder( w->codec_param );
     if ( ! codec )
     {
         // there's no ffmpeg codec for this audio type - give up
@@ -422,31 +424,47 @@
     static char codec_name[64];
     info->name =  strncpy( codec_name, codec->name, sizeof(codec_name)-1 );
 
-    AVCodecParserContext *parser = av_parser_init( codec->id );
-    AVCodecContext *context = avcodec_alloc_context3(codec);
-    hb_ff_set_sample_fmt( context, codec );
+    AVCodecContext *context      = avcodec_alloc_context3(codec);
+    AVCodecParserContext *parser = NULL;
+
+    if (w->title->opaque_priv != NULL)
+    {
+        AVFormatContext *ic = (AVFormatContext*)w->title->opaque_priv;
+        avcodec_copy_context(context, ic->streams[w->audio->id]->codec);
+        // libav's eac3 parser toggles the codec_id in the context as
+        // it reads eac3 data between AV_CODEC_ID_AC3 and AV_CODEC_ID_EAC3.
+        // It detects an AC3 sync pattern sometimes in ac3_sync() which
+        // causes it to eventually set avctx->codec_id to AV_CODEC_ID_AC3
+        // in ff_aac_ac3_parse(). Since we are parsing some data before
+        // we get here, the codec_id may have flipped.  This will cause an
+        // error in hb_avcodec_open().  So flip it back!
+        context->codec_id = w->codec_param;
+    }
+    else
+    {
+        parser = av_parser_init(codec->id);
+    }
+
+    hb_ff_set_sample_fmt( context, codec, AV_SAMPLE_FMT_FLT );
     if ( hb_avcodec_open( context, codec, NULL, 0 ) )
     {
         return -1;
     }
-    uint8_t *buffer = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE );
-    int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
     unsigned char *pbuffer;
     int pos, pbuffer_size;
 
-    while ( buf && !ret )
+    while (buf != NULL && !ret)
     {
         pos = 0;
-        while ( pos < buf->size )
+        while (pos < buf->size)
         {
-            int len;
+            int len, truehd_mono = 0;
 
-            if ( parser != NULL )
+            if (parser != NULL)
             {
-                len = av_parser_parse2( parser, context, &pbuffer, 
-                                        &pbuffer_size, buf->data + pos, 
-                                        buf->size - pos, buf->start, 
-                                        buf->start, 0 );
+                len = av_parser_parse2(parser, context, &pbuffer, &pbuffer_size,
+                                       buf->data + pos, buf->size - pos,
+                                       buf->s.start, buf->s.start, 0);
             }
             else
             {
@@ -454,35 +472,66 @@
                 len = pbuffer_size = buf->size;
             }
             pos += len;
-            if ( pbuffer_size > 0 )
+
+            // libavcodec can't decode TrueHD Mono (bug #356)
+            // work around it by requesting Stereo before decoding
+            if (context->codec_id == AV_CODEC_ID_TRUEHD &&
+                context->channel_layout == AV_CH_LAYOUT_MONO)
             {
+                truehd_mono                     = 1;
+                context->request_channels       = 2;
+                context->request_channel_layout = AV_CH_LAYOUT_STEREO;
+            }
+            else
+            {
+                context->request_channels       = 0;
+                context->request_channel_layout = 0;
+            }
+
+            if (pbuffer_size > 0)
+            {
+                int got_frame;
+                AVFrame frame = { { 0 } };
                 AVPacket avp;
-                av_init_packet( &avp );
+                av_init_packet(&avp);
                 avp.data = pbuffer;
                 avp.size = pbuffer_size;
 
-                len = avcodec_decode_audio3( context, (int16_t*)buffer, 
-                                             &out_size, &avp );
-                if ( len > 0 && context->sample_rate > 0 )
+                len = avcodec_decode_audio4(context, &frame, &got_frame, &avp);
+                if (len > 0 && context->sample_rate > 0)
                 {
-                    // DTS: work around lack of 6.0/6.1 support in libhb
-                    if( hb_ff_dts_disable_xch( context ) )
+                    info->rate_base          = 1;
+                    info->rate               = context->sample_rate;
+                    info->samples_per_frame  = frame.nb_samples;
+
+                    int bps = av_get_bits_per_sample(context->codec_id);
+                    if (bps > 0 && context->channels > 0)
                     {
-                        hb_deep_log( 2, "decavcodecaBSInfo: found DTS-ES, requesting DTS core" );
+                        info->bitrate = (bps *
+                                         context->channels *
+                                         context->sample_rate);
                     }
-                    int isamp = av_get_bytes_per_sample( context->sample_fmt );
-                    info->bitrate = context->bit_rate;
-                    info->rate = context->sample_rate;
-                    info->rate_base = 1;
-                    info->channel_layout = 
-                        hb_ff_layout_xlat(context->channel_layout, 
-                                          context->channels);
-                    ret = 1;
-                    if ( context->channels && isamp )
+                    else if (context->bit_rate > 0)
                     {
-                        info->samples_per_frame = out_size / 
-                                                  (isamp * context->channels);
+                        info->bitrate = context->bit_rate;
                     }
+                    else
+                    {
+                        info->bitrate = 1;
+                    }
+
+                    if (truehd_mono)
+                    {
+                        info->channel_layout = AV_CH_LAYOUT_MONO;
+                    }
+                    else
+                    {
+                        info->channel_layout =
+                            hb_ff_layout_xlat(context->channel_layout,
+                                              context->channels);
+                    }
+
+                    ret = 1;
                     break;
                 }
             }
@@ -492,9 +541,8 @@
 
     info->profile = context->profile;
     info->level = context->level;
-    info->channel_map = &hb_smpte_chan_map;
+    info->channel_map = &hb_libav_chan_map;
 
-    av_free( buffer );
     if ( parser != NULL )
         av_parser_close( parser );
     hb_avcodec_close( context );
@@ -547,52 +595,51 @@
     hb_buffer_t *buf = hb_video_buffer_init( w, h );
     uint8_t *dst = buf->data;
 
-    if ( context->pix_fmt != PIX_FMT_YUV420P || w != context->width ||
-         h != context->height )
+    if (context->pix_fmt != AV_PIX_FMT_YUV420P || w != context->width ||
+        h != context->height)
     {
         // have to convert to our internal color space and/or rescale
         AVPicture dstpic;
-        avpicture_fill( &dstpic, dst, PIX_FMT_YUV420P, w, h );
+        hb_avpicture_fill(&dstpic, buf);
 
-        if ( ! pv->sws_context || 
-             pv->sws_width != context->width ||
-             pv->sws_height != context->height ||
-             pv->sws_pix_fmt != context->pix_fmt )
+        if (pv->sws_context == NULL            ||
+            pv->sws_width   != context->width  ||
+            pv->sws_height  != context->height ||
+            pv->sws_pix_fmt != context->pix_fmt)
         {
-            if( pv->sws_context )
-                sws_freeContext( pv->sws_context );
-            pv->sws_context = hb_sws_get_context( 
-                            context->width, context->height, context->pix_fmt,
-                            w, h, PIX_FMT_YUV420P,
-                            SWS_LANCZOS|SWS_ACCURATE_RND);
-            pv->sws_width = context->width;
-            pv->sws_height = context->height;
+            if (pv->sws_context != NULL)
+                sws_freeContext(pv->sws_context);
+            pv->sws_context = hb_sws_get_context(context->width,
+                                                 context->height,
+                                                 context->pix_fmt,
+                                                 w, h, AV_PIX_FMT_YUV420P,
+                                                  SWS_LANCZOS|SWS_ACCURATE_RND);
+            pv->sws_width   = context->width;
+            pv->sws_height  = context->height;
             pv->sws_pix_fmt = context->pix_fmt;
         }
-        sws_scale( pv->sws_context, (const uint8_t* const *)frame->data, 
-                   frame->linesize, 0, context->height,
-                   dstpic.data, dstpic.linesize );
+        sws_scale(pv->sws_context,
+                  (const uint8_t* const *)frame->data, frame->linesize,
+                  0, context->height, dstpic.data, dstpic.linesize);
     }
     else
     {
-        dst = copy_plane( dst, frame->data[0], w, frame->linesize[0], h );
-        w = (w + 1) >> 1; h = (h + 1) >> 1;
-        dst = copy_plane( dst, frame->data[1], w, frame->linesize[1], h );
-        dst = copy_plane( dst, frame->data[2], w, frame->linesize[2], h );
+        w = buf->plane[0].stride;
+        h = buf->plane[0].height;
+        dst = buf->plane[0].data;
+        copy_plane( dst, frame->data[0], w, frame->linesize[0], h );
+        w = buf->plane[1].stride;
+        h = buf->plane[1].height;
+        dst = buf->plane[1].data;
+        copy_plane( dst, frame->data[1], w, frame->linesize[1], h );
+        w = buf->plane[2].stride;
+        h = buf->plane[2].height;
+        dst = buf->plane[2].data;
+        copy_plane( dst, frame->data[2], w, frame->linesize[2], h );
     }
     return buf;
 }
 
-static int get_frame_buf( AVCodecContext *context, AVFrame *frame )
-{
-    return avcodec_default_get_buffer( context, frame );
-}
-
-static int reget_frame_buf( AVCodecContext *context, AVFrame *frame )
-{
-    return avcodec_default_reget_buffer( context, frame );
-}
-
 static void log_chapter( hb_work_private_t *pv, int chap_num, int64_t pts )
 {
     hb_chapter_t *c;
@@ -600,7 +647,7 @@
     if ( !pv->job )
         return;
 
-    c = hb_list_item( pv->job->title->list_chapter, chap_num - 1 );
+    c = hb_list_item( pv->job->list_chapter, chap_num - 1 );
     if ( c && c->title )
     {
         hb_log( "%s: \"%s\" (%d) at frame %u time %"PRId64,
@@ -621,7 +668,7 @@
     // flush all the video packets left on our timestamp-reordering delay q
     while ( ( buf = pv->delayq[slot] ) != NULL )
     {
-        buf->start = heap_pop( &pv->pts_heap );
+        buf->s.start = heap_pop( &pv->pts_heap );
         hb_list_add( pv->list, buf );
         pv->delayq[slot] = NULL;
         slot = ( slot + 1 ) & (HEAP_SIZE-1);
@@ -708,24 +755,24 @@
 }
 
 /*
- * Decodes a video frame from the specified raw packet data 
+ * Decodes a video frame from the specified raw packet data
  *      ('data', 'size', 'sequence').
  * The output of this function is stored in 'pv->list', which contains a list
  * of zero or more decoded packets.
- * 
- * The returned packets are guaranteed to have their timestamps in the correct 
- * order, even if the original packets decoded by libavcodec have misordered 
+ *
+ * The returned packets are guaranteed to have their timestamps in the correct
+ * order, even if the original packets decoded by libavcodec have misordered
  * timestamps, due to the use of 'packed B-frames'.
- * 
+ *
  * Internally the set of decoded packets may be buffered in 'pv->delayq'
  * until enough packets have been decoded so that the timestamps can be
  * correctly rewritten, if this is necessary.
  */
-static int decodeFrame( hb_work_object_t *w, uint8_t *data, int size, int sequence, int64_t pts, int64_t dts )
+static int decodeFrame( hb_work_object_t *w, uint8_t *data, int size, int sequence, int64_t pts, int64_t dts, uint8_t frametype )
 {
     hb_work_private_t *pv = w->private_data;
     int got_picture, oldlevel = 0;
-    AVFrame frame;
+    AVFrame frame = { { 0 } };
     AVPacket avp;
 
     if ( global_verbosity_level <= 1 )
@@ -734,14 +781,23 @@
         av_log_set_level( AV_LOG_QUIET );
     }
 
-    av_init_packet( &avp );
+    av_init_packet(&avp);
     avp.data = data;
     avp.size = size;
-    avp.pts = pts;
-    avp.dts = dts;
+    avp.pts  = pts;
+    avp.dts  = dts;
+    /*
+     * libav avcodec_decode_video2() needs AVPacket flagged with AV_PKT_FLAG_KEY
+     * for some codecs. For example, sequence of PNG in a mov container.
+     */ 
+    if ( frametype & HB_FRAME_KEY )
+    {
+        avp.flags |= AV_PKT_FLAG_KEY;
+    }
+
     if ( avcodec_decode_video2( pv->context, &frame, &got_picture, &avp ) < 0 )
     {
-        ++pv->decode_errors;     
+        ++pv->decode_errors;
     }
     if ( global_verbosity_level <= 1 )
     {
@@ -753,10 +809,9 @@
         // codecs it simply sets frame.key_frame.  But for others, it only
         // sets frame.pict_type. And for yet others neither gets set at all
         // (qtrle).
-        int key = frame.key_frame ||
-                  ( w->codec_param != CODEC_ID_H264 &&
-                    ( frame.pict_type == AV_PICTURE_TYPE_I ||
-                      frame.pict_type == 0 ) );
+        int key = frame.key_frame || (w->codec_param != AV_CODEC_ID_H264 &&
+                                      (frame.pict_type == 0 ||
+                                       frame.pict_type == AV_PICTURE_TYPE_I));
         if( !key )
         {
             pv->wait_for_keyframe--;
@@ -770,15 +825,15 @@
 
         // ffmpeg makes it hard to attach a pts to a frame. if the MPEG ES
         // packet had a pts we handed it to av_parser_parse (if the packet had
-        // no pts we set it to AV_NOPTS_VALUE, but before the parse we can't 
-        // distinguish between the start of a video frame with no pts & an 
-        // intermediate packet of some frame which never has a pts). we hope 
-        // that when parse returns the frame to us the pts we originally 
-        // handed it will be in parser->pts. we put this pts into avp.pts so 
-        // that when avcodec_decode_video finally gets around to allocating an 
-        // AVFrame to hold the decoded frame, avcodec_default_get_buffer can 
-        // stuff that pts into the it. if all of these relays worked at this 
-        // point frame.pts should hold the frame's pts from the original data 
+        // no pts we set it to AV_NOPTS_VALUE, but before the parse we can't
+        // distinguish between the start of a video frame with no pts & an
+        // intermediate packet of some frame which never has a pts). we hope
+        // that when parse returns the frame to us the pts we originally
+        // handed it will be in parser->pts. we put this pts into avp.pts so
+        // that when avcodec_decode_video finally gets around to allocating an
+        // AVFrame to hold the decoded frame, avcodec_default_get_buffer can
+        // stuff that pts into the it. if all of these relays worked at this
+        // point frame.pts should hold the frame's pts from the original data
         // stream or AV_NOPTS_VALUE if it didn't have one. in the latter case
         // we generate the next pts in sequence for it.
         if ( !pv->frame_duration_set )
@@ -827,21 +882,23 @@
         if ( ! pv->job || ! pv->brokenByMicrosoft )
         {
             buf = copy_frame( pv, &frame );
-            buf->start = pts;
+            buf->s.start = pts;
             buf->sequence = sequence;
-            buf->flags = flags;
-            if ( pv->new_chap && buf->start >= pv->chap_time )
+
+            buf->s.flags = flags;
+
+            if ( pv->new_chap && buf->s.start >= pv->chap_time )
             {
-                buf->new_chap = pv->new_chap;
+                buf->s.new_chap = pv->new_chap;
+                log_chapter( pv, pv->new_chap, buf->s.start );
                 pv->new_chap = 0;
                 pv->chap_time = 0;
-                log_chapter( pv, buf->new_chap, buf->start );
             }
             else if ( pv->nframes == 0 && pv->job )
             {
-                log_chapter( pv, pv->job->chapter_start, buf->start );
+                log_chapter( pv, pv->job->chapter_start, buf->s.start );
             }
-            checkCadence( pv->cadence, buf->flags, buf->start );
+            checkCadence( pv->cadence, flags, buf->s.start );
             hb_list_add( pv->list, buf );
             ++pv->nframes;
             return got_picture;
@@ -873,27 +930,28 @@
         if ( ( buf = pv->delayq[slot] ) != NULL )
         {
             pv->queue_primed = 1;
-            buf->start = heap_pop( &pv->pts_heap );
+            buf->s.start = heap_pop( &pv->pts_heap );
 
-            if ( pv->new_chap && buf->start >= pv->chap_time )
+            if ( pv->new_chap && buf->s.start >= pv->chap_time )
             {
-                buf->new_chap = pv->new_chap;
+                buf->s.new_chap = pv->new_chap;
+                log_chapter( pv, pv->new_chap, buf->s.start );
                 pv->new_chap = 0;
                 pv->chap_time = 0;
-                log_chapter( pv, buf->new_chap, buf->start );
             }
             else if ( pv->nframes == 0 && pv->job )
             {
-                log_chapter( pv, pv->job->chapter_start, buf->start );
+                log_chapter( pv, pv->job->chapter_start, buf->s.start );
             }
-            checkCadence( pv->cadence, buf->flags, buf->start );
+            checkCadence( pv->cadence, buf->s.flags, buf->s.start );
             hb_list_add( pv->list, buf );
         }
 
         // add the new frame to the delayq & push its timestamp on the heap
         buf = copy_frame( pv, &frame );
         buf->sequence = sequence;
-        buf->flags = flags;
+        /* Store picture flags for later use by filters */
+        buf->s.flags = flags;
         pv->delayq[slot] = buf;
         heap_push( &pv->pts_heap, pts );
 
@@ -902,7 +960,7 @@
 
     return got_picture;
 }
-static void decodeVideo( hb_work_object_t *w, uint8_t *data, int size, int sequence, int64_t pts, int64_t dts )
+static void decodeVideo( hb_work_object_t *w, uint8_t *data, int size, int sequence, int64_t pts, int64_t dts, uint8_t frametype )
 {
     hb_work_private_t *pv = w->private_data;
 
@@ -935,14 +993,14 @@
 
         if ( pout_len > 0 )
         {
-            decodeFrame( w, pout, pout_len, sequence, parser_pts, parser_dts );
+            decodeFrame( w, pout, pout_len, sequence, parser_pts, parser_dts, frametype );
         }
     } while ( pos < size );
 
     /* the stuff above flushed the parser, now flush the decoder */
     if ( size <= 0 )
     {
-        while ( decodeFrame( w, NULL, 0, sequence, AV_NOPTS_VALUE, AV_NOPTS_VALUE ) )
+        while ( decodeFrame( w, NULL, 0, sequence, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0 ) )
         {
         }
         flushDelayQueue( pv );
@@ -973,14 +1031,6 @@
     return head;
 }
 
-static void init_video_avcodec_context( hb_work_private_t *pv )
-{
-    /* we have to wrap ffmpeg's get_buffer to be able to set the pts (?!) */
-    pv->context->opaque = pv;
-    pv->context->get_buffer = get_frame_buf;
-    pv->context->reget_buffer = reget_frame_buf;
-}
-
 static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
 {
 
@@ -995,13 +1045,9 @@
         pv->title = w->title;
     pv->list = hb_list_init();
 
-    if( pv->job && pv->job->title )
+    if( pv->job && pv->job->title && !pv->job->title->has_resolution_change )
     {
-        if( !pv->job->title->has_resolution_change &&
-            w->codec_param != CODEC_ID_PRORES )
-        {
-            pv->threads = HB_FFMPEG_THREADS_AUTO;
-        }
+        pv->threads = HB_FFMPEG_THREADS_AUTO;
     }
     if ( pv->title->opaque_priv )
     {
@@ -1015,8 +1061,6 @@
         pv->context = avcodec_alloc_context3(codec);
         avcodec_copy_context( pv->context, ic->streams[pv->title->video_id]->codec);
         pv->context->workaround_bugs = FF_BUG_AUTODETECT;
-        // Depricated but still used by Libav (twits!)
-        pv->context->error_recognition = FF_ER_CAREFUL;
         pv->context->err_recognition = AV_EF_CRCCHECK;
         pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
 
@@ -1040,11 +1084,8 @@
         pv->parser = av_parser_init( w->codec_param );
         pv->context = avcodec_alloc_context3( codec );
         pv->context->workaround_bugs = FF_BUG_AUTODETECT;
-        // Depricated but still used by Libav (twits!)
-        pv->context->error_recognition = FF_ER_CAREFUL;
         pv->context->err_recognition = AV_EF_CRCCHECK;
         pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
-        init_video_avcodec_context( pv );
     }
     return 0;
 }
@@ -1085,18 +1126,18 @@
     hb_work_private_t *pv = w->private_data;
 
     // we can't call the avstream funcs but the read_header func in the
-    // AVInputFormat may set up some state in the AVContext. In particular 
+    // AVInputFormat may set up some state in the AVContext. In particular
     // vc1t_read_header allocates 'extradata' to deal with header issues
     // related to Microsoft's bizarre engineering notions. We alloc a chunk
     // of space to make vc1 work then associate the codec with the context.
-    if ( w->codec_param != CODEC_ID_VC1 )
+    if ( w->codec_param != AV_CODEC_ID_VC1 )
     {
         // we haven't been inflicted with M$ - allocate a little space as
         // a marker and return success.
         pv->context->extradata_size = 0;
         // av_malloc uses posix_memalign which is allowed to
         // return NULL when allocating 0 bytes.  We use extradata == NULL
-        // to trigger initialization of extradata and the decoder, so 
+        // to trigger initialization of extradata and the decoder, so
         // we can not set it to NULL here. So allocate a small
         // buffer instead.
         pv->context->extradata = av_malloc(1);
@@ -1155,7 +1196,7 @@
     {
         if ( pv->context->codec != NULL )
         {
-            decodeVideo( w, in->data, in->size, in->sequence, pts, dts );
+            decodeVideo( w, in->data, in->size, in->sequence, pts, dts, in->s.frametype );
         }
         hb_list_add( pv->list, in );
         *buf_out = link_buf_list( pv );
@@ -1173,8 +1214,15 @@
             *buf_out = hb_buffer_init( 0 );;
             return HB_WORK_DONE;
         }
+        // Note that there is currently a small memory leak in libav at this
+        // point.  pv->context->priv_data gets allocated by
+        // avcodec_alloc_context3(), then avcodec_get_context_defaults3()
+        // memsets the context and looses the pointer.
+        //
+        // avcodec_get_context_defaults3() looks as if they intended for
+        // it to preserve any existing priv_data because they test the pointer
+        // before allocating new memory, but the memset has already cleared it.
         avcodec_get_context_defaults3( pv->context, codec );
-        init_video_avcodec_context( pv );
         if ( setup_extradata( w, in ) )
         {
             // we didn't find the headers needed to set up extradata.
@@ -1193,17 +1241,17 @@
         pv->video_codec_opened = 1;
     }
 
-    if( in->start >= 0 )
+    if( in->s.start >= 0 )
     {
-        pts = in->start;
-        dts = in->renderOffset;
+        pts = in->s.start;
+        dts = in->s.renderOffset;
     }
-    if ( in->new_chap )
+    if ( in->s.new_chap )
     {
-        pv->new_chap = in->new_chap;
+        pv->new_chap = in->s.new_chap;
         pv->chap_time = pts >= 0? pts : pv->pts_next;
     }
-    decodeVideo( w, in->data, in->size, in->sequence, pts, dts );
+    decodeVideo( w, in->data, in->size, in->sequence, pts, dts, in->s.frametype );
     hb_buffer_close( &in );
     *buf_out = link_buf_list( pv );
     return HB_WORK_OK;
@@ -1262,7 +1310,7 @@
              pv->context->time_base.num * max_fps > pv->context->time_base.den &&
              pv->context->time_base.den > pv->context->time_base.num * 8L )
         {
-            duration =  (double)pv->context->time_base.num / 
+            duration =  (double)pv->context->time_base.num /
                         (double)pv->context->time_base.den;
             if ( pv->context->ticks_per_frame > 1 )
             {
@@ -1277,7 +1325,7 @@
         if ( pv->context->time_base.num * max_fps > pv->context->time_base.den &&
              pv->context->time_base.den > pv->context->time_base.num * 8L )
         {
-            duration =  (double)pv->context->time_base.num / 
+            duration =  (double)pv->context->time_base.num /
                             (double)pv->context->time_base.den;
             if ( pv->context->ticks_per_frame > 1 )
             {
@@ -1328,11 +1376,79 @@
     info->level = pv->context->level;
     info->name = pv->context->codec->name;
 
+    switch( pv->context->color_primaries )
+    {
+        case AVCOL_PRI_BT709:
+            info->color_prim = HB_COLR_PRI_BT709;
+            break;
+        case AVCOL_PRI_BT470BG:
+            info->color_prim = HB_COLR_PRI_EBUTECH;
+            break;
+        case AVCOL_PRI_BT470M:
+        case AVCOL_PRI_SMPTE170M:
+        case AVCOL_PRI_SMPTE240M:
+            info->color_prim = HB_COLR_PRI_SMPTEC;
+            break;
+        default:
+        {
+            if( ( info->width >= 1280 || info->height >= 720 ) ||
+                ( info->width >   720 && info->height >  576 ) )
+                // ITU BT.709 HD content
+                info->color_prim = HB_COLR_PRI_BT709;
+            else if( info->rate_base == 1080000 )
+                // ITU BT.601 DVD or SD TV content (PAL)
+                info->color_prim = HB_COLR_PRI_EBUTECH;
+            else
+                // ITU BT.601 DVD or SD TV content (NTSC)
+                info->color_prim = HB_COLR_PRI_SMPTEC;
+            break;
+        }
+    }
+
+    switch( pv->context->color_trc )
+    {
+        case AVCOL_TRC_SMPTE240M:
+            info->color_transfer = HB_COLR_TRA_SMPTE240M;
+            break;
+        default:
+            // ITU BT.601, BT.709, anything else
+            info->color_transfer = HB_COLR_TRA_BT709;
+            break;
+    }
+
+    switch( pv->context->colorspace )
+    {
+        case AVCOL_SPC_BT709:
+            info->color_matrix = HB_COLR_MAT_BT709;
+            break;
+        case AVCOL_SPC_FCC:
+        case AVCOL_SPC_BT470BG:
+        case AVCOL_SPC_SMPTE170M:
+        case AVCOL_SPC_RGB: // libswscale rgb2yuv
+            info->color_matrix = HB_COLR_MAT_SMPTE170M;
+            break;
+        case AVCOL_SPC_SMPTE240M:
+            info->color_matrix = HB_COLR_MAT_SMPTE240M;
+            break;
+        default:
+        {
+            if( ( info->width >= 1280 || info->height >= 720 ) ||
+                ( info->width >   720 && info->height >  576 ) )
+                // ITU BT.709 HD content
+                info->color_matrix = HB_COLR_MAT_BT709;
+            else
+                // ITU BT.601 DVD or SD TV content (PAL)
+                // ITU BT.601 DVD or SD TV content (NTSC)
+                info->color_matrix = HB_COLR_MAT_SMPTE170M;
+            break;
+        }
+    }
+
     return 1;
 }
 
 static int decavcodecvBSInfo( hb_work_object_t *w, const hb_buffer_t *buf,
-                             hb_work_info_t *info )
+                              hb_work_info_t *info )
 {
     return 0;
 }
@@ -1350,6 +1466,7 @@
         {
             pv->video_codec_opened = 0;
             hb_avcodec_close( pv->context );
+            av_freep( &pv->context->extradata );
             if ( pv->parser )
             {
                 av_parser_close(pv->parser);
@@ -1376,144 +1493,77 @@
     .bsinfo = decavcodecvBSInfo
 };
 
-static hb_buffer_t * downmixAudio( 
-    hb_audio_t *audio, 
-    hb_work_private_t *pv, 
-    hb_sample_t *buffer, 
-    int channels,
-    int nsamples )
-{
-    hb_buffer_t * buf = NULL;
-
-    if ( pv->downmix )
-    {
-        int n_ch_samples = nsamples / channels;
-        int out_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
-
-        buf = hb_buffer_init( n_ch_samples * out_channels * sizeof(float) );
-        hb_sample_t *samples = (hb_sample_t *)buf->data;
-        hb_downmix(pv->downmix, samples, buffer, n_ch_samples);
-    }
-    else
-    {
-        buf = hb_buffer_init( nsamples * sizeof(float) );
-        memcpy( buf->data, buffer, nsamples * sizeof(float) );
-    }
-
-    return buf;
-}
-
-static void decodeAudio( hb_audio_t * audio, hb_work_private_t *pv, uint8_t *data, int size, int64_t pts )
+static void decodeAudio(hb_audio_t *audio, hb_work_private_t *pv, uint8_t *data,
+                        int size, int64_t pts)
 {
     AVCodecContext *context = pv->context;
-    int pos = 0;
     int loop_limit = 256;
+    int pos = 0;
 
-    // If we are givn a pts, use it.
-    // But don't loose partial ticks.
-    if ( pts != -1 && (int64_t)pv->pts_next != pts )
+    // If we are given a pts, use it; but don't lose partial ticks.
+    if (pts != -1 && (int64_t)pv->pts_next != pts)
         pv->pts_next = pts;
-    while ( pos < size )
+    while (pos < size)
     {
-        float *buffer = pv->buffer;
-        if ( buffer == NULL )
-        {
-            pv->buffer = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE );
-            buffer = pv->buffer;
-        }
-
+        int got_frame;
+        AVFrame frame = { { 0 } };
         AVPacket avp;
-        av_init_packet( &avp );
+
+        av_init_packet(&avp);
         avp.data = data + pos;
         avp.size = size - pos;
-        avp.pts = pv->pts_next;
-        avp.dts = AV_NOPTS_VALUE;
+        avp.pts  = pv->pts_next;
+        avp.dts  = AV_NOPTS_VALUE;
 
-        int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-        int nsamples;
-        int len = avcodec_decode_audio3( context, (int16_t*)buffer, &out_size, &avp );
-        if ( len < 0 )
+        int len = avcodec_decode_audio4(context, &frame, &got_frame, &avp);
+        if ((len < 0) || (!got_frame && !(loop_limit--)))
         {
             return;
         }
-        if ( len == 0 )
-        {
-            if ( !(loop_limit--) )
-                return;
-        }
         else
+        {
             loop_limit = 256;
+        }
 
         pos += len;
-        if( out_size > 0 )
+
+        if (got_frame)
         {
-            int isamp = av_get_bytes_per_sample( context->sample_fmt );
-            nsamples = out_size / isamp;
-            double duration = nsamples * pv->duration;
+            hb_buffer_t *out;
+            double duration = frame.nb_samples * pv->duration;
             double pts_next = pv->pts_next + duration;
 
-            // DTS-HD can be passed through to mkv
-            if( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
+            if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
             {
-                // Note that even though we are doing passthru, we had
-                // to decode so that we know the stop time and the
-                // pts of the next audio packet.
-                hb_buffer_t * buf;
-
-                buf = hb_buffer_init( avp.size );
-                memcpy( buf->data, avp.data, avp.size );
-                buf->start = pv->pts_next;
-                buf->duration = duration;
-                buf->stop  = pts_next;
-                hb_list_add( pv->list, buf );
-                pv->pts_next = pts_next;
-                continue;
+                // Note that even though we are doing passthru, we had to decode
+                // so that we know the stop time and the pts of the next audio
+                // packet.
+                out = hb_buffer_init(avp.size);
+                memcpy(out->data, avp.data, avp.size);
             }
-
-            // We require floats for the output format. If
-            // we got something different convert it.
-            if ( context->sample_fmt != AV_SAMPLE_FMT_FLT )
+            else
             {
-                // Note: av_audio_convert seems to be a work-in-progress but
-                //       looks like it will eventually handle general audio
-                //       mixdowns which would allow us much more flexibility
-                //       in handling multichannel audio in HB. If we were doing
-                //       anything more complicated than a one-for-one format
-                //       conversion we'd probably want to cache the converter
-                //       context in the pv.
-                AVAudioConvert *ctx;
-
-                ctx = av_audio_convert_alloc( AV_SAMPLE_FMT_FLT, 1,
-                                              context->sample_fmt, 1,
-                                              NULL, 0 );
-
-                // get output buffer size then malloc a buffer
-                buffer = av_malloc( nsamples * sizeof(hb_sample_t) );
-
-                // we're doing straight sample format conversion which 
-                // behaves as if there were only one channel.
-                const void * const ibuf[6] = { pv->buffer };
-                void * const obuf[6] = { buffer };
-                const int istride[6] = { isamp };
-                const int ostride[6] = { sizeof(hb_sample_t) };
-
-                av_audio_convert( ctx, obuf, ostride, ibuf, istride, nsamples );
-                av_audio_convert_free( ctx );
+                hb_audio_resample_set_channel_layout(pv->resample,
+                                                     context->channel_layout,
+                                                     context->channels);
+                hb_audio_resample_set_sample_fmt(pv->resample,
+                                                 context->sample_fmt);
+                if (hb_audio_resample_update(pv->resample))
+                {
+                    hb_log("decavcodec: hb_audio_resample_update() failed");
+                    return;
+                }
+                out = hb_audio_resample(pv->resample, frame.extended_data,
+                                        frame.nb_samples);
             }
 
-            hb_buffer_t * buf;
-            buf = downmixAudio( audio, pv, buffer, context->channels, nsamples );
-            buf->start = pv->pts_next;
-            buf->duration = duration;
-            buf->stop = pts_next;
-            hb_list_add( pv->list, buf );
-
-            pv->pts_next = pts_next;
-
-            // if we allocated a buffer for sample format conversion, free it
-            if ( buffer != pv->buffer )
+            if (out != NULL)
             {
-                av_free( buffer );
+                out->s.start    = pv->pts_next;
+                out->s.duration = duration;
+                out->s.stop     = pts_next;
+                pv->pts_next    = pts_next;
+                hb_list_add(pv->list, out);
             }
         }
     }

HandBrake-0.9.8.tar.bz2/libhb/deccc608sub.c -> HandBrake-0.9.9.tar.bz2/libhb/deccc608sub.c Changed

@@ -1497,10 +1497,10 @@
          * Put this subtitle in a hb_buffer_t and shove it into the subtitle fifo
          */
         buffer = hb_buffer_init( length + 1 );
-        buffer->start = wb->data608->current_visible_start_ms;
-        buffer->stop = get_fts(wb);
+        buffer->s.start = wb->data608->current_visible_start_ms;
+        buffer->s.stop = get_fts(wb);
         memcpy( buffer->data, wb->subline, length + 1 );
-        //hb_log("CC %"PRId64": %s", buffer->stop, wb->subline);
+        //hb_log("CC %"PRId64": %s", buffer->s.stop, wb->subline);
 
         if (wb->hb_last_buffer) {
             wb->hb_last_buffer->next = buffer;
@@ -1607,7 +1607,7 @@
     if (debug_608)
     {
         hb_log ("\n- - - SRT caption - - -\n");
-        hb_log (timeline);
+        hb_log ("%s", timeline);
     }
     //fwrite (enc_buffer,enc_buffer_used,1,wb->fh);		
     XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
@@ -1650,8 +1650,8 @@
     if (wb->enc_buffer_used)
     {
         hb_buffer_t *buffer = hb_buffer_init( wb->enc_buffer_used + 1 );
-        buffer->start = ms_start;
-        buffer->stop = ms_end;
+        buffer->s.start = ms_start;
+        buffer->s.stop = ms_end;
         memcpy( buffer->data, wb->enc_buffer, wb->enc_buffer_used + 1 );
         if (wb->hb_last_buffer) {
             wb->hb_last_buffer->next = buffer;
@@ -2504,7 +2504,7 @@
         return HB_WORK_DONE;
     }
 
-    pv->cc608->last_pts = in->start;
+    pv->cc608->last_pts = in->s.start;
 
     process608(in->data, in->size, pv->cc608);

HandBrake-0.9.8.tar.bz2/libhb/declpcm.c -> HandBrake-0.9.9.tar.bz2/libhb/declpcm.c Changed

@@ -1,18 +1,22 @@
-/* $Id: declpcm.c,v 1.8 2005/11/04 14:44:01 titer Exp $
+/* declpcm.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
-#include "downmix.h"
+#include "hbffmpeg.h"
+#include "audio_resample.h"
 
 struct hb_work_private_s
 {
     hb_job_t    *job;
     uint32_t    size;       /* frame size in bytes */
-    uint32_t    chunks;     /* number of samples pairs if paired */
-    uint32_t    samples;    /* frame size in samples */
+    uint32_t    nchunks;     /* number of samples pairs if paired */
+    uint32_t    nsamples;   /* frame size in samples */
     uint32_t    pos;        /* buffer offset for next input data */
 
     int64_t     next_pts;   /* pts for next output frame */
@@ -26,6 +30,10 @@
     uint8_t     sample_size; /* bits per sample */
 
     uint8_t     frame[HB_DVD_READ_BUFFER_SIZE*2];
+    uint8_t   * data;
+    uint32_t    alloc_size;
+
+    hb_audio_resample_t *resample;
 };
 
 static hb_buffer_t * Decode( hb_work_object_t * w );
@@ -48,11 +56,12 @@
 
 static const int hdr2samplerate[] = { 48000, 96000, 44100, 32000 };
 static const int hdr2samplesize[] = { 16, 20, 24, 16 };
-static const int hdr2layout[] = {
-        HB_INPUT_CH_LAYOUT_MONO,   HB_INPUT_CH_LAYOUT_STEREO,
-        HB_INPUT_CH_LAYOUT_2F1R,   HB_INPUT_CH_LAYOUT_2F2R,
-        HB_INPUT_CH_LAYOUT_3F2R,   HB_INPUT_CH_LAYOUT_4F2R,
-        HB_INPUT_CH_LAYOUT_STEREO, HB_INPUT_CH_LAYOUT_STEREO,
+static const uint64_t hdr2layout[] =
+{
+    AV_CH_LAYOUT_MONO,         AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_2_1,          AV_CH_LAYOUT_QUAD,
+    AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_6POINT0_FRONT,
+    AV_CH_LAYOUT_6POINT1,      AV_CH_LAYOUT_7POINT1,
 };
 
 static void lpcmInfo( hb_work_object_t *w, hb_buffer_t *in )
@@ -95,8 +104,8 @@
         hb_log( "declpcm: illegal frame offset %d", pv->offset );
         pv->offset = 2; /*XXX*/
     }
-    pv->samplerate = hdr2samplerate[ ( in->data[4] >> 4 ) & 0x3 ];
-    pv->nchannels  = ( in->data[4] & 7 ) + 1;
+    pv->nchannels   = ( in->data[4] & 7 ) + 1;
+    pv->samplerate  = hdr2samplerate[ ( in->data[4] >> 4 ) & 0x3 ];
     pv->sample_size = hdr2samplesize[in->data[4] >> 6];
 
     // 20 and 24 bit lpcm is always encoded in sample pairs.  So take this
@@ -138,19 +147,30 @@
                    149 ) / 150;
 
     pv->duration = frames * 150;
-    pv->chunks =  ( pv->duration * pv->nchannels * pv->samplerate + 
+    pv->nchunks =  ( pv->duration * pv->nchannels * pv->samplerate + 
                     samples_per_chunk - 1 ) / ( 90000 * samples_per_chunk );
-    pv->samples = ( pv->duration * pv->nchannels * pv->samplerate ) / 90000;
-    pv->size = pv->chunks * chunk_size;
+    pv->nsamples = ( pv->duration * pv->samplerate ) / 90000;
+    pv->size = pv->nchunks * chunk_size;
 
-    pv->next_pts = in->start;
+    pv->next_pts = in->s.start;
 }
 
 static int declpcmInit( hb_work_object_t * w, hb_job_t * job )
 {
     hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
     w->private_data = pv;
-    pv->job   = job;
+    pv->job = job;
+
+    pv->resample =
+        hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
+                               w->audio->config.out.mixdown,
+                               w->audio->config.out.normalize_mix_level);
+    if (pv->resample == NULL)
+    {
+        hb_error("declpcmInit: hb_audio_resample_init() failed");
+        return 1;
+    }
+
     return 0;
 }
 
@@ -213,18 +233,18 @@
     hb_work_private_t *pv = w->private_data;
     hb_buffer_t *out;
  
-    if (pv->samples == 0)
+    if (pv->nsamples == 0)
         return NULL;
 
-    out = hb_buffer_init( pv->samples * sizeof( float ) );
-
-    out->start  = pv->next_pts;
-    out->duration = pv->duration;
-    pv->next_pts += pv->duration;
-    out->stop = pv->next_pts;
+    int size = pv->nsamples * pv->nchannels * sizeof( float );
+    if (pv->alloc_size != size)
+    {
+        pv->data = realloc( pv->data, size );
+        pv->alloc_size = size;
+    }
 
-    float *odat = (float *)out->data;
-    int count = pv->chunks / pv->nchannels;
+    float *odat = (float *)pv->data;
+    int count = pv->nchunks / pv->nchannels;
 
     switch( pv->sample_size )
     {
@@ -308,14 +328,36 @@
             }
         } break;
     }
+
+    hb_audio_resample_set_channel_layout(pv->resample,
+                                         hdr2layout[pv->nchannels - 1],
+                                         pv->nchannels);
+    if (hb_audio_resample_update(pv->resample))
+    {
+        hb_log("declpcm: hb_audio_resample_update() failed");
+        return NULL;
+    }
+    out = hb_audio_resample(pv->resample, &pv->data, pv->nsamples);
+
+    if (out != NULL)
+    {
+        out->s.start    = pv->next_pts;
+        out->s.duration = pv->duration;
+        pv->next_pts   += pv->duration;
+        out->s.stop     = pv->next_pts;
+    }
     return out;
 }
 
 static void declpcmClose( hb_work_object_t * w )
 {
-    if ( w->private_data )
+    hb_work_private_t * pv = w->private_data;
+
+    if ( pv )
     {
-        free( w->private_data );
+        hb_audio_resample_free(pv->resample);
+        free( pv->data );
+        free( pv );
         w->private_data = 0;
     }
 }
@@ -338,7 +380,7 @@
     info->bitrate = bitrate;
     info->flags = ( b->data[3] << 16 ) | ( b->data[4] << 8 ) | b->data[5];
     info->channel_layout = hdr2layout[nchannels - 1];
-    info->channel_map = &hb_qt_chan_map;
+    info->channel_map = &hb_libav_chan_map;
     info->samples_per_frame = ( duration * rate ) / 90000;
 
     return 1;

HandBrake-0.9.8.tar.bz2/libhb/decmetadata.c -> HandBrake-0.9.9.tar.bz2/libhb/decmetadata.c Changed

@@ -1,16 +1,20 @@
-/* decmetadata.c - Extract and decode metadata from the source
+/* decmetadata.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include <mp4v2/mp4v2.h>
 
 #include "common.h"
 
-static void decmp4metadata( hb_title_t *title )
+static int decmp4metadata( hb_title_t *title )
 {
     MP4FileHandle input_file;
+    int result = 0;
     hb_deep_log( 2, "Got an MP4 input, read the metadata");
 
     input_file = MP4Read( title->path, 0 );
@@ -28,35 +32,93 @@
 
         if( tags->name ) {
             hb_deep_log( 2, "Metadata Name in input file is '%s'", tags->name );
-            strncpy( title->metadata->name, tags->name, sizeof(title->metadata->name) );
+            hb_metadata_set_name(title->metadata, tags->name);
+            result = 1;
         }
 
         if( tags->artist )
-            strncpy( title->metadata->artist, tags->artist, sizeof(title->metadata->artist) );
+        {
+            hb_metadata_set_artist(title->metadata, tags->artist);
+            result = 1;
+        }
 
         if( tags->composer )
-            strncpy( title->metadata->composer, tags->composer, sizeof(title->metadata->composer) );
+        {
+            hb_metadata_set_composer(title->metadata, tags->composer);
+            result = 1;
+        }
 
         if( tags->comments )
-            strncpy( title->metadata->comment, tags->comments, sizeof(title->metadata->comment) );
+        {
+            hb_metadata_set_comment(title->metadata, tags->comments);
+            result = 1;
+        }
 
         if( tags->releaseDate )
-            strncpy( title->metadata->release_date, tags->releaseDate, sizeof(title->metadata->release_date) );
+        {
+            hb_metadata_set_release_date(title->metadata, tags->releaseDate);
+            result = 1;
+        }
 
         if( tags->album )
-            strncpy( title->metadata->album, tags->album, sizeof(title->metadata->album) );
+        {
+            hb_metadata_set_album(title->metadata, tags->album);
+            result = 1;
+        }
+
+        if( tags->albumArtist )
+        {
+            hb_metadata_set_album_artist(title->metadata, tags->albumArtist);
+            result = 1;
+        }
 
         if( tags->genre )
-            strncpy( title->metadata->genre, tags->genre, sizeof(title->metadata->genre) );
+        {
+            hb_metadata_set_genre(title->metadata, tags->genre);
+            result = 1;
+        }
+
+        if( tags->description )
+        {
+            hb_metadata_set_description(title->metadata, tags->description);
+            result = 1;
+        }
 
-        if( tags->artworkCount > 0 ) {
-            const MP4TagArtwork* art = tags->artwork + 0; // first element
-            title->metadata->coverart = (uint8_t*)malloc( art->size );
-            title->metadata->coverart_size = art->size;
-            memcpy( title->metadata->coverart, art->data, art->size );
+        if( tags->longDescription )
+        {
+            hb_metadata_set_long_description(title->metadata, tags->longDescription);
+            result = 1;
+        }
+
+        int ii;
+        for ( ii = 0; ii < tags->artworkCount; ii++ )
+        {
+            const MP4TagArtwork* art = tags->artwork + ii;
+            int type;
+            switch ( art->type )
+            {
+                case MP4_ART_BMP:
+                    type = HB_ART_BMP;
+                    break;
+                case MP4_ART_GIF:
+                    type = HB_ART_GIF;
+                    break;
+                case MP4_ART_JPEG:
+                    type = HB_ART_JPEG;
+                    break;
+                case MP4_ART_PNG:
+                    type = HB_ART_PNG;
+                    break;
+                default:
+                    type = HB_ART_UNDEFINED;
+                    break;
+            }
+            hb_metadata_add_coverart(
+                    title->metadata, art->data, art->size, type);
             hb_deep_log( 2, "Got some cover art of type %d, size %d", 
                          art->type,
-                         title->metadata->coverart_size );
+                         art->size );
+            result = 1;
         }
 
         /* store,free tags */
@@ -80,13 +142,27 @@
                 chapter = calloc( sizeof( hb_chapter_t ), 1 );
                 chapter->index = i;
                 chapter->duration = chapter_list[i-1].duration * 90;
-                chapter->hours    = chapter->duration / 90000 / 3600;
-                chapter->minutes  = ( ( chapter->duration / 90000 ) % 3600 ) / 60;
-                chapter->seconds  = ( chapter->duration / 90000 ) % 60;
-                strcpy( chapter->title, chapter_list[i-1].title );
-                hb_deep_log( 2, "Added chapter %i, name='%s', dur=%"PRId64", (%02i:%02i:%02i)", chapter->index, chapter->title, 
-                       chapter->duration, chapter->hours, 
-                       chapter->minutes, chapter->seconds);
+
+                int seconds      = ( chapter->duration + 45000 ) / 90000;
+                chapter->hours   = ( seconds / 3600 );
+                chapter->minutes = ( seconds % 3600 ) / 60;
+                chapter->seconds = ( seconds % 60 );
+
+                if( chapter_list[i-1].title )
+                {
+                    hb_chapter_set_title( chapter, chapter_list[i-1].title );
+                }
+                else
+                {
+                    char chapter_title[80];
+                    sprintf( chapter_title, "Chapter %d", chapter->index );
+                    hb_chapter_set_title( chapter, chapter_title );
+                }
+
+                hb_deep_log( 2, "Added chapter %i, name='%s', dur=%"PRId64", (%02i:%02i:%02i)",
+                             chapter->index, chapter->title, chapter->duration,
+                             chapter->hours, chapter->minutes, chapter->seconds);
+
                 hb_list_add( title->list_chapter, chapter );
                 i++;
             }
@@ -94,6 +170,7 @@
 
         MP4Close( input_file );
     }
+    return result;
 }
 
 /*
@@ -101,24 +178,16 @@
  *
  * Look at the title and extract whatever metadata we can from that title.
  */
-void decmetadata( hb_title_t *title )
+int decmetadata( hb_title_t *title )
 {
     if( !title ) 
     {
-        return;
+        return 0;
     }
     
-    if( title->metadata )
-    {
-        free( title->metadata );
-        title->metadata = NULL;
-    }
-
-    title->metadata = calloc( sizeof(hb_metadata_t), 1);
-
     if( !title->metadata )
     {
-        return;
+        return 0;
     }
 
     /*
@@ -126,9 +195,7 @@
      */
     if( title->container_name && strcmp(title->container_name, "mov,mp4,m4a,3gp,3g2,mj2") == 0 ) 
     {
-        decmp4metadata( title );
-    } else {
-        free( title->metadata );
-        title->metadata = NULL;
+        return decmp4metadata( title );
     }
+    return 0;
 }

HandBrake-0.9.8.tar.bz2/libhb/decmpeg2.c -> HandBrake-0.9.9.tar.bz2/libhb/decmpeg2.c Changed

@@ -1,8 +1,11 @@
-/* $Id: decmpeg2.c,v 1.12 2005/03/03 16:30:42 titer Exp $
+/* decmpeg2.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "hbffmpeg.h"
@@ -41,7 +44,7 @@
     int                  height;
     int                  rate;
     double               aspect_ratio;
-    enum PixelFormat     pixfmt;
+    enum AVPixelFormat   pixfmt;
     int                  got_iframe;        /* set when we get our first iframe */
     int                  look_for_iframe;   /* need an iframe to add chap break */
     int                  look_for_break;    /* need gop start to add chap break */
@@ -57,6 +60,12 @@
         int64_t          start;             // start time of this frame
         hb_buffer_t    * cc_buf;            // captions for this frame
     } tags[NTAGS];
+    uint8_t              cc_tag_pending;
+
+    struct SwsContext *sws_context; // if we have to rescale or convert color space
+    int             sws_width;
+    int             sws_height;
+    int             sws_pix_fmt;
 } hb_libmpeg2_t;
 
 /**********************************************************************
@@ -76,7 +85,7 @@
     int i;
     for ( i = 0; i < NTAGS; ++i )
     {
-        m->tags[i].start = -1;
+        m->tags[i].start = -2;
     }
 
     return m;
@@ -95,7 +104,7 @@
     {
         // make a copy of the buf then forward it to the decoder
         hb_buffer_t *cpy = hb_buffer_init( cc_buf->size );
-        hb_buffer_copy_settings( cpy, cc_buf );
+        cpy->s = cc_buf->s;
         memcpy( cpy->data, cc_buf->data, cc_buf->size );
 
         subtitle = hb_list_item( m->list_subtitle, i++ );
@@ -250,22 +259,38 @@
     {
         if ( m->tags[m->cur_tag].start < 0 ||
              ( m->got_iframe && m->tags[m->cur_tag].start >= m->first_pts ) )
-            hb_log("mpeg2 tag botch: pts %"PRId64", tag pts %"PRId64" buf 0x%p",
-                   buf_es->start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
+            hb_log("mpeg2 tag botch: pts %"PRId64", tag pts %"PRId64" buf %p",
+                   buf_es->s.start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
         if ( m->tags[m->cur_tag].cc_buf )
             hb_buffer_close( &m->tags[m->cur_tag].cc_buf );
     }
-    m->tags[m->cur_tag].start = buf_es->start;
+    m->tags[m->cur_tag].start = buf_es->s.start;
     mpeg2_tag_picture( m->libmpeg2, m->cur_tag, 0 );
 }
 
-static hb_buffer_t *hb_copy_frame( hb_job_t *job, int width, int height,
-                                   int *crop, enum PixelFormat pixfmt,
-                                   uint8_t* y, uint8_t *u, uint8_t *v )
+static hb_buffer_t *hb_copy_frame( hb_libmpeg2_t *m )
 {
+    hb_job_t * job = m->job;
+    int width = m->info->sequence->width;
+    int height = m->info->sequence->height;
+    enum AVPixelFormat pixfmt = m->pixfmt;
+    uint8_t *y = m->info->display_fbuf->buf[0];
+    uint8_t *u = m->info->display_fbuf->buf[1];
+    uint8_t *v = m->info->display_fbuf->buf[2];
+    int crop[4] = {0};
+
     int dst_w, dst_h;
     int src_w, src_h;
 
+    if ( m->info->sequence->picture_width < m->info->sequence->width )
+    {
+        crop[3] = m->info->sequence->width - m->info->sequence->picture_width;
+    }
+    if ( m->info->sequence->picture_height < m->info->sequence->height )
+    {
+        crop[1] = m->info->sequence->height - m->info->sequence->picture_height;
+    }
+
     src_w = width - (crop[2] + crop[3]);
     src_h = height - (crop[0] + crop[1]);
     if ( job )
@@ -280,7 +305,7 @@
     }
 
     hb_buffer_t *buf  = hb_video_buffer_init( dst_w, dst_h );
-    buf->start = -1;
+    buf->s.start = -1;
 
     AVPicture in, out, pic_crop;
 
@@ -290,23 +315,34 @@
     in.linesize[0] = width;
     in.linesize[1] = width>>1;
     in.linesize[2] = width>>1;
-    avpicture_fill( &out, buf->data, PIX_FMT_YUV420P, dst_w, dst_h );
+    hb_avpicture_fill( &out, buf );
 
     av_picture_crop( &pic_crop, &in, pixfmt, crop[0], crop[2] );
 
-    // Source and Dest dimensions may be the same.  There is no speed
-    // cost to using sws_scale to simply copy the data.
-    struct SwsContext *context = hb_sws_get_context( src_w, src_h, pixfmt,
-                                                 dst_w, dst_h, PIX_FMT_YUV420P,
-                                                 SWS_LANCZOS|SWS_ACCURATE_RND);
-    if ( context == NULL )
+    if ( !m->sws_context ||
+         m->sws_width != src_w ||
+         m->sws_height != src_h ||
+         m->sws_pix_fmt != pixfmt )
     {
-        hb_buffer_close( &buf );
-        return NULL;
+        // Source and Dest dimensions may be the same.  There is no speed
+        // cost to using sws_scale to simply copy the data.
+        m->sws_context = hb_sws_get_context( src_w, src_h, pixfmt,
+                                             dst_w, dst_h, buf->f.fmt,
+                                             SWS_LANCZOS|SWS_ACCURATE_RND);
+        m->sws_width = src_w;
+        m->sws_height = src_h;
+        m->sws_pix_fmt = pixfmt;
+
+        if ( m->sws_context == NULL )
+        {
+            hb_buffer_close( &buf );
+            return NULL;
+        }
+
     }
 
-    sws_scale( context, (const uint8_t* const *)pic_crop.data, pic_crop.linesize, 0, src_h, out.data, out.linesize );
-    sws_freeContext( context );
+    sws_scale( m->sws_context, (const uint8_t* const *)pic_crop.data, 
+               pic_crop.linesize, 0, src_h, out.data, out.linesize );
 
     return buf;
 }
@@ -325,9 +361,10 @@
     if ( buf_es->size )
     {
         /* Feed libmpeg2 */
-        if( buf_es->start >= 0 )
+        if( buf_es->s.start >= 0 )
         {
             next_tag( m, buf_es );
+            m->cc_tag_pending = 1;
         }
         mpeg2_buffer( m->libmpeg2, buf_es->data, buf_es->data + buf_es->size );
     }
@@ -350,22 +387,32 @@
             // if we don't have a tag for the captions, make one
             if ( m->last_cc1_buf && m->tags[m->cur_tag].cc_buf != m->last_cc1_buf )
             {
-                if (m->tags[m->cur_tag].cc_buf)
+                // If we have not set a CC tag for the picture and
+                // we have a new CC buffer, make a new tag.
+                if (!m->cc_tag_pending && m->tags[m->cur_tag].cc_buf != NULL)
+                {
+                    next_tag( m, buf_es );
+                }
+                else if (m->tags[m->cur_tag].cc_buf)
                 {
-                    hb_log("mpeg2 tag botch2: pts %"PRId64", tag pts %"PRId64" buf 0x%p",
-                           buf_es->start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
+                    hb_log("mpeg2 tag botch2: pts %"PRId64", tag pts %"PRId64" buf %p",
+                           buf_es->s.start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
                     hb_buffer_close( &m->tags[m->cur_tag].cc_buf );
                 }
                 // see if we already made a tag for the timestamp. If so we
                 // can just use it, otherwise make a new tag.
-                if (m->tags[m->cur_tag].start < 0)
+                if (m->tags[m->cur_tag].start == -2)
                 {
                     next_tag( m, buf_es );
                 }
                 m->tags[m->cur_tag].cc_buf = m->last_cc1_buf;
             }
         }
-        if( state == STATE_SEQUENCE )
+        if( state == STATE_PICTURE )
+        {
+            m->cc_tag_pending = 0;
+        }
+        else if( state == STATE_SEQUENCE )
         {
             if( !( m->width && m->height && m->rate ) )
             {
@@ -388,11 +435,11 @@
             if ( m->info->sequence->width >> 1 == m->info->sequence->chroma_width &&
                  m->info->sequence->height >> 1 == m->info->sequence->chroma_height )
             {
-                m->pixfmt = PIX_FMT_YUV420P;
+                m->pixfmt = AV_PIX_FMT_YUV420P;
             }
             else
             {
-                m->pixfmt = PIX_FMT_YUV422P;
+                m->pixfmt = AV_PIX_FMT_YUV422P;
             }
         }
         else if( state == STATE_GOP && m->look_for_break)
@@ -416,23 +463,7 @@
 
             if( m->got_iframe )
             {
-                int crop[4] = {0};
-                if ( m->info->sequence->picture_width < m->info->sequence->width )
-                {
-                    crop[3] = m->info->sequence->width - m->info->sequence->picture_width;
-                }
-                if ( m->info->sequence->picture_height < m->info->sequence->height )
-                {
-                    crop[1] = m->info->sequence->height - m->info->sequence->picture_height;
-                }
-                buf  = hb_copy_frame( m->job, 
-                                      m->info->sequence->width,
-                                      m->info->sequence->height,
-                                      crop,
-                                      m->pixfmt,
-                                      m->info->display_fbuf->buf[0],
-                                      m->info->display_fbuf->buf[1],
-                                      m->info->display_fbuf->buf[2] );
+                buf  = hb_copy_frame( m );
                 if ( buf == NULL )
                     continue;
 
@@ -442,29 +473,29 @@
                 if( m->info->display_picture->flags & PIC_FLAG_TAGS )
                 {
                     int t = m->info->display_picture->tag;
-                    buf->start = m->tags[t].start;
+                    buf->s.start = m->tags[t].start;
                     cc_buf = m->tags[t].cc_buf;
-                    m->tags[t].start = -1;
+                    m->tags[t].start = -2;
                     m->tags[t].cc_buf = NULL;
                 }
-                if( buf->start < 0 && m->last_pts >= 0 )
+                if( buf->s.start < 0 && m->last_pts >= 0 )
                 {
                     /* For some reason nb_fields is sometimes 1 while it
                        should be 2 */
-                    buf->start = m->last_pts +
+                    buf->s.start = m->last_pts +
                         MAX( 2, m->info->display_picture->nb_fields ) *
                         m->info->sequence->frame_period / 600;
                 }
-                if ( buf->start >= 0 )
+                if ( buf->s.start >= 0 )
                 {
-                    m->last_pts = buf->start;
+                    m->last_pts = buf->s.start;
                 }
 
                 // if we were accumulating captions we now know the timestamp
                 // so ship them to the decoder.
                 if ( cc_buf )
                 {
-                    cc_buf->start = m->last_pts;
+                    cc_buf->s.start = m->last_pts;
                     cc_send_to_decoder( m, cc_buf );
                 }
 
@@ -473,31 +504,35 @@
                 {
                     // we were waiting for an iframe to insert a chapter mark
                     // and we have one.
-                    buf->new_chap = m->look_for_iframe;
+                    int new_chap = m->look_for_iframe;
+                    buf->s.new_chap = new_chap;
+
                     m->look_for_iframe = 0;
                     const char *chap_name = "";
-                    if ( m->job && buf->new_chap > 0 &&
-                         hb_list_item( m->job->title->list_chapter,
-                                       buf->new_chap - 1 ) )
+                    if ( m->job && new_chap > 0 &&
+                         hb_list_item( m->job->list_chapter,
+                                       new_chap - 1 ) )
                     {
-                        hb_chapter_t * c = hb_list_item( m->job->title->list_chapter,
-                                                         buf->new_chap - 1 );
+                        hb_chapter_t * c = hb_list_item( 
+                                                 m->job->list_chapter,
+                                                 new_chap - 1 );
                         chap_name = c->title;
                     }
                     hb_log( "mpeg2: \"%s\" (%d) at frame %u time %"PRId64,
-                            chap_name, buf->new_chap, m->nframes, buf->start );
+                            chap_name, new_chap, 
+                            m->nframes, buf->s.start );
                 }
                 else if ( m->nframes == 0 )
                 {
                     // this is the first frame returned by the decoder
-                    m->first_pts = buf->start;
-                    if ( m->job && hb_list_item( m->job->title->list_chapter,
+                    m->first_pts = buf->s.start;
+                    if ( m->job && hb_list_item( m->job->list_chapter,
                                                  m->job->chapter_start - 1 ) )
                     {
-                        hb_chapter_t * c = hb_list_item( m->job->title->list_chapter,
+                        hb_chapter_t * c = hb_list_item( m->job->list_chapter,
                                                          m->job->chapter_start - 1 );
                         hb_log( "mpeg2: \"%s\" (%d) at frame %u time %"PRId64,
-                                c->title, m->job->chapter_start, m->nframes, buf->start );
+                                c->title, m->job->chapter_start, m->nframes, buf->s.start );
                     }
                 }
                 ++m->nframes;
@@ -505,7 +540,7 @@
                 m->flag = m->info->display_picture->flags;
 
 /*  Uncomment this block to see frame-by-frame picture flags, as the video encodes.
-               hb_log("***** MPEG 2 Picture Info for PTS %"PRId64" *****", buf->start);
+               hb_log("***** MPEG 2 Picture Info for PTS %"PRId64" *****", buf->s.start);
                 if( m->flag & TOP_FIRST )
                     hb_log("MPEG2 Flag: Top field first");
                 if( m->flag & PROGRESSIVE )
@@ -584,12 +619,11 @@
                 }
 
                 if ( (m->cadence[2] <= TB) && (m->cadence[1] <= TB) && (m->cadence[0] > TB) && (m->cadence[11]) )
-                    hb_log("%fs: Video -> Film", (float)buf->start / 90000);
+                    hb_log("%fs: Video -> Film", (float)buf->s.start / 90000);
                 if ( (m->cadence[2] > TB) && (m->cadence[1] <= TB) && (m->cadence[0] <= TB) && (m->cadence[11]) )
-                    hb_log("%fs: Film -> Video", (float)buf->start / 90000);
+                    hb_log("%fs: Film -> Video", (float)buf->s.start / 90000);
 
-                /* Store picture flags for later use by filters */
-                buf->flags = m->info->display_picture->flags;
+                buf->s.flags = m->info->display_picture->flags;
 
                 hb_list_add( list_raw, buf );
             }
@@ -635,6 +669,7 @@
                 subtitle->format = TEXTSUB;
                 subtitle->source = CC608SUB;
                 subtitle->config.dest = PASSTHRUSUB;
+                subtitle->codec = WORK_DECCC608;
                 subtitle->type = 5; 
                 snprintf( subtitle->lang, sizeof( subtitle->lang ), "Closed Captions");
                 /*
@@ -645,7 +680,7 @@
                 if( audio )
                 {
                     snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), 
-                              audio->config.lang.iso639_2);
+                              "%s", audio->config.lang.iso639_2);
                 } else {
                     snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "und");
                 }
@@ -667,6 +702,11 @@
 
     mpeg2_close( m->libmpeg2 );
 
+    if ( m->sws_context )
+    {
+        sws_freeContext( m->sws_context );
+    }
+
     int i;
     for ( i = 0; i < NTAGS; ++i )
     {
@@ -754,6 +794,7 @@
 {
     hb_work_private_t * pv = w->private_data;
     hb_buffer_t * buf, * last = NULL;
+    hb_buffer_t * in = *buf_in;
     int status = HB_WORK_OK;
 
     if( w->title && pv && pv->libmpeg2 && !pv->libmpeg2->title ) {
@@ -763,21 +804,21 @@
     // The reader found a chapter break. Remove it from the input 
     // stream. If we're reading (as opposed to scanning) start looking
     // for the next GOP start since that's where the chapter begins.
-    if( (*buf_in)->new_chap )
+    if( in->s.new_chap )
     {
         if ( pv->libmpeg2->job )
         {
-            pv->libmpeg2->look_for_break = (*buf_in)->new_chap;
+            pv->libmpeg2->look_for_break = in->s.new_chap;
         }
-        (*buf_in)->new_chap = 0;
+        in->s.new_chap = 0;
     }
 
-    hb_libmpeg2_decode( pv->libmpeg2, *buf_in, pv->list );
+    hb_libmpeg2_decode( pv->libmpeg2, in, pv->list );
 
     /* if we got an empty buffer signaling end-of-stream send it downstream */
-    if ( (*buf_in)->size == 0 )
+    if ( in->size == 0 )
     {
-        hb_list_add( pv->list, *buf_in );
+        hb_list_add( pv->list, in );
         *buf_in = NULL;
         status = HB_WORK_DONE;
 
@@ -869,6 +910,82 @@
         info->profile = m->info->sequence->profile_level_id >> 4;
         info->level = m->info->sequence->profile_level_id & 0xf;
         info->name = "mpeg2";
+
+        if( pv->libmpeg2->info->sequence->flags & SEQ_FLAG_COLOUR_DESCRIPTION )
+        {
+            switch( pv->libmpeg2->info->sequence->colour_primaries )
+            {
+                case 1: // ITU-R Recommendation 709
+                    info->color_prim = HB_COLR_PRI_BT709;
+                    break;
+                case 5: // ITU-R Recommendation 624-4 System B, G
+                    info->color_prim = HB_COLR_PRI_EBUTECH;
+                    break;
+                case 4: // ITU-R Recommendation 624-4 System M
+                case 6: // SMPTE 170M
+                case 7: // SMPTE 240M
+                    info->color_prim = HB_COLR_PRI_SMPTEC;
+                    break;
+                default:
+                    info->color_prim = HB_COLR_PRI_UNDEF;
+                    break;
+            }
+            switch( pv->libmpeg2->info->sequence->transfer_characteristics )
+            {
+                case 1: // ITU-R Recommendation 709
+                case 4: // ITU-R Recommendation 624-4 System M
+                case 5: // ITU-R Recommendation 624-4 System B, G
+                case 6: // SMPTE 170M
+                    info->color_transfer = HB_COLR_TRA_BT709;
+                    break;
+                case 7: // SMPTE 240M
+                    info->color_transfer = HB_COLR_TRA_SMPTE240M;
+                    break;
+                default:
+                    info->color_transfer = HB_COLR_TRA_UNDEF;
+                    break;
+            }
+            switch( pv->libmpeg2->info->sequence->matrix_coefficients )
+            {
+                case 1: // ITU-R Recommendation 709
+                    info->color_matrix = HB_COLR_MAT_BT709;
+                    break;
+                case 4: // FCC
+                case 5: // ITU-R Recommendation 624-4 System B, G
+                case 6: // SMPTE 170M
+                    info->color_matrix = HB_COLR_MAT_SMPTE170M;
+                    break;
+                case 7: // SMPTE 240M
+                    info->color_matrix = HB_COLR_MAT_SMPTE240M;
+                    break;
+                default:
+                    info->color_matrix = HB_COLR_MAT_UNDEF;
+                    break;
+            }
+        }
+        else if( ( info->width >= 1280 || info->height >= 720 ) ||
+                 ( info->width >   720 && info->height >  576 ) )
+        {
+            // ITU BT.709 HD content
+            info->color_prim     = HB_COLR_PRI_BT709;
+            info->color_transfer = HB_COLR_TRA_BT709;
+            info->color_matrix   = HB_COLR_MAT_BT709;
+        }
+        else if( info->rate_base == 1080000 )
+        {
+            // ITU BT.601 DVD or SD TV content (PAL)
+            info->color_prim     = HB_COLR_PRI_EBUTECH;
+            info->color_transfer = HB_COLR_TRA_BT709;
+            info->color_matrix   = HB_COLR_MAT_SMPTE170M;
+        }
+        else
+        {
+            // ITU BT.601 DVD or SD TV content (NTSC)
+            info->color_prim     = HB_COLR_PRI_SMPTEC;
+            info->color_transfer = HB_COLR_TRA_BT709;
+            info->color_matrix   = HB_COLR_MAT_SMPTE170M;
+        }
+
         return 1;
     }
     return 0;

HandBrake-0.9.8.tar.bz2/libhb/decomb.c -> HandBrake-0.9.9.tar.bz2/libhb/decomb.c Changed

@@ -1,8 +1,10 @@
-/* $Id: decomb.c,v 1.14 2008/04/25 5:00:00 jbrjake Exp $
+/* decomb.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
 
    The yadif algorithm was created by Michael Niedermayer.
    Tritical's work inspired much of the comb detection code:
@@ -27,13 +29,14 @@
 Original "Faster" settings:
     7:2:6:9:1:80:16:16:10:20:20:4:2:50:24:1:-1
 *****/
-
 #define MODE_YADIF       1 // Use yadif
 #define MODE_BLEND       2 // Use blending interpolation
 #define MODE_CUBIC       4 // Use cubic interpolation
 #define MODE_EEDI2       8 // Use EEDI2 interpolation
 #define MODE_MCDEINT    16 // Post-process with mcdeint
 #define MODE_MASK       32 // Output combing masks instead of pictures
+#define MODE_BOB        64 // Deinterlace each field to a separate frame
+
 #define MODE_GAMMA      128 // Scale gamma when decombing
 #define MODE_FILTER     256 // Filter combing mask
 #define MODE_COMPOSITE  512 // Overlay combing mask onto picture
@@ -79,6 +82,7 @@
 #include "mpeg2dec/mpeg2.h"
 #include "eedi2.h"
 #include "mcdeint.h"
+#include "taskset.h"
 
 #define PARITY_DEFAULT   -1
 
@@ -103,24 +107,13 @@
 #define DST2MPF 4
 
 struct yadif_arguments_s {
-    uint8_t **dst;
+    hb_buffer_t *dst;
     int parity;
     int tff;
-    int stop;
     int is_combed;
 };
 
-struct decomb_arguments_s {
-    int stop;
-};
-
-struct eedi2_arguments_s {
-    int stop;
-};
-
 typedef struct yadif_arguments_s yadif_arguments_t;
-typedef struct decomb_arguments_s decomb_arguments_t;
-typedef struct eedi2_arguments_s eedi2_arguments_t;
 
 typedef struct eedi2_thread_arg_s {
     hb_filter_private_t *pv;
@@ -130,19 +123,19 @@
 typedef struct decomb_thread_arg_s {
     hb_filter_private_t *pv;
     int segment;
+    int segment_start[3];
+    int segment_height[3];
 } decomb_thread_arg_t;
 
 typedef struct yadif_thread_arg_s {
     hb_filter_private_t *pv;
     int segment;
+    int segment_start[3];
+    int segment_height[3];
 } yadif_thread_arg_t;
 
 struct hb_filter_private_s
 {
-    int              pix_fmt;
-    int              width[3];
-    int              height[3];
-
     // Decomb parameters
     int              mode;
     int              filter_mode;
@@ -152,6 +145,11 @@
     int              block_threshold;
     int              block_width;
     int              block_height;
+    int            * block_score;
+    int              comb_check_complete;
+    int              comb_check_nthreads;
+    int              skip_comb_check;
+    int              is_combed;
 
     float            gamma_lut[256];
 
@@ -177,72 +175,57 @@
     int              blended_frames;
     int              unfiltered_frames;
 
-    uint8_t        * ref[4][3];
-    int              ref_stride[3];
+    hb_buffer_t    * ref[3];
 
     /* Make buffers to store a comb masks. */
-    uint8_t        * mask[3];
-    uint8_t        * mask_filtered[3];
-    uint8_t        * mask_temp[3];
+    hb_buffer_t    * mask;
+    hb_buffer_t    * mask_filtered;
+    hb_buffer_t    * mask_temp;
     int              mask_box_x;
     int              mask_box_y;
     uint8_t          mask_box_color;
 
 
-    uint8_t        * eedi_half[4][3];
-    uint8_t        * eedi_full[5][3];
+    hb_buffer_t    * eedi_half[4];
+    hb_buffer_t    * eedi_full[5];
     int            * cx2;
     int            * cy2;
     int            * cxy;
     int            * tmpc;
 
-    AVPicture        pic_in;
-    AVPicture        pic_out;
-    hb_buffer_t *    buf_out[2];
-    hb_buffer_t *    buf_settings;
-
     int              cpu_count;
+    int              segment_height[3];
 
-    hb_thread_t    ** yadif_threads;         // Threads for Yadif - one per CPU
-    hb_lock_t      ** yadif_begin_lock;      // Thread has work
-    hb_lock_t      ** yadif_complete_lock;   // Thread has completed work
-    yadif_arguments_t *yadif_arguments;      // Arguments to thread for work
+    taskset_t        yadif_taskset;       // Threads for Yadif - one per CPU
+    yadif_arguments_t *yadif_arguments;   // Arguments to thread for work
 
-    hb_thread_t    ** decomb_threads;        // Threads for comb detection - one per CPU
-    hb_lock_t      ** decomb_begin_lock;     // Thread has work
-    hb_lock_t      ** decomb_complete_lock;  // Thread has completed work
-    decomb_arguments_t *decomb_arguments;    // Arguments to thread for work
+    taskset_t        decomb_filter_taskset; // Threads for comb detection
+    taskset_t        decomb_check_taskset;  // Threads for comb check
+    taskset_t        mask_filter_taskset; // Threads for decomb mask filter
+    taskset_t        mask_erode_taskset;  // Threads for decomb mask erode
+    taskset_t        mask_dilate_taskset; // Threads for decomb mask dilate
 
-    hb_thread_t    ** eedi2_threads;        // Threads for eedi2 - one per plane
-    hb_lock_t      ** eedi2_begin_lock;     // Thread has work
-    hb_lock_t      ** eedi2_complete_lock;  // Thread has completed work
-    eedi2_arguments_t *eedi2_arguments;    // Arguments to thread for work
-
-//    int              alternator;           // for bobbing parity when framedoubling
+    taskset_t        eedi2_taskset;       // Threads for eedi2 - one per plane
 };
 
-hb_filter_private_t * hb_decomb_init( int pix_fmt,
-                                           int width,
-                                           int height,
-                                           char * settings );
+static int hb_decomb_init( hb_filter_object_t * filter,
+                           hb_filter_init_t * init );
 
-int hb_decomb_work(      const hb_buffer_t * buf_in,
-                         hb_buffer_t ** buf_out,
-                         int pix_fmt,
-                         int width,
-                         int height,
-                         hb_filter_private_t * pv );
+static int hb_decomb_work( hb_filter_object_t * filter,
+                           hb_buffer_t ** buf_in,
+                           hb_buffer_t ** buf_out );
 
-void hb_decomb_close( hb_filter_private_t * pv );
+static void hb_decomb_close( hb_filter_object_t * filter );
 
 hb_filter_object_t hb_filter_decomb =
 {
-    FILTER_DECOMB,
-    "Decomb",
-    NULL,
-    hb_decomb_init,
-    hb_decomb_work,
-    hb_decomb_close,
+    .id            = HB_FILTER_DECOMB,
+    .enforce_order = 1,
+    .name          = "Decomb",
+    .settings      = NULL,
+    .init          = hb_decomb_init,
+    .work          = hb_decomb_work,
+    .close         = hb_decomb_close,
 };
 
 int cubic_interpolate_pixel( int y0, int y1, int y2, int y3 )
@@ -263,14 +246,15 @@
     return result;
 }
 
-static void cubic_interpolate_line( uint8_t *dst,
-                               uint8_t *cur,
-                               int plane,
-                               int y,
-                               hb_filter_private_t * pv )
+static void cubic_interpolate_line(
+        uint8_t *dst,
+        uint8_t *cur,
+        int width,
+        int height,
+        int stride,
+        int y)
 {
-    int w = pv->width[plane];
-    int refs = pv->ref_stride[plane];
+    int w = width;
     int x;
 
     for( x = 0; x < w; x++)
@@ -281,39 +265,39 @@
         if( y >= 3 )
         {
             /* Normal top*/
-            a = cur[-3*refs];
-            b = cur[-refs];
+            a = cur[-3*stride];
+            b = cur[-stride];
         }
         else if( y == 2 || y == 1 )
         {
             /* There's only one sample above this pixel, use it twice. */
-            a = cur[-refs];
-            b = cur[-refs];
+            a = cur[-stride];
+            b = cur[-stride];
         }
         else if( y == 0 )
         {
             /* No samples above, triple up on the one below. */
-            a = cur[+refs];
-            b = cur[+refs];
+            a = cur[+stride];
+            b = cur[+stride];
         }
 
-        if( y <= ( pv->height[plane] - 4 ) )
+        if( y <= ( height - 4 ) )
         {
             /* Normal bottom*/
-            c = cur[+refs];
-            d = cur[3*refs];
+            c = cur[+stride];
+            d = cur[3*stride];
         }
-        else if( y == ( pv->height[plane] - 3 ) || y == ( pv->height[plane] - 2 ) )
+        else if( y == ( height - 3 ) || y == ( height - 2 ) )
         {
             /* There's only one sample below, use it twice. */
-            c = cur[+refs];
-            d = cur[+refs];
+            c = cur[+stride];
+            d = cur[+stride];
         }
-        else if( y == pv->height[plane] - 1)
+        else if( y == height - 1)
         {
             /* No samples below, triple up on the one above. */
-            c = cur[-refs];
-            d = cur[-refs];
+            c = cur[-stride];
+            d = cur[-stride];
         }
 
         dst[0] = cubic_interpolate_pixel( a, b, c, d );
@@ -329,8 +313,19 @@
     int y = pv->mask_box_y;
     int box_width = pv->block_width;
     int box_height = pv->block_height;
-    int stride = pv->ref_stride[0];
-    uint8_t * mskp = ( pv->mode & MODE_FILTER ) ? pv->mask_filtered[0] : pv->mask[0];
+    int stride;
+    uint8_t * mskp;
+
+    if (pv->mode & MODE_FILTER)
+    {
+        mskp = pv->mask_filtered->plane[0].data;
+        stride = pv->mask_filtered->plane[0].stride;
+    }
+    else
+    {
+        mskp = pv->mask->plane[0].data;
+        stride = pv->mask->plane[0].stride;
+    }
 
 
     int block_x, block_y;
@@ -355,7 +350,7 @@
 
     for( x = 0; x < width; x++ )
     {
-        if( mskp[x] == 255 )
+        if( mskp[x] == 1 )
         {
             srcp[x] = 255;
         }
@@ -366,93 +361,54 @@
     }
 }
 
-void apply_mask( hb_filter_private_t * pv )
+void apply_mask(hb_filter_private_t * pv, hb_buffer_t * b)
 {
-
     /* draw_boxes */
     draw_mask_box( pv );
 
-    int plane, height;
+    int pp, yy;
+    hb_buffer_t * m;
 
-    for( plane = 0; plane < 3; plane++ )
+    if (pv->mode & MODE_FILTER)
+    {
+        m = pv->mask_filtered;
+    }
+    else
     {
-        uint8_t * srcp = ( pv->mode & MODE_MCDEINT ) ? pv->pic_in.data[plane] : pv->pic_out.data[plane];
-        uint8_t * mskp = ( pv->mode & MODE_FILTER ) ? pv->mask_filtered[plane] : pv->mask[plane];
+        m = pv->mask;
+    }
+    for (pp = 0; pp < 3; pp++)
+    {
+        uint8_t * dstp = b->plane[pp].data;
+        uint8_t * mskp = m->plane[pp].data;
 
-        for( height = 0; height < pv->height[plane]; height++ )
+        for( yy = 0; yy < m->plane[pp].height; yy++ )
         {
-            if( !(pv->mode & MODE_COMPOSITE) && plane == 0 )
+            if (!(pv->mode & MODE_COMPOSITE) && pp == 0)
             {
-                memcpy( srcp, mskp, pv->width[plane] );
+                memcpy(dstp, mskp, m->plane[pp].width);
             }
-            else if( !(pv->mode & MODE_COMPOSITE) )
+            else if (!(pv->mode & MODE_COMPOSITE))
             {
-                memset( srcp, 128, pv->width[plane] );
+                memset(dstp, 128, m->plane[pp].width);
             }
-            else if( plane == 0 )
+            else if (pp == 0)
             {
-                apply_mask_line( srcp, mskp, pv->width[plane] );
+                apply_mask_line(dstp, mskp, m->plane[pp].width);
             }
 
-            srcp += pv->pic_out.linesize[plane];
-            mskp += pv->ref_stride[plane];
-        }
-    }
-}
-
-static void store_ref( const uint8_t ** pic,
-                             hb_filter_private_t * pv )
-{
-    memcpy( pv->ref[3],
-            pv->ref[0],
-            sizeof(uint8_t *)*3 );
-
-    memmove( pv->ref[0],
-             pv->ref[1],
-             sizeof(uint8_t *)*3*3 );
-
-    int i;
-    for( i = 0; i < 3; i++ )
-    {
-        const uint8_t * src = pic[i];
-        uint8_t * ref = pv->ref[2][i];
-
-        int w = pv->width[i];
-        int h = pv->height[i];
-        int ref_stride = pv->ref_stride[i];
-
-        int y;
-        for( y = 0; y < h; y++ )
-        {
-            memcpy(ref, src, w);
-            src = (uint8_t*)src + w;
-            ref = (uint8_t*)ref + ref_stride;
+            dstp += b->plane[pp].stride;
+            mskp += m->plane[pp].stride;
         }
     }
 }
 
-/* This function may be useful in the future, if we want to output
-   a reference to an AVPicture, since they have different strides.
-static void get_ref( uint8_t ** pic, hb_filter_private_t * pv, int frm )
+static void store_ref(hb_filter_private_t * pv, hb_buffer_t * b)
 {
-    int i;
-    for( i = 0; i < 3; i++ )
-    {
-        uint8_t * dst = pic[i];
-        const uint8_t * ref = pv->ref[frm][i];
-        int w = pv->width[i];
-        int ref_stride = pv->ref_stride[i];
-
-        int y;
-        for( y = 0; y < pv->height[i]; y++ )
-        {
-            memcpy(dst, ref, w);
-            dst += w;
-            ref += ref_stride;
-        }
-    }
+    hb_buffer_close(&pv->ref[0]);
+    memmove(&pv->ref[0], &pv->ref[1], sizeof(hb_buffer_t *) * 2 );
+    pv->ref[2] = b;
 }
-*/
 
 int blend_filter_pixel( int up2, int up1, int current, int down1, int down2 )
 {
@@ -479,265 +435,124 @@
 
 static void blend_filter_line( uint8_t *dst,
                                uint8_t *cur,
-                               int plane,
-                               int y,
-                               hb_filter_private_t * pv )
+                               int width,
+                               int height,
+                               int stride,
+                               int y)
 {
-    int w = pv->width[plane];
-    int refs = pv->ref_stride[plane];
+    int w = width;
     int x;
+    int up1, up2, down1, down2;
 
-    for( x = 0; x < w; x++)
+    if (y > 1 && y < (height - 2))
     {
-        int a, b, c, d, e;
-
-        a = cur[-2*refs];
-        b = cur[-refs];
-        c = cur[0];
-        d = cur[+refs];
-        e = cur[2*refs];
-
-        if( y == 0 )
-        {
-            /* First line, so A and B don't exist.*/
-            a = cur[0];
-            b = cur[0];
-        }
-        else if( y == 1 )
-        {
-            /* Second line, no A. */
-            a = cur[-refs];
-        }
-        else if( y == (pv->height[plane] - 2) )
-        {
-            /* Second to last line, no E. */
-            e = cur[+refs];
-        }
-        else if( y == (pv->height[plane] -1) )
-        {
-            /* Last line, no D or E. */
-            d = cur[0];
-            e = cur[0];
-        }
+        up1 = -1 * stride;
+        up2 = -2 * stride;
+        down1 = 1 * stride;
+        down2 = 2 * stride;
+    }
+    else if (y == 0)
+    {
+        /* First line, so A and B don't exist.*/
+        up1 = up2 = 0;
+        down1 = 1 * stride;
+        down2 = 2 * stride;
+    }
+    else if (y == 1)
+    {
+        /* Second line, no A. */
+        up1 = up2 = -1 * stride;
+        down1 = 1 * stride;
+        down2 = 2 * stride;
+    }
+    else if (y == (height - 2))
+    {
+        /* Second to last line, no E. */
+        up1 = -1 * stride;
+        up2 = -2 * stride;
+        down1 = down2 = 1 * stride;
+    }
+    else if (y == (height -1))
+    {
+        /* Last line, no D or E. */
+        up1 = -1 * stride;
+        up2 = -2 * stride;
+        down1 = down2 = 0;
+    }
+    else
+    {
+        hb_error("Invalid value y %d heigh %d", y, height);
+        return;
+    }
 
-        dst[0] = blend_filter_pixel( a, b, c, d, e );
+    for( x = 0; x < w; x++)
+    {
+        dst[0] = blend_filter_pixel( cur[up2], cur[up1], cur[0],
+                                     cur[down1], cur[down2] );
 
         dst++;
         cur++;
     }
 }
 
-void erode_combing_mask( hb_filter_private_t * pv )
+void reset_combing_results( hb_filter_private_t * pv )
 {
-    //Take in mask, output to mask_temp
-    int x, y, k;
-
-    uint8_t * cur;
-    uint8_t * dst;
-
-    int count;
-
-    int erosion_threshold = 2;
-
-    int ref;
-    for( k = 0; k < 1; k++ )
+    pv->comb_check_complete = 0;
+    int ii;
+    for (ii = 0; ii < pv->comb_check_nthreads; ii++)
     {
-        ref = pv->ref_stride[k];
-
-        for( y = 1; y < pv->height[k] -1; y++ )
-        {
-            cur = &pv->mask_temp[k][y*ref];
-            dst = &pv->mask_filtered[k][y*ref];
-
-            for( x = 1; x < pv->width[k]-1; x++ )
-            {
-                if( cur[0] == 0 )
-                {
-                    dst[0] = 0;
-                    cur++;
-                    dst++;
-                    continue;
-                }
-
-                count = 0;
-                if( cur[-ref-1] == 255 )
-                    ++count;
-                if( cur[-ref] == 255 )
-                    ++count;
-                if( cur[-ref+1] == 255 )
-                    ++count;
-                if( cur[-1] == 255 )
-                    ++count;
-                if( cur[+1] == 255 )
-                    ++count;
-                if( cur[ref-1] == 255 )
-                    ++count;
-                if( cur[ref] == 255 )
-                    ++count;
-                if( cur[ref+1] == 255 )
-                    ++count;
-
-                if( count < erosion_threshold )
-                    dst[0] = 0;
-                else
-                    dst[0] = 255;
-
-                cur++;
-                dst++;
-            }
-        }
+       pv->block_score[ii] = 0;
     }
 }
 
-void dilate_combing_mask( hb_filter_private_t * pv )
+int check_combing_results( hb_filter_private_t * pv )
 {
-    //Take in mask_temp, output to mask
-    int x, y, k;
-
-    uint8_t * curp;
-    uint8_t * cur;
-    uint8_t * curn;
-    uint8_t * dst;
-
-    int count;
-
-    int dilation_threshold = 4;
+    int threshold       = pv->block_threshold;
+    int send_to_blend = 0;
 
-    int ref;
-    for( k = 0; k < 1; k++ )
+    int ii;
+    for (ii = 0; ii < pv->comb_check_nthreads; ii++)
     {
-        ref = pv->ref_stride[k];
-
-        for( y = 1; y < pv->height[k] -1; y++ )
+        if( pv->block_score[ii] >= ( threshold / 2 ) )
         {
-            curp = &pv->mask_filtered[k][(y-1)*ref];
-            cur  = &pv->mask_filtered[k][y*ref];
-            curn = &pv->mask_filtered[k][(y+1)*ref];
-            dst = &pv->mask_temp[k][y*ref];
-
-            for( x = 1; x < pv->width[k]-1; x++ )
+            if (pv->block_score[ii] <= threshold &&
+                !( pv->ref[1]->s.flags & 16) )
             {
-                if( cur[0] == 255 )
-                {
-                    dst[0] = 255;
-                    curp++;
-                    cur++;
-                    curn++;
-                    dst++;
-                    continue;
-                }
-
-                count = 0;
-                if( curp[-1] == 255 )
-                    ++count;
-                if( curp[0] == 255 )
-                    ++count;
-                if( curp[+1] == 255 )
-                    ++count;
-                if( cur[-1] == 255 )
-                    ++count;
-                if( cur[+1] == 255 )
-                    ++count;
-                if( curn[-1] == 255 )
-                    ++count;
-                if( curn[0] == 255 )
-                    ++count;
-                if( curn[+1] == 255 )
-                    ++count;
-
-                if( count >= dilation_threshold )
-                    dst[0] = 255;
-                else
-                    dst[0] = 0;
-
-                curp++;
-                cur++;
-                curn++;
-                dst++;
+                /* Blend video content that scores between
+                   ( threshold / 2 ) and threshold.        */
+                send_to_blend = 1;
+                pv->mask_box_color = 2;
             }
-        }
-    }
-}
-
-
-void filter_combing_mask( hb_filter_private_t * pv )
-{
-    int x, y, k;
-
-    uint8_t * curp;
-    uint8_t * cur;
-    uint8_t * curn;
-    uint8_t * dst;
-
-    int h_count, v_count;
-
-    int ref;
-    for( k = 0; k < 1; k++ )
-    {
-        ref = pv->ref_stride[k];
-
-        for( y = 0; y < pv->height[k] -1; y++ )
-        {
-            curp = &pv->mask[k][(y-1)*ref];
-            cur = &pv->mask[k][y*ref];
-            curn = &pv->mask[k][(y+1)*ref];
-            dst = (pv->filter_mode == FILTER_CLASSIC ) ? &pv->mask_filtered[k][y*ref] : &pv->mask_temp[k][y*ref] ;
-
-            for( x = 0; x < pv->width[k]-1; x++ )
+            else if( pv->block_score[ii] > threshold )
             {
-
-                h_count = v_count = 0;
-                if( x == 0 )
-                {
-                    if( cur[0] == 255 && cur[1] == 255 )
-                        h_count++;
-                }
-                else if( x == pv->width[k]-1 )
-                {
-                    if( cur[-1] == 255 && cur[0] == 255 )
-                        h_count++;
-                }
-                else
-                {
-                    if(cur[-1] == 255 && cur[0] == 255 && cur[1] == 255 )
-                        h_count++;
-                }
-
-                if( y == 0 )
-                {
-                    if( cur[0] == 255 && curn[0] == 255 )
-                        v_count++;
-                }
-                else if( y == pv->height[k]-1 )
+                if( pv->ref[1]->s.flags & 16 )
                 {
-                    if( curp[0] == 255 && cur[0] == 255 )
-                        v_count++;
+                    /* Blend progressive content above the threshold.*/
+                    pv->mask_box_color = 2;
+                    return 2;
                 }
                 else
                 {
-                    if( curp[0] == 255 && cur[0] == 255 && curn[0] == 255 )
-                        v_count++;
+                    /* Yadif deinterlace video content above the threshold. */
+                    pv->mask_box_color = 1;
+                    return 1;
                 }
-
-                if( h_count && pv->filter_mode == FILTER_CLASSIC )
-                    dst[0] = 255;
-                else if( pv->filter_mode == FILTER_CLASSIC )
-                    dst[0] = 0;
-                else if( h_count && v_count )
-                    dst[0] = 255;
-                else
-                    dst[0] = 0;
-
-                curp++;
-                cur++;
-                curn++;
-                dst++;
             }
         }
     }
+
+    if( send_to_blend )
+    {
+        return 2;
+    }
+    else
+    {
+        /* Consider this frame to be uncombed. */
+        return 0;
+    }
 }
 
-int check_filtered_combing_mask( hb_filter_private_t * pv )
+void check_filtered_combing_mask( hb_filter_private_t * pv, int segment, int start, int stop )
 {
     /* Go through the mask in X*Y blocks. If any of these windows
        have threshold or more combed pixels, consider the whole
@@ -751,84 +566,61 @@
     int block_width     = pv->block_width;
     int block_height    = pv->block_height;
     int block_x, block_y;
-    int block_score = 0; int send_to_blend = 0;
+    int block_score = 0;
     uint8_t * mask_p;
-    int x, y, k;
+    int x, y, pp;
 
-    for( k = 0; k < 1; k++ )
+    for( pp = 0; pp < 1; pp++ )
     {
-        int ref_stride = pv->ref_stride[k];
+        int stride = pv->mask_filtered->plane[pp].stride;
+        int width = pv->mask_filtered->plane[pp].width;
+
         pv->mask_box_x = -1;
         pv->mask_box_y = -1;
         pv->mask_box_color = 0;
 
-        for( y = 0; y < ( pv->height[k] - block_height ); y = y + block_height )
+        for( y = start; y < ( stop - block_height + 1 ); y = y + block_height )
         {
-            for( x = 0; x < ( pv->width[k] - block_width ); x = x + block_width )
+            for( x = 0; x < ( width - block_width ); x = x + block_width )
             {
                 block_score = 0;
 
                 for( block_y = 0; block_y < block_height; block_y++ )
                 {
-                    int mask_y = y + block_y;
-                    mask_p = &pv->mask_filtered[k][mask_y*ref_stride + x];
+                    int my = y + block_y;
+                    mask_p = &pv->mask_filtered->plane[pp].data[my*stride + x];
 
                     for( block_x = 0; block_x < block_width; block_x++ )
                     {
-
-                        if( mask_p[ 0 ] == 255 )
-                            block_score++;
+                        block_score += mask_p[0];
                         mask_p++;
                     }
                 }
 
+                if (pv->comb_check_complete)
+                {
+                    // Some other thread found coming before this one
+                    return;
+                }
+
                 if( block_score >= ( threshold / 2 ) )
                 {
-#if 0
-                    hb_log("decomb: frame %i | score %i | type %s", pv->deinterlaced_frames + pv->blended_frames +  pv->unfiltered_frames + 1, block_score, pv->buf_settings->flags & 16 ? "Film" : "Video");
-#endif
                     pv->mask_box_x = x;
                     pv->mask_box_y = y;
 
-                   if ( block_score <= threshold && !( pv->buf_settings->flags & 16) )
-                    {
-                        /* Blend video content that scores between
-                           ( threshold / 2 ) and threshold.        */
-                        send_to_blend = 1;
-                        pv->mask_box_color = 2;
-                    }
-                    else if( block_score > threshold )
+                    pv->block_score[segment] = block_score;
+                    if( block_score > threshold )
                     {
-                        if( pv->buf_settings->flags & 16 )
-                        {
-                            /* Blend progressive content above the threshold.*/
-                            pv->mask_box_color = 2;
-                            return 2;
-                        }
-                        else
-                        {
-                            /* Yadif deinterlace video content above the threshold. */
-                            pv->mask_box_color = 1;
-                            return 1;
-                        }
+                        pv->comb_check_complete = 1;
+                        return;
                     }
                 }
             }
         }
     }
-
-    if( send_to_blend )
-    {
-        return 2;
-    }
-    else
-    {
-        /* Consider this frame to be uncombed. */
-        return 0;
-    }
 }
 
-int check_combing_mask( hb_filter_private_t * pv )
+void check_combing_mask( hb_filter_private_t * pv, int segment, int start, int stop )
 {
     /* Go through the mask in X*Y blocks. If any of these windows
        have threshold or more combed pixels, consider the whole
@@ -842,23 +634,25 @@
     int block_width     = pv->block_width;
     int block_height    = pv->block_height;
     int block_x, block_y;
-    int block_score = 0; int send_to_blend = 0;
+    int block_score = 0;
     uint8_t * mask_p;
-    int x, y, k;
+    int x, y, pp;
 
-    for( k = 0; k < 1; k++ )
+    for( pp = 0; pp < 1; pp++ )
     {
-        int ref_stride = pv->ref_stride[k];
-        for( y = 0; y < ( pv->height[k] - block_height ); y = y + block_height )
+        int stride = pv->mask->plane[pp].stride;
+        int width = pv->mask->plane[pp].width;
+
+        for (y = start; y < (stop - block_height + 1); y = y + block_height)
         {
-            for( x = 0; x < ( pv->width[k] - block_width ); x = x + block_width )
+            for (x = 0; x < (width - block_width); x = x + block_width)
             {
                 block_score = 0;
 
                 for( block_y = 0; block_y < block_height; block_y++ )
                 {
                     int mask_y = y + block_y;
-                    mask_p = &pv->mask[k][mask_y*ref_stride + x];
+                    mask_p = &pv->mask->plane[pp].data[mask_y * stride + x];
 
                     for( block_x = 0; block_x < block_width; block_x++ )
                     {
@@ -867,94 +661,42 @@
                            handle the sides separately.       */
                         if( (x + block_x) == 0 )
                         {
-                            if( mask_p[ 0 ] == 255 &&
-                                mask_p[ 1 ] == 255 )
-                                    block_score++;
+                            block_score += mask_p[0] & mask_p[1];
                         }
-                        else if( (x + block_x) == (pv->width[k] -1) )
+                        else if( (x + block_x) == (width -1) )
                         {
-                            if( mask_p[ -1 ] == 255 &&
-                                mask_p[  0 ] == 255 )
-                                    block_score++;
+                            block_score += mask_p[-1] & mask_p[0];
                         }
                         else
                         {
-                            if( mask_p[ -1 ] == 255 &&
-                                mask_p[  0 ] == 255 &&
-                                mask_p[  1 ] == 255 )
-                                    block_score++;
+                            block_score += mask_p[-1] & mask_p[0] & mask_p[1];
                         }
 
-#if 0
-                         if( (y + block_y) == 0 )
-                         {
-                             if( mask_p[ 0 ] == 255 &&
-                                 mask_p[ ref_stride ] == 255 )
-                                     block_score++;
-                         }
-                         else if( (y + block_y) == (pv->height[k] -1) )
-                         {
-                             if( mask_p[ -ref_stride ] == 255 &&
-                                 mask_p[  0 ] == 255 )
-                                     block_score++;
-                         }
-                         else
-                         {
-                             if( mask_p[ -ref_stride ] == 255 &&
-                                 mask_p[  0 ] == 255 &&
-                                 mask_p[  +ref_stride ] == 255 )
-                                     block_score++;
-                         }
-#endif
                         mask_p++;
                     }
                 }
 
-                if( block_score >= ( threshold / 2 ) )
+                if (pv->comb_check_complete)
                 {
-#if 0
-                    hb_log("decomb: frame %i | score %i | type %s", pv->deinterlaced_frames + pv->blended_frames +  pv->unfiltered_frames + 1, block_score, pv->buf_settings->flags & 16 ? "Film" : "Video");
-#endif
+                    // Some other thread found coming before this one
+                    return;
+                }
 
+                if( block_score >= ( threshold / 2 ) )
+                {
                     pv->mask_box_x = x;
                     pv->mask_box_y = y;
 
-                    if ( block_score <= threshold && !( pv->buf_settings->flags & 16) )
-                    {
-                        /* Blend video content that scores between
-                           ( threshold / 2 ) and threshold.        */
-                        send_to_blend = 1;
-                        pv->mask_box_color = 2;
-                    }
-                    else if( block_score > threshold )
+                    pv->block_score[segment] = block_score;
+                    if( block_score > threshold )
                     {
-                        if( pv->buf_settings->flags & 16 )
-                        {
-                            /* Blend progressive content above the threshold.*/
-                            pv->mask_box_color = 2;
-                            return 2;
-                        }
-                        else
-                        {
-                            /* Yadif deinterlace video content above the threshold. */
-                            pv->mask_box_color = 1;
-                            return 1;
-                        }
+                        pv->comb_check_complete = 1;
+                        return;
                     }
                 }
             }
         }
     }
-
-    if( send_to_blend )
-    {
-        return 2;
-    }
-    else
-    {
-        /* Consider this frame to be uncombed. */
-        return 0;
-    }
 }
 
 void build_gamma_lut( hb_filter_private_t * pv )
@@ -978,8 +720,6 @@
        AviSynth and tritical's IsCombedT and
        IsCombedTIVTC plugins.                       */
 
-    int x, y, k, width, height;
-
     /* Comb scoring algorithm */
     /* Motion threshold */
     float mthresh         = (float)pv->motion_threshold / (float)255;
@@ -988,11 +728,13 @@
     float athresh6        = 6 *athresh;
 
     /* One pas for Y, one pass for U, one pass for V */
-    for( k = 0; k < 1; k++ )
+    int pp;
+    for( pp = 0; pp < 1; pp++ )
     {
-        int ref_stride  = pv->ref_stride[k];
-        width           = pv->width[k];
-        height          = pv->height[k];
+        int x, y;
+        int stride  = pv->ref[0]->plane[pp].stride;
+        int width   = pv->ref[0]->plane[pp].width;
+        int height  = pv->ref[0]->plane[pp].height;
 
         /* Comb detection has to start at y = 2 and end at
            y = height - 2, because it needs to examine
@@ -1005,22 +747,25 @@
         for( y =  segment_start; y < segment_stop; y++ )
         {
             /* These are just to make the buffer locations easier to read. */
-            int up_2    = -2*ref_stride ;
-            int up_1    = -1*ref_stride;
-            int down_1 = ref_stride;
-            int down_2 = 2*ref_stride;
+            int up_2    = -2 * stride ;
+            int up_1    = -1 * stride;
+            int down_1  =      stride;
+            int down_2  =  2 * stride;
 
             /* We need to examine a column of 5 pixels
                in the prev, cur, and next frames.      */
-            uint8_t * cur = &pv->ref[1][k][y*ref_stride];
-            uint8_t * prev = &pv->ref[0][k][y*ref_stride];
-            uint8_t * next = &pv->ref[2][k][y*ref_stride];
-            uint8_t * mask = &pv->mask[k][y*ref_stride];
+            uint8_t * prev = &pv->ref[0]->plane[pp].data[y * stride];
+            uint8_t * cur  = &pv->ref[1]->plane[pp].data[y * stride];
+            uint8_t * next = &pv->ref[2]->plane[pp].data[y * stride];
+            uint8_t * mask = &pv->mask->plane[pp].data[y * stride];
+
+            memset(mask, 0, stride);
 
             for( x = 0; x < width; x++ )
             {
-                float up_diff   = pv->gamma_lut[cur[0]] - pv->gamma_lut[cur[up_1]];
-                float down_diff = pv->gamma_lut[cur[0]] - pv->gamma_lut[cur[down_1]];
+                float up_diff, down_diff;
+                up_diff   = pv->gamma_lut[cur[0]] - pv->gamma_lut[cur[up_1]];
+                down_diff = pv->gamma_lut[cur[0]] - pv->gamma_lut[cur[down_1]];
 
                 if( ( up_diff >  athresh && down_diff >  athresh ) ||
                     ( up_diff < -athresh && down_diff < -athresh ) )
@@ -1060,28 +805,13 @@
                                          - ( 3 * ( pv->gamma_lut[cur[up_1]]
                                                  + pv->gamma_lut[cur[down_1]] ) ) );
                         /* If the frame is sufficiently combed,
-                           then mark it down on the mask as 255. */
-
- //                              hb_log("combing: %f, athresh6: %f", combing, athresh6);
+                           then mark it down on the mask as 1. */
                         if( combing > athresh6 )
                         {
-                            mask[0] = 255;
-                        }
-                        else
-                        {
-                            mask[0] = 0;
+                            mask[0] = 1;
                         }
-
-                    }
-                    else
-                    {
-                        mask[0] = 0;
                     }
                 }
-                else
-                {
-                    mask[0] = 0;
-                }
 
                 cur++;
                 prev++;
@@ -1100,7 +830,6 @@
        AviSynth and tritical's IsCombedT and
        IsCombedTIVTC plugins.                       */
 
-    int x, y, k, width, height;
 
     /* Comb scoring algorithm */
     int spatial_metric  = pv->spatial_metric;
@@ -1109,14 +838,16 @@
     /* Spatial threshold */
     int athresh         = pv->spatial_threshold;
     int athresh_squared = athresh * athresh;
-    int athresh6        = 6 *athresh;
+    int athresh6        = 6 * athresh;
 
     /* One pas for Y, one pass for U, one pass for V */
-    for( k = 0; k < 1; k++ )
+    int pp;
+    for( pp = 0; pp < 1; pp++ )
     {
-        int ref_stride  = pv->ref_stride[k];
-        width           = pv->width[k];
-        height          = pv->height[k];
+        int x, y;
+        int stride  = pv->ref[0]->plane[pp].stride;
+        int width   = pv->ref[0]->plane[pp].width;
+        int height  = pv->ref[0]->plane[pp].height;
 
         /* Comb detection has to start at y = 2 and end at
            y = height - 2, because it needs to examine
@@ -1129,17 +860,19 @@
         for( y =  segment_start; y < segment_stop; y++ )
         {
             /* These are just to make the buffer locations easier to read. */
-            int up_2    = -2*ref_stride ;
-            int up_1    = -1*ref_stride;
-            int down_1 = ref_stride;
-            int down_2 = 2*ref_stride;
+            int up_2    = -2 * stride ;
+            int up_1    = -1 * stride;
+            int down_1  =      stride;
+            int down_2  =  2 * stride;
 
             /* We need to examine a column of 5 pixels
                in the prev, cur, and next frames.      */
-            uint8_t * cur = &pv->ref[1][k][y*ref_stride];
-            uint8_t * prev = &pv->ref[0][k][y*ref_stride];
-            uint8_t * next = &pv->ref[2][k][y*ref_stride];
-            uint8_t * mask = &pv->mask[k][y*ref_stride];
+            uint8_t * prev = &pv->ref[0]->plane[pp].data[y * stride];
+            uint8_t * cur  = &pv->ref[1]->plane[pp].data[y * stride];
+            uint8_t * next = &pv->ref[2]->plane[pp].data[y * stride];
+            uint8_t * mask = &pv->mask->plane[pp].data[y * stride];
+
+            memset(mask, 0, stride);
 
             for( x = 0; x < width; x++ )
             {
@@ -1181,11 +914,7 @@
                             if( ( abs( cur[0] - cur[down_2] ) < 10  ) &&
                                 ( abs( cur[0] - cur[down_1] ) > 15 ) )
                             {
-                                mask[0] = 255;
-                            }
-                            else
-                            {
-                                mask[0] = 0;
+                                mask[0] = 1;
                             }
                         }
                         else if( spatial_metric == 1 )
@@ -1196,9 +925,9 @@
                                              ( cur[down_1] - cur[0] );
 
                                if( combing > athresh_squared )
-                                   mask[0] = 255;
-                               else
-                                   mask[0] = 0;
+                               {
+                                   mask[0] = 1;
+                               }
                         }
                         else if( spatial_metric == 2 )
                         {
@@ -1211,25 +940,13 @@
                                                      + cur[down_1] ) ) );
 
                             /* If the frame is sufficiently combed,
-                               then mark it down on the mask as 255. */
+                               then mark it down on the mask as 1. */
                             if( combing > athresh6 )
                             {
-                                mask[0] = 255;
-                            }
-                            else
-                            {
-                                mask[0] = 0;
+                                mask[0] = 1;
                             }
                         }
                     }
-                    else
-                    {
-                        mask[0] = 0;
-                    }
-                }
-                else
-                {
-                    mask[0] = 0;
                 }
 
                 cur++;
@@ -1243,28 +960,29 @@
 
 // This function calls all the eedi2 filters in sequence for a given plane.
 // It outputs the final interpolated image to pv->eedi_full[DST2PF].
-void eedi2_interpolate_plane( hb_filter_private_t * pv, int k )
+void eedi2_interpolate_plane( hb_filter_private_t * pv, int plane )
 {
     /* We need all these pointers. No, seriously.
        I swear. It's not a joke. They're used.
        All nine of them.                         */
-    uint8_t * mskp = pv->eedi_half[MSKPF][k];
-    uint8_t * srcp = pv->eedi_half[SRCPF][k];
-    uint8_t * tmpp = pv->eedi_half[TMPPF][k];
-    uint8_t * dstp = pv->eedi_half[DSTPF][k];
-    uint8_t * dst2p = pv->eedi_full[DST2PF][k];
-    uint8_t * tmp2p2 = pv->eedi_full[TMP2PF2][k];
-    uint8_t * msk2p = pv->eedi_full[MSK2PF][k];
-    uint8_t * tmp2p = pv->eedi_full[TMP2PF][k];
-    uint8_t * dst2mp = pv->eedi_full[DST2MPF][k];
+    uint8_t * mskp = pv->eedi_half[MSKPF]->plane[plane].data;
+    uint8_t * srcp = pv->eedi_half[SRCPF]->plane[plane].data;
+    uint8_t * tmpp = pv->eedi_half[TMPPF]->plane[plane].data;
+    uint8_t * dstp = pv->eedi_half[DSTPF]->plane[plane].data;
+    uint8_t * dst2p = pv->eedi_full[DST2PF]->plane[plane].data;
+    uint8_t * tmp2p2 = pv->eedi_full[TMP2PF2]->plane[plane].data;
+    uint8_t * msk2p = pv->eedi_full[MSK2PF]->plane[plane].data;
+    uint8_t * tmp2p = pv->eedi_full[TMP2PF]->plane[plane].data;
+    uint8_t * dst2mp = pv->eedi_full[DST2MPF]->plane[plane].data;
     int * cx2 = pv->cx2;
     int * cy2 = pv->cy2;
     int * cxy = pv->cxy;
     int * tmpc = pv->tmpc;
 
-    int pitch = pv->ref_stride[k];
-    int height = pv->height[k]; int width = pv->width[k];
-    int half_height = height / 2;
+    int pitch = pv->eedi_full[0]->plane[plane].stride;
+    int height = pv->eedi_full[0]->plane[plane].height;
+    int width = pv->eedi_full[0]->plane[plane].width;
+    int half_height = pv->eedi_half[0]->plane[plane].height;
 
     // edge mask
     eedi2_build_edge_mask( mskp, pitch, srcp, pitch,
@@ -1276,7 +994,7 @@
     eedi2_remove_small_gaps( tmpp, pitch, mskp, pitch, half_height, width );
 
     // direction mask
-    eedi2_calc_directions( k, mskp, pitch, srcp, pitch, tmpp, pitch,
+    eedi2_calc_directions( plane, mskp, pitch, srcp, pitch, tmpp, pitch,
                      pv->maximum_search_distance, pv->noise_threshold,
                      half_height, width );
     eedi2_filter_dir_map( mskp, pitch, tmpp, pitch, dstp, pitch, half_height, width );
@@ -1296,13 +1014,13 @@
     eedi2_fill_gaps_2x( msk2p, pitch, dst2mp, pitch, tmp2p, pitch, pv->tff, height, width );
 
     // interpolate a full-size plane
-    eedi2_interpolate_lattice( k, tmp2p, pitch, dst2p, pitch, tmp2p2, pitch, pv->tff,
+    eedi2_interpolate_lattice( plane, tmp2p, pitch, dst2p, pitch, tmp2p2, pitch, pv->tff,
                          pv->noise_threshold, height, width );
 
     if( pv->post_processing == 1 || pv->post_processing == 3 )
     {
         // make sure the edge directions are consistent
-        eedi2_bit_blit( tmp2p2, pitch, tmp2p, pitch, pv->width[k], pv->height[k] );
+        eedi2_bit_blit( tmp2p2, pitch, tmp2p, pitch, width, height );
         eedi2_filter_dir_map_2x( msk2p, pitch, tmp2p, pitch, dst2mp, pitch, pv->tff, height, width );
         eedi2_expand_dir_map_2x( msk2p, pitch, dst2mp, pitch, tmp2p, pitch, pv->tff, height, width );
         eedi2_post_process( tmp2p, pitch, tmp2p2, pitch, dst2p, pitch, pv->tff, height, width );
@@ -1324,9 +1042,7 @@
  */
 void eedi2_filter_thread( void *thread_args_v )
 {
-    eedi2_arguments_t *eedi2_work = NULL;
     hb_filter_private_t * pv;
-    int run = 1;
     int plane;
     eedi2_thread_arg_t *thread_args = thread_args_v;
 
@@ -1335,36 +1051,33 @@
 
     hb_log("eedi2 thread started for plane %d", plane);
 
-    while( run )
+    while (1)
     {
         /*
-         * Wait here until there is work to do. hb_lock() blocks until
-         * render releases it to say that there is more work to do.
+         * Wait here until there is work to do.
          */
-        hb_lock( pv->eedi2_begin_lock[plane] );
+        taskset_thread_wait4start( &pv->eedi2_taskset, plane );
 
-        eedi2_work = &pv->eedi2_arguments[plane];
-
-        if( eedi2_work->stop )
+        if( taskset_thread_stop( &pv->eedi2_taskset, plane ) )
         {
             /*
              * No more work to do, exit this thread.
              */
-            run = 0;
-            continue;
+            break;
         }
 
         /*
          * Process plane
          */
-            eedi2_interpolate_plane( pv, plane );
-
+        eedi2_interpolate_plane( pv, plane );
+        
         /*
          * Finished this segment, let everyone know.
          */
-        hb_unlock( pv->eedi2_complete_lock[plane] );
+        taskset_thread_complete( &pv->eedi2_taskset, plane );
     }
-    free( thread_args_v );
+
+    taskset_thread_complete( &pv->eedi2_taskset, plane );
 }
 
 // Sets up the input field planes for EEDI2 in pv->eedi_half[SRCPF]
@@ -1372,164 +1085,511 @@
 void eedi2_planer( hb_filter_private_t * pv )
 {
     /* Copy the first field from the source to a half-height frame. */
-    int i;
-    for( i = 0;  i < 3; i++ )
+    int pp;
+    for( pp = 0;  pp < 3; pp++ )
     {
-        int pitch = pv->ref_stride[i];
+        int pitch = pv->ref[1]->plane[pp].stride;
+        int height = pv->ref[1]->plane[pp].height;
         int start_line = !pv->tff;
-        eedi2_fill_half_height_buffer_plane( &pv->ref[1][i][pitch*start_line], pv->eedi_half[SRCPF][i], pitch, pv->height[i] );
-    }
 
-    int plane;
-    for( plane = 0; plane < 3; plane++ )
-    {
-        /*
-         * Let the thread for this plane know that we've setup work
-         * for it by releasing the begin lock (ensuring that the
-         * complete lock is already locked so that we block when
-         * we try to lock it again below).
-         */
-        hb_lock( pv->eedi2_complete_lock[plane] );
-        hb_unlock( pv->eedi2_begin_lock[plane] );
+        eedi2_fill_half_height_buffer_plane(
+                &pv->ref[1]->plane[pp].data[pitch * start_line],
+                pv->eedi_half[SRCPF]->plane[pp].data, pitch, height );
     }
 
     /*
-     * Wait until all three threads have completed by trying to get
-     * the complete lock that we locked earlier for each thread, which
-     * will block until that thread has completed the work on that
-     * plane.
+     * Now that all data is ready for our threads, fire them off
+     * and wait for their completion.
      */
-    for( plane = 0; plane < 3; plane++ )
-    {
-        hb_lock( pv->eedi2_complete_lock[plane] );
-        hb_unlock( pv->eedi2_complete_lock[plane] );
-    }
+    taskset_cycle( &pv->eedi2_taskset );
 }
 
 
-/*
- * comb detect this segment of all three planes in a single thread.
- */
-void decomb_filter_thread( void *thread_args_v )
+void mask_dilate_thread( void *thread_args_v )
 {
-    decomb_arguments_t *decomb_work = NULL;
     hb_filter_private_t * pv;
-    int run = 1;
-    int segment, segment_start, segment_stop, plane;
+    int segment, segment_start, segment_stop;
     decomb_thread_arg_t *thread_args = thread_args_v;
 
     pv = thread_args->pv;
     segment = thread_args->segment;
 
-    hb_log("decomb thread started for segment %d", segment);
+    hb_log("mask dilate thread started for segment %d", segment);
 
-    while( run )
+    while (1)
     {
         /*
-         * Wait here until there is work to do. hb_lock() blocks until
-         * render releases it to say that there is more work to do.
+         * Wait here until there is work to do.
          */
-        hb_lock( pv->decomb_begin_lock[segment] );
-
-        decomb_work = &pv->decomb_arguments[segment];
+        taskset_thread_wait4start( &pv->mask_dilate_taskset, segment );
 
-        if( decomb_work->stop )
+        if (taskset_thread_stop(&pv->mask_dilate_taskset, segment))
         {
             /*
              * No more work to do, exit this thread.
              */
-            run = 0;
-            continue;
-        }
+            break;
+        } 
 
-        /*
-         * Process segment (for now just from luma)
-         */
-        for( plane = 0; plane < 1; plane++)
+        int xx, yy, pp;
+
+        int count;
+        int dilation_threshold = 4;
+
+        for( pp = 0; pp < 1; pp++ )
         {
+            int width = pv->mask_filtered->plane[pp].width;
+            int height = pv->mask_filtered->plane[pp].height;
+            int stride = pv->mask_filtered->plane[pp].stride;
+
+            int start, stop, p, c, n;
+            segment_start = thread_args->segment_start[pp];
+            segment_stop = segment_start + thread_args->segment_height[pp];
 
-            int h = pv->height[plane];
-            segment_start = ( h / pv->cpu_count ) * segment;
-            if( segment == pv->cpu_count - 1 )
+            if (segment_start == 0)
             {
-                /*
-                 * Final segment
-                 */
-                segment_stop = h;
-            } else {
-                segment_stop = ( h / pv->cpu_count ) * ( segment + 1 );
+                start = 1;
+                p = 0;
+                c = 1;
+                n = 2;
+            }
+            else
+            {
+                start = segment_start;
+                p = segment_start - 1;
+                c = segment_start;
+                n = segment_start + 1;
             }
 
-            if( pv->mode & MODE_GAMMA )
+            if (segment_stop == height)
             {
-                detect_gamma_combed_segment( pv, segment_start, segment_stop );
+                stop = height -1;
             }
             else
             {
-                detect_combed_segment( pv, segment_start, segment_stop );
+                stop = segment_stop;
+            }
+
+            uint8_t *curp = &pv->mask_filtered->plane[pp].data[p * stride + 1];
+            uint8_t *cur  = &pv->mask_filtered->plane[pp].data[c * stride + 1];
+            uint8_t *curn = &pv->mask_filtered->plane[pp].data[n * stride + 1];
+            uint8_t *dst = &pv->mask_temp->plane[pp].data[c * stride + 1];
+
+            for( yy = start; yy < stop; yy++ )
+            {
+                for( xx = 1; xx < width - 1; xx++ )
+                {
+                    if (cur[xx])
+                    {
+                        dst[xx] = 1;
+                        continue;
+                    }
+
+                    count = curp[xx-1] + curp[xx] + curp[xx+1] +
+                            cur [xx-1] +            cur [xx+1] +
+                            curn[xx-1] + curn[xx] + curn[xx+1];
+
+                    dst[xx] = count >= dilation_threshold;
+                }
+                curp += stride;
+                cur += stride;
+                curn += stride;
+                dst += stride;
             }
         }
-        /*
-         * Finished this segment, let everyone know.
-         */
-        hb_unlock( pv->decomb_complete_lock[segment] );
+
+        taskset_thread_complete( &pv->mask_dilate_taskset, segment );
     }
-    free( thread_args_v );
+
+    /*
+     * Finished this segment, let everyone know.
+     */
+    taskset_thread_complete( &pv->mask_dilate_taskset, segment );
 }
 
-int comb_segmenter( hb_filter_private_t * pv )
+void mask_erode_thread( void *thread_args_v )
 {
-    int segment;
+    hb_filter_private_t * pv;
+    int segment, segment_start, segment_stop;
+    decomb_thread_arg_t *thread_args = thread_args_v;
+
+    pv = thread_args->pv;
+    segment = thread_args->segment;
+
+    hb_log("mask erode thread started for segment %d", segment);
 
-    for( segment = 0; segment < pv->cpu_count; segment++ )
+    while (1)
     {
         /*
-         * Let the thread for this plane know that we've setup work
-         * for it by releasing the begin lock (ensuring that the
-         * complete lock is already locked so that we block when
-         * we try to lock it again below).
+         * Wait here until there is work to do.
          */
-        hb_lock( pv->decomb_complete_lock[segment] );
-        hb_unlock( pv->decomb_begin_lock[segment] );
+        taskset_thread_wait4start( &pv->mask_erode_taskset, segment );
+
+        if( taskset_thread_stop( &pv->mask_erode_taskset, segment ) )
+        {
+            /*
+             * No more work to do, exit this thread.
+             */
+            break;
+        } 
+
+        int xx, yy, pp;
+
+        int count;
+        int erosion_threshold = 2;
+
+        for( pp = 0; pp < 1; pp++ )
+        {
+            int width = pv->mask_filtered->plane[pp].width;
+            int height = pv->mask_filtered->plane[pp].height;
+            int stride = pv->mask_filtered->plane[pp].stride;
+
+            int start, stop, p, c, n;
+            segment_start = thread_args->segment_start[pp];
+            segment_stop = segment_start + thread_args->segment_height[pp];
+
+            if (segment_start == 0)
+            {
+                start = 1;
+                p = 0;
+                c = 1;
+                n = 2;
+            }
+            else
+            {
+                start = segment_start;
+                p = segment_start - 1;
+                c = segment_start;
+                n = segment_start + 1;
+            }
+
+            if (segment_stop == height)
+            {
+                stop = height -1;
+            }
+            else
+            {
+                stop = segment_stop;
+            }
+
+            uint8_t *curp = &pv->mask_temp->plane[pp].data[p * stride + 1];
+            uint8_t *cur  = &pv->mask_temp->plane[pp].data[c * stride + 1];
+            uint8_t *curn = &pv->mask_temp->plane[pp].data[n * stride + 1];
+            uint8_t *dst = &pv->mask_filtered->plane[pp].data[c * stride + 1];
+
+            for( yy = start; yy < stop; yy++ )
+            {
+                for( xx = 1; xx < width - 1; xx++ )
+                {
+                    if( cur[xx] == 0 )
+                    {
+                        dst[xx] = 0;
+                        continue;
+                    }
+
+                    count = curp[xx-1] + curp[xx] + curp[xx+1] +
+                            cur [xx-1] +            cur [xx+1] +
+                            curn[xx-1] + curn[xx] + curn[xx+1];
+
+                    dst[xx] = count >= erosion_threshold;
+                }
+                curp += stride;
+                cur += stride;
+                curn += stride;
+                dst += stride;
+            }
+        }
+
+        taskset_thread_complete( &pv->mask_erode_taskset, segment );
+    }
+
+    /*
+     * Finished this segment, let everyone know.
+     */
+    taskset_thread_complete( &pv->mask_erode_taskset, segment );
+}
+
+void mask_filter_thread( void *thread_args_v )
+{
+    hb_filter_private_t * pv;
+    int segment, segment_start, segment_stop;
+    decomb_thread_arg_t *thread_args = thread_args_v;
+
+    pv = thread_args->pv;
+    segment = thread_args->segment;
+
+    hb_log("mask filter thread started for segment %d", segment);
+
+    while (1)
+    {
+        /*
+         * Wait here until there is work to do.
+         */
+        taskset_thread_wait4start( &pv->mask_filter_taskset, segment );
+
+        if( taskset_thread_stop( &pv->mask_filter_taskset, segment ) )
+        {
+            /*
+             * No more work to do, exit this thread.
+             */
+            break;
+        } 
+
+        int xx, yy, pp;
+
+        for( pp = 0; pp < 1; pp++ )
+        {
+            int width = pv->mask->plane[pp].width;
+            int height = pv->mask->plane[pp].height;
+            int stride = pv->mask->plane[pp].stride;
+
+            int start, stop, p, c, n;
+            segment_start = thread_args->segment_start[pp];
+            segment_stop = segment_start + thread_args->segment_height[pp];
+
+            if (segment_start == 0)
+            {
+                start = 1;
+                p = 0;
+                c = 1;
+                n = 2;
+            }
+            else
+            {
+                start = segment_start;
+                p = segment_start - 1;
+                c = segment_start;
+                n = segment_start + 1;
+            }
+
+            if (segment_stop == height)
+            {
+                stop = height - 1;
+            }
+            else
+            {
+                stop = segment_stop;
+            }
+
+            uint8_t *curp = &pv->mask->plane[pp].data[p * stride + 1];
+            uint8_t *cur = &pv->mask->plane[pp].data[c * stride + 1];
+            uint8_t *curn = &pv->mask->plane[pp].data[n * stride + 1];
+            uint8_t *dst = (pv->filter_mode == FILTER_CLASSIC ) ?
+                &pv->mask_filtered->plane[pp].data[c * stride + 1] :
+                &pv->mask_temp->plane[pp].data[c * stride + 1] ;
+
+            for( yy = start; yy < stop; yy++ )
+            {
+                for( xx = 1; xx < width - 1; xx++ )
+                {
+                    int h_count, v_count;
+
+                    h_count = cur[xx-1] & cur[xx] & cur[xx+1];
+                    v_count = curp[xx] & cur[xx] & curn[xx];
+
+                    if (pv->filter_mode == FILTER_CLASSIC)
+                    {
+                        dst[xx] = h_count;
+                    }
+                    else
+                    {
+                        dst[xx] = h_count & v_count;
+                    }
+                }
+                curp += stride;
+                cur += stride;
+                curn += stride;
+                dst += stride;
+            }
+        }
+
+        taskset_thread_complete( &pv->mask_filter_taskset, segment );
+    }
+
+    /*
+     * Finished this segment, let everyone know.
+     */
+    taskset_thread_complete( &pv->mask_filter_taskset, segment );
+}
+
+void decomb_check_thread( void *thread_args_v )
+{
+    hb_filter_private_t * pv;
+    int segment, segment_start, segment_stop;
+    decomb_thread_arg_t *thread_args = thread_args_v;
+
+    pv = thread_args->pv;
+    segment = thread_args->segment;
+
+    hb_log("decomb check thread started for segment %d", segment);
+
+    while (1)
+    {
+        /*
+         * Wait here until there is work to do.
+         */
+        taskset_thread_wait4start( &pv->decomb_check_taskset, segment );
+
+        if( taskset_thread_stop( &pv->decomb_check_taskset, segment ) )
+        {
+            /*
+             * No more work to do, exit this thread.
+             */
+            break;
+        } 
+
+        segment_start = thread_args->segment_start[0];
+        segment_stop = segment_start + thread_args->segment_height[0];
+
+        if( pv->mode & MODE_FILTER )
+        {
+            check_filtered_combing_mask(pv, segment, segment_start, segment_stop);
+        }
+        else
+        {
+            check_combing_mask(pv, segment, segment_start, segment_stop);
+        }
+
+        taskset_thread_complete( &pv->decomb_check_taskset, segment );
     }
 
     /*
-     * Wait until all three threads have completed by trying to get
-     * the complete lock that we locked earlier for each thread, which
-     * will block until that thread has completed the work on that
-     * plane.
+     * Finished this segment, let everyone know.
      */
-    for( segment = 0; segment < pv->cpu_count; segment++ )
+    taskset_thread_complete( &pv->decomb_check_taskset, segment );
+}
+
+/*
+ * comb detect this segment of all three planes in a single thread.
+ */
+void decomb_filter_thread( void *thread_args_v )
+{
+    hb_filter_private_t * pv;
+    int segment, segment_start, segment_stop;
+    decomb_thread_arg_t *thread_args = thread_args_v;
+
+    pv = thread_args->pv;
+    segment = thread_args->segment;
+
+    hb_log("decomb filter thread started for segment %d", segment);
+
+    while (1)
     {
-        hb_lock( pv->decomb_complete_lock[segment] );
-        hb_unlock( pv->decomb_complete_lock[segment] );
+        /*
+         * Wait here until there is work to do.
+         */
+        taskset_thread_wait4start( &pv->decomb_filter_taskset, segment );
+
+        if( taskset_thread_stop( &pv->decomb_filter_taskset, segment ) )
+        {
+            /*
+             * No more work to do, exit this thread.
+             */
+            break;
+        } 
+
+        /*
+         * Process segment (for now just from luma)
+         */
+        int pp;
+        for( pp = 0; pp < 1; pp++)
+        {
+            segment_start = thread_args->segment_start[pp];
+            segment_stop = segment_start + thread_args->segment_height[pp];
+
+            if( pv->mode & MODE_GAMMA )
+            {
+                detect_gamma_combed_segment( pv, segment_start, segment_stop );
+            }
+            else
+            {
+                detect_combed_segment( pv, segment_start, segment_stop );
+            }
+        }
+
+        taskset_thread_complete( &pv->decomb_filter_taskset, segment );
     }
 
+    /*
+     * Finished this segment, let everyone know.
+     */
+    taskset_thread_complete( &pv->decomb_filter_taskset, segment );
+}
+
+int comb_segmenter( hb_filter_private_t * pv )
+{
+    /*
+     * Now that all data for decomb detection is ready for
+     * our threads, fire them off and wait for their completion.
+     */
+    taskset_cycle( &pv->decomb_filter_taskset );
+    
     if( pv->mode & MODE_FILTER )
     {
-        filter_combing_mask( pv );
+         taskset_cycle( &pv->mask_filter_taskset );
         if( pv->filter_mode == FILTER_ERODE_DILATE )
         {
-            erode_combing_mask( pv );
-            dilate_combing_mask( pv );
-            erode_combing_mask( pv );
+            taskset_cycle( &pv->mask_erode_taskset );
+            taskset_cycle( &pv->mask_dilate_taskset );
+            taskset_cycle( &pv->mask_erode_taskset );
         }
-        return check_filtered_combing_mask( pv );
+        //return check_filtered_combing_mask( pv );
     }
     else
     {
-        return check_combing_mask( pv );
+        //return check_combing_mask( pv );
     }
+    reset_combing_results(pv);
+    taskset_cycle( &pv->decomb_check_taskset );
+    return check_combing_results(pv);
 }
 
-static void yadif_filter_line( uint8_t *dst,
-                               uint8_t *prev,
-                               uint8_t *cur,
-                               uint8_t *next,
-                               int plane,
-                               int parity,
-                               int y,
-                               hb_filter_private_t * pv )
+/* EDDI: Edge Directed Deinterlacing Interpolation
+   Checks 4 different slopes to see if there is more similarity along a diagonal
+   than there was vertically. If a diagonal is more similar, then it indicates
+   an edge, so interpolate along that instead of a vertical line, using either
+   linear or cubic interpolation depending on mode. */
+#define YADIF_CHECK(j) {\
+        int score = ABS(cur[-stride-1+j] - cur[+stride-1-j])\
+                      + ABS(cur[-stride  +j] - cur[+stride  -j])\
+                      + ABS(cur[-stride+1+j] - cur[+stride+1-j]);\
+        if( score < spatial_score ){\
+            spatial_score = score;\
+            if( ( pv->mode & MODE_CUBIC ) && !vertical_edge )\
+            {\
+                switch(j)\
+                {\
+                    case -1:\
+                        spatial_pred = cubic_interpolate_pixel(cur[-3 * stride - 3], cur[-stride -1], cur[+stride + 1], cur[3* stride + 3] );\
+                    break;\
+                    case -2:\
+                        spatial_pred = cubic_interpolate_pixel( ( ( cur[-3*stride - 4] + cur[-stride - 4] ) / 2 ) , cur[-stride -2], cur[+stride + 2], ( ( cur[3*stride + 4] + cur[stride + 4] ) / 2 ) );\
+                    break;\
+                    case 1:\
+                        spatial_pred = cubic_interpolate_pixel(cur[-3 * stride +3], cur[-stride +1], cur[+stride - 1], cur[3* stride -3] );\
+                    break;\
+                    case 2:\
+                        spatial_pred = cubic_interpolate_pixel(( ( cur[-3*stride + 4] + cur[-stride + 4] ) / 2 ), cur[-stride +2], cur[+stride - 2], ( ( cur[3*stride - 4] + cur[stride - 4] ) / 2 ) );\
+                    break;\
+                }\
+            }\
+            else\
+            {\
+                spatial_pred = ( cur[-stride +j] + cur[+stride -j] ) >>1;\
+            }\
+
+static void yadif_filter_line(
+       hb_filter_private_t * pv,
+       uint8_t             * dst,
+       uint8_t             * prev,
+       uint8_t             * cur,
+       uint8_t             * next,
+       int                   plane,
+       int                   width,
+       int                   height,
+       int                   stride,
+       int                   parity,
+       int                   y)
 {
     /* While prev and next point to the previous and next frames,
        prev2 and next2 will shift depending on the parity, usually 1.
@@ -1538,36 +1598,38 @@
     uint8_t *prev2 = parity ? prev : cur ;
     uint8_t *next2 = parity ? cur  : next;
 
-    int w = pv->width[plane];
-    int refs = pv->ref_stride[plane];
     int x;
     int eedi2_mode = ( pv->mode & MODE_EEDI2 );
 
     /* We can replace spatial_pred with this interpolation*/
-    uint8_t * eedi2_guess = &pv->eedi_full[DST2PF][plane][y*refs];
+    uint8_t * eedi2_guess = NULL;
+    if (eedi2_mode)
+    {
+        eedi2_guess = &pv->eedi_full[DST2PF]->plane[plane].data[y*stride];
+    }
 
     /* Decomb's cubic interpolation can only function when there are
        three samples above and below, so regress to yadif's traditional
        two-tap interpolation when filtering at the top and bottom edges. */
     int vertical_edge = 0;
-    if( ( y < 3 ) || ( y > ( pv->height[plane] - 4 ) )  )
+    if( ( y < 3 ) || ( y > ( height - 4 ) )  )
         vertical_edge = 1;
 
-    for( x = 0; x < w; x++)
+    for( x = 0; x < width; x++)
     {
         /* Pixel above*/
-        int c              = cur[-refs];
+        int c              = cur[-stride];
         /* Temporal average: the current location in the adjacent fields */
         int d              = (prev2[0] + next2[0])>>1;
         /* Pixel below */
-        int e              = cur[+refs];
+        int e              = cur[+stride];
 
         /* How the current pixel changes between the adjacent fields */
         int temporal_diff0 = ABS(prev2[0] - next2[0]);
         /* The average of how much the pixels above and below change from the frame before to now. */
-        int temporal_diff1 = ( ABS(prev[-refs] - cur[-refs]) + ABS(prev[+refs] - cur[+refs]) ) >> 1;
+        int temporal_diff1 = ( ABS(prev[-stride] - cur[-stride]) + ABS(prev[+stride] - cur[+stride]) ) >> 1;
         /* The average of how much the pixels above and below change from now to the next frame. */
-        int temporal_diff2 = ( ABS(next[-refs] - cur[-refs]) + ABS(next[+refs] - cur[+refs]) ) >> 1;
+        int temporal_diff2 = ( ABS(next[-stride] - cur[-stride]) + ABS(next[+stride] - cur[+stride]) ) >> 1;
         /* For the actual difference, use the largest of the previous average diffs. */
         int diff           = MAX3(temporal_diff0>>1, temporal_diff1, temporal_diff2);
 
@@ -1582,75 +1644,44 @@
         else // Yadif spatial interpolation
         {
             /* SAD of how the pixel-1, the pixel, and the pixel+1 change from the line above to below. */
-            int spatial_score  = ABS(cur[-refs-1] - cur[+refs-1]) + ABS(cur[-refs]-cur[+refs]) +
-                                         ABS(cur[-refs+1] - cur[+refs+1]) - 1;
+            int spatial_score  = ABS(cur[-stride-1] - cur[+stride-1]) + ABS(cur[-stride]-cur[+stride]) +
+                                         ABS(cur[-stride+1] - cur[+stride+1]) - 1;
 
             /* Spatial pred is either a bilinear or cubic vertical interpolation. */
             if( ( pv->mode & MODE_CUBIC ) && !vertical_edge)
             {
-                spatial_pred = cubic_interpolate_pixel( cur[-3*refs], cur[-refs], cur[+refs], cur[3*refs] );
+                spatial_pred = cubic_interpolate_pixel( cur[-3*stride], cur[-stride], cur[+stride], cur[3*stride] );
             }
             else
             {
                 spatial_pred = (c+e)>>1;
             }
 
-        /* EDDI: Edge Directed Deinterlacing Interpolation
-           Checks 4 different slopes to see if there is more similarity along a diagonal
-           than there was vertically. If a diagonal is more similar, then it indicates
-           an edge, so interpolate along that instead of a vertical line, using either
-           linear or cubic interpolation depending on mode. */
-        #define YADIF_CHECK(j)\
-                {   int score = ABS(cur[-refs-1+j] - cur[+refs-1-j])\
-                              + ABS(cur[-refs  +j] - cur[+refs  -j])\
-                              + ABS(cur[-refs+1+j] - cur[+refs+1-j]);\
-                    if( score < spatial_score ){\
-                        spatial_score = score;\
-                        if( ( pv->mode & MODE_CUBIC ) && !vertical_edge )\
-                        {\
-                            switch(j)\
-                            {\
-                                case -1:\
-                                    spatial_pred = cubic_interpolate_pixel(cur[-3 * refs - 3], cur[-refs -1], cur[+refs + 1], cur[3* refs + 3] );\
-                                break;\
-                                case -2:\
-                                    spatial_pred = cubic_interpolate_pixel( ( ( cur[-3*refs - 4] + cur[-refs - 4] ) / 2 ) , cur[-refs -2], cur[+refs + 2], ( ( cur[3*refs + 4] + cur[refs + 4] ) / 2 ) );\
-                                break;\
-                                case 1:\
-                                    spatial_pred = cubic_interpolate_pixel(cur[-3 * refs +3], cur[-refs +1], cur[+refs - 1], cur[3* refs -3] );\
-                                break;\
-                                case 2:\
-                                    spatial_pred = cubic_interpolate_pixel(( ( cur[-3*refs + 4] + cur[-refs + 4] ) / 2 ), cur[-refs +2], cur[+refs - 2], ( ( cur[3*refs - 4] + cur[refs - 4] ) / 2 ) );\
-                                break;\
-                            }\
-                        }\
-                        else\
-                        {\
-                            spatial_pred = ( cur[-refs +j] + cur[+refs -j] ) >>1;\
-                        }\
-
-                        if( x >= 2 && x <= w - 3 )
-                        {
-                            YADIF_CHECK(-1)
-                            if( x >= 3 && x <= w - 4 )
-                            {
-                                YADIF_CHECK(-2) }} }}
-                            }
-                        }
-                        if( x >= 2 && x <= w - 3 )
-                        {
-                            YADIF_CHECK(1)
-                            if( x >= 3 && x <= w - 4 )
-                            {
-                                YADIF_CHECK(2) }} }}
-                            }
-                        }
+            // YADIF_CHECK requires a margin to avoid invalid memory access.
+            // In MODE_CUBIC, margin needed is 2 + ABS(param).
+            // Else, the margin needed is 1 + ABS(param).
+            int margin = 2;
+            if (pv->mode & MODE_CUBIC)
+                margin = 3;
+
+            if (x >= margin && x <= width - (margin + 1))
+            {
+                YADIF_CHECK(-1)
+                if (x >= margin + 1 && x <= width - (margin + 2))
+                    YADIF_CHECK(-2) }} }}
+            }
+            if (x >= margin && x <= width - (margin + 1))
+            {
+                YADIF_CHECK(1)
+                if (x >= margin + 1 && x <= width - (margin + 2))
+                    YADIF_CHECK(2) }} }}
+            }
         }
 
         /* Temporally adjust the spatial prediction by
            comparing against lines in the adjacent fields. */
-        int b = (prev2[-2*refs] + next2[-2*refs])>>1;
-        int f = (prev2[+2*refs] + next2[+2*refs])>>1;
+        int b = (prev2[-2*stride] + next2[-2*stride])>>1;
+        int f = (prev2[+2*stride] + next2[+2*stride])>>1;
 
         /* Find the median value */
         int max = MAX3(d-e, d-c, MIN(b-c, f-e));
@@ -1684,169 +1715,158 @@
 {
     yadif_arguments_t *yadif_work = NULL;
     hb_filter_private_t * pv;
-    int run = 1;
-    int plane;
     int segment, segment_start, segment_stop;
     yadif_thread_arg_t *thread_args = thread_args_v;
-    uint8_t **dst;
-    int parity, tff, y, w, h, penultimate, ultimate, ref_stride, is_combed;
 
     pv = thread_args->pv;
     segment = thread_args->segment;
 
     hb_log("yadif thread started for segment %d", segment);
 
-    while( run )
+    while (1)
     {
         /*
-         * Wait here until there is work to do. hb_lock() blocks until
-         * render releases it to say that there is more work to do.
+         * Wait here until there is work to do.
          */
-        hb_lock( pv->yadif_begin_lock[segment] );
-
-        yadif_work = &pv->yadif_arguments[segment];
-
-        if( yadif_work->stop )
+        taskset_thread_wait4start( &pv->yadif_taskset, segment );
+        
+        if( taskset_thread_stop( &pv->yadif_taskset, segment ) )
         {
             /*
              * No more work to do, exit this thread.
              */
-            run = 0;
-            continue;
-        }
-
-        if( yadif_work->dst == NULL )
-        {
-            hb_error( "thread started when no work available" );
-            hb_snooze(500);
-            continue;
-        }
+            break;
+        } 
 
-        is_combed = pv->yadif_arguments[segment].is_combed;
+        yadif_work = &pv->yadif_arguments[segment];
 
         /*
          * Process all three planes, but only this segment of it.
          */
-        for( plane = 0; plane < 3; plane++)
-        {
+        hb_buffer_t *dst;
+        int parity, tff, is_combed;
 
-            dst = yadif_work->dst;
-            parity = yadif_work->parity;
-            tff = yadif_work->tff;
-            w = pv->width[plane];
-            h = pv->height[plane];
-            penultimate = h - 2;
-            ultimate = h - 1;
-            ref_stride = pv->ref_stride[plane];
-            segment_start = ( h / pv->cpu_count ) * segment;
-            if( segment == pv->cpu_count - 1 )
-            {
-                /*
-                 * Final segment
-                 */
-                segment_stop = h;
-            } else {
-                segment_stop = ( h / pv->cpu_count ) * ( segment + 1 );
-            }
+        is_combed = pv->yadif_arguments[segment].is_combed;
+        dst = yadif_work->dst;
+        tff = yadif_work->tff;
+        parity = yadif_work->parity;
 
-            for( y = segment_start; y < segment_stop; y++ )
+        int pp;
+        for (pp = 0; pp < 3; pp++)
+        {
+            int yy;
+            int width = dst->plane[pp].width;
+            int stride = dst->plane[pp].stride;
+            int height = dst->plane[pp].height;
+            int penultimate = height - 2;
+
+            segment_start = thread_args->segment_start[pp];
+            segment_stop = segment_start + thread_args->segment_height[pp];
+
+            // Filter parity lines
+            int start = parity ? (segment_start + 1) & ~1 : segment_start | 1;
+            uint8_t *dst2 = &dst->plane[pp].data[start * stride];
+            uint8_t *prev = &pv->ref[0]->plane[pp].data[start * stride];
+            uint8_t *cur  = &pv->ref[1]->plane[pp].data[start * stride];
+            uint8_t *next = &pv->ref[2]->plane[pp].data[start * stride];
+
+            if( is_combed == 2 )
             {
-                if( is_combed == 2 )
+                /* These will be useful if we ever do temporal blending. */
+                for( yy = start; yy < segment_stop; yy += 2 )
                 {
                     /* This line gets blend filtered, not yadif filtered. */
-                    uint8_t *cur  = &pv->ref[1][plane][y*ref_stride];
-                    uint8_t *dst2 = &dst[plane][y*w];
-                    /* These will be useful if we ever do temporal blending. */
-                    // uint8_t *prev = &pv->ref[0][plane][y*ref_stride];
-                    // uint8_t *next = &pv->ref[2][plane][y*ref_stride];
-
-                    blend_filter_line( dst2, cur, plane, y, pv );
+                    blend_filter_line(dst2, cur, width, height, stride, yy);
+                    dst2 += stride * 2;
+                    cur += stride * 2;
                 }
-                else if( pv->mode == MODE_CUBIC && is_combed && ( ( y ^ parity ) & 1 ) )
+            }
+            else if (pv->mode == MODE_CUBIC && is_combed)
+            {
+                for( yy = start; yy < segment_stop; yy += 2 )
                 {
                     /* Just apply vertical cubic interpolation */
-                    uint8_t *cur  = &pv->ref[1][plane][y*ref_stride];
-                    uint8_t *dst2 = &dst[plane][y*w];
-
-                    cubic_interpolate_line( dst2, cur, plane, y, pv );
+                    cubic_interpolate_line(dst2, cur, width, height, stride, yy);
+                    dst2 += stride * 2;
+                    cur += stride * 2;
                 }
-                else if( pv->mode & MODE_YADIF && ( ( y ^ parity ) &  1 )  && ( is_combed == 1 ) )
+            }
+            else if ((pv->mode & MODE_YADIF) && is_combed == 1)
+            {
+                for( yy = start; yy < segment_stop; yy += 2 )
                 {
-                    /* This line gets yadif filtered. It is the bottom field
-                       when TFF and vice-versa. It's the field that gets
-                       filtered. Because yadif needs 2 lines above and below
-                       the one being filtered, we need to mirror the edges.
-                       When TFF, this means replacing the 2nd line with a
-                       copy of the 1st, and the last with the second-to-last. */
-                    if( y > 1 && y < ( h -2 ) )
-                    {
-                        /* This isn't the top or bottom, proceed as normal to yadif. */
-                        uint8_t *prev = &pv->ref[0][plane][y*ref_stride];
-                        uint8_t *cur  = &pv->ref[1][plane][y*ref_stride];
-                        uint8_t *next = &pv->ref[2][plane][y*ref_stride];
-                        uint8_t *dst2 = &dst[plane][y*w];
-
-                        yadif_filter_line( dst2,
-                                           prev,
-                                           cur,
-                                           next,
-                                           plane,
-                                           parity ^ tff,
-                                           y,
-                                           pv );
-                    }
-                    else if( y == 0 )
-                    {
-                        /* BFF, so y0 = y1 */
-                        memcpy( &dst[plane][y*w],
-                                &pv->ref[1][plane][1*ref_stride],
-                                w * sizeof(uint8_t) );
-                    }
-                    else if( y == 1 )
-                    {
-                        /* TFF, so y1 = y0 */
-                        memcpy( &dst[plane][y*w],
-                                &pv->ref[1][plane][0],
-                                w * sizeof(uint8_t) );
-                    }
-                    else if( y == penultimate )
+                    if( yy > 1 && yy < penultimate )
                     {
-                        /* BFF, so penultimate y = ultimate y */
-                        memcpy( &dst[plane][y*w],
-                                &pv->ref[1][plane][ultimate*ref_stride],
-                                w * sizeof(uint8_t) );
+                        // This isn't the top or bottom,
+                        // proceed as normal to yadif
+                        yadif_filter_line(pv, dst2, prev, cur, next, pp,
+                                          width, height, stride,
+                                          parity ^ tff, yy);
                     }
-                    else if( y == ultimate )
+                    else
                     {
-                        /* TFF, so ultimate y = penultimate y */
-                        memcpy( &dst[plane][y*w],
-                                &pv->ref[1][plane][penultimate*ref_stride],
-                                w * sizeof(uint8_t) );
+                        // parity == 0 (TFF), y1 = y0
+                        // parity == 1 (BFF), y0 = y1
+                        // parity == 0 (TFF), yu = yp
+                        // parity == 1 (BFF), yp = yu
+                        int yp = (yy ^ parity) * stride;
+                        memcpy(dst2, &pv->ref[1]->plane[pp].data[yp], width);
                     }
+                    dst2 += stride * 2;
+                    prev += stride * 2;
+                    cur += stride * 2;
+                    next += stride * 2;
                 }
-                else
+            }
+            else
+            {
+                // No combing, copy frame
+                for( yy = start; yy < segment_stop; yy += 2 )
                 {
-                    memcpy( &dst[plane][y*w],
-                            &pv->ref[1][plane][y*ref_stride],
-                            w * sizeof(uint8_t) );
+                    memcpy(dst2, cur, width);
+                    dst2 += stride * 2;
+                    cur += stride * 2;
                 }
             }
+
+            // Copy unfiltered lines
+            start = !parity ? (segment_start + 1) & ~1 : segment_start | 1;
+            dst2 = &dst->plane[pp].data[start * stride];
+            prev = &pv->ref[0]->plane[pp].data[start * stride];
+            cur  = &pv->ref[1]->plane[pp].data[start * stride];
+            next = &pv->ref[2]->plane[pp].data[start * stride];
+            for( yy = start; yy < segment_stop; yy += 2 )
+            {
+                memcpy(dst2, cur, width);
+                dst2 += stride * 2;
+                cur += stride * 2;
+            }
         }
-        /*
-         * Finished this segment, let everyone know.
-         */
-        hb_unlock( pv->yadif_complete_lock[segment] );
+        taskset_thread_complete( &pv->yadif_taskset, segment );
     }
-    free( thread_args_v );
+
+    /*
+     * Finished this segment, let everyone know.
+     */
+    taskset_thread_complete( &pv->yadif_taskset, segment );
 }
 
-static void yadif_filter( uint8_t ** dst,
+static void yadif_filter( hb_filter_private_t * pv,
+                          hb_buffer_t * dst,
                           int parity,
-                          int tff,
-                          hb_filter_private_t * pv )
+                          int tff)
 {
     /* If we're running comb detection, do it now, otherwise default to true. */
-    int is_combed = pv->spatial_metric >= 0 ? comb_segmenter( pv ) : 1;
+    int is_combed;
+
+    if (!pv->skip_comb_check)
+    {
+        is_combed = pv->spatial_metric >= 0 ? comb_segmenter( pv ) : 1;
+    }
+    else
+    {
+        is_combed = pv->is_combed;
+    }
 
     /* The comb detector suggests three different values:
        0: Don't comb this frame.
@@ -1897,25 +1917,28 @@
         eedi2_planer( pv );
     }
 
+    pv->is_combed = is_combed;
     if( is_combed )
     {
         if( ( pv->mode & MODE_EEDI2 ) && !( pv->mode & MODE_YADIF ) && is_combed == 1 )
         {
             // Just pass through the EEDI2 interpolation
-            int i;
-            for( i = 0; i < 3; i++ )
+            int pp;
+            for( pp = 0; pp < 3; pp++ )
             {
-                uint8_t * ref = pv->eedi_full[DST2PF][i];
-                uint8_t * dest = dst[i];
+                uint8_t * ref = pv->eedi_full[DST2PF]->plane[pp].data;
+                int ref_stride = pv->eedi_full[DST2PF]->plane[pp].stride;
 
-                int w = pv->width[i];
-                int ref_stride = pv->ref_stride[i];
+                uint8_t * dest = dst->plane[pp].data;
+                int width = dst->plane[pp].width;
+                int height = dst->plane[pp].height;
+                int stride = dst->plane[pp].stride;
 
-                int y;
-                for( y = 0; y < pv->height[i]; y++ )
+                int yy;
+                for( yy = 0; yy < height; yy++ )
                 {
-                    memcpy(dest, ref, w);
-                    dest += w;
+                    memcpy(dest, ref, width);
+                    dest += stride;
                     ref += ref_stride;
                 }
             }
@@ -1933,28 +1956,12 @@
                 pv->yadif_arguments[segment].tff = tff;
                 pv->yadif_arguments[segment].dst = dst;
                 pv->yadif_arguments[segment].is_combed = is_combed;
-
-                /*
-                 * Let the thread for this plane know that we've setup work
-                 * for it by releasing the begin lock (ensuring that the
-                 * complete lock is already locked so that we block when
-                 * we try to lock it again below).
-                 */
-                hb_lock( pv->yadif_complete_lock[segment] );
-                hb_unlock( pv->yadif_begin_lock[segment] );
             }
 
             /*
-             * Wait until all three threads have completed by trying to get
-             * the complete lock that we locked earlier for each thread, which
-             * will block until that thread has completed the work on that
-             * plane.
+             * Allow the taskset threads to make one pass over the data.
              */
-            for( segment = 0; segment < pv->cpu_count; segment++ )
-            {
-                hb_lock( pv->yadif_complete_lock[segment] );
-                hb_unlock( pv->yadif_complete_lock[segment] );
-            }
+            taskset_cycle( &pv->yadif_taskset );
 
             /*
              * Entire frame is now deinterlaced.
@@ -1967,58 +1974,18 @@
 
         /* For mcdeint's benefit... */
         pv->yadif_arguments[0].is_combed = is_combed; // 0
-
-        int i;
-        for( i = 0; i < 3; i++ )
-        {
-            uint8_t * ref = pv->ref[1][i];
-            uint8_t * dest = dst[i];
-
-            int w = pv->width[i];
-            int ref_stride = pv->ref_stride[i];
-
-            int y;
-            for( y = 0; y < pv->height[i]; y++ )
-            {
-                memcpy(dest, ref, w);
-                dest += w;
-                ref += ref_stride;
-            }
-        }
-    }
-
-    if( pv->mode & MODE_MASK && pv->spatial_metric >= 0 )
-    {
-        if( pv->mode == MODE_MASK || (pv->mode & MODE_MASK && pv->mode & MODE_GAMMA) || is_combed || (pv->mode & MODE_MASK && pv->mode & MODE_FILTER ))
-        apply_mask( pv );
+        hb_buffer_copy(dst, pv->ref[1]);
     }
 }
 
-hb_filter_private_t * hb_decomb_init( int pix_fmt,
-                                           int width,
-                                           int height,
-                                           char * settings )
+static int hb_decomb_init( hb_filter_object_t * filter,
+                           hb_filter_init_t * init )
 {
-    if( pix_fmt != PIX_FMT_YUV420P )
-    {
-        return 0;
-    }
-
-    hb_filter_private_t * pv = calloc( 1, sizeof(struct hb_filter_private_s) );
-
-    pv->pix_fmt = pix_fmt;
-
-    pv->width[0]  = width;
-    pv->height[0] = height;
-    pv->width[1]  = pv->width[2]  = width >> 1;
-    pv->height[1] = pv->height[2] = height >> 1;
+    filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+    hb_filter_private_t * pv = filter->private_data;
 
     build_gamma_lut( pv );
 
-    pv->buf_out[0] = hb_video_buffer_init( width, height );
-    pv->buf_out[1] = hb_video_buffer_init( width, height );
-    pv->buf_settings = hb_buffer_init( 0 );
-
     pv->deinterlaced_frames = 0;
     pv->blended_frames = 0;
     pv->unfiltered_frames = 0;
@@ -2049,9 +2016,9 @@
     pv->mcdeint_mode   = MCDEINT_MODE_DEFAULT;
     int mcdeint_qp     = MCDEINT_QP_DEFAULT;
 
-    if( settings )
+    if( filter->settings )
     {
-        sscanf( settings, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
+        sscanf( filter->settings, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
                 &pv->mode,
                 &pv->spatial_metric,
                 &pv->motion_threshold,
@@ -2073,216 +2040,426 @@
 
     pv->cpu_count = hb_get_cpu_count();
 
+    // Make segment sizes an even number of lines
+    int height = hb_image_height(init->pix_fmt, init->height, 0);
+    pv->segment_height[0] = (height / pv->cpu_count) & ~1;
+    pv->segment_height[1] = hb_image_height(init->pix_fmt, pv->segment_height[0], 1);
+    pv->segment_height[2] = hb_image_height(init->pix_fmt, pv->segment_height[0], 2);
 
     if( pv->mode & MODE_MCDEINT )
     {
         pv->mcdeint_mode = MCDEINT_MODE_ENABLED;
     }
 
-    /* Allocate yadif specific buffers */
-    int i, j;
-    for( i = 0; i < 3; i++ )
+    /* Allocate buffers to store comb masks. */
+    pv->mask = hb_frame_buffer_init(init->pix_fmt, init->width, init->height);
+    pv->mask_filtered = hb_frame_buffer_init(init->pix_fmt, init->width, init->height);
+    pv->mask_temp = hb_frame_buffer_init(init->pix_fmt, init->width, init->height);
+    memset(pv->mask->data, 0, pv->mask->size);
+    memset(pv->mask_filtered->data, 0, pv->mask_filtered->size);
+    memset(pv->mask_temp->data, 0, pv->mask_temp->size);
+
+    int ii;
+    if( pv->mode & MODE_EEDI2 )
     {
-        int is_chroma = !!i;
-        int w = ((width >>is_chroma)  + 31) & (~31);
-        int h = ((height>>is_chroma)+6+ 31) & (~31);
-
-        pv->ref_stride[i] = w;
+        /* Allocate half-height eedi2 buffers */
+        for( ii = 0; ii < 4; ii++ )
+        {
+            pv->eedi_half[ii] = hb_frame_buffer_init(
+                    init->pix_fmt, init->width, init->height / 2);
+        }
 
-        for( j = 0; j < 3; j++ )
+        /* Allocate full-height eedi2 buffers */
+        for( ii = 0; ii < 5; ii++ )
         {
-            pv->ref[j][i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
+            pv->eedi_full[ii] = hb_frame_buffer_init(
+                    init->pix_fmt, init->width, init->height);
         }
     }
-
-    /* Allocate buffers to store comb masks. */
-    for( i = 0; i < 3; i++ )
+    
+    /*
+     * Setup yadif taskset.
+     */
+    pv->yadif_arguments = malloc( sizeof( yadif_arguments_t ) * pv->cpu_count );
+    if( pv->yadif_arguments == NULL ||
+        taskset_init( &pv->yadif_taskset, pv->cpu_count,
+                      sizeof( yadif_thread_arg_t ) ) == 0 )
     {
-        int is_chroma = !!i;
-        int w = ((width >>is_chroma)  + 31) & (~31);
-        int h = ((height>>is_chroma)+6+ 31) & (~31);
-
-        pv->mask[i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
-        pv->mask_filtered[i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
-        pv->mask_temp[i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
+        hb_error( "yadif could not initialize taskset" );
     }
 
-    if( pv->mode & MODE_EEDI2 )
+    yadif_thread_arg_t *yadif_prev_thread_args = NULL;
+    for( ii = 0; ii < pv->cpu_count; ii++ )
     {
-        /* Allocate half-height eedi2 buffers */
-        int half_h = height / 2;
-        for( i = 0; i < 3; i++ )
-        {
-            int is_chroma = !!i;
-            int w = ((width>>is_chroma)     + 31) & (~31);
-            int h = ((half_h>>is_chroma)+ 6 + 31) & (~31);
+        yadif_thread_arg_t *thread_args;
 
-            for( j = 0; j < 4; j++ )
-            {
-                pv->eedi_half[j][i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
-            }
-        }
+        thread_args = taskset_thread_args( &pv->yadif_taskset, ii );
+        thread_args->pv = pv;
+        thread_args->segment = ii;
 
-        /* Allocate full-height eedi2 buffers */
-        for( i = 0; i < 3; i++ )
+        int pp;
+        for (pp = 0; pp < 3; pp++)
         {
-            int is_chroma = !!i;
-            int w = ((width >>is_chroma)  + 31) & (~31);
-            int h = ((height>>is_chroma)+6+ 31) & (~31);
-
-            for( j = 0; j < 5; j++ )
+            if (yadif_prev_thread_args != NULL)
             {
-                pv->eedi_full[j][i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
+                thread_args->segment_start[pp] =
+                    yadif_prev_thread_args->segment_start[pp] +
+                    yadif_prev_thread_args->segment_height[pp];
             }
+            if( ii == pv->cpu_count - 1 )
+            {
+                /*
+                 * Final segment
+                 */
+                thread_args->segment_height[pp] =
+                    hb_image_height(init->pix_fmt, init->height, pp) -
+                    thread_args->segment_start[pp];
+            } else {
+                thread_args->segment_height[pp] = pv->segment_height[pp];
+            }
+        }
+        pv->yadif_arguments[ii].dst = NULL;
+        if( taskset_thread_spawn( &pv->yadif_taskset, ii,
+                                 "yadif_filter_segment",
+                                 yadif_decomb_filter_thread,
+                                 HB_NORMAL_PRIORITY ) == 0 )
+        {
+            hb_error( "yadif could not spawn thread" );
         }
+        yadif_prev_thread_args = thread_args;
     }
 
-     /*
-      * Create yadif threads and locks.
-      */
-     pv->yadif_threads = malloc( sizeof( hb_thread_t* ) * pv->cpu_count );
-     pv->yadif_begin_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
-     pv->yadif_complete_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
-     pv->yadif_arguments = malloc( sizeof( yadif_arguments_t ) * pv->cpu_count );
+    /*
+     * Create comb detection taskset.
+     */
+    if( taskset_init( &pv->decomb_filter_taskset, pv->cpu_count,
+                      sizeof( decomb_thread_arg_t ) ) == 0 )
+    {
+        hb_error( "decomb could not initialize taskset" );
+    }
 
-     for( i = 0; i < pv->cpu_count; i++ )
-     {
-         yadif_thread_arg_t *thread_args;
+    decomb_thread_arg_t *decomb_prev_thread_args = NULL;
+    for( ii = 0; ii < pv->cpu_count; ii++ )
+    {
+        decomb_thread_arg_t *thread_args;
+    
+        thread_args = taskset_thread_args( &pv->decomb_filter_taskset, ii );
+        thread_args->pv = pv;
+        thread_args->segment = ii;
 
-         thread_args = malloc( sizeof( yadif_thread_arg_t ) );
+        int pp;
+        for (pp = 0; pp < 3; pp++)
+        {
+            if (decomb_prev_thread_args != NULL)
+            {
+                thread_args->segment_start[pp] =
+                    decomb_prev_thread_args->segment_start[pp] +
+                    decomb_prev_thread_args->segment_height[pp];
+            }
+            if( ii == pv->cpu_count - 1 )
+            {
+                /*
+                 * Final segment
+                 */
+                thread_args->segment_height[pp] =
+                    hb_image_height(init->pix_fmt, init->height, pp) -
+                    thread_args->segment_start[pp];
+            } else {
+                thread_args->segment_height[pp] = pv->segment_height[pp];
+            }
+        }
 
-         if( thread_args )
-         {
-             thread_args->pv = pv;
-             thread_args->segment = i;
+        if( taskset_thread_spawn( &pv->decomb_filter_taskset, ii,
+                                 "decomb_filter_segment",
+                                 decomb_filter_thread,
+                                 HB_NORMAL_PRIORITY ) == 0 )
+        {
+            hb_error( "decomb could not spawn thread" );
+        }
 
-             pv->yadif_begin_lock[i] = hb_lock_init();
-             pv->yadif_complete_lock[i] = hb_lock_init();
+        decomb_prev_thread_args = thread_args;
+    }
 
-             /*
-              * Important to start off with the threads locked waiting
-              * on input.
-              */
-             hb_lock( pv->yadif_begin_lock[i] );
+    pv->comb_check_nthreads = init->height / pv->block_height;
 
-             pv->yadif_arguments[i].stop = 0;
-             pv->yadif_arguments[i].dst = NULL;
+    if (pv->comb_check_nthreads > pv->cpu_count)
+        pv->comb_check_nthreads = pv->cpu_count;
 
-             pv->yadif_threads[i] = hb_thread_init( "yadif_filter_segment",
-                                                    yadif_decomb_filter_thread,
-                                                    thread_args,
-                                                    HB_NORMAL_PRIORITY );
-         }
-         else
-         {
-             hb_error( "yadif could not create threads" );
-         }
-    }
+    pv->block_score = calloc(pv->comb_check_nthreads, sizeof(int));
 
     /*
-     * Create decomb threads and locks.
+     * Create comb check taskset.
      */
-    pv->decomb_threads = malloc( sizeof( hb_thread_t* ) * pv->cpu_count );
-    pv->decomb_begin_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
-    pv->decomb_complete_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
-    pv->decomb_arguments = malloc( sizeof( decomb_arguments_t ) * pv->cpu_count );
+    if( taskset_init( &pv->decomb_check_taskset, pv->comb_check_nthreads,
+                      sizeof( decomb_thread_arg_t ) ) == 0 )
+    {
+        hb_error( "decomb check could not initialize taskset" );
+    }
 
-    for( i = 0; i < pv->cpu_count; i++ )
+    decomb_prev_thread_args = NULL;
+    for( ii = 0; ii < pv->comb_check_nthreads; ii++ )
     {
-        decomb_thread_arg_t *decomb_thread_args;
+        decomb_thread_arg_t *thread_args, *decomb_prev_thread_args = NULL;
+    
+        thread_args = taskset_thread_args( &pv->decomb_check_taskset, ii );
+        thread_args->pv = pv;
+        thread_args->segment = ii;
+
+        int pp;
+        for (pp = 0; pp < 3; pp++)
+        {
+            if (decomb_prev_thread_args != NULL)
+            {
+                thread_args->segment_start[pp] =
+                    decomb_prev_thread_args->segment_start[pp] +
+                    decomb_prev_thread_args->segment_height[pp];
+            }
 
-        decomb_thread_args = malloc( sizeof( decomb_thread_arg_t ) );
+            // Make segment hight a multiple of block_height
+            int h = hb_image_height(init->pix_fmt, init->height, pp) / pv->comb_check_nthreads;
+            h = h / pv->block_height * pv->block_height;
+            if (h == 0)
+                h = pv->block_height;
 
-        if( decomb_thread_args )
+            if (ii == pv->comb_check_nthreads - 1)
+            {
+                /*
+                 * Final segment
+                 */
+                thread_args->segment_height[pp] =
+                    hb_image_height(init->pix_fmt, init->height, pp) -
+                    thread_args->segment_start[pp];
+            } else {
+                thread_args->segment_height[pp] = h;
+            }
+        }
+
+        if( taskset_thread_spawn( &pv->decomb_check_taskset, ii,
+                                 "decomb_check_segment",
+                                 decomb_check_thread,
+                                 HB_NORMAL_PRIORITY ) == 0 )
         {
-            decomb_thread_args->pv = pv;
-            decomb_thread_args->segment = i;
+            hb_error( "decomb check could not spawn thread" );
+        }
 
-            pv->decomb_begin_lock[i] = hb_lock_init();
-            pv->decomb_complete_lock[i] = hb_lock_init();
+        decomb_prev_thread_args = thread_args;
+    }
 
-            /*
-             * Important to start off with the threads locked waiting
-             * on input.
-             */
-            hb_lock( pv->decomb_begin_lock[i] );
+    if( pv->mode & MODE_FILTER )
+    {
+        if( taskset_init( &pv->mask_filter_taskset, pv->cpu_count,
+                          sizeof( decomb_thread_arg_t ) ) == 0 )
+        {
+            hb_error( "maske filter could not initialize taskset" );
+        }
+
+        decomb_prev_thread_args = NULL;
+        for( ii = 0; ii < pv->cpu_count; ii++ )
+        {
+            decomb_thread_arg_t *thread_args;
+        
+            thread_args = taskset_thread_args( &pv->mask_filter_taskset, ii );
+            thread_args->pv = pv;
+            thread_args->segment = ii;
+
+            int pp;
+            for (pp = 0; pp < 3; pp++)
+            {
+                if (decomb_prev_thread_args != NULL)
+                {
+                    thread_args->segment_start[pp] =
+                        decomb_prev_thread_args->segment_start[pp] +
+                        decomb_prev_thread_args->segment_height[pp];
+                }
 
-            pv->decomb_arguments[i].stop = 0;
+                if( ii == pv->cpu_count - 1 )
+                {
+                    /*
+                     * Final segment
+                     */
+                    thread_args->segment_height[pp] =
+                        hb_image_height(init->pix_fmt, init->height, pp) -
+                        thread_args->segment_start[pp];
+                } else {
+                    thread_args->segment_height[pp] = pv->segment_height[pp];
+                }
+            }
+
+            if( taskset_thread_spawn( &pv->mask_filter_taskset, ii,
+                                     "mask_filter_segment",
+                                     mask_filter_thread,
+                                     HB_NORMAL_PRIORITY ) == 0 )
+            {
+                hb_error( "mask filter could not spawn thread" );
+            }
 
-            pv->decomb_threads[i] = hb_thread_init( "decomb_filter_segment",
-                                                   decomb_filter_thread,
-                                                   decomb_thread_args,
-                                                   HB_NORMAL_PRIORITY );
+            decomb_prev_thread_args = thread_args;
         }
-        else
+
+        if( pv->filter_mode == FILTER_ERODE_DILATE )
         {
-            hb_error( "decomb could not create threads" );
+            if( taskset_init( &pv->mask_erode_taskset, pv->cpu_count,
+                              sizeof( decomb_thread_arg_t ) ) == 0 )
+            {
+                hb_error( "mask erode could not initialize taskset" );
+            }
+
+            decomb_prev_thread_args = NULL;
+            for( ii = 0; ii < pv->cpu_count; ii++ )
+            {
+                decomb_thread_arg_t *thread_args;
+            
+                thread_args = taskset_thread_args( &pv->mask_erode_taskset, ii );
+                thread_args->pv = pv;
+                thread_args->segment = ii;
+
+                int pp;
+                for (pp = 0; pp < 3; pp++)
+                {
+                    if (decomb_prev_thread_args != NULL)
+                    {
+                        thread_args->segment_start[pp] =
+                            decomb_prev_thread_args->segment_start[pp] +
+                            decomb_prev_thread_args->segment_height[pp];
+                    }
+
+                    if( ii == pv->cpu_count - 1 )
+                    {
+                        /*
+                         * Final segment
+                         */
+                        thread_args->segment_height[pp] =
+                            hb_image_height(init->pix_fmt, init->height, pp) -
+                            thread_args->segment_start[pp];
+                    } else {
+                        thread_args->segment_height[pp] = pv->segment_height[pp];
+                    }
+                }
+
+                if( taskset_thread_spawn( &pv->mask_erode_taskset, ii,
+                                         "mask_erode_segment",
+                                         mask_erode_thread,
+                                         HB_NORMAL_PRIORITY ) == 0 )
+                {
+                    hb_error( "mask erode could not spawn thread" );
+                }
+
+                decomb_prev_thread_args = thread_args;
+            }
+
+            if( taskset_init( &pv->mask_dilate_taskset, pv->cpu_count,
+                              sizeof( decomb_thread_arg_t ) ) == 0 )
+            {
+                hb_error( "mask dilate could not initialize taskset" );
+            }
+
+            decomb_prev_thread_args = NULL;
+            for( ii = 0; ii < pv->cpu_count; ii++ )
+            {
+                decomb_thread_arg_t *thread_args;
+            
+                thread_args = taskset_thread_args( &pv->mask_dilate_taskset, ii );
+                thread_args->pv = pv;
+                thread_args->segment = ii;
+
+                int pp;
+                for (pp = 0; pp < 3; pp++)
+                {
+                    if (decomb_prev_thread_args != NULL)
+                    {
+                        thread_args->segment_start[pp] =
+                            decomb_prev_thread_args->segment_start[pp] +
+                            decomb_prev_thread_args->segment_height[pp];
+                    }
+
+                    if( ii == pv->cpu_count - 1 )
+                    {
+                        /*
+                         * Final segment
+                         */
+                        thread_args->segment_height[pp] =
+                            hb_image_height(init->pix_fmt, init->height, pp) -
+                            thread_args->segment_start[pp];
+                    } else {
+                        thread_args->segment_height[pp] = pv->segment_height[pp];
+                    }
+                }
+
+                if( taskset_thread_spawn( &pv->mask_dilate_taskset, ii,
+                                         "mask_dilate_segment",
+                                         mask_dilate_thread,
+                                         HB_NORMAL_PRIORITY ) == 0 )
+                {
+                    hb_error( "mask dilate could not spawn thread" );
+                }
+
+                decomb_prev_thread_args = thread_args;
+            }
         }
     }
 
     if( pv->mode & MODE_EEDI2 )
     {
         /*
-         * Create eedi2 threads and locks.
+         * Create eedi2 taskset.
          */
-        pv->eedi2_threads = malloc( sizeof( hb_thread_t* ) * 3 );
-        pv->eedi2_begin_lock = malloc( sizeof( hb_lock_t * ) * 3 );
-        pv->eedi2_complete_lock = malloc( sizeof( hb_lock_t * ) * 3 );
-        pv->eedi2_arguments = malloc( sizeof( eedi2_arguments_t ) * 3 );
+        if( taskset_init( &pv->eedi2_taskset, /*thread_count*/3,
+                          sizeof( eedi2_thread_arg_t ) ) == 0 )
+        {
+            hb_error( "eedi2 could not initialize taskset" );
+        }
 
         if( pv->post_processing > 1 )
         {
-            pv->cx2 = (int*)eedi2_aligned_malloc(pv->height[0]*pv->ref_stride[0]*sizeof(int), 16);
-            pv->cy2 = (int*)eedi2_aligned_malloc(pv->height[0]*pv->ref_stride[0]*sizeof(int), 16);
-            pv->cxy = (int*)eedi2_aligned_malloc(pv->height[0]*pv->ref_stride[0]*sizeof(int), 16);
-            pv->tmpc = (int*)eedi2_aligned_malloc(pv->height[0]*pv->ref_stride[0]*sizeof(int), 16);
+            int stride = hb_image_stride(init->pix_fmt, init->width, 0);
+
+            pv->cx2 = (int*)eedi2_aligned_malloc(
+                    init->height * stride * sizeof(int), 16);
+
+            pv->cy2 = (int*)eedi2_aligned_malloc(
+                    init->height * stride * sizeof(int), 16);
+
+            pv->cxy = (int*)eedi2_aligned_malloc(
+                    init->height * stride * sizeof(int), 16);
+
+            pv->tmpc = (int*)eedi2_aligned_malloc(
+                    init->height * stride * sizeof(int), 16);
+
             if( !pv->cx2 || !pv->cy2 || !pv->cxy || !pv->tmpc )
                 hb_log("EEDI2: failed to malloc derivative arrays");
             else
                 hb_log("EEDI2: successfully mallloced derivative arrays");
         }
 
-        for( i = 0; i < 3; i++ )
+        for( ii = 0; ii < 3; ii++ )
         {
             eedi2_thread_arg_t *eedi2_thread_args;
 
-            eedi2_thread_args = malloc( sizeof( eedi2_thread_arg_t ) );
-
-            if( eedi2_thread_args )
-            {
-                eedi2_thread_args->pv = pv;
-                eedi2_thread_args->plane = i;
-
-                pv->eedi2_begin_lock[i] = hb_lock_init();
-                pv->eedi2_complete_lock[i] = hb_lock_init();
-
-                /*
-                 * Important to start off with the threads locked waiting
-                 * on input.
-                 */
-                hb_lock( pv->eedi2_begin_lock[i] );
+            eedi2_thread_args = taskset_thread_args( &pv->eedi2_taskset, ii );
 
-                pv->eedi2_arguments[i].stop = 0;
+            eedi2_thread_args->pv = pv;
+            eedi2_thread_args->plane = ii;
 
-                pv->eedi2_threads[i] = hb_thread_init( "eedi2_filter_segment",
-                                                       eedi2_filter_thread,
-                                                       eedi2_thread_args,
-                                                       HB_NORMAL_PRIORITY );
-            }
-            else
+            if( taskset_thread_spawn( &pv->eedi2_taskset, ii,
+                                      "eedi2_filter_segment",
+                                      eedi2_filter_thread,
+                                      HB_NORMAL_PRIORITY ) == 0 )
             {
-                hb_error( "eedi2 could not create threads" );
+                hb_error( "eedi2 could not spawn thread" );
             }
         }
     }
+    
+    mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, 
+                  init->pix_fmt, init->width, init->height );
 
-    mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, width, height );
-
-    return pv;
+    return 0;
 }
 
-void hb_decomb_close( hb_filter_private_t * pv )
+static void hb_decomb_close( hb_filter_object_t * filter )
 {
+    hb_filter_private_t * pv = filter->private_data;
+
     if( !pv )
     {
         return;
@@ -2290,85 +2467,51 @@
 
     hb_log("decomb: deinterlaced %i | blended %i | unfiltered %i | total %i", pv->deinterlaced_frames, pv->blended_frames, pv->unfiltered_frames, pv->deinterlaced_frames + pv->blended_frames + pv->unfiltered_frames);
 
-    /* Cleanup frame buffers */
-    if( pv->buf_out[0] )
-    {
-        hb_buffer_close( &pv->buf_out[0] );
-    }
-    if( pv->buf_out[1] )
-    {
-        hb_buffer_close( &pv->buf_out[1] );
-    }
-    if (pv->buf_settings )
-    {
-        hb_buffer_close( &pv->buf_settings );
-    }
+    taskset_fini( &pv->yadif_taskset );
+    taskset_fini( &pv->decomb_filter_taskset );
+    taskset_fini( &pv->decomb_check_taskset );
 
-    /* Cleanup yadif specific buffers */
-    int i;
-    for( i = 0; i<3*3; i++ )
+    if( pv->mode & MODE_FILTER )
     {
-        uint8_t **p = &pv->ref[i%3][i/3];
-        if (*p)
+        taskset_fini( &pv->mask_filter_taskset );
+        if( pv->filter_mode == FILTER_ERODE_DILATE )
         {
-            free( *p - 3*pv->ref_stride[i/3] );
-            *p = NULL;
+            taskset_fini( &pv->mask_erode_taskset );
+            taskset_fini( &pv->mask_dilate_taskset );
         }
     }
 
-    /* Cleanup combing masks. */
-    for( i = 0; i<3*3; i++ )
+    if( pv->mode & MODE_EEDI2 )
     {
-        uint8_t **p = &pv->mask[i/3];
-        uint8_t **p2 = &pv->mask_filtered[i/3];
-        uint8_t **p3 = &pv->mask_temp[i/3];
+        taskset_fini( &pv->eedi2_taskset );
+    }
 
-        if (*p)
-        {
-            free( *p - 3*pv->ref_stride[i/3] );
-            *p = NULL;
-        }
-        if (*p2)
-        {
-            free( *p2 - 3*pv->ref_stride[i/3] );
-            *p2 = NULL;
-        }
-        if (*p3)
-        {
-            free( *p3 - 3*pv->ref_stride[i/3] );
-            *p3 = NULL;
-        }
+    
+    /* Cleanup reference buffers. */
+    int ii;
+    for (ii = 0; ii < 3; ii++)
+    {
+        hb_buffer_close(&pv->ref[ii]);
     }
 
+    /* Cleanup combing masks. */
+    hb_buffer_close(&pv->mask);
+    hb_buffer_close(&pv->mask_filtered);
+    hb_buffer_close(&pv->mask_temp);
+
     if( pv->mode & MODE_EEDI2 )
     {
         /* Cleanup eedi-half  buffers */
-        int j;
-        for( i = 0; i<3; i++ )
+        int ii;
+        for( ii = 0; ii < 4; ii++ )
         {
-            for( j = 0; j < 4; j++ )
-            {
-                uint8_t **p = &pv->eedi_half[j][i];
-                if (*p)
-                {
-                    free( *p - 3*pv->ref_stride[i] );
-                    *p = NULL;
-                }
-            }
+            hb_buffer_close(&pv->eedi_half[ii]);
         }
 
         /* Cleanup eedi-full  buffers */
-        for( i = 0; i<3; i++ )
+        for( ii = 0; ii < 5; ii++ )
         {
-            for( j = 0; j < 5; j++ )
-            {
-                uint8_t **p = &pv->eedi_full[j][i];
-                if (*p)
-                {
-                    free( *p - 3*pv->ref_stride[i] );
-                    *p = NULL;
-                }
-            }
+            hb_buffer_close(&pv->eedi_full[ii]);
         }
     }
 
@@ -2379,195 +2522,167 @@
         if (pv->cxy) eedi2_aligned_free(pv->cxy);
         if (pv->tmpc) eedi2_aligned_free(pv->tmpc);
     }
-
-    for( i = 0; i < pv->cpu_count; i++)
-    {
-        /*
-         * Tell each yadif thread to stop, and then cleanup.
-         */
-        pv->yadif_arguments[i].stop = 1;
-        hb_unlock(  pv->yadif_begin_lock[i] );
-
-        hb_thread_close( &pv->yadif_threads[i] );
-        hb_lock_close( &pv->yadif_begin_lock[i] );
-        hb_lock_close( &pv->yadif_complete_lock[i] );
-    }
+    
+    free(pv->block_score);
 
     /*
      * free memory for yadif structs
      */
-    free( pv->yadif_threads );
-    free( pv->yadif_begin_lock );
-    free( pv->yadif_complete_lock );
     free( pv->yadif_arguments );
-
-    for( i = 0; i < pv->cpu_count; i++)
-    {
-        /*
-         * Tell each decomb thread to stop, and then cleanup.
-         */
-        pv->decomb_arguments[i].stop = 1;
-        hb_unlock(  pv->decomb_begin_lock[i] );
-
-        hb_thread_close( &pv->decomb_threads[i] );
-        hb_lock_close( &pv->decomb_begin_lock[i] );
-        hb_lock_close( &pv->decomb_complete_lock[i] );
-    }
-
-    /*
-     * free memory for decomb structs
-     */
-    free( pv->decomb_threads );
-    free( pv->decomb_begin_lock );
-    free( pv->decomb_complete_lock );
-    free( pv->decomb_arguments );
-
-    if( pv->mode & MODE_EEDI2 )
-    {
-        for( i = 0; i < 3; i++)
-        {
-            /*
-             * Tell each eedi2 thread to stop, and then cleanup.
-             */
-            pv->eedi2_arguments[i].stop = 1;
-            hb_unlock(  pv->eedi2_begin_lock[i] );
-
-            hb_thread_close( &pv->eedi2_threads[i] );
-            hb_lock_close( &pv->eedi2_begin_lock[i] );
-            hb_lock_close( &pv->eedi2_complete_lock[i] );
-        }
-
-        /*
-         * free memory for eedi2 structs
-         */
-        free( pv->eedi2_threads );
-        free( pv->eedi2_begin_lock );
-        free( pv->eedi2_complete_lock );
-        free( pv->eedi2_arguments );
-    }
-
+    
     /* Cleanup mcdeint specific buffers */
     mcdeint_close( &pv->mcdeint );
 
     free( pv );
+    filter->private_data = NULL;
 }
 
-int hb_decomb_work( const hb_buffer_t * cbuf_in,
-                    hb_buffer_t ** buf_out,
-                    int pix_fmt,
-                    int width,
-                    int height,
-                    hb_filter_private_t * pv )
+static int hb_decomb_work( hb_filter_object_t * filter,
+                           hb_buffer_t ** buf_in,
+                           hb_buffer_t ** buf_out )
 {
-    hb_buffer_t * buf_in = (hb_buffer_t *)cbuf_in;
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+    hb_buffer_t * last = NULL, * out = NULL;
 
-    if( !pv ||
-        pix_fmt != pv->pix_fmt ||
-        width   != pv->width[0] ||
-        height  != pv->height[0] )
+    if ( in->size <= 0 )
     {
-        return FILTER_FAILED;
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
     }
 
-    avpicture_fill( &pv->pic_in, buf_in->data,
-                    pix_fmt, width, height );
+    /* Store current frame in yadif cache */
+    *buf_in = NULL;
+    store_ref(pv, in);
+
+    // yadif requires 3 buffers, prev, cur, and next.  For the first
+    // frame, there can be no prev, so we duplicate the first frame.
+    if (!pv->yadif_ready)
+    {
+        // If yadif is not ready, store another ref and return HB_FILTER_DELAY
+        store_ref(pv, hb_buffer_dup(in));
+        pv->yadif_ready = 1;
+        // Wait for next
+        return HB_FILTER_DELAY;
+    }
 
     /* Determine if top-field first layout */
     int tff;
     if( pv->parity < 0 )
     {
-        tff = !!(buf_in->flags & PIC_FLAG_TOP_FIELD_FIRST);
+        tff = !!(in->s.flags & PIC_FLAG_TOP_FIELD_FIRST);
     }
     else
     {
         tff = (pv->parity & 1) ^ 1;
     }
 
-    /* Store current frame in yadif cache */
-    store_ref( (const uint8_t**)pv->pic_in.data, pv );
-
-    /* If yadif is not ready, store another ref and return FILTER_DELAY */
-    if( pv->yadif_ready == 0 )
+    /* deinterlace both fields if mcdeint is enabled without bob */
+    int frame, num_frames = 1;
+    if (pv->mode & (MODE_MCDEINT | MODE_BOB))
     {
-        store_ref( (const uint8_t**)pv->pic_in.data, pv );
-
-        hb_buffer_copy_settings( pv->buf_settings, buf_in );
-
-        /* don't let 'work_loop' send a chapter mark upstream */
-        buf_in->new_chap  = 0;
-
-        pv->yadif_ready = 1;
-
-        return FILTER_DELAY;
+        num_frames = 2;
     }
+    
+    // Will need up to 2 buffers simultaneously
+    int idx = 0;
+    hb_buffer_t * o_buf[2] = {NULL,};
 
-    /* Perform yadif filtering */
-    int frame;
-    for( frame = 0; frame <= ( ( pv->mode & MODE_MCDEINT ) ? 1 : 0 ) ; frame++ )
-// This would be what to use for bobbing: for( frame = 0; frame <= 0 ; frame++ )
+    /* Perform yadif filtering */        
+    for( frame = 0; frame < num_frames; frame++ )
     {
+        int parity = frame ^ tff ^ 1;
 
-#if 0
-        /* Perhaps skip the second run if the frame is uncombed? */
-        if( frame && !pv->yadif_arguments[0].is_combed )
+        /* Skip the second run if the frame is uncombed */
+        if (frame && pv->is_combed == 0)
         {
             break;
         }
-#endif
-        int parity = frame ^ tff ^ 1;
 
-// This will be for bobbing
-#if 0
-        if( pv->alternator )
+        // tff for eedi2
+        pv->tff = !parity;
+
+        if (o_buf[idx] == NULL)
         {
-            parity = !parity;
-            pv->alternator = 0;
+            o_buf[idx] = hb_video_buffer_init(in->f.width, in->f.height);
         }
+
+        if (frame)
+            pv->skip_comb_check = 1;
         else
-        {
-            pv->alternator = 1;
-        }
-#endif
-        pv->tff = !parity;
+            pv->skip_comb_check = 0;
+
+        yadif_filter(pv, o_buf[idx], parity, tff);
 
-        avpicture_fill( &pv->pic_out, pv->buf_out[!(frame^1)]->data,
-                        pix_fmt, width, height );
-
-        /* XXX
-            Should check here and only bother filtering field 2 when
-           field 1 was detected as combed.
-           And when it's not, it's a progressive frame,
-           so mcdeint should be skipped...
-        */
-        yadif_filter( pv->pic_out.data, parity, tff, pv );
-
-        /* Commented out code in the line below would skip mcdeint
-           on uncombed frames. Possibly a bad idea, since mcdeint
-           maintains the same snow context for the entire video... */
-        if( pv->mcdeint_mode >= 0 /* && pv->yadif_arguments[0].is_combed */)
+        // Unfortunately, all frames must be fed to mcdeint combed or
+        // not since it maintains state that is updated by each frame.
+        if (pv->mcdeint_mode >= 0)
         {
+            if (o_buf[idx^1] == NULL)
+            {
+                o_buf[idx^1] = hb_video_buffer_init(in->f.width, in->f.height);
+            }
             /* Perform mcdeint filtering */
-            avpicture_fill( &pv->pic_in,  pv->buf_out[(frame^1)]->data,
-                            pix_fmt, width, height );
+            mcdeint_filter(o_buf[idx^1], o_buf[idx], parity, &pv->mcdeint);
 
-            mcdeint_filter( pv->pic_in.data, pv->pic_out.data, parity, pv->width, pv->height, &pv->mcdeint );
-
-            *buf_out = pv->buf_out[(frame^1)];
+            // If frame was combed, we will use results from mcdeint
+            // else we will use yadif result
+            if (pv->is_combed)
+                idx ^= 1;
         }
-        else
+
+        // Add to list of output buffers (should be at most 2)
+        if ((pv->mode & MODE_BOB) ||
+            pv->is_combed == 0 ||
+            frame == num_frames - 1)
         {
-            *buf_out = pv->buf_out[!(frame^1)];
+            if ( out == NULL )
+            {
+                last = out = o_buf[idx];
+            }
+            else
+            {
+                last->next = o_buf[idx];
+                last = last->next;
+            }
+            last->next = NULL;
+
+            // Indicate that buffer was consumed
+            o_buf[idx] = NULL;
+
+            /* Copy buffered settings to output buffer settings */
+            last->s = pv->ref[1]->s;
+            idx ^= 1;
+
+            if ((pv->mode & MODE_MASK) && pv->spatial_metric >= 0 )
+            {
+                if (pv->mode == MODE_MASK ||
+                    ((pv->mode & MODE_MASK) && (pv->mode & MODE_FILTER)) ||
+                    ((pv->mode & MODE_MASK) && (pv->mode & MODE_GAMMA)) ||
+                    pv->is_combed)
+                {
+                    apply_mask(pv, last);
+                }
+            }
         }
     }
+    // Copy subs only to first output buffer
+    hb_buffer_move_subs( out, pv->ref[1] );
 
-    /* Copy buffered settings to output buffer settings */
-    hb_buffer_copy_settings( *buf_out, pv->buf_settings );
+    hb_buffer_close(&o_buf[0]);
+    hb_buffer_close(&o_buf[1]);
 
-    /* Replace buffered settings with input buffer settings */
-    hb_buffer_copy_settings( pv->buf_settings, buf_in );
+    /* if this frame was deinterlaced and bob mode is engaged, halve
+       the duration of the saved timestamps. */
+    if ((pv->mode & MODE_BOB) && pv->is_combed)
+    {
+        out->s.stop -= (out->s.stop - out->s.start) / 2LL;
+        last->s.start = out->s.stop;
+        last->s.new_chap = 0;
+    }
 
-    /* don't let 'work_loop' send a chapter mark upstream */
-    buf_in->new_chap  = 0;
+    *buf_out = out;
 
-    return FILTER_OK;
+    return HB_FILTER_OK;
 }

HandBrake-0.9.9.tar.bz2/libhb/decpgssub.c Added

@@ -0,0 +1,462 @@
+/* decpgssub.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
+#include "hb.h"
+#include "hbffmpeg.h"
+
+struct hb_work_private_s
+{
+    AVCodecContext * context;
+    hb_job_t * job;
+    // For PGS subs, when doing passthru, we don't know if we need a
+    // packet until we have processed several packets.  So we cache
+    // all the packets we see until libav returns a subtitle with
+    // the information we need.
+    hb_buffer_t * list_pass_buffer;
+    hb_buffer_t * last_pass_buffer;
+    // It is possible for multiple subtitles to be enncapsulated in
+    // one packet.  This won't happen for PGS subs, but may for other
+    // types of subtitles.  Since I plan to generalize this code to handle
+    // other than PGS, we will need to keep a list of all subtitles seen
+    // while parsing an input packet.
+    hb_buffer_t * list_buffer;
+    hb_buffer_t * last_buffer;
+    // XXX: we may occasionally see subtitles with broken timestamps
+    //      while this should really get fixed elsewhere,
+    //      dropping subtitles should be avoided as much as possible
+    int64_t last_pts;
+    // for PGS subs, we need to pass 'empty' subtitles through (they clear the
+    // display) - when doing forced-only extraction, only pass empty subtitles
+    // through if we've seen a forced sub and haven't seen any empty sub since
+    uint8_t seen_forced_sub;
+    // if we start encoding partway through the source, we may encounter empty
+    // subtitles before we see any actual subtitle content - discard them
+    uint8_t discard_subtitle;
+};
+
+static int decsubInit( hb_work_object_t * w, hb_job_t * job )
+{
+    AVCodec *codec = avcodec_find_decoder( AV_CODEC_ID_HDMV_PGS_SUBTITLE );
+    AVCodecContext *context = avcodec_alloc_context3( codec );
+    context->codec = codec;
+
+    hb_work_private_t * pv;
+    pv = calloc( 1, sizeof( hb_work_private_t ) );
+    w->private_data = pv;
+
+    pv->discard_subtitle = 1;
+    pv->seen_forced_sub  = 0;
+    pv->last_pts         = 0;
+    pv->context          = context;
+    pv->job              = job;
+
+    return 0;
+}
+
+static void make_empty_pgs( hb_buffer_t * buf )
+{
+    hb_buffer_t * b = buf;
+    uint8_t done = 0;
+
+    // Each buffer is composed of 1 or more segments.
+    // Segment header is:
+    //      type   - 1 byte
+    //      length - 2 bytes
+    // We want to modify the presentation segment which is type 0x16
+    //
+    // Note that every pgs display set is required to have a presentation
+    // segment, so we will only have to look at one display set.
+    while ( b && !done )
+    {
+        int ii = 0;
+
+        while (ii + 3 <= b->size)
+        {
+            uint8_t type;
+            int len;
+            int segment_len_pos;
+
+            type = b->data[ii++];
+            segment_len_pos = ii;
+            len = ((int)b->data[ii] << 8) + b->data[ii+1];
+            ii += 2;
+
+            if (type == 0x16 && ii + len <= b->size)
+            {
+                int obj_count;
+                int kk, jj = ii;
+                int obj_start;
+
+                // Skip
+                // video descriptor 5 bytes
+                // composition descriptor 3 bytes
+                // palette update flg 1 byte
+                // palette id ref 1 byte
+                jj += 10;
+
+                // Set number of composition objects to 0
+                obj_count = b->data[jj];
+                b->data[jj] = 0;
+                jj++;
+                obj_start = jj;
+
+                // And remove all the composition objects
+                for (kk = 0; kk < obj_count; kk++)
+                {
+                    uint8_t crop;
+
+                    crop = b->data[jj + 3];
+                    // skip
+                    // object id - 2 bytes
+                    // window id - 1 byte
+                    // object/forced flag - 1 byte
+                    // x pos - 2 bytes
+                    // y pos - 2 bytes
+                    jj += 8;
+                    if (crop & 0x80)
+                    {
+                        // skip
+                        // crop x - 2 bytes
+                        // crop y - 2 bytes
+                        // crop w - 2 bytes
+                        // crop h - 2 bytes
+                        jj += 8;
+                    }
+                }
+                if (jj < b->size)
+                {
+                    memmove(b->data + obj_start, b->data + jj, b->size - jj);
+                }
+                b->size = obj_start + ( b->size - jj );
+                done = 1;
+                len = obj_start - (segment_len_pos + 2);
+                b->data[segment_len_pos] = len >> 8;
+                b->data[segment_len_pos+1] = len & 0xff;
+                break;
+            }
+            ii += len;
+        }
+        b = b->next;
+    }
+}
+
+static int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
+                hb_buffer_t ** buf_out )
+{
+    hb_work_private_t * pv = w->private_data;
+    hb_buffer_t * in = *buf_in;
+
+    if ( in->size <= 0 )
+    {
+        /* EOF on input stream - send it downstream & say that we're done */
+        if ( pv->list_buffer == NULL )
+        {
+            pv->list_buffer = pv->last_buffer = in;
+        }
+        else
+        {
+            pv->last_buffer->next = in;
+        }
+        *buf_in = NULL;
+        *buf_out = pv->list_buffer;
+        pv->list_buffer = NULL;
+
+        return HB_WORK_DONE;
+    }
+
+    if ( !pv->job->indepth_scan &&
+         w->subtitle->config.dest == PASSTHRUSUB &&
+         hb_subtitle_can_pass( PGSSUB, pv->job->mux ) )
+    {
+        // Append to buffer list.  It will be sent to fifo after we determine
+        // if this is a packet we need.
+        if ( pv->list_pass_buffer == NULL )
+        {
+            pv->list_pass_buffer = pv->last_pass_buffer = in;
+        }
+        else
+        {
+            pv->last_pass_buffer->next = in;
+            pv->last_pass_buffer = in;
+        }
+        // We are keeping the buffer, so prevent the filter loop from
+        // deleting it.
+        *buf_in = NULL;
+    }
+
+    AVSubtitle subtitle;
+    memset( &subtitle, 0, sizeof(subtitle) );
+
+    AVPacket avp;
+    av_init_packet( &avp );
+    avp.data = in->data;
+    avp.size = in->size;
+    // libav wants pkt pts in AV_TIME_BASE units
+    avp.pts = av_rescale(in->s.start, AV_TIME_BASE, 90000);
+
+    int has_subtitle = 0;
+
+    do
+    {
+        int usedBytes = avcodec_decode_subtitle2( pv->context, &subtitle, &has_subtitle, &avp );
+        if (usedBytes < 0)
+        {
+            hb_log("unable to decode subtitle with %d bytes.", avp.size);
+            return HB_WORK_OK;
+        }
+
+        if (usedBytes <= avp.size)
+        {
+            avp.data += usedBytes;
+            avp.size -= usedBytes;
+        }
+        else
+        {
+            avp.size = 0;
+        }
+
+        /* Subtitles are "usable" if:
+         *   1. Libav returned a subtitle (has_subtitle) AND
+         *   2. we're not doing Foreign Audio Search (!pv->job->indepth_scan) AND
+         *   3. the sub is non-empty or we've seen one such sub before (!pv->discard_subtitle)
+         * For forced-only extraction, usable subtitles also need to:
+         *   a. be forced (subtitle.rects[0]->flags & AV_SUBTITLE_FLAG_FORCED) OR
+         *   b. follow a forced sub (pv->seen_forced_sub) */
+        uint8_t forced_sub     = 0;
+        uint8_t useable_sub    = 0;
+        uint8_t clear_subtitle = 0;
+
+        if (has_subtitle)
+        {
+            // subtitle statistics
+            if (subtitle.num_rects)
+            {
+                w->subtitle->hits++;
+                if (subtitle.rects[0]->flags & AV_SUBTITLE_FLAG_FORCED)
+                {
+                    forced_sub = 1;
+                    w->subtitle->forced_hits++;
+                }
+            }
+            else
+            {
+                clear_subtitle = 1;
+            }
+            // are we doing Foreign Audio Search?
+            if (!pv->job->indepth_scan)
+            {
+                // do we want to discard this subtitle?
+                pv->discard_subtitle = pv->discard_subtitle && clear_subtitle;
+                // do we need this subtitle?
+                useable_sub = (!pv->discard_subtitle &&
+                               (!w->subtitle->config.force ||
+                                forced_sub || pv->seen_forced_sub));
+                // do we need to create an empty subtitle?
+                if (w->subtitle->config.force &&
+                    useable_sub && !forced_sub && !clear_subtitle)
+                {
+                    // We are forced-only and need to output this subtitle, but
+                    // it's neither forced nor empty.
+                    //
+                    // If passthru, create an empty subtitle.
+                    // Also, flag an empty subtitle for subtitle RENDER.
+                    make_empty_pgs(pv->list_pass_buffer);
+                    clear_subtitle = 1;
+                }
+                // is the subtitle forced?
+                pv->seen_forced_sub = forced_sub;
+            }
+        }
+
+        if (useable_sub)
+        {
+            int64_t pts = av_rescale(subtitle.pts, 90000, AV_TIME_BASE);
+            hb_buffer_t * out = NULL;
+
+            // work around broken timestamps
+            if (pts < 0 && in->s.start >= 0)
+            {
+                pts = in->s.start;
+            }
+            else if (pts < 0)
+            {
+                // XXX: a broken pts will cause us to drop this subtitle,
+                //      which is bad; use a default duration of 3 seconds
+                pts = pv->last_pts + 3 * 90000LL;
+                hb_log("[warning] decpgssub: track %d, invalid PTS",
+                       w->subtitle->out_track);
+            }
+            pv->last_pts = pts;
+
+            if ( w->subtitle->config.dest == PASSTHRUSUB &&
+                 hb_subtitle_can_pass( PGSSUB, pv->job->mux ) )
+            {
+                /* PGS subtitles are spread across multiple packets (1 per segment).
+                 * In the MKV container, all segments are found in the same packet
+                 * (this is expected by some devices, such as the WD TV Live).
+                 * So if there are multiple packets, merge them. */
+                if (pv->list_pass_buffer->next == NULL)
+                {
+                    // packets already merged (e.g. MKV sources)
+                    out = pv->list_pass_buffer;
+                    pv->list_pass_buffer = NULL;
+                }
+                else
+                {
+                    int size = 0;
+                    uint8_t * data;
+                    hb_buffer_t * b;
+
+                    b = pv->list_pass_buffer;
+                    while (b != NULL)
+                    {
+                        size += b->size;
+                        b = b->next;
+                    }
+
+                    out = hb_buffer_init( size );
+                    data = out->data;
+                    b = pv->list_pass_buffer;
+                    while (b != NULL)
+                    {
+                        memcpy( data, b->data, b->size );
+                        data += b->size;
+                        b = b->next;
+                    }
+                    hb_buffer_close( &pv->list_pass_buffer );
+
+                    out->s        = in->s;
+                    out->sequence = in->sequence;
+                }
+                out->s.start = out->s.stop = pts;
+            }
+            else
+            {
+                if (!clear_subtitle)
+                {
+                    unsigned ii;
+                    for (ii = 0; ii < subtitle.num_rects; ii++)
+                    {
+                        AVSubtitleRect *rect = subtitle.rects[ii];
+
+                        out = hb_frame_buffer_init(AV_PIX_FMT_YUVA420P,
+                                                   rect->w, rect->h);
+
+                        out->s.id     = in->s.id;
+                        out->sequence = in->sequence;
+                        out->s.start  = pts;
+                        out->s.stop   = pts;
+                        out->f.x      = rect->x;
+                        out->f.y      = rect->y;
+
+                        uint8_t *lum     = out->plane[0].data;
+                        uint8_t *chromaU = out->plane[1].data;
+                        uint8_t *chromaV = out->plane[2].data;
+                        uint8_t *alpha   = out->plane[3].data;
+
+                        int xx, yy;
+                        for (yy = 0; yy < rect->h; yy++)
+                        {
+                            for (xx = 0; xx < rect->w; xx++)
+                            {
+                                uint32_t argb, yuv;
+                                int pixel;
+                                uint8_t color;
+
+                                pixel = yy * rect->w + xx;
+                                color = rect->pict.data[0][pixel];
+                                argb = ((uint32_t*)rect->pict.data[1])[color];
+                                yuv = hb_rgb2yuv(argb);
+
+                                lum[xx] = (yuv >> 16) & 0xff;
+                                alpha[xx] = (argb >> 24) & 0xff;
+                                if ((xx & 1) == 0 && (yy & 1) == 0)
+                                {
+                                    chromaV[xx>>1] = (yuv >> 8) & 0xff;
+                                    chromaU[xx>>1] = yuv & 0xff;
+                                }
+                            }
+                            lum += out->plane[0].stride;
+                            if ((yy & 1) == 0)
+                            {
+                                chromaU += out->plane[1].stride;
+                                chromaV += out->plane[2].stride;
+                            }
+                            alpha += out->plane[3].stride;
+                        }
+
+                        if ( pv->list_buffer == NULL )
+                        {
+                            pv->list_buffer = pv->last_buffer = out;
+                        }
+                        else
+                        {
+                            pv->last_buffer->next = out;
+                            pv->last_buffer = out;
+                        }
+                        out = NULL;
+                    }
+                }
+                else
+                {
+                    out = hb_buffer_init( 1 );
+
+                    out->s.id     = in->s.id;
+                    out->s.start  = pts;
+                    out->s.stop   = pts;
+                    out->f.x      = 0;
+                    out->f.y      = 0;
+                    out->f.width  = 0;
+                    out->f.height = 0;
+                }
+            }
+            if ( pv->list_buffer == NULL )
+            {
+                pv->list_buffer = pv->last_buffer = out;
+            }
+            else
+            {
+                pv->last_buffer->next = out;
+            }
+            while (pv->last_buffer && pv->last_buffer->next)
+            {
+                pv->last_buffer = pv->last_buffer->next;
+            }
+        }
+        else if ( has_subtitle )
+        {
+            hb_buffer_close( &pv->list_pass_buffer );
+            pv->list_pass_buffer = NULL;
+        }
+        if ( has_subtitle )
+        {
+            avsubtitle_free(&subtitle);
+        }
+    } while (avp.size > 0);
+
+    *buf_out = pv->list_buffer;
+    pv->list_buffer = NULL;
+    return HB_WORK_OK;
+}
+
+static void decsubClose( hb_work_object_t * w )
+{
+    hb_work_private_t * pv = w->private_data;
+    avcodec_flush_buffers( pv->context );
+    avcodec_close( pv->context );
+}
+
+hb_work_object_t hb_decpgssub =
+{
+    WORK_DECPGSSUB,
+    "PGS decoder",
+    decsubInit,
+    decsubWork,
+    decsubClose
+};

HandBrake-0.9.8.tar.bz2/libhb/decsrtsub.c -> HandBrake-0.9.9.tar.bz2/libhb/decsrtsub.c Changed

@@ -1,7 +1,11 @@
-/* 
-   This file is part of the HandBrake source code.
+/* decsrtsub.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -162,6 +166,9 @@
     int i;
     char c;
 
+    // clear remnants of the previous line before progessing a new one
+    memset(buf, '\0', size);
+
     /* Find newline in converted UTF-8 buffer */
     for( i = 0; i < size - 1; i++ )
     {
@@ -233,11 +240,11 @@
         case k_state_inEntry_or_new:
         {
             char *endpoint;
-            long entry_number;
             /*
              * Is this really new next entry begin?
+             * Look for entry number.
              */
-            entry_number = strtol(line_buffer, &endpoint, 10);
+            strtol(line_buffer, &endpoint, 10);
             if (endpoint == line_buffer ||
                 (endpoint && *endpoint != '\n' && *endpoint != '\r'))
             {
@@ -317,7 +324,7 @@
              */
             pv->last_entry_number = entry_number;
             resync = 0;
-            if( *pv->current_entry.text )
+            if (*pv->current_entry.text != '\0')
             {
                 long length;
                 char *p, *q;
@@ -338,30 +345,36 @@
 
                 length = strlen( pv->current_entry.text );
 
-                for( q = p = pv->current_entry.text; *p; p++)
+                for (q = p = pv->current_entry.text; *p != '\0'; p++)
                 {
-                    if( *p == '\n' )
+                    if (*p == '\n' || *p == '\r')
                     {
-                        if ( line == 1 )
+                        if (*(p + 1) == '\n' || *(p + 1) == '\r' ||
+                            *(p + 1) == '\0')
                         {
-                            *q = *p;
+                            // followed by line break or last character, skip it
+                            length--;
+                            continue;
+                        }
+                        else if (line == 1)
+                        {
+                            // replace '\r' with '\n'
+                            *q   = '\n';
                             line = 2;
                         }
                         else
                         {
+                            // all subtitles on two lines tops
+                            // replace line breaks with spaces
                             *q = ' ';
                         }
                         q++;
                     }
-                    else if( *p != '\r' )
+                    else
                     {
                         *q = *p;
                         q++;
                     }
-                    else
-                    {
-                        length--;
-                    }
                 }
                 *q = '\0';
 
@@ -369,8 +382,8 @@
 
                 if( buffer )
                 {
-                    buffer->start = start_time - pv->start_time;
-                    buffer->stop = stop_time - pv->start_time;
+                    buffer->s.start = start_time - pv->start_time;
+                    buffer->s.stop = stop_time - pv->start_time;
 
                     memcpy( buffer->data, pv->current_entry.text, length + 1 );
                 }
@@ -388,7 +401,7 @@
     }
 
     hb_buffer_t *buffer = NULL;
-    if( *pv->current_entry.text )
+    if (*pv->current_entry.text != '\0')
     {
         long length;
         char *p, *q;
@@ -407,30 +420,35 @@
 
         length = strlen( pv->current_entry.text );
 
-        for( q = p = pv->current_entry.text; *p; p++)
+        for (q = p = pv->current_entry.text; *p != '\0'; p++)
         {
-            if( *p == '\n' )
+            if (*p == '\n' || *p == '\r')
             {
-                if ( line == 1 )
+                if (*(p + 1) == '\n' || *(p + 1) == '\r' || *(p + 1) == '\0')
+                {
+                    // followed by line break or last character, skip it
+                    length--;
+                    continue;
+                }
+                else if (line == 1)
                 {
-                    *q = *p;
+                    // replace '\r' with '\n'
+                    *q   = '\n';
                     line = 2;
                 }
                 else
                 {
+                    // all subtitles on two lines tops
+                    // replace line breaks with spaces
                     *q = ' ';
                 }
                 q++;
             }
-            else if( *p != '\r' )
+            else
             {
                 *q = *p;
                 q++;
             }
-            else
-            {
-                length--;
-            }
         }
         *q = '\0';
 
@@ -438,8 +456,8 @@
 
         if( buffer )
         {
-            buffer->start = start_time - pv->start_time;
-            buffer->stop = stop_time - pv->start_time;
+            buffer->s.start = start_time - pv->start_time;
+            buffer->s.stop = stop_time - pv->start_time;
 
             memcpy( buffer->data, pv->current_entry.text, length + 1 );
         }
@@ -460,7 +478,6 @@
     hb_buffer_t *buffer;
     int i;
     hb_chapter_t * chapter;
-    hb_title_t *title = job->title;
 
     pv = calloc( 1, sizeof( hb_work_private_t ) );
     if( pv )
@@ -485,7 +502,7 @@
         pv->start_time = 0;
         for( i = 1; i < job->chapter_start; ++i )
         {
-            chapter = hb_list_item( title->list_chapter, i - 1 );
+            chapter = hb_list_item( job->list_chapter, i - 1 );
             if( chapter )
             {
                 pv->start_time += chapter->duration;
@@ -497,7 +514,7 @@
         pv->stop_time = pv->start_time;
         for( i = job->chapter_start; i <= job->chapter_end; ++i )
         {
-            chapter = hb_list_item( title->list_chapter, i - 1 );
+            chapter = hb_list_item( job->list_chapter, i - 1 );
             if( chapter )
             {
                 pv->stop_time += chapter->duration;

HandBrake-0.9.8.tar.bz2/libhb/decssasub.c -> HandBrake-0.9.9.tar.bz2/libhb/decssasub.c Changed

@@ -1,7 +1,11 @@
-/* 
-   This file is part of the HandBrake source code.
+/* decssasub.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 /*
  * Converts SSA subtitles to either:
@@ -28,9 +32,6 @@
 struct hb_work_private_s
 {
     // If decoding to PICTURESUB format:
-    ASS_Library *ssa;
-    ASS_Renderer *renderer;
-    ASS_Track *ssaTrack;
     int readOrder;
 
     hb_job_t *job;
@@ -113,7 +114,7 @@
 }
 
 static hb_buffer_t *ssa_decode_line_to_utf8( uint8_t *in_data, int in_size, int in_sequence );
-static hb_buffer_t *ssa_decode_line_to_picture( hb_work_object_t * w, uint8_t *in_data, int in_size, int in_sequence );
+static hb_buffer_t *ssa_decode_line_to_mkv_ssa( hb_work_object_t * w, uint8_t *in_data, int in_size, int in_sequence );
 
 /*
  * Decodes a single SSA packet to one or more TEXTSUB or PICTURESUB subtitle packets.
@@ -125,8 +126,8 @@
 static hb_buffer_t *ssa_decode_packet( hb_work_object_t * w, hb_buffer_t *in )
 {
     // Store NULL after the end of the buffer to make using string processing safe
-    hb_buffer_realloc( in, in->size + 1 );
-    in->data[in->size] = '\0';
+    hb_buffer_realloc(in, ++in->size);
+    in->data[in->size - 1] = '\0';
     
     hb_buffer_t *out_list = NULL;
     hb_buffer_t **nextPtr = &out_list;
@@ -150,10 +151,10 @@
             
             // We shouldn't be storing the extra NULL character,
             // but the MP4 muxer expects this, unfortunately.
-            if ( out->size > 0 && out->data[out->size - 1] != '\0' ) {
-                // NOTE: out->size remains unchanged
-                hb_buffer_realloc( out, out->size + 1 );
-                out->data[out->size] = '\0';
+            if (out->size > 0 && out->data[out->size - 1] != '\0')
+            {
+                hb_buffer_realloc(out, ++out->size);
+                out->data[out->size - 1] = '\0';
             }
             
             // If the input packet was non-empty, do not pass through
@@ -164,7 +165,7 @@
                 continue;
             }
         } else if ( w->subtitle->config.dest == RENDERSUB ) {
-            out = ssa_decode_line_to_picture( w, (uint8_t *) curLine, strlen( curLine ), in->sequence );
+            out = ssa_decode_line_to_mkv_ssa( w, (uint8_t *) curLine, strlen( curLine ), in->sequence );
             if ( out == NULL )
                 continue;
         }
@@ -188,16 +189,16 @@
     //       such that first output packet's display time aligns with the 
     //       input packet's display time. This should give the correct time 
     //       when point-to-point encoding is in effect.
-    if (out_list && out_list->start > in->start)
+    if (out_list && out_list->s.start > in->s.start)
     {
-        int64_t slip = out_list->start - in->start;
+        int64_t slip = out_list->s.start - in->s.start;
         hb_buffer_t *out;
 
         out = out_list;
         while (out)
         {
-            out->start -= slip;
-            out->stop -= slip;
+            out->s.start -= slip;
+            out->s.stop -= slip;
             out = out->next;
         }
     }
@@ -262,7 +263,7 @@
     uint8_t *pos = in_data;
     uint8_t *end = in_data + in_size;
     
-    // Parse values for in->start and in->stop
+    // Parse values for in->s.start and in->s.stop
     int64_t in_start, in_stop;
     if ( parse_timing_from_ssa_packet( (char *) in_data, &in_start, &in_stop ) )
         goto fail;
@@ -335,8 +336,8 @@
     out->size = dst - out->data;
     
     // Copy metadata from the input packet to the output packet
-    out->start = in_start;
-    out->stop = in_stop;
+    out->s.start = in_start;
+    out->s.stop = in_stop;
     out->sequence = in_sequence;
     
     return out;
@@ -348,12 +349,12 @@
 
 static hb_buffer_t * ssa_to_mkv_ssa( hb_work_object_t * w,  hb_buffer_t * in )
 {
-    hb_work_private_t * pv = w->private_data;
     hb_buffer_t * out_last = NULL;
     hb_buffer_t * out_first = NULL;
 
-    hb_buffer_realloc( in, in->size + 1 );
-    in->data[in->size] = '\0';
+    // Store NULL after the end of the buffer to make using string processing safe
+    hb_buffer_realloc(in, ++in->size);
+    in->data[in->size - 1] = '\0';
 
     const char *EOL = "\r\n";
     char *curLine, *curLine_parserData;
@@ -361,62 +362,11 @@
           curLine;
           curLine = strtok_r( NULL, EOL, &curLine_parserData ) )
     {
-        // Skip empty lines and spaces between adjacent CR and LF
-        if (curLine[0] == '\0')
-            continue;
-        
-        int64_t in_start, in_stop;
-        if ( parse_timing_from_ssa_packet( curLine, &in_start, &in_stop ) )
-            continue;
+        hb_buffer_t * out;
 
-        int len = strlen(curLine);
-
-        // Convert the SSA line to MKV-SSA format
-        char *layerField = malloc( len );
-        // SSA subtitles have an empty layer field (bare ',').  The scanf
-        // format specifier "%*128[^,]" will not match on a bare ','.  There
-        // must be at least one non ',' character in the match.  So the format
-        // specifier is placed directly next to the ':' so that the next
-        // expected ' ' after the ':' will be the character it matches on 
-        // when there is no layer field.
-        int numPartsRead = sscanf( curLine, "Dialogue:%128[^,],", layerField );
-        if ( numPartsRead != 1 )
+        out = ssa_decode_line_to_mkv_ssa( w, (uint8_t *) curLine, strlen( curLine ), in->sequence );
+        if( out )
         {
-            free( layerField );
-            continue;
-        }
-        
-        char *styleToTextFields = (char *)find_field( (uint8_t*)curLine, (uint8_t*)curLine + len, 4 );
-        if ( styleToTextFields == NULL ) 
-        {
-            free( layerField );
-            continue;
-        }
-        
-        // The output should always be shorter than the input
-        hb_buffer_t * out = hb_buffer_init( len );
-        char *mkvOut = (char*)out->data;
-        out->start = in_start;
-        out->stop = in_stop;
-
-        // The sscanf conversion above will result in an extra space
-        // before the layerField.  Strip the space.
-        char *stripLayerField = layerField;
-        for(; *stripLayerField == ' '; stripLayerField++);
-
-        sprintf( mkvOut, "%d,%s,%s", 
-                 pv->readOrder++, stripLayerField, styleToTextFields );
-        
-        free( layerField );
-
-        len = strlen(mkvOut);
-        if ( len == 0 )
-        {
-            hb_buffer_close(&out);
-        }
-        else
-        {
-            out->size = len;
             if ( out_last == NULL )
             {
                 out_last = out_first = out;
@@ -441,154 +391,64 @@
  *   ReadOrder,Marked,          Style,Name,MarginL,MarginR,MarginV,Effect,Text '\0'
  *   1         2                3     4    5       6       7       8      9
  */
-static hb_buffer_t *ssa_decode_line_to_picture( hb_work_object_t * w, uint8_t *in_data, int in_size, int in_sequence )
+static hb_buffer_t *ssa_decode_line_to_mkv_ssa( hb_work_object_t * w, uint8_t *in_data, int in_size, int in_sequence )
 {
     hb_work_private_t * pv = w->private_data;
+    hb_buffer_t * out;
     
-    // Parse values for in->start and in->stop
+    // Parse values for in->s.start and in->s.stop
     int64_t in_start, in_stop;
     if ( parse_timing_from_ssa_packet( (char *) in_data, &in_start, &in_stop ) )
         goto fail;
     
     // Convert the SSA packet to MKV-SSA format, which is what libass expects
     char *mkvIn;
-    int mkvInSize;
-    {
-        char *layerField = malloc( in_size );
-        // SSA subtitles have an empty layer field (bare ',').  The scanf
-        // format specifier "%*128[^,]" will not match on a bare ','.  There
-        // must be at least one non ',' character in the match.  So the format
-        // specifier is placed directly next to the ':' so that the next
-        // expected ' ' after the ':' will be the character it matches on 
-        // when there is no layer field.
-        int numPartsRead = sscanf( (char *) in_data, "Dialogue:%128[^,],", layerField );
-        if ( numPartsRead != 1 )
-            goto fail;
-        
-        char *styleToTextFields = (char *) find_field( in_data, in_data + in_size, 4 );
-        if ( styleToTextFields == NULL ) {
-            free( layerField );
-            goto fail;
-        }
-        
-        // The sscanf conversion above will result in an extra space
-        // before the layerField.  Strip the space.
-        char *stripLayerField = layerField;
-        for(; *stripLayerField == ' '; stripLayerField++);
-
-        mkvIn = malloc( in_size + 1 );
-        mkvIn[0] = '\0';
-        sprintf(mkvIn, "%d", pv->readOrder++);    // ReadOrder: make this up
-        strcat( mkvIn, "," );
-        strcat( mkvIn, stripLayerField );
-        strcat( mkvIn, "," );
-        strcat( mkvIn, (char *) styleToTextFields );
-        
-        mkvInSize = strlen(mkvIn);
-        
+    int numPartsRead;
+    char *styleToTextFields;
+    char *layerField = malloc( in_size );
+
+    // SSA subtitles have an empty layer field (bare ',').  The scanf
+    // format specifier "%*128[^,]" will not match on a bare ','.  There
+    // must be at least one non ',' character in the match.  So the format
+    // specifier is placed directly next to the ':' so that the next
+    // expected ' ' after the ':' will be the character it matches on 
+    // when there is no layer field.
+    numPartsRead = sscanf( (char *)in_data, "Dialogue:%128[^,],", layerField );
+    if ( numPartsRead != 1 )
+        goto fail;
+    
+    styleToTextFields = (char *)find_field( in_data, in_data + in_size, 4 );
+    if ( styleToTextFields == NULL ) {
         free( layerField );
+        goto fail;
     }
     
-    // Parse MKV-SSA packet
-    ass_process_chunk( pv->ssaTrack, mkvIn, mkvInSize, in_start / 90, (in_stop - in_start) / 90 );
-    
-    free( mkvIn );
-    
-    // TODO: To support things like karaoke, it won't be sufficient to only generate
-    //       new subtitle pictures when there are subtitle packets. Rather, pictures will
-    //       need to be generated potentially continuously. 
-    //       
-    //       Until "karaoke support" is implemented, make an educated guess about the
-    //       timepoint within the subtitle that should be rendered. I guess the midpoint.
-    int64_t renderTime = ( in_start + in_stop ) / 2; 
-    
-    int changed;
-    ASS_Image *frameList = ass_render_frame( pv->renderer, pv->ssaTrack, renderTime / 90, &changed );
-    if ( !changed || !frameList )
-        return NULL;
-    
-    int numFrames = 0;
-    ASS_Image *curFrame;
-    for (curFrame = frameList; curFrame; curFrame = curFrame->next)
-        numFrames++;
-    
-    hb_buffer_t *outSubpictureList = NULL;
-    hb_buffer_t **outSubpictureListTailPtr = &outSubpictureList;
+    // The sscanf conversion above will result in an extra space
+    // before the layerField.  Strip the space.
+    char *stripLayerField = layerField;
+    for(; *stripLayerField == ' '; stripLayerField++);
+
+    out = hb_buffer_init( in_size + 1 );
+    mkvIn = (char*)out->data;
+
+    mkvIn[0] = '\0';
+    sprintf(mkvIn, "%d", pv->readOrder++);    // ReadOrder: make this up
+    strcat( mkvIn, "," );
+    strcat( mkvIn, stripLayerField );
+    strcat( mkvIn, "," );
+    strcat( mkvIn, (char *) styleToTextFields );
     
-    // Generate a PICTURESUB packet from the frames
-    ASS_Image *frame;
-    for (frame = frameList; frame; frame = frame->next) {
-        // Allocate pixmap where drawing will be done
-        uint8_t *rgba = calloc(frame->w * frame->h * 4, 1);
-        
-        unsigned r = (frame->color >> 24) & 0xff;
-        unsigned g = (frame->color >> 16) & 0xff;
-        unsigned b = (frame->color >>  8) & 0xff;
-        unsigned a = (frame->color      ) & 0xff;
-        
-        int x, y;
-        for (y = 0; y < frame->h; y++) {
-            for (x = 0; x < frame->w; x++) {
-                unsigned srcAlphaPrenormalized = frame->bitmap[y*frame->stride + x];
-                unsigned srcAlpha = (255 - a) * srcAlphaPrenormalized / 255;
-                
-                uint8_t *dst = &rgba[(y*frame->w + x) * 4];
-                unsigned oldDstAlpha = dst[3];
-                
-                if (oldDstAlpha == 0) {
-                    // Optimized version
-                    dst[0] = r;
-                    dst[1] = g;
-                    dst[2] = b;
-                    dst[3] = srcAlpha;
-                } else {
-                    dst[3] = 255 - ( 255 - dst[3] ) * ( 255 - srcAlpha ) / 255;
-                    if (dst[3] != 0) {
-                        dst[0] = ( dst[0] * oldDstAlpha * (255-srcAlpha) / 255 + r * srcAlpha ) / dst[3];
-                        dst[1] = ( dst[1] * oldDstAlpha * (255-srcAlpha) / 255 + g * srcAlpha ) / dst[3];
-                        dst[2] = ( dst[2] * oldDstAlpha * (255-srcAlpha) / 255 + b * srcAlpha ) / dst[3];
-                    }
-                }
-            }
-        }
-        
-        // Generate output subpicture (in PICTURESUB format)
-        hb_buffer_t *out = hb_buffer_init(frame->w * frame->h * 4);
-        out->x = frame->dst_x;
-        out->y = frame->dst_y;
-        out->width = frame->w;
-        out->height = frame->h;
-        out->start = in_start;
-        out->stop = in_stop;
-        out->sequence = in_sequence;
-        
-        int i;
-        int numPixels = frame->w * frame->h;
-        for (i = 0; i < numPixels; i++) {
-            uint8_t *srcRgba = &rgba[i * 4];
-            
-            uint8_t *dstY = &out->data[(numPixels * 0) + i];
-            uint8_t *dstA = &out->data[(numPixels * 1) + i];
-            uint8_t *dstU = &out->data[(numPixels * 2) + i];
-            uint8_t *dstV = &out->data[(numPixels * 3) + i];
-            
-            int srcYuv = hb_rgb2yuv((srcRgba[0] << 16) | (srcRgba[1] << 8) | (srcRgba[2] << 0));
-            int srcA = srcRgba[3];
-            
-            *dstY = (srcYuv >> 16) & 0xff;
-            *dstV = (srcYuv >> 8 ) & 0xff;
-            *dstU = (srcYuv >> 0 ) & 0xff;
-            *dstA = srcA / 16;  // HB's max alpha value is 16
-        }
-        
-        free(rgba);
-        
-        *outSubpictureListTailPtr = out;
-        outSubpictureListTailPtr = &out->next;
+    out->size = strlen(mkvIn);
+    out->s.start = in_start;
+    out->s.stop = in_stop;
+    out->sequence = in_sequence;
+
+    if( out->size == 0 )
+    {
+        hb_buffer_close(&out);
     }
     
-    // NOTE: The subpicture list is actually considered a single packet by most other code
-    hb_buffer_t *out = outSubpictureList;
+    free( layerField );
     
     return out;
     
@@ -597,14 +457,6 @@
     return NULL;
 }
 
-static void ssa_log(int level, const char *fmt, va_list args, void *data)
-{
-    if ( level < 5 )      // same as default verbosity when no callback is set
-    {
-        hb_valog( 1, "[ass]", fmt, args );
-    }
-}
-
 static int decssaInit( hb_work_object_t * w, hb_job_t * job )
 {
     hb_work_private_t * pv;
@@ -613,73 +465,6 @@
     w->private_data = pv;
     pv->job = job;
     
-    if ( w->subtitle->config.dest == RENDERSUB ) {
-        pv->ssa = ass_library_init();
-        if ( !pv->ssa ) {
-            hb_log( "decssasub: libass initialization failed\n" );
-            return 1;
-        }
-        
-        // Redirect libass output to hb_log
-        ass_set_message_cb( pv->ssa, ssa_log, NULL );
-        
-        // Load embedded fonts
-        hb_list_t * list_attachment = job->title->list_attachment;
-        int i;
-        for ( i = 0; i < hb_list_count(list_attachment); i++ )
-        {
-            hb_attachment_t * attachment = hb_list_item( list_attachment, i );
-            
-            if ( attachment->type == FONT_TTF_ATTACH )
-            {
-                ass_add_font(
-                    pv->ssa,
-                    attachment->name,
-                    attachment->data,
-                    attachment->size );
-            }
-        }
-        
-        ass_set_extract_fonts( pv->ssa, 1 );
-        ass_set_style_overrides( pv->ssa, NULL );
-        
-        pv->renderer = ass_renderer_init( pv->ssa );
-        if ( !pv->renderer ) {
-            hb_log( "decssasub: renderer initialization failed\n" );
-            return 1;
-        }
-        
-        ass_set_use_margins( pv->renderer, 0 );
-        ass_set_hinting( pv->renderer, ASS_HINTING_LIGHT );     // VLC 1.0.4 uses this
-        ass_set_font_scale( pv->renderer, 1.0 );
-        ass_set_line_spacing( pv->renderer, 1.0 );
-        
-        // Setup default font family
-        // 
-        // SSA v4.00 requires that "Arial" be the default font
-        const char *font = NULL;
-        const char *family = "Arial";
-        // NOTE: This can sometimes block for several *seconds*.
-        //       It seems that process_fontdata() for some embedded fonts is slow.
-        ass_set_fonts( pv->renderer, font, family, /*haveFontConfig=*/1, NULL, 1 );
-        
-        // Setup track state
-        pv->ssaTrack = ass_new_track( pv->ssa );
-        if ( !pv->ssaTrack ) {
-            hb_log( "decssasub: ssa track initialization failed\n" );
-            return 1;
-        }
-        
-        // NOTE: The codec extradata is expected to be in MKV format
-        ass_process_codec_private( pv->ssaTrack,
-            (char *) w->subtitle->extradata, w->subtitle->extradata_size );
-        
-        int originalWidth = job->title->width;
-        int originalHeight = job->title->height;
-        ass_set_frame_size( pv->renderer, originalWidth, originalHeight);
-        ass_set_aspect_ratio( pv->renderer, /*dar=*/1.0, /*sar=*/1.0 );
-    }
-    
     return 0;
 }
 
@@ -690,7 +475,7 @@
     hb_buffer_t * in = *buf_in;
     
 #if SSA_VERBOSE_PACKETS
-    printf("\nPACKET(%"PRId64",%"PRId64"): %.*s\n", in->start/90, in->stop/90, in->size, in->data);
+    printf("\nPACKET(%"PRId64",%"PRId64"): %.*s\n", in->s.start/90, in->s.stop/90, in->size, in->data);
 #endif
     
     if ( in->size <= 0 )
@@ -714,15 +499,6 @@
 
 static void decssaClose( hb_work_object_t * w )
 {
-    hb_work_private_t * pv = w->private_data;
-
-    if ( pv->ssaTrack )
-        ass_free_track( pv->ssaTrack );
-    if ( pv->renderer )
-        ass_renderer_done( pv->renderer );
-    if ( pv->ssa )
-        ass_library_done( pv->ssa );
-    
     free( w->private_data );
 }

HandBrake-0.9.8.tar.bz2/libhb/dectx3gsub.c -> HandBrake-0.9.9.tar.bz2/libhb/dectx3gsub.c Changed

@@ -1,7 +1,11 @@
-/* 
-   This file is part of the HandBrake source code.
+/* dectx3gsub.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 /*
  * Converts TX3G subtitles to UTF-8 subtitles with limited HTML-style markup (<b>, <i>, <u>).
@@ -164,8 +168,8 @@
     out->size = dst - out->data;
     
     // Copy metadata from the input packet to the output packet
-    out->start = in->start;
-    out->stop = in->stop;
+    out->s.start = in->s.start;
+    out->s.stop = in->s.stop;
     
 fail:
     free( startStyle );
@@ -197,7 +201,7 @@
     
     // Warn if the subtitle's duration has not been passed through by the demuxer,
     // which will prevent the subtitle from displaying at all
-    if ( in->stop == 0 ) {
+    if ( in->s.stop == 0 ) {
         hb_log( "dectx3gsub: subtitle packet lacks duration" );
     }
     
@@ -210,10 +214,10 @@
     if ( out != NULL ) {
         // We shouldn't be storing the extra NULL character,
         // but the MP4 muxer expects this, unfortunately.
-        if ( out->size > 0 && out->data[out->size - 1] != '\0' ) {
-            // NOTE: out->size remains unchanged
-            hb_buffer_realloc( out, out->size + 1 );
-            out->data[out->size] = '\0';
+        if (out->size > 0 && out->data[out->size - 1] != '\0')
+        {
+            hb_buffer_realloc(out, ++out->size);
+            out->data[out->size - 1] = '\0';
         }
         
         // If the input packet was non-empty, do not pass through

HandBrake-0.9.8.tar.bz2/libhb/decutf8sub.c -> HandBrake-0.9.9.tar.bz2/libhb/decutf8sub.c Changed

@@ -1,7 +1,11 @@
-/* 
-   This file is part of the HandBrake source code.
+/* decutf8sub.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 /*
  * Decoder for UTF-8 subtitles obtained from file input-sources.
@@ -16,40 +20,38 @@
 #include <stdio.h>
 #include "hb.h"
 
-static int decutf8Init( hb_work_object_t * w, hb_job_t * job )
+static int decutf8Init(hb_work_object_t *w, hb_job_t *job)
 {
     return 0;
 }
 
-static int decutf8Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
-                        hb_buffer_t ** buf_out )
+static int decutf8Work(hb_work_object_t * w,
+                       hb_buffer_t **buf_in, hb_buffer_t **buf_out)
 {
-    hb_buffer_t * in = *buf_in;
-    hb_buffer_t * out = NULL;
-
     // Pass the packets through without modification
-    out = in;
+    hb_buffer_t *out = *buf_in;
 
-    // Warn if the subtitle's duration has not been passed through by the demuxer,
-    // which will prevent the subtitle from displaying at all
-    if ( out->stop == 0 ) {
-        hb_log( "decutf8sub: subtitle packet lacks duration" );
+    // Warn if the subtitle's duration has not been passed through by the
+    // demuxer, which will prevent the subtitle from displaying at all
+    if (out->s.stop == 0)
+    {
+        hb_log("decutf8sub: subtitle packet lacks duration");
     }
-    
+
     // We shouldn't be storing the extra NULL character,
     // but the MP4 muxer expects this, unfortunately.
-    if ( out->size > 0 && out->data[out->size - 1] != '\0' ) {
-        // NOTE: out->size remains unchanged
-        hb_buffer_realloc( out, out->size + 1 );
-        out->data[out->size] = '\0';
+    if (out->size > 0 && out->data[out->size - 1] != '\0')
+    {
+        hb_buffer_realloc(out, ++out->size);
+        out->data[out->size - 1] = '\0';
     }
-    
-    *buf_in = NULL;
+
+    *buf_in  = NULL;
     *buf_out = out;
     return HB_WORK_OK;
 }
 
-static void decutf8Close( hb_work_object_t * w )
+static void decutf8Close(hb_work_object_t *w)
 {
     // nothing
 }

HandBrake-0.9.8.tar.bz2/libhb/decvobsub.c -> HandBrake-0.9.9.tar.bz2/libhb/decvobsub.c Changed

@@ -1,8 +1,11 @@
-/* $Id: decsub.c,v 1.12 2005/04/14 17:37:54 titer Exp $
+/* decvobsub.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 /*
  * Decoder for DVD bitmap subtitles, also known as "VOB subtitles" within the HandBrake source code.
@@ -49,6 +52,7 @@
     uint8_t       chromaU[4];
     uint8_t       chromaV[4];
     uint8_t       alpha[4];
+    uint8_t       palette_set;
 };
 
 static hb_buffer_t * Decode( hb_work_object_t * );
@@ -64,18 +68,23 @@
     pv->pts = 0;
     
     // Warn if the input color palette is empty
-    int paletteEmpty = 1;
-    int i;
-    for (i=0; i<16; i++)
+    pv->palette_set = w->subtitle->palette_set;
+    if ( pv->palette_set )
     {
-        if (w->subtitle->palette[i])
+        // Make sure the entries in the palette are not all 0
+        pv->palette_set = 0;
+        int i;
+        for (i=0; i<16; i++)
         {
-            paletteEmpty = 0;
-            break;
+            if (w->subtitle->palette[i])
+            {
+                pv->palette_set = 1;
+                break;
+            }
         }
     }
-    if (paletteEmpty) {
-        hb_log( "decvobsub: input color palette is empty; not demuxed properly?" );
+    if (!pv->palette_set) {
+        hb_log( "decvobsub: input color palette is empty!" );
     }
 
     return 0;
@@ -96,7 +105,7 @@
         return HB_WORK_DONE;
     }
 
-    pv->stream_id = in->id;
+    pv->stream_id = in->s.id;
 
     size_sub = ( in->data[0] << 8 ) | in->data[1];
     size_rle = ( in->data[2] << 8 ) | in->data[3];
@@ -113,12 +122,12 @@
 
             pv->buf      = hb_buffer_init( 0xFFFF );
             memcpy( pv->buf->data, in->data, in->size );
-            pv->buf->id = in->id;
+            pv->buf->s.id = in->s.id;
             pv->buf->sequence = in->sequence;
             pv->size_got = in->size;
-            if( in->start >= 0 )
+            if( in->s.start >= 0 )
             {
-                pv->pts      = in->start;
+                pv->pts      = in->s.start;
             }
         }
     }
@@ -128,12 +137,12 @@
         if( in->size <= pv->size_sub - pv->size_got )
         {
             memcpy( pv->buf->data + pv->size_got, in->data, in->size );
-            pv->buf->id = in->id;
+            pv->buf->s.id = in->s.id;
             pv->buf->sequence = in->sequence;
             pv->size_got += in->size;
-            if( in->start >= 0 )
+            if( in->s.start >= 0 )
             {
-                pv->pts = in->start;
+                pv->pts = in->s.start;
             }
         }
         else
@@ -158,7 +167,7 @@
 
         if( buf_out && *buf_out )
         {
-            (*buf_out)->id = in->id;
+            (*buf_out)->s.id = in->s.id;
             (*buf_out)->sequence = in->sequence;
         }
 
@@ -209,12 +218,9 @@
 static void ParseControls( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
-    hb_job_t * job = pv->job;
-    hb_title_t * title = job->title;
-    hb_subtitle_t * subtitle;
     uint8_t * buf = pv->buf->data;
 
-    int i, n;
+    int i;
     int command;
     int date, next;
 
@@ -253,28 +259,14 @@
                 case 0x00: // 0x00 - FSTA_DSP - Forced Start Display, no arguments
                     pv->pts_start = pv->pts + date * 1024;
                     pv->pts_forced = 1;
-
-                    /*
-                     * If we are doing a subtitle scan then note down
-                     */
-                    if( job->indepth_scan )
-                    {
-                        for( n=0; n < hb_list_count(title->list_subtitle); n++ )
-                        {
-                            subtitle = hb_list_item( title->list_subtitle, n);
-                            if( pv->stream_id == subtitle->id ) {
-                                /*
-                                 * A hit, count it.
-                                 */
-                                subtitle->forced_hits++;
-                            }
-                        }
-                    }
+                    w->subtitle->hits++;
+                    w->subtitle->forced_hits++;
                     break;
 
                 case 0x01: // 0x01 - STA_DSP - Start Display, no arguments
                     pv->pts_start = pv->pts + date * 1024;
                     pv->pts_forced  = 0;
+                    w->subtitle->hits++;
                     break;
 
                 case 0x02: // 0x02 - STP_DSP - Stop Display, no arguments
@@ -335,10 +327,10 @@
                      */
                     uint8_t    alpha[4];
 
-                    alpha[3] = (buf[i+0]>>4)&0x0f;
-                    alpha[2] = (buf[i+0])&0x0f;
-                    alpha[1] = (buf[i+1]>>4)&0x0f;
-                    alpha[0] = (buf[i+1])&0x0f;
+                    alpha[3] = ((buf[i+0] >> 4) & 0x0f) << 4;
+                    alpha[2] = ((buf[i+0]     ) & 0x0f) << 4;
+                    alpha[1] = ((buf[i+1] >> 4) & 0x0f) << 4;
+                    alpha[0] = ((buf[i+1]     ) & 0x0f) << 4;
 
 
                     int lastAlpha = pv->alpha[3] + pv->alpha[2] + pv->alpha[1] + pv->alpha[0];
@@ -416,6 +408,7 @@
     }
     return 1;
 }
+
 static int ColumnIsTransparent( hb_work_object_t * w, uint8_t * p )
 {
     hb_work_private_t * pv = w->private_data;
@@ -429,6 +422,59 @@
     }
     return 1;
 }
+
+// Brain dead resampler.  This should really use swscale...
+// Uses Bresenham algo to pick source samples for averaging
+static void resample( uint8_t * dst, uint8_t * src, int dst_w, int src_w )
+{
+    int dst_x, src_x, err, cnt, sum, val;
+
+    if( dst_w < src_w )
+    {
+        // sample down
+        err = 0;
+        sum = 0;
+        val = 0;
+        cnt = 0;
+        err = src_w / 2;
+        dst_x = 0;
+        for( src_x = 0; src_x < src_w; src_x++ )
+        {
+            sum += src[src_x];
+            cnt++;
+            err -= dst_w;
+            if( err < 0 )
+            {
+                val = sum / cnt;
+                dst[dst_x++] = val;
+                sum = cnt = 0;
+                err += src_w;
+            }
+        }
+        for( ; dst_x < dst_w; dst_x++ )
+        {
+            dst[dst_x] = val;
+        }
+    }
+    else
+    {
+        // sample up
+        err = 0;
+        err = dst_w / 2;
+        src_x = 0;
+        for( dst_x = 0; dst_x < dst_w; dst_x++ )
+        {
+            dst[dst_x] = src[src_x];
+            err -= src_w;
+            if( err < 0 )
+            {
+                src_x++;
+                err += dst_w;
+            }
+        }
+    }
+}
+
 static hb_buffer_t * CropSubtitle( hb_work_object_t * w, uint8_t * raw )
 {
     hb_work_private_t * pv = w->private_data;
@@ -437,8 +483,7 @@
     uint8_t * alpha;
     int realwidth, realheight;
     hb_buffer_t * buf;
-    uint8_t * lum_in, * lum_out, * alpha_in, * alpha_out;
-    uint8_t * u_in, * u_out, * v_in, * v_out;
+    uint8_t * lum_in, * alpha_in, * u_in, * v_in;
 
     alpha = raw + pv->width * pv->height;
 
@@ -491,40 +536,44 @@
     realwidth  = crop[3] - crop[2] + 1;
     realheight = crop[1] - crop[0] + 1;
 
-    buf         = hb_buffer_init( realwidth * realheight * 4 );
-    buf->start  = pv->pts_start;
-    buf->stop   = pv->pts_stop;
-    buf->x      = pv->x + crop[2];
-    buf->y      = pv->y + crop[0];
-    buf->width  = realwidth;
-    buf->height = realheight;
+    buf = hb_frame_buffer_init( AV_PIX_FMT_YUVA420P, realwidth, realheight );
+    buf->s.start  = pv->pts_start;
+    buf->s.stop   = pv->pts_stop;
+    buf->s.type   = SUBTITLE_BUF;
+
+    buf->f.x = pv->x + crop[2];
+    buf->f.y = pv->y + crop[0];
 
     lum_in    = raw + crop[0] * pv->width + crop[2];
     alpha_in  = lum_in + pv->width * pv->height;
     u_in      = alpha_in + pv->width * pv->height;
     v_in      = u_in + pv->width * pv->height;
 
-    lum_out   = buf->data;
-    alpha_out = lum_out + realwidth * realheight;
-    u_out     = alpha_out + realwidth * realheight;
-    v_out     = u_out + realwidth * realheight;
-
+    uint8_t *dst;
     for( i = 0; i < realheight; i++ )
     {
-        memcpy( lum_out, lum_in, realwidth );
-        memcpy( alpha_out, alpha_in, realwidth );
-        memcpy( u_out, u_in, realwidth );
-        memcpy( v_out, v_in, realwidth );
+        // Luma
+        dst = buf->plane[0].data + buf->plane[0].stride * i;
+        memcpy( dst, lum_in, realwidth );
+
+        if( ( i & 1 ) == 0 )
+        {
+            // chroma U (resample to YUV420)
+            dst = buf->plane[1].data + buf->plane[1].stride * ( i >> 1 );
+            resample( dst, u_in, buf->plane[1].width, realwidth );
+
+            // chroma V (resample to YUV420)
+            dst = buf->plane[2].data + buf->plane[2].stride * ( i >> 1 );
+            resample( dst, v_in, buf->plane[2].width, realwidth );
+        }
+        // Alpha
+        dst = buf->plane[3].data + buf->plane[3].stride * i;
+        memcpy( dst, alpha_in, realwidth );
 
         lum_in    += pv->width;
         alpha_in  += pv->width;
         u_in      += pv->width;
         v_in      += pv->width;
-
-        lum_out   += realwidth;
-        alpha_out += realwidth;
-        u_out     += realwidth;
-        v_out     += realwidth;
     }
 
     return buf;
@@ -557,8 +606,8 @@
 
     if (w->subtitle->config.dest == PASSTHRUSUB)
     {
-        pv->buf->start  = pv->pts_start;
-        pv->buf->stop   = pv->pts_stop;
+        pv->buf->s.start  = pv->pts_start;
+        pv->buf->s.stop   = pv->pts_stop;
         buf = pv->buf;
         pv->buf = NULL;
         return buf;

HandBrake-0.9.8.tar.bz2/libhb/deinterlace.c -> HandBrake-0.9.9.tar.bz2/libhb/deinterlace.c Changed

@@ -20,8 +20,16 @@
 #include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 #include "mcdeint.h"
+#include "taskset.h"
 
-#define YADIF_MODE_DEFAULT     -1
+// yadif_mode is a bit vector with the following flags
+// Note that 2PASS should be enabled when using MCDEINT
+#define MODE_YADIF_ENABLE       1
+#define MODE_YADIF_SPATIAL      2
+#define MODE_YADIF_2PASS        4
+#define MODE_YADIF_BOB          8
+
+#define YADIF_MODE_DEFAULT      0
 #define YADIF_PARITY_DEFAULT   -1
 
 #define MCDEINT_MODE_DEFAULT   -1
@@ -32,139 +40,105 @@
 #define MAX3(a,b,c) MAX(MAX(a,b),c)
 
 typedef struct yadif_arguments_s {
-    uint8_t **dst;
+    hb_buffer_t * dst;
     int parity;
     int tff;
-    int stop;
 } yadif_arguments_t;
 
 struct hb_filter_private_s
 {
-    int              pix_fmt;
-    int              width[3];
-    int              height[3];
+    int              width;
+    int              height;
 
     int              yadif_mode;
     int              yadif_parity;
     int              yadif_ready;
 
-    uint8_t        * yadif_ref[4][3];
-    int              yadif_ref_stride[3];
+    hb_buffer_t      * yadif_ref[3];
 
     int              cpu_count;
 
-    hb_thread_t    ** yadif_threads;        // Threads for Yadif - one per CPU
-    hb_lock_t      ** yadif_begin_lock;     // Thread has work
-    hb_lock_t      ** yadif_complete_lock;  // Thread has completed work
+    taskset_t        yadif_taskset;         // Threads for Yadif - one per CPU
+
     yadif_arguments_t *yadif_arguments;     // Arguments to thread for work
 
     int              mcdeint_mode;
     mcdeint_private_t mcdeint;
 
-    AVPicture        pic_in;
-    AVPicture        pic_out;
-    hb_buffer_t *    buf_out[2];
-    hb_buffer_t *    buf_settings;
+    //hb_buffer_t *    buf_out[2];
 };
 
-hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
-                                           int width,
-                                           int height,
-                                           char * settings );
+static int hb_deinterlace_init( hb_filter_object_t * filter,
+                                hb_filter_init_t * init );
 
-int hb_deinterlace_work( hb_buffer_t * buf_in,
-                         hb_buffer_t ** buf_out,
-                         int pix_fmt,
-                         int width,
-                         int height,
-                         hb_filter_private_t * pv );
+static int hb_deinterlace_work( hb_filter_object_t * filter,
+                                hb_buffer_t ** buf_in,
+                                hb_buffer_t ** buf_out );
 
-void hb_deinterlace_close( hb_filter_private_t * pv );
+static void hb_deinterlace_close( hb_filter_object_t * filter );
 
 hb_filter_object_t hb_filter_deinterlace =
 {
-    FILTER_DEINTERLACE,
-    "Deinterlace (ffmpeg or yadif/mcdeint)",
-    NULL,
-    hb_deinterlace_init,
-    hb_deinterlace_work,
-    hb_deinterlace_close,
+    .id            = HB_FILTER_DEINTERLACE,
+    .enforce_order = 1,
+    .name          = "Deinterlace (ffmpeg or yadif/mcdeint)",
+    .settings      = NULL,
+    .init          = hb_deinterlace_init,
+    .work          = hb_deinterlace_work,
+    .close         = hb_deinterlace_close,
 };
 
 
-static void yadif_store_ref( const uint8_t ** pic,
-                             hb_filter_private_t * pv )
+static void yadif_store_ref(hb_filter_private_t *pv, hb_buffer_t *b)
 {
-    memcpy( pv->yadif_ref[3],
-            pv->yadif_ref[0],
-            sizeof(uint8_t *)*3 );
-
-    memmove( pv->yadif_ref[0],
-             pv->yadif_ref[1],
-             sizeof(uint8_t *)*3*3 );
-
-    int i;
-    for( i = 0; i < 3; i++ )
-    {
-        const uint8_t * src = pic[i];
-        uint8_t * ref = pv->yadif_ref[2][i];
-
-        int w = pv->width[i];
-        int ref_stride = pv->yadif_ref_stride[i];
 
-        int y;
-        for( y = 0; y < pv->height[i]; y++ )
-        {
-            memcpy(ref, src, w);
-            src = (uint8_t*)src + w;
-            ref = (uint8_t*)ref + ref_stride;
-        }
-    }
+    hb_buffer_close(&pv->yadif_ref[0]);
+    memmove(&pv->yadif_ref[0], &pv->yadif_ref[1], sizeof(hb_buffer_t *) * 2 );
+    pv->yadif_ref[2] = b;
 }
 
-static void yadif_filter_line( uint8_t *dst,
-                               uint8_t *prev,
-                               uint8_t *cur,
-                               uint8_t *next,
-                               int plane,
-                               int parity,
-                               hb_filter_private_t * pv )
+static void yadif_filter_line(
+    hb_filter_private_t * pv,
+    uint8_t             * dst,
+    uint8_t             * prev,
+    uint8_t             * cur,
+    uint8_t             * next,
+    int                   width,
+    int                   stride,
+    int                   parity)
 {
     uint8_t *prev2 = parity ? prev : cur ;
     uint8_t *next2 = parity ? cur  : next;
 
-    int w = pv->width[plane];
-    int refs = pv->yadif_ref_stride[plane];
-
     int x;
-    for( x = 0; x < w; x++)
+    for( x = 0; x < width; x++)
     {
-        int c              = cur[-refs];
+        int c              = cur[-stride];
         int d              = (prev2[0] + next2[0])>>1;
-        int e              = cur[+refs];
+        int e              = cur[+stride];
         int temporal_diff0 = ABS(prev2[0] - next2[0]);
-        int temporal_diff1 = ( ABS(prev[-refs] - c) + ABS(prev[+refs] - e) ) >> 1;
-        int temporal_diff2 = ( ABS(next[-refs] - c) + ABS(next[+refs] - e) ) >> 1;
+        int temporal_diff1 = ( ABS(prev[-stride] - c) + ABS(prev[+stride] - e) ) >> 1;
+        int temporal_diff2 = ( ABS(next[-stride] - c) + ABS(next[+stride] - e) ) >> 1;
         int diff           = MAX3(temporal_diff0>>1, temporal_diff1, temporal_diff2);
         int spatial_pred   = (c+e)>>1;
-        int spatial_score  = ABS(cur[-refs-1] - cur[+refs-1]) + ABS(c-e) +
-                             ABS(cur[-refs+1] - cur[+refs+1]) - 1;
+        int spatial_score  = ABS(cur[-stride-1] - cur[+stride-1]) + ABS(c-e) +
+                             ABS(cur[-stride+1] - cur[+stride+1]) - 1;
 
 #define YADIF_CHECK(j)\
-        {   int score = ABS(cur[-refs-1+j] - cur[+refs-1-j])\
-                      + ABS(cur[-refs  +j] - cur[+refs  -j])\
-                      + ABS(cur[-refs+1+j] - cur[+refs+1-j]);\
+        {   int score = ABS(cur[-stride-1+j] - cur[+stride-1-j])\
+                      + ABS(cur[-stride  +j] - cur[+stride  -j])\
+                      + ABS(cur[-stride+1+j] - cur[+stride+1-j]);\
             if( score < spatial_score ){\
                 spatial_score = score;\
-                spatial_pred  = (cur[-refs  +j] + cur[+refs  -j])>>1;\
+                spatial_pred  = (cur[-stride  +j] + cur[+stride  -j])>>1;\
 
         YADIF_CHECK(-1) YADIF_CHECK(-2) }} }}
         YADIF_CHECK( 1) YADIF_CHECK( 2) }} }}
 
-        if( pv->yadif_mode < 2 )
+        if( pv->yadif_mode & MODE_YADIF_SPATIAL )
         {
-            int b = (prev2[-2*refs] + next2[-2*refs])>>1;
-            int f = (prev2[+2*refs] + next2[+2*refs])>>1;
+            int b = (prev2[-2*stride] + next2[-2*stride])>>1;
+            int f = (prev2[+2*stride] + next2[+2*stride])>>1;
 
             int max = MAX3(d-e, d-c, MIN(b-c, f-e));
             int min = MIN3(d-e, d-c, MAX(b-c, f-e));
@@ -205,12 +179,8 @@
     yadif_arguments_t *yadif_work = NULL;
     hb_filter_private_t * pv;
     int run = 1;
-    int plane;
     int segment, segment_start, segment_stop;
     yadif_thread_arg_t *thread_args = thread_args_v;
-    uint8_t **dst;
-    int parity, tff, y, w, h, ref_stride, penultimate, ultimate;
-
 
     pv = thread_args->pv;
     segment = thread_args->segment;
@@ -220,44 +190,46 @@
     while( run )
     {
         /*
-         * Wait here until there is work to do. hb_lock() blocks until
-         * render releases it to say that there is more work to do.
+         * Wait here until there is work to do.
          */
-        hb_lock( pv->yadif_begin_lock[segment] );
+        taskset_thread_wait4start( &pv->yadif_taskset, segment );
 
-        yadif_work = &pv->yadif_arguments[segment];
 
-        if( yadif_work->stop )
+        if( taskset_thread_stop( &pv->yadif_taskset, segment ) )
         {
             /*
              * No more work to do, exit this thread.
              */
             run = 0;
-            continue;
+            goto report_completion;
         } 
 
+        yadif_work = &pv->yadif_arguments[segment];
+
         if( yadif_work->dst == NULL )
         {
             hb_error( "Thread started when no work available" );
             hb_snooze(500);
-            continue;
+            goto report_completion;
         }
         
         /*
          * Process all three planes, but only this segment of it.
          */
-        for( plane = 0; plane < 3; plane++)
+        int pp;
+        for(pp = 0; pp < 3; pp++)
         {
-
-            dst = yadif_work->dst;
-            parity = yadif_work->parity;
-            tff = yadif_work->tff;
-            w = pv->width[plane];
-            h = pv->height[plane];
-            penultimate = h -2;
-            ultimate = h - 1;
-            ref_stride = pv->yadif_ref_stride[plane];
-            segment_start = ( h / pv->cpu_count ) * segment;
+            hb_buffer_t *dst = yadif_work->dst;
+            int w = dst->plane[pp].width;
+            int s = dst->plane[pp].stride;
+            int h = dst->plane[pp].height;
+            int yy;
+            int parity = yadif_work->parity;
+            int tff = yadif_work->tff;
+            int penultimate = h - 2;
+
+            int segment_height = (h / pv->cpu_count) & ~1;
+            segment_start = segment_height * segment;
             if( segment == pv->cpu_count - 1 )
             {
                 /*
@@ -265,12 +237,16 @@
                  */
                 segment_stop = h;
             } else {
-                segment_stop = ( h / pv->cpu_count ) * ( segment + 1 );
+                segment_stop = segment_height * ( segment + 1 );
             }
 
-            for( y = segment_start; y < segment_stop; y++ )
+            uint8_t *dst2 = &dst->plane[pp].data[segment_start * s];
+            uint8_t *prev = &pv->yadif_ref[0]->plane[pp].data[segment_start * s];
+            uint8_t *cur  = &pv->yadif_ref[1]->plane[pp].data[segment_start * s];
+            uint8_t *next = &pv->yadif_ref[2]->plane[pp].data[segment_start * s];
+            for( yy = segment_start; yy < segment_stop; yy++ )
             {
-                if( ( ( y ^ parity ) &  1 ) )
+                if(((yy ^ parity) &  1))
                 {
                     /* This is the bottom field when TFF and vice-versa.
                        It's the field that gets filtered. Because yadif
@@ -278,66 +254,41 @@
                        we need to mirror the edges. When TFF, this means
                        replacing the 2nd line with a copy of the 1st,
                        and the last with the second-to-last.                  */
-                    if( y > 1 && y < ( h -2 ) )
+                    if( yy > 1 && yy < penultimate )
                     {
-                        /* This isn't the top or bottom, proceed as normal to yadif. */
-                        uint8_t *prev = &pv->yadif_ref[0][plane][y*ref_stride];
-                        uint8_t *cur  = &pv->yadif_ref[1][plane][y*ref_stride];
-                        uint8_t *next = &pv->yadif_ref[2][plane][y*ref_stride];
-                        uint8_t *dst2 = &dst[plane][y*w];
-
-                        yadif_filter_line( dst2, 
-                                           prev, 
-                                           cur, 
-                                           next, 
-                                           plane, 
-                                           parity ^ tff, 
-                                           pv );
+                        /* This isn't the top or bottom,
+                         * proceed as normal to yadif. */
+                        yadif_filter_line(pv, dst2, prev, cur, next, w, s, 
+                                          parity ^ tff);
                     }
-                    else if( y == 0 )
+                    else
                     {
-                        /* BFF, so y0 = y1 */
-                        memcpy( &dst[plane][y*w],
-                                &pv->yadif_ref[1][plane][1*ref_stride],
-                                w * sizeof(uint8_t) );
-                    }
-                    else if( y == 1 )
-                    {
-                        /* TFF, so y1 = y0 */
-                        memcpy( &dst[plane][y*w],
-                                &pv->yadif_ref[1][plane][0],
-                                w * sizeof(uint8_t) );
-                    }
-                    else if( y == penultimate )
-                    {
-                        /* BFF, so penultimate y = ultimate y */
-                        memcpy( &dst[plane][y*w],
-                                &pv->yadif_ref[1][plane][ultimate*ref_stride],
-                                w * sizeof(uint8_t) );
-                    }
-                    else if( y == ultimate )
-                    {
-                        /* TFF, so ultimate y = penultimate y */
-                        memcpy( &dst[plane][y*w],
-                                &pv->yadif_ref[1][plane][penultimate*ref_stride],
-                                w * sizeof(uint8_t) );
+                        // parity == 0 (TFF), y1 = y0
+                        // parity == 1 (BFF), y0 = y1
+                        // parity == 0 (TFF), yu = yp
+                        // parity == 1 (BFF), yp = yu
+                        uint8_t *src  = &pv->yadif_ref[1]->plane[pp].data[(yy^parity)*s];
+                        memcpy(dst2, src, w);
                     }
                 }
                 else
                 {
                     /* Preserve this field unfiltered */
-                    memcpy( &dst[plane][y*w],
-                            &pv->yadif_ref[1][plane][y*ref_stride],
-                            w * sizeof(uint8_t) );
+                    memcpy(dst2, cur, w);
                 }
+                dst2 += s;
+                prev += s;
+                cur += s;
+                next += s;
             }
         }
+
+report_completion:
         /*
          * Finished this segment, let everyone know.
          */
-        hb_unlock( pv->yadif_complete_lock[segment] );
+        taskset_thread_complete( &pv->yadif_taskset, segment );
     }
-    free( thread_args_v );
 }
 
 
@@ -348,10 +299,8 @@
  *
  * This function blocks until the frame is deinterlaced.
  */
-static void yadif_filter( uint8_t ** dst,
-                          int parity,
-                          int tff,
-                          hb_filter_private_t * pv )
+static void yadif_filter( hb_filter_private_t * pv,
+                          hb_buffer_t * dst, int parity, int tff)
 {
 
     int segment;
@@ -364,56 +313,24 @@
         pv->yadif_arguments[segment].parity = parity;
         pv->yadif_arguments[segment].tff = tff;
         pv->yadif_arguments[segment].dst = dst;
-
-        /*
-         * Let the thread for this plane know that we've setup work 
-         * for it by releasing the begin lock (ensuring that the
-         * complete lock is already locked so that we block when
-         * we try to lock it again below).
-         */
-        hb_lock( pv->yadif_complete_lock[segment] );
-        hb_unlock( pv->yadif_begin_lock[segment] );
     }
 
-    /*
-     * Wait until all three threads have completed by trying to get
-     * the complete lock that we locked earlier for each thread, which
-     * will block until that thread has completed the work on that
-     * plane.
-     */
-    for( segment = 0; segment < pv->cpu_count; segment++ )
-    {
-        hb_lock( pv->yadif_complete_lock[segment] );
-        hb_unlock( pv->yadif_complete_lock[segment] );
-    }
+    /* Allow the taskset threads to make one pass over the data. */
+    taskset_cycle( &pv->yadif_taskset );
 
     /*
      * Entire frame is now deinterlaced.
      */
 }
 
-hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
-                                           int width,
-                                           int height,
-                                           char * settings )
+static int hb_deinterlace_init( hb_filter_object_t * filter,
+                                hb_filter_init_t * init )
 {
-    if( pix_fmt != PIX_FMT_YUV420P )
-    {
-        return 0;
-    }
-
-    hb_filter_private_t * pv = calloc( 1, sizeof(struct hb_filter_private_s) );
-
-    pv->pix_fmt = pix_fmt;
+    filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+    hb_filter_private_t * pv = filter->private_data;
 
-    pv->width[0]  = width;
-    pv->height[0] = height;
-    pv->width[1]  = pv->width[2]  = width >> 1;
-    pv->height[1] = pv->height[2] = height >> 1;
-
-    pv->buf_out[0] = hb_video_buffer_init( width, height );
-    pv->buf_out[1] = hb_video_buffer_init( width, height );
-    pv->buf_settings = hb_buffer_init( 0 );
+    pv->width = init->width;
+    pv->height = init->height;
 
     pv->yadif_ready    = 0;
     pv->yadif_mode     = YADIF_MODE_DEFAULT;
@@ -422,9 +339,9 @@
     pv->mcdeint_mode   = MCDEINT_MODE_DEFAULT;
     int mcdeint_qp     = MCDEINT_QP_DEFAULT;
 
-    if( settings )
+    if( filter->settings )
     {
-        sscanf( settings, "%d:%d:%d:%d",
+        sscanf( filter->settings, "%d:%d:%d:%d",
                 &pv->yadif_mode,
                 &pv->yadif_parity,
                 &pv->mcdeint_mode,
@@ -434,275 +351,222 @@
     pv->cpu_count = hb_get_cpu_count();
 
     /* Allocate yadif specific buffers */
-    if( pv->yadif_mode >= 0 )
+    if( pv->yadif_mode & MODE_YADIF_ENABLE )
     {
-        int i, j;
-        for( i = 0; i < 3; i++ )
-        {
-            int is_chroma = !!i;
-            int w = ((width   + 31) & (~31))>>is_chroma;
-            int h = ((height+6+ 31) & (~31))>>is_chroma;
-
-            pv->yadif_ref_stride[i] = w;
-
-            for( j = 0; j < 3; j++ )
-            {
-                pv->yadif_ref[j][i] = malloc( w*h*sizeof(uint8_t) ) + 3*w;
-            }
-        }
-
         /*
-         * Create yadif threads and locks.
+         * Setup yadif taskset.
          */
-        pv->yadif_threads = malloc( sizeof( hb_thread_t* ) * pv->cpu_count );
-        pv->yadif_begin_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
-        pv->yadif_complete_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
         pv->yadif_arguments = malloc( sizeof( yadif_arguments_t ) * pv->cpu_count );
+        if( pv->yadif_arguments == NULL ||
+            taskset_init( &pv->yadif_taskset, /*thread_count*/pv->cpu_count,
+                          sizeof( yadif_arguments_t ) ) == 0 )
+        {
+            hb_error( "yadif could not initialize taskset" );
+        }
 
-        for( i = 0; i < pv->cpu_count; i++ )
+        int ii;
+        for( ii = 0; ii < pv->cpu_count; ii++ )
         {
             yadif_thread_arg_t *thread_args;
 
-            thread_args = malloc( sizeof( yadif_thread_arg_t ) );
-
-            if( thread_args ) {
-                thread_args->pv = pv;
-                thread_args->segment = i;
+            thread_args = taskset_thread_args( &pv->yadif_taskset, ii );
 
-                pv->yadif_begin_lock[i] = hb_lock_init();
-                pv->yadif_complete_lock[i] = hb_lock_init();
+            thread_args->pv = pv;
+            thread_args->segment = ii;
+            pv->yadif_arguments[ii].dst = NULL;
 
-                /*
-                 * Important to start off with the threads locked waiting
-                 * on input.
-                 */
-                hb_lock( pv->yadif_begin_lock[i] );
-
-                pv->yadif_arguments[i].stop = 0;
-                pv->yadif_arguments[i].dst = NULL;
-                
-                pv->yadif_threads[i] = hb_thread_init( "yadif_filter_segment",
-                                                       yadif_filter_thread,
-                                                       thread_args,
-                                                       HB_NORMAL_PRIORITY );
-            } else {
-                hb_error( "Yadif could not create threads" );
+            if( taskset_thread_spawn( &pv->yadif_taskset, ii,
+                                      "yadif_filter_segment",
+                                      yadif_filter_thread,
+                                      HB_NORMAL_PRIORITY ) == 0 )
+            {
+                hb_error( "yadif could not spawn thread" );
             }
         }
     }
 
-    mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, width, height );
+    mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, 
+                  init->pix_fmt, init->width, init->height );
     
-    return pv;
+    return 0;
 }
 
-void hb_deinterlace_close( hb_filter_private_t * pv )
+static void hb_deinterlace_close( hb_filter_object_t * filter )
 {
+    hb_filter_private_t * pv = filter->private_data;
+
     if( !pv )
     {
         return;
     }
 
-    /* Cleanup frame buffers */
-    if( pv->buf_out[0] )
-    {
-        hb_buffer_close( &pv->buf_out[0] );
-    }
-    if( pv->buf_out[1] )
-    {
-        hb_buffer_close( &pv->buf_out[1] );
-    }
-    if (pv->buf_settings )
-    {
-        hb_buffer_close( &pv->buf_settings );
-    }
-
     /* Cleanup yadif specific buffers */
-    if( pv->yadif_mode >= 0 )
+    if( pv->yadif_mode & MODE_YADIF_ENABLE )
     {
-        int i;
-        for( i = 0; i<3*3; i++ )
-        {
-            uint8_t **p = &pv->yadif_ref[i%3][i/3];
-            if (*p)
-            {
-                free( *p - 3*pv->yadif_ref_stride[i/3] );
-                *p = NULL;
-            }
-        }
+        taskset_fini( &pv->yadif_taskset );
 
-        for( i = 0; i < pv->cpu_count; i++)
+        int ii;
+        for(ii = 0; ii < 3; ii++)
         {
-            /*
-             * Tell each yadif thread to stop, and then cleanup.
-             */
-            pv->yadif_arguments[i].stop = 1;
-            hb_unlock(  pv->yadif_begin_lock[i] );
-
-            hb_thread_close( &pv->yadif_threads[i] );
-            hb_lock_close( &pv->yadif_begin_lock[i] );
-            hb_lock_close( &pv->yadif_complete_lock[i] );
+            hb_buffer_close(&pv->yadif_ref[ii]);
         }
-        
-        /*
-         * free memory for yadif structs
-         */
-        free( pv->yadif_threads );
-        free( pv->yadif_begin_lock );
-        free( pv->yadif_complete_lock );
+
         free( pv->yadif_arguments );
     }
 
     mcdeint_close( &pv->mcdeint );
     
     free( pv );
+    filter->private_data = NULL;
+}
+
+static hb_buffer_t * deint_fast(hb_buffer_t * in)
+{
+    AVPicture pic_in;
+    AVPicture pic_out;
+    hb_buffer_t * out;
+
+    int w = (in->plane[0].width + 3) & ~0x3;
+    int h = (in->plane[0].height + 3) & ~0x3;
+
+    out = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
+
+    hb_avpicture_fill( &pic_in, in );
+    hb_avpicture_fill( &pic_out, out );
+
+    // avpicture_deinterlace requires 4 pixel aligned width and height
+    // we have aligned all buffers to 16 byte width and height strides
+    // so there is room in the buffers to accomodate a litte
+    // overscan.
+    avpicture_deinterlace(&pic_out, &pic_in, out->f.fmt, w, h);
+
+    out->s = in->s;
+    hb_buffer_move_subs(out, in);
+
+    return out;
 }
 
-int hb_deinterlace_work( hb_buffer_t * buf_in,
-                         hb_buffer_t ** buf_out,
-                         int pix_fmt,
-                         int width,
-                         int height,
-                         hb_filter_private_t * pv )
+static int hb_deinterlace_work( hb_filter_object_t * filter,
+                                hb_buffer_t ** buf_in,
+                                hb_buffer_t ** buf_out )
 {
-    if( !pv ||
-        pix_fmt != pv->pix_fmt ||
-        width   != pv->width[0] ||
-        height  != pv->height[0] )
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+    hb_buffer_t * last = NULL, * out = NULL;
+
+    if ( in->size <= 0 )
     {
-        return FILTER_FAILED;
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
     }
 
-    avpicture_fill( &pv->pic_in, buf_in->data,
-                    pix_fmt, width, height );
-
     /* Use libavcodec deinterlace if yadif_mode < 0 */
-    if( pv->yadif_mode < 0 )
+    if( !( pv->yadif_mode & MODE_YADIF_ENABLE ) )
     {
-        avpicture_fill( &pv->pic_out, pv->buf_out[0]->data,
-                        pix_fmt, width, height );
-
-        if ( ( width & 7 ) || ( height & 7 ) )
-        {
-            // avpicture_deinterlace requires 8 pixel aligned dimensions
-            // so we are going to have to do some buffer copying
-            int aligned_width = ((width + 7) & ~7);
-            int aligned_height = ((height + 7) & ~7);
-            uint8_t * buf1, * buf2;
-            AVPicture pic_in, pic_out;
-            int i, p;
-
-            buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P,
-                              aligned_width, aligned_height ) );
-            buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P,
-                              aligned_width, aligned_height ) );
-            avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
-                            aligned_width, aligned_height );
-            avpicture_fill( &pic_out, buf2, PIX_FMT_YUV420P,
-                            aligned_width, aligned_height );
-            for (p = 0; p < 3; p++)
-            {
-                int h = !p ? height : height >> 1;
-                for (i = 0; i < h; i++)
-                {
-                    memcpy(pic_in.data[p] + pic_in.linesize[p] * i,
-                           pv->pic_in.data[p] + pv->pic_in.linesize[p] * i,
-                           pv->pic_in.linesize[p]);
-                }
-            }
-            avpicture_deinterlace( &pic_out, &pic_in,
-                                   pix_fmt, aligned_width, aligned_height );
-            for (p = 0; p < 3; p++)
-            {
-                int h = !p ? height : height >> 1;
-                for (i = 0; i < h; i++)
-                {
-                    memcpy(pv->pic_out.data[p] + pv->pic_out.linesize[p] * i,
-                           pic_out.data[p] + pic_out.linesize[p] * i,
-                           pv->pic_out.linesize[p]);
-                }
-            }
-            avpicture_free( &pic_in );
-            avpicture_free( &pic_out );
-        }
-        else
-        {
-            avpicture_deinterlace( &pv->pic_out, &pv->pic_in,
-                                   pix_fmt, width, height );
-        }
-
-        hb_buffer_copy_settings( pv->buf_out[0], buf_in );
+        *buf_out = deint_fast(in);
+        return HB_FILTER_OK;
+    }
 
-        *buf_out = pv->buf_out[0];
+    /* Store current frame in yadif cache */
+    *buf_in = NULL;
+    yadif_store_ref(pv, in);
 
-        return FILTER_OK;
+    // yadif requires 3 buffers, prev, cur, and next.  For the first
+    // frame, there can be no prev, so we duplicate the first frame.
+    if (!pv->yadif_ready)
+    {
+        // If yadif is not ready, store another ref and return HB_FILTER_DELAY
+        yadif_store_ref(pv, hb_buffer_dup(in));
+        pv->yadif_ready = 1;
+        // Wait for next
+        return HB_FILTER_DELAY;
     }
 
     /* Determine if top-field first layout */
     int tff;
     if( pv->yadif_parity < 0 )
     {
-        tff = !!(buf_in->flags & PIC_FLAG_TOP_FIELD_FIRST);
+        tff = !!(in->s.flags & PIC_FLAG_TOP_FIELD_FIRST);
     }
     else
     {
         tff = (pv->yadif_parity & 1) ^ 1;
     }
 
-    /* Store current frame in yadif cache */
-    yadif_store_ref( (const uint8_t**)pv->pic_in.data, pv );
-
-    /* If yadif is not ready, store another ref and return FILTER_DELAY */
-    if( pv->yadif_ready == 0 )
+    /* deinterlace both fields if mcdeint is enabled without bob */
+    int frame, num_frames = 1;
+    if ((pv->yadif_mode & MODE_YADIF_2PASS) ||
+        (pv->yadif_mode & MODE_YADIF_BOB))
     {
-        yadif_store_ref( (const uint8_t**)pv->pic_in.data, pv );
-
-        hb_buffer_copy_settings( pv->buf_settings, buf_in );
-
-        /* don't let 'work_loop' send a chapter mark upstream */
-        buf_in->new_chap  = 0;
-
-        pv->yadif_ready = 1;
-
-        return FILTER_DELAY;
+        num_frames = 2;
     }
 
+    // Will need up to 2 buffers simultaneously
+    int idx = 0;
+    hb_buffer_t * o_buf[2] = {NULL,};
+
     /* Perform yadif and mcdeint filtering */
-    int frame;
-    for( frame = 0; frame <= (pv->yadif_mode & 1); frame++ )
+    for( frame = 0; frame < num_frames; frame++ )
     {
         int parity = frame ^ tff ^ 1;
 
-        avpicture_fill( &pv->pic_out, pv->buf_out[!(frame^1)]->data,
-                        pix_fmt, width, height );
+        if (o_buf[idx] == NULL)
+        {
+            o_buf[idx] = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
+        }
+        yadif_filter(pv, o_buf[idx], parity, tff);
 
-        yadif_filter( pv->pic_out.data, parity, tff, pv );
+        if (pv->mcdeint_mode >= 0)
+        {
+            if (o_buf[idx^1] == NULL)
+            {
+                o_buf[idx^1] = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
+            }
+            mcdeint_filter( o_buf[idx^1], o_buf[idx], parity, &pv->mcdeint );
+            idx ^= 1;
+        }
 
-        if( pv->mcdeint_mode >= 0 )
+        // If bob, add both frames
+        // else, add only second frame
+        if (( pv->yadif_mode & MODE_YADIF_BOB ) || frame == num_frames - 1)
         {
-            avpicture_fill( &pv->pic_in,  pv->buf_out[(frame^1)]->data,
-                            pix_fmt, width, height );
+            if ( out == NULL )
+            {
+                last = out = o_buf[idx];
+            }
+            else
+            {
+                last->next = o_buf[idx];
+                last = last->next;
+            }
+            last->next = NULL;
 
-            mcdeint_filter( pv->pic_in.data, pv->pic_out.data, parity, pv->width, pv->height, &pv->mcdeint );
+            // Indicate that buffer was consumed
+            o_buf[idx] = NULL;
 
-            *buf_out = pv->buf_out[ (frame^1)];
-        }
-        else
-        {
-            *buf_out = pv->buf_out[!(frame^1)];
+            /* Copy buffered settings to output buffer settings */
+            last->s = pv->yadif_ref[1]->s;
+            idx ^= 1;
         }
     }
+    // Copy subs only to first output buffer
+    hb_buffer_move_subs( out, pv->yadif_ref[1] );
 
-    /* Copy buffered settings to output buffer settings */
-    hb_buffer_copy_settings( *buf_out, pv->buf_settings );
+    hb_buffer_close(&o_buf[0]);
+    hb_buffer_close(&o_buf[1]);
 
-    /* Replace buffered settings with input buffer settings */
-    hb_buffer_copy_settings( pv->buf_settings, buf_in );
+    /* if bob mode is engaged, halve the duration of the
+     * timestamps. */
+    if (pv->yadif_mode & MODE_YADIF_BOB)
+    {
+        out->s.stop -= (out->s.stop - out->s.start) / 2LL;
+        last->s.start = out->s.stop;
+        last->s.new_chap = 0;
+    }
 
-    /* don't let 'work_loop' send a chapter mark upstream */
-    buf_in->new_chap  = 0;
+    *buf_out = out;
 
-    return FILTER_OK;
+    return HB_FILTER_OK;
 }
 
-

HandBrake-0.9.8.tar.bz2/libhb/demuxmpeg.c -> HandBrake-0.9.9.tar.bz2/libhb/demuxmpeg.c Changed

@@ -1,8 +1,11 @@
-/* $Id: demuxmpeg.c,v 1.4 2004/10/19 23:11:36 titer Exp $
+/* demuxmpeg.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 
@@ -46,10 +49,10 @@
 
 static inline void save_chap( hb_psdemux_t *state, hb_buffer_t *buf )
 {
-    if ( state && buf->new_chap )
+    if ( state && buf->s.new_chap )
     {
-        state->new_chap = buf->new_chap;
-        buf->new_chap = 0;
+        state->new_chap = buf->s.new_chap;
+        buf->s.new_chap = 0;
     }
 }
 
@@ -57,7 +60,7 @@
 {
     if ( state )
     {
-        buf->new_chap = state->new_chap;
+        buf->s.new_chap = state->new_chap;
         state->new_chap = 0;
     }
 }
@@ -214,10 +217,10 @@
             /* Here we hit we ES payload */
             buf_es = hb_buffer_init( pes_packet_end - pos );
 
-            buf_es->id       = id;
-            buf_es->start    = pts;
-            buf_es->renderOffset = dts;
-            buf_es->stop     = -1;
+            buf_es->s.id       = id;
+            buf_es->s.start    = pts;
+            buf_es->s.renderOffset = dts;
+            buf_es->s.stop     = -1;
             if ( state && id == 0xE0)
             {
                 // Consume a chapter break, and apply it to the ES.
@@ -248,27 +251,28 @@
         save_chap( state, buf );
         if ( state )
         {
-            if ( buf->discontinuity )
+            if ( buf->s.discontinuity )
             {
                 // Buffer has been flagged as a discontinuity.  This happens
                 // when a blueray changes clips.
                 ++state->scr_changes;
-                state->last_scr = buf->start;
+                state->last_scr = buf->s.start;
+                state->scr_delta = 0;
             }
 
             // we're keeping track of timing (i.e., not in scan)
             // check if there's a new pcr in this packet
-            if ( buf->pcr >= 0 )
+            if ( buf->s.pcr >= 0 )
             {
                 // we have a new pcr
-                check_mpeg_scr( state, buf->pcr, 300 );
-                buf->pcr = -1;
+                check_mpeg_scr( state, buf->s.pcr, 300 );
+                buf->s.pcr = -1;
                 // Some streams have consistantly bad PCRs or SCRs
                 // So filter out the offset
-                if ( buf->start >= 0 )
-                    state->scr_delta = buf->start - state->last_scr;
+                if ( buf->s.start >= 0 )
+                    state->scr_delta = buf->s.start - state->last_scr;
             }
-            if ( buf->start >= 0 )
+            if ( buf->s.start >= 0 )
             {
                 // Program streams have an SCR in every PACK header so they
                 // can't lose their clock reference. But the PCR in Transport
@@ -279,7 +283,7 @@
                 // We try to protect against that here by sanity checking
                 // timestamps against the current reference clock and discarding
                 // packets where the DTS is "too far" from its clock.
-                int64_t fdelta = buf->start - state->last_scr - state->scr_delta;
+                int64_t fdelta = buf->s.start - state->last_scr - state->scr_delta;
                 if ( fdelta < -300 * 90000LL || fdelta > 300 * 90000LL )
                 {
                     // packet too far behind or ahead of its clock reference
@@ -297,25 +301,29 @@
                     // in DTS or PTS is detected.  So we need to update
                     // our scr_delta with each valid timestamp so that
                     // fdelta does not continually grow.
-                    state->scr_delta = buf->start - state->last_scr;
+                    state->scr_delta = buf->s.start - state->last_scr;
                 }
-                if ( state->last_pts >= 0 )
+                if (buf->s.type == AUDIO_BUF || buf->s.type == VIDEO_BUF)
                 {
-                    fdelta = buf->start - state->last_pts;
-                    if ( fdelta < -5 * 90000LL || fdelta > 5 * 90000LL )
+                    if ( state->last_pts >= 0 )
                     {
-                        // Packet too far from last. This may be a NZ TV broadcast
-                        // as they like to change the PCR without sending a PCR
-                        // update. Since it may be a while until they actually tell
-                        // us the new PCR use the PTS as the PCR.
-                        ++state->scr_changes;
-                        state->last_scr = buf->start;
+                        fdelta = buf->s.start - state->last_pts;
+                        if ( fdelta < -5 * 90000LL || fdelta > 5 * 90000LL )
+                        {
+                            // Packet too far from last. This may be a NZ TV broadcast
+                            // as they like to change the PCR without sending a PCR
+                            // update. Since it may be a while until they actually tell
+                            // us the new PCR use the PTS as the PCR.
+                            ++state->scr_changes;
+                            state->last_scr = buf->s.start;
+                            state->scr_delta = 0;
+                        }
                     }
+                    state->last_pts = buf->s.start;
                 }
-                state->last_pts = buf->start;
             }
 
-            if ( buf->type == VIDEO_BUF )
+            if ( buf->s.type == VIDEO_BUF )
             {
                 restore_chap( state, buf );
             }
@@ -341,13 +349,13 @@
             // if we don't have a time offset yet, 
             // use this timestamp as the offset.
             if ( state->scr_changes == 0 &&
-                 ( buf->start != -1 || buf->renderOffset != -1 ) )
+                 ( buf->s.start != -1 || buf->s.renderOffset != -1 ) )
             {
                 ++state->scr_changes;
-                state->last_scr = buf->start >= 0 ? buf->start : buf->renderOffset;
+                state->last_scr = buf->s.start >= 0 ? buf->s.start : buf->s.renderOffset;
             }
 
-            if ( buf->type == VIDEO_BUF )
+            if ( buf->s.type == VIDEO_BUF )
             {
                 restore_chap( state, buf );
             }

HandBrake-0.9.8.tar.bz2/libhb/denoise.c -> HandBrake-0.9.9.tar.bz2/libhb/denoise.c Changed

@@ -28,41 +28,29 @@
 
 struct hb_filter_private_s
 {
-    int              pix_fmt;
-    int              width[3];
-    int              height[3];
-
     int              hqdn3d_coef[4][512*16];
     unsigned int   * hqdn3d_line;
-	unsigned short * hqdn3d_frame[3];
-
-    AVPicture        pic_in;
-    AVPicture        pic_out;
-    hb_buffer_t    * buf_out;
+    unsigned short * hqdn3d_frame[3];
 };
 
-hb_filter_private_t * hb_denoise_init( int pix_fmt,
-                                       int width,
-                                       int height,
-                                       char * settings );
+static int hb_denoise_init( hb_filter_object_t * filter,
+                            hb_filter_init_t * init );
 
-int hb_denoise_work( const hb_buffer_t * buf_in,
-                     hb_buffer_t ** buf_out,
-                     int pix_fmt,
-                     int width,
-                     int height,
-                     hb_filter_private_t * pv );
+static int hb_denoise_work( hb_filter_object_t * filter,
+                            hb_buffer_t ** buf_in,
+                            hb_buffer_t ** buf_out );
 
-void hb_denoise_close( hb_filter_private_t * pv );
+static void hb_denoise_close( hb_filter_object_t * filter );
 
 hb_filter_object_t hb_filter_denoise =
 {
-    FILTER_DENOISE,
-    "Denoise (hqdn3d)",
-    NULL,
-    hb_denoise_init,
-    hb_denoise_work,
-    hb_denoise_close,
+    .id            = HB_FILTER_DENOISE,
+    .enforce_order = 1,
+    .name          = "Denoise (hqdn3d)",
+    .settings      = NULL,
+    .init          = hb_denoise_init,
+    .work          = hb_denoise_work,
+    .close         = hb_denoise_close,
 };
 
 static void hqdn3d_precalc_coef( int * ct,
@@ -293,34 +281,17 @@
     }
 }
 
-hb_filter_private_t * hb_denoise_init( int pix_fmt,
-                                       int width,
-                                       int height,
-                                       char * settings )
+static int hb_denoise_init( hb_filter_object_t * filter,
+                            hb_filter_init_t * init )
 {
-    if( pix_fmt != PIX_FMT_YUV420P )
-    {
-        return 0;
-    }
-
-    hb_filter_private_t * pv = malloc( sizeof(struct hb_filter_private_s) );
-
-    /*
-     * Clear the memory to avoid freeing uninitialised memory later.
-     */
-    memset( pv, 0, sizeof( struct hb_filter_private_s ) );
-
-    pv->pix_fmt  = pix_fmt;
-    pv->width[0]  = width;
-    pv->height[0] = height;
-    pv->width[1]  = pv->width[2] = width >> 1;
-    pv->height[1] = pv->height[2] = height >> 1;
+    filter->private_data = calloc( sizeof(struct hb_filter_private_s), 1 );
+    hb_filter_private_t * pv = filter->private_data;
 
     double spatial_luma, temporal_luma, spatial_chroma, temporal_chroma;
 
-    if( settings )
+    if( filter->settings )
     {
-        switch( sscanf( settings, "%lf:%lf:%lf:%lf",
+        switch( sscanf( filter->settings, "%lf:%lf:%lf:%lf",
                         &spatial_luma, &spatial_chroma,
                         &temporal_luma, &temporal_chroma ) )
         {
@@ -361,20 +332,18 @@
         }
     }
 
-    pv->hqdn3d_line = malloc( width * sizeof(int) );
-
     hqdn3d_precalc_coef( pv->hqdn3d_coef[0], spatial_luma );
     hqdn3d_precalc_coef( pv->hqdn3d_coef[1], temporal_luma );
     hqdn3d_precalc_coef( pv->hqdn3d_coef[2], spatial_chroma );
     hqdn3d_precalc_coef( pv->hqdn3d_coef[3], temporal_chroma );
 
-    pv->buf_out = hb_video_buffer_init( width, height );
-
-    return pv;
+    return 0;
 }
 
-void hb_denoise_close( hb_filter_private_t * pv )
+static void hb_denoise_close( hb_filter_object_t * filter )
 {
+    hb_filter_private_t * pv = filter->private_data;
+
     if( !pv )
     {
         return;
@@ -400,68 +369,66 @@
         free( pv->hqdn3d_frame[2] );
         pv->hqdn3d_frame[2] = NULL;
     }
-    if( pv->buf_out )
-    {
-        hb_buffer_close( &pv->buf_out );
-    }
 
     free( pv );
+    filter->private_data = NULL;
 }
 
-int hb_denoise_work( const hb_buffer_t * buf_in,
-                     hb_buffer_t ** buf_out,
-                     int pix_fmt,
-                     int width,
-                     int height,
-                     hb_filter_private_t * pv )
+static int hb_denoise_work( hb_filter_object_t * filter,
+                            hb_buffer_t ** buf_in,
+                            hb_buffer_t ** buf_out )
 {
-    if( !pv ||
-        pix_fmt != pv->pix_fmt ||
-        width != pv->width[0] ||
-        height != pv->height[0] )
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in, * out;
+
+    if ( in->size <= 0 )
     {
-        return FILTER_FAILED;
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
     }
 
-    avpicture_fill( &pv->pic_in, buf_in->data,
-                    pix_fmt, width, height );
+    out = hb_video_buffer_init( in->f.width, in->f.height );
 
-    avpicture_fill( &pv->pic_out, pv->buf_out->data,
-                    pix_fmt, width, height );
+    if( !pv->hqdn3d_line )
+    {
+        pv->hqdn3d_line = malloc( in->plane[0].stride * sizeof(int) );
+    }
 
-    hqdn3d_denoise( pv->pic_in.data[0],
-                    pv->pic_out.data[0],
+    hqdn3d_denoise( in->plane[0].data,
+                    out->plane[0].data,
                     pv->hqdn3d_line,
                     &pv->hqdn3d_frame[0],
-                    pv->width[0],
-                    pv->height[0],
+                    in->plane[0].stride,
+                    in->plane[0].height,
                     pv->hqdn3d_coef[0],
                     pv->hqdn3d_coef[0],
                     pv->hqdn3d_coef[1] );
 
-    hqdn3d_denoise( pv->pic_in.data[1],
-                    pv->pic_out.data[1],
+    hqdn3d_denoise( in->plane[1].data,
+                    out->plane[1].data,
                     pv->hqdn3d_line,
                     &pv->hqdn3d_frame[1],
-                    pv->width[1],
-                    pv->height[1],
+                    in->plane[1].stride,
+                    in->plane[1].height,
                     pv->hqdn3d_coef[2],
                     pv->hqdn3d_coef[2],
                     pv->hqdn3d_coef[3] );
 
-    hqdn3d_denoise( pv->pic_in.data[2],
-                    pv->pic_out.data[2],
+    hqdn3d_denoise( in->plane[2].data,
+                    out->plane[2].data,
                     pv->hqdn3d_line,
                     &pv->hqdn3d_frame[2],
-                    pv->width[2],
-                    pv->height[2],
+                    in->plane[2].stride,
+                    in->plane[2].height,
                     pv->hqdn3d_coef[2],
                     pv->hqdn3d_coef[2],
                     pv->hqdn3d_coef[3] );
 
-    hb_buffer_copy_settings( pv->buf_out, buf_in );
+    out->s = in->s;
+    hb_buffer_move_subs( out, in );
 
-    *buf_out = pv->buf_out;
+    *buf_out = out;
 
-    return FILTER_OK;
+    return HB_FILTER_OK;
 }

HandBrake-0.9.8.tar.bz2/libhb/detelecine.c -> HandBrake-0.9.9.tar.bz2/libhb/detelecine.c Changed

@@ -1,3 +1,12 @@
+/* detelecine.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
@@ -24,6 +33,7 @@
 {
     int lock[2];
     unsigned char **planes;
+    int *size;
 };
 
 struct pullup_field
@@ -80,41 +90,29 @@
 
 struct hb_filter_private_s
 {
-    int              pix_fmt;
-    int              width[3];
-    int              height[3];
-
     struct pullup_context * pullup_ctx;
     int                     pullup_fakecount;
     int                     pullup_skipflag;
-
-    AVPicture        pic_in;
-    AVPicture        pic_out;
-    hb_buffer_t    * buf_out;
 };
 
-hb_filter_private_t * hb_detelecine_init( int pix_fmt,
-                                          int width,
-                                          int height,
-                                          char * settings );
+static int hb_detelecine_init( hb_filter_object_t * filter,
+                               hb_filter_init_t * init );
 
-int hb_detelecine_work( const hb_buffer_t * buf_in,
-                        hb_buffer_t ** buf_out,
-                        int pix_fmt,
-                        int width,
-                        int height,
-                        hb_filter_private_t * pv );
+static int hb_detelecine_work( hb_filter_object_t * filter,
+                               hb_buffer_t ** buf_in,
+                               hb_buffer_t ** buf_out );
 
-void hb_detelecine_close( hb_filter_private_t * pv );
+static void hb_detelecine_close( hb_filter_object_t * filter );
 
 hb_filter_object_t hb_filter_detelecine =
 {
-    FILTER_DETELECINE,
-    "Detelecine (pullup)",
-    NULL,
-    hb_detelecine_init,
-    hb_detelecine_work,
-    hb_detelecine_close,
+    .id            = HB_FILTER_DETELECINE,
+    .enforce_order = 1,
+    .name          = "Detelecine (pullup)",
+    .settings      = NULL,
+    .init          = hb_detelecine_init,
+    .work          = hb_detelecine_work,
+    .close         = hb_detelecine_close,
 };
 
 /*
@@ -596,11 +594,13 @@
     int i;
     if( b->planes ) return;
     b->planes = calloc( c->nplanes, sizeof(unsigned char *) );
+    b->size = calloc( c->nplanes, sizeof(int) );
     for ( i = 0; i < c->nplanes; i++ )
     {
-        b->planes[i] = malloc(c->h[i]*c->stride[i]);
+        b->size[i] = c->h[i] * c->stride[i];
+        b->planes[i] = malloc(b->size[i]);
         /* Deal with idiotic 128=0 for chroma: */
-        memset( b->planes[i], c->background[i], c->h[i]*c->stride[i] );
+        memset( b->planes[i], c->background[i], b->size[i] );
     }
 }
 
@@ -812,25 +812,11 @@
  *
  */
 
-hb_filter_private_t * hb_detelecine_init( int pix_fmt,
-                                          int width,
-                                          int height,
-                                          char * settings )
+static int hb_detelecine_init( hb_filter_object_t * filter,
+                               hb_filter_init_t * init )
 {
-    if( pix_fmt != PIX_FMT_YUV420P )
-    {
-        return 0;
-    }
-
-    hb_filter_private_t * pv = malloc( sizeof(struct hb_filter_private_s) );
-
-    pv->pix_fmt  = pix_fmt;
-    pv->width[0]  = width;
-    pv->height[0] = height;
-    pv->width[1]  = pv->width[2] = width >> 1;
-    pv->height[1] = pv->height[2] = height >> 1;
-
-    pv->buf_out = hb_video_buffer_init( width, height );
+    filter->private_data = calloc( sizeof(struct hb_filter_private_s), 1 );
+    hb_filter_private_t * pv = filter->private_data;
 
     struct pullup_context * ctx;
     pv->pullup_ctx = ctx = pullup_alloc_context();
@@ -841,9 +827,9 @@
     ctx->metric_plane  = 0;
     ctx->parity = -1;
     
-    if( settings )
+    if( filter->settings )
     {
-        sscanf( settings, "%d:%d:%d:%d:%d:%d:%d",
+        sscanf( filter->settings, "%d:%d:%d:%d:%d:%d:%d",
                 &ctx->junk_left,
                 &ctx->junk_right,
                 &ctx->junk_top,
@@ -861,19 +847,19 @@
     ctx->bpp[0] = ctx->bpp[1] = ctx->bpp[2] = 8;
     ctx->background[1] = ctx->background[2] = 128;
 
-    ctx->w[0]      = pv->width[0];
-    ctx->h[0]      = pv->height[0];
-    ctx->stride[0] = pv->width[0];
+    ctx->w[0]      = init->width;
+    ctx->h[0]      = hb_image_height( init->pix_fmt, init->height, 0 );
+    ctx->stride[0] = hb_image_stride( init->pix_fmt, init->width, 0 );
 
-    ctx->w[1]      = pv->width[1];
-    ctx->h[1]      = pv->height[1];
-    ctx->stride[1] = pv->width[1];
+    ctx->w[1]      = init->width >> 1;
+    ctx->h[1]      = hb_image_height( init->pix_fmt, init->height, 1 );
+    ctx->stride[1] = hb_image_stride( init->pix_fmt, init->width, 1 );
 
-    ctx->w[2]      = pv->width[2];
-    ctx->h[2]      = pv->height[2];
-    ctx->stride[2] = pv->width[2];
+    ctx->w[1]      = init->width >> 1;
+    ctx->h[2]      = hb_image_height( init->pix_fmt, init->height, 2 );
+    ctx->stride[2] = hb_image_stride( init->pix_fmt, init->width, 2 );
 
-    ctx->w[3]      = ((width+15)/16) * ((height+15)/16);
+    ctx->w[3]      = ((init->width+15)/16) * ((init->height+15)/16);
     ctx->h[3]      = 2;
     ctx->stride[3] = ctx->w[3];
 
@@ -886,42 +872,40 @@
     pv->pullup_fakecount = 1;
     pv->pullup_skipflag = 0;
 
-    return pv;
+    return 0;
 }
 
-void hb_detelecine_close( hb_filter_private_t * pv )
+static void hb_detelecine_close( hb_filter_object_t * filter )
 {
+    hb_filter_private_t * pv = filter->private_data;
+
     if( !pv )
     {
         return;
     }
 
-    if( pv->buf_out )
-    {
-        hb_buffer_close( &pv->buf_out );
-    }
-
     if( pv->pullup_ctx )
     {
         pullup_free_context( pv->pullup_ctx );
     }
 
     free( pv );
+    filter->private_data = NULL;
 }
 
-int hb_detelecine_work( const hb_buffer_t * buf_in,
-                        hb_buffer_t ** buf_out,
-                        int pix_fmt,
-                        int width,
-                        int height,
-                        hb_filter_private_t * pv )
+
+static int hb_detelecine_work( hb_filter_object_t * filter,
+                               hb_buffer_t ** buf_in,
+                               hb_buffer_t ** buf_out )
 {
-    if( !pv ||
-        pix_fmt != pv->pix_fmt ||
-        width != pv->width[0] ||
-        height != pv->height[0] )
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in, * out;
+
+    if ( in->size <= 0 )
     {
-        return FILTER_FAILED;
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
     }
 
     struct pullup_context * ctx = pv->pullup_ctx;
@@ -934,26 +918,18 @@
         frame = pullup_get_frame( ctx );
         pullup_release_frame( frame );
         hb_log( "Could not get buffer from pullup!" );
-        return FILTER_FAILED;
+        return HB_FILTER_FAILED;
     }
 
     /* Copy input buffer into pullup buffer */
-    avpicture_fill( &pv->pic_in, buf_in->data,
-                    pix_fmt, width, height );
-
-    hb_buffer_copy_settings( pv->buf_out, buf_in );
-
-    memcpy( buf->planes[0], pv->pic_in.data[0],
-            pv->width[0] * pv->height[0] * sizeof(uint8_t) );
-    memcpy( buf->planes[1], pv->pic_in.data[1],
-            pv->width[1] * pv->height[1] * sizeof(uint8_t) );
-    memcpy( buf->planes[2], pv->pic_in.data[2],
-            pv->width[2] * pv->height[2] * sizeof(uint8_t) );
+    memcpy( buf->planes[0], in->plane[0].data, buf->size[0] );
+    memcpy( buf->planes[1], in->plane[1].data, buf->size[1] );
+    memcpy( buf->planes[2], in->plane[2].data, buf->size[2] );
 
     /* Submit buffer fields based on buffer flags.
        Detelecine assumes BFF when the TFF flag isn't present. */
     int parity = 1;
-    if( buf_in->flags & PIC_FLAG_TOP_FIELD_FIRST )
+    if( in->s.flags & PIC_FLAG_TOP_FIELD_FIRST )
     {
         /* Source signals TFF */
         parity = 0;
@@ -971,7 +947,7 @@
     }
     pullup_submit_field( ctx, buf, parity );
     pullup_submit_field( ctx, buf, parity^1 );
-    if( buf_in->flags & PIC_FLAG_REPEAT_FIRST_FIELD )
+    if( in->s.flags & PIC_FLAG_REPEAT_FIRST_FIELD )
     {
         pullup_submit_field( ctx, buf, parity );
     }
@@ -985,7 +961,8 @@
         {
             pv->pullup_fakecount--;
 
-            memcpy( pv->buf_out->data, buf_in->data, buf_in->size );
+            *buf_in = NULL;
+            *buf_out = in;
 
             goto output_frame;
         }
@@ -1009,7 +986,7 @@
         {
             pullup_release_frame( frame );
 
-            if( !(buf_in->flags & PIC_FLAG_REPEAT_FIRST_FIELD) )
+            if( !(in->s.flags & PIC_FLAG_REPEAT_FIRST_FIELD) )
             {
                 goto discard_frame;
             }
@@ -1034,30 +1011,30 @@
         pullup_pack_frame( ctx, frame );
     }
 
-    /* Copy pullup frame buffer into output buffer */
-    avpicture_fill( &pv->pic_out, pv->buf_out->data,
-                    pix_fmt, width, height );
+    out = hb_video_buffer_init( in->f.width, in->f.height );
 
-    memcpy( pv->pic_out.data[0], frame->buffer->planes[0],
-            pv->width[0] * pv->height[0] * sizeof(uint8_t) );
-    memcpy( pv->pic_out.data[1], frame->buffer->planes[1],
-            pv->width[1] * pv->height[1] * sizeof(uint8_t) );
-    memcpy( pv->pic_out.data[2], frame->buffer->planes[2],
-            pv->width[2] * pv->height[2] * sizeof(uint8_t) );
+    /* Copy pullup frame buffer into output buffer */
+    memcpy( out->plane[0].data, frame->buffer->planes[0], frame->buffer->size[0] );
+    memcpy( out->plane[1].data, frame->buffer->planes[1], frame->buffer->size[1] );
+    memcpy( out->plane[2].data, frame->buffer->planes[2], frame->buffer->size[2] );
 
     pullup_release_frame( frame );
 
+    out->s = in->s;
+    hb_buffer_move_subs( out, in );
+
+    *buf_out = out;
+
 output_frame:
-    *buf_out = pv->buf_out;
-    return FILTER_OK;
+
+    return HB_FILTER_OK;
 
 /* This and all discard_frame calls shown above are
    the result of me restoring the functionality in
    pullup that huevos_rancheros disabled because
    HB couldn't handle it.                           */
 discard_frame:
-    *buf_out = pv->buf_out;
-    return FILTER_DROP;
+    return HB_FILTER_OK;
 
 }

HandBrake-0.9.8.tar.bz2/libhb/dvd.c -> HandBrake-0.9.9.tar.bz2/libhb/dvd.c Changed

@@ -1,8 +1,11 @@
-/* $Id: dvd.c,v 1.12 2005/11/25 15:05:25 titer Exp $
+/* dvd.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "lang.h"
@@ -170,10 +173,10 @@
     ifo_handle_t * vts = NULL;
     int            pgc_id, pgn, i;
     hb_chapter_t * chapter;
-    int            c;
     uint64_t       duration;
     float          duration_correction;
     unsigned char  unused[1024];
+    const char   * codec_name;
 
     hb_log( "scan: scanning title %d", t );
 
@@ -200,14 +203,14 @@
     if ( !title->vts )
     {
         /* A VTS of 0 means the title wasn't found in the title set */
-        hb_error("Invalid VTS (title set) number: %i", title->vts);
+        hb_log("Invalid VTS (title set) number: %i", title->vts);
         goto fail;
     }
 
     hb_log( "scan: opening IFO for VTS %d", title->vts );
     if( !( vts = ifoOpen( d->reader, title->vts ) ) )
     {
-        hb_error( "scan: ifoOpen failed" );
+        hb_log( "scan: ifoOpen failed" );
         goto fail;
     }
 
@@ -218,26 +221,26 @@
         if( (vts->vts_c_adt->cell_adr_table[i].start_sector & 0xffffff ) ==
             0xffffff )
         {
-            hb_error( "scan: cell_adr_table[%d].start_sector invalid (0x%x) "
-                      "- skipping title", i,
-                      vts->vts_c_adt->cell_adr_table[i].start_sector );
+            hb_log( "scan: cell_adr_table[%d].start_sector invalid (0x%x) "
+                    "- skipping title", i,
+                    vts->vts_c_adt->cell_adr_table[i].start_sector );
             goto fail;
         }
         if( (vts->vts_c_adt->cell_adr_table[i].last_sector & 0xffffff ) ==
             0xffffff )
         {
-            hb_error( "scan: cell_adr_table[%d].last_sector invalid (0x%x) "
-                      "- skipping title", i,
-                      vts->vts_c_adt->cell_adr_table[i].last_sector );
+            hb_log( "scan: cell_adr_table[%d].last_sector invalid (0x%x) "
+                    "- skipping title", i,
+                    vts->vts_c_adt->cell_adr_table[i].last_sector );
             goto fail;
         }
         if( vts->vts_c_adt->cell_adr_table[i].start_sector >=
             vts->vts_c_adt->cell_adr_table[i].last_sector )
         {
-            hb_error( "scan: cell_adr_table[%d].start_sector (0x%x) "
-                      "is not before last_sector (0x%x) - skipping title", i,
-                      vts->vts_c_adt->cell_adr_table[i].start_sector,
-                      vts->vts_c_adt->cell_adr_table[i].last_sector );
+            hb_log( "scan: cell_adr_table[%d].start_sector (0x%x) "
+                    "is not before last_sector (0x%x) - skipping title", i,
+                    vts->vts_c_adt->cell_adr_table[i].start_sector,
+                    vts->vts_c_adt->cell_adr_table[i].last_sector );
             goto fail;
         }
     }
@@ -251,7 +254,7 @@
     title->ttn = d->vmg->tt_srpt->title[t-1].vts_ttn;
     if ( title->ttn < 1 || title->ttn > vts->vts_ptt_srpt->nr_of_srpts )
     {
-        hb_error( "invalid VTS PTT offset %d for title %d, skipping", title->ttn, t );
+        hb_log( "invalid VTS PTT offset %d for title %d, skipping", title->ttn, t );
         goto fail;
     }
 
@@ -259,7 +262,7 @@
     pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgcn;
     if ( pgc_id < 1 || pgc_id > vts->vts_pgcit->nr_of_pgci_srp )
     {
-        hb_error( "invalid PGC ID %d for title %d, skipping", pgc_id, t );
+        hb_log( "invalid PGC ID %d for title %d, skipping", pgc_id, t );
         goto fail;
     }
     pgn    = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn;
@@ -269,13 +272,19 @@
 
     if( !d->pgc || !d->pgc->program_map )
     {
-        hb_error( "scan: pgc not valid, skipping" );
+        hb_log( "scan: pgc not valid, skipping" );
+        goto fail;
+    }
+
+    if (d->pgc->cell_playback == NULL)
+    {
+        hb_log( "invalid PGC cell_playback table for title %d, skipping", t );
         goto fail;
     }
 
     if( pgn <= 0 || pgn > 99 )
     {
-        hb_error( "scan: pgn %d not valid, skipping", pgn );
+        hb_log( "scan: pgn %d not valid, skipping", pgn );
         goto fail;
     }
 
@@ -325,11 +334,9 @@
     /* Detect languages */
     for( i = 0; i < vts->vtsi_mat->nr_of_vts_audio_streams; i++ )
     {
+        int audio_format, lang_code, lang_extension, audio_control, position, j;
         hb_audio_t * audio, * audio_tmp;
-        int          audio_format, lang_code, audio_control,
-                     position, j;
         iso639_lang_t * lang;
-        int lang_extension = 0;
 
         hb_log( "scan: checking audio %d", i + 1 );
 
@@ -355,27 +362,34 @@
             case 0x00:
                 audio->id    = ( ( 0x80 + position ) << 8 ) | 0xbd;
                 audio->config.in.codec = HB_ACODEC_AC3;
+                codec_name = "AC3";
                 break;
 
             case 0x02:
             case 0x03:
                 audio->id    = 0xc0 + position;
                 audio->config.in.codec = HB_ACODEC_FFMPEG;
+                audio->config.in.codec_param = AV_CODEC_ID_MP2;
+                codec_name = "MPEG";
                 break;
 
             case 0x04:
                 audio->id    = ( ( 0xa0 + position ) << 8 ) | 0xbd;
                 audio->config.in.codec = HB_ACODEC_LPCM;
+                codec_name = "LPCM";
                 break;
 
             case 0x06:
                 audio->id    = ( ( 0x88 + position ) << 8 ) | 0xbd;
                 audio->config.in.codec = HB_ACODEC_DCA;
+                audio->config.in.codec_param = AV_CODEC_ID_DTS;
+                codec_name = "DTS";
                 break;
 
             default:
                 audio->id    = 0;
                 audio->config.in.codec = 0;
+                codec_name = "Unknown";
                 hb_log( "scan: unknown audio codec (%x)",
                         audio_format );
                 break;
@@ -403,36 +417,32 @@
             continue;
         }
 
-        audio->config.lang.type = lang_extension;
+        lang = lang_for_code( lang_code );
 
-        lang = lang_for_code( vts->vtsi_mat->vts_audio_attr[i].lang_code );
+        audio->config.lang.type = lang_extension;
 
-        snprintf( audio->config.lang.description, sizeof( audio->config.lang.description ), "%s (%s)",
-            strlen(lang->native_name) ? lang->native_name : lang->eng_name,
-            audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : ( audio->config.in.codec ==
-                HB_ACODEC_DCA ? "DTS" : ( audio->config.in.codec ==
-                HB_ACODEC_FFMPEG ? "MPEG" : "LPCM" ) ) );
-        snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s",
-                  strlen(lang->native_name) ? lang->native_name : lang->eng_name );
-        snprintf( audio->config.lang.iso639_2, sizeof( audio->config.lang.iso639_2 ), "%s",
-                  lang->iso639_2);
+        snprintf( audio->config.lang.simple,
+                  sizeof( audio->config.lang.simple ), "%s",
+                  strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
+        snprintf( audio->config.lang.iso639_2,
+                  sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
+        snprintf( audio->config.lang.description,
+                  sizeof( audio->config.lang.description ), "%s (%s)",
+                  audio->config.lang.simple, codec_name );
 
         switch( lang_extension )
         {
-        case 0:
-        case 1:
-            break;
-        case 2:
-            strcat( audio->config.lang.description, " (Visually Impaired)" );
-            break;
-        case 3:
-            strcat( audio->config.lang.description, " (Director's Commentary 1)" );
-            break;
-        case 4:
-            strcat( audio->config.lang.description, " (Director's Commentary 2)" );
-            break;
-        default:
-            break;
+            case 2:
+                strcat( audio->config.lang.description, " (Visually Impaired)" );
+                break;
+            case 3:
+                strcat( audio->config.lang.description, " (Director's Commentary 1)" );
+                break;
+            case 4:
+                strcat( audio->config.lang.description, " (Director's Commentary 2)" );
+                break;
+            default:
+                break;
         }
 
         hb_log( "scan: id=0x%x, lang=%s, 3cc=%s ext=%i", audio->id,
@@ -496,61 +506,51 @@
         subtitle->format = PICTURESUB;
         subtitle->source = VOBSUB;
         subtitle->config.dest   = RENDERSUB;  // By default render (burn-in) the VOBSUB.
+        subtitle->stream_type = 0xbd;
+        subtitle->substream_type = 0x20 + position;
+        subtitle->codec = WORK_DECVOBSUB;
 
         subtitle->type = lang_extension;
         
         memcpy( subtitle->palette,
             vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
             16 * sizeof( uint32_t ) );
+        subtitle->palette_set = 1;
 
         switch( lang_extension )
         {  
-        case 0:
-            break;
-        case 1:
-            break;
-        case 2:
-            strcat( subtitle->lang, " (Caption with bigger size character)");
-            break;
-        case 3: 
-            strcat( subtitle->lang, " (Caption for Children)");
-            break;
-        case 4:
-            break;
-        case 5:
-            strcat( subtitle->lang, " (Closed Caption)");
-            break;
-        case 6:
-            strcat( subtitle->lang, " (Closed Caption with bigger size character)");
-            break;
-        case 7:
-            strcat( subtitle->lang, " (Closed Caption for Children)");
-            break;
-        case 8:
-            break;
-        case 9:
-            strcat( subtitle->lang, " (Forced Caption)");
-            break;
-        case 10:
-            break;
-        case 11:
-            break;
-        case 12:
-            break;
-        case 13:
-            strcat( subtitle->lang, " (Director's Commentary)");
-            break;
-        case 14:
-            strcat( subtitle->lang, " (Director's Commentary with bigger size character)");
-            break;
-        case 15:
-            strcat( subtitle->lang, " (Director's Commentary for Children)");
-        default:
-            break;
+            case 2:
+                strcat( subtitle->lang, " (Caption with bigger size character)" );
+                break;
+            case 3: 
+                strcat( subtitle->lang, " (Caption for Children)" );
+                break;
+            case 5:
+                strcat( subtitle->lang, " (Closed Caption)" );
+                break;
+            case 6:
+                strcat( subtitle->lang, " (Closed Caption with bigger size character)" );
+                break;
+            case 7:
+                strcat( subtitle->lang, " (Closed Caption for Children)" );
+                break;
+            case 9:
+                strcat( subtitle->lang, " (Forced Caption)" );
+                break;
+            case 13:
+                strcat( subtitle->lang, " (Director's Commentary)" );
+                break;
+            case 14:
+                strcat( subtitle->lang, " (Director's Commentary with bigger size character)" );
+                break;
+            case 15:
+                strcat( subtitle->lang, " (Director's Commentary for Children)" );
+            default:
+                break;
         }
 
-        hb_log( "scan: id=0x%x, lang=%s, 3cc=%s", subtitle->id,
-                subtitle->lang, subtitle->iso639_2 );
+        hb_log( "scan: id=0x%x, lang=%s, 3cc=%s ext=%i", subtitle->id,
+                subtitle->lang, subtitle->iso639_2, lang_extension );
 
         hb_list_add( title->list_subtitle, subtitle );
     }
@@ -558,12 +558,16 @@
     /* Chapters */
     hb_log( "scan: title %d has %d chapters", t,
             vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts );
-    for( i = 0, c = 1;
+    for( i = 0;
          i < vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts; i++ )
     {
+        char chapter_title[80];
         chapter = calloc( sizeof( hb_chapter_t ), 1 );
+
         /* remember the on-disc chapter number */
         chapter->index = i + 1;
+        sprintf( chapter_title, "Chapter %d", chapter->index );
+        hb_chapter_set_title( chapter, chapter_title );
 
         pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i].pgcn;
         pgn    = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i].pgn;
@@ -601,8 +605,8 @@
             FindNextCell( d );
             d->cell_cur = d->cell_next;
         }
+
         hb_list_add( title->list_chapter, chapter );
-        c++;
     }
 
     /* The durations we get for chapters aren't precise. Scale them so
@@ -616,13 +620,13 @@
     duration_correction = (float) title->duration / (float) duration;
     for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
     {
-        int seconds;
-        chapter            = hb_list_item( title->list_chapter, i );
-        chapter->duration  = duration_correction * chapter->duration;
-        seconds            = ( chapter->duration + 45000 ) / 90000;
-        chapter->hours     = seconds / 3600;
-        chapter->minutes   = ( seconds % 3600 ) / 60;
-        chapter->seconds   = seconds % 60;
+        chapter           = hb_list_item( title->list_chapter, i );
+        chapter->duration = duration_correction * chapter->duration;
+
+        int seconds       = ( chapter->duration + 45000 ) / 90000;
+        chapter->hours    = ( seconds / 3600 );
+        chapter->minutes  = ( seconds % 3600 ) / 60;
+        chapter->seconds  = ( seconds % 60 );
 
         hb_log( "scan: chap %d c=%d->%d, b=%"PRIu64"->%"PRIu64" (%"PRIu64"), %"PRId64" ms",
                 chapter->index, chapter->cell_start, chapter->cell_end,
@@ -645,7 +649,7 @@
             goto fail;
     }
 
-    hb_log( "scan: aspect = %g", title->aspect );
+    hb_log( "scan: aspect = %g", title->container_aspect );
 
     /* This title is ok so far */
     goto cleanup;
@@ -832,7 +836,6 @@
     }
 }
 
-
 /***********************************************************************
  * hb_dvdread_read
  ***********************************************************************
@@ -1065,7 +1068,7 @@
 
                 if( d->cell_overlap )
                 {
-                    b->new_chap = hb_dvdread_is_break( d );
+                    b->s.new_chap = hb_dvdread_is_break( d );
                     d->cell_overlap = 0;
                 }
             }

HandBrake-0.9.8.tar.bz2/libhb/dvd.h -> HandBrake-0.9.9.tar.bz2/libhb/dvd.h Changed

HandBrake-0.9.8.tar.bz2/libhb/dvdnav.c -> HandBrake-0.9.9.tar.bz2/libhb/dvdnav.c Changed

@@ -1,8 +1,11 @@
-/* $Id: dvd.c,v 1.12 2005/11/25 15:05:25 titer Exp $
+/* dvdnav.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "lang.h"
@@ -239,6 +242,8 @@
     int            cell_start, cell_end;
     int            i;
 
+    *blocks = 0;
+
     // Initialize map of visited pgc's to prevent loops
     uint32_t pgcn_map[MAX_PGCN/32];
     PgcWalkInit( pgcn_map );
@@ -246,25 +251,35 @@
     pgn   = ifo->vts_ptt_srpt->title[ttn-1].ptt[pttn-1].pgn;
     if ( pgcn < 1 || pgcn > ifo->vts_pgcit->nr_of_pgci_srp || pgcn >= MAX_PGCN)
     {
-        hb_error( "invalid PGC ID %d, skipping", pgcn );
+        hb_log( "invalid PGC ID %d, skipping", pgcn );
         return 0;
     }
 
     if( pgn <= 0 || pgn > 99 )
     {
-        hb_error( "scan: pgn %d not valid, skipping", pgn );
+        hb_log( "scan: pgn %d not valid, skipping", pgn );
         return 0;
     }
 
-    *blocks = 0;
     do
     {
         pgc = ifo->vts_pgcit->pgci_srp[pgcn-1].pgc;
         if (!pgc)
         {
-            hb_error( "scan: pgc not valid, skipping" );
+            *blocks = 0;
+            duration = 0;
+            hb_log( "scan: pgc not valid, skipping" );
+            break;
+        }
+
+        if (pgc->cell_playback == NULL)
+        {
+            *blocks = 0;
+            duration = 0;
+            hb_log("invalid PGC cell_playback table, skipping");
             break;
         }
+
         if (pgn > pgc->nr_of_programs)
         {
             pgn = 1;
@@ -305,6 +320,7 @@
     int            longest_pgcn, longest_pgn, longest_pgcn_end;
     float          duration_correction;
     const char   * name;
+    const char   * codec_name;
 
     hb_log( "scan: scanning title %d", t );
 
@@ -333,14 +349,14 @@
     if ( !title->vts )
     {
         /* A VTS of 0 means the title wasn't found in the title set */
-        hb_error("Invalid VTS (title set) number: %i", title->vts);
+        hb_log("Invalid VTS (title set) number: %i", title->vts);
         goto fail;
     }
 
     hb_log( "scan: opening IFO for VTS %d", title->vts );
     if( !( ifo = ifoOpen( d->reader, title->vts ) ) )
     {
-        hb_error( "scan: ifoOpen failed" );
+        hb_log( "scan: ifoOpen failed" );
         goto fail;
     }
 
@@ -351,26 +367,26 @@
         if( (ifo->vts_c_adt->cell_adr_table[i].start_sector & 0xffffff ) ==
             0xffffff )
         {
-            hb_error( "scan: cell_adr_table[%d].start_sector invalid (0x%x) "
-                      "- skipping title", i,
-                      ifo->vts_c_adt->cell_adr_table[i].start_sector );
+            hb_log( "scan: cell_adr_table[%d].start_sector invalid (0x%x) "
+                    "- skipping title", i,
+                    ifo->vts_c_adt->cell_adr_table[i].start_sector );
             goto fail;
         }
         if( (ifo->vts_c_adt->cell_adr_table[i].last_sector & 0xffffff ) ==
             0xffffff )
         {
-            hb_error( "scan: cell_adr_table[%d].last_sector invalid (0x%x) "
-                      "- skipping title", i,
-                      ifo->vts_c_adt->cell_adr_table[i].last_sector );
+            hb_log( "scan: cell_adr_table[%d].last_sector invalid (0x%x) "
+                    "- skipping title", i,
+                    ifo->vts_c_adt->cell_adr_table[i].last_sector );
             goto fail;
         }
         if( ifo->vts_c_adt->cell_adr_table[i].start_sector >=
             ifo->vts_c_adt->cell_adr_table[i].last_sector )
         {
-            hb_error( "scan: cell_adr_table[%d].start_sector (0x%x) "
-                      "is not before last_sector (0x%x) - skipping title", i,
-                      ifo->vts_c_adt->cell_adr_table[i].start_sector,
-                      ifo->vts_c_adt->cell_adr_table[i].last_sector );
+            hb_log( "scan: cell_adr_table[%d].start_sector (0x%x) "
+                    "is not before last_sector (0x%x) - skipping title", i,
+                    ifo->vts_c_adt->cell_adr_table[i].start_sector,
+                    ifo->vts_c_adt->cell_adr_table[i].last_sector );
             goto fail;
         }
     }
@@ -384,7 +400,7 @@
     title->ttn = d->vmg->tt_srpt->title[t-1].vts_ttn;
     if ( title->ttn < 1 || title->ttn > ifo->vts_ptt_srpt->nr_of_srpts )
     {
-        hb_error( "invalid VTS PTT offset %d for title %d, skipping", title->ttn, t );
+        hb_log( "invalid VTS PTT offset %d for title %d, skipping", title->ttn, t );
         goto fail;
     }
 
@@ -442,16 +458,37 @@
     /* Get pgc */
     if ( pgcn < 1 || pgcn > ifo->vts_pgcit->nr_of_pgci_srp || pgcn >= MAX_PGCN)
     {
-        hb_error( "invalid PGC ID %d for title %d, skipping", pgcn, t );
+        hb_log( "invalid PGC ID %d for title %d, skipping", pgcn, t );
         goto fail;
     }
 
+    // Check all pgc's for validity
+    uint32_t pgcn_map[MAX_PGCN/32];
+    PgcWalkInit( pgcn_map );
+    do
+    {
+        pgc = ifo->vts_pgcit->pgci_srp[pgcn-1].pgc;
+
+        if( !pgc || !pgc->program_map )
+        {
+            hb_log( "scan: pgc not valid, skipping" );
+            goto fail;
+        }
+
+        if (pgc->cell_playback == NULL)
+        {
+            hb_log( "invalid PGC cell_playback table for title %d, skipping", t );
+            goto fail;
+        }
+    } while ((pgcn = NextPgcn(ifo, pgcn, pgcn_map)) != 0);
+
+    pgcn       = longest_pgcn;
     pgc = ifo->vts_pgcit->pgci_srp[pgcn-1].pgc;
 
     hb_log("pgc_id: %d, pgn: %d: pgc: %p", pgcn, pgn, pgc);
     if (pgn > pgc->nr_of_programs)
     {
-        hb_error( "invalid PGN %d for title %d, skipping", pgn, t );
+        hb_log( "invalid PGN %d for title %d, skipping", pgn, t );
         goto fail;
     }
 
@@ -473,11 +510,9 @@
     /* Detect languages */
     for( i = 0; i < ifo->vtsi_mat->nr_of_vts_audio_streams; i++ )
     {
+        int audio_format, lang_code, lang_extension, audio_control, position, j;
         hb_audio_t * audio, * audio_tmp;
-        int          audio_format, lang_code, audio_control,
-                     position, j;
         iso639_lang_t * lang;
-        int lang_extension = 0;
 
         hb_log( "scan: checking audio %d", i + 1 );
 
@@ -503,27 +538,34 @@
             case 0x00:
                 audio->id    = ( ( 0x80 + position ) << 8 ) | 0xbd;
                 audio->config.in.codec = HB_ACODEC_AC3;
+                codec_name = "AC3";
                 break;
 
             case 0x02:
             case 0x03:
                 audio->id    = 0xc0 + position;
                 audio->config.in.codec = HB_ACODEC_FFMPEG;
+                audio->config.in.codec_param = AV_CODEC_ID_MP2;
+                codec_name = "MPEG";
                 break;
 
             case 0x04:
                 audio->id    = ( ( 0xa0 + position ) << 8 ) | 0xbd;
                 audio->config.in.codec = HB_ACODEC_LPCM;
+                codec_name = "LPCM";
                 break;
 
             case 0x06:
                 audio->id    = ( ( 0x88 + position ) << 8 ) | 0xbd;
                 audio->config.in.codec = HB_ACODEC_DCA;
+                audio->config.in.codec_param = AV_CODEC_ID_DTS;
+                codec_name = "DTS";
                 break;
 
             default:
                 audio->id    = 0;
                 audio->config.in.codec = 0;
+                codec_name = "Unknown";
                 hb_log( "scan: unknown audio codec (%x)",
                         audio_format );
                 break;
@@ -551,36 +593,32 @@
             continue;
         }
 
+        lang = lang_for_code( lang_code );
+
         audio->config.lang.type = lang_extension;
 
-        lang = lang_for_code( ifo->vtsi_mat->vts_audio_attr[i].lang_code );
-
-        snprintf( audio->config.lang.description, sizeof( audio->config.lang.description ), "%s (%s)",
-            strlen(lang->native_name) ? lang->native_name : lang->eng_name,
-            audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : ( audio->config.in.codec ==
-                HB_ACODEC_DCA ? "DTS" : ( audio->config.in.codec ==
-                HB_ACODEC_FFMPEG ? "MPEG" : "LPCM" ) ) );
-        snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s",
-                  strlen(lang->native_name) ? lang->native_name : lang->eng_name );
-        snprintf( audio->config.lang.iso639_2, sizeof( audio->config.lang.iso639_2 ), "%s",
-                  lang->iso639_2);
+        snprintf( audio->config.lang.simple,
+                  sizeof( audio->config.lang.simple ), "%s",
+                  strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
+        snprintf( audio->config.lang.iso639_2,
+                  sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
+        snprintf( audio->config.lang.description,
+                  sizeof( audio->config.lang.description ), "%s (%s)",
+                  audio->config.lang.simple, codec_name );
 
         switch( lang_extension )
         {
-        case 0:
-        case 1:
-            break;
-        case 2:
-            strcat( audio->config.lang.description, " (Visually Impaired)" );
-            break;
-        case 3:
-            strcat( audio->config.lang.description, " (Director's Commentary 1)" );
-            break;
-        case 4:
-            strcat( audio->config.lang.description, " (Director's Commentary 2)" );
-            break;
-        default:
-            break;
+            case 2:
+                strcat( audio->config.lang.description, " (Visually Impaired)" );
+                break;
+            case 3:
+                strcat( audio->config.lang.description, " (Director's Commentary 1)" );
+                break;
+            case 4:
+                strcat( audio->config.lang.description, " (Director's Commentary 2)" );
+                break;
+            default:
+                break;
         }
 
         hb_log( "scan: id=0x%x, lang=%s, 3cc=%s ext=%i", audio->id,
@@ -644,67 +682,56 @@
         subtitle->format = PICTURESUB;
         subtitle->source = VOBSUB;
         subtitle->config.dest   = RENDERSUB;  // By default render (burn-in) the VOBSUB.
+        subtitle->stream_type = 0xbd;
+        subtitle->substream_type = 0x20 + position;
+        subtitle->codec = WORK_DECVOBSUB;
 
         subtitle->type = lang_extension;
         
         memcpy( subtitle->palette,
             ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
             16 * sizeof( uint32_t ) );
+        subtitle->palette_set = 1;
 
         switch( lang_extension )
         {  
-        case 0:
-            break;
-        case 1:
-            break;
-        case 2:
-            strcat( subtitle->lang, " (Caption with bigger size character)");
-            break;
-        case 3: 
-            strcat( subtitle->lang, " (Caption for Children)");
-            break;
-        case 4:
-            break;
-        case 5:
-            strcat( subtitle->lang, " (Closed Caption)");
-            break;
-        case 6:
-            strcat( subtitle->lang, " (Closed Caption with bigger size character)");
-            break;
-        case 7:
-            strcat( subtitle->lang, " (Closed Caption for Children)");
-            break;
-        case 8:
-            break;
-        case 9:
-            strcat( subtitle->lang, " (Forced Caption)");
-            break;
-        case 10:
-            break;
-        case 11:
-            break;
-        case 12:
-            break;
-        case 13:
-            strcat( subtitle->lang, " (Director's Commentary)");
-            break;
-        case 14:
-            strcat( subtitle->lang, " (Director's Commentary with bigger size character)");
-            break;
-        case 15:
-            strcat( subtitle->lang, " (Director's Commentary for Children)");
-        default:
-            break;
+            case 2:
+                strcat( subtitle->lang, " (Caption with bigger size character)" );
+                break;
+            case 3: 
+                strcat( subtitle->lang, " (Caption for Children)" );
+                break;
+            case 5:
+                strcat( subtitle->lang, " (Closed Caption)" );
+                break;
+            case 6:
+                strcat( subtitle->lang, " (Closed Caption with bigger size character)" );
+                break;
+            case 7:
+                strcat( subtitle->lang, " (Closed Caption for Children)" );
+                break;
+            case 9:
+                strcat( subtitle->lang, " (Forced Caption)" );
+                break;
+            case 13:
+                strcat( subtitle->lang, " (Director's Commentary)" );
+                break;
+            case 14:
+                strcat( subtitle->lang, " (Director's Commentary with bigger size character)" );
+                break;
+            case 15:
+                strcat( subtitle->lang, " (Director's Commentary for Children)" );
+            default:
+                break;
         }
 
-        hb_log( "scan: id=0x%x, lang=%s, 3cc=%s", subtitle->id,
-                subtitle->lang, subtitle->iso639_2 );
+        hb_log( "scan: id=0x%x, lang=%s, 3cc=%s ext=%i", subtitle->id,
+                subtitle->lang, subtitle->iso639_2, lang_extension );
 
         hb_list_add( title->list_subtitle, subtitle );
     }
 
     /* Chapters */
-    uint32_t pgcn_map[MAX_PGCN/32];
     PgcWalkInit( pgcn_map );
     c = 0;
     do
@@ -713,11 +740,15 @@
 
         for (i = pgn; i <= pgc->nr_of_programs; i++)
         {
+            char chapter_title[80];
             chapter = calloc( sizeof( hb_chapter_t ), 1 );
 
-            chapter->index = c + 1;
             chapter->pgcn = pgcn;
             chapter->pgn = i;
+            chapter->index = c + 1;
+            sprintf( chapter_title, "Chapter %d", chapter->index );
+            hb_chapter_set_title( chapter, chapter_title );
+
             hb_list_add( title->list_chapter, chapter );
             c++;
         }
@@ -774,13 +805,13 @@
     duration_correction = (float) title->duration / (float) duration;
     for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
     {
-        int seconds;
-        chapter            = hb_list_item( title->list_chapter, i );
-        chapter->duration  = duration_correction * chapter->duration;
-        seconds            = ( chapter->duration + 45000 ) / 90000;
-        chapter->hours     = seconds / 3600;
-        chapter->minutes   = ( seconds % 3600 ) / 60;
-        chapter->seconds   = seconds % 60;
+        chapter           = hb_list_item( title->list_chapter, i );
+        chapter->duration = duration_correction * chapter->duration;
+
+        int seconds       = ( chapter->duration + 45000 ) / 90000;
+        chapter->hours    = ( seconds / 3600 );
+        chapter->minutes  = ( seconds % 3600 ) / 60;
+        chapter->seconds  = ( seconds % 60 );
 
         hb_log( "scan: chap %d c=%d->%d, b=%"PRIu64"->%"PRIu64" (%"PRIu64"), %"PRId64" ms",
                 chapter->index, chapter->cell_start, chapter->cell_end,
@@ -803,7 +834,7 @@
             goto fail;
     }
 
-    hb_log( "scan: aspect = %g", title->aspect );
+    hb_log( "scan: aspect = %g", title->container_aspect );
 
     /* This title is ok so far */
     goto cleanup;
@@ -961,7 +992,7 @@
 
     cur_title = title;
 
-    for (jj = 0; jj < 5; jj++)
+    for (jj = 0; jj < 10; jj++)
     {
         for (ii = 0; ii < 2000; ii++)
         {
@@ -1621,7 +1652,7 @@
             // The muxers expect to only get chapter 2 and above
             // They write chapter 1 when chapter 2 is detected.
             if (chapter > 1)
-                b->new_chap = chapter;
+                b->s.new_chap = chapter;
             chapter = 0;
             error_count = 0;
             return b;
@@ -1762,7 +1793,7 @@
             // The muxers expect to only get chapter 2 and above
             // They write chapter 1 when chapter 2 is detected.
             if (chapter > 1)
-                b->new_chap = chapter;
+                b->s.new_chap = chapter;
             chapter = 0;
             return b;
 
@@ -1825,6 +1856,8 @@
     if( d->vmg ) ifoClose( d->vmg );
     if( d->reader ) DVDClose( d->reader );
 
+    free(d->path);
+
     free( d );
     *_d = NULL;
 }

HandBrake-0.9.8.tar.bz2/libhb/eedi2.c -> HandBrake-0.9.9.tar.bz2/libhb/eedi2.c Changed

@@ -1,8 +1,10 @@
-/* $Id: eedi2.c,v 1.0 2009/03/06 5:00:00 jbrjake Exp $
+/* eedi2.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
    
    The EEDI2 interpolator was created by tritical:
    http://web.missouri.edu/~kes25c/
@@ -1191,15 +1193,15 @@
                 }
             }
             if( x > 1 && x < width - 2 && 
-                (     dstp[x] < MAX(   dstp[x-2],   dstp[x-1] ) - 3 &&
+                ( (   dstp[x] < MAX(   dstp[x-2],   dstp[x-1] ) - 3 &&
                       dstp[x] < MAX(   dstp[x+2],   dstp[x+1] ) - 3 &&
                     dstpnn[x] < MAX( dstpnn[x-2], dstpnn[x-1] ) - 3 &&
                     dstpnn[x] < MAX( dstpnn[x+2], dstpnn[x+1] ) - 3 )
                 ||
-                (     dstp[x] > MIN(   dstp[x-2],   dstp[x-1] ) + 3 &&
+                  (   dstp[x] > MIN(   dstp[x-2],   dstp[x-1] ) + 3 &&
                       dstp[x] > MIN(   dstp[x+2],   dstp[x+1] ) + 3 &&
                     dstpnn[x] > MIN( dstpnn[x-2], dstpnn[x-1] ) + 3 &&
-                    dstpnn[x] > MIN( dstpnn[x+2], dstpnn[x+1] ) + 3 ) )
+                    dstpnn[x] > MIN( dstpnn[x+2], dstpnn[x+1] ) + 3 ) ) )
             {
                 dstpn[x] = ( dstp[x] + dstpnn[x] + 1 ) >> 1;
                 dmskp[x] = 128;

HandBrake-0.9.8.tar.bz2/libhb/eedi2.h -> HandBrake-0.9.9.tar.bz2/libhb/eedi2.h Changed

HandBrake-0.9.8.tar.bz2/libhb/encavcodec.c -> HandBrake-0.9.9.tar.bz2/libhb/encavcodec.c Changed

@@ -1,10 +1,14 @@
-/* $Id: encavcodec.c,v 1.23 2005/10/13 23:47:06 titer Exp $
+/* encavcodec.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
+#include "hb_dict.h"
 #include "hbffmpeg.h"
 
 /*
@@ -66,11 +70,11 @@
 
     switch ( w->codec_param )
     {
-        case CODEC_ID_MPEG4:
+        case AV_CODEC_ID_MPEG4:
         {
             hb_log("encavcodecInit: MPEG-4 ASP encoder");
         } break;
-        case CODEC_ID_MPEG2VIDEO:
+        case AV_CODEC_ID_MPEG2VIDEO:
         {
             hb_log("encavcodecInit: MPEG-2 encoder");
         } break;
@@ -156,51 +160,21 @@
     context->time_base.num = fps.den;
     context->gop_size  = 10 * (int)( (double)job->vrate / (double)job->vrate_base + 0.5 );
 
-    /*
-        This section passes the string advanced_opts to avutil for parsing 
-        into an AVCodecContext.
-
-        The string is set up like this:
-        option1=value1:option2=value2
-
-        So, you have to iterate through based on the colons, and then put
-        the left side of the equals sign in "name" and the right side into
-        "value." Then you hand those strings off to avutil for interpretation.
-     */
-    AVDictionary *av_opts = NULL;
+    /* place job->advanced_opts in an hb_dict_t for convenience */
+    hb_dict_t * lavc_opts = NULL;
     if( job->advanced_opts != NULL && *job->advanced_opts != '\0' )
     {
-        char *opts, *opts_start;
-
-        opts = opts_start = strdup(job->advanced_opts);
-
-        if( opts_start )
-        {
-            while( *opts )
-            {
-                char *name = opts;
-                char *value;
-
-                opts += strcspn( opts, ":" );
-                if( *opts )
-                {
-                    *opts = 0;
-                    opts++;
-                }
-
-                value = strchr( name, '=' );
-                if( value )
-                {
-                    *value = 0;
-                    value++;
-                }
-
-                /* Here's where the strings are passed to avutil for parsing. */
-                av_dict_set( &av_opts, name, value, 0 );
-            }
-        }
-        free(opts_start);
+        lavc_opts = hb_encopts_to_dict( job->advanced_opts, job->vcodec );
     }
+    /* iterate through lavc_opts and have avutil parse the options for us */
+    AVDictionary * av_opts = NULL;
+    hb_dict_entry_t * entry = NULL;
+    while( ( entry = hb_dict_next( lavc_opts, entry ) ) )
+    {
+        /* Here's where the strings are passed to avutil for parsing. */
+        av_dict_set( &av_opts, entry->key, entry->value, 0 );
+    }
+    hb_dict_free( &lavc_opts );
 
     // Now set the things in context that we don't want to allow
     // the user to override.
@@ -224,7 +198,7 @@
     }
     context->width     = job->width;
     context->height    = job->height;
-    context->pix_fmt   = PIX_FMT_YUV420P;
+    context->pix_fmt   = AV_PIX_FMT_YUV420P;
 
     if( job->anamorphic.mode )
     {
@@ -334,8 +308,8 @@
 static void save_frame_info( hb_work_private_t * pv, hb_buffer_t * in )
 {
     int i = pv->frameno_in & FRAME_INFO_MASK;
-    pv->frame_info[i].start = in->start;
-    pv->frame_info[i].stop = in->stop;
+    pv->frame_info[i].start = in->s.start;
+    pv->frame_info[i].stop = in->s.stop;
 }
 
 static int64_t get_frame_start( hb_work_private_t * pv, int64_t frameno )
@@ -356,7 +330,7 @@
     {
         if ( ( pv->frameno_in - 1 ) == pv->job->areBframes )
         {
-            pv->dts_delay = buf->start;
+            pv->dts_delay = buf->s.start;
             pv->job->config.h264.init_delay = pv->dts_delay;
         }
     }
@@ -401,7 +375,7 @@
             // Note that start Nth frame != start time this buffer since the
             // output buffers have rearranged start times.
             int64_t start = get_frame_start( pv, pv->frameno_out );
-            buf->renderOffset = start - pv->dts_delay;
+            buf->s.renderOffset = start - pv->dts_delay;
             return buf;
         }
         else
@@ -415,7 +389,7 @@
                 // Note that start Nth frame != start time this buffer since the
                 // output buffers have rearranged start times.
                 int64_t start = get_frame_start( pv, pv->frameno_out );
-                buf->renderOffset = start - pv->dts_delay;
+                buf->s.renderOffset = start - pv->dts_delay;
                 buf = buf->next;
             }
             buf = pv->delay_head;
@@ -425,7 +399,7 @@
     }
     else if ( buf )
     {
-        buf->renderOffset = buf->start - pv->dts_delay;
+        buf->s.renderOffset = buf->s.start - pv->dts_delay;
         return buf;
     }
     return NULL;
@@ -453,12 +427,13 @@
     }
 
     frame              = avcodec_alloc_frame();
-    frame->data[0]     = in->data;
-    frame->data[1]     = frame->data[0] + job->width * job->height;
-    frame->data[2]     = frame->data[1] + job->width * job->height / 4;
-    frame->linesize[0] = job->width;
-    frame->linesize[1] = job->width / 2;
-    frame->linesize[2] = job->width / 2;
+    frame->data[0]     = in->plane[0].data;
+    frame->data[1]     = in->plane[1].data;
+    frame->data[2]     = in->plane[2].data;
+    frame->linesize[0] = in->plane[0].stride;
+    frame->linesize[1] = in->plane[1].stride;
+    frame->linesize[2] = in->plane[2].stride;
+
     // For constant quality, setting the quality in AVCodecContext 
     // doesn't do the trick.  It must be set in the AVFrame.
     frame->quality = pv->context->global_quality;
@@ -466,7 +441,7 @@
     // Bizarro ffmpeg appears to require the input AVFrame.pts to be
     // set to a frame number.  Setting it to an actual pts causes
     // jerky video.
-    // frame->pts = in->start;
+    // frame->pts = in->s.start;
     frame->pts = ++pv->frameno_in;
 
     // Remember info about this frame that we need to pass across
@@ -476,67 +451,75 @@
 
     if ( pv->context->codec )
     {
+        int ret;
+        AVPacket pkt;
+        int got_packet;
+
+        av_init_packet(&pkt);
         /* Should be way too large */
         buf = hb_video_buffer_init( job->width, job->height );
-        buf->size = avcodec_encode_video( pv->context, buf->data, buf->alloc,
-                                          frame );
-        if ( buf->size <= 0 )
+        pkt.data = buf->data;
+        pkt.size = buf->alloc;
+
+        ret = avcodec_encode_video2( pv->context, &pkt, frame, &got_packet );
+        if ( ret < 0 || pkt.size <= 0 || !got_packet )
         {
             hb_buffer_close( &buf );
         }
         else
         {
-            int64_t frameno = pv->context->coded_frame->pts;
-            buf->start  = get_frame_start( pv, frameno );
-            buf->stop  = get_frame_stop( pv, frameno );
-            buf->flags &= ~HB_FRAME_REF;
+            int64_t frameno = pkt.pts;
+            buf->size = pkt.size;
+            buf->s.start  = get_frame_start( pv, frameno );
+            buf->s.stop  = get_frame_stop( pv, frameno );
+            buf->s.flags &= ~HB_FRAME_REF;
             switch ( pv->context->coded_frame->pict_type )
             {
                 case AV_PICTURE_TYPE_P:
                 {
-                    buf->frametype = HB_FRAME_P;
+                    buf->s.frametype = HB_FRAME_P;
                 } break;
 
                 case AV_PICTURE_TYPE_B:
                 {
-                    buf->frametype = HB_FRAME_B;
+                    buf->s.frametype = HB_FRAME_B;
                 } break;
 
                 case AV_PICTURE_TYPE_S:
                 {
-                    buf->frametype = HB_FRAME_P;
+                    buf->s.frametype = HB_FRAME_P;
                 } break;
 
                 case AV_PICTURE_TYPE_SP:
                 {
-                    buf->frametype = HB_FRAME_P;
+                    buf->s.frametype = HB_FRAME_P;
                 } break;
 
                 case AV_PICTURE_TYPE_BI:
                 case AV_PICTURE_TYPE_SI:
                 case AV_PICTURE_TYPE_I:
                 {
-                    buf->flags |= HB_FRAME_REF;
-                    if ( pv->context->coded_frame->key_frame )
+                    buf->s.flags |= HB_FRAME_REF;
+                    if ( pkt.flags & AV_PKT_FLAG_KEY )
                     {
-                        buf->frametype = HB_FRAME_IDR;
+                        buf->s.frametype = HB_FRAME_IDR;
                     }
                     else
                     {
-                        buf->frametype = HB_FRAME_I;
+                        buf->s.frametype = HB_FRAME_I;
                     }
                 } break;
 
                 default:
                 {
-                    if ( pv->context->coded_frame->key_frame )
+                    if ( pkt.flags & AV_PKT_FLAG_KEY )
                     {
-                        buf->flags |= HB_FRAME_REF;
-                        buf->frametype = HB_FRAME_KEY;
+                        buf->s.flags |= HB_FRAME_REF;
+                        buf->s.frametype = HB_FRAME_KEY;
                     }
                     else
                     {
-                        buf->frametype = HB_FRAME_REF;
+                        buf->s.frametype = HB_FRAME_REF;
                     }
                 } break;
             }
@@ -556,7 +539,7 @@
         hb_error( "encavcodec: codec context has uninitialized codec; skipping frame" );
     }
 
-    av_free( frame );
+    avcodec_free_frame(&frame);
 
     *buf_out = buf;

HandBrake-0.9.8.tar.bz2/libhb/encavcodecaudio.c -> HandBrake-0.9.9.tar.bz2/libhb/encavcodecaudio.c Changed

@@ -1,13 +1,14 @@
-/* $Id: encavcodeca.c,v 1.23 2005/10/13 23:47:06 titer Exp $
+/* encavcodecaudio.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "hbffmpeg.h"
-#include "downmix.h"
-#include "libavcodec/audioconvert.h"
 
 struct hb_work_private_s
 {
@@ -16,11 +17,13 @@
 
     int              out_discrete_channels;
     int              samples_per_frame;
-    int              layout;
+    unsigned long    max_output_bytes;
     unsigned long    input_samples;
-    unsigned long    output_bytes;
+    uint8_t        * output_buf;
+    uint8_t        * input_buf;
     hb_list_t      * list;
-    uint8_t        * buf;
+
+    AVAudioResampleContext *avresample;
 };
 
 static int  encavcodecaInit( hb_work_object_t *, hb_job_t * );
@@ -36,114 +39,207 @@
     encavcodecaClose
 };
 
-static int encavcodecaInit( hb_work_object_t * w, hb_job_t * job )
+static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job)
 {
-    AVCodec * codec;
-    AVCodecContext * context;
-    hb_audio_t * audio = w->audio;
+    AVCodec *codec;
+    AVCodecContext *context;
+    hb_audio_t *audio = w->audio;
+
+    hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+    w->private_data       = pv;
+    pv->job               = job;
+    pv->list              = hb_list_init();
+
+    // channel count, layout and matrix encoding
+    int matrix_encoding;
+    uint64_t channel_layout   = hb_ff_mixdown_xlat(audio->config.out.mixdown,
+                                                   &matrix_encoding);
+    pv->out_discrete_channels =
+        hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
+
+    // default settings and options
+    AVDictionary *av_opts          = NULL;
+    const char *codec_name         = NULL;
+    enum AVCodecID codec_id        = AV_CODEC_ID_NONE;
+    enum AVSampleFormat sample_fmt = AV_SAMPLE_FMT_FLTP;
+    int bits_per_raw_sample        = 0;
+    int profile                    = FF_PROFILE_UNKNOWN;
+
+    // override with encoder-specific values
+    switch (audio->config.out.codec)
+    {
+        case HB_ACODEC_AC3:
+            codec_id = AV_CODEC_ID_AC3;
+            if (matrix_encoding != AV_MATRIX_ENCODING_NONE)
+                av_dict_set(&av_opts, "dsur_mode", "on", 0);
+            break;
 
-    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
-    w->private_data = pv;
+        case HB_ACODEC_FDK_AAC:
+        case HB_ACODEC_FDK_HAAC:
+            codec_name          = "libfdk_aac";
+            sample_fmt          = AV_SAMPLE_FMT_S16;
+            bits_per_raw_sample = 16;
+            switch (audio->config.out.codec)
+            {
+                case HB_ACODEC_FDK_HAAC:
+                    profile = FF_PROFILE_AAC_HE;
+                    break;
+                default:
+                    profile = FF_PROFILE_AAC_LOW;
+                    break;
+            }
+            // Libav's libfdk-aac wrapper expects back channels for 5.1
+            // audio, and will error out unless we translate the layout
+            if (channel_layout == AV_CH_LAYOUT_5POINT1)
+                channel_layout  = AV_CH_LAYOUT_5POINT1_BACK;
+            break;
 
-    pv->job = job;
+        case HB_ACODEC_FFAAC:
+            codec_name = "aac";
+            av_dict_set(&av_opts, "stereo_mode", "ms_off", 0);
+            break;
 
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
+        case HB_ACODEC_FFFLAC:
+        case HB_ACODEC_FFFLAC24:
+            codec_id = AV_CODEC_ID_FLAC;
+            switch (audio->config.out.codec)
+            {
+                case HB_ACODEC_FFFLAC24:
+                    sample_fmt          = AV_SAMPLE_FMT_S32;
+                    bits_per_raw_sample = 24;
+                    break;
+                default:
+                    sample_fmt          = AV_SAMPLE_FMT_S16;
+                    bits_per_raw_sample = 16;
+                    break;
+            }
+            break;
 
-    codec = avcodec_find_encoder( w->codec_param );
-    if( !codec )
-    {
-        hb_log( "encavcodecaInit: avcodec_find_encoder "
-                "failed" );
-        return 1;
+        default:
+            hb_error("encavcodecaInit: unsupported codec (0x%x)",
+                     audio->config.out.codec);
+            return 1;
     }
-    context = avcodec_alloc_context3(codec);
-
-    AVDictionary *av_opts = NULL;
-    if ( w->codec_param == CODEC_ID_AAC )
+    if (codec_name != NULL)
     {
-        av_dict_set( &av_opts, "stereo_mode", "ms_off", 0 );
+        codec = avcodec_find_encoder_by_name(codec_name);
+        if (codec == NULL)
+        {
+            hb_error("encavcodecaInit: avcodec_find_encoder_by_name(%s) failed",
+                     codec_name);
+            return 1;
+        }
     }
-    if ( w->codec_param == CODEC_ID_AC3 )
+    else
     {
-        if( audio->config.out.mixdown == HB_AMIXDOWN_DOLBY ||
-            audio->config.out.mixdown == HB_AMIXDOWN_DOLBYPLII )
+        codec = avcodec_find_encoder(codec_id);
+        if (codec == NULL)
         {
-            av_dict_set( &av_opts, "dsur_mode", "on", 0 );
+            hb_error("encavcodecaInit: avcodec_find_encoder(%d) failed",
+                     codec_id);
+            return 1;
         }
     }
-
-    context->channel_layout = AV_CH_LAYOUT_STEREO;
-    switch( audio->config.out.mixdown )
+    // allocate the context and apply the settings
+    context                      = avcodec_alloc_context3(codec);
+    hb_ff_set_sample_fmt(context, codec, sample_fmt);
+    context->bits_per_raw_sample = bits_per_raw_sample;
+    context->profile             = profile;
+    context->channel_layout      = channel_layout;
+    context->channels            = pv->out_discrete_channels;
+    context->sample_rate         = audio->config.out.samplerate;
+
+    if (audio->config.out.bitrate > 0)
     {
-        case HB_AMIXDOWN_MONO:
-            context->channel_layout = AV_CH_LAYOUT_MONO;
-            pv->layout = HB_INPUT_CH_LAYOUT_MONO;
-            break;
-
-        case HB_AMIXDOWN_STEREO:
-        case HB_AMIXDOWN_DOLBY:
-        case HB_AMIXDOWN_DOLBYPLII:
-            context->channel_layout = AV_CH_LAYOUT_STEREO;
-            pv->layout = HB_INPUT_CH_LAYOUT_STEREO;
-            break;
-
-        case HB_AMIXDOWN_6CH:
-            context->channel_layout = AV_CH_LAYOUT_5POINT1;
-            pv->layout = HB_INPUT_CH_LAYOUT_3F2R | HB_INPUT_CH_LAYOUT_HAS_LFE;
-            break;
-
-        default:
-            hb_log("encavcodecaInit: bad mixdown" );
-            break;
-    }
-
-    if( audio->config.out.bitrate > 0 )
         context->bit_rate = audio->config.out.bitrate * 1000;
-    else if( audio->config.out.quality >= 0 )
+    }
+    else if (audio->config.out.quality >= 0)
     {
         context->global_quality = audio->config.out.quality * FF_QP2LAMBDA;
         context->flags |= CODEC_FLAG_QSCALE;
     }
 
-    if( audio->config.out.compression_level >= 0 )
+    if (audio->config.out.compression_level >= 0)
+    {
         context->compression_level = audio->config.out.compression_level;
+    }
 
-    context->sample_rate = audio->config.out.samplerate;
-    context->channels = pv->out_discrete_channels;
-    // Try to set format to float.  Fallback to whatever is supported.
-    hb_ff_set_sample_fmt( context, codec );
+    // For some codecs, libav requires the following flag to be set
+    // so that it fills extradata with global header information.
+    // If this flag is not set, it inserts the data into each
+    // packet instead.
+    context->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
-    if( hb_avcodec_open( context, codec, &av_opts, 0 ) )
+    if (hb_avcodec_open(context, codec, &av_opts, 0))
     {
-        hb_log( "encavcodecaInit: avcodec_open failed" );
+        hb_error("encavcodecaInit: hb_avcodec_open() failed");
         return 1;
     }
     // avcodec_open populates the opts dictionary with the
     // things it didn't recognize.
     AVDictionaryEntry *t = NULL;
-    while( ( t = av_dict_get( av_opts, "", t, AV_DICT_IGNORE_SUFFIX ) ) )
+    while ((t = av_dict_get(av_opts, "", t, AV_DICT_IGNORE_SUFFIX)))
     {
-        hb_log( "encavcodecaInit: Unknown avcodec option %s", t->key );
+        hb_log("encavcodecaInit: Unknown avcodec option %s", t->key);
+    }
+    av_dict_free(&av_opts);
+
+    pv->context           = context;
+    audio->config.out.samples_per_frame =
+    pv->samples_per_frame = context->frame_size;
+    pv->input_samples     = context->frame_size * context->channels;
+    pv->input_buf         = malloc(pv->input_samples * sizeof(float));
+    // Some encoders in libav (e.g. fdk-aac) fail if the output buffer
+    // size is not some minumum value.  8K seems to be enough :(
+    pv->max_output_bytes  = MAX(FF_MIN_BUFFER_SIZE,
+                                (pv->input_samples *
+                                 av_get_bytes_per_sample(context->sample_fmt)));
+
+    // sample_fmt conversion
+    if (context->sample_fmt != AV_SAMPLE_FMT_FLT)
+    {
+        pv->output_buf = malloc(pv->max_output_bytes);
+        pv->avresample = avresample_alloc_context();
+        if (pv->avresample == NULL)
+        {
+            hb_error("encavcodecaInit: avresample_alloc_context() failed");
+            return 1;
+        }
+        av_opt_set_int(pv->avresample, "in_sample_fmt",
+                       AV_SAMPLE_FMT_FLT, 0);
+        av_opt_set_int(pv->avresample, "out_sample_fmt",
+                       context->sample_fmt, 0);
+        av_opt_set_int(pv->avresample, "in_channel_layout",
+                       context->channel_layout, 0);
+        av_opt_set_int(pv->avresample, "out_channel_layout",
+                       context->channel_layout, 0);
+        if (hb_audio_dither_is_supported(audio->config.out.codec))
+        {
+            // dithering needs the sample rate
+            av_opt_set_int(pv->avresample, "in_sample_rate",
+                           context->sample_rate, 0);
+            av_opt_set_int(pv->avresample, "out_sample_rate",
+                           context->sample_rate, 0);
+            av_opt_set_int(pv->avresample, "dither_method",
+                           audio->config.out.dither_method, 0);
+        }
+        if (avresample_open(pv->avresample))
+        {
+            hb_error("encavcodecaInit: avresample_open() failed");
+            avresample_free(&pv->avresample);
+            return 1;
+        }
+    }
+    else
+    {
+        pv->avresample = NULL;
+        pv->output_buf = pv->input_buf;
     }
-    av_dict_free( &av_opts );
-
-    pv->context = context;
-
-    audio->config.out.samples_per_frame = pv->samples_per_frame = context->frame_size;
-    pv->input_samples = pv->samples_per_frame * pv->out_discrete_channels;
-
-    // Set a reasonable maximum output size
-    pv->output_bytes = context->frame_size * 
-        av_get_bytes_per_sample(context->sample_fmt) * 
-        context->channels;
-
-    pv->buf = malloc( pv->input_samples * sizeof( float ) );
-
-    pv->list = hb_list_init();
 
-    if ( context->extradata )
+    if (context->extradata != NULL)
     {
-        memcpy( w->config->extradata.bytes, context->extradata, context->extradata_size );
+        memcpy(w->config->extradata.bytes, context->extradata,
+               context->extradata_size);
         w->config->extradata.length = context->extradata_size;
     }
 
@@ -157,127 +253,165 @@
  **********************************************************************/
 // Some encoders (e.g. flac) require a final NULL encode in order to
 // finalize things.
-static void Finalize( hb_work_object_t * w )
+static void Finalize(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
-    hb_buffer_t * buf = hb_buffer_init( pv->output_bytes );
+    hb_work_private_t *pv = w->private_data;
 
     // Finalize with NULL input needed by FLAC to generate md5sum
     // in context extradata
-    avcodec_encode_audio( pv->context, buf->data, buf->alloc, NULL );
-    hb_buffer_close( &buf );
+
+    // Prepare output packet
+    AVPacket pkt;
+    int got_packet;
+    hb_buffer_t *buf = hb_buffer_init(pv->max_output_bytes);
+    av_init_packet(&pkt);
+    pkt.data = buf->data;
+    pkt.size = buf->alloc;
+
+    avcodec_encode_audio2(pv->context, &pkt, NULL, &got_packet);
+    hb_buffer_close(&buf);
 
     // Then we need to recopy the header since it was modified
-    if ( pv->context->extradata )
+    if (pv->context->extradata != NULL)
     {
-        memcpy( w->config->extradata.bytes, pv->context->extradata, pv->context->extradata_size );
+        memcpy(w->config->extradata.bytes, pv->context->extradata,
+               pv->context->extradata_size);
         w->config->extradata.length = pv->context->extradata_size;
     }
 }
 
-static void encavcodecaClose( hb_work_object_t * w )
+static void encavcodecaClose(hb_work_object_t * w)
 {
     hb_work_private_t * pv = w->private_data;
 
-    if ( pv )
+    if (pv != NULL)
     {
-        if( pv->context )
+        if (pv->context != NULL)
+        {
+            Finalize(w);
+            hb_deep_log(2, "encavcodeca: closing libavcodec");
+            if (pv->context->codec != NULL)
+                avcodec_flush_buffers(pv->context);
+            hb_avcodec_close(pv->context);
+        }
+
+        if (pv->output_buf != NULL)
+        {
+            free(pv->output_buf);
+        }
+        if (pv->input_buf != NULL && pv->input_buf != pv->output_buf)
         {
-            Finalize( w );
-            hb_deep_log( 2, "encavcodeca: closing libavcodec" );
-            if ( pv->context->codec )
-                avcodec_flush_buffers( pv->context );
-            hb_avcodec_close( pv->context );
+            free(pv->input_buf);
         }
+        pv->output_buf = pv->input_buf = NULL;
 
-        if ( pv->buf )
+        if (pv->list != NULL)
         {
-            free( pv->buf );
-            pv->buf = NULL;
+            hb_list_empty(&pv->list);
         }
 
-        if ( pv->list )
-            hb_list_empty( &pv->list );
+        if (pv->avresample != NULL)
+        {
+            avresample_free(&pv->avresample);
+        }
 
-        free( pv );
+        free(pv);
         w->private_data = NULL;
     }
 }
 
-static hb_buffer_t * Encode( hb_work_object_t * w )
+static hb_buffer_t* Encode(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
+    hb_work_private_t *pv = w->private_data;
+    hb_audio_t *audio = w->audio;
     uint64_t pts, pos;
-    hb_audio_t * audio = w->audio;
-    hb_buffer_t * buf;
 
-    if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
+    if (hb_list_bytes(pv->list) < pv->input_samples * sizeof(float))
     {
         return NULL;
     }
 
-    hb_list_getbytes( pv->list, pv->buf, pv->input_samples * sizeof( float ),
-                      &pts, &pos);
-
-    // XXX: ffaac fails to remap from the internal libav* channel map (SMPTE) to the native AAC channel map
-    //      do it here - this hack should be removed if Libav fixes the bug
-    hb_chan_map_t * out_map = ( w->codec_param == CODEC_ID_AAC ) ? &hb_qt_chan_map : &hb_smpte_chan_map;
-
-    if ( audio->config.in.channel_map != out_map )
+    hb_list_getbytes(pv->list, pv->input_buf, pv->input_samples * sizeof(float),
+                     &pts, &pos);
+
+    // Prepare input frame
+    int out_linesize;
+    int out_size = av_samples_get_buffer_size(&out_linesize,
+                                              pv->context->channels,
+                                              pv->samples_per_frame,
+                                              pv->context->sample_fmt, 1);
+    AVFrame frame = { .nb_samples = pv->samples_per_frame, };
+    avcodec_fill_audio_frame(&frame,
+                             pv->context->channels, pv->context->sample_fmt,
+                             pv->output_buf, out_size, 1);
+    if (pv->avresample != NULL)
     {
-        hb_layout_remap( audio->config.in.channel_map, out_map, pv->layout,
-                         (float*)pv->buf, pv->samples_per_frame );
+        int in_linesize;
+        av_samples_get_buffer_size(&in_linesize, pv->context->channels,
+                                   frame.nb_samples, AV_SAMPLE_FMT_FLT, 1);
+        int out_samples = avresample_convert(pv->avresample,
+                                             frame.extended_data, out_linesize,
+                                             frame.nb_samples,
+                                             &pv->input_buf,       in_linesize,
+                                             frame.nb_samples);
+        if (out_samples != pv->samples_per_frame)
+        {
+            // we're not doing sample rate conversion, so this shouldn't happen
+            hb_log("encavcodecaWork: avresample_convert() failed");
+            return NULL;
+        }
     }
 
-    // Do we need to convert our internal float format?
-    if ( pv->context->sample_fmt != AV_SAMPLE_FMT_FLT )
+    // Libav requires that timebase of audio frames be in sample_rate units
+    frame.pts = pts + (90000 * pos / (sizeof(float) *
+                                      pv->out_discrete_channels *
+                                      audio->config.out.samplerate));
+    frame.pts = av_rescale(frame.pts, pv->context->sample_rate, 90000);
+
+    // Prepare output packet
+    AVPacket pkt;
+    int got_packet;
+    hb_buffer_t *out = hb_buffer_init(pv->max_output_bytes);
+    av_init_packet(&pkt);
+    pkt.data = out->data;
+    pkt.size = out->alloc;
+
+    // Encode
+    int ret = avcodec_encode_audio2(pv->context, &pkt, &frame, &got_packet);
+    if (ret < 0)
     {
-        int isamp, osamp;
-        AVAudioConvert *ctx;
-
-        isamp = av_get_bytes_per_sample( AV_SAMPLE_FMT_FLT );
-        osamp = av_get_bytes_per_sample( pv->context->sample_fmt );
-        ctx = av_audio_convert_alloc( pv->context->sample_fmt, 1,
-                                      AV_SAMPLE_FMT_FLT, 1,
-                                      NULL, 0 );
-
-        // get output buffer size then malloc a buffer
-        //nsamples = out_size / isamp;
-        //buffer = av_malloc( nsamples * sizeof(hb_sample_t) );
-
-        // we're doing straight sample format conversion which 
-        // behaves as if there were only one channel.
-        const void * const ibuf[6] = { pv->buf };
-        void * const obuf[6] = { pv->buf };
-        const int istride[6] = { isamp };
-        const int ostride[6] = { osamp };
-
-        av_audio_convert( ctx, obuf, ostride, ibuf, istride, pv->input_samples );
-        av_audio_convert_free( ctx );
+        hb_log("encavcodeca: avcodec_encode_audio failed");
+        hb_buffer_close(&out);
+        return NULL;
     }
-    
-    buf = hb_buffer_init( pv->output_bytes );
-    buf->size = avcodec_encode_audio( pv->context, buf->data, buf->alloc,
-                                      (short*)pv->buf );
 
-    buf->start = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
-    buf->stop  = buf->start + 90000 * pv->samples_per_frame / audio->config.out.samplerate;
-
-    buf->frametype = HB_FRAME_AUDIO;
-
-    if ( !buf->size )
+    if (got_packet && pkt.size)
     {
-        hb_buffer_close( &buf );
-        return Encode( w );
+        out->size = pkt.size;
+
+        // The output pts from libav is in context->time_base. Convert it back
+        // to our timebase.
+        //
+        // Also account for the "delay" factor that libav seems to arbitrarily
+        // subtract from the packet.  Not sure WTH they think they are doing by
+        // offsetting the value in a negative direction.
+        out->s.start = av_rescale_q(pv->context->delay + pkt.pts,
+                                    pv->context->time_base,
+                                    (AVRational){1, 90000});
+
+        out->s.stop  = out->s.start + (90000 * pv->samples_per_frame /
+                                       audio->config.out.samplerate);
+
+        out->s.type = AUDIO_BUF;
+        out->s.frametype = HB_FRAME_AUDIO;
     }
-    else if (buf->size < 0)
+    else
     {
-        hb_log( "encavcodeca: avcodec_encode_audio failed" );
-        hb_buffer_close( &buf );
-        return NULL;
+        hb_buffer_close(&out);
+        return Encode(w);
     }
 
-    return buf;
+    return out;
 }
 
 static hb_buffer_t * Flush( hb_work_object_t * w )

HandBrake-0.9.8.tar.bz2/libhb/encfaac.c -> HandBrake-0.9.9.tar.bz2/libhb/encfaac.c Changed

@@ -1,10 +1,14 @@
-/* $Id: encfaac.c,v 1.13 2005/03/03 17:21:57 titer Exp $
+/* encfaac.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
+#include "audio_remap.h"
 
 #include "faac.h"
 
@@ -36,21 +40,6 @@
     encfaacClose
 };
 
-static const int valid_rates[] =
-{
-    22050, 24000, 32000, 44100, 48000, 0
-};
-
-static int find_samplerate( int rate )
-{
-    int i;
-
-    for ( i = 0; valid_rates[i] && rate > valid_rates[i]; ++i )
-    {
-    }
-    return i;
-}
-
 /***********************************************************************
  * hb_work_encfaac_init
  ***********************************************************************
@@ -69,29 +58,7 @@
     pv->job   = job;
 
 	/* pass the number of channels used into the private work data */
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
-
-    /* if the sample rate is 'auto' and that has given us an invalid output */
-    /* rate, map it to the next highest output rate or 48K if above the highest. */
-    int rate_index = find_samplerate(audio->config.out.samplerate);
-    if ( audio->config.out.samplerate != valid_rates[rate_index] )
-    {
-        int rate = valid_rates[valid_rates[rate_index]? rate_index : rate_index - 1];
-        hb_log( "encfaac changing output samplerate from %d to %d",
-                audio->config.out.samplerate, rate );
-        audio->config.out.samplerate = rate;
-
-        /* if the new rate is over the max bandwidth per channel limit */
-        /* lower the bandwidth. */
-        double bw = audio->config.out.bitrate * 1000 / pv->out_discrete_channels;
-        if ( bw > (double)rate * (6144./1024.) )
-        {
-            int newbr = (double)rate * (6.144/1024.) * pv->out_discrete_channels;
-            hb_log( "encfaac changing output bitrate from %d to %d",
-                    audio->config.out.bitrate, newbr );
-            audio->config.out.bitrate = newbr;
-        }
-    }
+    pv->out_discrete_channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
 
     pv->faac = faacEncOpen( audio->config.out.samplerate, pv->out_discrete_channels,
                             &pv->input_samples, &pv->output_bytes );
@@ -106,13 +73,38 @@
     cfg->aacObjectType = LOW;
     cfg->allowMidside  = 1;
 
-	if (pv->out_discrete_channels == 6) {
-		/* we are preserving 5.1 audio into 6-channel AAC,
-		so indicate that we have an lfe channel */
-		cfg->useLfe    = 1;
-	} else {
-		cfg->useLfe    = 0;
-	}
+    /* channel configuration & remapping */
+    uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
+    hb_audio_remap_build_table(&hb_aac_chan_map, audio->config.in.channel_map,
+                               layout, cfg->channel_map);
+
+    switch (audio->config.out.mixdown)
+    {
+        case HB_AMIXDOWN_7POINT1:
+            cfg->channelConfiguration = 0;
+            cfg->numFrontChannels     = 3;
+            cfg->numSideChannels      = 2;
+            cfg->numBackChannels      = 2;
+            cfg->numLFEChannels       = 1;
+            break;
+
+        case HB_AMIXDOWN_6POINT1:
+            cfg->channelConfiguration = 0;
+            cfg->numFrontChannels     = 3;
+            cfg->numSideChannels      = 0;
+            cfg->numBackChannels      = 3;
+            cfg->numLFEChannels       = 1;
+            break;
+
+        case HB_AMIXDOWN_5_2_LFE:
+            cfg->channelConfiguration = 7;
+            break;
+
+        default:
+            cfg->channelConfiguration =
+                hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
+            break;
+    }
 
     cfg->useTns        = 0;
     cfg->bitRate       = audio->config.out.bitrate * 1000 / pv->out_discrete_channels; /* Per channel */
@@ -120,28 +112,6 @@
     cfg->outputFormat  = 0;
     cfg->inputFormat   =  FAAC_INPUT_FLOAT;
 
-    if( ( audio->config.out.mixdown == HB_AMIXDOWN_6CH ) && ( audio->config.in.channel_map != &hb_qt_chan_map ) )
-    {
-        if( audio->config.in.channel_map == &hb_ac3_chan_map )
-        {
-            cfg->channel_map[0] = 2;
-            cfg->channel_map[1] = 1;
-            cfg->channel_map[2] = 3;
-            cfg->channel_map[3] = 4;
-            cfg->channel_map[4] = 5;
-            cfg->channel_map[5] = 0;
-        }
-        else if( audio->config.in.channel_map == &hb_smpte_chan_map )
-        {
-            cfg->channel_map[0] = 2;
-            cfg->channel_map[1] = 0;
-            cfg->channel_map[2] = 1;
-            cfg->channel_map[3] = 4;
-            cfg->channel_map[4] = 5;
-            cfg->channel_map[5] = 3;
-        }
-    }
-
     if( !faacEncSetConfiguration( pv->faac, cfg ) )
     {
         hb_log( "faacEncSetConfiguration failed" );
@@ -231,10 +201,11 @@
         hb_buffer_t * buf = hb_buffer_init( size );
         memcpy( buf->data, pv->obuf, size );
         buf->size = size;
-        buf->start = pv->pts;
+        buf->s.start = pv->pts;
         pv->pts += pv->framedur;
-        buf->stop = pv->pts;
-        buf->frametype   = HB_FRAME_AUDIO;
+        buf->s.stop = pv->pts;
+        buf->s.type = AUDIO_BUF;
+        buf->s.frametype = HB_FRAME_AUDIO;
         return buf;
     }
     return NULL;

HandBrake-0.9.8.tar.bz2/libhb/enclame.c -> HandBrake-0.9.9.tar.bz2/libhb/enclame.c Changed

@@ -1,9 +1,11 @@
-/* $Id: enclame.c,v 1.9 2005/03/05 14:27:05 titer Exp $
+/* enclame.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 #include "hb.h"
 
 #include "lame/lame.h"
@@ -69,7 +71,7 @@
     lame_set_in_samplerate( pv->lame, audio->config.out.samplerate );
     lame_set_out_samplerate( pv->lame, audio->config.out.samplerate );
 
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
+    pv->out_discrete_channels = hb_mixdown_get_discrete_channel_count( audio->config.out.mixdown );
     // Lame's default encoding mode is JOINT_STEREO.  This subtracts signal
     // that is "common" to left and right (within some threshold) and encodes
     // it separately.  This improves quality at low bitrates, but hurts 
@@ -144,14 +146,15 @@
     }
 
     buf        = hb_buffer_init( pv->output_bytes );
-    buf->start = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
-    buf->stop  = buf->start + 90000 * 1152 / audio->config.out.samplerate;
-    pv->pts = buf->stop;
+    buf->s.start = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
+    buf->s.stop  = buf->s.start + 90000 * 1152 / audio->config.out.samplerate;
+    pv->pts = buf->s.stop;
     buf->size  = lame_encode_buffer_float( 
             pv->lame, samples[0], samples[1],
             1152, buf->data, LAME_MAXMP3BUFFER );
 
-    buf->frametype   = HB_FRAME_AUDIO;
+    buf->s.type = AUDIO_BUF;
+    buf->s.frametype = HB_FRAME_AUDIO;
 
     if( !buf->size )
     {
@@ -188,9 +191,12 @@
 
         buf = hb_buffer_init( pv->output_bytes );
         buf->size = lame_encode_flush( pv->lame, buf->data, LAME_MAXMP3BUFFER );
-        buf->start = pv->pts;
-        buf->stop  = buf->start + 90000 * 1152 / audio->config.out.samplerate;
-        buf->frametype   = HB_FRAME_AUDIO;
+        buf->s.start = pv->pts;
+        buf->s.stop  = buf->s.start + 90000 * 1152 / audio->config.out.samplerate;
+
+        buf->s.type = AUDIO_BUF;
+        buf->s.frametype = HB_FRAME_AUDIO;
+
         if( buf->size <= 0 )
         {
             hb_buffer_close( &buf );

HandBrake-0.9.8.tar.bz2/libhb/enctheora.c -> HandBrake-0.9.9.tar.bz2/libhb/enctheora.c Changed

@@ -1,6 +1,11 @@
-/* This file is part of the HandBrake source code.
+/* enctheora.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "theora/codec.h"
@@ -319,16 +324,18 @@
     // Y
     ycbcr[0].width = frame_width;
     ycbcr[0].height = frame_height;
-    ycbcr[0].stride = job->width;
 
     // CbCr decimated by factor of 2 in both width and height
     ycbcr[1].width  = ycbcr[2].width  = (frame_width + 1) / 2;
     ycbcr[1].height = ycbcr[2].height = (frame_height + 1) / 2;
-    ycbcr[1].stride = ycbcr[2].stride = (job->width + 1) / 2;
 
-    ycbcr[0].data = in->data;
-    ycbcr[1].data = ycbcr[0].data + (ycbcr[0].stride * job->height);
-    ycbcr[2].data = ycbcr[1].data + (ycbcr[1].stride * ((job->height+1)/2));
+    ycbcr[0].stride = in->plane[0].stride;
+    ycbcr[1].stride = in->plane[1].stride;
+    ycbcr[2].stride = in->plane[2].stride;
+
+    ycbcr[0].data = in->plane[0].data;
+    ycbcr[1].data = in->plane[1].data;
+    ycbcr[2].data = in->plane[2].data;
 
     th_encode_ycbcr_in( pv->ctx, ycbcr );
 
@@ -358,9 +365,12 @@
     buf = hb_buffer_init( op.bytes + sizeof(op) );
     memcpy(buf->data, &op, sizeof(op));
     memcpy(buf->data + sizeof(op), op.packet, op.bytes);
-    buf->frametype = ( th_packet_iskeyframe(&op) ) ? HB_FRAME_KEY : HB_FRAME_REF;
-    buf->start = in->start;
-    buf->stop  = in->stop;
+    buf->f.fmt = AV_PIX_FMT_YUV420P;
+    buf->f.width = frame_width;
+    buf->f.height = frame_height;
+    buf->s.frametype = ( th_packet_iskeyframe(&op) ) ? HB_FRAME_KEY : HB_FRAME_REF;
+    buf->s.start = in->s.start;
+    buf->s.stop  = in->s.stop;
 
     *buf_out = buf;

HandBrake-0.9.8.tar.bz2/libhb/encvobsub.c -> HandBrake-0.9.9.tar.bz2/libhb/encvobsub.c Changed

HandBrake-0.9.8.tar.bz2/libhb/encvorbis.c -> HandBrake-0.9.9.tar.bz2/libhb/encvorbis.c Changed

@@ -1,10 +1,14 @@
-/* $Id: encvorbis.c,v 1.6 2005/03/05 15:08:32 titer Exp $
+/* encvorbis.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
+#include "audio_remap.h"
 
 #include "vorbis/vorbisenc.h"
 
@@ -25,154 +29,109 @@
 
 struct hb_work_private_s
 {
-    hb_job_t   * job;
+    uint8_t   *buf;
+    hb_job_t  *job;
+    hb_list_t *list;
 
-    vorbis_info        vi;
-    vorbis_comment     vc;
-    vorbis_dsp_state   vd;
-    vorbis_block       vb;
+    vorbis_dsp_state vd;
+    vorbis_comment   vc;
+    vorbis_block     vb;
+    vorbis_info      vi;
 
-    unsigned long   input_samples;
-    uint8_t       * buf;
-    uint64_t        pts;
+    unsigned  input_samples;
+    uint64_t  pts;
+    int64_t   prev_blocksize;
+    int       out_discrete_channels;
 
-    hb_list_t     * list;
-    int           out_discrete_channels;
-    int           channel_map[6];
-    int64_t       prev_blocksize;
+    int       remap_table[8];
 };
 
-int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
+int encvorbisInit(hb_work_object_t *w, hb_job_t *job)
 {
-    hb_audio_t * audio = w->audio;
-    int i;
-    ogg_packet header[3];
-
-    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
+    hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+    hb_audio_t *audio = w->audio;
     w->private_data = pv;
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
+    pv->job = job;
 
-    pv->job   = job;
+    int i;
+    ogg_packet header[3];
 
-    hb_log( "encvorbis: opening libvorbis" );
+    hb_log("encvorbis: opening libvorbis");
 
     /* init */
-    for( i = 0; i < 3; i++ )
+    for (i = 0; i < 3; i++)
     {
         // Zero vorbis headers so that we don't crash in mk_laceXiph
         // when vorbis_encode_setup_managed fails.
-        memset( w->config->vorbis.headers[i], 0, sizeof( ogg_packet ) );
+        memset(w->config->vorbis.headers[i], 0, sizeof(ogg_packet));
     }
-    vorbis_info_init( &pv->vi );
+    vorbis_info_init(&pv->vi);
 
-    if( audio->config.out.bitrate > 0 )
-    {
-        /* 28kbps/channel seems to be the minimum for 6ch vorbis. */
-        int min_bitrate = 28 * pv->out_discrete_channels;
-        if (pv->out_discrete_channels > 2 && audio->config.out.bitrate < min_bitrate)
-        {
-            hb_log( "encvorbis: Selected bitrate (%d kbps) too low for %d channel audio.", audio->config.out.bitrate, pv->out_discrete_channels);
-            hb_log( "encvorbis: Resetting bitrate to %d kbps", min_bitrate);
-            /* Naughty! We shouldn't modify the audio from here. */
-            audio->config.out.bitrate = min_bitrate;
-        }
+    pv->out_discrete_channels =
+        hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
 
-        if( vorbis_encode_setup_managed( &pv->vi, pv->out_discrete_channels,
-              audio->config.out.samplerate, -1, 1000 * audio->config.out.bitrate, -1 ) )
+    if (audio->config.out.bitrate > 0)
+    {
+        if (vorbis_encode_setup_managed(&pv->vi, pv->out_discrete_channels,
+                                        audio->config.out.samplerate, -1,
+                                        audio->config.out.bitrate * 1000, -1))
         {
-            hb_error( "encvorbis: vorbis_encode_setup_managed failed.\n" );
+            hb_error("encvorbis: vorbis_encode_setup_managed() failed");
             *job->die = 1;
             return -1;
         }
     }
-    else if( audio->config.out.quality != HB_INVALID_AUDIO_QUALITY )
+    else if (audio->config.out.quality != HB_INVALID_AUDIO_QUALITY)
     {
         // map VBR quality to Vorbis API (divide by 10)
-        if( vorbis_encode_setup_vbr( &pv->vi, pv->out_discrete_channels,
-              audio->config.out.samplerate, audio->config.out.quality/10 ) )
+        if (vorbis_encode_setup_vbr(&pv->vi, pv->out_discrete_channels,
+                                    audio->config.out.samplerate,
+                                    audio->config.out.quality / 10))
         {
-            hb_error( "encvorbis: vorbis_encode_setup_vbr failed.\n" );
+            hb_error("encvorbis: vorbis_encode_setup_vbr() failed");
             *job->die = 1;
             return -1;
         }
     }
 
-    if( vorbis_encode_ctl( &pv->vi, OV_ECTL_RATEMANAGE2_SET, NULL ) ||
-          vorbis_encode_setup_init( &pv->vi ) )
+    if (vorbis_encode_ctl(&pv->vi, OV_ECTL_RATEMANAGE2_SET, NULL) ||
+        vorbis_encode_setup_init(&pv->vi))
     {
-        hb_error( "encvorbis: vorbis_encode_ctl( ratemanage2_set ) OR vorbis_encode_setup_init failed.\n" );
+        hb_error("encvorbis: vorbis_encode_ctl(ratemanage2_set) OR vorbis_encode_setup_init() failed");
         *job->die = 1;
         return -1;
     }
 
     /* add a comment */
-    vorbis_comment_init( &pv->vc );
-    vorbis_comment_add_tag( &pv->vc, "Encoder", "HandBrake");
-    vorbis_comment_add_tag( &pv->vc, "LANGUAGE", w->config->vorbis.language);
+    vorbis_comment_init(&pv->vc);
+    vorbis_comment_add_tag(&pv->vc, "Encoder", "HandBrake");
+    vorbis_comment_add_tag(&pv->vc, "LANGUAGE", w->config->vorbis.language);
 
     /* set up the analysis state and auxiliary encoding storage */
-    vorbis_analysis_init( &pv->vd, &pv->vi);
-    vorbis_block_init( &pv->vd, &pv->vb);
+    vorbis_analysis_init(&pv->vd, &pv->vi);
+    vorbis_block_init(&pv->vd, &pv->vb);
 
     /* get the 3 headers */
-    vorbis_analysis_headerout( &pv->vd, &pv->vc,
-                               &header[0], &header[1], &header[2] );
-    for( i = 0; i < 3; i++ )
+    vorbis_analysis_headerout(&pv->vd, &pv->vc,
+                              &header[0], &header[1], &header[2]);
+    for (i = 0; i < 3; i++)
     {
-        memcpy( w->config->vorbis.headers[i], &header[i],
-                sizeof( ogg_packet ) );
-        memcpy( w->config->vorbis.headers[i] + sizeof( ogg_packet ),
-                header[i].packet, header[i].bytes );
+        memcpy(w->config->vorbis.headers[i], &header[i], sizeof(ogg_packet));
+        memcpy(w->config->vorbis.headers[i] + sizeof(ogg_packet),
+               header[i].packet, header[i].bytes);
     }
 
     pv->input_samples = pv->out_discrete_channels * OGGVORBIS_FRAME_SIZE;
     audio->config.out.samples_per_frame = OGGVORBIS_FRAME_SIZE;
-    pv->buf = malloc( pv->input_samples * sizeof( float ) );
+    pv->buf = malloc(pv->input_samples * sizeof(float));
 
     pv->list = hb_list_init();
 
-    switch (pv->out_discrete_channels) {
-        case 1:
-            pv->channel_map[0] = 0;
-            break;
-        case 6:
-            // Vorbis uses the following channel map = L C R Ls Rs Lfe
-            if( audio->config.in.channel_map == &hb_ac3_chan_map )
-            {
-                pv->channel_map[0] = 1;
-                pv->channel_map[1] = 2;
-                pv->channel_map[2] = 3;
-                pv->channel_map[3] = 4;
-                pv->channel_map[4] = 5;
-                pv->channel_map[5] = 0;
-            }
-            else if( audio->config.in.channel_map == &hb_smpte_chan_map )
-            {
-                pv->channel_map[0] = 0;
-                pv->channel_map[1] = 2;
-                pv->channel_map[2] = 1;
-                pv->channel_map[3] = 4;
-                pv->channel_map[4] = 5;
-                pv->channel_map[5] = 3;
-            }
-            else // &hb_qt_chan_map
-            {
-                pv->channel_map[0] = 1;
-                pv->channel_map[1] = 0;
-                pv->channel_map[2] = 2;
-                pv->channel_map[3] = 3;
-                pv->channel_map[4] = 4;
-                pv->channel_map[5] = 5;
-            }
-            break;
-        default:
-            hb_log("encvorbis.c: Unable to correctly proccess %d channels, assuming stereo.", pv->out_discrete_channels);
-        case 2:
-            // Assume stereo
-            pv->channel_map[0] = 0;
-            pv->channel_map[1] = 1;
-            break;
-    }
+    // channel remapping
+    uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
+    hb_audio_remap_build_table(&hb_vorbis_chan_map,
+                               audio->config.in.channel_map, layout,
+                               pv->remap_table);
 
     return 0;
 }
@@ -182,20 +141,22 @@
  ***********************************************************************
  *
  **********************************************************************/
-void encvorbisClose( hb_work_object_t * w )
+void encvorbisClose(hb_work_object_t * w)
 {
-    hb_work_private_t * pv = w->private_data;
+    hb_work_private_t *pv = w->private_data;
 
-    vorbis_block_clear( &pv->vb );
-    vorbis_dsp_clear( &pv->vd );
-    vorbis_comment_clear( &pv->vc );
-    vorbis_info_clear( &pv->vi );
+    vorbis_comment_clear(&pv->vc);
+    vorbis_block_clear(&pv->vb);
+    vorbis_info_clear(&pv->vi);
+    vorbis_dsp_clear(&pv->vd);
 
     if (pv->list)
-        hb_list_empty( &pv->list );
+    {
+        hb_list_empty(&pv->list);
+    }
 
-    free( pv->buf );
-    free( pv );
+    free(pv->buf);
+    free(pv);
     w->private_data = NULL;
 }
 
@@ -224,9 +185,12 @@
             memcpy( buf->data + sizeof( ogg_packet ), op.packet,
                     op.bytes );
             blocksize = vorbis_packet_blocksize(&pv->vi, &op);
-            buf->frametype   = HB_FRAME_AUDIO;
-            buf->start = (int64_t)(vorbis_granule_time(&pv->vd, op.granulepos) * 90000);
-            buf->stop  = (int64_t)(vorbis_granule_time(&pv->vd, (pv->prev_blocksize + blocksize)/4 + op.granulepos) * 90000);
+
+            buf->s.type = AUDIO_BUF;
+            buf->s.frametype = HB_FRAME_AUDIO;
+
+            buf->s.start = (int64_t)(vorbis_granule_time(&pv->vd, op.granulepos) * 90000);
+            buf->s.stop  = (int64_t)(vorbis_granule_time(&pv->vd, (pv->prev_blocksize + blocksize)/4 + op.granulepos) * 90000);
             /* The stop time isn't accurate for the first ~3 packets, as the actual blocksize depends on the previous _and_ current packets. */
             pv->prev_blocksize = blocksize;
             return buf;
@@ -241,40 +205,42 @@
  ***********************************************************************
  *
  **********************************************************************/
-static hb_buffer_t * Encode( hb_work_object_t * w )
+static hb_buffer_t* Encode(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
-    hb_buffer_t * buf;
-    float ** buffer;
+    hb_work_private_t *pv = w->private_data;
+    hb_buffer_t *buf;
+    float **buffer;
     int i, j;
 
     /* Try to extract more data */
-    if( ( buf = Flush( w ) ) )
+    if ((buf = Flush(w)) != NULL)
     {
         return buf;
     }
 
-    if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
+    /* Check if we need more data */
+    if (hb_list_bytes(pv->list) < pv->input_samples * sizeof(float))
     {
         return NULL;
     }
 
     /* Process more samples */
-    hb_list_getbytes( pv->list, pv->buf, pv->input_samples * sizeof( float ),
-                      &pv->pts, NULL );
-    buffer = vorbis_analysis_buffer( &pv->vd, OGGVORBIS_FRAME_SIZE );
-    for( i = 0; i < OGGVORBIS_FRAME_SIZE; i++ )
+    hb_list_getbytes(pv->list, pv->buf, pv->input_samples * sizeof(float),
+                     &pv->pts, NULL);
+    buffer = vorbis_analysis_buffer(&pv->vd, OGGVORBIS_FRAME_SIZE);
+    for (i = 0; i < OGGVORBIS_FRAME_SIZE; i++)
     {
-        for( j = 0; j < pv->out_discrete_channels; j++)
+        for (j = 0; j < pv->out_discrete_channels; j++)
         {
-            buffer[j][i] = ((float *) pv->buf)[(pv->out_discrete_channels * i + pv->channel_map[j])];
+            buffer[j][i] = ((float*)pv->buf)[(pv->out_discrete_channels * i +
+                                              pv->remap_table[j])];
         }
     }
 
-    vorbis_analysis_wrote( &pv->vd, OGGVORBIS_FRAME_SIZE );
+    vorbis_analysis_wrote(&pv->vd, OGGVORBIS_FRAME_SIZE);
 
     /* Try to extract again */
-    return Flush( w );
+    return Flush(w);
 }
 
 /***********************************************************************

HandBrake-0.9.8.tar.bz2/libhb/encx264.c -> HandBrake-0.9.9.tar.bz2/libhb/encx264.c Changed

@@ -1,14 +1,17 @@
-/* $Id: encx264.c,v 1.21 2005/11/04 13:09:41 titer Exp $
+/* encx264.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include <stdarg.h>
 
 #include "hb.h"
-
-#include "x264.h"
+#include "hb_dict.h"
+#include "encx264.h"
 
 int  encx264Init( hb_work_object_t *, hb_job_t * );
 int  encx264Work( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
@@ -80,29 +83,20 @@
 
     pv->job = job;
 
-    memset( pv->filename, 0, 1024 );
-    hb_get_tempory_filename( job->h, pv->filename, "x264.log" );
-
     if( x264_param_default_preset( &param, job->x264_preset, job->x264_tune ) < 0 )
     {
         free( pv );
         pv = NULL;
         return 1;
     }
+
+    /* Some HandBrake-specific defaults; users can override them
+     * using the advanced_opts string. */
     
     /* Enable metrics */
     param.analyse.b_psnr = 1;
     param.analyse.b_ssim = 1;
-
-    /* QuickTime has trouble with very low QPs (resulting in visual artifacts).
-     * Known to affect QuickTime 7, QuickTime X and iTunes.
-     * Testing shows that a qpmin of 3 works.
-     */
-    param.rc.i_qp_min = 3;
     
-    param.i_threads    = ( hb_get_cpu_count() * 3 / 2 );
-    param.i_width      = job->width;
-    param.i_height     = job->height;
     if( job->pass == 2 && job->cfr != 1 )
     {
         hb_interjob_t * interjob = hb_interjob_get( job->h );
@@ -126,104 +120,82 @@
         param.i_timebase_den   = 90000;
     }
 
-    /* Disable annexb. Inserts size into nal header instead of start code */
-    param.b_annexb     = 0;
-
-    /* Set min:max keyframe intervals to 1:10 of fps.
-       adjust +0.5 for when fps has remainder to bump
-       { 23.976, 29.976, 59.94 } to { 24, 30, 60 } */
+    /* Set min:max keyframe intervals to 1:10 of fps;
+     * adjust +0.5 for when fps has remainder to bump
+     * { 23.976, 29.976, 59.94 } to { 24, 30, 60 }. */
     param.i_keyint_min = (int)( (double)job->vrate / (double)job->vrate_base + 0.5 );
     param.i_keyint_max = 10 * param.i_keyint_min;
 
     param.i_log_level  = X264_LOG_INFO;
-    
+
     /* set up the VUI color model & gamma to match what the COLR atom
      * set in muxmp4.c says. See libhb/muxmp4.c for notes. */
-    if( job->color_matrix_code == 3 )
+    if( job->color_matrix_code == 4 )
     {
         // Custom
         param.vui.i_colorprim = job->color_prim;
         param.vui.i_transfer  = job->color_transfer;
         param.vui.i_colmatrix = job->color_matrix;
     }
-    else if( ( job->color_matrix_code == 2 ) || 
-             ( job->color_matrix_code == 0 && ( job->title->width >= 1280 || job->title->height >= 720 ) ) )
+    else if( job->color_matrix_code == 3 )
     {
         // ITU BT.709 HD content
-        param.vui.i_colorprim = 1;
-        param.vui.i_transfer  = 1;
-        param.vui.i_colmatrix = 1;
+        param.vui.i_colorprim = HB_COLR_PRI_BT709;
+        param.vui.i_transfer  = HB_COLR_TRA_BT709;
+        param.vui.i_colmatrix = HB_COLR_MAT_BT709;
+    }
+    else if( job->color_matrix_code == 2 )
+    {
+        // ITU BT.601 DVD or SD TV content (PAL)
+        param.vui.i_colorprim = HB_COLR_PRI_EBUTECH;
+        param.vui.i_transfer  = HB_COLR_TRA_BT709;
+        param.vui.i_colmatrix = HB_COLR_MAT_SMPTE170M;
+    }
+    else if( job->color_matrix_code == 1 )
+    {
+        // ITU BT.601 DVD or SD TV content (NTSC)
+        param.vui.i_colorprim = HB_COLR_PRI_SMPTEC;
+        param.vui.i_transfer  = HB_COLR_TRA_BT709;
+        param.vui.i_colmatrix = HB_COLR_MAT_SMPTE170M;
     }
     else
     {
-        // ITU BT.601 DVD or SD TV content
-        param.vui.i_colorprim = 6;
-        param.vui.i_transfer  = 1;
-        param.vui.i_colmatrix = 6;
+        // detected during scan
+        param.vui.i_colorprim = job->title->color_prim;
+        param.vui.i_transfer  = job->title->color_transfer;
+        param.vui.i_colmatrix = job->title->color_matrix;
     }
 
-    /*
-        This section passes the string advanced_opts to libx264 for parsing into
-        parameter names and values.
-
-        The string is set up like this:
-        option1=value1:option2=value 2
-
-        So, you have to iterate through based on the colons, and then put
-        the left side of the equals sign in "name" and the right side into
-        "value." Then you hand those strings off to x264 for interpretation.
-
-        This is all based on the universal x264 option handling Loren
-        Merritt implemented in the Mplayer/Mencoder project.
-     */
-
+    /* place job->advanced_opts in an hb_dict_t for convenience */
+    hb_dict_t * x264_opts = NULL;
     if( job->advanced_opts != NULL && *job->advanced_opts != '\0' )
     {
-        char *x264opts, *x264opts_start;
-
-        x264opts = x264opts_start = strdup(job->advanced_opts);
-
-        while( x264opts_start && *x264opts )
-        {
-            char *name = x264opts;
-            char *value;
-            int ret;
-
-            x264opts += strcspn( x264opts, ":" );
-            if( *x264opts )
-            {
-                *x264opts = 0;
-                x264opts++;
-            }
-
-            value = strchr( name, '=' );
-            if( value )
-            {
-                *value = 0;
-                value++;
-            }
-
-            /* Here's where the strings are passed to libx264 for parsing. */
-            ret = x264_param_parse( &param, name, value );
-
-            /* Let x264 sanity check the options for us*/
-            if( ret == X264_PARAM_BAD_NAME )
-                hb_log( "x264 options: Unknown suboption %s", name );
-            if( ret == X264_PARAM_BAD_VALUE )
-                hb_log( "x264 options: Bad argument %s=%s", name, value ? value : "(null)" );
-        }
-        free(x264opts_start);
+        x264_opts = hb_encopts_to_dict( job->advanced_opts, job->vcodec );
     }
+    /* iterate through x264_opts and have libx264 parse the options for us */
+    int ret;
+    hb_dict_entry_t * entry = NULL;
+    while( ( entry = hb_dict_next( x264_opts, entry ) ) )
+    {
+        /* Here's where the strings are passed to libx264 for parsing. */
+        ret = x264_param_parse( &param, entry->key, entry->value );
+        /* Let x264 sanity check the options for us */
+        if( ret == X264_PARAM_BAD_NAME )
+            hb_log( "x264 options: Unknown suboption %s", entry->key );
+        if( ret == X264_PARAM_BAD_VALUE )
+            hb_log( "x264 options: Bad argument %s=%s", entry->key, entry->value ? entry->value : "(null)" );
+    }
+    hb_dict_free( &x264_opts );
 
     /* Reload colorimetry settings in case custom values were set
      * in the advanced_opts string */
-    job->color_matrix_code = 3;
+    job->color_matrix_code = 4;
     job->color_prim = param.vui.i_colorprim;
     job->color_transfer = param.vui.i_transfer;
     job->color_matrix = param.vui.i_colmatrix;
 
     /* For 25 fps sources, HandBrake's explicit keyints will match the x264 defaults:
-       min-keyint 25 (same as auto), keyint 250 */
+     * min-keyint 25 (same as auto), keyint 250. */
     if( param.i_keyint_min != 25 || param.i_keyint_max != 250 )
     {
         int min_auto;
@@ -245,6 +217,15 @@
         hb_log( "encx264: min-keyint: %s, keyint: %s", min, max );
     }
 
+    /* Settings which can't be overriden in the advanced_opts string
+     * (muxer-specific settings, resolution, ratecontrol, etc.). */
+
+    /* Disable annexb. Inserts size into nal header instead of start code. */
+    param.b_annexb = 0;
+
+    param.i_width  = job->width;
+    param.i_height = job->height;
+
     if( job->anamorphic.mode )
     {
         param.vui.i_sar_width  = job->anamorphic.par_width;
@@ -254,7 +235,6 @@
                 param.vui.i_sar_width, param.vui.i_sar_height );
     }
 
-
     if( job->vquality >= 0 )
     {
         /* Constant RF */
@@ -267,49 +247,64 @@
         /* Average bitrate */
         param.rc.i_rc_method = X264_RC_ABR;
         param.rc.i_bitrate = job->vbitrate;
+        if( job->pass > 0 && job->pass < 3 )
+        {
+            memset( pv->filename, 0, 1024 );
+            hb_get_tempory_filename( job->h, pv->filename, "x264.log" );
+        }
         switch( job->pass )
         {
             case 1:
-                param.rc.b_stat_write  = 1;
+                param.rc.b_stat_read  = 0;
+                param.rc.b_stat_write = 1;
                 param.rc.psz_stat_out = pv->filename;
                 break;
             case 2:
-                param.rc.b_stat_read = 1;
-                param.rc.psz_stat_in = pv->filename;
+                param.rc.b_stat_read  = 1;
+                param.rc.b_stat_write = 0;
+                param.rc.psz_stat_in  = pv->filename;
                 break;
         }
     }
 
-    /* Apply profile settings after explicit settings, if present. */
-    if( job->x264_profile )
+    /* Apply profile and level settings last, if present. */
+    if (job->h264_profile != NULL && *job->h264_profile)
     {
-        if( x264_param_apply_profile( &param, job->x264_profile ) < 0 )
+        if (hb_apply_h264_profile(&param, job->h264_profile, 1))
         {
-            free( pv );
+            free(pv);
+            pv = NULL;
+            return 1;
+        }
+    }
+    if (job->h264_level != NULL && *job->h264_level)
+    {
+        if (hb_apply_h264_level(&param, job->h264_level,
+                                job->h264_profile, 1) < 0)
+        {
+            free(pv);
             pv = NULL;
             return 1;
         }
     }
 
-    /* B-frames are on by default.*/
-    job->areBframes = 1;
-    
-    if( param.i_bframe && param.i_bframe_pyramid )
+    /* Turbo first pass */
+    if( job->pass == 1 && job->fastfirstpass == 1 )
     {
-        /* Note b-pyramid here, so the initial delay can be doubled */
-        job->areBframes = 2;
+        x264_param_apply_fastfirstpass( &param );
     }
-    else if( !param.i_bframe )
+
+    /* B-pyramid is enabled by default. */
+    job->areBframes = 2;
+    
+    if( !param.i_bframe )
     {
-        /*
-         When B-frames are enabled, the max frame count increments
-         by 1 (regardless of the number of B-frames). If you don't
-         change the duration of the video track when you mux, libmp4
-         barfs.  So, check if the x264opts aren't using B-frames, and
-         when they aren't, set the boolean job->areBframes as false.
-         */
         job->areBframes = 0;
     }
+    else if( !param.i_bframe_pyramid )
+    {
+        job->areBframes = 1;
+    }
     
     hb_deep_log( 2, "encx264: opening libx264 (pass %d)", job->pass );
     pv->x264 = x264_encoder_open( &param );
@@ -335,14 +330,13 @@
 
     pv->pic_in.img.i_csp = X264_CSP_I420;
     pv->pic_in.img.i_plane = 3;
-    pv->pic_in.img.i_stride[0] = job->width;
-    pv->pic_in.img.i_stride[2] = pv->pic_in.img.i_stride[1] = ( ( job->width + 1 ) >> 1 );
 
     if( job->grayscale )
     {
-        int uvsize = ( (job->width + 1) >> 1 ) * ( (job->height + 1) >> 1 );
-        pv->grey_data = malloc( uvsize );
-        memset( pv->grey_data, 0x80, uvsize );
+        int uvsize = (hb_image_stride(AV_PIX_FMT_YUV420P, job->width,  1) *
+                      hb_image_height(AV_PIX_FMT_YUV420P, job->height, 1));
+        pv->grey_data = malloc(uvsize);
+        memset(pv->grey_data, 0x80, uvsize);
         pv->pic_in.img.plane[1] = pv->pic_in.img.plane[2] = pv->grey_data;
     }
 
@@ -372,8 +366,8 @@
  */
 static void save_frame_info( hb_work_private_t * pv, hb_buffer_t * in )
 {
-    int i = (in->start >> FRAME_INFO_MAX2) & FRAME_INFO_MASK;
-    pv->frame_info[i].duration = in->stop - in->start;
+    int i = (in->s.start >> FRAME_INFO_MAX2) & FRAME_INFO_MASK;
+    pv->frame_info[i].duration = in->s.stop - in->s.start;
 }
 
 static int64_t get_frame_duration( hb_work_private_t * pv, int64_t pts )
@@ -392,13 +386,13 @@
     /* Should be way too large */
     buf = hb_video_buffer_init( job->width, job->height );
     buf->size = 0;
-    buf->frametype = 0;
+    buf->s.frametype = 0;
 
     // use the pts to get the original frame's duration.
     int64_t duration  = get_frame_duration( pv, pic_out->i_pts );
-    buf->start = pic_out->i_pts;
-    buf->stop  = pic_out->i_pts + duration;
-    buf->renderOffset = pic_out->i_dts;
+    buf->s.start = pic_out->i_pts;
+    buf->s.stop  = pic_out->i_pts + duration;
+    buf->s.renderOffset = pic_out->i_dts;
     if ( !w->config->h264.init_delay && pic_out->i_dts < 0 )
     {
         w->config->h264.init_delay = -pic_out->i_dts;
@@ -444,47 +438,47 @@
                 break;
 
             case X264_TYPE_I:
-                buf->frametype = HB_FRAME_I;
+                buf->s.frametype = HB_FRAME_I;
                 break;
 
             case X264_TYPE_P:
-                buf->frametype = HB_FRAME_P;
+                buf->s.frametype = HB_FRAME_P;
                 break;
 
             case X264_TYPE_B:
-                buf->frametype = HB_FRAME_B;
+                buf->s.frametype = HB_FRAME_B;
                 break;
 
         /*  This is for b-pyramid, which has reference b-frames
             However, it doesn't seem to ever be used... */
             case X264_TYPE_BREF:
-                buf->frametype = HB_FRAME_BREF;
+                buf->s.frametype = HB_FRAME_BREF;
                 break;
 
             // If it isn't the above, what type of frame is it??
             default:
-                buf->frametype = 0;
+                buf->s.frametype = 0;
                 break;
         }
 
         /* Since libx264 doesn't tell us when b-frames are
            themselves reference frames, figure it out on our own. */
-        if( (buf->frametype == HB_FRAME_B) &&
+        if( (buf->s.frametype == HB_FRAME_B) &&
             (nal[i].i_ref_idc != NAL_PRIORITY_DISPOSABLE) )
-            buf->frametype = HB_FRAME_BREF;
+            buf->s.frametype = HB_FRAME_BREF;
 
         /* Expose disposable bit to muxer. */
         if( nal[i].i_ref_idc == NAL_PRIORITY_DISPOSABLE )
-            buf->flags &= ~HB_FRAME_REF;
+            buf->s.flags &= ~HB_FRAME_REF;
         else
-            buf->flags |= HB_FRAME_REF;
+            buf->s.flags |= HB_FRAME_REF;
 
         // PIR has no IDR frames, but x264 marks recovery points
         // as keyframes.  So fake an IDR at these points. This flag
         // is also set for real IDR frames.
         if( pic_out->b_keyframe )
         {
-            buf->frametype = HB_FRAME_IDR;
+            buf->s.frametype = HB_FRAME_IDR;
             /* if we have a chapter marker pending and this
                frame's presentation time stamp is at or after
                the marker's time stamp, use this as the
@@ -492,7 +486,7 @@
             if( pv->next_chap != 0 && pv->next_chap <= pic_out->i_pts )
             {
                 pv->next_chap = 0;
-                buf->new_chap = pv->chap_mark;
+                buf->s.new_chap = pv->chap_mark;
             }
         }
 
@@ -513,16 +507,17 @@
     hb_job_t *job = pv->job;
 
     /* Point x264 at our current buffers Y(UV) data.  */
-    pv->pic_in.img.plane[0] = in->data;
-
-    int uvsize = ( (job->width + 1) >> 1 ) * ( (job->height + 1) >> 1 );
+    pv->pic_in.img.i_stride[0] = in->plane[0].stride;
+    pv->pic_in.img.i_stride[1] = in->plane[1].stride;
+    pv->pic_in.img.i_stride[2] = in->plane[2].stride;
+    pv->pic_in.img.plane[0] = in->plane[0].data;
     if( !job->grayscale )
     {
-        /* Point x264 at our buffers (Y)UV data */
-        pv->pic_in.img.plane[1] = in->data + job->width * job->height;
-        pv->pic_in.img.plane[2] = pv->pic_in.img.plane[1] + uvsize;
+        pv->pic_in.img.plane[1] = in->plane[1].data;
+        pv->pic_in.img.plane[2] = in->plane[2].data;
     }
-    if( in->new_chap && job->chapter_markers )
+
+    if( in->s.new_chap && job->chapter_markers )
     {
         /* chapters have to start with an IDR frame so request that this
            frame be coded as IDR. Since there may be up to 16 frames
@@ -532,11 +527,11 @@
         pv->pic_in.i_type = X264_TYPE_IDR;
         if( pv->next_chap == 0 )
         {
-            pv->next_chap = in->start;
-            pv->chap_mark = in->new_chap;
+            pv->next_chap = in->s.start;
+            pv->chap_mark = in->s.new_chap;
         }
         /* don't let 'work_loop' put a chapter mark on the wrong buffer */
-        in->new_chap = 0;
+        in->s.new_chap = 0;
     }
     else
     {
@@ -548,19 +543,19 @@
      * frame stream with the current frame's start time equal to the
      * previous frame's stop time.
      */
-    if( pv->last_stop != in->start )
+    if( pv->last_stop != in->s.start )
     {
         hb_log("encx264 input continuity err: last stop %"PRId64"  start %"PRId64,
-                pv->last_stop, in->start);
+                pv->last_stop, in->s.start);
     }
-    pv->last_stop = in->stop;
+    pv->last_stop = in->s.stop;
 
     // Remember info about this frame that we need to pass across
     // the x264_encoder_encode call (since it reorders frames).
     save_frame_info( pv, in );
 
     /* Feed the input PTS to x264 so it can figure out proper output PTS */
-    pv->pic_in.i_pts = in->start;
+    pv->pic_in.i_pts = in->s.start;
 
     x264_picture_t pic_out;
     int i_nal;
@@ -627,6 +622,1003 @@
     return HB_WORK_OK;
 }
 
+int hb_apply_h264_profile(x264_param_t *param, const char *h264_profile,
+                          int verbose)
+{
+    if (h264_profile != NULL &&
+        strcasecmp(h264_profile, hb_h264_profile_names[0]) != 0)
+    {
+        /*
+         * baseline profile doesn't support interlacing
+         */
+        if ((param->b_interlaced ||
+             param->b_fake_interlaced) &&
+            !strcasecmp(h264_profile, "baseline"))
+        {
+            if (verbose)
+            {
+                hb_log("hb_apply_h264_profile [warning]: baseline profile doesn't support interlacing, disabling");
+            }
+            param->b_interlaced = param->b_fake_interlaced = 0;
+        }
+        /*
+         * lossless requires High 4:4:4 Predictive profile
+         */
+        if (param->rc.f_rf_constant < 1.0 &&
+            param->rc.i_rc_method == X264_RC_CRF &&
+            strcasecmp(h264_profile, "high444") != 0)
+        {
+            if (verbose)
+            {
+                hb_log("hb_apply_h264_profile [warning]: lossless requires high444 profile, disabling");
+            }
+            param->rc.f_rf_constant = 1.0;
+        }
+        if (!strcasecmp(h264_profile, "high10") ||
+            !strcasecmp(h264_profile, "high422"))
+        {
+            // arbitrary profile names may be specified via the CLI
+            // map unsupported high10 and high422 profiles to high
+            return x264_param_apply_profile(param, "high");
+        }
+        return x264_param_apply_profile(param, h264_profile);
+    }
+    else if (!strcasecmp(h264_profile, hb_h264_profile_names[0]))
+    {
+        // "auto", do nothing
+        return 0;
+    }
+    else
+    {
+        // error (profile not a string), abort
+        hb_error("hb_apply_h264_profile: no profile specified");
+        return -1;
+    }
+}
+
+int hb_check_h264_level(const char *h264_level, int width, int height,
+                        int fps_num, int fps_den, int interlaced,
+                        int fake_interlaced)
+{
+    x264_param_t param;
+    x264_param_default(&param);
+    param.i_width           = width;
+    param.i_height          = height;
+    param.i_fps_num         = fps_num;
+    param.i_fps_den         = fps_den;
+    param.b_interlaced      = !!interlaced;
+    param.b_fake_interlaced = !!fake_interlaced;
+    return (hb_apply_h264_level(&param, h264_level, NULL, 0) != 0);
+}
+
+int hb_apply_h264_level(x264_param_t *param, const char *h264_level,
+                        const char *h264_profile, int verbose)
+{
+    float f_framerate;
+    const x264_level_t *x264_level = NULL;
+    int i, i_mb_size, i_mb_rate, i_mb_width, i_mb_height, max_mb_side, ret;
+
+    /*
+     * find the x264_level_t corresponding to the requested level
+     */
+    if (h264_level != NULL &&
+        strcasecmp(h264_level, hb_h264_level_names[0]) != 0)
+    {
+        for (i = 0; hb_h264_level_values[i]; i++)
+        {
+            if (!strcmp(hb_h264_level_names[i], h264_level))
+            {
+                int val = hb_h264_level_values[i];
+                for (i = 0; x264_levels[i].level_idc; i++)
+                {
+                    if (x264_levels[i].level_idc == val)
+                    {
+                        x264_level = &x264_levels[i];
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+        if (x264_level == NULL)
+        {
+            // error (invalid or unsupported level), abort
+            hb_error("hb_apply_h264_level: invalid level %s", h264_level);
+            return -1;
+        }
+    }
+    else if(!strcasecmp(h264_level, hb_h264_level_names[0]))
+    {
+        // "auto", do nothing
+        return 0;
+    }
+    else
+    {
+        // error (level not a string), abort
+        hb_error("hb_apply_h264_level: no level specified");
+        return -1;
+    }
+
+    /*
+     * the H.264 profile determines VBV constraints
+     */
+    enum
+    {
+        // Main or Baseline (equivalent)
+        HB_ENCX264_PROFILE_MAIN,
+        // High (no 4:2:2 or 10-bit support, so anything lossy is equivalent)
+        HB_ENCX264_PROFILE_HIGH,
+        // Lossless (4:2:0 8-bit for now)
+        HB_ENCX264_PROFILE_HIGH444,
+    } hb_encx264_profile;
+
+    /*
+     * H.264 profile
+     *
+     * TODO: we need to guess the profile like x264_sps_init does, otherwise
+     * we'll get an error when setting a Main-incompatible VBV and
+     * x264_sps_init() guesses Main profile. x264_sps_init() may eventually take
+     * VBV into account when guessing profile, at which point this code can be
+     * re-enabled.
+     */
+#if 0
+    if (h264_profile != NULL && *h264_profile)
+    {
+        // if the user explicitly specified a profile, don't guess it
+        if (!strcasecmp(h264_profile, "high444"))
+        {
+            hb_encx264_profile = HB_ENCX264_PROFILE_HIGH444;
+        }
+        else if (!strcasecmp(h264_profile, "main") ||
+                 !strcasecmp(h264_profile, "baseline"))
+        {
+            hb_encx264_profile = HB_ENCX264_PROFILE_MAIN;
+        }
+        else
+        {
+            hb_encx264_profile = HB_ENCX264_PROFILE_HIGH;
+        }
+    }
+    else
+#endif
+    {
+        // guess the H.264 profile if the user didn't request one
+        if (param->rc.i_rc_method == X264_RC_CRF &&
+            param->rc.f_rf_constant < 1.0)
+        {
+            hb_encx264_profile = HB_ENCX264_PROFILE_HIGH444;
+        }
+        else if (param->analyse.b_transform_8x8 ||
+                 param->i_cqm_preset != X264_CQM_FLAT)
+        {
+            hb_encx264_profile = HB_ENCX264_PROFILE_HIGH;
+        }
+        else
+        {
+            hb_encx264_profile = HB_ENCX264_PROFILE_MAIN;
+        }
+    }
+
+    /*
+     * we need at least width and height in order to apply a level correctly
+     */
+    if (param->i_width <= 0 || param->i_height <= 0)
+    {
+        // error (invalid width or height), abort
+        hb_error("hb_apply_h264_level: invalid resolution (width: %d, height: %d)",
+                 param->i_width, param->i_height);
+        return -1;
+    }
+
+    /*
+     * a return value of 1 means there were warnings
+     */
+    ret = 0;
+
+    /*
+     * some levels do not support interlaced encoding
+     */
+    if (x264_level->frame_only && (param->b_interlaced ||
+                                   param->b_fake_interlaced))
+    {
+        if (verbose)
+        {
+            hb_log("hb_apply_h264_level [warning]: interlaced flag not supported for level %s, disabling",
+                   h264_level);
+        }
+        ret = 1;
+        param->b_interlaced = param->b_fake_interlaced = 0;
+    }
+
+    /*
+     * frame dimensions and rate (in macroblocks)
+     */
+    i_mb_width  = (param->i_width  + 15) / 16;
+    i_mb_height = (param->i_height + 15) / 16;
+    if (param->b_interlaced || param->b_fake_interlaced)
+    {
+        // interlaced: encoded height must divide cleanly by 32
+        i_mb_height = (i_mb_height + 1) & ~1;
+    }
+    i_mb_size = i_mb_width * i_mb_height;
+    if (param->i_fps_den <= 0 || param->i_fps_num <= 0)
+    {
+        i_mb_rate   = 0;
+        f_framerate = 0.0;
+    }
+    else
+    {
+        i_mb_rate   = (int64_t)i_mb_size * param->i_fps_num / param->i_fps_den;
+        f_framerate = (float)param->i_fps_num / param->i_fps_den;
+    }
+
+    /*
+     * sanitize ref/frameref
+     */
+    if (param->i_keyint_max != 1)
+    {
+        int i_max_dec_frame_buffering =
+            MAX(MIN(x264_level->dpb / i_mb_size, 16), 1);
+        param->i_frame_reference =
+            MIN(i_max_dec_frame_buffering, param->i_frame_reference);
+        /*
+         * some level and resolution combos may require as little as 1 ref;
+         * bframes and b-pyramid are not compatible with this scenario
+         */
+        if (i_max_dec_frame_buffering < 2)
+        {
+            param->i_bframe = 0;
+        }
+        else if (i_max_dec_frame_buffering < 4)
+        {
+            param->i_bframe_pyramid = X264_B_PYRAMID_NONE;
+        }
+    }
+
+    /*
+     * set and/or sanitize the VBV (if not lossless)
+     */
+    if (hb_encx264_profile != HB_ENCX264_PROFILE_HIGH444)
+    {
+        // High profile allows for higher VBV bufsize/maxrate
+        int cbp_factor = hb_encx264_profile == HB_ENCX264_PROFILE_HIGH ? 5 : 4;
+        if (!param->rc.i_vbv_max_bitrate)
+        {
+            param->rc.i_vbv_max_bitrate = (x264_level->bitrate * cbp_factor) / 4;
+        }
+        else
+        {
+            param->rc.i_vbv_max_bitrate =
+                MIN(param->rc.i_vbv_max_bitrate,
+                    (x264_level->bitrate * cbp_factor) / 4);
+        }
+        if (!param->rc.i_vbv_buffer_size)
+        {
+            param->rc.i_vbv_buffer_size = (x264_level->cpb * cbp_factor) / 4;
+        }
+        else
+        {
+            param->rc.i_vbv_buffer_size =
+                MIN(param->rc.i_vbv_buffer_size,
+                    (x264_level->cpb * cbp_factor) / 4);
+        }
+    }
+
+    /*
+     * sanitize mvrange/mv-range
+     */
+    param->analyse.i_mv_range =
+        MIN(param->analyse.i_mv_range,
+            x264_level->mv_range >> !!param->b_interlaced);
+
+    /*
+     * TODO: check the rest of the limits
+     */
+
+    /*
+     * things we can do nothing about (too late to change resolution or fps),
+     * print warnings if we're not being quiet
+     */
+    if (x264_level->frame_size < i_mb_size)
+    {
+        if (verbose)
+        {
+            hb_log("hb_apply_h264_level [warning]: frame size (%dx%d, %d macroblocks) too high for level %s (max. %d macroblocks)",
+                   i_mb_width * 16, i_mb_height * 16, i_mb_size, h264_level,
+                   x264_level->frame_size);
+        }
+        ret = 1;
+    }
+    else if (x264_level->mbps < i_mb_rate)
+    {
+        if (verbose)
+        {
+            hb_log("hb_apply_h264_level [warning]: framerate (%.3f) too high for level %s at %dx%d (max. %.3f)",
+                   f_framerate, h264_level, param->i_width, param->i_height,
+                   (float)x264_level->mbps / i_mb_size);
+        }
+        ret = 1;
+    }
+    /*
+     * width or height squared may not exceed 8 * frame_size (in macroblocks)
+     * thus neither dimension may exceed sqrt(8 * frame_size)
+     */
+    max_mb_side = sqrt(x264_level->frame_size * 8);
+    if (i_mb_width > max_mb_side)
+    {
+        if (verbose)
+        {
+            hb_log("hb_apply_h264_level [warning]: frame too wide (%d) for level %s (max. %d)",
+                   param->i_width, h264_level, max_mb_side * 16);
+        }
+        ret = 1;
+    }
+    if (i_mb_height > max_mb_side)
+    {
+        if (verbose)
+        {
+            hb_log("hb_apply_h264_level [warning]: frame too tall (%d) for level %s (max. %d)",
+                   param->i_height, h264_level, max_mb_side * 16);
+        }
+        ret = 1;
+    }
+
+    /*
+     * level successfully applied, yay!
+     */
+    param->i_level_idc = x264_level->level_idc;
+    return ret;
+}
+
+char * hb_x264_param_unparse(const char *x264_preset,  const char *x264_tune,
+                             const char *x264_encopts, const char *h264_profile,
+                             const char *h264_level, int width, int height)
+{
+    int i;
+    char buf[32];
+    char *unparsed_opts;
+    hb_dict_t *x264_opts;
+    hb_dict_entry_t *entry;
+    x264_param_t defaults, param;
+
+    /*
+     * get the global x264 defaults (what we compare against)
+     */
+    x264_param_default(&defaults);
+
+    /*
+     * apply the defaults, preset and tune
+     */
+    if (x264_param_default_preset(&param, x264_preset, x264_tune) < 0)
+    {
+        /*
+         * Note: GUIs should be able to always specifiy valid preset/tunes, so
+         *       this code will hopefully never be reached
+         */
+        return strdup("hb_x264_param_unparse: invalid x264 preset/tune");
+    }
+
+    /*
+     * place additional x264 options in a dictionary
+     */
+    entry     = NULL;
+    x264_opts = hb_encopts_to_dict(x264_encopts, HB_VCODEC_X264);
+
+    /*
+     * some libx264 options are set via dedicated widgets in the video tab or
+     * hardcoded in libhb, and have no effect when present in the advanced x264
+     * options string.
+     *
+     * clear them from x264_opts so as to not apply then during unparse.
+     */
+    hb_dict_unset(&x264_opts, "qp");
+    hb_dict_unset(&x264_opts, "qp_constant");
+    hb_dict_unset(&x264_opts, "crf");
+    hb_dict_unset(&x264_opts, "bitrate");
+    hb_dict_unset(&x264_opts, "fps");
+    hb_dict_unset(&x264_opts, "force-cfr");
+    hb_dict_unset(&x264_opts, "sar");
+    hb_dict_unset(&x264_opts, "annexb");
+
+    /*
+     * apply the additional x264 options
+     */
+    while ((entry = hb_dict_next(x264_opts, entry)) != NULL)
+    {
+        // let's not pollute GUI logs with x264_param_parse return codes
+        x264_param_parse(&param, entry->key, entry->value);
+    }
+
+    /*
+     * apply the x264 profile, if specified
+     */
+    if (h264_profile != NULL && *h264_profile)
+    {
+        // be quiet so at to not pollute GUI logs
+        hb_apply_h264_profile(&param, h264_profile, 0);
+    }
+
+    /*
+     * apply the h264 level, if specified
+     */
+    if (h264_level != NULL && *h264_level)
+    {
+        // set width/height to avoid issues in hb_apply_h264_level
+        param.i_width  = width;
+        param.i_height = height;
+        // be quiet so at to not pollute GUI logs
+        hb_apply_h264_level(&param, h264_level, h264_profile, 0);
+    }
+
+    /*
+     * if x264_encopts is NULL, x264_opts wasn't initialized
+     */
+    if (x264_opts == NULL && (x264_opts = hb_dict_init(20)) == NULL)
+    {
+        return strdup("hb_x264_param_unparse: could not initialize hb_dict_t");
+    }
+
+    /*
+     * x264 lets you specify some options in multiple ways. For options that we
+     * do unparse, clear the forms that don't match how we unparse said option
+     * from the x264_opts dictionary.
+     *
+     * actual synonyms are already handled by hb_encopts_to_dict().
+     *
+     * "no-deblock" is a special case as it can't be unparsed to "deblock=0"
+     *
+     * also, don't bother with forms that aren't allowed by the x264 CLI, such
+     * as "no-bframes" - there are too many.
+     */
+    hb_dict_unset(&x264_opts, "no-sliced-threads");
+    hb_dict_unset(&x264_opts, "no-scenecut");
+    hb_dict_unset(&x264_opts, "no-b-adapt");
+    hb_dict_unset(&x264_opts, "no-weightb");
+    hb_dict_unset(&x264_opts, "no-cabac");
+    hb_dict_unset(&x264_opts, "interlaced"); // we unparse to tff/bff
+    hb_dict_unset(&x264_opts, "no-interlaced");
+    hb_dict_unset(&x264_opts, "no-8x8dct");
+    hb_dict_unset(&x264_opts, "no-mixed-refs");
+    hb_dict_unset(&x264_opts, "no-fast-pskip");
+    hb_dict_unset(&x264_opts, "no-dct-decimate");
+    hb_dict_unset(&x264_opts, "no-psy");
+    hb_dict_unset(&x264_opts, "no-mbtree");
+
+    /*
+     * compare defaults to param and unparse to the x264_opts dictionary
+     */
+    if (!param.b_sliced_threads != !defaults.b_sliced_threads)
+    {
+        // can be modified by: tune zerolatency
+        sprintf(buf, "%d", !!param.b_sliced_threads);
+        hb_dict_set(&x264_opts, "sliced-threads", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "sliced-threads");
+    }
+    if (param.i_sync_lookahead != defaults.i_sync_lookahead)
+    {
+        // can be modified by: tune zerolatency
+        sprintf(buf, "%d", param.i_sync_lookahead);
+        hb_dict_set(&x264_opts, "sync-lookahead", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "sync-lookahead");
+    }
+    if (param.i_level_idc != defaults.i_level_idc)
+    {
+        // can be modified by: level
+        for (i = 0; hb_h264_level_values[i]; i++)
+            if (param.i_level_idc == hb_h264_level_values[i])
+                hb_dict_set(&x264_opts, "level", hb_h264_level_names[i]);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "level");
+    }
+    if (param.i_frame_reference != defaults.i_frame_reference)
+    {
+        // can be modified by: presets, tunes, level
+        sprintf(buf, "%d", param.i_frame_reference);
+        hb_dict_set(&x264_opts, "ref", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "ref");
+    }
+    if (param.i_scenecut_threshold != defaults.i_scenecut_threshold)
+    {
+        // can be modified by: preset ultrafast
+        sprintf(buf, "%d", param.i_scenecut_threshold);
+        hb_dict_set(&x264_opts, "scenecut", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "scenecut");
+    }
+    if (param.i_bframe != defaults.i_bframe)
+    {
+        // can be modified by: presets, tunes, profile, level
+        sprintf(buf, "%d", param.i_bframe);
+        hb_dict_set(&x264_opts, "bframes", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "bframes");
+    }
+    if (param.i_bframe > 0)
+    {
+        if (param.i_bframe_adaptive != defaults.i_bframe_adaptive)
+        {
+            // can be modified by: presets
+            sprintf(buf, "%d", param.i_bframe_adaptive);
+            hb_dict_set(&x264_opts, "b-adapt", buf);
+        }
+        else
+        {
+            hb_dict_unset(&x264_opts, "b-adapt");
+        }
+        if (param.i_bframe > 1 &&
+            param.i_bframe_pyramid != defaults.i_bframe_pyramid)
+        {
+            // can be modified by: level
+            if (param.i_bframe_pyramid < X264_B_PYRAMID_NONE)
+                param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
+            if (param.i_bframe_pyramid > X264_B_PYRAMID_NORMAL)
+                param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL;
+            for (i = 0; x264_b_pyramid_names[i] != NULL; i++)
+                if (param.i_bframe_pyramid == i)
+                    hb_dict_set(&x264_opts, "b-pyramid",
+                                x264_b_pyramid_names[i]);
+        }
+        else
+        {
+            hb_dict_unset(&x264_opts, "b-pyramid");
+        }
+        if (param.analyse.i_direct_mv_pred != defaults.analyse.i_direct_mv_pred)
+        {
+            // can be modified by: presets
+            if (param.analyse.i_direct_mv_pred < X264_DIRECT_PRED_NONE)
+                param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_NONE;
+            if (param.analyse.i_direct_mv_pred > X264_DIRECT_PRED_AUTO)
+                param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
+            for (i = 0; x264_direct_pred_names[i] != NULL; i++)
+                if (param.analyse.i_direct_mv_pred == i)
+                    hb_dict_set(&x264_opts, "direct",
+                                x264_direct_pred_names[i]);
+        }
+        else
+        {
+            hb_dict_unset(&x264_opts, "direct");
+        }
+        if (!param.analyse.b_weighted_bipred !=
+            !defaults.analyse.b_weighted_bipred)
+        {
+            // can be modified by: preset ultrafast, tune fastdecode
+            sprintf(buf, "%d", !!param.analyse.b_weighted_bipred);
+            hb_dict_set(&x264_opts, "weightb", buf);
+        }
+        else
+        {
+            hb_dict_unset(&x264_opts, "weightb");
+        }
+    }
+    else
+    {
+        // no bframes, these options have no effect
+        hb_dict_unset(&x264_opts, "b-adapt");
+        hb_dict_unset(&x264_opts, "b-pyramid");
+        hb_dict_unset(&x264_opts, "direct");
+        hb_dict_unset(&x264_opts, "weightb");
+        hb_dict_unset(&x264_opts, "b-bias");
+        hb_dict_unset(&x264_opts, "open-gop");
+    }
+    if (!param.b_deblocking_filter != !defaults.b_deblocking_filter)
+    {
+        // can be modified by: preset ultrafast, tune fastdecode
+        sprintf(buf, "%d", !param.b_deblocking_filter);
+        hb_dict_set(&x264_opts, "no-deblock", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "no-deblock");
+    }
+    if (param.b_deblocking_filter &&
+        (param.i_deblocking_filter_alphac0 != defaults.i_deblocking_filter_alphac0 ||
+         param.i_deblocking_filter_beta    != defaults.i_deblocking_filter_beta))
+    {
+        // can be modified by: tunes
+        sprintf(buf, "%d,%d", param.i_deblocking_filter_alphac0,
+                param.i_deblocking_filter_beta);
+        hb_dict_set(&x264_opts, "deblock", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "deblock");
+    }
+    if (!param.b_cabac != !defaults.b_cabac)
+    {
+        // can be modified by: preset ultrafast, tune fastdecode, profile
+        sprintf(buf, "%d", !!param.b_cabac);
+        hb_dict_set(&x264_opts, "cabac", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "cabac");
+    }
+    if (param.b_interlaced != defaults.b_interlaced)
+    {
+        if (param.b_tff)
+        {
+            hb_dict_set(&x264_opts, "tff", "1");
+            hb_dict_unset(&x264_opts, "bff");
+        }
+        else
+        {
+            hb_dict_set(&x264_opts, "bff", "1");
+            hb_dict_unset(&x264_opts, "tff");
+        }
+        hb_dict_unset(&x264_opts, "fake-interlaced");
+    }
+    else if (param.b_fake_interlaced != defaults.b_fake_interlaced)
+    {
+        hb_dict_set(&x264_opts, "fake-interlaced", "1");
+        hb_dict_unset(&x264_opts, "tff");
+        hb_dict_unset(&x264_opts, "bff");
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "tff");
+        hb_dict_unset(&x264_opts, "bff");
+        hb_dict_unset(&x264_opts, "fake-interlaced");
+    }
+    if (param.i_cqm_preset == defaults.i_cqm_preset &&
+        param.psz_cqm_file == defaults.psz_cqm_file)
+    {
+        // can be reset to default by: profile
+        hb_dict_unset(&x264_opts, "cqm");
+        hb_dict_unset(&x264_opts, "cqm4");
+        hb_dict_unset(&x264_opts, "cqm8");
+        hb_dict_unset(&x264_opts, "cqm4i");
+        hb_dict_unset(&x264_opts, "cqm4p");
+        hb_dict_unset(&x264_opts, "cqm8i");
+        hb_dict_unset(&x264_opts, "cqm8p");
+        hb_dict_unset(&x264_opts, "cqm4iy");
+        hb_dict_unset(&x264_opts, "cqm4ic");
+        hb_dict_unset(&x264_opts, "cqm4py");
+        hb_dict_unset(&x264_opts, "cqm4pc");
+    }
+    /*
+     * Note: param.analyse.intra can only be modified directly or by using
+     *       x264 --preset ultrafast, but not via the "analyse" option
+     */
+    if (param.analyse.inter != defaults.analyse.inter)
+    {
+        // can be modified by: presets, tune touhou
+        if (!param.analyse.inter)
+        {
+            hb_dict_set(&x264_opts, "analyse", "none");
+        }
+        else if ((param.analyse.inter & X264_ANALYSE_I4x4)      &&
+                 (param.analyse.inter & X264_ANALYSE_I8x8)      &&
+                 (param.analyse.inter & X264_ANALYSE_PSUB16x16) &&
+                 (param.analyse.inter & X264_ANALYSE_PSUB8x8)   &&
+                 (param.analyse.inter & X264_ANALYSE_BSUB16x16))
+        {
+            hb_dict_set(&x264_opts, "analyse", "all");
+        }
+        else
+        {
+            sprintf(buf, "%s", "");
+            if (param.analyse.inter & X264_ANALYSE_I4x4)
+            {
+                strcat(buf, "i4x4");
+            }
+            if (param.analyse.inter & X264_ANALYSE_I8x8)
+            {
+                if (*buf)
+                    strcat(buf, ",");
+                strcat(buf, "i8x8");
+            }
+            if (param.analyse.inter & X264_ANALYSE_PSUB16x16)
+            {
+                if (*buf)
+                    strcat(buf, ",");
+                strcat(buf, "p8x8");
+            }
+            if (param.analyse.inter & X264_ANALYSE_PSUB8x8)
+            {
+                if (*buf)
+                    strcat(buf, ",");
+                strcat(buf, "p4x4");
+            }
+            if (param.analyse.inter & X264_ANALYSE_BSUB16x16)
+            {
+                if (*buf)
+                    strcat(buf, ",");
+                strcat(buf, "b8x8");
+            }
+            hb_dict_set(&x264_opts, "analyse", buf);
+        }
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "analyse");
+    }
+    if (!param.analyse.b_transform_8x8 != !defaults.analyse.b_transform_8x8)
+    {
+        // can be modified by: preset ultrafast, profile
+        sprintf(buf, "%d", !!param.analyse.b_transform_8x8);
+        hb_dict_set(&x264_opts, "8x8dct", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "8x8dct");
+    }
+    if (param.analyse.i_weighted_pred != defaults.analyse.i_weighted_pred)
+    {
+        // can be modified by: presets, tune fastdecode, profile
+        sprintf(buf, "%d", param.analyse.i_weighted_pred);
+        hb_dict_set(&x264_opts, "weightp", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "weightp");
+    }
+    if (param.analyse.i_me_method != defaults.analyse.i_me_method)
+    {
+        // can be modified by: presets
+        if (param.analyse.i_me_method < X264_ME_DIA)
+            param.analyse.i_me_method = X264_ME_DIA;
+        if (param.analyse.i_me_method > X264_ME_TESA)
+            param.analyse.i_me_method = X264_ME_TESA;
+        for (i = 0; x264_motion_est_names[i] != NULL; i++)
+            if (param.analyse.i_me_method == i)
+                hb_dict_set(&x264_opts, "me", x264_motion_est_names[i]);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "me");
+    }
+    if (param.analyse.i_me_range != defaults.analyse.i_me_range)
+    {
+        // can be modified by: presets
+        sprintf(buf, "%d", param.analyse.i_me_range);
+        hb_dict_set(&x264_opts, "merange", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "merange");
+    }
+    if (param.analyse.i_mv_range != defaults.analyse.i_mv_range)
+    {
+        // can be modified by: level
+        sprintf(buf, "%d", param.analyse.i_mv_range);
+        hb_dict_set(&x264_opts, "mvrange", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "mvrange");
+    }
+    if (param.analyse.i_subpel_refine > 9 && (param.rc.i_aq_mode == 0 ||
+                                              param.analyse.i_trellis < 2))
+    {
+        // subme 10 and higher require AQ and trellis 2
+        param.analyse.i_subpel_refine = 9;
+    }
+    if (param.analyse.i_subpel_refine != defaults.analyse.i_subpel_refine)
+    {
+        // can be modified by: presets
+        sprintf(buf, "%d", param.analyse.i_subpel_refine);
+        hb_dict_set(&x264_opts, "subme", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "subme");
+    }
+    if (!param.analyse.b_mixed_references !=
+        !defaults.analyse.b_mixed_references)
+    {
+        // can be modified by: presets
+        sprintf(buf, "%d", !!param.analyse.b_mixed_references);
+        hb_dict_set(&x264_opts, "mixed-refs", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "mixed-refs");
+    }
+    if (param.analyse.i_trellis != defaults.analyse.i_trellis)
+    {
+        // can be modified by: presets
+        sprintf(buf, "%d", param.analyse.i_trellis);
+        hb_dict_set(&x264_opts, "trellis", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "trellis");
+    }
+    if (!param.analyse.b_fast_pskip != !defaults.analyse.b_fast_pskip)
+    {
+        // can be modified by: preset placebo
+        sprintf(buf, "%d", !!param.analyse.b_fast_pskip);
+        hb_dict_set(&x264_opts, "fast-pskip", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "fast-pskip");
+    }
+    if (!param.analyse.b_dct_decimate != !defaults.analyse.b_dct_decimate)
+    {
+        // can be modified by: tune grain
+        sprintf(buf, "%d", !!param.analyse.b_dct_decimate);
+        hb_dict_set(&x264_opts, "dct-decimate", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "dct-decimate");
+    }
+    if (!param.analyse.b_psy != !defaults.analyse.b_psy)
+    {
+        // can be modified by: tunes
+        sprintf(buf, "%d", !!param.analyse.b_psy);
+        hb_dict_set(&x264_opts, "psy", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "psy");
+    }
+    if (param.analyse.b_psy &&
+        (param.analyse.f_psy_rd      != defaults.analyse.f_psy_rd ||
+         param.analyse.f_psy_trellis != defaults.analyse.f_psy_trellis))
+    {
+        // can be modified by: tunes
+        sprintf(buf, "%.2f,%.2f", param.analyse.f_psy_rd,
+                param.analyse.f_psy_trellis);
+        hb_dict_set(&x264_opts, "psy-rd", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "psy-rd");
+    }
+    /*
+     * Note: while deadzone is incompatible with trellis, it still has a slight
+     *       effect on the output even when trellis is on, so always unparse it.
+     */
+    if (param.analyse.i_luma_deadzone[0] != defaults.analyse.i_luma_deadzone[0])
+    {
+        // can be modified by: tune grain
+        sprintf(buf, "%d", param.analyse.i_luma_deadzone[0]);
+        hb_dict_set(&x264_opts, "deadzone-inter", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "deadzone-inter");
+    }
+    if (param.analyse.i_luma_deadzone[1] != defaults.analyse.i_luma_deadzone[1])
+    {
+        // can be modified by: tune grain
+        sprintf(buf, "%d", param.analyse.i_luma_deadzone[1]);
+        hb_dict_set(&x264_opts, "deadzone-intra", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "deadzone-intra");
+    }
+    if (param.rc.i_vbv_buffer_size != defaults.rc.i_vbv_buffer_size)
+    {
+        // can be modified by: level
+        sprintf(buf, "%d", param.rc.i_vbv_buffer_size);
+        hb_dict_set(&x264_opts, "vbv-bufsize", buf);
+        if (param.rc.i_vbv_max_bitrate != defaults.rc.i_vbv_max_bitrate)
+        {
+            // can be modified by: level
+            sprintf(buf, "%d", param.rc.i_vbv_max_bitrate);
+            hb_dict_set(&x264_opts, "vbv-maxrate", buf);
+        }
+        else
+        {
+            hb_dict_unset(&x264_opts, "vbv-maxrate");
+        }
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "vbv-bufsize");
+        hb_dict_unset(&x264_opts, "vbv-maxrate");
+    }
+    if (param.rc.f_ip_factor != defaults.rc.f_ip_factor)
+    {
+        // can be modified by: tune grain
+        sprintf(buf, "%.2f", param.rc.f_ip_factor);
+        hb_dict_set(&x264_opts, "ipratio", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "ipratio");
+    }
+    if (param.i_bframe > 0 && !param.rc.b_mb_tree &&
+        param.rc.f_pb_factor != defaults.rc.f_pb_factor)
+    {
+        // can be modified by: tune grain
+        sprintf(buf, "%.2f", param.rc.f_pb_factor);
+        hb_dict_set(&x264_opts, "pbratio", buf);
+    }
+    else
+    {
+        // pbratio requires bframes and is incomaptible with mbtree
+        hb_dict_unset(&x264_opts, "pbratio");
+    }
+    if (param.rc.f_qcompress != defaults.rc.f_qcompress)
+    {
+        // can be modified by: tune grain
+        sprintf(buf, "%.2f", param.rc.f_qcompress);
+        hb_dict_set(&x264_opts, "qcomp", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "qcomp");
+    }
+    if (param.rc.i_aq_mode != defaults.rc.i_aq_mode)
+    {
+        // can be modified by: preset ultrafast, tune psnr
+        sprintf(buf, "%d", param.rc.i_aq_mode);
+        hb_dict_set(&x264_opts, "aq-mode", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "aq-mode");
+    }
+    if (param.rc.i_aq_mode > 0 &&
+        param.rc.f_aq_strength != defaults.rc.f_aq_strength)
+    {
+        // can be modified by: tunes
+        sprintf(buf, "%.2f", param.rc.f_aq_strength);
+        hb_dict_set(&x264_opts, "aq-strength", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "aq-strength");
+    }
+    if (!param.rc.b_mb_tree != !defaults.rc.b_mb_tree)
+    {
+        // can be modified by: presets, tune zerolatency
+        sprintf(buf, "%d", !!param.rc.b_mb_tree);
+        hb_dict_set(&x264_opts, "mbtree", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "mbtree");
+    }
+    if (param.rc.i_lookahead != defaults.rc.i_lookahead)
+    {
+        // can be modified by: presets, tune zerolatency
+        sprintf(buf, "%d", param.rc.i_lookahead);
+        hb_dict_set(&x264_opts, "rc-lookahead", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "rc-lookahead");
+    }
+    if (!param.b_vfr_input != !defaults.b_vfr_input)
+    {
+        // can be modified by: tune zerolatency
+        sprintf(buf, "%d", !param.b_vfr_input);
+        hb_dict_set(&x264_opts, "force-cfr", buf);
+    }
+    else
+    {
+        hb_dict_unset(&x264_opts, "force-cfr");
+    }
+
+    /* convert the x264_opts dictionary to an encopts string */
+    unparsed_opts = hb_dict_to_encopts(x264_opts);
+    hb_dict_free(&x264_opts);
+
+    /* we're done */
+    return unparsed_opts;
+}
+
 const char * const * hb_x264_presets()
 {
     return x264_preset_names;
@@ -637,8 +1629,21 @@
     return x264_tune_names;
 }
 
-const char * const * hb_x264_profiles()
+const char * const * hb_h264_profiles()
+{
+    return hb_h264_profile_names;
+}
+
+const char * const * hb_h264_levels()
 {
-    return x264_profile_names;
+    return hb_h264_level_names;
 }
 
+const char * hb_x264_encopt_name(const char *name)
+{
+    int i;
+    for (i = 0; hb_x264_encopt_synonyms[i][0] != NULL; i++)
+        if (!strcmp(name, hb_x264_encopt_synonyms[i][1]))
+            return hb_x264_encopt_synonyms[i][0];
+    return name;
+}

HandBrake-0.9.9.tar.bz2/libhb/encx264.h Added

@@ -0,0 +1,80 @@
+/* encx264.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "x264.h"
+
+static const char * const hb_h264_profile_names[] = { "auto", "high", "main", "baseline", NULL, };
+static const char * const   hb_h264_level_names[] = { "auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2",  NULL, };
+static const int    const  hb_h264_level_values[] = {     -1,    10,    9,    11,    12,    13,    20,    21,    22,    30,    31,    32,    40,    41,    42,    50,    51,    52,     0, };
+
+/* x264 preferred option names (left) and synonyms (right).
+ * The "preferred" names match names used in x264's param2string function more
+ * closely than their corresponding synonyms, or are just shorter. */
+static const char * const hb_x264_encopt_synonyms[][2] =
+{
+    { "deterministic",  "n-deterministic", },
+    { "level",          "level-idc",       },
+    { "ref",            "frameref",        },
+    { "keyint-min",     "min-keyint",      },
+    { "no-deblock",     "nf",              },
+    { "deblock",        "filter",          },
+    { "cqm",            "cqmfile",         },
+    { "analyse",        "partitions",      },
+    { "weightb",        "weight-b",        },
+    { "direct",         "direct-pred",     },
+    { "merange",        "me-range",        },
+    { "mvrange",        "mv-range",        },
+    { "mvrange-thread", "mv-range-thread", },
+    { "subme",          "subq",            },
+    { "qp",             "qp_constant",     },
+    { "qpmin",          "qp-min",          },
+    { "qpmax",          "qp-max",          },
+    { "qpstep",         "qp-step",         },
+    { "ipratio",        "ip-factor",       },
+    { "pbratio",        "pb-factor",       },
+    { "cplxblur",       "cplx-blur",       },
+    { NULL,             NULL,              },
+};
+
+/*
+ * Check whether a valid h264_level is compatible with the given framerate,
+ * resolution and interlaced compression/flags combination.
+ *
+ * width, height, fps_num and fps_den should be greater than zero.
+ *
+ * interlacing parameters can be set to zero when the information is
+ * unavailable, as hb_apply_h264_level() will disable interlacing if necessary.
+ *
+ * Returns 0 if the level is valid and compatible, 1 otherwise.
+ */
+int hb_check_h264_level(const char *h264_level, int width, int height,
+                        int fps_num, int fps_den, int interlaced,
+                        int fake_interlaced);
+
+/*
+ * Applies the restrictions of the requested H.264 level to an x264_param_t.
+ *
+ * Returns -1 if an invalid level (or no level) is specified. GUIs should be
+ * capable of always providing a valid level.
+ *
+ * Does not modify resolution/framerate but warns when they exceed level limits.
+ *
+ * Based on a x264_param_apply_level() draft and other x264 code.
+ */
+int hb_apply_h264_level(x264_param_t *param, const char *h264_level,
+                        const char *x264_profile, int verbose);
+
+/*
+ * Applies the restrictions of the requested H.264 profile to an x264_param_t.
+ *
+ * x264_param_apply_profile wrapper designed to always succeed when a valid
+ * H.264 profile is specified (unlike x264's function).
+ */
+int hb_apply_h264_profile(x264_param_t *param, const char *h264_profile,
+                          int verbose);

HandBrake-0.9.8.tar.bz2/libhb/fifo.c -> HandBrake-0.9.9.tar.bz2/libhb/fifo.c Changed

@@ -1,8 +1,11 @@
-/* $Id: fifo.c,v 1.17 2005/10/15 18:05:03 titer Exp $
+/* fifo.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 
@@ -236,9 +239,9 @@
         count = 0;
         while( ( b = hb_fifo_get(buffers.pool[i]) ) )
         {
-            freed += b->alloc;
             if( b->data )
             {
+                freed += b->alloc;
                 free( b->data );
             }
             free( b );
@@ -339,7 +342,7 @@
 {
     if ( size > b->alloc || b->data == NULL )
     {
-        uint32_t orig = b->alloc;
+        uint32_t orig = b->data != NULL ? b->alloc : 0;
         size = size_to_pool( size )->buffer_size;
         b->data  = realloc( b->data, size );
         b->alloc = size;
@@ -363,6 +366,162 @@
     }
 }
 
+hb_buffer_t * hb_buffer_dup( const hb_buffer_t * src )
+{
+    hb_buffer_t * buf;
+
+    if ( src == NULL )
+        return NULL;
+
+    buf = hb_buffer_init( src->size );
+    if ( buf )
+    {
+        memcpy( buf->data, src->data, src->size );
+        buf->s = src->s;
+        buf->f = src->f;
+        if ( buf->s.type == FRAME_BUF )
+            hb_buffer_init_planes( buf );
+    }
+
+    return buf;
+}
+
+int hb_buffer_copy(hb_buffer_t * dst, const hb_buffer_t * src)
+{
+    if (src == NULL || dst == NULL)
+        return -1;
+
+    if ( dst->size < src->size )
+        return -1;
+
+    memcpy( dst->data, src->data, src->size );
+    dst->s = src->s;
+    dst->f = src->f;
+    if (dst->s.type == FRAME_BUF)
+        hb_buffer_init_planes(dst);
+
+    return 0;
+}
+
+static void hb_buffer_init_planes_internal( hb_buffer_t * b, uint8_t * has_plane )
+{
+    uint8_t * plane = b->data;
+    int p, tot = 0;
+
+    for( p = 0; p < 4; p++ )
+    {
+        if ( has_plane[p] )
+        {
+            b->plane[p].data = plane;
+            b->plane[p].stride = hb_image_stride( b->f.fmt, b->f.width, p );
+            b->plane[p].height_stride = hb_image_height_stride( b->f.fmt, b->f.height, p );
+            b->plane[p].width  = hb_image_width( b->f.fmt, b->f.width, p );
+            b->plane[p].height = hb_image_height( b->f.fmt, b->f.height, p );
+            b->plane[p].size   = b->plane[p].stride * b->plane[p].height_stride;
+            plane += b->plane[p].size;
+            tot += b->plane[p].size;
+        }
+    }
+}
+
+void hb_buffer_init_planes( hb_buffer_t * b )
+{
+    const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[b->f.fmt];
+    int p;
+
+    uint8_t has_plane[4] = {0,};
+
+    for( p = 0; p < 4; p++ )
+    {
+        has_plane[desc->comp[p].plane] = 1;
+    }
+    hb_buffer_init_planes_internal( b, has_plane );
+}
+
+// this routine gets a buffer for an uncompressed picture
+// with pixel format pix_fmt and dimensions width x height.
+hb_buffer_t * hb_frame_buffer_init( int pix_fmt, int width, int height )
+{
+    const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
+    hb_buffer_t * buf;
+    int p;
+    uint8_t has_plane[4] = {0,};
+
+    for( p = 0; p < 4; p++ )
+    {
+        has_plane[desc->comp[p].plane] = 1;
+    }
+
+    int size = 0;
+    for( p = 0; p < 4; p++ )
+    {
+        if ( has_plane[p] )
+        {
+            size += hb_image_stride( pix_fmt, width, p ) * 
+                    hb_image_height_stride( pix_fmt, height, p );
+        }
+    }
+
+    buf = hb_buffer_init( size );
+    if( buf == NULL )
+        return NULL;
+
+    buf->s.type = FRAME_BUF;
+    buf->f.width = width;
+    buf->f.height = height;
+    buf->f.fmt = pix_fmt;
+
+    hb_buffer_init_planes_internal( buf, has_plane );
+    return buf;
+}
+
+// this routine reallocs a buffer for an uncompressed YUV420 video frame
+// with dimensions width x height.
+void hb_video_buffer_realloc( hb_buffer_t * buf, int width, int height )
+{
+    const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[buf->f.fmt];
+    int p;
+    uint8_t has_plane[4] = {0,};
+
+    for( p = 0; p < 4; p++ )
+    {
+        has_plane[desc->comp[p].plane] = 1;
+    }
+
+    int size = 0;
+    for( p = 0; p < 4; p++ )
+    {
+        if ( has_plane[p] )
+        {
+            size += hb_image_stride( buf->f.fmt, width, p ) * 
+                    hb_image_height_stride( buf->f.fmt, height, p );
+        }
+    }
+
+    hb_buffer_realloc(buf, size );
+
+    buf->f.width = width;
+    buf->f.height = height;
+
+    hb_buffer_init_planes_internal( buf, has_plane );
+}
+
+// this routine 'moves' data from src to dst by interchanging 'data',
+// 'size' & 'alloc' between them and copying the rest of the fields
+// from src to dst.
+void hb_buffer_swap_copy( hb_buffer_t *src, hb_buffer_t *dst )
+{
+    uint8_t *data  = dst->data;
+    int      size  = dst->size;
+    int      alloc = dst->alloc;
+
+    *dst = *src;
+
+    src->data  = data;
+    src->size  = size;
+    src->alloc = alloc;
+}
+
 // Frees the specified buffer list.
 void hb_buffer_close( hb_buffer_t ** _b )
 {
@@ -375,6 +534,9 @@
 
         b->next = NULL;
 
+        // Close any attached subtitle buffers
+        hb_buffer_close( &b->sub );
+
         if( buffer_pool && b->data && !hb_fifo_is_full( buffer_pool ) )
         {
             hb_fifo_push_head( buffer_pool, b );
@@ -393,16 +555,15 @@
         free( b );
         b = next;
     }
+
     *_b = NULL;
 }
 
-void hb_buffer_copy_settings( hb_buffer_t * dst, const hb_buffer_t * src )
+void hb_buffer_move_subs( hb_buffer_t * dst, hb_buffer_t * src )
 {
-    dst->start     = src->start;
-    dst->stop      = src->stop;
-    dst->new_chap  = src->new_chap;
-    dst->frametype = src->frametype;
-    dst->flags     = src->flags;
+    // Note that dst takes ownership of the subtitles
+    dst->sub       = src->sub;
+    src->sub       = NULL;
 }
 
 hb_fifo_t * hb_fifo_init( int capacity, int thresh )
@@ -737,6 +898,9 @@
     hb_fifo_t   * f = *_f;
     hb_buffer_t * b;
 
+    if ( f == NULL )
+        return;
+
     hb_deep_log( 2, "fifo_close: trashing %d buffer(s)", hb_fifo_size( f ) );
     while( ( b = hb_fifo_get( f ) ) )
     {

HandBrake-0.9.8.tar.bz2/libhb/hb.c -> HandBrake-0.9.9.tar.bz2/libhb/hb.c Changed

@@ -1,3 +1,12 @@
+/* hb.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
 #include "hb.h"
 #include "hbffmpeg.h"
 #include <stdio.h>
@@ -27,7 +36,7 @@
     int            pid;
 
     /* DVD/file scan thread */
-    hb_list_t    * list_title;
+    hb_title_set_t title_set;
     hb_thread_t  * scan_thread;
 
     /* The thread which processes the jobs. Others threads are launched
@@ -55,14 +64,15 @@
        on multi-pass encodes where frames get dropped.     */
     hb_interjob_t * interjob;
 
-};
+    // power management opaque pointer
+    void *system_sleep_opaque;
+} ;
 
 hb_work_object_t * hb_objects = NULL;
 int hb_instance_counter = 0;
 int hb_process_initialized = 0;
 
 static void thread_func( void * );
-hb_title_t * hb_get_title_by_index( hb_handle_t *, int );
 
 static int ff_lockmgr_cb(void **mutex, enum AVLockOp op)
 {
@@ -92,19 +102,28 @@
 
 void hb_avcodec_init()
 {
-    av_lockmgr_register( ff_lockmgr_cb );
+    av_lockmgr_register(ff_lockmgr_cb);
     av_register_all();
+#ifdef _WIN64
+    // avresample's assembly optimizations can cause crashes under Win x86_64
+    // (see http://bugzilla.libav.org/show_bug.cgi?id=496)
+    // disable AVX and FMA4 as a workaround
+    hb_deep_log(2, "hb_avcodec_init: Windows x86_64, disabling AVX and FMA4");
+    int cpu_flags = av_get_cpu_flags() & ~AV_CPU_FLAG_AVX & ~AV_CPU_FLAG_FMA4;
+    av_set_cpu_flags_mask(cpu_flags);
+#endif
 }
 
-int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec, AVDictionary **av_opts, int thread_count)
+int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec,
+                    AVDictionary **av_opts, int thread_count)
 {
     int ret;
 
-    if ( ( thread_count == HB_FFMPEG_THREADS_AUTO || thread_count > 0 ) && 
-         ( codec->type == AVMEDIA_TYPE_VIDEO ) )
+    if ((thread_count == HB_FFMPEG_THREADS_AUTO || thread_count > 0) && 
+        (codec->type == AVMEDIA_TYPE_VIDEO))
     {
-        avctx->thread_count = ( thread_count == HB_FFMPEG_THREADS_AUTO ) ? 
-                                hb_get_cpu_count() / 2 + 1 : thread_count;
+        avctx->thread_count = (thread_count == HB_FFMPEG_THREADS_AUTO) ?
+                               hb_get_cpu_count() / 2 + 1 : thread_count;
         avctx->thread_type = FF_THREAD_FRAME|FF_THREAD_SLICE;
         avctx->thread_safe_callbacks = 1;
     }
@@ -113,6 +132,12 @@
         avctx->thread_count = 1;
     }
 
+    if (codec->capabilities & CODEC_CAP_EXPERIMENTAL)
+    {
+        // "experimental" encoders will not open without this
+        avctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+    }
+
     ret = avcodec_open2(avctx, codec, av_opts);
     return ret;
 }
@@ -124,20 +149,40 @@
     return ret;
 }
 
-static int handle_jpeg(enum PixelFormat *format)
+
+int hb_avpicture_fill(AVPicture *pic, hb_buffer_t *buf)
+{
+    int ret, ii;
+
+    for (ii = 0; ii < 4; ii++)
+        pic->linesize[ii] = buf->plane[ii].stride;
+
+    ret = av_image_fill_pointers(pic->data, buf->f.fmt,
+                                 buf->plane[0].height_stride,
+                                 buf->data, pic->linesize);
+    if (ret != buf->size)
+    {
+        hb_error("Internal error hb_avpicture_fill expected %d, got %d",
+                 buf->size, ret);
+    }
+    return ret;
+}
+
+static int handle_jpeg(enum AVPixelFormat *format)
 {
-    switch (*format) {
-    case PIX_FMT_YUVJ420P: *format = PIX_FMT_YUV420P; return 1;
-    case PIX_FMT_YUVJ422P: *format = PIX_FMT_YUV422P; return 1;
-    case PIX_FMT_YUVJ444P: *format = PIX_FMT_YUV444P; return 1;
-    case PIX_FMT_YUVJ440P: *format = PIX_FMT_YUV440P; return 1;
-    default:                                          return 0;
+    switch (*format)
+    {
+        case AV_PIX_FMT_YUVJ420P: *format = AV_PIX_FMT_YUV420P; return 1;
+        case AV_PIX_FMT_YUVJ422P: *format = AV_PIX_FMT_YUV422P; return 1;
+        case AV_PIX_FMT_YUVJ444P: *format = AV_PIX_FMT_YUV444P; return 1;
+        case AV_PIX_FMT_YUVJ440P: *format = AV_PIX_FMT_YUV440P; return 1;
+        default:                                                return 0;
     }
 }
 
 struct SwsContext*
-hb_sws_get_context(int srcW, int srcH, enum PixelFormat srcFormat,
-                   int dstW, int dstH, enum PixelFormat dstFormat,
+hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat,
+                   int dstW, int dstH, enum AVPixelFormat dstFormat,
                    int flags)
 {
     struct SwsContext * ctx;
@@ -181,138 +226,123 @@
     return ctx;
 }
 
-int hb_ff_layout_xlat( int64_t ff_channel_layout, int channels )
+uint64_t hb_ff_mixdown_xlat(int hb_mixdown, int *downmix_mode)
 {
-    int hb_layout;
-
-    switch( ff_channel_layout )
+    uint64_t ff_layout = 0;
+    int mode = AV_MATRIX_ENCODING_NONE;
+    switch (hb_mixdown)
     {
-        case AV_CH_LAYOUT_MONO:
-            hb_layout = HB_INPUT_CH_LAYOUT_MONO;
+        // Passthru
+        case HB_AMIXDOWN_NONE:
             break;
-        case AV_CH_LAYOUT_STEREO:
-        case AV_CH_LAYOUT_STEREO_DOWNMIX:
-            hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
+
+        case HB_AMIXDOWN_MONO:
+        case HB_AMIXDOWN_LEFT:
+        case HB_AMIXDOWN_RIGHT:
+            ff_layout = AV_CH_LAYOUT_MONO;
             break;
-        case AV_CH_LAYOUT_SURROUND:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F;
+
+        case HB_AMIXDOWN_DOLBY:
+            ff_layout = AV_CH_LAYOUT_STEREO;
+            mode = AV_MATRIX_ENCODING_DOLBY;
             break;
-        case AV_CH_LAYOUT_4POINT0:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F1R;
+
+        case HB_AMIXDOWN_DOLBYPLII:
+            ff_layout = AV_CH_LAYOUT_STEREO;
+            mode = AV_MATRIX_ENCODING_DPLII;
             break;
-        case AV_CH_LAYOUT_2_2:
-        case AV_CH_LAYOUT_QUAD:
-            hb_layout = HB_INPUT_CH_LAYOUT_2F2R;
+
+        case HB_AMIXDOWN_STEREO:
+            ff_layout = AV_CH_LAYOUT_STEREO;
             break;
-        case AV_CH_LAYOUT_5POINT0:
-        case AV_CH_LAYOUT_5POINT0_BACK:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F2R;
+
+        case HB_AMIXDOWN_5POINT1:
+            ff_layout = AV_CH_LAYOUT_5POINT1;
             break;
-        case AV_CH_LAYOUT_5POINT1:
-        case AV_CH_LAYOUT_5POINT1_BACK:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+
+        case HB_AMIXDOWN_6POINT1:
+            ff_layout = AV_CH_LAYOUT_6POINT1;
             break;
-        case AV_CH_LAYOUT_7POINT0:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F4R;
+
+        case HB_AMIXDOWN_7POINT1:
+            ff_layout = AV_CH_LAYOUT_7POINT1;
             break;
-        case AV_CH_LAYOUT_7POINT1:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+
+        case HB_AMIXDOWN_5_2_LFE:
+            ff_layout = (AV_CH_LAYOUT_5POINT1_BACK|
+                         AV_CH_FRONT_LEFT_OF_CENTER|
+                         AV_CH_FRONT_RIGHT_OF_CENTER);
             break;
+
         default:
-            hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
+            ff_layout = AV_CH_LAYOUT_STEREO;
+            hb_log("hb_ff_mixdown_xlat: unsupported mixdown %d", hb_mixdown);
             break;
     }
-    // Now make sure the chosen layout agrees with the number of channels
-    // ffmpeg tells us there are.  It seems ffmpeg is sometimes confused
-    // about this. So we will make a best guess based on the number
-    // of channels.
-    int chans = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( hb_layout );
-    if( ff_channel_layout && chans == channels )
-    {
-        return hb_layout;
-    }
-    if( !ff_channel_layout )
-    {
-        hb_log( "No channel layout reported by Libav; guessing one from channel count." );
-    }
-    else
-    {
-        hb_log( "Channels reported by Libav (%d) != computed layout channels (%d). Guessing layout from channel count.", channels, chans );
-    }
-    switch( channels )
+    if (downmix_mode != NULL)
+        *downmix_mode = mode;
+    return ff_layout;
+}
+
+uint64_t hb_ff_layout_xlat(uint64_t ff_channel_layout, int nchannels)
+{
+    uint64_t hb_layout = ff_channel_layout;
+    if (!hb_layout || av_get_channel_layout_nb_channels(hb_layout) != nchannels)
     {
-        case 1:
-            hb_layout = HB_INPUT_CH_LAYOUT_MONO;
-            break;
-        case 2:
-            hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
-            break;
-        case 3:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F;
-            break;
-        case 4:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F1R;
-            break;
-        case 5:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F2R;
-            break;
-        case 6:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE;
-            break;
-        case 7:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F4R;
-            break;
-        case 8:
-            hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE;
-            break;
-        default:
-            hb_log( "Unsupported number of audio channels (%d).", channels );
-            hb_layout = 0;
-            break;
+        hb_layout = av_get_default_channel_layout(nchannels);
+        if (!hb_layout)
+        {
+            // This will likely not sound very good ;)
+            hb_layout = AV_CH_LAYOUT_STEREO;
+            hb_error("hb_ff_layout_xlat: unsupported layout 0x%"PRIx64" with %d channels",
+                     ff_channel_layout, nchannels);
+        }
     }
     return hb_layout;
 }
 
-// Set sample format to AV_SAMPLE_FMT_FLT if supported.
-// If it is not supported, we will have to translate using
-// av_audio_convert.
-void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec)
+/*
+ * Set sample format to the request format if supported by the codec.
+ * The planar/packed variant of the requested format is the next best thing.
+ */
+void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec,
+                          enum AVSampleFormat request_sample_fmt)
 {
-    if ( codec && codec->sample_fmts )
+    if (context != NULL && codec != NULL &&
+        codec->type == AVMEDIA_TYPE_AUDIO && codec->sample_fmts != NULL)
     {
-        if ( codec->type != AVMEDIA_TYPE_AUDIO )
-            return; // Not audio
-
         const enum AVSampleFormat *fmt;
+        enum AVSampleFormat next_best_fmt;
+
+        next_best_fmt = (av_sample_fmt_is_planar(request_sample_fmt)  ?
+                         av_get_packed_sample_fmt(request_sample_fmt) :
+                         av_get_planar_sample_fmt(request_sample_fmt));
+
+        context->request_sample_fmt = AV_SAMPLE_FMT_NONE;
 
-        for ( fmt = codec->sample_fmts; *fmt != -1; fmt++ )
+        for (fmt = codec->sample_fmts; *fmt != AV_SAMPLE_FMT_NONE; fmt++)
         {
-            if ( *fmt == AV_SAMPLE_FMT_FLT )
+            if (*fmt == request_sample_fmt)
             {
-                context->request_sample_fmt = AV_SAMPLE_FMT_FLT;
-                context->sample_fmt = AV_SAMPLE_FMT_FLT;
+                context->request_sample_fmt = request_sample_fmt;
                 break;
             }
+            else if (*fmt == next_best_fmt)
+            {
+                context->request_sample_fmt = next_best_fmt;
+            }
         }
-        if ( *fmt == -1 )
-            context->sample_fmt = codec->sample_fmts[0];
-
-    }
-}
 
-// Libav can decode DTS-ES 6.0/6.1 (5.0/5.1 core + XCh extension)
-// but we don't support 6.0/6.1 (and incorrectly assume 5.1/7.0)
-// request channels-1 to disable XCh processing in Libav
-int hb_ff_dts_disable_xch( AVCodecContext *c )
-{
-    if( ( c->codec_id == CODEC_ID_DTS ) &&
-        ( ( c->channel_layout & ~AV_CH_LOW_FREQUENCY ) == ( AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER ) ) )
-    {
-        c->request_channels = --c->channels;
-        c->channel_layout &= ~AV_CH_BACK_CENTER;
-        return 1;
+        /*
+         * When encoding and AVCodec.sample_fmts exists, avcodec_open2()
+         * will error out if AVCodecContext.sample_fmt isn't set.
+         */
+        if (context->request_sample_fmt == AV_SAMPLE_FMT_NONE)
+        {
+            context->request_sample_fmt = codec->sample_fmts[0];
+        }
+        context->sample_fmt = context->request_sample_fmt;
     }
-    return 0;
 }
 
 /**
@@ -387,6 +417,9 @@
     /* Check for an update on the website if asked to */
     h->build = -1;
 
+    /* Initialize opaque for PowerManagement purposes */
+    h->system_sleep_opaque = hb_system_sleep_opaque_init();
+
     if( update_check )
     {
         hb_log( "hb_init: checking for updates" );
@@ -418,7 +451,7 @@
      */
     hb_buffer_pool_init();
 
-    h->list_title = hb_list_init();
+    h->title_set.list_title = hb_list_init();
     h->jobs       = hb_list_init();
 
     h->state_lock  = hb_lock_init();
@@ -446,12 +479,11 @@
     hb_register( &hb_decutf8sub );
     hb_register( &hb_dectx3gsub );
     hb_register( &hb_decssasub );
-	hb_register( &hb_render );
+    hb_register( &hb_decpgssub );
 	hb_register( &hb_encavcodec );
 	hb_register( &hb_encx264 );
     hb_register( &hb_enctheora );
 	hb_register( &hb_deca52 );
-	hb_register( &hb_decdca );
 	hb_register( &hb_decavcodeca );
 	hb_register( &hb_decavcodecv );
 	hb_register( &hb_declpcm );
@@ -492,6 +524,9 @@
     /* Check for an update on the website if asked to */
     h->build = -1;
 
+    /* Initialize opaque for PowerManagement purposes */
+    h->system_sleep_opaque = hb_system_sleep_opaque_init();
+
     if( update_check )
     {
         hb_log( "hb_init: checking for updates" );
@@ -518,7 +553,7 @@
         }
     }
 
-    h->list_title = hb_list_init();
+    h->title_set.list_title = hb_list_init();
     h->jobs       = hb_list_init();
     h->current_job = NULL;
 
@@ -546,12 +581,10 @@
     hb_register( &hb_decutf8sub );
     hb_register( &hb_dectx3gsub );
     hb_register( &hb_decssasub );
-	hb_register( &hb_render );
 	hb_register( &hb_encavcodec );
 	hb_register( &hb_encx264 );
     hb_register( &hb_enctheora );
 	hb_register( &hb_deca52 );
-	hb_register( &hb_decdca );
 	hb_register( &hb_decavcodeca );
 	hb_register( &hb_decavcodecv );
 	hb_register( &hb_declpcm );
@@ -620,7 +653,7 @@
     dir = opendir( dirname );
     if (dir == NULL) return;
 
-    count = hb_list_count( h->list_title );
+    count = hb_list_count( h->title_set.list_title );
     while( ( entry = readdir( dir ) ) )
     {
         if( entry->d_name[0] == '.' )
@@ -629,7 +662,7 @@
         }
         for( i = 0; i < count; i++ )
         {
-            title = hb_list_item( h->list_title, i );
+            title = hb_list_item( h->title_set.list_title, i );
             len = snprintf( filename, 1024, "%d_%d", h->id, title->index );
             if (strncmp(entry->d_name, filename, len) == 0)
             {
@@ -659,15 +692,15 @@
 
     /* Clean up from previous scan */
     hb_remove_previews( h );
-    while( ( title = hb_list_item( h->list_title, 0 ) ) )
+    while( ( title = hb_list_item( h->title_set.list_title, 0 ) ) )
     {
-        hb_list_rem( h->list_title, title );
+        hb_list_rem( h->title_set.list_title, title );
         hb_title_close( &title );
     }
 
     hb_log( "hb_scan: path=%s, title_index=%d", path, title_index );
     h->scan_thread = hb_scan_init( h, &h->scan_die, path, title_index, 
-                                   h->list_title, preview_count, 
+                                   &h->title_set, preview_count, 
                                    store_previews, min_duration );
 }
 
@@ -678,25 +711,103 @@
  */
 hb_list_t * hb_get_titles( hb_handle_t * h )
 {
-    return h->list_title;
+    return h->title_set.list_title;
 }
 
-/**
- * Create preview image of desired title a index of picture.
- * @param h Handle to hb_handle_t.
- * @param title_index Index of the title to get the preview for (1-based).
- * @param picture Index in title.
- * @param buffer Handle to buffer were image will be drawn.
- */
-void hb_get_preview_by_index( hb_handle_t * h, int title_index, int picture, uint8_t * buffer )
+hb_title_set_t * hb_get_title_set( hb_handle_t * h )
 {
-    hb_title_t * title;
+    return &h->title_set;
+}
+
+int hb_save_preview( hb_handle_t * h, int title, int preview, hb_buffer_t *buf )
+{
+    FILE * file;
+    char   filename[1024];
 
-    title = hb_get_title_by_index( h, title_index );
-    if ( title != NULL )
+    hb_get_tempory_filename( h, filename, "%d_%d_%d",
+                             hb_get_instance_id(h), title, preview );
+
+    file = fopen( filename, "wb" );
+    if( !file )
+    {
+        hb_error( "hb_save_preview: fopen failed (%s)", filename );
+        return -1;
+    }
+
+    int pp, hh;
+    for( pp = 0; pp < 3; pp++ )
+    {
+        uint8_t *data = buf->plane[pp].data;
+        int stride = buf->plane[pp].stride;
+        int w = buf->plane[pp].width;
+        int h = buf->plane[pp].height;
+
+        for( hh = 0; hh < h; hh++ )
+        {
+            fwrite( data, w, 1, file );
+            data += stride;
+        }
+    }
+    fclose( file );
+    return 0;
+}
+
+hb_buffer_t * hb_read_preview( hb_handle_t * h, int title_idx, int preview )
+{
+    FILE * file;
+    char   filename[1024];
+    hb_title_set_t *title_set;
+
+    hb_title_t * title = NULL;
+
+    title_set = hb_get_title_set(h);
+
+    int ii;
+    for (ii = 0; ii < hb_list_count(title_set->list_title); ii++)
+    {
+        title = hb_list_item( title_set->list_title, ii);
+        if (title != NULL && title->index == title_idx)
+        {
+            break;
+        }
+        title = NULL;
+    }
+    if (title == NULL)
+    {
+        hb_error( "hb_read_preview: invalid title (%d)", title_idx );
+        return NULL;
+    }
+
+    hb_get_tempory_filename( h, filename, "%d_%d_%d",
+                             hb_get_instance_id(h), title_idx, preview );
+
+    file = fopen( filename, "rb" );
+    if( !file )
+    {
+        hb_error( "hb_read_preview: fopen failed (%s)", filename );
+        return NULL;
+    }
+
+    hb_buffer_t * buf;
+    buf = hb_frame_buffer_init( AV_PIX_FMT_YUV420P, title->width, title->height );
+
+    int pp, hh;
+    for( pp = 0; pp < 3; pp++ )
     {
-        hb_get_preview( h, title, picture, buffer );
-    } 
+        uint8_t *data = buf->plane[pp].data;
+        int stride = buf->plane[pp].stride;
+        int w = buf->plane[pp].width;
+        int h = buf->plane[pp].height;
+
+        for( hh = 0; hh < h; hh++ )
+        {
+            fread( data, w, 1, file );
+            data += stride;
+        }
+    }
+    fclose( file );
+
+    return buf;
 }
 
 /**
@@ -706,77 +817,67 @@
  * @param picture Index in title.
  * @param buffer Handle to buffer were image will be drawn.
  */
-void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
+void hb_get_preview( hb_handle_t * h, hb_job_t * job, int picture,
                      uint8_t * buffer )
 {
-    hb_job_t           * job = title->job;
+    hb_title_t         * title = job->title;
     char                 filename[1024];
-    FILE               * file;
-    uint8_t            * buf1, * buf2, * buf3, * pen;
+    hb_buffer_t        * in_buf, * deint_buf = NULL, * preview_buf;
+    uint8_t            * pen;
     uint32_t             swsflags;
     AVPicture            pic_in, pic_preview, pic_deint, pic_crop;
     struct SwsContext  * context;
-    int                  i, p;
-    int                  aligned_width = ((title->width + 7) & ~7);
-    int                  aligned_height = ((title->height + 7) & ~7);
+    int                  i;
     int                  preview_size;
 
     swsflags = SWS_LANCZOS | SWS_ACCURATE_RND;
 
-    buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, aligned_width, aligned_height ) );
-    buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, aligned_width, aligned_height ) );
-    buf3 = av_malloc( avpicture_get_size( PIX_FMT_RGB32, job->width, job->height ) );
-    avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
-                    aligned_width, aligned_height );
-    avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P,
-                    aligned_width, aligned_height );
-    avpicture_fill( &pic_preview, buf3, PIX_FMT_RGB32,
-                    job->width, job->height );
+    preview_buf = hb_frame_buffer_init( AV_PIX_FMT_RGB32,
+                                        job->width, job->height );
+    hb_avpicture_fill( &pic_preview, preview_buf );
 
     // Allocate the AVPicture frames and fill in
 
     memset( filename, 0, 1024 );
 
-    hb_get_tempory_filename( h, filename, "%d_%d_%d",
-                             h->id, title->index, picture );
-
-    file = fopen( filename, "rb" );
-    if( !file )
+    in_buf = hb_read_preview( h, title->index, picture );
+    if ( in_buf == NULL )
     {
-        hb_log( "hb_get_preview: fopen failed" );
         return;
     }
 
-    for (p = 0; p < 3; p++)
-    {
-        int w = !p ? title->width : title->width >> 1;
-        int h = !p ? title->height : title->height >> 1;
-        pen = pic_in.data[p];
-        for (i = 0; i < h; i++)
-        {
-            fread( pen, w, 1, file );
-            pen += pic_in.linesize[p];
-        }
-    }
-    fclose( file );
+    hb_avpicture_fill( &pic_in, in_buf );
 
     if( job->deinterlace )
     {
+        int width = (in_buf->plane[0].width + 3) & ~0x3;
+        int height = (in_buf->plane[0].height + 3) & ~0x3;
+
         // Deinterlace and crop
-        avpicture_deinterlace( &pic_deint, &pic_in, PIX_FMT_YUV420P, aligned_width, aligned_height );
-        av_picture_crop( &pic_crop, &pic_deint, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
+        // avpicture_deinterlace requires 4 pixel aligned width and height
+        // we have aligned all buffers to 16 byte width and height strides
+        // so there is room in the buffers to accomodate a litte
+        // overscan.
+        deint_buf = hb_frame_buffer_init( AV_PIX_FMT_YUV420P,
+                                          title->width, title->height );
+        hb_avpicture_fill( &pic_deint, deint_buf );
+        avpicture_deinterlace( &pic_deint, &pic_in, AV_PIX_FMT_YUV420P,
+            width, height );
+
+        av_picture_crop( &pic_crop, &pic_deint, AV_PIX_FMT_YUV420P,
+                job->crop[0], job->crop[2] );
     }
     else
     {
         // Crop
-        av_picture_crop( &pic_crop, &pic_in, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
+        av_picture_crop( &pic_crop, &pic_in, AV_PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
     }
 
     // Get scaling context
     context = hb_sws_get_context(title->width  - (job->crop[2] + job->crop[3]),
                              title->height - (job->crop[0] + job->crop[1]),
-                             PIX_FMT_YUV420P,
-                             job->width, job->height, PIX_FMT_RGB32,
+                             AV_PIX_FMT_YUV420P,
+                             job->width, job->height, AV_PIX_FMT_RGB32,
                              swsflags);
 
     // Scale
@@ -792,14 +893,14 @@
     pen = buffer;
     for( i = 0; i < job->height; i++ )
     {
-        memcpy( pen, buf3 + preview_size * i, 4 * job->width );
+        memcpy( pen, pic_preview.data[0] + preview_size * i, 4 * job->width );
         pen += 4 * job->width;
     }
 
     // Clean up
-    avpicture_free( &pic_preview );
-    avpicture_free( &pic_deint );
-    avpicture_free( &pic_in );
+    hb_buffer_close( &in_buf );
+    hb_buffer_close( &deint_buf );
+    hb_buffer_close( &preview_buf );
 }
 
  /**
@@ -821,16 +922,12 @@
  */
 int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold )
 {
-    int width = buf->width;
-    int height = buf->height;
     int j, k, n, off, cc_1, cc_2, cc[3];
 	// int flag[3] ; // debugging flag
     uint16_t s1, s2, s3, s4;
     cc_1 = 0; cc_2 = 0;
 
-    int offset = 0;
-    
-    if ( buf->flags & 16 )
+    if ( buf->s.flags & 16 )
     {
         /* Frame is progressive, be more discerning. */
         color_diff = prog_diff;
@@ -841,21 +938,10 @@
     /* One pas for Y, one pass for Cb, one pass for Cr */    
     for( k = 0; k < 3; k++ )
     {
-        if( k == 1 )
-        {
-            /* Y has already been checked, now offset by Y's dimensions
-               and divide all the other values by 2, since Cr and Cb
-               are half-size compared to Y.                               */
-            offset = width * height;
-            width >>= 1;
-            height >>= 1;
-        }
-        else if ( k == 2 )
-        {
-            /* Y and Cb are done, so the offset needs to be bumped
-               so it's width*height + (width / 2) * (height / 2)  */
-            offset *= 5/4;
-        }
+        uint8_t * data = buf->plane[k].data;
+        int width = buf->plane[k].width;
+        int stride = buf->plane[k].stride;
+        int height = buf->plane[k].height;
 
         for( j = 0; j < width; ++j )
         {
@@ -864,10 +950,10 @@
             for( n = 0; n < ( height - 4 ); n = n + 2 )
             {
                 /* Look at groups of 4 sequential horizontal lines */
-                s1 = ( ( buf->data + offset )[ off + j             ] & 0xff );
-                s2 = ( ( buf->data + offset )[ off + j + width     ] & 0xff );
-                s3 = ( ( buf->data + offset )[ off + j + 2 * width ] & 0xff );
-                s4 = ( ( buf->data + offset )[ off + j + 3 * width ] & 0xff );
+                s1 = ( ( data )[ off + j              ] & 0xff );
+                s2 = ( ( data )[ off + j +     stride ] & 0xff );
+                s3 = ( ( data )[ off + j + 2 * stride ] & 0xff );
+                s4 = ( ( data )[ off + j + 3 * stride ] & 0xff );
 
                 /* Note if the 1st and 2nd lines are more different in
                    color than the 1st and 3rd lines are similar in color.*/
@@ -882,7 +968,7 @@
                         ++cc_2;
 
                 /* Now move down 2 horizontal lines before starting over.*/
-                off += 2 * width;
+                off += 2 * stride;
             }
         }
 
@@ -918,26 +1004,6 @@
 /**
  * Calculates job width and height for anamorphic content,
  *
- * @param h Instance handle
- * @param title_index Index of the title/job to inspect (1-based).
- * @param output_width Pointer to returned storage width
- * @param output_height Pointer to returned storage height
- * @param output_par_width Pointer to returned pixel width
- * @param output_par_height Pointer to returned pixel height
- */
-void hb_set_anamorphic_size_by_index( hb_handle_t * h, int title_index,
-        int *output_width, int *output_height,
-        int *output_par_width, int *output_par_height )
-{
-    hb_title_t * title;
-    title = hb_get_title_by_index( h, title_index );
-    
-    hb_set_anamorphic_size( title->job, output_width, output_height, output_par_width, output_par_height );
-}
-
-/**
- * Calculates job width and height for anamorphic content,
- *
  * @param job Handle to hb_job_t
  * @param output_width Pointer to returned storage width
  * @param output_height Pointer to returned storage height
@@ -1163,6 +1229,78 @@
 }
 
 /**
+ * Add a filter to a jobs filter list
+ *
+ * @param job Handle to hb_job_t
+ * @param settings to give the filter
+ */
+void hb_add_filter( hb_job_t * job, hb_filter_object_t * filter, const char * settings_in )
+{
+    char * settings = NULL;
+
+    if ( settings_in != NULL )
+    {
+        settings = strdup( settings_in );
+    }
+    filter->settings = settings;
+    if( filter->enforce_order )
+    {
+        // Find the position in the filter chain this filter belongs in
+        int i;
+        for( i = 0; i < hb_list_count( job->list_filter ); i++ )
+        {
+            hb_filter_object_t * f = hb_list_item( job->list_filter, i );
+            if( f->id > filter->id )
+            {
+                hb_list_insert( job->list_filter, i, filter );
+                return;
+            }
+            else if( f->id == filter->id )
+            {
+                // Don't allow the same filter to be added twice
+                hb_filter_close( &filter );
+                return;
+            }
+        }
+    }
+    // No position found or order not enforced for this filter
+    hb_list_add( job->list_filter, filter );
+}
+
+/**
+ * Validate and adjust dimensions if necessary
+ *
+ * @param job Handle to hb_job_t
+ */
+void hb_validate_size( hb_job_t * job )
+{
+    if ( job->anamorphic.mode )
+    {
+        hb_set_anamorphic_size( job, &job->width, &job->height,
+            &job->anamorphic.par_width, &job->anamorphic.par_height );
+    }
+    else
+    {
+        if ( job->maxHeight && ( job->height > job->maxHeight )  )
+        {
+            job->height = job->maxHeight;
+            hb_fix_aspect( job, HB_KEEP_HEIGHT );
+            hb_log( "Height out of bounds, scaling down to %i",
+                    job->maxHeight );
+            hb_log( "New dimensions %i * %i", job->width, job->height );
+        }
+        if ( job->maxWidth && ( job->width > job->maxWidth )  )
+        {
+            job->width = job->maxWidth;
+            hb_fix_aspect( job, HB_KEEP_WIDTH );
+            hb_log( "Width out of bounds, scaling down to %i",
+                    job->maxWidth );
+            hb_log( "New dimensions %i * %i", job->width, job->height );
+        }
+    }
+}
+
+/**
  * Calculates job width, height, and cropping parameters.
  * @param job Handle to hb_job_t.
  * @param aspect Desired aspect ratio. Value of -1 uses title aspect.
@@ -1278,53 +1416,6 @@
 }
 
 /**
- * Applies information from the given job to the official job instance.
- * @param h Handle to hb_handle_t.
- * @param title_index Index of the title to apply the chapter name to (1-based).
- * @param chapter The chapter to apply the name to (1-based).
- * @param job Job information to apply.
- */
-void hb_set_chapter_name( hb_handle_t * h, int title_index, int chapter_index, const char * chapter_name )
-{
-    hb_title_t * title;
-    title = hb_get_title_by_index( h, title_index );
-    
-    hb_chapter_t * chapter = hb_list_item( title->list_chapter, chapter_index - 1 );
-    
-    strncpy(chapter->title, chapter_name, 1023);
-    chapter->title[1023] = '\0';
-}
-
-/**
- * Applies information from the given job to the official job instance.
- * Currently only applies information needed for anamorphic size calculation and previews.
- * @param h Handle to hb_handle_t.
- * @param title_index Index of the title to apply the job information to (1-based).
- * @param job Job information to apply.
- */
-void hb_set_job( hb_handle_t * h, int title_index, hb_job_t * job )
-{
-	int i;
-
-    hb_title_t * title;
-    title = hb_get_title_by_index( h, title_index );
-    
-    hb_job_t * job_target = title->job;
-    
-    job_target->deinterlace = job->deinterlace;
-    job_target->width = job->width;
-    job_target->height = job->height;
-    job_target->maxWidth = job->maxWidth;
-    job_target->maxHeight = job->maxHeight;
-    for (i = 0; i < 4; i++)
-    {
-        job_target->crop[i] = job->crop[i];
-    }
-	
-    job_target->anamorphic = job->anamorphic;
-}
-
-/**
  * Adds a job to the job list.
  * @param h Handle to hb_handle_t.
  * @param job Handle to hb_job_t.
@@ -1332,93 +1423,21 @@
 void hb_add( hb_handle_t * h, hb_job_t * job )
 {
     hb_job_t      * job_copy;
-    hb_title_t    * title,    * title_copy;
-    hb_chapter_t  * chapter,  * chapter_copy;
     hb_audio_t    * audio;
     hb_subtitle_t * subtitle;
-    hb_attachment_t * attachment;
     int             i;
     char            audio_lang[4];
 
-    /* Copy the title */
-    title      = job->title;
-    title_copy = malloc( sizeof( hb_title_t ) );
-    memcpy( title_copy, title, sizeof( hb_title_t ) );
-
-    title_copy->list_chapter = hb_list_init();
-    for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
-    {
-        chapter      = hb_list_item( title->list_chapter, i );
-        chapter_copy = malloc( sizeof( hb_chapter_t ) );
-        memcpy( chapter_copy, chapter, sizeof( hb_chapter_t ) );
-        hb_list_add( title_copy->list_chapter, chapter_copy );
-    }
-
-    /*
-     * Copy the metadata
-     */
-    if( title->metadata )
-    {
-        title_copy->metadata = malloc( sizeof( hb_metadata_t ) );
-        
-        if( title_copy->metadata ) 
-        {
-            memcpy( title_copy->metadata, title->metadata, sizeof( hb_metadata_t ) );
-
-            /*
-             * Need to copy the artwork seperatly (TODO).
-             */
-            if( title->metadata->coverart )
-            {
-                title_copy->metadata->coverart = malloc( title->metadata->coverart_size );
-                if( title_copy->metadata->coverart )
-                {
-                    memcpy( title_copy->metadata->coverart, title->metadata->coverart,
-                            title->metadata->coverart_size );
-                } else {
-                    title_copy->metadata->coverart_size = 0; 
-                }
-            }
-        }
-    }
-
-    /* Copy the audio track(s) we want */
-    title_copy->list_audio = hb_list_init();
-    for( i = 0; i < hb_list_count(job->list_audio); i++ )
-    {
-        if( ( audio = hb_list_item( job->list_audio, i ) ) )
-        {
-            hb_list_add( title_copy->list_audio, hb_audio_copy(audio) );
-        }
-    }
-
-    /* Initialize subtitle list - filled out further below */
-    title_copy->list_subtitle = hb_list_init();
-    
-    /* Copy all the attachments */
-    title_copy->list_attachment = hb_list_init();
-    for( i = 0; i < hb_list_count(title->list_attachment); i++ )
-    {
-        if( ( attachment = hb_list_item( title->list_attachment, i ) ) )
-        {
-            hb_list_add( title_copy->list_attachment, hb_attachment_copy(attachment) );
-        }
-    }
-    title_copy->video_codec_name = strdup( title->video_codec_name );
+    /* Copy the job */
+    job_copy        = calloc( sizeof( hb_job_t ), 1 );
+    memcpy( job_copy, job, sizeof( hb_job_t ) );
 
-    /*
-     * The following code is confusing, there are two ways in which
-     * we select subtitles and it depends on whether this is single or
-     * two pass mode.
-     *
-     * subtitle_scan may be enabled, in which case the first pass
-     * scans all subtitles of that language. The second pass does not
-     * select any because they are set at the end of the first pass.
+    /* If we're doing Foreign Audio Search, copy all subtitles matching the
+     * first audio track language we find in the audio list.
      *
-     * We may have manually selected a subtitle, in which case that is
-     * selected in the first pass of a single pass, or the second of a
-     * two pass.
-     */
+     * Otherwise, copy all subtitles found in the input job (which can be
+     * manually selected by the user, or added after the Foreign Audio
+     * Search pass). */
     memset( audio_lang, 0, sizeof( audio_lang ) );
 
     if( job->indepth_scan )
@@ -1434,77 +1453,58 @@
                 break;
             }
         }
-        for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+
+        /*
+         * If doing a subtitle scan then add all the matching subtitles for this
+         * language.
+         */
+        job_copy->list_subtitle = hb_list_init();
+    
+        for( i = 0; i < hb_list_count( job->title->list_subtitle ); i++ )
         {
-            subtitle = hb_list_item( title->list_subtitle, i );
+            subtitle = hb_list_item( job->title->list_subtitle, i );
             if( strcmp( subtitle->iso639_2, audio_lang ) == 0 &&
-                subtitle->source == VOBSUB )
+                hb_subtitle_can_force( subtitle->source ) )
             {
-                /* Matched subtitle language with audio language, so
-                 * add this to our list to scan.
+                /* Matched subtitle language with audio language, so add this to
+                 * our list to scan.
                  *
-                 * We will update the subtitle list on the second pass
-                 * later after the first pass has completed. */
-                hb_list_add( title_copy->list_subtitle, hb_subtitle_copy( subtitle ) );
+                 * We will update the subtitle list on the next pass later, after
+                 * the subtitle scan pass has completed. */
+                hb_list_add( job_copy->list_subtitle,
+                             hb_subtitle_copy( subtitle ) );
             }
         }
     }
     else
     {
-        /*
-         * Not doing a subtitle scan in this pass, but maybe we are in the
-         * first pass?
-         */
-        if( job->pass != 1 )
-        {
-            /* Copy all subtitles from the input job to title_copy/job_copy. */
-            for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
-            {
-                if( ( subtitle = hb_list_item( job->list_subtitle, i ) ) )
-                {
-                    hb_list_add( title_copy->list_subtitle, hb_subtitle_copy( subtitle ) );
-                }
-            }
-        }
+        /* Copy all subtitles from the input job to title_copy/job_copy. */
+        job_copy->list_subtitle = hb_subtitle_list_copy( job->list_subtitle );
     }
 
-    /* Copy the job */
-    job_copy        = calloc( sizeof( hb_job_t ), 1 );
-    memcpy( job_copy, job, sizeof( hb_job_t ) );
-    title_copy->job = job_copy;
-    job_copy->title = title_copy;
-    job_copy->list_audio = title_copy->list_audio;
-    job_copy->list_subtitle = title_copy->list_subtitle;   // sharing list between title and job
-    job_copy->file  = strdup( job->file );
+    job_copy->list_chapter = hb_chapter_list_copy( job->list_chapter );
+    job_copy->list_audio = hb_audio_list_copy( job->list_audio );
+    job_copy->list_attachment = hb_attachment_list_copy( job->list_attachment );
+    job_copy->metadata = hb_metadata_copy( job->metadata );
+
+    if ( job->file )
+        job_copy->file  = strdup( job->file );
+    if ( job->advanced_opts )
+        job_copy->advanced_opts  = strdup( job->advanced_opts );
+    if ( job->x264_preset )
+        job_copy->x264_preset  = strdup( job->x264_preset );
+    if ( job->x264_tune )
+        job_copy->x264_tune  = strdup( job->x264_tune );
+    if ( job->h264_profile )
+        job_copy->h264_profile  = strdup( job->h264_profile );
+    if ( job->h264_level )
+        job_copy->h264_level  = strdup( job->h264_level );
+
     job_copy->h     = h;
     job_copy->pause = h->pause_lock;
 
     /* Copy the job filter list */
-    if( job->filters )
-    {
-        int i;
-        int filter_count = hb_list_count( job->filters );
-        job_copy->filters = hb_list_init();
-        for( i = 0; i < filter_count; i++ )
-        {
-            /*
-             * Copy the filters, since the MacGui reuses the global filter objects
-             * meaning that queued up jobs overwrite the previous filter settings.
-             * In reality, settings is probably the only field that needs duplicating
-             * since it's the only value that is ever changed. But name is duplicated
-             * as well for completeness. Not copying private_data since it gets
-             * created for each job in renderInit.
-             */
-            hb_filter_object_t * filter = hb_list_item( job->filters, i );
-            hb_filter_object_t * filter_copy = malloc( sizeof( hb_filter_object_t ) );
-            memcpy( filter_copy, filter, sizeof( hb_filter_object_t ) );
-            if( filter->name )
-                filter_copy->name = strdup( filter->name );
-            if( filter->settings )
-                filter_copy->settings = strdup( filter->settings );
-            hb_list_add( job_copy->filters, filter_copy );
-        }
-    }
+    job_copy->list_filter = hb_filter_list_copy( job->list_filter );
 
     /* Add the job to the list */
     hb_list_add( h->jobs, job_copy );
@@ -1629,52 +1629,6 @@
 }
 
 /**
- * Gets a filter object with the given type and settings.
- * @param filter_id The type of filter to get.
- * @param settings The filter settings to use.
- * @returns The requested filter object.
- */
-hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings)
-{
-    if (filter_id == HB_FILTER_ROTATE)
-    {
-        hb_filter_rotate.settings = (char*)settings;
-        return &hb_filter_rotate;
-    }
-
-    if (filter_id == HB_FILTER_DETELECINE)
-    {
-        hb_filter_detelecine.settings = (char*)settings;
-        return &hb_filter_detelecine;
-    }
-
-    if (filter_id == HB_FILTER_DECOMB)
-    {
-        hb_filter_decomb.settings = (char*)settings;
-        return &hb_filter_decomb;
-    }
-
-    if (filter_id == HB_FILTER_DEINTERLACE)
-    {
-        hb_filter_deinterlace.settings = (char*)settings;
-        return &hb_filter_deinterlace;
-    }
-
-    if (filter_id == HB_FILTER_DEBLOCK)
-    {
-        hb_filter_deblock.settings = (char*)settings;
-        return &hb_filter_deblock;
-    }
-
-    if (filter_id == HB_FILTER_DENOISE)
-    {
-        hb_filter_denoise.settings = (char*)settings;
-        return &hb_filter_denoise;
-    }
-    return NULL;
-}
-
-/**
  * Returns the state of the conversion process.
  * @param h Handle to hb_handle_t.
  * @param s Handle to hb_state_t which to copy the state data.
@@ -1721,22 +1675,19 @@
     
     hb_thread_close( &h->main_thread );
 
-    while( ( title = hb_list_item( h->list_title, 0 ) ) )
+    while( ( title = hb_list_item( h->title_set.list_title, 0 ) ) )
     {
-        hb_list_rem( h->list_title, title );
-        if( title->job && title->job->filters )
-        {
-            hb_list_close( &title->job->filters );
-        }
-        free( title->job );
+        hb_list_rem( h->title_set.list_title, title );
         hb_title_close( &title );
     }
-    hb_list_close( &h->list_title );
+    hb_list_close( &h->title_set.list_title );
 
     hb_list_close( &h->jobs );
     hb_lock_close( &h->state_lock );
     hb_lock_close( &h->pause_lock );
 
+    hb_system_sleep_opaque_close(&h->system_sleep_opaque);
+
     free( h->interjob );
 
     free( h );
@@ -1815,9 +1766,9 @@
                 hb_title_t * title;
 
                 hb_remove_previews( h );
-                while( ( title = hb_list_item( h->list_title, 0 ) ) )
+                while( ( title = hb_list_item( h->title_set.list_title, 0 ) ) )
                 {
-                    hb_list_rem( h->list_title, title );
+                    hb_list_rem( h->title_set.list_title, title );
                     hb_title_close( &title );
                 }
 
@@ -1826,7 +1777,7 @@
             else
             {
                 hb_log( "libhb: scan thread found %d valid title(s)",
-                        hb_list_count( h->list_title ) );
+                        hb_list_count( h->title_set.list_title ) );
             }
             hb_lock( h->state_lock );
             h->state.state = HB_STATE_SCANDONE; //originally state.state
@@ -1914,29 +1865,6 @@
 }
 
 /**
- * Returns the title with the given title index.
- * @param h Handle to hb_handle_t
- * @param title_index the index of the title to get
- * @returns The requested title
- */
-hb_title_t * hb_get_title_by_index( hb_handle_t * h, int title_index )
-{
-    hb_title_t * title;
-    int i;
-	int count = hb_list_count( h->list_title );
-    for (i = 0; i < count; i++)
-    {
-        title = hb_list_item( h->list_title, i );
-        if (title->index == title_index)
-        {
-            return title;
-        }
-    }
-    
-    return NULL;
-}
-
-/**
  * Sets the current state.
  * @param h Handle to hb_handle_t
  * @param s Handle to new hb_state_t
@@ -1967,61 +1895,18 @@
     hb_unlock( h->pause_lock );
 }
 
-/* Passes a pointer to persistent data */
-hb_interjob_t * hb_interjob_get( hb_handle_t * h )
+void hb_system_sleep_allow(hb_handle_t *h)
 {
-    return h->interjob;
+    hb_system_sleep_private_enable(h->system_sleep_opaque);
 }
 
-/************************************************************************
- * encca_haac_available()
- ************************************************************************
- * Returns whether the Core Audio HE-AAC encoder is available for use
- * on the system. Under 10.5, if the encoder is available, register it.
- * The registration is actually only performed on the first call.
- ************************************************************************/
-int encca_haac_available()
+void hb_system_sleep_prevent(hb_handle_t *h)
 {
-#ifdef __APPLE__
-    static int encca_haac_available = -1;
-
-    if (encca_haac_available != -1)
-        return encca_haac_available;
-
-    encca_haac_available = 0;
-
-    long minorVersion, majorVersion, quickTimeVersion;
-    Gestalt(gestaltSystemVersionMajor, &majorVersion);
-    Gestalt(gestaltSystemVersionMinor, &minorVersion);
-    Gestalt(gestaltQuickTime, &quickTimeVersion);
-
-    if (majorVersion > 10 || (majorVersion == 10 && minorVersion >= 6))
-    {
-        // OS X 10.6+ - ca_haac is available and ready to use
-        encca_haac_available = 1;
-    }
-    else if (majorVersion == 10 && minorVersion >= 5 && quickTimeVersion >= 0x07630000)
-    {
-        // OS X 10.5, QuickTime 7.6.3+ - register the component
-        ComponentDescription cd;
-        cd.componentType         = kAudioEncoderComponentType;
-        cd.componentSubType      = kAudioFormatMPEG4AAC_HE;
-        cd.componentManufacturer = kAudioUnitManufacturer_Apple;
-        cd.componentFlags        = 0;
-        cd.componentFlagsMask    = 0;
-        ComponentResult (*ComponentRoutine) (ComponentParameters * cp, Handle componentStorage);
-        void *handle = dlopen("/System/Library/Components/AudioCodecs.component/Contents/MacOS/AudioCodecs", RTLD_LAZY|RTLD_LOCAL);
-        if (handle)
-        {
-            ComponentRoutine = dlsym(handle, "ACMP4AACHighEfficiencyEncoderEntry");
-            if (ComponentRoutine)
-                if (RegisterComponent(&cd, ComponentRoutine, 0, NULL, NULL, NULL))
-                    encca_haac_available = 1;
-        }
-    }
+    hb_system_sleep_private_disable(h->system_sleep_opaque);
+}
 
-    return encca_haac_available;
-#else
-    return 0;
-#endif
+/* Passes a pointer to persistent data */
+hb_interjob_t * hb_interjob_get( hb_handle_t * h )
+{
+    return h->interjob;
 }

HandBrake-0.9.8.tar.bz2/libhb/hb.h -> HandBrake-0.9.9.tar.bz2/libhb/hb.h Changed

@@ -1,3 +1,12 @@
+/* hb.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
 #ifndef HB_HB_H
 #define HB_HB_H
 
@@ -7,14 +16,7 @@
 
 #include "project.h"
 #include "common.h"
-
-#ifdef __APPLE__
-#include <CoreServices/CoreServices.h> // for Gestalt
-#include <AudioToolbox/AudioToolbox.h>
-#include <dlfcn.h>
-#endif
-/* Whether the Core Audio HE-AAC encoder is available on the system. */
-int encca_haac_available();
+#include "hb_dict.h"
 
 /* hb_init()
    Initializes a libhb session (launches his own thread, detects CPUs,
@@ -47,42 +49,55 @@
                        int title_index, int preview_count,
                        int store_previews, uint64_t min_duration );
 void          hb_scan_stop( hb_handle_t * );
-hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings);
 uint64_t      hb_first_duration( hb_handle_t * );
 
 /* hb_get_titles()
    Returns the list of valid titles detected by the latest scan. */
 hb_list_t   * hb_get_titles( hb_handle_t * );
 
+/* hb_get_title_set()
+   Returns the title set which contains a list of valid titles detected
+   by the latest scan and title set data. */
+hb_title_set_t   * hb_get_title_set( hb_handle_t * );
+
 /* hb_detect_comb()
    Analyze a frame for interlacing artifacts, returns true if they're found.
    Taken from Thomas Oestreich's 32detect filter in the Transcode project.  */
 int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold );
 
-void          hb_get_preview_by_index( hb_handle_t *, int, int, uint8_t * );
-void          hb_get_preview( hb_handle_t *, hb_title_t *, int,
+// JJJ: title->job?
+int           hb_save_preview( hb_handle_t * h, int title, int preview, 
+                               hb_buffer_t *buf );
+hb_buffer_t * hb_read_preview( hb_handle_t * h, int title_idx, int preview );
+void          hb_get_preview( hb_handle_t *, hb_job_t *, int,
                               uint8_t * );
 void          hb_set_size( hb_job_t *, double ratio, int pixels );
-void          hb_set_anamorphic_size_by_index( hb_handle_t *, int,
-                int *output_width, int *output_height,
-                int *output_par_width, int *output_par_height );
 void          hb_set_anamorphic_size( hb_job_t *,
                 int *output_width, int *output_height,
                 int *output_par_width, int *output_par_height );
+void          hb_validate_size( hb_job_t * job );
+void          hb_add_filter( hb_job_t * job, hb_filter_object_t * filter, 
+                const char * settings );
 
 /* Handling jobs */
 int           hb_count( hb_handle_t * );
 hb_job_t *    hb_job( hb_handle_t *, int );
-void          hb_set_chapter_name( hb_handle_t *, int, int, const char * );
-void          hb_set_job( hb_handle_t *, int, hb_job_t * );
 void          hb_add( hb_handle_t *, hb_job_t * );
 void          hb_rem( hb_handle_t *, hb_job_t * );
 
+hb_job_t *    hb_job_init_by_index( hb_handle_t *h, int title_index );
+hb_job_t *    hb_job_init( hb_title_t * title );
+void          hb_job_reset( hb_job_t * job );
+void          hb_job_close( hb_job_t ** job );
+
 void          hb_start( hb_handle_t * );
 void          hb_pause( hb_handle_t * );
 void          hb_resume( hb_handle_t * );
 void          hb_stop( hb_handle_t * );
 
+void          hb_system_sleep_allow(hb_handle_t*);
+void          hb_system_sleep_prevent(hb_handle_t*);
+
 /* Persistent data between jobs. */
 typedef struct hb_interjob_s
 {

HandBrake-0.9.9.tar.bz2/libhb/hb_dict.c Added

@@ -0,0 +1,223 @@
+/* hb_dict.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "hb.h"
+#include "hb_dict.h"
+
+hb_dict_t * hb_dict_init( int alloc )
+{
+    hb_dict_t * dict = NULL;
+    dict = malloc( sizeof( hb_dict_t ) );
+    if( !dict )
+    {
+        hb_log( "ERROR: could not allocate hb_dict_t" );
+        return NULL;
+    }
+    dict->count = 0;
+    dict->objects = malloc( alloc * sizeof( hb_dict_entry_t ) );
+    if( !dict->objects )
+    {
+        hb_log( "ERROR: could not allocate hb_dict_t objects" );
+        dict->alloc = 0;
+    }
+    else
+    {
+        dict->alloc = alloc;
+    }
+    return dict;
+}
+
+void hb_dict_free( hb_dict_t ** dict_ptr )
+{
+    hb_dict_t * dict = *dict_ptr;
+    if( dict )
+    {
+        if( dict->objects )
+        {
+            int i;
+            for( i = 0; i < dict->count; i++ )
+            {
+                if( dict->objects[i].key )
+                {
+                    free( dict->objects[i].key );
+                }
+                if( dict->objects[i].value )
+                {
+                    free( dict->objects[i].value );
+                }
+            }
+            free( dict->objects );
+        }
+        free( *dict_ptr );
+        *dict_ptr = NULL;
+    }
+}
+
+void hb_dict_set( hb_dict_t ** dict_ptr, const char * key, const char * value )
+{
+    hb_dict_t * dict = *dict_ptr;
+    if( !dict )
+    {
+        hb_log( "hb_dict_set: NULL dictionary" );
+        return;
+    }
+    if( !key || !strlen( key ) )
+        return;
+    hb_dict_entry_t * entry = hb_dict_get( dict, key );
+    if( entry )
+    {
+        if( entry->value )
+        {
+            if( value && !strcmp( value, entry->value ) )
+                return;
+            else
+            {
+                free( entry->value );
+                entry->value = NULL;
+            }
+        }
+        if( value && strlen( value ) )
+            entry->value = strdup( value );
+    }
+    else
+    {
+        if( dict->alloc <= dict->count )
+        {
+            hb_dict_entry_t * tmp = NULL;
+            tmp = malloc( ( 2 * dict->alloc ) * sizeof( hb_dict_entry_t ) );
+            if( !tmp )
+            {
+                hb_log( "ERROR: could not realloc hb_dict_t objects" );
+                return;
+            }
+            if( dict->objects )
+            {
+                if( dict->count )
+                    memcpy( tmp, dict->objects, dict->count * sizeof( hb_dict_entry_t ) );
+                free( dict->objects );
+            }
+            dict->objects = tmp;
+            dict->alloc *= 2;
+        }
+        dict->objects[dict->count].key = strdup( key );
+        if( value && strlen( value ) )
+            dict->objects[dict->count].value = strdup( value );
+        else
+            dict->objects[dict->count].value = NULL;
+        dict->count++;
+    }
+}
+
+void hb_dict_unset( hb_dict_t ** dict_ptr, const char * key )
+{
+    hb_dict_t * dict = *dict_ptr;
+    if( !dict || !dict->objects || !key || !strlen( key ) )
+        return;
+    int i;
+    for( i = 0; i < dict->count; i++ )
+        if( !strcmp( key, dict->objects[i].key ) )
+        {
+            free( dict->objects[i].key );
+            if( dict->objects[i].value )
+                free( dict->objects[i].value );
+            if( i != --dict->count )
+                memmove( &dict->objects[i], &dict->objects[i+1],
+                         sizeof( hb_dict_entry_t ) * ( dict->count - i ) );
+        }
+}
+
+hb_dict_entry_t * hb_dict_get( hb_dict_t * dict, const char * key )
+{
+    if( !dict || !dict->objects || !key || !strlen( key ) )
+        return NULL;
+    int i;
+    for( i = 0; i < dict->count; i++ )
+        if( !strcmp( key, dict->objects[i].key ) )
+            return &dict->objects[i];
+    return NULL;
+}
+
+hb_dict_entry_t * hb_dict_next( hb_dict_t * dict, hb_dict_entry_t * previous )
+{
+    if( dict == NULL || dict->objects == NULL || !dict->count )
+        return NULL;
+    if( previous == NULL )
+        return &dict->objects[0];
+    unsigned int prev_index = previous - dict->objects;
+    if( prev_index + 1 < dict->count )
+            return &dict->objects[prev_index+1];
+    return NULL;
+}
+
+hb_dict_t * hb_encopts_to_dict( const char * encopts, int encoder )
+{
+    hb_dict_t * dict = NULL;
+    if( encopts && *encopts )
+    {
+        char *cur_opt, *opts_start, *value;
+        const char *name;
+        dict = hb_dict_init( 10 );
+        if( !dict )
+            return NULL;
+        cur_opt = opts_start = strdup( encopts );
+        if( opts_start )
+        {
+            while( *cur_opt )
+            {
+                name = cur_opt;
+                cur_opt += strcspn( cur_opt, ":" );
+                if( *cur_opt )
+                {
+                    *cur_opt = 0;
+                    cur_opt++;
+                }
+                value = strchr( name, '=' );
+                if( value )
+                {
+                    *value = 0;
+                    value++;
+                }
+                // x264 has multiple names for some options
+                if( encoder == HB_VCODEC_X264 )
+                    name = hb_x264_encopt_name( name );
+                hb_dict_set( &dict, name, value );
+            }
+        }
+        free( opts_start );
+    }
+    return dict;
+}
+
+char * hb_dict_to_encopts( hb_dict_t * dict )
+{
+    int first_opt = 1;
+    char *tmp, *encopts_tmp, *encopts = NULL;
+    hb_dict_entry_t * entry = NULL;
+    while( ( entry = hb_dict_next( dict, entry ) ) )
+    {
+        tmp = hb_strdup_printf( "%s%s%s%s",
+                                first_opt    ? "" : ":",
+                                entry->key,
+                                entry->value ? "=" : "",
+                                entry->value ? entry->value : "" );
+        if( tmp )
+        {
+            encopts_tmp = hb_strncat_dup( encopts, tmp, strlen( tmp ) );
+            if( encopts_tmp )
+            {
+                if( encopts )
+                    free( encopts );
+                encopts = encopts_tmp;
+            }
+            first_opt = 0;
+            free( tmp );
+        }
+    }
+    return encopts;
+}

HandBrake-0.9.9.tar.bz2/libhb/hb_dict.h Added

@@ -0,0 +1,54 @@
+/* hb_dict.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+#if !defined(HB_DICT_H)
+#define HB_DICT_H
+
+typedef struct hb_dict_entry_s hb_dict_entry_t;
+typedef struct hb_dict_s       hb_dict_t;
+
+/* Basic dictionary implementation.
+ *
+ * an hb_dict_t must be initialized with hb_dict_init() before use.
+ *
+ * "key" must be a string with non-zero length (NULL and "" are invalid keys).
+ * "value" can be NULL (the zero-length string "" is mapped to NULL).
+ *
+ * hb_dict_next( dict, NULL ) returns the first key in the dictionary.
+ * hb_dict_next( dict, previous ) returns key directly following previous, or
+ * NULL if the end of the dictionary was reached.
+ *
+ * hb_encopts_to_dict() converts an op1=val1:opt2=val2:opt3=val3 type string to
+ * an hb_dict_t dictionary. */
+
+hb_dict_t * hb_dict_init( int alloc );
+void        hb_dict_free( hb_dict_t ** dict_ptr );
+
+void hb_dict_set(   hb_dict_t ** dict_ptr, const char * key, const char * value );
+void hb_dict_unset( hb_dict_t ** dict_ptr, const char * key );
+
+hb_dict_entry_t * hb_dict_get(  hb_dict_t * dict, const char * key );
+hb_dict_entry_t * hb_dict_next( hb_dict_t * dict, hb_dict_entry_t * previous );
+
+hb_dict_t * hb_encopts_to_dict( const char * encopts, int encoder );
+char      * hb_dict_to_encopts( hb_dict_t  * dict );
+
+struct hb_dict_entry_s
+{
+    char * key;
+    char * value;
+};
+
+struct hb_dict_s
+{
+    int alloc;
+    int count;
+    hb_dict_entry_t * objects;
+};
+
+#endif // !defined(HB_DICT_H)

HandBrake-0.9.8.tar.bz2/libhb/hbffmpeg.h -> HandBrake-0.9.9.tar.bz2/libhb/hbffmpeg.h Changed

@@ -1,22 +1,33 @@
-/* This file is part of the HandBrake source code.
+/* hbffmpeg.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "libavcodec/avcodec.h"
 #include "libavformat/avformat.h"
-#include "libavutil/opt.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libswscale/swscale.h"
+#include "libavresample/avresample.h"
 
-#define HB_FFMPEG_THREADS_AUTO (-1) // let hb_avcodec_open decide thread_count
+#define HB_FFMPEG_THREADS_AUTO (-1) // let hb_avcodec_open() decide thread_count
 
 void hb_avcodec_init(void);
-int hb_avcodec_open( AVCodecContext *, struct AVCodec *, AVDictionary **av_opts, int thread_count );
-int hb_avcodec_close( AVCodecContext * );
-int hb_ff_layout_xlat(int64_t ff_layout, int channels);
+int  hb_avcodec_open(AVCodecContext *, AVCodec *, AVDictionary **, int);
+int  hb_avcodec_close(AVCodecContext *);
+
+uint64_t hb_ff_layout_xlat(uint64_t ff_channel_layout, int nchannels);
+uint64_t hb_ff_mixdown_xlat(int hb_mixdown, int *downmix_mode);
+void     hb_ff_set_sample_fmt(AVCodecContext *, AVCodec *, enum AVSampleFormat);
+
 struct SwsContext*
-hb_sws_get_context(int srcW, int srcH, enum PixelFormat srcFormat,
-                   int dstW, int dstH, enum PixelFormat dstFormat,
+hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat,
+                   int dstW, int dstH, enum AVPixelFormat dstFormat,
                    int flags);
-void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec);
-int hb_ff_dts_disable_xch( AVCodecContext *c );
+int hb_avpicture_fill(AVPicture *pic, hb_buffer_t *buf);

HandBrake-0.9.8.tar.bz2/libhb/internal.h -> HandBrake-0.9.9.tar.bz2/libhb/internal.h Changed

@@ -1,8 +1,13 @@
-/* $Id: internal.h,v 1.41 2005/11/25 15:05:25 titer Exp $
+/* internal.h
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "hbffmpeg.h"
 
 /***********************************************************************
  * common.c
@@ -29,8 +34,6 @@
 hb_title_t * hb_title_init( char * dvd, int index );
 void         hb_title_close( hb_title_t ** );
 
-void         hb_filter_close( hb_filter_object_t ** );
-
 /***********************************************************************
  * hb.c
  **********************************************************************/
@@ -40,6 +43,7 @@
 /***********************************************************************
  * fifo.c
  **********************************************************************/
+
 /*
  * Holds a packet of data that is moving through the transcoding process.
  * 
@@ -51,7 +55,7 @@
     int           size;     // size of this packet
     int           alloc;    // used internally by the packet allocator (hb_buffer_init)
     uint8_t *     data;     // packet data
-    int           cur;      // used internally by packet lists (hb_list_t)
+    int           offset;   // used internally by packet lists (hb_list_t)
 
     /*
      * Corresponds to the order that this packet was read from the demuxer.
@@ -66,40 +70,58 @@
      */
     int64_t       sequence;
 
-    enum { AUDIO_BUF, VIDEO_BUF, SUBTITLE_BUF, OTHER_BUF } type;
-
-    int           id;           // ID of the track that the packet comes from
-    int64_t       start;        // Video and subtitle packets: start time of frame/subtitle
-    double        duration;     // Actual duration, may be fractional ticks
-    int64_t       stop;         // Video and subtitle packets: stop time of frame/subtitle
-    int64_t       pcr;
-    uint8_t       discontinuity;
-    int           new_chap;     // Video packets: if non-zero, is the index of the chapter whose boundary was crossed
-
-#define HB_FRAME_IDR    0x01
-#define HB_FRAME_I      0x02
-#define HB_FRAME_AUDIO  0x04
-#define HB_FRAME_P      0x10
-#define HB_FRAME_B      0x20
-#define HB_FRAME_BREF   0x40
-#define HB_FRAME_KEY    0x0F
-#define HB_FRAME_REF    0xF0
-    uint8_t       frametype;
-    uint16_t       flags;
-
-    /* Holds the output PTS from x264, for use by b-frame offsets in muxmp4.c */
-    int64_t     renderOffset;
+    struct settings
+    {
+        enum { AUDIO_BUF, VIDEO_BUF, SUBTITLE_BUF, FRAME_BUF, OTHER_BUF } type;
+
+        int           id;           // ID of the track that the packet comes from
+        int64_t       start;        // start time of frame
+        double        duration;     // Actual duration, may be fractional ticks
+        int64_t       stop;         // stop time of frame
+        int64_t       renderOffset; // DTS used by b-frame offsets in muxmp4
+        int64_t       pcr;
+        uint8_t       discontinuity;
+        int           new_chap;     // Video packets: if non-zero, is the index of the chapter whose boundary was crossed
+
+    #define HB_FRAME_IDR    0x01
+    #define HB_FRAME_I      0x02
+    #define HB_FRAME_AUDIO  0x04
+    #define HB_FRAME_P      0x10
+    #define HB_FRAME_B      0x20
+    #define HB_FRAME_BREF   0x40
+    #define HB_FRAME_KEY    0x0F
+    #define HB_FRAME_REF    0xF0
+        uint8_t       frametype;
+        uint16_t      flags;
+    } s;
+
+    struct format
+    {
+        int           x;
+        int           y;
+        int           width;
+        int           height;
+        int           fmt;
+    } f;
+
+    struct plane
+    {
+        uint8_t     * data;
+        int           stride;
+        int           width;
+        int           height;
+        int           height_stride;
+        int           size;
+    } plane[4]; // 3 Color components + alpha
 
     // PICTURESUB subtitle packets:
-    //   Location and size of the subpicture.
-    int           x;
-    int           y;
-    int           width;
-    int           height;
 
     // Video packets (after processing by the hb_sync_video work-object):
-    //   A (copy of a) PICTURESUB subtitle packet that needs to be burned into this video packet by the hb_render work-object.
-    //   Subtitles that are simply passed thru are NOT attached to the associated video packets.
+    //   A (copy of a) PICTURESUB subtitle packet that needs to be burned into 
+    //   this video packet by the vobsub renderer filter
+    //
+    //   Subtitles that are simply passed thru are NOT attached to the 
+    //   associated video packets.
     hb_buffer_t * sub;
 
     // Packets in a list:
@@ -111,11 +133,16 @@
 void hb_buffer_pool_free( void );
 
 hb_buffer_t * hb_buffer_init( int size );
+hb_buffer_t * hb_frame_buffer_init( int pix_fmt, int w, int h);
+void          hb_buffer_init_planes( hb_buffer_t * b );
 void          hb_buffer_realloc( hb_buffer_t *, int size );
+void          hb_video_buffer_realloc( hb_buffer_t * b, int w, int h );
 void          hb_buffer_reduce( hb_buffer_t * b, int size );
 void          hb_buffer_close( hb_buffer_t ** );
-void          hb_buffer_copy_settings( hb_buffer_t * dst,
-                                       const hb_buffer_t * src );
+hb_buffer_t * hb_buffer_dup( const hb_buffer_t * src );
+int           hb_buffer_copy( hb_buffer_t * dst, const hb_buffer_t * src );
+void          hb_buffer_swap_copy( hb_buffer_t *src, hb_buffer_t *dst );
+void          hb_buffer_move_subs( hb_buffer_t * dst, hb_buffer_t * src );
 
 hb_fifo_t   * hb_fifo_init( int capacity, int thresh );
 int           hb_fifo_size( hb_fifo_t * );
@@ -136,39 +163,62 @@
 void          hb_fifo_close( hb_fifo_t ** );
 void          hb_fifo_flush( hb_fifo_t * f );
 
-// this routine gets a buffer for an uncompressed YUV420 video frame
-// with dimensions width x height.
-static inline hb_buffer_t * hb_video_buffer_init( int width, int height )
+static inline int hb_image_stride( int pix_fmt, int width, int plane )
 {
-    // Y requires w x h bytes. U & V each require (w+1)/2 x
-    // (h+1)/2 bytes (the "+1" is to round up). We shift rather
-    // than divide by 2 since the compiler can't know these ints
-    // are positive so it generates very expensive integer divides
-    // if we do "/2". The code here matches the calculation for
-    // PIX_FMT_YUV420P in ffmpeg's avpicture_fill() which is required
-    // for most of HB's filters to work right.
-    hb_buffer_t * b = hb_buffer_init( width * height + ( ( width+1 ) >> 1 ) *
-                                      ( ( height+1 ) >> 1 ) * 2 );
-    b->width = width;
-    b->height = height;
-
-    return b;
+    int linesize = av_image_get_linesize( pix_fmt, width, plane );
+
+    // Make buffer SIMD friendly.
+    // Decomb requires stride aligned to 32 bytes
+    // TODO: eliminate extra buffer copies in decomb
+    linesize = MULTIPLE_MOD_UP( linesize, 32 );
+    return linesize;
 }
 
-// this routine 'moves' data from src to dst by interchanging 'data',
-// 'size' & 'alloc' between them and copying the rest of the fields
-// from src to dst.
-static inline void hb_buffer_swap_copy( hb_buffer_t *src, hb_buffer_t *dst )
+static inline int hb_image_width(int pix_fmt, int width, int plane)
 {
-    uint8_t *data  = dst->data;
-    int      size  = dst->size;
-    int      alloc = dst->alloc;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 
-    *dst = *src;
+    if (desc != NULL && (plane == 1 || plane == 2))
+    {
+        // The wacky arithmatic assures rounding up.
+        width = -((-width) >> desc->log2_chroma_w);
+    }
 
-    src->data  = data;
-    src->size  = size;
-    src->alloc = alloc;
+    return width;
+}
+
+static inline int hb_image_height_stride(int pix_fmt, int height, int plane)
+{
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+
+    // Decomb requires 6 extra lines and stride aligned to 32 bytes
+    height = MULTIPLE_MOD_UP(height + 6, 32);
+    if (desc != NULL && (plane == 1 || plane == 2))
+    {
+        height = height >> desc->log2_chroma_h;
+    }
+
+    return height;
+}
+
+static inline int hb_image_height(int pix_fmt, int height, int plane)
+{
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+
+    if (desc != NULL && (plane == 1 || plane == 2))
+    {
+        // The wacky arithmatic assures rounding up.
+        height = -((-height) >> desc->log2_chroma_h);
+    }
+
+    return height;
+}
+
+// this routine gets a buffer for an uncompressed YUV420 video frame
+// with dimensions width x height.
+static inline hb_buffer_t * hb_video_buffer_init( int width, int height )
+{
+    return hb_frame_buffer_init( AV_PIX_FMT_YUV420P, width, height );
 }
 
 /***********************************************************************
@@ -177,7 +227,7 @@
 hb_thread_t * hb_update_init( int * build, char * version );
 hb_thread_t * hb_scan_init( hb_handle_t *, volatile int * die, 
                             const char * path, int title_index, 
-                            hb_list_t * list_title, int preview_count, 
+                            hb_title_set_t * title_set, int preview_count, 
                             int store_previews, uint64_t min_duration );
 hb_thread_t * hb_work_init( hb_list_t * jobs,
                             volatile int * die, int * error, hb_job_t ** job );
@@ -215,7 +265,7 @@
 /***********************************************************************
  * decmetadata.c
  **********************************************************************/
-extern void decmetadata( hb_title_t *title );
+extern int decmetadata( hb_title_t *title );
 
 /***********************************************************************
  * batch.c
@@ -356,7 +406,6 @@
     WORK_ENCX264,
     WORK_ENCTHEORA,
     WORK_DECA52,
-    WORK_DECDCA,
     WORK_DECAVCODEC,
     WORK_DECAVCODECV,
     WORK_DECLPCM,
@@ -367,18 +416,19 @@
     WORK_ENC_CA_HAAC,
     WORK_ENCAVCODEC_AUDIO,
     WORK_MUX,
-    WORK_READER
+    WORK_READER,
+    WORK_DECPGSSUB
 };
 
-enum
-{
-    FILTER_DEINTERLACE = 1,
-    FILTER_DEBLOCK,
-    FILTER_DENOISE,
-    FILTER_DETELECINE,
-    FILTER_DECOMB,
-    FILTER_ROTATE
-};
+extern hb_filter_object_t hb_filter_detelecine;
+extern hb_filter_object_t hb_filter_deinterlace;
+extern hb_filter_object_t hb_filter_deblock;
+extern hb_filter_object_t hb_filter_denoise;
+extern hb_filter_object_t hb_filter_decomb;
+extern hb_filter_object_t hb_filter_rotate;
+extern hb_filter_object_t hb_filter_crop_scale;
+extern hb_filter_object_t hb_filter_render_sub;
+extern hb_filter_object_t hb_filter_vfr;
 
 // Picture flags used by filters
 #ifndef PIC_FLAG_REPEAT_FIRST_FIELD

HandBrake-0.9.8.tar.bz2/libhb/lang.c -> HandBrake-0.9.9.tar.bz2/libhb/lang.c Changed

HandBrake-0.9.8.tar.bz2/libhb/lang.h -> HandBrake-0.9.9.tar.bz2/libhb/lang.h Changed

HandBrake-0.9.8.tar.bz2/libhb/mcdeint.c -> HandBrake-0.9.9.tar.bz2/libhb/mcdeint.c Changed

@@ -28,6 +28,7 @@
 void mcdeint_init( mcdeint_private_t * pv,
                    int mode,
                    int qp,
+                   int pix_fmt,
                    int width,
                    int height )
 {
@@ -39,50 +40,49 @@
     {
         avcodec_register_all();
 
-        AVCodec * enc = avcodec_find_encoder( CODEC_ID_SNOW );
+        AVCodec * enc = avcodec_find_encoder( AV_CODEC_ID_SNOW );
 
-        int i;
-        for (i = 0; i < 3; i++ )
-        {
-            AVCodecContext * avctx_enc;
-
-            avctx_enc = pv->mcdeint_avctx_enc = avcodec_alloc_context3( enc );
-
-            avctx_enc->width                    = width;
-            avctx_enc->height                   = height;
-            avctx_enc->time_base                = (AVRational){1,25};  // meaningless
-            avctx_enc->gop_size                 = 300;
-            avctx_enc->max_b_frames             = 0;
-            avctx_enc->pix_fmt                  = PIX_FMT_YUV420P;
-            avctx_enc->flags                    = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-            avctx_enc->strict_std_compliance    = FF_COMPLIANCE_EXPERIMENTAL;
-            avctx_enc->global_quality           = 1;
-            avctx_enc->flags2                   = CODEC_FLAG2_MEMC_ONLY;
-            avctx_enc->me_cmp                   = FF_CMP_SAD; //SSE;
-            avctx_enc->me_sub_cmp               = FF_CMP_SAD; //SSE;
-            avctx_enc->mb_cmp                   = FF_CMP_SSE;
-
-            switch( pv->mcdeint_mode )
-            {
-                case 3:
-                    avctx_enc->refs = 3;
-                case 2:
-                    avctx_enc->me_method = ME_ITER;
-                case 1:
-                    avctx_enc->flags |= CODEC_FLAG_4MV;
-                    avctx_enc->dia_size =2;
-                case 0:
-                    avctx_enc->flags |= CODEC_FLAG_QPEL;
-            }
+        // Snow ME_ITER will crash if width & height are not 16 pixel
+        // aligned (or 8 pixel if CODEC_FLAG_4MV is set).
+        // Fortunately, our input buffers have padding
+        width = (width + 15) & ~0xf;
+        height = (height + 15) & ~0xf;
+
+        AVCodecContext * avctx_enc;
 
-            hb_avcodec_open(avctx_enc, enc, NULL, 0);
+        avctx_enc = pv->mcdeint_avctx_enc = avcodec_alloc_context3( enc );
+
+        avctx_enc->width                    = width;
+        avctx_enc->height                   = height;
+        avctx_enc->time_base                = (AVRational){1,25};  // meaningless
+        avctx_enc->gop_size                 = 300;
+        avctx_enc->max_b_frames             = 0;
+        avctx_enc->pix_fmt                  = pix_fmt;
+        avctx_enc->flags                    = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
+        avctx_enc->strict_std_compliance    = FF_COMPLIANCE_EXPERIMENTAL;
+        avctx_enc->global_quality           = 1;
+        avctx_enc->me_cmp                   = FF_CMP_SAD; //SSE;
+        avctx_enc->me_sub_cmp               = FF_CMP_SAD; //SSE;
+        avctx_enc->mb_cmp                   = FF_CMP_SSE;
+
+        switch( pv->mcdeint_mode )
+        {
+            case 3:
+                avctx_enc->refs = 3;
+            case 2:
+                avctx_enc->me_method = ME_ITER;
+            case 1:
+                avctx_enc->flags |= CODEC_FLAG_4MV;
+                avctx_enc->dia_size =2;
+            case 0:
+                avctx_enc->flags |= CODEC_FLAG_QPEL;
         }
 
+        hb_avcodec_open(avctx_enc, enc, NULL, 0);
+
         pv->mcdeint_frame       = avcodec_alloc_frame();
-        pv->mcdeint_outbuf_size = width * height * 10;
-        pv->mcdeint_outbuf      = malloc( pv->mcdeint_outbuf_size );
+        av_new_packet( &pv->mcdeint_pkt, width * height * 10 );
     }
-
 }
 
 void mcdeint_close( mcdeint_private_t * pv )
@@ -95,22 +95,16 @@
             hb_avcodec_close( pv->mcdeint_avctx_enc );
             av_freep( &pv->mcdeint_avctx_enc );
         }
-        if( pv->mcdeint_outbuf )
-        {
-            free( pv->mcdeint_outbuf );
-        }
+        av_free_packet( &pv->mcdeint_pkt );
     }
 }
 
-void mcdeint_filter( uint8_t ** dst,
-                     uint8_t ** src,
+void mcdeint_filter( hb_buffer_t * dst_buf,
+                     hb_buffer_t * src_buf,
                      int parity,
-                     int * width,
-                     int * height,
                      mcdeint_private_t * pv )
 {
     int x, y, i;
-    int out_size;
 
 #ifdef SUPPRESS_AV_LOG
     /* TODO: temporarily change log level to suppress obnoxious debug output */
@@ -120,49 +114,49 @@
 
     for( i=0; i<3; i++ )
     {
-        pv->mcdeint_frame->data[i] = src[i];
-        pv->mcdeint_frame->linesize[i] = width[i];
+        pv->mcdeint_frame->data[i] = src_buf->plane[i].data;
+        pv->mcdeint_frame->linesize[i] = src_buf->plane[i].stride;
     }
     pv->mcdeint_avctx_enc->me_cmp     = FF_CMP_SAD;
     pv->mcdeint_avctx_enc->me_sub_cmp = FF_CMP_SAD;
     pv->mcdeint_frame->quality        = pv->mcdeint_qp * FF_QP2LAMBDA;
 
-    out_size = avcodec_encode_video( pv->mcdeint_avctx_enc,
-                                     pv->mcdeint_outbuf,
-                                     pv->mcdeint_outbuf_size,
-                                     pv->mcdeint_frame );
+    int got_packet;
+
+    avcodec_encode_video2( pv->mcdeint_avctx_enc,
+            &pv->mcdeint_pkt, pv->mcdeint_frame, &got_packet );
 
     pv->mcdeint_frame_dec = pv->mcdeint_avctx_enc->coded_frame;
 
     for( i = 0; i < 3; i++ )
     {
-        int w    = width[i];
-        int h    = height[i];
+        uint8_t * dst = dst_buf->plane[i].data;
+        uint8_t * src = src_buf->plane[i].data;
+        int w    = src_buf->plane[i].stride;
+        int h    = src_buf->plane[i].height;
         int fils = pv->mcdeint_frame_dec->linesize[i];
-        int srcs = width[i];
+        int srcs = src_buf->plane[i].stride;
 
-        for( y = 0; y < h; y++ )
+        for (y = parity; y < h; y += 2)
         {
-            if( (y ^ parity) & 1 )
+            for( x = 0; x < w; x++ )
             {
-                for( x = 0; x < w; x++ )
+                if( (x-1)+(y-1)*w >= 0 && (x+1)+(y+1)*w < w*h )
                 {
-                    if( (x-1)+(y-1)*w >= 0 && (x+1)+(y+1)*w < w*h )
-                    {
-                        uint8_t * filp =
-                            &pv->mcdeint_frame_dec->data[i][x + y*fils];
-                        uint8_t * srcp = &src[i][x + y*srcs];
+                    uint8_t * filp =
+                        &pv->mcdeint_frame_dec->data[i][x + y * fils];
+                    uint8_t * srcp = &src[x + y * srcs];
 
-                        int diff0 = filp[-fils] - srcp[-srcs];
-                        int diff1 = filp[+fils] - srcp[+srcs];
-                        int spatial_score;
-                        
-                        spatial_score =
-                            ABS(srcp[-srcs-1] - srcp[+srcs-1]) +
-                            ABS(srcp[-srcs  ] - srcp[+srcs  ]) +
-                            ABS(srcp[-srcs+1] - srcp[+srcs+1]) - 1;
+                    int diff0 = filp[-fils] - srcp[-srcs];
+                    int diff1 = filp[+fils] - srcp[+srcs];
+                    int spatial_score;
+                    
+                    spatial_score =
+                        ABS(srcp[-srcs-1] - srcp[+srcs-1]) +
+                        ABS(srcp[-srcs  ] - srcp[+srcs  ]) +
+                        ABS(srcp[-srcs+1] - srcp[+srcs+1]) - 1;
 
-                        int temp = filp[0];
+                    int temp = filp[0];
 
 #define MCDEINT_CHECK(j)\
                         {   int score = ABS(srcp[-srcs-1+j] - srcp[+srcs-1-j])\
@@ -173,56 +167,50 @@
                                 diff0 = filp[-fils+j] - srcp[-srcs+j];\
                                 diff1 = filp[+fils-j] - srcp[+srcs-j];
 
-                        if( x >= 2 && x <= w - 3 )
-                        {
-                            MCDEINT_CHECK(-1)
-                            if( x >= 3 && x <= w - 4 )
-                            {
-                                MCDEINT_CHECK(-2) }} }}
-                            }
-                        }
-                        if( x >= 2 && x <= w - 3 )
-                        {
-                            MCDEINT_CHECK(1)
-                            if( x >= 3 && x <= w - 4 )
-                            {
-                                MCDEINT_CHECK(2) }} }}
-                            }
-                        }
-
-                        if(diff0 + diff1 > 0)
+                    if( x >= 2 && x <= w - 3 )
+                    {
+                        MCDEINT_CHECK(-1)
+                        if( x >= 3 && x <= w - 4 )
                         {
-                            temp -= (diff0 + diff1 -
-                                     ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
+                            MCDEINT_CHECK(-2) }} }}
                         }
-                        else
+                    }
+                    if( x >= 2 && x <= w - 3 )
+                    {
+                        MCDEINT_CHECK(1)
+                        if( x >= 3 && x <= w - 4 )
                         {
-                            temp -= (diff0 + diff1 +
-                                     ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
+                            MCDEINT_CHECK(2) }} }}
                         }
+                    }
 
-                        filp[0] = dst[i][x + y*w] =
-                            temp > 255U ? ~(temp>>31) : temp;
+                    if(diff0 + diff1 > 0)
+                    {
+                        temp -= (diff0 + diff1 -
+                                 ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
                     }
                     else
                     {
-                        dst[i][x + y*w] =
-                            pv->mcdeint_frame_dec->data[i][x + y*fils];
+                        temp -= (diff0 + diff1 +
+                                 ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
                     }
+
+                    filp[0] = dst[x + y*w] =
+                        temp > 255U ? ~(temp>>31) : temp;
+                }
+                else
+                {
+                    dst[x + y*w] =
+                        pv->mcdeint_frame_dec->data[i][x + y*fils];
                 }
             }
         }
 
-        for( y = 0; y < h; y++ )
+        for( y = !parity; y < h; y += 2 )
         {
-            if( !((y ^ parity) & 1) )
-            {
-                for( x = 0; x < w; x++ )
-                {
-                    pv->mcdeint_frame_dec->data[i][x + y*fils] =
-                        dst[i][x + y*w]= src[i][x + y*srcs];
-                }
-            }
+            memcpy(&pv->mcdeint_frame_dec->data[i][y * fils],
+                   &src[y * srcs], w);
+            memcpy(&dst[y * w], &src[y * srcs], w);
         }
     }

HandBrake-0.9.8.tar.bz2/libhb/mcdeint.h -> HandBrake-0.9.9.tar.bz2/libhb/mcdeint.h Changed

@@ -1,10 +1,18 @@
+/* mcdeint.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
 struct mcdeint_private_s
 {
     int              mcdeint_mode;
     int              mcdeint_qp;
 
-    int              mcdeint_outbuf_size;
-    uint8_t        * mcdeint_outbuf;
+    AVPacket         mcdeint_pkt;
     AVCodecContext * mcdeint_avctx_enc;
     AVFrame        * mcdeint_frame;
     AVFrame        * mcdeint_frame_dec;
@@ -15,14 +23,13 @@
 void mcdeint_init( mcdeint_private_t * pv,
                    int mode,
                    int qp,
+                   int pix_fmt,
                    int width,
                    int height );
 
 void mcdeint_close( mcdeint_private_t * pv );
 
-void mcdeint_filter( uint8_t ** dst,
-                     uint8_t ** src,
+void mcdeint_filter( hb_buffer_t * dst,
+                     hb_buffer_t * src,
                      int parity,
-                     int * width,
-                     int * height,
                      mcdeint_private_t * pv );

HandBrake-0.9.8.tar.bz2/libhb/module.defs -> HandBrake-0.9.9.tar.bz2/libhb/module.defs Changed

@@ -1,6 +1,6 @@
 __deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
     LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
-    MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY
+    MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC
 
 $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
 $(eval $(call import.GCC,LIBHB))
@@ -37,6 +37,9 @@
 ifeq (1,$(FEATURE.ff.mpeg2))
 LIBHB.GCC.D += USE_FF_MPEG2
 endif
+ifeq (1,$(FEATURE.fdk_aac))
+LIBHB.GCC.D += USE_FDK_AAC
+endif
 LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
 LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
 
@@ -92,10 +95,15 @@
 LIBHB.lib = $(LIBHB.build/)hb.lib
 
 LIBHB.dll.libs = $(foreach n, \
-        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
+        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
+        fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
         $(CONTRIB.build/)lib/lib$(n).a )
 
+ifeq (1,$(FEATURE.fdk_aac))
+LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a
+endif
+
 ifneq ($(HAS.iconv),1)
 LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a
 else
@@ -127,7 +135,7 @@
 endif
 
 LIBHB.GCC.args.extra.dylib++ += -Wl,--out-implib,$(LIBHB.lib)
-LIBHB.GCC.l += iberty ws2_32
+LIBHB.GCC.l += ws2_32
 ifeq ($(HAS.dlfcn),1)
     LIBHB.GCC.l += dl
 endif

HandBrake-0.9.8.tar.bz2/libhb/muxcommon.c -> HandBrake-0.9.9.tar.bz2/libhb/muxcommon.c Changed

@@ -1,9 +1,11 @@
-/* $Id: muxcommon.c,v 1.23 2005/03/30 17:27:19 titer Exp $
+/* muxcommon.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 #include "hb.h"
 
 #define MIN_BUFFERING (1024*1024*10)
@@ -188,7 +190,7 @@
     // (b) we can control how data from multiple tracks is
     // interleaved in the output file.
     mf_push( mux, tk, buf );
-    if ( buf->stop >= mux->pts )
+    if ( buf->s.stop >= mux->pts )
     {
         // buffer is past our next interleave point so
         // note that this track is ready to be output.
@@ -201,7 +203,7 @@
     hb_track_t *track = mux->track[tk];
     hb_buffer_t *buf;
 
-    while ( ( buf = mf_peek( track ) ) != NULL && buf->start < mux->pts )
+    while ( ( buf = mf_peek( track ) ) != NULL && buf->s.start < mux->pts )
     {
         buf = mf_pull( mux, tk );
         track->frames += 1;
@@ -276,7 +278,7 @@
             // Otherwise clear rdy.
             if ( ( mux->eof & (1 << i) ) == 0 &&
                  ( track->mf.out == track->mf.in ||
-                   track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->stop
+                   track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->s.stop
                      < mux->pts + mux->interleave ) )
             {
                 mux->rdy &=~ ( 1 << i );
@@ -439,7 +441,6 @@
 
 hb_work_object_t * hb_muxer_init( hb_job_t * job )
 {
-    hb_title_t  * title = job->title;
     int           i;
     hb_mux_t    * mux = calloc( sizeof( hb_mux_t ), 1 );
     hb_work_object_t  * w;
@@ -488,9 +489,9 @@
     add_mux_track( mux, job->mux_data, 1 );
     muxer->done = &muxer->private_data->mux->done;
 
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+    for( i = 0; i < hb_list_count( job->list_audio ); i++ )
     {
-        hb_audio_t  *audio = hb_list_item( title->list_audio, i );
+        hb_audio_t  *audio = hb_list_item( job->list_audio, i );
 
         w = hb_get_work( WORK_MUX );
         w->private_data = calloc( sizeof( hb_work_private_t ), 1 );
@@ -505,9 +506,9 @@
         w->thread = hb_thread_init( w->name, mux_loop, w, HB_NORMAL_PRIORITY );
     }
 
-    for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+    for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
     {
-        hb_subtitle_t  *subtitle = hb_list_item( title->list_subtitle, i );
+        hb_subtitle_t  *subtitle = hb_list_item( job->list_subtitle, i );
 
         if (subtitle->config.dest != PASSTHRUSUB)
             continue;

HandBrake-0.9.8.tar.bz2/libhb/muxmkv.c -> HandBrake-0.9.9.tar.bz2/libhb/muxmkv.c Changed

@@ -1,8 +1,11 @@
-/* $Id:  $
+/* muxmkv.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 /* libmkv header */
 #include "libmkv.h"
@@ -56,7 +59,6 @@
 static int MKVInit( hb_mux_object_t * m )
 {
     hb_job_t   * job   = m->job;
-    hb_title_t * title = job->title;
     hb_audio_t    * audio;
     hb_mux_data_t * mux_data;
 
@@ -193,17 +195,16 @@
 
     mux_data->track = mk_createTrack(m->file, track);
 
-    memset(track, 0, sizeof(mk_TrackConfig));
-
     /* add the audio tracks */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+    for( i = 0; i < hb_list_count( job->list_audio ); i++ )
     {
-        audio = hb_list_item( title->list_audio, i );
+        audio = hb_list_item( job->list_audio, i );
         mux_data = calloc(1, sizeof( hb_mux_data_t ) );
         audio->priv.mux_data = mux_data;
 
         mux_data->codec = audio->config.out.codec;
 
+        memset(track, 0, sizeof(mk_TrackConfig));
         switch (audio->config.out.codec & HB_ACODEC_MASK)
         {
             case HB_ACODEC_DCA:
@@ -246,11 +247,11 @@
                 }
                 break;
             case HB_ACODEC_FFFLAC:
-                if( audio->priv.config.extradata.bytes )
+            case HB_ACODEC_FFFLAC24:
+                if (audio->priv.config.extradata.bytes)
                 {
-                    track->codecPrivate = create_flac_header( 
-                            audio->priv.config.extradata.bytes,
-                            audio->priv.config.extradata.length );
+                    track->codecPrivate = create_flac_header(audio->priv.config.extradata.bytes,
+                                                             audio->priv.config.extradata.length);
                     track->codecPrivateSize = audio->priv.config.extradata.length + 8;
                 }
                 track->codecID = MK_ACODEC_FLAC;
@@ -259,6 +260,8 @@
             case HB_ACODEC_FFAAC:
             case HB_ACODEC_CA_AAC:
             case HB_ACODEC_CA_HAAC:
+            case HB_ACODEC_FDK_AAC:
+            case HB_ACODEC_FDK_HAAC:
                 track->codecPrivate = audio->priv.config.extradata.bytes;
                 track->codecPrivateSize = audio->priv.config.extradata.length;
                 track->codecID = MK_ACODEC_AAC;
@@ -269,7 +272,7 @@
                 return 0;
         }
 
-        if (default_track_flag)
+        if( default_track_flag )
         {
             track->flagDefault = 1;
             default_track_flag = 0;
@@ -284,7 +287,8 @@
         lang =  lang_for_code2( audio->config.lang.iso639_2 );
         track->language = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2;
         // sample rate
-        if ((audio->config.out.codec == HB_ACODEC_CA_HAAC) ||
+        if ((audio->config.out.codec == HB_ACODEC_CA_HAAC)  ||
+            (audio->config.out.codec == HB_ACODEC_FDK_HAAC) ||
             (audio->config.out.codec == HB_ACODEC_AAC_PASS &&
              audio->config.in.samples_per_frame > 1024))
         {
@@ -299,17 +303,17 @@
         }
         if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
         {
-            track->extra.audio.channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->config.in.channel_layout);
+            track->extra.audio.channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
         }
         else
         {
-            track->extra.audio.channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
+            track->extra.audio.channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
         }
-//        track->defaultDuration = job->arate * 1000;
         mux_data->track = mk_createTrack(m->file, track);
-        if ( audio->config.out.codec == HB_ACODEC_VORBIS ||
-             audio->config.out.codec == HB_ACODEC_FFFLAC )
-          free(track->codecPrivate);
+        if (audio->config.out.codec == HB_ACODEC_VORBIS ||
+            audio->config.out.codec == HB_ACODEC_FFFLAC ||
+            audio->config.out.codec == HB_ACODEC_FFFLAC24)
+            free(track->codecPrivate);
     }
 
     char * subidx_fmt =
@@ -327,21 +331,21 @@
         "custom colors: OFF, tridx: 0000, "
         "colors: 000000, 000000, 000000, 000000\n";
 
-    for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+    for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
     {
         hb_subtitle_t * subtitle;
         uint32_t        rgb[16];
         char            subidx[2048];
         int             len;
 
-        subtitle = hb_list_item( title->list_subtitle, i );
+        subtitle = hb_list_item( job->list_subtitle, i );
         if (subtitle->config.dest != PASSTHRUSUB)
             continue;
 
         memset(track, 0, sizeof(mk_TrackConfig));
-        switch (subtitle->format)
+        switch (subtitle->source)
         {
-            case PICTURESUB:
+            case VOBSUB:
                 track->codecID = MK_SUBTITLE_VOBSUB;
                 for (j = 0; j < 16; j++)
                     rgb[j] = hb_yuv2rgb(subtitle->palette[j]);
@@ -355,16 +359,25 @@
                 track->codecPrivate = subidx;
                 track->codecPrivateSize = len + 1;
                 break;
-            case TEXTSUB:
-                if (subtitle->source == SSASUB)
-                {
-                    track->codecID = MK_SUBTITLE_SSA;
-                    need_fonts = 1;
-                    track->codecPrivate = subtitle->extradata;
-                    track->codecPrivateSize = subtitle->extradata_size;
-                }
-                else
-                    track->codecID = MK_SUBTITLE_UTF8;
+            case PGSSUB:
+                track->codecPrivate = NULL;
+                track->codecPrivateSize = 0;
+                track->codecID = MK_SUBTITLE_PGS;
+                break;
+            case SSASUB:
+                track->codecID = MK_SUBTITLE_SSA;
+                need_fonts = 1;
+                track->codecPrivate = subtitle->extradata;
+                track->codecPrivateSize = subtitle->extradata_size;
+                break;
+            case CC608SUB:
+            case CC708SUB:
+            case UTF8SUB:
+            case TX3GSUB:
+            case SRTSUB:
+                track->codecPrivate = NULL;
+                track->codecPrivateSize = 0;
+                track->codecID = MK_SUBTITLE_UTF8;
                 break;
             default:
                 continue;
@@ -390,7 +403,7 @@
 
     if (need_fonts)
     {
-        hb_list_t * list_attachment = job->title->list_attachment;
+        hb_list_t * list_attachment = job->list_attachment;
         int i;
         for ( i = 0; i < hb_list_count(list_attachment); i++ )
         {
@@ -422,46 +435,43 @@
     return 0;
 }
 
-static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
-                   hb_buffer_t * buf )
+static int MKVMux(hb_mux_object_t *m, hb_mux_data_t *mux_data, hb_buffer_t *buf)
 {
-    ogg_packet  *op = NULL;
-    hb_job_t * job = m->job;
-    hb_title_t * title = job->title;
-    uint64_t   timecode = 0;
+    char chapter_name[1024];
     hb_chapter_t *chapter_data;
-    char tmp_buffer[1024];
-    char *string = tmp_buffer;
+    uint64_t timecode = 0;
+    ogg_packet *op    = NULL;
+    hb_job_t *job     = m->job;
 
     if (mux_data == job->mux_data)
     {
         /* Video */
-        timecode = buf->start * TIMECODE_SCALE;
+        timecode = buf->s.start * TIMECODE_SCALE;
 
-        if (job->chapter_markers && (buf->new_chap || timecode == 0))
+        if (job->chapter_markers && buf->s.new_chap)
         {
-            /* Make sure we're not writing a chapter that has 0 length */
-            if (mux_data->prev_chapter_tc != timecode)
-            {
-                if ( buf->new_chap )
-                {
-                    mux_data->current_chapter = buf->new_chap - 2;
-                }
-                chapter_data = hb_list_item( title->list_chapter,
-                                             mux_data->current_chapter++ );
-                tmp_buffer[0] = '\0';
+            // reached chapter N, write marker for chapter N-1
+            mux_data->current_chapter = buf->s.new_chap - 1;
 
-                if( chapter_data != NULL )
+            // chapter numbers start at 1, but the list starts at 0
+            chapter_data = hb_list_item(job->list_chapter,
+                                        mux_data->current_chapter - 1);
+
+            // make sure we're not writing a chapter that has 0 length
+            if (chapter_data != NULL && mux_data->prev_chapter_tc < timecode)
+            {
+                if (chapter_data->title != NULL)
                 {
-                    string = chapter_data->title;
+                    snprintf(chapter_name, 1023, "%s", chapter_data->title);
                 }
-
-                if( strlen(string) == 0 || strlen(string) >= 1024 )
+                else
                 {
-                    snprintf( tmp_buffer, 1023, "Chapter %02i", mux_data->current_chapter );
-                    string = tmp_buffer;
+                    snprintf(chapter_name, 1023, "Chapter %d",
+                             mux_data->current_chapter);
                 }
-                mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->prev_chapter_tc, string);
+                mk_createChapterSimple(m->file,
+                                       mux_data->prev_chapter_tc,
+                                       mux_data->prev_chapter_tc, chapter_name);
             }
             mux_data->prev_chapter_tc = timecode;
         }
@@ -482,27 +492,33 @@
             return 0;
         }
     }
-    else if ( mux_data->subtitle )
+    else if (mux_data->subtitle)
     {
-        uint64_t   duration;
-        timecode = buf->start * TIMECODE_SCALE;
         if( mk_startFrame(m->file, mux_data->track) < 0)
         {
-            hb_error( "Failed to write frame to output file, Disk Full?" );
+            hb_error("Failed to write frame to output file, Disk Full?");
             *job->die = 1;
         }
-
-        duration = buf->stop * TIMECODE_SCALE - timecode;
+        uint64_t duration;
+        timecode = buf->s.start * TIMECODE_SCALE;
+        if (buf->s.stop <= buf->s.start)
+        {
+            duration = 0;
+        }
+        else
+        {
+            duration = buf->s.stop * TIMECODE_SCALE - timecode;
+        }
         mk_addFrameData(m->file, mux_data->track, buf->data, buf->size);
         mk_setFrameFlags(m->file, mux_data->track, timecode, 1, duration);
         mk_flushFrame(m->file, mux_data->track);
-        hb_buffer_close( &buf );
+        hb_buffer_close(&buf);
         return 0;
     }
     else
     {
         /* Audio */
-        timecode = buf->start * TIMECODE_SCALE;
+        timecode = buf->s.start * TIMECODE_SCALE;
         if (mux_data->codec == HB_ACODEC_VORBIS)
         {
             /* ughhh, vorbis is a pain :( */
@@ -530,20 +546,18 @@
                      (((job->vcodec == HB_VCODEC_X264 || 
                         (job->vcodec & HB_VCODEC_FFMPEG_MASK)) && 
                        mux_data == job->mux_data) ? 
-                            (buf->frametype == HB_FRAME_IDR) : 
-                            ((buf->frametype & HB_FRAME_KEY) != 0)), 0 );
+                            (buf->s.frametype == HB_FRAME_IDR) : 
+                            ((buf->s.frametype & HB_FRAME_KEY) != 0)), 0 );
     hb_buffer_close( &buf );
     return 0;
 }
 
-static int MKVEnd( hb_mux_object_t * m )
+static int MKVEnd(hb_mux_object_t *m)
 {
-    hb_job_t  *job = m->job;
-    hb_mux_data_t *mux_data = job->mux_data;
-    hb_title_t  *title = job->title;
+    char chapter_name[1024];
     hb_chapter_t *chapter_data;
-    char tmp_buffer[1024];
-    char *string = tmp_buffer;
+    hb_job_t *job           = m->job;
+    hb_mux_data_t *mux_data = job->mux_data;
 
     if( !job->mux_data )
     {
@@ -553,53 +567,92 @@
         return 0;
     }
 
-    chapter_data = hb_list_item( title->list_chapter, mux_data->current_chapter++ );
-
-    if(job->chapter_markers)
+    if (job->chapter_markers)
     {
-        tmp_buffer[0] = '\0';
-
-        if( chapter_data != NULL )
-        {
-            string = chapter_data->title;
-        }
+        // get the last chapter
+        chapter_data = hb_list_item(job->list_chapter,
+                                    mux_data->current_chapter++);
 
-        if( strlen(string) == 0 || strlen(string) >= 1024 )
+        // only write the last chapter marker if it lasts at least 1.5 second
+        if (chapter_data != NULL && chapter_data->duration > 135000LL)
         {
-            snprintf( tmp_buffer, 1023, "Chapter %02i", mux_data->current_chapter );
-            string = tmp_buffer;
+            if (chapter_data->title != NULL)
+            {
+                snprintf(chapter_name, 1023, "%s", chapter_data->title);
+            }
+            else
+            {
+                snprintf(chapter_name, 1023, "Chapter %d",
+                         mux_data->current_chapter);
+            }
+            mk_createChapterSimple(m->file,
+                                   mux_data->prev_chapter_tc,
+                                   mux_data->prev_chapter_tc, chapter_name);
         }
-        mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->prev_chapter_tc, string);
     }
 
-    if( title->metadata )
+    if( job->metadata )
     {
-        hb_metadata_t *md = title->metadata;
+        hb_metadata_t *md = job->metadata;
 
         hb_deep_log( 2, "Writing Metadata to output file...");
-        mk_createTagSimple( m->file, MK_TAG_TITLE, md->name );
-        mk_createTagSimple( m->file, "ARTIST", md->artist );
-        mk_createTagSimple( m->file, "COMPOSER", md->composer );
-        mk_createTagSimple( m->file, MK_TAG_SYNOPSIS, md->comment );
-        mk_createTagSimple( m->file, "DATE_RELEASED", md->release_date );
-        // mk_createTagSimple( m->file, "", md->album );
-        mk_createTagSimple( m->file, MK_TAG_GENRE, md->genre );
+        if ( md->name )
+        {
+            mk_createTagSimple( m->file, MK_TAG_TITLE, md->name );
+        }
+        if ( md->artist )
+        {
+            mk_createTagSimple( m->file, "ARTIST", md->artist );
+        }
+        if ( md->album_artist )
+        {
+            mk_createTagSimple( m->file, "DIRECTOR", md->album_artist );
+        }
+        if ( md->composer )
+        {
+            mk_createTagSimple( m->file, "COMPOSER", md->composer );
+        }
+        if ( md->release_date )
+        {
+            mk_createTagSimple( m->file, "DATE_RELEASED", md->release_date );
+        }
+        if ( md->comment )
+        {
+            mk_createTagSimple( m->file, "SUMMARY", md->comment );
+        }
+        if ( !md->name && md->album )
+        {
+            mk_createTagSimple( m->file, MK_TAG_TITLE, md->album );
+        }
+        if ( md->genre )
+        {
+            mk_createTagSimple( m->file, MK_TAG_GENRE, md->genre );
+        }
+        if ( md->description )
+        {
+            mk_createTagSimple( m->file, "DESCRIPTION", md->description );
+        }
+        if ( md->long_description )
+        {
+            mk_createTagSimple( m->file, "SYNOPSIS", md->long_description );
+        }
     }
 
     // Update and track private data that can change during
     // encode.
     int i;
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+    for( i = 0; i < hb_list_count( job->list_audio ); i++ )
     {
         mk_Track  * track;
         hb_audio_t    * audio;
 
-        audio = hb_list_item( title->list_audio, i );
+        audio = hb_list_item( job->list_audio, i );
         track = audio->priv.mux_data->track;
 
         switch (audio->config.out.codec & HB_ACODEC_MASK)
         {
             case HB_ACODEC_FFFLAC:
+            case HB_ACODEC_FFFLAC24:
                 if( audio->priv.config.extradata.bytes )
                 {
                     uint8_t *header;

HandBrake-0.9.8.tar.bz2/libhb/muxmp4.c -> HandBrake-0.9.9.tar.bz2/libhb/muxmp4.c Changed

@@ -1,8 +1,11 @@
-/* $Id: muxmp4.c,v 1.24 2005/11/04 13:09:41 titer Exp $
+/* muxmp4.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "mp4v2/mp4v2.h"
 #include "a52dec/a52.h"
@@ -35,6 +38,10 @@
     int         sub_format;
 
     uint64_t    sum_dur; // sum of the frame durations so far
+
+    // audio frame duration info
+    int sample_rate;
+    int samples_per_frame;
 };
 
 /* Tune video track chunk duration.
@@ -214,29 +221,34 @@
         hb_error("muxmp4.c: Unsupported video encoder!");
     }
 
-    // COLR atom for color and gamma correction.
-    // Per the notes at:
-    //   http://developer.apple.com/quicktime/icefloe/dispatch019.html#colr
-    //   http://forum.doom9.org/showthread.php?t=133982#post1090068
-    // the user can set it from job->color_matrix_code, otherwise by default
-    // we say anything that's likely to be HD content is ITU BT.709 and
-    // DVD, SD TV & other content is ITU BT.601.  We look at the title height
-    // rather than the job height here to get uncropped input dimensions.
-    if( job->color_matrix_code == 3 )
+    /* COLR atom for color and gamma correction. Per the notes at:
+     * http://developer.apple.com/quicktime/icefloe/dispatch019.html#colr
+     * http://forum.doom9.org/showthread.php?t=133982#post1090068
+     * The user can set it from job->color_matrix_code. */
+    if( job->color_matrix_code == 4 )
     {
         // Custom
         MP4AddColr(m->file, mux_data->track, job->color_prim, job->color_transfer, job->color_matrix);        
     }
-    else if( ( job->color_matrix_code == 2 ) || 
-             ( job->color_matrix_code == 0 && ( job->title->width >= 1280 || job->title->height >= 720 ) ) )
+    else if( job->color_matrix_code == 3 )
     {
         // ITU BT.709 HD content
-        MP4AddColr(m->file, mux_data->track, 1, 1, 1);
+        MP4AddColr(m->file, mux_data->track, HB_COLR_PRI_BT709, HB_COLR_TRA_BT709, HB_COLR_MAT_BT709);
+    }
+    else if( job->color_matrix_code == 2 )
+    {
+        // ITU BT.601 DVD or SD TV content (PAL)
+        MP4AddColr(m->file, mux_data->track, HB_COLR_PRI_EBUTECH, HB_COLR_TRA_BT709, HB_COLR_MAT_SMPTE170M);
+    }
+    else if( job->color_matrix_code == 1 )
+    {
+        // ITU BT.601 DVD or SD TV content (NTSC)
+        MP4AddColr(m->file, mux_data->track, HB_COLR_PRI_SMPTEC, HB_COLR_TRA_BT709, HB_COLR_MAT_SMPTE170M);
     }
     else
     {
-        // ITU BT.601 DVD or SD TV content
-        MP4AddColr(m->file, mux_data->track, 6, 1, 6);
+        // detected during scan
+        MP4AddColr(m->file, mux_data->track, title->color_prim, title->color_transfer, title->color_matrix);        
     }
 
     if( job->anamorphic.mode )
@@ -254,9 +266,9 @@
     }
 
     /* add the audio tracks */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+    for( i = 0; i < hb_list_count( job->list_audio ); i++ )
     {
-        audio = hb_list_item( title->list_audio, i );
+        audio = hb_list_item( job->list_audio, i );
         mux_data = calloc(1, sizeof( hb_mux_data_t ) );
         audio->priv.mux_data = mux_data;
 
@@ -264,30 +276,31 @@
         {
             case HB_ACODEC_AC3:
             {
+                int ii, jj;
+                int bitrate;
+                int sr_shift, sr_code;
                 uint8_t bsid;
                 uint8_t bsmod;
                 uint8_t acmod;
                 uint8_t lfeon;
-                uint8_t bit_rate_code = 0;
-                int ii, jj;
-                int freq;
-                int bitrate;
-                int sr_shift, sr_code;
+                uint8_t br_code = 0;
 
                 if ( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
                 {
-                    bsmod = audio->config.in.mode;
-                    acmod = audio->config.flags.ac3 & 0x7;
-                    lfeon = (audio->config.flags.ac3 & A52_LFE) ? 1 : 0;
-                    freq = audio->config.in.samplerate;
-                    bitrate = audio->config.in.bitrate;
+                    bsmod                       = audio->config.in.mode;
+                    acmod                       = audio->config.in.flags & 0x7;
+                    lfeon                       = !!(audio->config.in.flags & A52_LFE);
+                    bitrate                     = audio->config.in.bitrate;
+                    mux_data->sample_rate       = audio->config.in.samplerate;
+                    mux_data->samples_per_frame = audio->config.in.samples_per_frame;
                 }
                 else
                 {
-                    bsmod = 0;
-                    freq = audio->config.out.samplerate;
-                    bitrate = audio->config.out.bitrate * 1000;
-                    switch( audio->config.out.mixdown )
+                    bsmod                       = 0;
+                    bitrate                     = audio->config.out.bitrate * 1000;
+                    mux_data->sample_rate       = audio->config.out.samplerate;
+                    mux_data->samples_per_frame = audio->config.out.samples_per_frame;
+                    switch (audio->config.out.mixdown)
                     {
                         case HB_AMIXDOWN_MONO:
                             acmod = 1;
@@ -301,13 +314,13 @@
                             lfeon = 0;
                             break;
 
-                        case HB_AMIXDOWN_6CH:
+                        case HB_AMIXDOWN_5POINT1:
                             acmod = 7;
                             lfeon = 1;
                             break;
 
                         default:
-                            hb_log(" MP4Init: bad mixdown" );
+                            hb_log("MP4Init: bad mixdown");
                             acmod = 2;
                             lfeon = 0;
                             break;
@@ -318,7 +331,7 @@
                 {
                     for (jj = 0; jj < 3; jj++)
                     {
-                        if ((ac3_sample_rate_tab[jj] >> ii) == freq)
+                        if ((ac3_sample_rate_tab[jj] >> ii) == mux_data->sample_rate)
                         {
                             goto rate_found1;
                         }
@@ -340,17 +353,12 @@
                     hb_error("Unknown AC3 bitrate");
                     ii = 0;
                 }
-                bit_rate_code = ii;
-
-                mux_data->track = MP4AddAC3AudioTrack(
-                    m->file,
-                    freq,
-                    sr_code,
-                    bsid,
-                    bsmod,
-                    acmod,
-                    lfeon,
-                    bit_rate_code);
+                br_code = ii;
+
+                mux_data->track = MP4AddAC3AudioTrack(m->file,
+                                                      mux_data->sample_rate,
+                                                      sr_code, bsid, bsmod,
+                                                      acmod, lfeon, br_code);
 
                 /* Tune track chunk duration */
                 MP4TuneTrackDurationPerChunk( m, mux_data->track );
@@ -374,13 +382,15 @@
             case HB_ACODEC_FFAAC:
             case HB_ACODEC_CA_AAC:
             case HB_ACODEC_CA_HAAC:
+            case HB_ACODEC_FDK_AAC:
+            case HB_ACODEC_FDK_HAAC:
             case HB_ACODEC_LAME:
             case HB_ACODEC_MP3:
             case HB_ACODEC_DCA_HD:
             case HB_ACODEC_DCA:
             {
                 uint8_t audio_type = MP4_MPEG4_AUDIO_TYPE;
-                int samplerate, samples_per_frame, channels, config_len = 0;
+                int channels, config_len = 0;
                 uint8_t *config_bytes = NULL;
 
                 switch ( audio->config.out.codec & HB_ACODEC_MASK )
@@ -389,6 +399,8 @@
                     case HB_ACODEC_FFAAC:
                     case HB_ACODEC_CA_AAC:
                     case HB_ACODEC_CA_HAAC:
+                    case HB_ACODEC_FDK_AAC:
+                    case HB_ACODEC_FDK_HAAC:
                     {
                         audio_type = MP4_MPEG4_AUDIO_TYPE;
                         config_bytes = audio->priv.config.extradata.bytes;
@@ -405,22 +417,24 @@
                         audio_type = 0xA9;
                     } break;
                 }
-                if( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
+                if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
                 {
-                    samplerate = audio->config.in.samplerate;
-                    samples_per_frame = audio->config.in.samples_per_frame;
-                    channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
-                                            audio->config.in.channel_layout );
+                    mux_data->sample_rate       = audio->config.in.samplerate;
+                    mux_data->samples_per_frame = audio->config.in.samples_per_frame;
+                    channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
                 }
                 else
                 {
-                    samplerate = audio->config.out.samplerate;
-                    samples_per_frame = audio->config.out.samples_per_frame;
-                    channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(
-                                            audio->config.out.mixdown );
+                    mux_data->sample_rate       = audio->config.out.samplerate;
+                    mux_data->samples_per_frame = audio->config.out.samples_per_frame;
+                    channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
                 }
-                mux_data->track = MP4AddAudioTrack( m->file, samplerate, 
-                                                samples_per_frame, audio_type );
+                mux_data->track = MP4AddAudioTrack(m->file,
+                                                   mux_data->sample_rate,
+                                                   // fixed frame duration, if applicable
+                                                   mux_data->samples_per_frame > 0 ?
+                                                   mux_data->samples_per_frame : MP4_INVALID_DURATION,
+                                                   audio_type);
 
                 /* Tune track chunk duration */
                 MP4TuneTrackDurationPerChunk( m, mux_data->track );
@@ -458,7 +472,7 @@
         /* Set the language for this track */
         MP4SetTrackLanguage(m->file, mux_data->track, audio->config.lang.iso639_2);
 
-        if( hb_list_count( title->list_audio ) > 1 )
+        if( hb_list_count( job->list_audio ) > 1 )
         {
             /* Set the audio track alternate group */
             MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.alternate_group", 1);
@@ -859,6 +873,11 @@
                 *writer++ = *reader++;
                 break;
             }
+        } else if (*reader == '\r') {
+            // skip '\r' and replace with '\n' if necessary
+            if (*(++reader) != '\n') {
+                *writer++ = '\n';
+            }
         } else {
             *writer++ = *reader++;
         }
@@ -893,15 +912,14 @@
     if( mux_data == job->mux_data )
     {
         /* Video */
-
         if( job->vcodec == HB_VCODEC_X264 ||
             ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) )
         {
-            if ( buf && buf->start < buf->renderOffset )
+            if ( buf && buf->s.start < buf->s.renderOffset )
             {
                 hb_log("MP4Mux: PTS %"PRId64" < DTS %"PRId64,
-                       buf->start, buf->renderOffset );
-                buf->renderOffset = buf->start;
+                       buf->s.start, buf->s.renderOffset );
+                buf->s.renderOffset = buf->s.start;
             }
         }
 
@@ -918,14 +936,14 @@
             ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) )
         {
             // x264 supplies us with DTS, so offset is PTS - DTS
-            offset = buf->start - buf->renderOffset;
+            offset = buf->s.start - buf->s.renderOffset;
         }
 
         /* Add the sample before the new frame.
            It is important that this be calculated prior to the duration
            of the new video sample, as we want to sync to right after it.
            (This is because of how durations for text tracks work in QT) */
-        if( job->chapter_markers && buf->new_chap )
+        if( job->chapter_markers && buf->s.new_chap )
         {    
             hb_chapter_t *chapter = NULL;
 
@@ -939,15 +957,15 @@
             duration = m->sum_dur - m->chapter_duration + offset;
             if ( duration >= (90000*3)/2 )
             {
-                chapter = hb_list_item( m->job->title->list_chapter,
-                                        buf->new_chap - 2 );
+                chapter = hb_list_item( m->job->list_chapter,
+                                        buf->s.new_chap - 2 );
 
                 MP4AddChapter( m->file,
                                m->chapter_track,
                                duration,
                                (chapter != NULL) ? chapter->title : NULL);
 
-                m->current_chapter = buf->new_chap;
+                m->current_chapter = buf->s.new_chap;
                 m->chapter_duration += duration;
             }
         }
@@ -958,11 +976,11 @@
             // x264 supplies us with DTS
             if ( m->delay_buf )
             {
-                duration = m->delay_buf->renderOffset - buf->renderOffset;
+                duration = m->delay_buf->s.renderOffset - buf->s.renderOffset;
             }
             else
             {
-                duration = buf->stop - m->sum_dur;
+                duration = buf->s.stop - m->sum_dur;
                 // Due to how libx264 generates DTS, it's possible for the
                 // above calculation to be negative. 
                 //
@@ -998,7 +1016,7 @@
             // We're getting the frames in decode order but the timestamps are
             // for presentation so we have to use durations and effectively
             // compute a DTS.
-            duration = buf->stop - buf->start;
+            duration = buf->s.stop - buf->s.start;
         }
 
         if ( duration <= 0 )
@@ -1009,7 +1027,7 @@
                try to fix the error so that the file will still be playable. */
             hb_log("MP4Mux: illegal duration %"PRId64", start %"PRId64","
                    "stop %"PRId64", sum_dur %"PRId64,
-                   duration, buf->start, buf->stop, m->sum_dur );
+                   duration, buf->s.start, buf->s.stop, m->sum_dur );
             /* we don't know when the next frame starts so we can't pick a
                valid duration for this one. we pick something "short"
                (roughly 1/3 of an NTSC frame time) to take time from
@@ -1021,7 +1039,12 @@
     else
     {
         /* Audio */
-        duration = MP4_INVALID_DURATION;
+        if (mux_data->samples_per_frame > 0)
+            // frame size is fixed and known
+            duration = MP4_INVALID_DURATION;
+        else
+            // frame size has to be computed
+            duration = buf->s.duration * mux_data->sample_rate / 90000;
     }
 
     /* Here's where the sample actually gets muxed. */
@@ -1045,12 +1068,12 @@
         uint32_t dflags = 0;
 
         /* encoding layer signals if frame is referenced by other frames */
-        if( buf->flags & HB_FRAME_REF )
+        if( buf->s.flags & HB_FRAME_REF )
             dflags |= MP4_SDT_HAS_DEPENDENTS;
         else
             dflags |= MP4_SDT_HAS_NO_DEPENDENTS; /* disposable */
 
-        switch( buf->frametype )
+        switch( buf->s.frametype )
         {
             case HB_FRAME_IDR:
                 sync = 1;
@@ -1086,50 +1109,50 @@
         {
             /* MPEG4 timed text does not allow overlapping samples; upstream
                code should coalesce overlapping subtitle lines. */
-            if( buf->start < mux_data->sum_dur )
+            if( buf->s.start < mux_data->sum_dur )
             {
-                if ( buf->stop - mux_data->sum_dur > 90*500 )
+                if ( buf->s.stop - mux_data->sum_dur > 90*500 )
                 {
                     hb_log("MP4Mux: shortening overlapping subtitle, "
                            "start %"PRId64", stop %"PRId64", sum_dur %"PRId64,
-                           buf->start, buf->stop, m->sum_dur);
-                    buf->start = mux_data->sum_dur;
+                           buf->s.start, buf->s.stop, m->sum_dur);
+                    buf->s.start = mux_data->sum_dur;
                 }
             }
-            if( buf->start < mux_data->sum_dur )
+            if( buf->s.start < mux_data->sum_dur )
             {
                 hb_log("MP4Mux: skipping overlapping subtitle, "
                        "start %"PRId64", stop %"PRId64", sum_dur %"PRId64,
-                       buf->start, buf->stop, m->sum_dur);
+                       buf->s.start, buf->s.stop, m->sum_dur);
             }
             else
             {
                 int64_t duration;
 
-                if( buf->start < 0 )
-                    buf->start = mux_data->sum_dur;
+                if( buf->s.start < 0 )
+                    buf->s.start = mux_data->sum_dur;
 
-                if( buf->stop < 0 )
+                if( buf->s.stop < 0 )
                     duration = 90000L * 10;
                 else
-                    duration = buf->stop - buf->start;
+                    duration = buf->s.stop - buf->s.start;
 
                 /* Write an empty sample */
-                if ( mux_data->sum_dur < buf->start )
+                if ( mux_data->sum_dur < buf->s.start )
                 {
                     uint8_t empty[2] = {0,0};
                     if( !MP4WriteSample( m->file,
                                         mux_data->track,
                                         empty,
                                         2,
-                                        buf->start - mux_data->sum_dur,
+                                        buf->s.start - mux_data->sum_dur,
                                         0,
                                         1 ))
                     {
                         hb_error("Failed to write to output file, disk full?");
                         *job->die = 1;
                     }
-                    mux_data->sum_dur += buf->start - mux_data->sum_dur;
+                    mux_data->sum_dur += buf->s.start - mux_data->sum_dur;
                 }
                 uint8_t styleatom[2048];;
                 uint16_t stylesize = 0;
@@ -1150,7 +1173,7 @@
                 buffersize = strlen((char*)buffer);
 
                 hb_deep_log(3, "MuxMP4:Sub:%fs:%"PRId64":%"PRId64":%"PRId64": %s",
-                            (float)buf->start / 90000, buf->start, buf->stop,
+                            (float)buf->s.start / 90000, buf->s.start, buf->s.stop,
                             duration, buffer);
 
                 /* Write the subtitle sample */
@@ -1178,30 +1201,30 @@
         {
             int64_t duration;
 
-            if( buf->start < 0 )
-                buf->start = mux_data->sum_dur;
+            if( buf->s.start < 0 )
+                buf->s.start = mux_data->sum_dur;
 
-            if( buf->stop < 0 )
+            if( buf->s.stop < 0 )
                 duration = 90000L * 10;
             else
-                duration = buf->stop - buf->start;
+                duration = buf->s.stop - buf->s.start;
 
             /* Write an empty sample */
-            if ( mux_data->sum_dur < buf->start )
+            if ( mux_data->sum_dur < buf->s.start )
             {
                 uint8_t empty[2] = {0,0};
                 if( !MP4WriteSample( m->file,
                                     mux_data->track,
                                     empty,
                                     2,
-                                    buf->start - mux_data->sum_dur,
+                                    buf->s.start - mux_data->sum_dur,
                                     0,
                                     1 ))
                 {
                     hb_error("Failed to write to output file, disk full?");
                     *job->die = 1;
                 } 
-                mux_data->sum_dur += buf->start - mux_data->sum_dur;
+                mux_data->sum_dur += buf->s.start - mux_data->sum_dur;
             }
             if( !MP4WriteSample( m->file,
                                  mux_data->track,
@@ -1229,7 +1252,7 @@
                              buf->size,
                              duration,
                              offset,
-                             ( buf->frametype & HB_FRAME_KEY ) != 0 ))
+                             ( buf->s.frametype & HB_FRAME_KEY ) != 0 ))
         {
             hb_error("Failed to write to output file, disk full?");
             *job->die = 1;
@@ -1243,104 +1266,138 @@
 static int MP4End( hb_mux_object_t * m )
 {
     hb_job_t   * job   = m->job;
-    hb_title_t * title = job->title;
-
-    // Flush the delayed frame
-    if ( m->delay_buf )
-        MP4Mux( m, job->mux_data, NULL );
 
-    /* Write our final chapter marker */
-    if( m->job->chapter_markers )
+    if (m->file != MP4_INVALID_FILE_HANDLE)
     {
-        hb_chapter_t *chapter = NULL;
-        int64_t duration = m->sum_dur - m->chapter_duration;
-        /* The final chapter can have a very short duration - if it's less
-         * than 1.5 seconds just skip it. */
-        if ( duration >= (90000*3)/2 )
+        // Flush the delayed frame
+        if ( m->delay_buf )
+            MP4Mux( m, job->mux_data, NULL );
+
+        /* Write our final chapter marker */
+        if( m->job->chapter_markers )
         {
+            hb_chapter_t *chapter = NULL;
+            int64_t duration = m->sum_dur - m->chapter_duration;
+            /* The final chapter can have a very short duration - if it's less
+             * than 1.5 seconds just skip it. */
+            if ( duration >= (90000*3)/2 )
+            {
 
-            chapter = hb_list_item( m->job->title->list_chapter,
-                                    m->current_chapter - 1 );
+                chapter = hb_list_item( m->job->list_chapter,
+                                        m->current_chapter - 1 );
 
-            MP4AddChapter( m->file,
-                           m->chapter_track,
-                           duration,
-                           (chapter != NULL) ? chapter->title : NULL);
+                MP4AddChapter( m->file,
+                               m->chapter_track,
+                               duration,
+                               (chapter != NULL) ? chapter->title : NULL);
+            }
         }
-    }
 
-    if ( job->config.h264.init_delay )
-    {
-           // Insert track edit to get A/V back in sync.  The edit amount is
-           // the init_delay.
-           int64_t edit_amt = job->config.h264.init_delay;
-           MP4AddTrackEdit(m->file, 1, MP4_INVALID_EDIT_ID, edit_amt,
-                           MP4GetTrackDuration(m->file, 1), 0);
-            if ( m->job->chapter_markers )
+        if ( job->config.h264.init_delay )
+        {
+               // Insert track edit to get A/V back in sync.  The edit amount is
+               // the init_delay.
+               int64_t edit_amt = job->config.h264.init_delay;
+               MP4AddTrackEdit(m->file, 1, MP4_INVALID_EDIT_ID, edit_amt,
+                               MP4GetTrackDuration(m->file, 1), 0);
+                if ( m->job->chapter_markers )
+                {
+                    // apply same edit to chapter track to keep it in sync with video
+                    MP4AddTrackEdit(m->file, m->chapter_track, MP4_INVALID_EDIT_ID,
+                                    edit_amt,
+                                    MP4GetTrackDuration(m->file, m->chapter_track), 0);
+                }
+         }
+
+        /*
+         * Write the MP4 iTunes metadata if we have any metadata
+         */
+        if( job->metadata )
+        {
+            hb_metadata_t *md = job->metadata;
+            const MP4Tags* tags;
+
+            hb_deep_log( 2, "Writing Metadata to output file...");
+
+            /* allocate tags structure */
+            tags = MP4TagsAlloc();
+            /* fetch data from MP4 file (in case it already has some data) */
+            MP4TagsFetch( tags, m->file );
+
+            /* populate */
+            if( md->name )
+                MP4TagsSetName( tags, md->name );
+            if( md->artist )
+                MP4TagsSetArtist( tags, md->artist );
+            if( md->composer )
+                MP4TagsSetComposer( tags, md->composer );
+            if( md->comment )
+                MP4TagsSetComments( tags, md->comment );
+            if( md->release_date )
+                MP4TagsSetReleaseDate( tags, md->release_date );
+            if( md->album )
+                MP4TagsSetAlbum( tags, md->album );
+            if( md->album_artist )
+                MP4TagsSetAlbumArtist( tags, md->album_artist );
+            if( md->genre )
+                MP4TagsSetGenre( tags, md->genre );
+            if( md->description )
+                MP4TagsSetDescription( tags, md->description );
+            if( md->long_description )
+                MP4TagsSetLongDescription( tags, md->long_description );
+
+            if( md->list_coverart )
             {
-                // apply same edit to chapter track to keep it in sync with video
-                MP4AddTrackEdit(m->file, m->chapter_track, MP4_INVALID_EDIT_ID,
-                                edit_amt,
-                                MP4GetTrackDuration(m->file, m->chapter_track), 0);
+                hb_coverart_t * coverart;
+                int ii;
+
+                for ( ii = 0; ii < hb_list_count( md->list_coverart ); ii++ )
+                {
+                    coverart = hb_list_item( md->list_coverart, ii );
+                    MP4TagArtwork art;
+                    int type;
+                    switch ( coverart->type )
+                    {
+                        case HB_ART_BMP:
+                            type = MP4_ART_BMP;
+                            break;
+                        case HB_ART_GIF:
+                            type = MP4_ART_GIF;
+                            break;
+                        case HB_ART_JPEG:
+                            type = MP4_ART_JPEG;
+                            break;
+                        case HB_ART_PNG:
+                            type = MP4_ART_PNG;
+                            break;
+                        default:
+                            type = MP4_ART_UNDEFINED;
+                            break;
+                    }
+                    art.data = coverart->data;
+                    art.size = coverart->size;
+                    art.type = type;
+                    MP4TagsAddArtwork( tags, &art );
+                }
             }
-     }
 
-    /*
-     * Write the MP4 iTunes metadata if we have any metadata
-     */
-    if( title->metadata )
-    {
-        hb_metadata_t *md = title->metadata;
-        const MP4Tags* tags;
-
-        hb_deep_log( 2, "Writing Metadata to output file...");
-
-        /* allocate tags structure */
-        tags = MP4TagsAlloc();
-        /* fetch data from MP4 file (in case it already has some data) */
-        MP4TagsFetch( tags, m->file );
-
-        /* populate */
-        if( strlen( md->name ))
-            MP4TagsSetName( tags, md->name );
-        if( strlen( md->artist ))
-            MP4TagsSetArtist( tags, md->artist );
-        if( strlen( md->composer ))
-            MP4TagsSetComposer( tags, md->composer );
-        if( strlen( md->comment ))
-            MP4TagsSetComments( tags, md->comment );
-        if( strlen( md->release_date ))
-            MP4TagsSetReleaseDate( tags, md->release_date );
-        if( strlen( md->album ))
-            MP4TagsSetAlbum( tags, md->album );
-        if( strlen( md->genre ))
-            MP4TagsSetGenre( tags, md->genre );
-
-        if( md->coverart )
-        {
-            MP4TagArtwork art;
-            art.data = md->coverart;
-            art.size = md->coverart_size;
-            art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
-            MP4TagsAddArtwork( tags, &art );
+            /* push data to MP4 file */
+            MP4TagsStore( tags, m->file );
+            /* free memory associated with structure */
+            MP4TagsFree( tags );
         }
 
-        /* push data to MP4 file */
-        MP4TagsStore( tags, m->file );
-        /* free memory associated with structure */
-        MP4TagsFree( tags );
-    }
-
-    MP4Close( m->file );
+        MP4Close( m->file );
 
-    if ( job->mp4_optimize )
-    {
-        hb_log( "muxmp4: optimizing file" );
-        char filename[1024]; memset( filename, 0, 1024 );
-        snprintf( filename, 1024, "%s.tmp", job->file );
-        MP4Optimize( job->file, filename, MP4_DETAILS_ERROR );
-        remove( job->file );
-        rename( filename, job->file );
+        if ( job->mp4_optimize )
+        {
+            hb_log( "muxmp4: optimizing file" );
+            char filename[1024]; memset( filename, 0, 1024 );
+            snprintf( filename, 1024, "%s.tmp", job->file );
+            MP4Optimize( job->file, filename, MP4_DETAILS_ERROR );
+            remove( job->file );
+            rename( filename, job->file );
+        }
     }
 
     return 0;

HandBrake-0.9.8.tar.bz2/libhb/platform/macosx/encca_aac.c -> HandBrake-0.9.9.tar.bz2/libhb/platform/macosx/encca_aac.c Changed

@@ -1,9 +1,14 @@
-/* This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
+/* encca_aac.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
-#include "downmix.h"
+#include "audio_remap.h"
 #include <AudioToolbox/AudioToolbox.h>
 #include <CoreAudio/CoreAudio.h>
 
@@ -44,8 +49,7 @@
     uint64_t pts, ibytes;
     Float64 osamplerate;
 
-    int layout;
-    hb_chan_map_t *ichanmap;
+    hb_audio_remap_t *remap;
 };
 
 #define MP4ESDescrTag                   0x03
@@ -55,61 +59,61 @@
 // based off of mov_mp4_read_descr_len from mov.c in ffmpeg's libavformat
 static int readDescrLen(UInt8 **buffer)
 {
-	int len = 0;
-	int count = 4;
-	while (count--)
+    int len = 0;
+    int count = 4;
+    while (count--)
     {
-		int c = *(*buffer)++;
-		len = (len << 7) | (c & 0x7f);
-		if (!(c & 0x80))
-			break;
-	}
-	return len;
+        int c = *(*buffer)++;
+        len = (len << 7) | (c & 0x7f);
+        if (!(c & 0x80))
+            break;
+    }
+    return len;
 }
 
 // based off of mov_mp4_read_descr from mov.c in ffmpeg's libavformat
 static int readDescr(UInt8 **buffer, int *tag)
 {
-	*tag = *(*buffer)++;
-	return readDescrLen(buffer);
+    *tag = *(*buffer)++;
+    return readDescrLen(buffer);
 }
 
 // based off of mov_read_esds from mov.c in ffmpeg's libavformat
 static long ReadESDSDescExt(void* descExt, UInt8 **buffer, UInt32 *size, int versionFlags)
 {
-	UInt8 *esds = (UInt8*)descExt;
-	int tag, len;
-	*size = 0;
+    UInt8 *esds = (UInt8*)descExt;
+    int tag, len;
+    *size = 0;
 
     if (versionFlags)
         esds += 4; // version + flags
-	readDescr(&esds, &tag);
-	esds += 2;     // ID
-	if (tag == MP4ESDescrTag)
-		esds++;    // priority
+    readDescr(&esds, &tag);
+    esds += 2;     // ID
+    if (tag == MP4ESDescrTag)
+        esds++;    // priority
 
-	readDescr(&esds, &tag);
-	if (tag == MP4DecConfigDescrTag)
+    readDescr(&esds, &tag);
+    if (tag == MP4DecConfigDescrTag)
     {
-		esds++;    // object type id
-		esds++;    // stream type
-		esds += 3; // buffer size db
-		esds += 4; // max bitrate
-		esds += 4; // average bitrate
-
-		len = readDescr(&esds, &tag);
-		if (tag == MP4DecSpecificDescrTag)
+        esds++;    // object type id
+        esds++;    // stream type
+        esds += 3; // buffer size db
+        esds += 4; // max bitrate
+        esds += 4; // average bitrate
+
+        len = readDescr(&esds, &tag);
+        if (tag == MP4DecSpecificDescrTag)
         {
-			*buffer = calloc(1, len + 8);
-			if (*buffer)
+            *buffer = calloc(1, len + 8);
+            if (*buffer)
             {
-				memcpy(*buffer, esds, len);
-				*size = len;
-			}
-		}
-	}
+                memcpy(*buffer, esds, len);
+                *size = len;
+            }
+        }
+    }
 
-	return noErr;
+    return noErr;
 }
 
 /***********************************************************************
@@ -145,7 +149,7 @@
 
     // pass the number of channels used into the private work data
     pv->nchannels =
-        HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
+        hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
 
     bzero(&input, sizeof(AudioStreamBasicDescription));
     input.mSampleRate = (Float64)audio->config.out.samplerate;
@@ -210,16 +214,19 @@
     {
         // set encoder bitrate control mode to constrained variable
         tmp = kAudioCodecBitRateControlMode_VariableConstrained;
-        AudioConverterSetProperty(pv->converter, kAudioCodecPropertyBitRateControlMode,
+        AudioConverterSetProperty(pv->converter,
+                                  kAudioCodecPropertyBitRateControlMode,
                                   sizeof(tmp), &tmp);
 
         // get available bitrates
         AudioValueRange *bitrates;
         ssize_t bitrateCounts;
-        err = AudioConverterGetPropertyInfo(pv->converter, kAudioConverterApplicableEncodeBitRates,
+        err = AudioConverterGetPropertyInfo(pv->converter,
+                                            kAudioConverterApplicableEncodeBitRates,
                                             &tmpsiz, NULL);
         bitrates = malloc(tmpsiz);
-        err = AudioConverterGetProperty(pv->converter, kAudioConverterApplicableEncodeBitRates,
+        err = AudioConverterGetProperty(pv->converter,
+                                        kAudioConverterApplicableEncodeBitRates,
                                         &tmpsiz, bitrates);
         bitrateCounts = tmpsiz / sizeof(AudioValueRange);
 
@@ -231,31 +238,36 @@
             tmp = bitrates[bitrateCounts-1].mMinimum;
         free(bitrates);
         if (tmp != audio->config.out.bitrate * 1000)
-            hb_log("encca_aac: sanitizing track %d audio bitrate %d to %"PRIu32"",
+        {
+            hb_log("encCoreAudioInit: sanitizing track %d audio bitrate %d to %"PRIu32"",
                    audio->config.out.track, audio->config.out.bitrate, tmp / 1000);
-        AudioConverterSetProperty(pv->converter, kAudioConverterEncodeBitRate,
+        }
+        AudioConverterSetProperty(pv->converter,
+                                  kAudioConverterEncodeBitRate,
                                   sizeof(tmp), &tmp);
     }
     else if (audio->config.out.quality >= 0)
     {
         if (mode != AAC_MODE_LC)
         {
-            hb_log("encCoreAudioInit: internal error, VBR set but not applicable");
+            hb_error("encCoreAudioInit: internal error, VBR set but not applicable");
             return 1;
         }
         // set encoder bitrate control mode to variable
         tmp = kAudioCodecBitRateControlMode_Variable;
-        AudioConverterSetProperty(pv->converter, kAudioCodecPropertyBitRateControlMode,
+        AudioConverterSetProperty(pv->converter,
+                                  kAudioCodecPropertyBitRateControlMode,
                                   sizeof(tmp), &tmp);
 
         // set quality
         tmp = audio->config.out.quality;
-        AudioConverterSetProperty(pv->converter, kAudioCodecPropertySoundQualityForVBR,
+        AudioConverterSetProperty(pv->converter,
+                                  kAudioCodecPropertySoundQualityForVBR,
                                   sizeof(tmp), &tmp);
     }
     else
     {
-        hb_log("encCoreAudioInit: internal error, bitrate/quality not set");
+        hb_error("encCoreAudioInit: internal error, bitrate/quality not set");
         return 1;
     }
 
@@ -276,23 +288,15 @@
     pv->osamplerate = output.mSampleRate;
     audio->config.out.samples_per_frame = pv->isamples;
 
-    // set channel map and layout (for remapping)
-    pv->ichanmap = audio->config.in.channel_map;
-    switch (audio->config.out.mixdown)
+    // channel remapping
+    pv->remap = hb_audio_remap_init(AV_SAMPLE_FMT_FLT, &hb_aac_chan_map,
+                                    audio->config.in.channel_map);
+    if (pv->remap == NULL)
     {
-        case HB_AMIXDOWN_MONO:
-            pv->layout = HB_INPUT_CH_LAYOUT_MONO;
-            break;
-        case HB_AMIXDOWN_STEREO:
-        case HB_AMIXDOWN_DOLBY:
-        case HB_AMIXDOWN_DOLBYPLII:
-            pv->layout = HB_INPUT_CH_LAYOUT_STEREO;
-            break;
-        case HB_AMIXDOWN_6CH:
-        default:
-            pv->layout = HB_INPUT_CH_LAYOUT_3F2R | HB_INPUT_CH_LAYOUT_HAS_LFE;
-            break;
+        hb_error("encCoreAudioInit: hb_audio_remap_init() failed");
     }
+    uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
+    hb_audio_remap_set_channel_layout(pv->remap, layout, pv->nchannels);
 
     // get maximum output size
     AudioConverterGetProperty(pv->converter,
@@ -337,6 +341,10 @@
         {
             free(pv->buf);
         }
+        if (pv->remap != NULL)
+        {
+            hb_audio_remap_free(pv->remap);
+        }
         hb_list_empty(&pv->list);
         free(pv);
         w->private_data = NULL;
@@ -381,11 +389,8 @@
     *npackets = buffers->mBuffers[0].mDataByteSize / pv->isamplesiz;
     pv->ibytes -= buffers->mBuffers[0].mDataByteSize;
 
-    if (pv->ichanmap != &hb_qt_chan_map)
-    {
-        hb_layout_remap(pv->ichanmap, &hb_qt_chan_map, pv->layout,
-                        (float*)buffers->mBuffers[0].mData, *npackets);
-    }
+    hb_audio_remap(pv->remap, (uint8_t**)(&buffers->mBuffers[0].mData),
+                   (int)(*npackets));
 
     return noErr;
 }
@@ -433,11 +438,12 @@
         return NULL;
     }
 
-    obuf->size      = odesc.mDataByteSize;
-    obuf->start     = pv->pts;
+    obuf->size        = odesc.mDataByteSize;
+    obuf->s.start     = pv->pts;
     pv->pts += 90000LL * pv->isamples / pv->osamplerate;
-    obuf->stop      = pv->pts;
-    obuf->frametype = HB_FRAME_AUDIO;
+    obuf->s.stop      = pv->pts;
+    obuf->s.type      = AUDIO_BUF;
+    obuf->s.frametype = HB_FRAME_AUDIO;
 
     return obuf;
 }

HandBrake-0.9.8.tar.bz2/libhb/ports.c -> HandBrake-0.9.9.tar.bz2/libhb/ports.c Changed

@@ -1,8 +1,11 @@
-/* $Id: ports.c,v 1.15 2005/10/15 18:05:03 titer Exp $
+/* ports.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #ifdef USE_PTHREAD
 #ifdef SYS_LINUX
@@ -63,6 +66,10 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef __APPLE__
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#endif
+
 #include <stddef.h>
 #include <unistd.h>
 
@@ -294,20 +301,20 @@
  ***********************************************************************/
 struct hb_thread_s
 {
-    char       * name;
-    int          priority;
-    void      (* function) ( void * );
-    void       * arg;
+    char          * name;
+    int             priority;
+    thread_func_t * function;
+    void          * arg;
 
-    hb_lock_t  * lock;
-    int          exited;
+    hb_lock_t     * lock;
+    int             exited;
 
 #if defined( SYS_BEOS )
-    thread_id    thread;
+    thread_id       thread;
 #elif USE_PTHREAD
-    pthread_t    thread;
+    pthread_t       thread;
 //#elif defined( SYS_CYGWIN )
-//    HANDLE       thread;
+//    HANDLE          thread;
 #endif
 };
 
@@ -346,7 +353,7 @@
 {
     hb_thread_t * t = (hb_thread_t *) _t;
 
-#if defined( SYS_DARWIN )
+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
     /* Set the thread priority */
     struct sched_param param;
     memset( &param, 0, sizeof( struct sched_param ) );
@@ -376,7 +383,7 @@
  * arg:      argument of the routine
  * priority: HB_LOW_PRIORITY or HB_NORMAL_PRIORITY
  ***********************************************************************/
-hb_thread_t * hb_thread_init( char * name, void (* function)(void *),
+hb_thread_t * hb_thread_init( const char * name, void (* function)(void *),
                               void * arg, int priority )
 {
     hb_thread_t * t = calloc( sizeof( hb_thread_t ), 1 );
@@ -489,7 +496,7 @@
 
     pthread_mutexattr_init(&mta);
 
-#if defined( SYS_CYGWIN )
+#if defined( SYS_CYGWIN ) || defined( SYS_FREEBSD )
     pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_NORMAL);
 #endif
 
@@ -566,6 +573,9 @@
 {
     hb_cond_t * c = calloc( sizeof( hb_cond_t ), 1 );
 
+    if( c == NULL )
+        return NULL;
+
 #if defined( SYS_BEOS )
     c->thread = -1;
 #elif USE_PTHREAD
@@ -611,9 +621,7 @@
 void hb_clock_gettime( struct timespec *tp )
 {
     struct timeval tv;
-    time_t sec;
 
-    sec = time( NULL );
     gettimeofday( &tv, NULL );
     tp->tv_sec = tv.tv_sec;
     tp->tv_nsec = tv.tv_usec * 1000;
@@ -777,3 +785,108 @@
     return token;
 }
 #endif
+
+/************************************************************************
+* OS Sleep Allow / Prevent
+***********************************************************************/
+
+#ifdef __APPLE__
+// 128 chars limit for IOPMAssertionCreateWithName
+static CFStringRef reasonForActivity =
+    CFSTR("HandBrake is currently scanning and/or encoding");
+#endif
+
+void* hb_system_sleep_opaque_init()
+{
+    void *opaque = NULL;
+#ifdef __APPLE__
+    opaque = calloc(sizeof(IOPMAssertionID), 1);
+    if (opaque == NULL)
+    {
+        hb_error("hb_system_sleep: failed to allocate opaque");
+        return NULL;
+    }
+
+    IOPMAssertionID *assertionID = (IOPMAssertionID*)opaque;
+    *assertionID = -1;
+#endif
+    return opaque;
+}
+
+void hb_system_sleep_opaque_close(void **opaque)
+{
+    if (*opaque != NULL)
+    {
+        hb_system_sleep_private_enable(*opaque);
+    }
+#ifdef __APPLE__
+    if (*opaque != NULL)
+    {
+        IOPMAssertionID *assertionID = (IOPMAssertionID*)*opaque;
+        free(assertionID);
+    }
+#endif
+    *opaque = NULL;
+}
+
+void hb_system_sleep_private_enable(void *opaque)
+{
+#ifdef __APPLE__
+    if (opaque == NULL)
+    {
+        hb_error("hb_system_sleep: opaque is NULL");
+    }
+
+    IOPMAssertionID *assertionID = (IOPMAssertionID*)opaque;
+    if (*assertionID == -1)
+    {
+        // nothing to do
+        return;
+    }
+
+    IOReturn success = IOPMAssertionRelease(*assertionID);
+    if (success == kIOReturnSuccess)
+    {
+        hb_deep_log(3,
+                    "hb_system_sleep: assertion %d released, sleep allowed",
+                    *assertionID);
+        *assertionID = -1;
+    }
+    else
+    {
+        hb_log("hb_system_sleep: failed to allow system sleep");
+    }
+#endif
+}
+
+void hb_system_sleep_private_disable(void *opaque)
+{
+#ifdef __APPLE__
+    if (opaque == NULL)
+    {
+        hb_error("hb_system_sleep: opaque is NULL");
+    }
+    
+    IOPMAssertionID *assertionID = (IOPMAssertionID*)opaque;
+    if (*assertionID != -1)
+    {
+        // nothing to do
+        return;
+    }
+
+    IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoIdleSleep,
+                                                   kIOPMAssertionLevelOn,
+                                                   reasonForActivity,
+                                                   assertionID);
+    if (success == kIOReturnSuccess)
+    {
+        hb_deep_log(3,
+                    "hb_system_sleep: assertion %d created, sleep prevented",
+                    *assertionID);
+    }
+    else
+    {
+        hb_log("hb_system_sleep: failed to prevent system sleep");
+    }
+#endif
+}

HandBrake-0.9.8.tar.bz2/libhb/ports.h -> HandBrake-0.9.9.tar.bz2/libhb/ports.h Changed

@@ -1,8 +1,11 @@
-/* $Id: ports.h,v 1.7 2005/10/15 18:05:03 titer Exp $
+/* ports.h
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #ifndef HB_PORTS_H
 #define HB_PORTS_H
@@ -62,7 +65,8 @@
 #  define HB_NORMAL_PRIORITY 0
 #endif
 
-hb_thread_t * hb_thread_init( char * name, void (* function)(void *),
+typedef void (thread_func_t)(void *);
+hb_thread_t * hb_thread_init( const char * name, thread_func_t *function,
                               void * arg, int priority );
 void          hb_thread_close( hb_thread_t ** );
 int           hb_thread_has_exited( hb_thread_t * );
@@ -98,6 +102,14 @@
 int        hb_net_recv( hb_net_t *, char *, int );
 void       hb_net_close( hb_net_t ** );
 
+/************************************************************************
+* OS Sleep Allow / Prevent
+***********************************************************************/
+void* hb_system_sleep_opaque_init();
+void  hb_system_sleep_opaque_close(void **opaque);
+void  hb_system_sleep_private_enable(void *opaque);
+void  hb_system_sleep_private_disable(void *opaque);
+
 #endif /* __LIBHB__ */
 
 #endif

HandBrake-0.9.8.tar.bz2/libhb/reader.c -> HandBrake-0.9.9.tar.bz2/libhb/reader.c Changed

@@ -1,9 +1,11 @@
-/* $Id: reader.c,v 1.21 2005/11/25 15:05:25 titer Exp $
+/* reader.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 #include "hb.h"
 
 static int  hb_reader_init( hb_work_object_t * w, hb_job_t * job );
@@ -24,6 +26,7 @@
 {
     int    startup;
     double average; // average time between packets
+    double filtered_average; // average time between packets
     int64_t last;   // last timestamp seen on this stream
     int id;         // stream id
     int is_audio;   // != 0 if this is an audio stream
@@ -52,6 +55,7 @@
     int            start_found;     // found pts_to_start point
     int64_t        pts_to_start;
     uint64_t       st_first;
+    uint64_t       duration;
     hb_fifo_t    * fifos[100];
 };
 
@@ -109,6 +113,7 @@
     r->stream_timing[0].id = r->title->video_id;
     r->stream_timing[0].average = 90000. * (double)job->vrate_base /
                                            (double)job->vrate;
+    r->stream_timing[0].filtered_average = r->stream_timing[0].average;
     r->stream_timing[0].last = -r->stream_timing[0].average;
     r->stream_timing[0].valid = 1;
     r->stream_timing[0].startup = 10;
@@ -126,6 +131,28 @@
         r->pts_to_start = MAX(0, job->pts_to_start - 180000);
     }
 
+    if (job->pts_to_stop)
+    {
+        r->duration = job->pts_to_start + job->pts_to_stop;
+    }
+    else if (job->frame_to_stop)
+    {
+        int frames = job->frame_to_start + job->frame_to_stop;
+        r->duration = (int64_t)frames * job->title->rate_base * 90000 / job->title->rate;
+    }
+    else
+    {
+        hb_chapter_t *chapter;
+        int ii;
+
+        r->duration = 0;
+        for (ii = job->chapter_start; ii < job->chapter_end; ii++)
+        {
+            chapter = hb_list_item( job->title->list_chapter, ii - 1);
+            r->duration += chapter->duration;
+        }
+    }
+
     // The stream needs to be open before starting the reader thead
     // to prevent a race with decoders that may share information
     // with the reader. Specifically avcodec needs this.
@@ -211,7 +238,7 @@
 static stream_timing_t *id_to_st( hb_work_private_t *r, const hb_buffer_t *buf, int valid )
 {
     stream_timing_t *st = r->stream_timing;
-    while ( st->id != buf->id && st->id != -1)
+    while ( st->id != buf->s.id && st->id != -1)
     {
         ++st;
     }
@@ -229,11 +256,12 @@
                                         sizeof(*r->stream_timing) );
             st = r->stream_timing + slot;
         }
-        st->id = buf->id;
+        st->id = buf->s.id;
         st->average = 30.*90.;
+        st->filtered_average = st->average;
         st->startup = 10;
         st->last = -st->average;
-        if ( ( st->is_audio = is_audio( r, buf->id ) ) != 0 )
+        if ( ( st->is_audio = is_audio( r, buf->s.id ) ) != 0 )
         {
             r->saw_audio = 1;
         }
@@ -250,27 +278,34 @@
 {
     stream_timing_t *st = id_to_st( r, buf, 1 );
 
-    if( buf->renderOffset < 0 )
+    if( buf->s.renderOffset < 0 )
     {
-        st->last += st->average;
+        st->last += st->filtered_average;
         return;
     }
 
-    double dt = buf->renderOffset - st->last;
+    double dt = buf->s.renderOffset - st->last;
+
     // Protect against spurious bad timestamps
-    if ( dt > -5 * 90000LL && dt < 5 * 90000LL )
+    // timestamps should only move forward and by reasonable increments
+    if ( dt > 0 && dt < 5 * 90000LL )
     {
         if( st->startup )
         {
-            st->average += ( dt - st->average ) * (1./2.);
+            st->average += ( dt - st->average ) * (1./4.);
             st->startup--;
         }
         else
         {
             st->average += ( dt - st->average ) * (1./32.);
         }
-        st->last = buf->renderOffset;
+        // Ignore outliers
+        if (dt < 1.5 * st->average)
+        {
+            st->filtered_average += ( dt - st->filtered_average ) * (1./32.);
+        }
     }
+    st->last = buf->s.renderOffset;
     st->valid = 1;
 }
 
@@ -294,11 +329,13 @@
     {
         last = st->last;
     }
-    int64_t nxt = last + st->average;
-    r->scr_offset = buf->renderOffset - nxt;
+    int64_t nxt = last + st->filtered_average;
+    r->scr_offset = buf->s.renderOffset - nxt;
     // This log is handy when you need to debug timing problems...
-    //hb_log("id %x last %ld avg %g nxt %ld renderOffset %ld scr_offset %ld",
-    //    buf->id, last, st->average, nxt, buf->renderOffset, r->scr_offset);
+    //hb_log("id %x last %"PRId64" avg %g nxt %"PRId64" renderOffset %"PRId64
+    //       " scr_offset %"PRId64"",
+    //    buf->s.id, last, st->filtered_average, nxt,
+    //    buf->s.renderOffset, r->scr_offset);
     r->scr_changes = r->demux.scr_changes;
 }
 
@@ -317,6 +354,7 @@
     int            n;
     int            chapter = -1;
     int            chapter_end = r->job->chapter_end;
+    uint8_t        done = 0;
 
     if (r->bd)
     {
@@ -336,6 +374,7 @@
             // Note, bd seeks always put us to an i-frame.  no need
             // to start decoding early using r->pts_to_start
             hb_bd_seek_pts( r->bd, r->job->pts_to_start );
+            r->duration -= r->job->pts_to_start;
             r->job->pts_to_start = 0;
             r->start_found = 1;
         }
@@ -359,12 +398,12 @@
          * a media chapter that got merged, we'll stop ripping too early.
          */
         int start = r->job->chapter_start;
-        hb_chapter_t *chap = hb_list_item( r->title->list_chapter, chapter_end - 1 );
+        hb_chapter_t *chap = hb_list_item( r->job->list_chapter, chapter_end - 1 );
 
         chapter_end = chap->index;
         if (start > 1)
         {
-           chap = hb_list_item( r->title->list_chapter, start - 1 );
+           chap = hb_list_item( r->job->list_chapter, start - 1 );
            start = chap->index;
         }
         /* end chapter mapping XXX */
@@ -402,9 +441,9 @@
         // and then seek to the appropriate offset from it
         if ( ( buf = hb_stream_read( r->stream ) ) )
         {
-            if ( buf->start > 0 )
+            if ( buf->s.start > 0 )
             {
-                pts_to_start += buf->start;
+                pts_to_start += buf->s.start;
             }
         }
         
@@ -415,6 +454,7 @@
             // first packet we get, subtract that from pts_to_start, and
             // inspect the reset of the frames in sync.
             r->start_found = 2;
+            r->duration -= r->job->pts_to_start;
             r->job->pts_to_start = pts_to_start;
         }
     } 
@@ -425,12 +465,12 @@
          * end chapter so that we end at the right time.
          */
         int start = r->job->chapter_start;
-        hb_chapter_t *chap = hb_list_item( r->title->list_chapter, chapter_end - 1 );
+        hb_chapter_t *chap = hb_list_item( r->job->list_chapter, chapter_end - 1 );
         
         chapter_end = chap->index;
         if (start > 1)
         {
-            chap = hb_list_item( r->title->list_chapter, start - 1 );
+            chap = hb_list_item( r->job->list_chapter, start - 1 );
             start = chap->index;
         }
         
@@ -442,7 +482,7 @@
 
     list  = hb_list_init();
 
-    while( !*r->die && !r->job->done )
+    while(!*r->die && !r->job->done && !done)
     {
         if (r->bd)
             chapter = hb_bd_chapter( r->bd );
@@ -488,11 +528,11 @@
             // We will inspect the timestamps of each frame in sync
             // to skip from this seek point to the timestamp we
             // want to start at.
-            if ( buf->start > 0 && buf->start < r->job->pts_to_start )
+            if ( buf->s.start > 0 && buf->s.start < r->job->pts_to_start )
             {
-                r->job->pts_to_start -= buf->start;
+                r->job->pts_to_start -= buf->s.start;
             }
-            else if ( buf->start >= r->job->pts_to_start )
+            else if ( buf->s.start >= r->job->pts_to_start )
             {
                 r->job->pts_to_start = 0;
                 r->start_found = 1;
@@ -500,42 +540,20 @@
           }
         }
 
-        if( r->job->indepth_scan )
-        {
-            /*
-             * Need to update the progress during a subtitle scan
-             */
-            hb_state_t state;
-
-#define p state.param.working
-
-            state.state = HB_STATE_WORKING;
-            p.progress = (double)chapter / (double)r->job->chapter_end;
-            if( p.progress > 1.0 )
-            {
-                p.progress = 1.0;
-            }
-            p.rate_avg = 0.0;
-            p.hours    = -1;
-            p.minutes  = -1;
-            p.seconds  = -1;
-            hb_set_state( r->job->h, &state );
-        }
-
         (hb_demux[r->title->demuxer])( buf, list, &r->demux );
 
         while( ( buf = hb_list_item( list, 0 ) ) )
         {
             hb_list_rem( list, buf );
-            fifos = GetFifoForId( r, buf->id );
+            fifos = GetFifoForId( r, buf->s.id );
 
             if ( fifos && ! r->saw_video && !r->job->indepth_scan )
             {
                 // The first data packet with a PTS from an audio or video stream
                 // that we're decoding defines 'time zero'. Discard packets until
                 // we get one.
-                if ( buf->start != -1 && buf->renderOffset != -1 &&
-                     ( buf->id == r->title->video_id || is_audio( r, buf->id ) ) )
+                if ( buf->s.start != -1 && buf->s.renderOffset != -1 &&
+                     ( buf->s.id == r->title->video_id || is_audio( r, buf->s.id ) ) )
                 {
                     // force a new scr offset computation
                     r->scr_changes = r->demux.scr_changes - 1;
@@ -544,16 +562,17 @@
                     id_to_st( r, buf, 1 );
                     r->saw_video = 1;
                     hb_log( "reader: first SCR %"PRId64" id 0x%x DTS %"PRId64,
-                            r->demux.last_scr, buf->id, buf->renderOffset );
+                            r->demux.last_scr, buf->s.id, buf->s.renderOffset );
                 }
                 else
                 {
                     fifos = NULL;
                 }
             }
-            if( fifos )
+
+            if ( r->job->indepth_scan || fifos )
             {
-                if ( buf->renderOffset != -1 )
+                if ( buf->s.renderOffset != -1 )
                 {
                     if ( r->scr_changes != r->demux.scr_changes )
                     {
@@ -578,16 +597,29 @@
                             // frame but video & subtitles don't. Clear
                             // the timestamps so the decoder will generate
                             // them from the frame durations.
-                            buf->start = -1;
-                            buf->renderOffset = -1;
+                            buf->s.start = -1;
+                            buf->s.renderOffset = -1;
                         }
                     }
                 }
-                if ( buf->start != -1 )
+                if ( buf->s.start != -1 )
                 {
-                    int64_t start = buf->start - r->scr_offset;
-                    if ( !r->start_found )
+                    int64_t start = buf->s.start - r->scr_offset;
+
+                    if (!r->start_found || r->job->indepth_scan)
+                    {
                         UpdateState( r, start );
+                    }
+
+                    if (r->job->indepth_scan && r->job->pts_to_stop &&
+                        start >= r->pts_to_start + r->job->pts_to_stop)
+                    {
+                        // sync normally would terminate p-to-p
+                        // but sync doesn't run during indepth scan
+                        hb_log( "reader: reached pts %"PRId64", exiting early", start );
+                        done = 1;
+                        break;
+                    }
 
                     if ( !r->start_found &&
                         start >= r->pts_to_start )
@@ -596,24 +628,34 @@
                         r->start_found = 1;
                     }
                     // This log is handy when you need to debug timing problems
-                    //hb_log("id %x scr_offset %ld start %ld --> %ld", 
-                    //        buf->id, r->scr_offset, buf->start, 
-                    //        buf->start - r->scr_offset);
-                    buf->start -= r->scr_offset;
+                    //hb_log("id %x scr_offset %"PRId64
+                    //       " start %"PRId64" --> %"PRId64"", 
+                    //        buf->s.id, r->scr_offset, buf->s.start, 
+                    //        buf->s.start - r->scr_offset);
+                    buf->s.start -= r->scr_offset;
                 }
-                if ( buf->renderOffset != -1 )
+                if ( buf->s.renderOffset != -1 )
                 {
                     // This packet is referenced to the same SCR as the last.
                     // Adjust timestamp to remove the System Clock Reference
                     // offset then update the average inter-packet time
                     // for this stream.
-                    buf->renderOffset -= r->scr_offset;
+                    buf->s.renderOffset -= r->scr_offset;
                     update_ipt( r, buf );
                 }
+#if 0
+                // JAS: This was added to fix a rare "audio time went backward"
+                // sync error I found in one sample.  But it has a bad side
+                // effect on DVDs, causing frequent "adding silence" sync
+                // errors. So I am disabling it.
                 else
                 {
                     update_ipt( r, buf );
                 }
+#endif
+            }
+            if( fifos )
+            {
                 if ( !r->start_found )
                 {
                     hb_buffer_close( &buf );
@@ -628,7 +670,7 @@
                 for( n = 1; fifos[n] != NULL; n++)
                 {
                     hb_buffer_t *buf_copy = hb_buffer_init( buf->size );
-                    hb_buffer_copy_settings( buf_copy, buf );
+                    buf_copy->s = buf->s;
                     memcpy( buf_copy->data, buf->data, buf->size );
                     push_buf( r, fifos[n], buf_copy );
                 }
@@ -647,14 +689,14 @@
         push_buf( r, r->job->fifo_mpeg2, hb_buffer_init(0) );
 
         hb_audio_t *audio;
-        for( n = 0; (audio = hb_list_item( r->job->title->list_audio, n)); ++n )
+        for( n = 0; (audio = hb_list_item( r->job->list_audio, n)); ++n )
         {
             if ( audio->priv.fifo_in )
                 push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) );
         }
 
         hb_subtitle_t *subtitle;
-        for( n = 0; (subtitle = hb_list_item( r->job->title->list_subtitle, n)); ++n )
+        for( n = 0; (subtitle = hb_list_item( r->job->list_subtitle, n)); ++n )
         {
             if ( subtitle->fifo_in && subtitle->source == VOBSUB)
                 push_buf( r, subtitle->fifo_in, hb_buffer_init(0) );
@@ -683,25 +725,37 @@
     }
 
 #define p state.param.working
-    state.state = HB_STATE_SEARCHING;
-    p.progress  = (float) start / (float) r->job->pts_to_start;
+    if ( !r->job->indepth_scan )
+    {
+        state.state = HB_STATE_SEARCHING;
+        p.progress  = (float) start / (float) r->job->pts_to_start;
+    }
+    else
+    {
+        state.state = HB_STATE_WORKING;
+        p.progress  = (float) start / (float) r->duration;
+    }
     if( p.progress > 1.0 )
     {
         p.progress = 1.0;
     }
+    p.rate_cur = 0.0;
+    p.rate_avg = 0.0;
     if (now > r->st_first)
     {
         int eta;
 
         avg = 1000.0 * (double)start / (now - r->st_first);
-        eta = ( r->job->pts_to_start - start ) / avg;
+        if ( !r->job->indepth_scan )
+            eta = ( r->job->pts_to_start - start ) / avg;
+        else
+            eta = ( r->duration - start ) / avg;
         p.hours   = eta / 3600;
         p.minutes = ( eta % 3600 ) / 60;
         p.seconds = eta % 60;
     }
     else
     {
-        p.rate_avg = 0.0;
         p.hours    = -1;
         p.minutes  = -1;
         p.seconds  = -1;
@@ -727,11 +781,14 @@
 
     if( id == title->video_id )
     {
-        if( job->indepth_scan )
+        if (job->indepth_scan && !job->frame_to_stop)
         {
             /*
              * Ditch the video here during the indepth scan until
              * we can improve the MPEG2 decode performance.
+             *
+             * But if we specify a stop frame, we must decode the
+             * frames in order to count them.
              */
             return NULL;
         }
@@ -742,22 +799,15 @@
         }
     }
 
-    n = 0;
-    count = hb_list_count( title->list_subtitle );
+    count = hb_list_count( job->list_subtitle );
     count = count > 99 ? 99 : count;
-    for( i=0; i < count; i++ ) {
-        subtitle =  hb_list_item( title->list_subtitle, i );
-        if (id == subtitle->id) {
-            subtitle->hits++;
-            if( !job->indepth_scan || job->select_subtitle_config.force )
-            {
-                /*
-                 * Pass the subtitles to be processed if we are not scanning, or if
-                 * we are scanning and looking for forced subs, then pass them up
-                 * to decode whether the sub is a forced one.
-                 */
-                r->fifos[n++] = subtitle->fifo_in;
-            }
+    for( i = n = 0; i < count; i++ )
+    {
+        subtitle =  hb_list_item( job->list_subtitle, i );
+        if (id == subtitle->id)
+        {
+            /* pass the subtitles to be processed */
+            r->fifos[n++] = subtitle->fifo_in;
         }
     }
     if ( n != 0 )
@@ -767,10 +817,9 @@
     
     if( !job->indepth_scan )
     {
-        n = 0;
-        for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+        for( i = n = 0; i < hb_list_count( job->list_audio ); i++ )
         {
-            audio = hb_list_item( title->list_audio, i );
+            audio = hb_list_item( job->list_audio, i );
             if( id == audio->id )
             {
                 r->fifos[n++] = audio->priv.fifo_in;

HandBrake-0.9.9.tar.bz2/libhb/rendersub.c Added

@@ -0,0 +1,787 @@
+/* rendersub.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
+#include "hb.h"
+#include "hbffmpeg.h"
+#include <ass/ass.h>
+
+struct hb_filter_private_s
+{
+    // Common
+    int               crop[4];
+    int               type;
+
+    // VOBSUB
+    hb_list_t       * sub_list; // List of active subs
+
+    // SSA
+    ASS_Library     * ssa;
+    ASS_Renderer    * renderer;
+    ASS_Track       * ssaTrack;
+};
+
+// VOBSUB
+static int vobsub_init( hb_filter_object_t * filter, hb_filter_init_t * init );
+
+static int vobsub_work( hb_filter_object_t * filter,
+                        hb_buffer_t ** buf_in,
+                        hb_buffer_t ** buf_out );
+
+static void vobsub_close( hb_filter_object_t * filter );
+
+
+// SSA
+static int ssa_init( hb_filter_object_t * filter, hb_filter_init_t * init );
+
+static int ssa_work( hb_filter_object_t * filter,
+                     hb_buffer_t ** buf_in,
+                     hb_buffer_t ** buf_out );
+
+static void ssa_close( hb_filter_object_t * filter );
+
+
+// PGS
+static int pgssub_init ( hb_filter_object_t * filter, hb_filter_init_t * init );
+
+static int pgssub_work ( hb_filter_object_t * filter,
+                      hb_buffer_t ** buf_in,
+                      hb_buffer_t ** buf_out );
+
+static void pgssub_close( hb_filter_object_t * filter );
+
+
+// Entry points
+static int hb_rendersub_init( hb_filter_object_t * filter,
+                                 hb_filter_init_t * init );
+
+static int hb_rendersub_work( hb_filter_object_t * filter,
+                                 hb_buffer_t ** buf_in,
+                                 hb_buffer_t ** buf_out );
+
+static void hb_rendersub_close( hb_filter_object_t * filter );
+
+hb_filter_object_t hb_filter_render_sub =
+{
+    .id            = HB_FILTER_RENDER_SUB,
+    .enforce_order = 1,
+    .name          = "Subtitle renderer",
+    .settings      = NULL,
+    .init          = hb_rendersub_init,
+    .work          = hb_rendersub_work,
+    .close         = hb_rendersub_close,
+};
+
+static void blend( hb_buffer_t *dst, hb_buffer_t *src, int left, int top )
+{
+    int xx, yy;
+    int ww, hh;
+    int x0, y0;
+    uint8_t *y_in, *y_out;
+    uint8_t *u_in, *u_out;
+    uint8_t *v_in, *v_out;
+    uint8_t *a_in, alpha;
+
+    x0 = y0 = 0;
+    if( left < 0 )
+    {
+        x0 = -left;
+    }
+    if( top < 0 )
+    {
+        y0 = -top;
+    }
+
+    ww = src->f.width;
+    if( src->f.width - x0 > dst->f.width - left )
+    {
+        ww = dst->f.width - left + x0;
+    }
+    hh = src->f.height;
+    if( src->f.height - y0 > dst->f.height - top )
+    {
+        hh = dst->f.height - top + y0;
+    }
+    // Blend luma
+    for( yy = y0; yy < hh; yy++ )
+    {
+        y_in   = src->plane[0].data + yy * src->plane[0].stride;
+        y_out   = dst->plane[0].data + ( yy + top ) * dst->plane[0].stride;
+        a_in = src->plane[3].data + yy * src->plane[3].stride;
+        for( xx = x0; xx < ww; xx++ )
+        {
+            alpha = a_in[xx];
+            /*
+             * Merge the luminance and alpha with the picture
+             */
+            y_out[left + xx] = 
+                ( (uint16_t)y_out[left + xx] * ( 255 - alpha ) +
+                     (uint16_t)y_in[xx] * alpha ) >> 8;
+        }
+    }
+
+    // Blend U & V
+    // Assumes source and dest are the same PIX_FMT
+    int hshift = 0;
+    int wshift = 0;
+    if( dst->plane[1].height < dst->plane[0].height )
+        hshift = 1;
+    if( dst->plane[1].width < dst->plane[0].width )
+        wshift = 1;
+
+    for( yy = y0 >> hshift; yy < hh >> hshift; yy++ )
+    {
+        u_in = src->plane[1].data + yy * src->plane[1].stride;
+        u_out = dst->plane[1].data + ( yy + ( top >> hshift ) ) * dst->plane[1].stride;
+        v_in = src->plane[2].data + yy * src->plane[2].stride;
+        v_out = dst->plane[2].data + ( yy + ( top >> hshift ) ) * dst->plane[2].stride;
+        a_in = src->plane[3].data + ( yy << hshift ) * src->plane[3].stride;
+
+        for( xx = x0 >> wshift; xx < ww >> wshift; xx++ )
+        {
+            alpha = a_in[xx << wshift];
+
+            // Blend averge U and alpha
+            u_out[(left >> wshift) + xx] =
+                ( (uint16_t)u_out[(left >> wshift) + xx] * ( 255 - alpha ) +
+                  (uint16_t)u_in[xx] * alpha ) >> 8;
+
+            // Blend V and alpha
+            v_out[(left >> wshift) + xx] =
+                ( (uint16_t)v_out[(left >> wshift) + xx] * ( 255 - alpha ) +
+                  (uint16_t)v_in[xx] * alpha ) >> 8;
+        }
+    }
+}
+
+// Assumes that the input buffer has the same dimensions
+// as the original title diminsions
+static void ApplySub( hb_filter_private_t * pv, hb_buffer_t * buf, hb_buffer_t * sub )
+{
+    int top, left, margin_top, margin_percent;
+
+    if ( !pv->ssa )
+    {
+        /*
+         * Percent of height of picture that form a margin that subtitles
+         * should not be displayed within.
+         */
+        margin_percent = 2;
+
+        /*
+         * If necessary, move the subtitle so it is not in a cropped zone.
+         * When it won't fit, we center it so we lose as much on both ends.
+         * Otherwise we try to leave a 20px or 2% margin around it.
+         */
+        margin_top = ( ( buf->f.height - pv->crop[0] - pv->crop[1] ) *
+                       margin_percent ) / 100;
+
+        if( margin_top > 20 )
+        {
+            /*
+             * A maximum margin of 20px regardless of height of the picture.
+             */
+            margin_top = 20;
+        }
+
+        if( sub->f.height > buf->f.height - pv->crop[0] - pv->crop[1] -
+            ( margin_top * 2 ) )
+        {
+            /*
+             * The subtitle won't fit in the cropped zone, so center
+             * it vertically so we fit in as much as we can.
+             */
+            top = pv->crop[0] + ( buf->f.height - pv->crop[0] -
+                                          pv->crop[1] - sub->f.height ) / 2;
+        }
+        else if( sub->f.y < pv->crop[0] + margin_top )
+        {
+            /*
+             * The subtitle fits in the cropped zone, but is currently positioned
+             * within our top margin, so move it outside of our margin.
+             */
+            top = pv->crop[0] + margin_top;
+        }
+        else if( sub->f.y > buf->f.height - pv->crop[1] - margin_top - sub->f.height )
+        {
+            /*
+             * The subtitle fits in the cropped zone, and is not within the top
+             * margin but is within the bottom margin, so move it to be above
+             * the margin.
+             */
+            top = buf->f.height - pv->crop[1] - margin_top - sub->f.height;
+        }
+        else
+        {
+            /*
+             * The subtitle is fine where it is.
+             */
+            top = sub->f.y;
+        }
+
+        if( sub->f.width > buf->f.width - pv->crop[2] - pv->crop[3] - 40 )
+            left = pv->crop[2] + ( buf->f.width - pv->crop[2] -
+                    pv->crop[3] - sub->f.width ) / 2;
+        else if( sub->f.x < pv->crop[2] + 20 )
+            left = pv->crop[2] + 20;
+        else if( sub->f.x > buf->f.width - pv->crop[3] - 20 - sub->f.width )
+            left = buf->f.width - pv->crop[3] - 20 - sub->f.width;
+        else
+            left = sub->f.x;
+    }
+    else
+    {
+        top = sub->f.y;
+        left = sub->f.x;
+    }
+
+    blend( buf, sub, left, top );
+}
+
+// Assumes that the input buffer has the same dimensions
+// as the original title diminsions
+static void ApplyVOBSubs( hb_filter_private_t * pv, hb_buffer_t * buf )
+{
+    int ii;
+    hb_buffer_t *sub, *next;
+
+    for( ii = 0; ii < hb_list_count(pv->sub_list); )
+    {
+        sub = hb_list_item( pv->sub_list, ii );
+        if (ii + 1 < hb_list_count(pv->sub_list))
+            next = hb_list_item( pv->sub_list, ii + 1 );
+        else
+            next = NULL;
+
+        if ((sub->s.stop != -1 && sub->s.stop <= buf->s.start) ||
+            (next != NULL && sub->s.stop == -1 && next->s.start <= buf->s.start))
+        {
+            // Subtitle stop is in the past, delete it
+            hb_list_rem( pv->sub_list, sub );
+            hb_buffer_close( &sub );
+        }
+        else if( sub->s.start <= buf->s.start )
+        {
+            // The subtitle has started before this frame and ends
+            // after it.  Render the subtitle into the frame.
+            while ( sub )
+            {
+                ApplySub( pv, buf, sub );
+                sub = sub->next;
+            }
+            ii++;
+        }
+        else
+        {
+            // The subtitle starts in the future.  No need to continue.
+            break;
+        }
+    }
+}
+
+static int vobsub_init( hb_filter_object_t * filter,
+                        hb_filter_init_t * init )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    pv->sub_list = hb_list_init();
+
+    return 0;
+}
+
+static void vobsub_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if( !pv )
+    {
+        return;
+    }
+
+    if( pv->sub_list )
+        hb_list_empty( &pv->sub_list );
+
+    free( pv );
+    filter->private_data = NULL;
+}
+
+static int vobsub_work( hb_filter_object_t * filter,
+                        hb_buffer_t ** buf_in,
+                        hb_buffer_t ** buf_out )
+{
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+    hb_buffer_t * sub;
+
+    if ( in->size <= 0 )
+    {
+        *buf_in = NULL;
+        *buf_out = in;
+        return HB_FILTER_DONE;
+    }
+
+    // Get any pending subtitles and add them to the active
+    // subtitle list
+    while( ( sub = hb_fifo_get( filter->subtitle->fifo_out ) ) )
+    {
+        hb_list_add( pv->sub_list, sub );
+    }
+
+    ApplyVOBSubs( pv, in );
+    *buf_in = NULL;
+    *buf_out = in;
+    
+    return HB_FILTER_OK;
+}
+
+static uint8_t ssaAlpha( ASS_Image *frame, int x, int y )
+{
+    unsigned frameA = ( frame->color ) & 0xff;
+    unsigned gliphA = frame->bitmap[y*frame->stride + x];
+
+    // Alpha for this pixel is the frame opacity (255 - frameA)
+    // multiplied by the gliph alfa (gliphA) for this pixel
+    unsigned alpha = (255 - frameA) * gliphA >> 8;
+
+    return (uint8_t)alpha;
+}
+
+static hb_buffer_t * RenderSSAFrame( hb_filter_private_t * pv, ASS_Image * frame )
+{
+    hb_buffer_t *sub;
+    int xx, yy;
+
+    unsigned r = ( frame->color >> 24 ) & 0xff;
+    unsigned g = ( frame->color >> 16 ) & 0xff;
+    unsigned b = ( frame->color >>  8 ) & 0xff;
+
+    int yuv = hb_rgb2yuv((r << 16) | (g << 8) | b );
+    
+    unsigned frameY = (yuv >> 16) & 0xff;
+    unsigned frameV = (yuv >> 8 ) & 0xff;
+    unsigned frameU = (yuv >> 0 ) & 0xff;
+
+    sub = hb_frame_buffer_init( AV_PIX_FMT_YUVA420P, frame->w, frame->h );
+    if( sub == NULL )
+        return NULL;
+
+    uint8_t *y_out, *u_out, *v_out, *a_out;
+    y_out = sub->plane[0].data;
+    u_out = sub->plane[1].data;
+    v_out = sub->plane[2].data;
+    a_out = sub->plane[3].data;
+
+    for( yy = 0; yy < frame->h; yy++ )
+    {
+        for( xx = 0; xx < frame->w; xx++ )
+        {
+            y_out[xx] = frameY;
+            if( ( yy & 1 ) == 0 )
+            {
+                u_out[xx>>1] = frameU;
+                v_out[xx>>1] = frameV;
+            }
+            a_out[xx] = ssaAlpha( frame, xx, yy );;
+        }
+        y_out += sub->plane[0].stride;
+        if( ( yy & 1 ) == 0 )
+        {
+            u_out += sub->plane[1].stride;
+            v_out += sub->plane[2].stride;
+        }
+        a_out += sub->plane[3].stride;
+    }
+    sub->f.width = frame->w;
+    sub->f.height = frame->h;
+    sub->f.x = frame->dst_x + pv->crop[2];
+    sub->f.y = frame->dst_y + pv->crop[0];
+
+    return sub;
+}
+
+static void ApplySSASubs( hb_filter_private_t * pv, hb_buffer_t * buf )
+{
+    ASS_Image *frameList;
+    hb_buffer_t *sub;
+    frameList = ass_render_frame( pv->renderer, pv->ssaTrack,
+                                  buf->s.start / 90, NULL );
+    if ( !frameList )
+        return;
+
+    ASS_Image *frame;
+    for (frame = frameList; frame; frame = frame->next) {
+        sub = RenderSSAFrame( pv, frame );
+        if( sub )
+        {
+            ApplySub( pv, buf, sub );
+            hb_buffer_close( &sub );
+        }
+    }
+}
+
+static void ssa_log(int level, const char *fmt, va_list args, void *data)
+{
+    if ( level < 5 )      // same as default verbosity when no callback is set
+    {
+        hb_valog( 1, "[ass]", fmt, args );
+    }
+}
+
+static int ssa_init( hb_filter_object_t * filter,
+                     hb_filter_init_t * init )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    pv->ssa = ass_library_init();
+    if ( !pv->ssa ) {
+        hb_error( "decssasub: libass initialization failed\n" );
+        return 1;
+    }
+    
+    // Redirect libass output to hb_log
+    ass_set_message_cb( pv->ssa, ssa_log, NULL );
+    
+    // Load embedded fonts
+    hb_list_t * list_attachment = init->job->list_attachment;
+    int i;
+    for ( i = 0; i < hb_list_count(list_attachment); i++ )
+    {
+        hb_attachment_t * attachment = hb_list_item( list_attachment, i );
+        
+        if ( attachment->type == FONT_TTF_ATTACH )
+        {
+            ass_add_font(
+                pv->ssa,
+                attachment->name,
+                attachment->data,
+                attachment->size );
+        }
+    }
+    
+    ass_set_extract_fonts( pv->ssa, 1 );
+    ass_set_style_overrides( pv->ssa, NULL );
+    
+    pv->renderer = ass_renderer_init( pv->ssa );
+    if ( !pv->renderer ) {
+        hb_log( "decssasub: renderer initialization failed\n" );
+        return 1;
+    }
+    
+    ass_set_use_margins( pv->renderer, 0 );
+    ass_set_hinting( pv->renderer, ASS_HINTING_LIGHT ); // VLC 1.0.4 uses this
+    ass_set_font_scale( pv->renderer, 1.0 );
+    ass_set_line_spacing( pv->renderer, 1.0 );
+    
+    // Setup default font family
+    // 
+    // SSA v4.00 requires that "Arial" be the default font
+    const char *font = NULL;
+    const char *family = "Arial";
+    // NOTE: This can sometimes block for several *seconds*.
+    //       It seems that process_fontdata() for some embedded fonts is slow.
+    ass_set_fonts( pv->renderer, font, family, /*haveFontConfig=*/1, NULL, 1 );
+    
+    // Setup track state
+    pv->ssaTrack = ass_new_track( pv->ssa );
+    if ( !pv->ssaTrack ) {
+        hb_log( "decssasub: ssa track initialization failed\n" );
+        return 1;
+    }
+    
+    // NOTE: The codec extradata is expected to be in MKV format
+    ass_process_codec_private( pv->ssaTrack,
+        (char *)filter->subtitle->extradata, filter->subtitle->extradata_size );
+    
+    int width = init->width - ( pv->crop[2] + pv->crop[3] );
+    int height = init->height - ( pv->crop[0] + pv->crop[1] );
+    ass_set_frame_size( pv->renderer, width, height);
+
+    double par = (double)init->par_width / init->par_height;
+    ass_set_aspect_ratio( pv->renderer, 1, par );
+
+    return 0;
+}
+
+static void ssa_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if( !pv )
+    {
+        return;
+    }
+
+    if ( pv->ssaTrack )
+        ass_free_track( pv->ssaTrack );
+    if ( pv->renderer )
+        ass_renderer_done( pv->renderer );
+    if ( pv->ssa )
+        ass_library_done( pv->ssa );
+
+    free( pv );
+    filter->private_data = NULL;
+}
+
+static int ssa_work( hb_filter_object_t * filter,
+                     hb_buffer_t ** buf_in,
+                     hb_buffer_t ** buf_out )
+{
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+    hb_buffer_t * sub;
+
+    if ( in->size <= 0 )
+    {
+        *buf_in = NULL;
+        *buf_out = in;
+        return HB_FILTER_DONE;
+    }
+
+    // Get any pending subtitles and add them to the active
+    // subtitle list
+    while( ( sub = hb_fifo_get( filter->subtitle->fifo_out ) ) )
+    {
+        // Parse MKV-SSA packet
+        // SSA subtitles always have an explicit stop time, so we
+        // do not need to do special processing for stop == -1
+        ass_process_chunk( pv->ssaTrack, (char*)sub->data, sub->size,
+                           sub->s.start / 90,
+                           (sub->s.stop - sub->s.start) / 90 );
+    }
+
+    ApplySSASubs( pv, in );
+    *buf_in = NULL;
+    *buf_out = in;
+    
+    return HB_FILTER_OK;
+}
+
+static void ApplyPGSSubs( hb_filter_private_t * pv, hb_buffer_t * buf )
+{
+    int index;
+    hb_buffer_t * old_sub;
+    hb_buffer_t * sub;
+
+    // Each PGS subtitle supersedes anything that preceded it.
+    // Find the active subtitle (if there is one), and delete
+    // everything before it.
+    for( index = hb_list_count( pv->sub_list ) - 1; index > 0; index-- )
+    {
+        sub = hb_list_item( pv->sub_list, index);
+        if ( sub->s.start <= buf->s.start )
+        {
+            while ( index > 0 )
+            {
+                old_sub = hb_list_item( pv->sub_list, index - 1);
+                hb_list_rem( pv->sub_list, old_sub );
+                hb_buffer_close( &old_sub );
+                index--;
+            }
+        }
+    }
+
+    // Some PGS subtitles have no content and only serve to clear
+    // the screen. If any of these are at the front of our list,
+    // we can now get rid of them.
+    while ( hb_list_count( pv->sub_list ) > 0 )
+    {
+        sub = hb_list_item( pv->sub_list, 0 );
+        if (sub->f.width != 0 && sub->f.height != 0)
+            break;
+
+        hb_list_rem( pv->sub_list, sub );
+        hb_buffer_close( &sub );
+    }
+
+    // Check to see if there's an active subtitle, and apply it.
+    if ( hb_list_count( pv->sub_list ) > 0)
+    {
+        sub = hb_list_item( pv->sub_list, 0 );
+        if ( sub->s.start <= buf->s.start )
+        {
+            while ( sub )
+            {
+                ApplySub( pv, buf, sub );
+                sub = sub->sub;
+            }
+        }
+    }
+}
+
+static int pgssub_init( hb_filter_object_t * filter,
+                        hb_filter_init_t * init )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    pv->sub_list = hb_list_init();
+
+    return 0;
+}
+
+static void pgssub_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if ( !pv )
+    {
+        return;
+    }
+
+    if ( pv->sub_list )
+        hb_list_empty( &pv->sub_list );
+
+    free( pv );
+    filter->private_data = NULL;
+}
+
+static int pgssub_work( hb_filter_object_t * filter,
+                        hb_buffer_t ** buf_in,
+                        hb_buffer_t ** buf_out)
+{
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+    hb_buffer_t * sub;
+
+    if ( in->size <= 0 )
+    {
+        *buf_in = NULL;
+        *buf_out = in;
+        return HB_FILTER_DONE;
+    }
+
+    // Get any pending subtitles and add them to the active
+    // subtitle list
+    while ( ( sub = hb_fifo_get( filter->subtitle->fifo_out ) ) )
+    {
+        hb_list_add( pv->sub_list, sub );
+    }
+
+    ApplyPGSSubs( pv, in );
+    *buf_in = NULL;
+    *buf_out = in;
+
+    return HB_FILTER_OK;
+}
+
+static int hb_rendersub_init( hb_filter_object_t * filter,
+                                 hb_filter_init_t * init )
+{
+    filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+    hb_filter_private_t * pv = filter->private_data;
+    hb_subtitle_t *subtitle;
+    int ii;
+
+    if( filter->settings )
+    {
+        sscanf( filter->settings, "%d:%d:%d:%d",
+                &pv->crop[0],
+                &pv->crop[1],
+                &pv->crop[2],
+                &pv->crop[3]);
+    }
+
+    // Find the subtitle we need
+    for( ii = 0; ii < hb_list_count(init->job->list_subtitle); ii++ )
+    {
+        subtitle = hb_list_item( init->job->list_subtitle, ii );
+        if( subtitle && subtitle->config.dest == RENDERSUB )
+        {
+            // Found it
+            filter->subtitle = subtitle;
+            pv->type = subtitle->source;
+            break;
+        }
+    }
+    if( filter->subtitle == NULL )
+    {
+        hb_log("rendersub: no subtitle marked for burn");
+        return 1;
+    }
+
+    switch( pv->type )
+    {
+        case VOBSUB:
+        {
+            return vobsub_init( filter, init );
+        } break;
+
+        case SSASUB:
+        {
+            return ssa_init( filter, init );
+        } break;
+
+        case PGSSUB:
+        {
+            return pgssub_init( filter, init );
+        } break;
+
+        default:
+        {
+            hb_log("rendersub: unsupported subtitle format %d", pv->type );
+            return 1;
+        } break;
+    }
+}
+
+static int hb_rendersub_work( hb_filter_object_t * filter,
+                                 hb_buffer_t ** buf_in,
+                                 hb_buffer_t ** buf_out )
+{
+    hb_filter_private_t * pv = filter->private_data;
+    switch( pv->type )
+    {
+        case VOBSUB:
+        {
+            return vobsub_work( filter, buf_in, buf_out );
+        } break;
+
+        case SSASUB:
+        {
+            return ssa_work( filter, buf_in, buf_out );
+        } break;
+
+        case PGSSUB:
+        {
+            return pgssub_work( filter, buf_in, buf_out );
+        } break;
+
+        default:
+        {
+            hb_error("rendersub: unsupported subtitle format %d", pv->type );
+            return 1;
+        } break;
+    }
+}
+
+static void hb_rendersub_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+    switch( pv->type )
+    {
+        case VOBSUB:
+        {
+            vobsub_close( filter );
+        } break;
+
+        case SSASUB:
+        {
+            ssa_close( filter );
+        } break;
+
+        case PGSSUB:
+        {
+            pgssub_close( filter );
+        } break;
+
+        default:
+        {
+            hb_error("rendersub: unsupported subtitle format %d", pv->type );
+        } break;
+    }
+}
+

HandBrake-0.9.8.tar.bz2/libhb/rotate.c -> HandBrake-0.9.9.tar.bz2/libhb/rotate.c Changed

@@ -1,7 +1,16 @@
+/* rorate.c
 
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
 #include "hb.h"
 #include "hbffmpeg.h"
 //#include "mpeg2dec/mpeg2.h"
+#include "taskset.h"
 
 #define MODE_DEFAULT     3
 // Mode 1: Flip vertically (y0 becomes yN and yN becomes y0)
@@ -9,80 +18,49 @@
 // Mode 3: Flip both horizontally and vertically (modes 1 and 2 combined)
 
 typedef struct rotate_arguments_s {
-    uint8_t **dst;
-    int stop;
+    hb_buffer_t *dst;
+    hb_buffer_t *src;
 } rotate_arguments_t;
 
 struct hb_filter_private_s
 {
-    int              pix_fmt;
-    int              width[3];
-    int              height[3];
-
     int              mode;
-
-    int              ref_stride[3];
+    int              width;
+    int              height;
+    int              par_width;
+    int              par_height;
 
     int              cpu_count;
 
-    hb_thread_t    ** rotate_threads;        // Threads for Rotate - one per CPU
-    hb_lock_t      ** rotate_begin_lock;     // Thread has work
-    hb_lock_t      ** rotate_complete_lock;  // Thread has completed work
+    taskset_t         rotate_taskset;        // Threads for Rotate - one per CPU
     rotate_arguments_t *rotate_arguments;     // Arguments to thread for work
-
-    AVPicture        pic_in;
-    AVPicture        pic_out;
-    hb_buffer_t *    buf_out;
-    hb_buffer_t *    buf_settings;
 };
 
-hb_filter_private_t * hb_rotate_init( int pix_fmt,
-                                           int width,
-                                           int height,
-                                           char * settings );
+static int hb_rotate_init( hb_filter_object_t * filter,
+                           hb_filter_init_t * init );
+
+static int hb_rotate_work( hb_filter_object_t * filter,
+                           hb_buffer_t ** buf_in,
+                           hb_buffer_t ** buf_out );
 
-int hb_rotate_work( hb_buffer_t * buf_in,
-                         hb_buffer_t ** buf_out,
-                         int pix_fmt,
-                         int width,
-                         int height,
-                         hb_filter_private_t * pv );
+static void hb_rotate_close( hb_filter_object_t * filter );
 
-void hb_rotate_close( hb_filter_private_t * pv );
+static int hb_rotate_info( hb_filter_object_t * filter,
+                           hb_filter_info_t * info );
 
 hb_filter_object_t hb_filter_rotate =
 {
-    FILTER_ROTATE,
-    "Rotate (flips image axes)",
-    NULL,
-    hb_rotate_init,
-    hb_rotate_work,
-    hb_rotate_close,
+    .id            = HB_FILTER_ROTATE,
+    .enforce_order = 0,
+    .name          = "Rotate (rotate & flip image axes)",
+    .settings      = NULL,
+    .init          = hb_rotate_init,
+    .work          = hb_rotate_work,
+    .close         = hb_rotate_close,
+    .info          = hb_rotate_info
 };
 
 
-static void rotate_filter_line( uint8_t *dst,
-                               uint8_t *cur,
-                               int plane,
-                               hb_filter_private_t * pv )
-{
-
-    int w = pv->width[plane];
-
-    int x;
-    for( x = 0; x < w; x++)
-    {
-        if( pv->mode & 2 )
-        {
-            dst[x] = cur[w-x-1];
-        }
-        else
-        {
-            dst[x] = cur[x];
-        }
-    }
-}
-
 typedef struct rotate_thread_arg_s {
     hb_filter_private_t *pv;
     int segment;
@@ -99,8 +77,10 @@
     int plane;
     int segment, segment_start, segment_stop;
     rotate_thread_arg_t *thread_args = thread_args_v;
-    uint8_t **dst;
-    int y, w, h, ref_stride;
+    uint8_t *dst;
+    hb_buffer_t *dst_buf;
+    hb_buffer_t *src_buf;
+    int y;
 
 
     pv = thread_args->pv;
@@ -111,39 +91,42 @@
     while( run )
     {
         /*
-         * Wait here until there is work to do. hb_lock() blocks until
-         * render releases it to say that there is more work to do.
+         * Wait here until there is work to do.
          */
-        hb_lock( pv->rotate_begin_lock[segment] );
-
-        rotate_work = &pv->rotate_arguments[segment];
+        taskset_thread_wait4start( &pv->rotate_taskset, segment );
 
-        if( rotate_work->stop )
+        if( taskset_thread_stop( &pv->rotate_taskset, segment ) )
         {
             /*
              * No more work to do, exit this thread.
              */
             run = 0;
-            continue;
+            goto report_completion;
         } 
 
+        rotate_work = &pv->rotate_arguments[segment];
         if( rotate_work->dst == NULL )
         {
             hb_error( "Thread started when no work available" );
             hb_snooze(500);
-            continue;
+            goto report_completion;
         }
         
         /*
          * Process all three planes, but only this segment of it.
          */
+        dst_buf = rotate_work->dst;
+        src_buf = rotate_work->src;
         for( plane = 0; plane < 3; plane++)
         {
+            int dst_stride, src_stride;
+
+            dst = dst_buf->plane[plane].data;
+            dst_stride = dst_buf->plane[plane].stride;
+            src_stride = src_buf->plane[plane].stride;
 
-            dst = rotate_work->dst;
-            w = pv->width[plane];
-            h = pv->height[plane];
-            ref_stride = pv->ref_stride[plane];
+            int h = src_buf->plane[plane].height;
+            int w = src_buf->plane[plane].width;
             segment_start = ( h / pv->cpu_count ) * segment;
             if( segment == pv->cpu_count - 1 )
             {
@@ -158,41 +141,58 @@
             for( y = segment_start; y < segment_stop; y++ )
             {
                 uint8_t * cur;
-                
-                if( pv->mode & 1 )
-                {
-                    cur  = &pv->pic_in.data[plane][(h-y-1)*pv->pic_in.linesize[plane]];
-                }
-                else
+                int x, xo, yo;
+
+                cur = &src_buf->plane[plane].data[y * src_stride];
+                for( x = 0; x < w; x++)
                 {
-                    cur  = &pv->pic_in.data[plane][(y)*pv->pic_in.linesize[plane]];
+                    if( pv->mode & 1 )
+                    {
+                        yo = h - y - 1;
+                    }
+                    else
+                    {
+                        yo = y;
+                    }
+                    if( pv->mode & 2 )
+                    {
+                        xo = w - x - 1;
+                    }
+                    else
+                    {
+                        xo = x;
+                    }
+                    if( pv->mode & 4 ) // Rotate 90 clockwise
+                    {
+                        int tmp = xo;
+                        xo = h - yo - 1;
+                        yo = tmp;
+                    }
+                    dst[yo*dst_stride + xo] = cur[x];
                 }
-                uint8_t *dst2 = &dst[plane][y*w];
-
-                rotate_filter_line( dst2, 
-                                   cur, 
-                                   plane, 
-                                   pv );
             }
         }
+
+report_completion:
         /*
          * Finished this segment, let everyone know.
          */
-        hb_unlock( pv->rotate_complete_lock[segment] );
+        taskset_thread_complete( &pv->rotate_taskset, segment );
     }
-    free( thread_args_v );
 }
 
 
 /*
- * threaded rotate - each thread rptates a single segment of all
+ * threaded rotate - each thread rotates a single segment of all
  * three planes. Where a segment is defined as the frame divided by
  * the number of CPUs.
  *
  * This function blocks until the frame is rotated.
  */
-static void rotate_filter( uint8_t ** dst,
-                          hb_filter_private_t * pv )
+static void rotate_filter( 
+    hb_filter_private_t * pv, 
+    hb_buffer_t *out, 
+    hb_buffer_t *in )
 {
 
     int segment;
@@ -202,29 +202,14 @@
         /*
          * Setup the work for this plane.
          */
-        pv->rotate_arguments[segment].dst = dst;
-
-        /*
-         * Let the thread for this plane know that we've setup work 
-         * for it by releasing the begin lock (ensuring that the
-         * complete lock is already locked so that we block when
-         * we try to lock it again below).
-         */
-        hb_lock( pv->rotate_complete_lock[segment] );
-        hb_unlock( pv->rotate_begin_lock[segment] );
+        pv->rotate_arguments[segment].dst = out;
+        pv->rotate_arguments[segment].src = in;
     }
 
     /*
-     * Wait until all three threads have completed by trying to get
-     * the complete lock that we locked earlier for each thread, which
-     * will block until that thread has completed the work on that
-     * plane.
+     * Allow the taskset threads to make one pass over the data.
      */
-    for( segment = 0; segment < pv->cpu_count; segment++ )
-    {
-        hb_lock( pv->rotate_complete_lock[segment] );
-        hb_unlock( pv->rotate_complete_lock[segment] );
-    }
+    taskset_cycle( &pv->rotate_taskset );
 
     /*
      * Entire frame is now rotated.
@@ -232,156 +217,157 @@
 }
 
 
-hb_filter_private_t * hb_rotate_init( int pix_fmt,
-                                           int width,
-                                           int height,
-                                           char * settings )
+static int hb_rotate_init( hb_filter_object_t * filter,
+                           hb_filter_init_t * init )
 {
-    if( pix_fmt != PIX_FMT_YUV420P )
-    {
-        return 0;
-    }
-
-    hb_filter_private_t * pv = calloc( 1, sizeof(struct hb_filter_private_s) );
-
-    pv->pix_fmt = pix_fmt;
-
-    pv->width[0]  = width;
-    pv->height[0] = height;
-    pv->width[1]  = pv->width[2]  = width >> 1;
-    pv->height[1] = pv->height[2] = height >> 1;
-
-    pv->buf_out = hb_video_buffer_init( width, height );
-    pv->buf_settings = hb_buffer_init( 0 );
+    filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+    hb_filter_private_t * pv = filter->private_data;
 
     pv->mode     = MODE_DEFAULT;
 
-    pv->ref_stride[0] = pv->width[0];
-    pv->ref_stride[1] = pv->width[1];
-    pv->ref_stride[2] = pv->width[2];
-    
-    if( settings )
+    if( filter->settings )
     {
-        sscanf( settings, "%d",
+        sscanf( filter->settings, "%d",
                 &pv->mode );
     }
 
     pv->cpu_count = hb_get_cpu_count();
 
-
     /*
-     * Create threads and locks.
+     * Create rotate taskset.
      */
-    pv->rotate_threads = malloc( sizeof( hb_thread_t* ) * pv->cpu_count );
-    pv->rotate_begin_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
-    pv->rotate_complete_lock = malloc( sizeof( hb_lock_t * ) * pv->cpu_count );
     pv->rotate_arguments = malloc( sizeof( rotate_arguments_t ) * pv->cpu_count );
+    if( pv->rotate_arguments == NULL ||
+        taskset_init( &pv->rotate_taskset, /*thread_count*/pv->cpu_count,
+                      sizeof( rotate_thread_arg_t ) ) == 0 )
+    {
+            hb_error( "rotate could not initialize taskset" );
+    }
 
     int i;
     for( i = 0; i < pv->cpu_count; i++ )
     {
         rotate_thread_arg_t *thread_args;
     
-        thread_args = malloc( sizeof( rotate_thread_arg_t ) );
-    
-        if( thread_args ) {
-            thread_args->pv = pv;
-            thread_args->segment = i;
+        thread_args = taskset_thread_args( &pv->rotate_taskset, i );
     
-            pv->rotate_begin_lock[i] = hb_lock_init();
-            pv->rotate_complete_lock[i] = hb_lock_init();
+        thread_args->pv = pv;
+        thread_args->segment = i;
+        pv->rotate_arguments[i].dst = NULL;
     
-            /*
-             * Important to start off with the threads locked waiting
-             * on input.
-             */
-            hb_lock( pv->rotate_begin_lock[i] );
-    
-            pv->rotate_arguments[i].stop = 0;
-            pv->rotate_arguments[i].dst = NULL;
-            
-            pv->rotate_threads[i] = hb_thread_init( "rotate_filter_segment",
-                                                   rotate_filter_thread,
-                                                   thread_args,
-                                                   HB_NORMAL_PRIORITY );
-        } else {
-            hb_error( "rotate could not create threads" );
+        if( taskset_thread_spawn( &pv->rotate_taskset, i,
+                                  "rotate_filter_segment",
+                                  rotate_filter_thread,
+                                  HB_NORMAL_PRIORITY ) == 0 )
+        {
+            hb_error( "rotate could not spawn thread" );
         }
     }
+    // Set init width/height so the next stage in the pipline
+    // knows what it will be getting
+    if( pv->mode & 4 )
+    {
+        // 90 degree rotation, exchange width and height
+        int tmp = init->width;
+        init->width = init->height;
+        init->height = tmp;
+
+        tmp = init->par_width;
+        init->par_width = init->par_height;
+        init->par_height = tmp;
+    }
+    pv->width = init->width;
+    pv->height = init->height;
+    pv->par_width = init->par_width;
+    pv->par_height = init->par_height;
 
-    return pv;
+    return 0;
 }
 
-void hb_rotate_close( hb_filter_private_t * pv )
+static int hb_rotate_info( hb_filter_object_t * filter,
+                           hb_filter_info_t * info )
 {
+    hb_filter_private_t * pv = filter->private_data;
     if( !pv )
+        return 1;
+
+    memset( info, 0, sizeof( hb_filter_info_t ) );
+    info->out.width = pv->width;
+    info->out.height = pv->height;
+    info->out.par_width = pv->par_width;
+    info->out.par_height = pv->par_height;
+    int pos = 0;
+    if( pv->mode & 1 )
+        pos += sprintf( &info->human_readable_desc[pos], "flip vertical" );
+    if( pv->mode & 2 )
     {
-        return;
-    }
-
-    /* Cleanup frame buffers */
-    if( pv->buf_out )
-    {
-        hb_buffer_close( &pv->buf_out );
+        if( pos )
+            pos += sprintf( &info->human_readable_desc[pos], "/" );
+        pos += sprintf( &info->human_readable_desc[pos], "flip horizontal" );
     }
-    if (pv->buf_settings )
+    if( pv->mode & 4 )
     {
-        hb_buffer_close( &pv->buf_settings );
+        if( pos )
+            pos += sprintf( &info->human_readable_desc[pos], "/" );
+        pos += sprintf( &info->human_readable_desc[pos], "rotate 90" );
     }
+    return 0;
+}
 
-    int i;
-    for( i = 0; i < pv->cpu_count; i++)
+static void hb_rotate_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if( !pv )
     {
-        /*
-         * Tell each rotate thread to stop, and then cleanup.
-         */
-        pv->rotate_arguments[i].stop = 1;
-        hb_unlock(  pv->rotate_begin_lock[i] );
-    
-        hb_thread_close( &pv->rotate_threads[i] );
-        hb_lock_close( &pv->rotate_begin_lock[i] );
-        hb_lock_close( &pv->rotate_complete_lock[i] );
+        return;
     }
+
+    taskset_fini( &pv->rotate_taskset );
     
     /*
      * free memory for rotate structs
      */
-    free( pv->rotate_threads );
-    free( pv->rotate_begin_lock );
-    free( pv->rotate_complete_lock );
     free( pv->rotate_arguments );
 
     free( pv );
+    filter->private_data = NULL;
 }
 
-int hb_rotate_work( hb_buffer_t * buf_in,
-                         hb_buffer_t ** buf_out,
-                         int pix_fmt,
-                         int width,
-                         int height,
-                         hb_filter_private_t * pv )
+static int hb_rotate_work( hb_filter_object_t * filter,
+                           hb_buffer_t ** buf_in,
+                           hb_buffer_t ** buf_out )
 {
-    if( !pv ||
-        pix_fmt != pv->pix_fmt ||
-        width   != pv->width[0] ||
-        height  != pv->height[0] )
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in, * out;
+
+    if ( in->size <= 0 )
     {
-        return FILTER_FAILED;
+        *buf_out = in;
+        *buf_in = NULL;
+        return HB_FILTER_DONE;
     }
 
-    avpicture_fill( &pv->pic_in, buf_in->data,
-                    pix_fmt, width, height );
+    int width_out, height_out;
+    if ( pv->mode & 4 )
+    {
+        width_out = in->f.height;
+        height_out = in->f.width;
+    }
+    else
+    {
+        width_out = in->f.width;
+        height_out = in->f.height;
+    }
 
-    avpicture_fill( &pv->pic_out, pv->buf_out->data,
-                        pix_fmt, width, height );
+    out = hb_video_buffer_init( width_out, height_out );
 
-    //do stuff here
-    rotate_filter( pv->pic_out.data, pv );
-    hb_buffer_copy_settings( pv->buf_out, buf_in );
+    // Rotate!
+    rotate_filter( pv, out, in );
+    out->s = in->s;
+    hb_buffer_move_subs( out, in );
     
-    *buf_out = pv->buf_out;
+    *buf_out = out;
     
-    return FILTER_OK;
+    return HB_FILTER_OK;
 }
-
-

HandBrake-0.9.8.tar.bz2/libhb/scan.c -> HandBrake-0.9.9.tar.bz2/libhb/scan.c Changed

@@ -1,13 +1,15 @@
-/* $Id: scan.c,v 1.52 2005/11/25 15:05:25 titer Exp $
+/* scan.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "a52dec/a52.h"
-#include "dca.h"
 
 typedef struct
 {
@@ -16,7 +18,7 @@
 
     char         * path;
     int            title_index;
-    hb_list_t    * list_title;
+    hb_title_set_t * title_set;
 
     hb_bd_t      * bd;
     hb_dvd_t     * dvd;
@@ -34,6 +36,9 @@
 static int  DecodePreviews( hb_scan_t *, hb_title_t * title );
 static void LookForAudio( hb_title_t * title, hb_buffer_t * b );
 static int  AllAudioOK( hb_title_t * title );
+static void UpdateState1(hb_scan_t *scan, int title);
+static void UpdateState2(hb_scan_t *scan, int title);
+static void UpdateState3(hb_scan_t *scan, int preview);
 
 static const char *aspect_to_string( double aspect )
 {
@@ -49,7 +54,7 @@
 
 hb_thread_t * hb_scan_init( hb_handle_t * handle, volatile int * die,
                             const char * path, int title_index, 
-                            hb_list_t * list_title, int preview_count, 
+                            hb_title_set_t * title_set, int preview_count, 
                             int store_previews, uint64_t min_duration )
 {
     hb_scan_t * data = calloc( sizeof( hb_scan_t ), 1 );
@@ -58,8 +63,8 @@
     data->die          = die;
     data->path         = strdup( path );
     data->title_index  = title_index;
-    data->list_title   = list_title;
-    
+    data->title_set    = title_set;
+
     data->preview_count  = preview_count;
     data->store_previews = store_previews;
     data->min_title_duration = min_duration;
@@ -86,7 +91,8 @@
         if( data->title_index )
         {
             /* Scan this title only */
-            hb_list_add( data->list_title, hb_bd_title_scan( data->bd,
+            hb_list_add( data->title_set->list_title,
+                         hb_bd_title_scan( data->bd,
                          data->title_index, 0 ) );
         }
         else
@@ -94,10 +100,13 @@
             /* Scan all titles */
             for( i = 0; i < hb_bd_title_count( data->bd ); i++ )
             {
-                hb_list_add( data->list_title, hb_bd_title_scan( data->bd, 
+                UpdateState1(data, i + 1);
+                hb_list_add( data->title_set->list_title,
+                             hb_bd_title_scan( data->bd, 
                              i + 1, data->min_title_duration ) );
             }
-            feature = hb_bd_main_feature( data->bd, data->list_title );
+            feature = hb_bd_main_feature( data->bd,
+                                          data->title_set->list_title );
         }
     }
     else if( ( data->dvd = hb_dvd_init( data->path ) ) )
@@ -107,7 +116,8 @@
         if( data->title_index )
         {
             /* Scan this title only */
-            hb_list_add( data->list_title, hb_dvd_title_scan( data->dvd,
+            hb_list_add( data->title_set->list_title,
+                         hb_dvd_title_scan( data->dvd,
                             data->title_index, 0 ) );
         }
         else
@@ -115,10 +125,13 @@
             /* Scan all titles */
             for( i = 0; i < hb_dvd_title_count( data->dvd ); i++ )
             {
-                hb_list_add( data->list_title, hb_dvd_title_scan( data->dvd, 
+                UpdateState1(data, i + 1);
+                hb_list_add( data->title_set->list_title,
+                             hb_dvd_title_scan( data->dvd, 
                             i + 1, data->min_title_duration ) );
             }
-            feature = hb_dvd_main_feature( data->dvd, data->list_title );
+            feature = hb_dvd_main_feature( data->dvd,
+                                           data->title_set->list_title );
         }
     }
     else if ( ( data->batch = hb_batch_init( data->path ) ) )
@@ -129,7 +142,7 @@
             title = hb_batch_title_scan( data->batch, data->title_index );
             if ( title )
             {
-                hb_list_add( data->list_title, title );
+                hb_list_add( data->title_set->list_title, title );
             }
         }
         else
@@ -139,22 +152,24 @@
             {
                 hb_title_t * title;
 
+                UpdateState1(data, i + 1);
                 title = hb_batch_title_scan( data->batch, i + 1 );
                 if ( title != NULL )
                 {
-                    hb_list_add( data->list_title, title );
+                    hb_list_add( data->title_set->list_title, title );
                 }
             }
         }
     }
     else
     {
-        hb_title_t * title = hb_title_init( data->path, 0 );
+        data->title_index = 1;
+        hb_title_t * title = hb_title_init( data->path, data->title_index );
         if ( (data->stream = hb_stream_open( data->path, title, 1 ) ) != NULL )
         {
             title = hb_stream_title_scan( data->stream, title );
             if ( title )
-                hb_list_add( data->list_title, title );
+                hb_list_add( data->title_set->list_title, title );
         }
         else
         {
@@ -164,35 +179,25 @@
         }
     }
 
-    for( i = 0; i < hb_list_count( data->list_title ); )
+    for( i = 0; i < hb_list_count( data->title_set->list_title ); )
     {
         int j;
-        hb_state_t state;
         hb_audio_t * audio;
 
         if ( *data->die )
         {
             goto finish;
         }
-        title = hb_list_item( data->list_title, i );
+        title = hb_list_item( data->title_set->list_title, i );
 
-#define p state.param.scanning
-        /* Update the UI */
-        state.state   = HB_STATE_SCANNING;
-        p.title_cur   = title->index;
-        p.title_count = data->dvd ? hb_dvd_title_count( data->dvd ) : 
-                        data->bd ? hb_bd_title_count( data->bd ) :
-                        data->batch ? hb_batch_title_count( data->batch ) :
-                                   hb_list_count(data->list_title);
-        hb_set_state( data->h, &state );
-#undef p
+        UpdateState2(data, i + 1);
 
         /* Decode previews */
         /* this will also detect more AC3 / DTS information */
         if( !DecodePreviews( data, title ) )
         {
             /* TODO: free things */
-            hb_list_rem( data->list_title, title );
+            hb_list_rem( data->title_set->list_title, title );
             for( j = 0; j < hb_list_count( title->list_audio ); j++)
             {
                 audio = hb_list_item( title->list_audio, j );
@@ -235,7 +240,7 @@
             for( j = 0; j < hb_list_count( title->list_subtitle ); j++ )
             {
                 hb_subtitle_t *subtitle = hb_list_item( title->list_subtitle, j );
-                if ( subtitle->source == VOBSUB )
+                if ( subtitle->source == VOBSUB || subtitle->source == PGSSUB )
                 {
                     subtitle->width = title->width;
                     subtitle->height = title->height;
@@ -245,63 +250,16 @@
         i++;
     }
 
-    /* Init jobs templates */
-    for( i = 0; i < hb_list_count( data->list_title ); i++ )
-    {
-        hb_job_t * job;
-
-        title      = hb_list_item( data->list_title, i );
-        job        = calloc( sizeof( hb_job_t ), 1 );
-        title->job = job;
-
-        job->title = title;
-        job->feature = feature;
+    data->title_set->feature = feature;
 
-        /* Set defaults settings */
-        job->chapter_start = 1;
-        job->chapter_end   = hb_list_count( title->list_chapter );
-
-        /* Autocrop by default. Gnark gnark */
-        memcpy( job->crop, title->crop, 4 * sizeof( int ) );
-
-        /* Preserve a source's pixel aspect, if it's available. */
-        if( title->pixel_aspect_width && title->pixel_aspect_height )
-        {
-            job->anamorphic.par_width  = title->pixel_aspect_width;
-            job->anamorphic.par_height = title->pixel_aspect_height;
-        }
-
-        if( title->aspect != 0 && title->aspect != 1. &&
-            !job->anamorphic.par_width && !job->anamorphic.par_height)
-        {
-            hb_reduce( &job->anamorphic.par_width, &job->anamorphic.par_height,
-                       (int)(title->aspect * title->height + 0.5), title->width );
-        }
-
-        job->width = title->width - job->crop[2] - job->crop[3];
-        hb_fix_aspect( job, HB_KEEP_WIDTH );
-        if( job->height > title->height - job->crop[0] - job->crop[1] )
-        {
-            job->height = title->height - job->crop[0] - job->crop[1];
-            hb_fix_aspect( job, HB_KEEP_HEIGHT );
-        }
-
-        hb_log( "scan: title (%d) job->width:%d, job->height:%d",
-                i, job->width, job->height );
-
-        job->keep_ratio = 1;
-
-        job->vcodec     = HB_VCODEC_FFMPEG_MPEG4;
-        job->vquality   = -1.0;
-        job->vbitrate   = 1000;
-        job->pass       = 0;
-        job->vrate      = title->rate;
-        job->vrate_base = title->rate_base;
-
-        job->list_audio = hb_list_init();
-        job->list_subtitle = hb_list_init();
-
-        job->mux = HB_MUX_MP4;
+    /* Mark title scan complete and init jobs */
+    for( i = 0; i < hb_list_count( data->title_set->list_title ); i++ )
+    {
+        title      = hb_list_item( data->title_set->list_title, i );
+        title->flags |= HBTF_SCAN_COMPLETE;
+#if defined(HB_TITLE_JOBS)
+        title->job = hb_job_init( title );
+#endif
     }
 
 finish:
@@ -343,17 +301,19 @@
     return x < 16 ? 16 : x;
 }
 
-static int row_all_dark( hb_work_info_t *info, uint8_t* luma, int row )
+static int row_all_dark( hb_buffer_t* buf, int row )
 {
-    luma += info->width * row;
+    int width = buf->plane[0].width;
+    int stride = buf->plane[0].stride;
+    uint8_t *luma = buf->plane[0].data + stride * row;
 
     // compute the average luma value of the row
     int i, avg = 0;
-    for ( i = 0; i < info->width; ++i )
+    for ( i = 0; i < width; ++i )
     {
         avg += clampBlack( luma[i] );
     }
-    avg /= info->width;
+    avg /= width;
     if ( avg >= DARK )
         return 0;
 
@@ -361,7 +321,7 @@
     // all pixels are within +-16 of the average (this range is fairly coarse
     // but there's a lot of quantization noise for luma values near black
     // so anything less will fail to crop because of the noise).
-    for ( i = 0; i < info->width; ++i )
+    for ( i = 0; i < width; ++i )
     {
         if ( absdiff( avg, clampBlack( luma[i] ) ) > 16 )
             return 0;
@@ -369,12 +329,11 @@
     return 1;
 }
 
-static int column_all_dark( hb_work_info_t *info, uint8_t* luma, int top, int bottom,
-                            int col )
+static int column_all_dark( hb_buffer_t* buf, int top, int bottom, int col )
 {
-    int stride = info->width;
-    int height = info->height - top - bottom;
-    luma += stride * top + col;
+    int stride = buf->plane[0].stride;
+    int height = buf->plane[0].height - top - bottom;
+    uint8_t *luma = buf->plane[0].data + stride * top + col;
 
     // compute the average value of the column
     int i = height, avg = 0, row = 0;
@@ -561,7 +520,7 @@
     if (vcodec == WORK_DECMPEG2)
     {
         vcodec = WORK_DECAVCODECV;
-        title->video_codec_param = CODEC_ID_MPEG2VIDEO;
+        title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
     }
 #endif
     hb_work_object_t *vid_decoder = hb_get_work( vcodec );
@@ -572,8 +531,8 @@
     for( i = 0; i < data->preview_count; i++ )
     {
         int j;
-        FILE * file_preview;
-        char   filename[1024];
+
+        UpdateState3(data, i + 1);
 
         if ( *data->die )
         {
@@ -664,7 +623,7 @@
             while( ( buf_es = hb_list_item( list_es, 0 ) ) )
             {
                 hb_list_rem( list_es, buf_es );
-                if( buf_es->id == title->video_id && vid_buf == NULL )
+                if( buf_es->s.id == title->video_id && vid_buf == NULL )
                 {
                     vid_decoder->work( vid_decoder, &buf_es, &vid_buf );
                 }
@@ -707,13 +666,13 @@
         remember_info( info_list, &vid_info );
 
         if( is_close_to( vid_info.rate_base, 900900, 100 ) &&
-            ( vid_buf->flags & PIC_FLAG_REPEAT_FIRST_FIELD ) )
+            ( vid_buf->s.flags & PIC_FLAG_REPEAT_FIRST_FIELD ) )
         {
             /* Potentially soft telecine material */
             pulldown_count++;
         }
 
-        if( vid_buf->flags & PIC_FLAG_REPEAT_FRAME )
+        if( vid_buf->s.flags & PIC_FLAG_REPEAT_FRAME )
         {
             // AVCHD-Lite specifies that all streams are
             // 50 or 60 fps.  To produce 25 or 30 fps, camera
@@ -744,25 +703,11 @@
         
         if( data->store_previews )
         {
-            hb_get_tempory_filename( data->h, filename, "%d_%d_%d",
-                                     hb_get_instance_id(data->h), title->index, i );
-
-            file_preview = fopen( filename, "wb" );
-            if( file_preview )
-            {
-                fwrite( vid_buf->data, vid_info.width * vid_info.height * 3 / 2,
-                        1, file_preview );
-                fclose( file_preview );
-            }
-            else
-            {
-                hb_log( "scan: fopen failed (%s)", filename );
-            }
+            hb_save_preview( data->h, title->index, i, vid_buf );
         }
 
         /* Detect black borders */
 
-#define Y    vid_buf->data
         int top, bottom, left, right;
         int h4 = vid_info.height / 4, w4 = vid_info.width / 4;
 
@@ -778,7 +723,7 @@
 
         for ( top = border; top < h4; ++top )
         {
-            if ( ! row_all_dark( &vid_info, Y, top ) )
+            if ( ! row_all_dark( vid_buf, top ) )
                 break;
         }
         if ( top <= border )
@@ -787,7 +732,7 @@
             // didn't check are dark or if we shouldn't crop at all.
             for ( top = 0; top < border; ++top )
             {
-                if ( ! row_all_dark( &vid_info, Y, top ) )
+                if ( ! row_all_dark( vid_buf, top ) )
                     break;
             }
             if ( top >= border )
@@ -797,14 +742,14 @@
         }
         for ( bottom = border; bottom < h4; ++bottom )
         {
-            if ( ! row_all_dark( &vid_info, Y, vid_info.height - 1 - bottom ) )
+            if ( ! row_all_dark( vid_buf, vid_info.height - 1 - bottom ) )
                 break;
         }
         if ( bottom <= border )
         {
             for ( bottom = 0; bottom < border; ++bottom )
             {
-                if ( ! row_all_dark( &vid_info, Y, vid_info.height - 1 - bottom ) )
+                if ( ! row_all_dark( vid_buf, vid_info.height - 1 - bottom ) )
                     break;
             }
             if ( bottom >= border )
@@ -814,12 +759,12 @@
         }
         for ( left = 0; left < w4; ++left )
         {
-            if ( ! column_all_dark( &vid_info, Y, top, bottom, left ) )
+            if ( ! column_all_dark( vid_buf, top, bottom, left ) )
                 break;
         }
         for ( right = 0; right < w4; ++right )
         {
-            if ( ! column_all_dark( &vid_info, Y, top, bottom, vid_info.width - 1 - right ) )
+            if ( ! column_all_dark( vid_buf, top, bottom, vid_info.width - 1 - right ) )
                 break;
         }
 
@@ -847,6 +792,8 @@
             hb_buffer_close( &vid_buf );
         }
     }
+    UpdateState3(data, i);
+
     vid_decoder->close( vid_decoder );
     free( vid_decoder );
 
@@ -913,6 +860,9 @@
             title->pixel_aspect_width = vid_info.pixel_aspect_width;
             title->pixel_aspect_height = vid_info.pixel_aspect_height;
         }
+        title->color_prim = vid_info.color_prim;
+        title->color_transfer = vid_info.color_transfer;
+        title->color_matrix = vid_info.color_matrix;
 
         // compute the aspect ratio based on the storage dimensions and the
         // pixel aspect ratio (if supplied) or just storage dimensions if no PAR.
@@ -1013,7 +963,7 @@
     {
         audio = hb_list_item( title->list_audio, i );
         /* check if this elementary stream is one we want */
-        if ( audio->id == b->id )
+        if ( audio->id == b->s.id )
         {
             break;
         }
@@ -1050,6 +1000,7 @@
     }
 
     hb_work_info_t info;
+    w->title = title;
     w->audio = audio;
     w->codec_param = audio->config.in.codec_param;
     b = hb_fifo_see( audio->priv.scan_cache );
@@ -1076,23 +1027,22 @@
     audio->config.in.channel_layout = info.channel_layout;
     audio->config.in.channel_map = info.channel_map;
     audio->config.in.version = info.version;
+    audio->config.in.flags = info.flags;
     audio->config.in.mode = info.mode;
-    audio->config.flags.ac3 = info.flags;
 
     // update the audio description string based on the info we found
-    if ( audio->config.flags.ac3 & AUDIO_F_DOLBY )
+    if (audio->config.in.channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
     {
-        strcat( audio->config.lang.description, " (Dolby Surround)" );
+        strcat(audio->config.lang.description, " (Dolby Surround)");
     }
-    else
+    else if (audio->config.in.channel_layout)
     {
-        int layout = audio->config.in.channel_layout;
-        char *desc = audio->config.lang.description +
-                        strlen( audio->config.lang.description );
-        sprintf( desc, " (%d.%d ch)",
-                 HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT(layout) +
-                     HB_INPUT_CH_LAYOUT_GET_DISCRETE_REAR_COUNT(layout),
-                 HB_INPUT_CH_LAYOUT_GET_DISCRETE_LFE_COUNT(layout) );
+        int lfes     = (!!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY) +
+                        !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY_2));
+        int channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
+        char *desc   = audio->config.lang.description +
+                        strlen(audio->config.lang.description);
+        sprintf(desc, " (%d.%d ch)", channels - lfes, lfes);
     }
 
     hb_log( "scan: audio 0x%x: %s, rate=%dHz, bitrate=%d %s", audio->id,
@@ -1137,3 +1087,60 @@
     }
     return 1;
 }
+
+static void UpdateState1(hb_scan_t *scan, int title)
+{
+    hb_state_t state;
+
+#define p state.param.scanning
+    /* Update the UI */
+    state.state   = HB_STATE_SCANNING;
+    p.title_cur   = title;
+    p.title_count = scan->dvd ? hb_dvd_title_count( scan->dvd ) :
+                    scan->bd ? hb_bd_title_count( scan->bd ) :
+                    scan->batch ? hb_batch_title_count( scan->batch ) :
+                               hb_list_count(scan->title_set->list_title);
+    p.preview_cur = 0;
+    p.preview_count = 1;
+    p.progress = 0.5 * ((float)p.title_cur + ((float)p.preview_cur / p.preview_count)) / p.title_count;
+#undef p
+
+    hb_set_state(scan->h, &state);
+}
+
+static void UpdateState2(hb_scan_t *scan, int title)
+{
+    hb_state_t state;
+
+#define p state.param.scanning
+    /* Update the UI */
+    state.state   = HB_STATE_SCANNING;
+    p.title_cur   = title;
+    p.title_count = hb_list_count( scan->title_set->list_title );
+    p.preview_cur = 1;
+    p.preview_count = scan->preview_count;
+    if (scan->title_index)
+        p.progress = (float)(p.title_cur - 1) / p.title_count;
+    else
+        p.progress = 0.5 + 0.5 * (float)(p.title_cur - 1) / p.title_count;
+#undef p
+
+    hb_set_state(scan->h, &state);
+}
+
+static void UpdateState3(hb_scan_t *scan, int preview)
+{
+    hb_state_t state;
+
+    hb_get_state2(scan->h, &state);
+#define p state.param.scanning
+    p.preview_cur = preview;
+    p.preview_count = scan->preview_count;
+    if (scan->title_index)
+        p.progress = ((float)p.title_cur - 1 + ((float)p.preview_cur / p.preview_count)) / p.title_count;
+    else
+        p.progress = 0.5 + 0.5 * ((float)p.title_cur - 1 + ((float)p.preview_cur / p.preview_count)) / p.title_count;
+#undef p
+
+    hb_set_state(scan->h, &state);
+}

HandBrake-0.9.8.tar.bz2/libhb/stream.c -> HandBrake-0.9.9.tar.bz2/libhb/stream.c Changed

@@ -1,8 +1,11 @@
-/* $Id$
+/* stream.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include <string.h>
 #include <ctype.h>
@@ -29,9 +32,10 @@
  * U - Unknown (to be determined by further processing)
  * A - Audio
  * V - Video
+ * S - Subtitle
  * P - PCR
  */
-typedef enum { N, U, A, V, P } kind_t;
+typedef enum { N, U, A, V, P, S } kind_t;
 typedef struct {
     kind_t kind; /* not handled / unknown / audio / video */
     int codec;          /* HB worker object id of codec */
@@ -43,57 +47,57 @@
  [id] = { kind, codec, codec_param, name }
 
 static const stream2codec_t st2codec[256] = {
-    st(0x00, U, 0,                 0,              NULL),
-    st(0x01, V, WORK_DECMPEG2,     0,              "MPEG1"),
-    st(0x02, V, WORK_DECMPEG2,     0,              "MPEG2"),
-    st(0x03, A, HB_ACODEC_FFMPEG,  CODEC_ID_MP2,   "MPEG1"),
-    st(0x04, A, HB_ACODEC_FFMPEG,  CODEC_ID_MP2,   "MPEG2"),
-    st(0x05, N, 0,                 0,              "ISO 13818-1 private section"),
-    st(0x06, U, 0,                 0,              "ISO 13818-1 PES private data"),
-    st(0x07, N, 0,                 0,              "ISO 13522 MHEG"),
-    st(0x08, N, 0,                 0,              "ISO 13818-1 DSM-CC"),
-    st(0x09, N, 0,                 0,              "ISO 13818-1 auxiliary"),
-    st(0x0a, N, 0,                 0,              "ISO 13818-6 encap"),
-    st(0x0b, N, 0,                 0,              "ISO 13818-6 DSM-CC U-N msgs"),
-    st(0x0c, N, 0,                 0,              "ISO 13818-6 Stream descriptors"),
-    st(0x0d, N, 0,                 0,              "ISO 13818-6 Sections"),
-    st(0x0e, N, 0,                 0,              "ISO 13818-1 auxiliary"),
-    st(0x0f, A, HB_ACODEC_FFAAC,   CODEC_ID_AAC,   "AAC"),
-    st(0x10, V, WORK_DECAVCODECV,  CODEC_ID_MPEG4, "MPEG4"),
-    st(0x11, A, HB_ACODEC_FFMPEG,  CODEC_ID_AAC_LATM, "LATM AAC"),
-    st(0x12, U, 0,                 0,              "MPEG4 generic"),
-
-    st(0x14, N, 0,                 0,              "ISO 13818-6 DSM-CC download"),
-
-    st(0x1b, V, WORK_DECAVCODECV,  CODEC_ID_H264,  "H.264"),
-
-    st(0x80, U, HB_ACODEC_FFMPEG,  CODEC_ID_PCM_BLURAY, "Digicipher II Video"),
-    st(0x81, A, HB_ACODEC_AC3,     0,              "AC3"),
-    st(0x82, A, HB_ACODEC_DCA,     0,              "DTS"),
+    st(0x00, U, 0,                0,                      NULL),
+    st(0x01, V, WORK_DECMPEG2,    0,                      "MPEG1"),
+    st(0x02, V, WORK_DECMPEG2,    0,                      "MPEG2"),
+    st(0x03, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2,        "MPEG1"),
+    st(0x04, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2,        "MPEG2"),
+    st(0x05, N, 0,                0,                      "ISO 13818-1 private section"),
+    st(0x06, U, 0,                0,                      "ISO 13818-1 PES private data"),
+    st(0x07, N, 0,                0,                      "ISO 13522 MHEG"),
+    st(0x08, N, 0,                0,                      "ISO 13818-1 DSM-CC"),
+    st(0x09, N, 0,                0,                      "ISO 13818-1 auxiliary"),
+    st(0x0a, N, 0,                0,                      "ISO 13818-6 encap"),
+    st(0x0b, N, 0,                0,                      "ISO 13818-6 DSM-CC U-N msgs"),
+    st(0x0c, N, 0,                0,                      "ISO 13818-6 Stream descriptors"),
+    st(0x0d, N, 0,                0,                      "ISO 13818-6 Sections"),
+    st(0x0e, N, 0,                0,                      "ISO 13818-1 auxiliary"),
+    st(0x0f, A, HB_ACODEC_FFAAC,  AV_CODEC_ID_AAC,        "AAC"),
+    st(0x10, V, WORK_DECAVCODECV, AV_CODEC_ID_MPEG4,      "MPEG4"),
+    st(0x11, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_AAC_LATM,   "LATM AAC"),
+    st(0x12, U, 0,                0,                      "MPEG4 generic"),
+
+    st(0x14, N, 0,                0,                      "ISO 13818-6 DSM-CC download"),
+
+    st(0x1b, V, WORK_DECAVCODECV, AV_CODEC_ID_H264,       "H.264"),
+
+    st(0x80, U, HB_ACODEC_FFMPEG, AV_CODEC_ID_PCM_BLURAY, "Digicipher II Video"),
+    st(0x81, A, HB_ACODEC_AC3,    0,                      "AC3"),
+    st(0x82, A, HB_ACODEC_DCA,    AV_CODEC_ID_DTS,        "DTS"),
     // 0x83 can be LPCM or BD TrueHD.  Set to 'unknown' till we know more.
-    st(0x83, U, HB_ACODEC_LPCM,    0,              "LPCM"),
+    st(0x83, U, HB_ACODEC_LPCM,   0,                      "LPCM"),
     // BD E-AC3 Primary audio
-    st(0x84, U, 0,                 0,              "SDDS"),
-    st(0x85, U, 0,                 0,              "ATSC Program ID"),
+    st(0x84, U, 0,                0,                      "SDDS"),
+    st(0x85, U, 0,                0,                      "ATSC Program ID"),
     // 0x86 can be BD DTS-HD/DTS. Set to 'unknown' till we know more.
-    st(0x86, U, HB_ACODEC_DCA_HD,  CODEC_ID_DTS,   "DTS-HD MA"),
-    st(0x87, A, HB_ACODEC_FFMPEG,  CODEC_ID_EAC3,  "E-AC3"),
+    st(0x86, U, HB_ACODEC_DCA_HD, AV_CODEC_ID_DTS,        "DTS-HD MA"),
+    st(0x87, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_EAC3,       "E-AC3"),
 
-    st(0x8a, A, HB_ACODEC_DCA,     0,              "DTS"),
+    st(0x8a, A, HB_ACODEC_DCA,    AV_CODEC_ID_DTS,        "DTS"),
 
-    st(0x90, N, 0,                 0,              "PGS Subtitle"),
+    st(0x90, S, WORK_DECPGSSUB,   0,                      "PGS Subtitle"),
     // 0x91 can be AC3 or BD Interactive Graphics Stream.
-    st(0x91, U, 0,                 0,              "AC3/IGS"),
-    st(0x92, N, 0,                 0,              "Subtitle"),
+    st(0x91, U, 0,                0,                      "AC3/IGS"),
+    st(0x92, N, 0,                0,                      "Subtitle"),
 
-    st(0x94, U, 0,                 0,              "SDDS"),
-    st(0xa0, V, 0,                 0,              "MSCODEC"),
+    st(0x94, U, 0,                0,                      "SDDS"),
+    st(0xa0, V, 0,                0,                      "MSCODEC"),
     // BD E-AC3 Secondary audio
-    st(0xa1, U, 0,                 0,              "E-AC3"),
+    st(0xa1, U, 0,                0,                      "E-AC3"),
     // BD DTS-HD Secondary audio
-    st(0xa2, U, 0,                 0,              "DTS-HD LBR"),
+    st(0xa2, U, 0,                0,                      "DTS-HD LBR"),
 
-    st(0xea, V, WORK_DECAVCODECV,  CODEC_ID_VC1,   "VC-1"),
+    st(0xea, V, WORK_DECAVCODECV, AV_CODEC_ID_VC1,        "VC-1"),
 };
 #undef st
 
@@ -252,6 +256,7 @@
 static int hb_ts_stream_init(hb_stream_t *stream);
 static hb_buffer_t * hb_ts_stream_decode(hb_stream_t *stream);
 static void hb_init_audio_list(hb_stream_t *stream, hb_title_t *title);
+static void hb_init_subtitle_list(hb_stream_t *stream, hb_title_t *title);
 static int hb_ts_stream_find_pids(hb_stream_t *stream);
 
 static void hb_ps_stream_init(hb_stream_t *stream);
@@ -946,11 +951,19 @@
         update_ts_streams( d, pid, stream_id_ext, stream_type, A, NULL );
     }
 
-    // When scanning, title->job == NULL.  We don't need to wait for
-    // a PCR when scanning. In fact, it trips us up on the first
-    // preview of every title since we would have to read quite a
-    // lot of data before finding the PCR.
-    if ( title->job )
+    hb_subtitle_t * subtitle;
+    for ( ii = 0; ( subtitle = hb_list_item( title->list_subtitle, ii ) ); ++ii )
+    {
+        pid = subtitle->id & 0xFFFF;
+        stream_type = subtitle->stream_type;
+
+        update_ts_streams( d, pid, 0, stream_type, S, NULL );
+    }
+
+    // We don't need to wait for a PCR when scanning. In fact, it
+    // trips us up on the first preview of every title since we would
+    // have to read quite a lot of data before finding the PCR.
+    if ( title->flags & HBTF_SCAN_COMPLETE )
     {
         /* BD has PCRs, but the BD index always points to a packet
          * after a PCR packet, so we will not see the initial PCR
@@ -1034,6 +1047,7 @@
     // - For program streams read the first 4MB and take every unique
     //   audio stream we find.
     hb_init_audio_list(stream, title);
+    hb_init_subtitle_list(stream, title);
 
     // set the video id, codec & muxer
     int idx = pes_index_of_video( stream );
@@ -1062,6 +1076,7 @@
     // One Chapter
     hb_chapter_t * chapter;
     chapter = calloc( sizeof( hb_chapter_t ), 1 );
+    hb_chapter_set_title( chapter, "Chapter 1" );
     chapter->index = 1;
     chapter->duration = title->duration;
     chapter->hours = title->hours;
@@ -1183,14 +1198,13 @@
 {
     uint8_t *nal;
     int nal_len;
-    int ii, type, size, start;
+    int ii, type, size;
     int recovery_frames = 0;
 
     CreateDecodedNAL( &nal, &nal_len, buf, len );
 
     for ( ii = 0; ii+1 < nal_len; )
     {
-        start = ii;
         type = 0;
         while ( ii+1 < nal_len )
         {
@@ -1230,8 +1244,8 @@
     int vid = pes_index_of_video( stream );
     hb_pes_stream_t *pes = &stream->pes.list[vid];
     if ( pes->stream_type <= 2 ||
-         pes->codec_param == CODEC_ID_MPEG1VIDEO ||
-         pes->codec_param == CODEC_ID_MPEG2VIDEO )
+         pes->codec_param == AV_CODEC_ID_MPEG1VIDEO ||
+         pes->codec_param == AV_CODEC_ID_MPEG2VIDEO )
     {
         // This section of the code handles MPEG-1 and MPEG-2 video streams
         for (ii = 0; ii < len; ii++)
@@ -1265,7 +1279,7 @@
         // didn't find an I-frame
         return 0;
     }
-    if ( pes->stream_type == 0x1b || pes->codec_param == CODEC_ID_H264 )
+    if ( pes->stream_type == 0x1b || pes->codec_param == AV_CODEC_ID_H264 )
     {
         // we have an h.264 stream
         for (ii = 0; ii < len; ii++)
@@ -1299,7 +1313,7 @@
         // didn't find an I-frame
         return 0;
     }
-    if ( pes->stream_type == 0xea || pes->codec_param == CODEC_ID_VC1 )
+    if ( pes->stream_type == 0xea || pes->codec_param == AV_CODEC_ID_VC1 )
     {
         // we have an vc1 stream
         for (ii = 0; ii < len; ii++)
@@ -1992,34 +2006,167 @@
     }
     else
     {
-        codec_name = audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" :
-                 audio->config.in.codec == HB_ACODEC_DCA ? "DTS" :
-                 audio->config.in.codec == HB_ACODEC_DCA_HD ? "DTS-HD" :
-                 audio->config.in.codec == HB_ACODEC_LPCM ? "LPCM" :
-                 (audio->config.in.codec & HB_ACODEC_FF_MASK) ? "FFmpeg" :
-                 "Unknown";
+        switch( audio->config.in.codec )
+        {
+            case HB_ACODEC_AC3:
+                codec_name = "AC3";
+                break;
+            case HB_ACODEC_DCA:
+                codec_name = "DTS";
+                break;
+            case HB_ACODEC_LPCM:
+                codec_name = "LPCM";
+                break;
+            case HB_ACODEC_MP3:
+                codec_name = "MP3";
+                break;
+            case HB_ACODEC_FFAAC:
+                codec_name = "AAC";
+                break;
+            case HB_ACODEC_DCA_HD:
+                codec_name = "DTS-HD";
+                break;
+            default:
+                codec_name = ( audio->config.in.codec & HB_ACODEC_FF_MASK ) ? "Unknown FFmpeg" : "Unknown";
+                break;
+        }
     }
 
+    snprintf( audio->config.lang.simple,
+              sizeof( audio->config.lang.simple ), "%s",
+              strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
+    snprintf( audio->config.lang.iso639_2,
+              sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
     snprintf( audio->config.lang.description,
               sizeof( audio->config.lang.description ), "%s (%s)",
-              strlen(lang->native_name) ? lang->native_name : lang->eng_name,
-              codec_name );
+              audio->config.lang.simple, codec_name );
+
+    if (audio->config.in.channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
+    {
+        strcat(audio->config.lang.description, " (Dolby Surround)");
+    }
+    else if (audio->config.in.channel_layout)
+    {
+        int lfes     = (!!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY) +
+                        !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY_2));
+        int channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
+        char *desc   = audio->config.lang.description +
+                        strlen(audio->config.lang.description);
+        sprintf(desc, " (%d.%d ch)", channels - lfes, lfes);
+    }
+}
+
+// Sort specifies the index in the audio list where you would
+// like sorted items to begin.
+static void pes_add_subtitle_to_title(
+    hb_stream_t *stream,
+    int         idx,
+    hb_title_t  *title,
+    int         sort)
+{
+    hb_pes_stream_t *pes = &stream->pes.list[idx];
+
+    // Sort by id when adding to the list
+    // This assures that they are always displayed in the same order
+    int id = get_id( pes );
+    int i;
+    hb_subtitle_t *tmp = NULL;
+
+    int count = hb_list_count( title->list_subtitle );
+
+    // Don't add the same audio twice.  Search for audio.
+    for ( i = 0; i < count; i++ )
+    {
+        tmp = hb_list_item( title->list_subtitle, i );
+        if ( id == tmp->id )
+            return;
+    }
+
+    hb_subtitle_t *subtitle = calloc( sizeof( hb_subtitle_t ), 1 );
+    iso639_lang_t * lang;
+
+    subtitle->track = idx;
+    subtitle->id = id;
+    lang = lang_for_code( pes->lang_code );
+    snprintf( subtitle->lang, sizeof( subtitle->lang ), "%s",
+              strlen(lang->native_name) ? lang->native_name : lang->eng_name);
+    snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "%s",
+              lang->iso639_2);
+
+    switch ( pes->codec )
+    {
+        case WORK_DECPGSSUB:
+            subtitle->source = PGSSUB;
+            subtitle->format = PICTURESUB;
+            subtitle->config.dest = RENDERSUB;
+            break;
+        case WORK_DECVOBSUB:
+            subtitle->source = VOBSUB;
+            subtitle->format = PICTURESUB;
+            subtitle->config.dest = RENDERSUB;
+            break;
+        default:
+            // Unrecognized, don't add to list
+            hb_log("unregonized subtitle!");
+            free( subtitle );
+            return;
+    }
+    subtitle->reg_desc = stream->reg_desc;
+    subtitle->stream_type = pes->stream_type;
+    subtitle->substream_type = pes->stream_id_ext;
+    subtitle->codec = pes->codec;
+
+    // Create a default palette since vob files do not include the
+    // vobsub palette.
+    if ( subtitle->source == VOBSUB )
+    {
+        subtitle->palette[0] = 0x108080;
+        subtitle->palette[1] = 0x108080;
+        subtitle->palette[2] = 0x108080;
+        subtitle->palette[3] = 0xbff000;
+
+        subtitle->palette[4] = 0xbff000;
+        subtitle->palette[5] = 0x108080;
+        subtitle->palette[6] = 0x108080;
+        subtitle->palette[7] = 0x108080;
+
+        subtitle->palette[8] = 0xbff000;
+        subtitle->palette[9] = 0x108080;
+        subtitle->palette[10] = 0x108080;
+        subtitle->palette[11] = 0x108080;
+
+        subtitle->palette[12] = 0x108080;
+        subtitle->palette[13] = 0xbff000;
+        subtitle->palette[14] = 0x108080;
+        subtitle->palette[15] = 0x108080;
+    }
+
+    hb_log("stream id 0x%x (type 0x%x substream 0x%x) subtitle 0x%x",
+           pes->stream_id, pes->stream_type, pes->stream_id_ext, subtitle->id);
 
-    if ( audio->config.in.channel_layout )
+    // Search for the sort position
+    if ( sort >= 0 )
+    {
+        sort = sort < count ? sort : count;
+        for ( i = sort; i < count; i++ )
+        {
+            tmp = hb_list_item( title->list_subtitle, i );
+            int sid = tmp->id & 0xffff;
+            int ssid = tmp->id >> 16;
+            if ( pes->stream_id < sid )
+                break;
+            else if ( pes->stream_id <= sid &&
+                      pes->stream_id_ext <= ssid )
+            {
+                break;
+            }
+        }
+        hb_list_insert( title->list_subtitle, i, subtitle );
+    }
+    else
     {
-        int layout = audio->config.in.channel_layout;
-        char *desc = audio->config.lang.description +
-                        strlen( audio->config.lang.description );
-        sprintf( desc, " (%d.%d ch)",
-                 HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT(layout) +
-                     HB_INPUT_CH_LAYOUT_GET_DISCRETE_REAR_COUNT(layout),
-                 HB_INPUT_CH_LAYOUT_GET_DISCRETE_LFE_COUNT(layout) );
-    }
-
-    snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s",
-              strlen(lang->native_name) ? lang->native_name : lang->eng_name );
-    snprintf( audio->config.lang.iso639_2, sizeof( audio->config.lang.iso639_2 ),
-              "%s", lang->iso639_2);
+        hb_list_add( title->list_subtitle, subtitle );
+    }
 }
 
 // Sort specifies the index in the audio list where you would
@@ -2090,6 +2237,42 @@
     }
 }
 
+static void hb_init_subtitle_list(hb_stream_t *stream, hb_title_t *title)
+{
+    int ii;
+    int map_idx;
+    int largest = -1;
+
+    // First add all that were found in a map.
+    for ( map_idx = 0; 1; map_idx++ )
+    {
+        for ( ii = 0; ii < stream->pes.count; ii++ )
+        {
+            if ( stream->pes.list[ii].stream_kind == S )
+            {
+                if ( stream->pes.list[ii].map_idx == map_idx )
+                {
+                    pes_add_subtitle_to_title( stream, ii, title, -1 );
+                }
+                if ( stream->pes.list[ii].map_idx > largest )
+                    largest = stream->pes.list[ii].map_idx;
+            }
+        }
+        if ( map_idx > largest )
+            break;
+    }
+
+    int count = hb_list_count( title->list_audio );
+    // Now add the reset.  Sort them by stream id.
+    for ( ii = 0; ii < stream->pes.count; ii++ )
+    {
+        if ( stream->pes.list[ii].stream_kind == S )
+        {
+            pes_add_subtitle_to_title( stream, ii, title, count );
+        }
+    }
+}
+
 static void hb_init_audio_list(hb_stream_t *stream, hb_title_t *title)
 {
     int ii;
@@ -2206,6 +2389,19 @@
                         stream->ts.list[i].is_pcr ? " (PCR)" : "");
             }
         }
+        hb_log("    Subtitle PIDS : ");
+        for (i = 0; i < stream->ts.count; i++)
+        {
+            if ( ts_stream_kind( stream, i ) == S )
+            {
+                hb_log( "      0x%x type %s (0x%x)%s",
+                        stream->ts.list[i].pid,
+                        stream_type_name2(stream,
+                                &stream->pes.list[stream->ts.list[i].pes_list]),
+                        ts_stream_type( stream, i ),
+                        stream->ts.list[i].is_pcr ? " (PCR)" : "");
+            }
+        }
         hb_log("    Other PIDS : ");
         for (i = 0; i < stream->ts.count; i++)
         {
@@ -2281,6 +2477,19 @@
                         stream->pes.list[i].stream_type );
             }
         }
+        hb_log("    Subtitle Streams : ");
+        for (i = 0; i < stream->pes.count; i++)
+        {
+            if ( stream->pes.list[i].stream_kind == S )
+            {
+                hb_log( "      0x%x-0x%x type %s (0x%x)",
+                        stream->pes.list[i].stream_id,
+                        stream->pes.list[i].stream_id_ext,
+                        stream_type_name2(stream,
+                                         &stream->pes.list[i]),
+                        stream->pes.list[i].stream_type );
+            }
+        }
         hb_log("    Other Streams : ");
         for (i = 0; i < stream->pes.count; i++)
         {
@@ -2566,7 +2775,6 @@
     stream->pmt_info.PCR_PID = bits_get(&bb, 13);
     bits_get(&bb, 4);
     int program_info_length = bits_get(&bb, 12);
-
     int i;
     for (i = 0; i < program_info_length - 2; )
     {
@@ -2922,13 +3130,13 @@
                 pes_info->dts = pes_info->pts;
             }
         }
-        // A user encountered a stream that has garbage DTS timestamps. 
-        // DTS should never be > PTS.  Such broken timestamps leads to 
-        // HandBrake computing negative buffer start times. 
-        if (pes_info->dts > pes_info->pts) 
-        { 
-            pes_info->dts = pes_info->pts; 
-        } 
+        // A user encountered a stream that has garbage DTS timestamps.
+        // DTS should never be > PTS.  Such broken timestamps leads to
+        // HandBrake computing negative buffer start times.
+        if (pes_info->dts > pes_info->pts)
+        {
+            pes_info->dts = pes_info->pts;
+        }
 
         if ( has_escr )
             bits_skip(&bb_hdr, 8 * 6);
@@ -3358,15 +3566,15 @@
         switch (stream->pes.list[idx].stream_kind)
         {
             case A:
-                buf->type = AUDIO_BUF;
+                buf->s.type = AUDIO_BUF;
                 break;
 
             case V:
-                buf->type = VIDEO_BUF;
+                buf->s.type = VIDEO_BUF;
                 break;
 
             default:
-                buf->type = OTHER_BUF;
+                buf->s.type = OTHER_BUF;
                 break;
         }
 
@@ -3374,25 +3582,25 @@
         {
             // we're looking for the first video frame because we're
             // doing random access during 'scan'
-            if ( buf->type != VIDEO_BUF ||
+            if ( buf->s.type != VIDEO_BUF ||
                  !isIframe( stream, buf->data, buf->size ) )
             {
                 // not the video stream or didn't find an I frame
                 // but we'll only wait 255 video frames for an I frame.
-                if ( buf->type != VIDEO_BUF || ++stream->need_keyframe < 512 )
+                if ( buf->s.type != VIDEO_BUF || ++stream->need_keyframe < 512 )
                 {
                     continue;
                 }
             }
             stream->need_keyframe = 0;
         }
-        if ( buf->type == VIDEO_BUF )
+        if ( buf->s.type == VIDEO_BUF )
             ++stream->frames;
 
-        buf->id = get_id( &stream->pes.list[idx] );
-        buf->pcr = stream->pes.scr;
-        buf->start = pes_info.pts;
-        buf->renderOffset = pes_info.dts;
+        buf->s.id = get_id( &stream->pes.list[idx] );
+        buf->s.pcr = stream->pes.scr;
+        buf->s.start = pes_info.pts;
+        buf->s.renderOffset = pes_info.dts;
         memmove( buf->data, buf->data + pes_info.header_len,
                  buf->size - pes_info.header_len );
         buf->size -= pes_info.header_len;
@@ -3728,10 +3936,10 @@
                 // Check dvd substream id
                 if ( ssid >= 0x20 && ssid <= 0x37 )
                 {
-                    // Skip dvd subtitles
                     int idx = update_ps_streams( stream, pes_info.stream_id,
                                             pes_info.bd_substream_id, 0, -1 );
-                    stream->pes.list[idx].stream_kind = N;
+                    stream->pes.list[idx].stream_kind = S;
+                    stream->pes.list[idx].codec = WORK_DECVOBSUB;
                     strncpy(stream->pes.list[idx].codec_name, 
                             "DVD Subtitle", 80);
                     continue;
@@ -3748,7 +3956,7 @@
                     int idx = update_ps_streams( stream, pes_info.stream_id,
                                             pes_info.bd_substream_id, 0, U );
                     stream->pes.list[idx].codec = HB_ACODEC_DCA_HD;
-                    stream->pes.list[idx].codec_param = CODEC_ID_DTS;
+                    stream->pes.list[idx].codec_param = AV_CODEC_ID_DTS;
                     continue;
                 }
                 else if ( ssid >= 0xa0 && ssid <= 0xaf )
@@ -3767,7 +3975,7 @@
                     int idx = update_ps_streams( stream, pes_info.stream_id,
                                             pes_info.bd_substream_id, 0, A );
                     stream->pes.list[idx].codec = HB_ACODEC_FFMPEG;
-                    stream->pes.list[idx].codec_param = CODEC_ID_TRUEHD;
+                    stream->pes.list[idx].codec_param = AV_CODEC_ID_TRUEHD;
                     continue;
                 }
                 else if ( ssid >= 0xc0 && ssid <= 0xcf )
@@ -3859,8 +4067,6 @@
     }
     switch (info.profile)
     {
-        /* When we improve handling of channels > 5.1, we should move
-         * DTS_ES down to use libav for decode */
         case FF_PROFILE_DTS:
         case FF_PROFILE_DTS_ES:
         case FF_PROFILE_DTS_96_24:
@@ -3935,28 +4141,32 @@
         if( !codec )
         {
             int i;
-            static const struct {
-                const char *name; enum CodecID id;
-            } fmt_id_type[] = {
-                { "g722"     , CODEC_ID_ADPCM_G722 },
-                { "mlp"      , CODEC_ID_MLP        },
-                { "truehd"   , CODEC_ID_TRUEHD     },
-                { "shn"      , CODEC_ID_SHORTEN    },
-                { "aac"      , CODEC_ID_AAC        },
-                { "ac3"      , CODEC_ID_AC3        },
-                { "dts"      , CODEC_ID_DTS        },
-                { "eac3"     , CODEC_ID_EAC3       },
-                { "h264"     , CODEC_ID_H264       },
-                { "m4v"      , CODEC_ID_MPEG4      },
-                { "mp3"      , CODEC_ID_MP3        },
-                { "mpegvideo", CODEC_ID_MPEG2VIDEO },
-                { "cavsvideo", CODEC_ID_CAVS },
-                { "dnxhd"    , CODEC_ID_DNXHD },
-                { "h261"     , CODEC_ID_H261 },
-                { "h263"     , CODEC_ID_H263 },
-                { "mjpeg"    , CODEC_ID_MJPEG },
-                { "vc1"      , CODEC_ID_VC1 },
-                { 0 }
+            static const struct
+            {
+                const char *name;
+                enum AVCodecID id;
+            }
+            fmt_id_type[] =
+            {
+                { "g722"     , AV_CODEC_ID_ADPCM_G722 },
+                { "mlp"      , AV_CODEC_ID_MLP        },
+                { "truehd"   , AV_CODEC_ID_TRUEHD     },
+                { "shn"      , AV_CODEC_ID_SHORTEN    },
+                { "aac"      , AV_CODEC_ID_AAC        },
+                { "ac3"      , AV_CODEC_ID_AC3        },
+                { "dts"      , AV_CODEC_ID_DTS        },
+                { "eac3"     , AV_CODEC_ID_EAC3       },
+                { "h264"     , AV_CODEC_ID_H264       },
+                { "m4v"      , AV_CODEC_ID_MPEG4      },
+                { "mp3"      , AV_CODEC_ID_MP3        },
+                { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO },
+                { "cavsvideo", AV_CODEC_ID_CAVS       },
+                { "dnxhd"    , AV_CODEC_ID_DNXHD      },
+                { "h261"     , AV_CODEC_ID_H261       },
+                { "h263"     , AV_CODEC_ID_H263       },
+                { "mjpeg"    , AV_CODEC_ID_MJPEG      },
+                { "vc1"      , AV_CODEC_ID_VC1        },
+                { 0 },
             };
             for( i = 0; fmt_id_type[i].name; i++ )
             {
@@ -3975,22 +4185,22 @@
                 pes->stream_kind = V;
                 switch ( codec->id )
                 {
-                    case CODEC_ID_MPEG1VIDEO:
+                    case AV_CODEC_ID_MPEG1VIDEO:
                         pes->codec = WORK_DECMPEG2;
                         pes->stream_type = 0x01;
                         break;
 
-                    case CODEC_ID_MPEG2VIDEO:
+                    case AV_CODEC_ID_MPEG2VIDEO:
                         pes->codec = WORK_DECMPEG2;
                         pes->stream_type = 0x02;
                         break;
 
-                    case CODEC_ID_H264:
+                    case AV_CODEC_ID_H264:
                         pes->codec = WORK_DECAVCODECV;
                         pes->stream_type = 0x1b;
                         break;
 
-                    case CODEC_ID_VC1:
+                    case AV_CODEC_ID_VC1:
                         pes->codec = WORK_DECAVCODECV;
                         pes->stream_type = 0xea;
                         break;
@@ -4004,7 +4214,7 @@
                 pes->stream_kind = A;
                 switch ( codec->id )
                 {
-                    case CODEC_ID_AC3:
+                    case AV_CODEC_ID_AC3:
                         pes->codec = HB_ACODEC_AC3;
                         break;
                     default:
@@ -4046,7 +4256,7 @@
             // To distinguish, Bluray streams have a reg_desc of HDMV
             update_ts_streams( stream, pid, 0, stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_FFMPEG;
-            stream->pes.list[pes_idx].codec_param = CODEC_ID_PCM_BLURAY;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_PCM_BLURAY;
             continue;
         }
 
@@ -4068,7 +4278,7 @@
             update_ts_streams( stream, pid, HB_SUBSTREAM_BD_TRUEHD,
                                stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_FFMPEG;
-            stream->pes.list[pes_idx].codec_param = CODEC_ID_TRUEHD;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_TRUEHD;
             continue;
         }
         if ( ( stype == 0x84 || stype == 0xa1 ) &&
@@ -4079,7 +4289,7 @@
             // To distinguish, Bluray streams have a reg_desc of HDMV
             update_ts_streams( stream, pid, 0, stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_FFMPEG;
-            stream->pes.list[pes_idx].codec_param = CODEC_ID_EAC3;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_EAC3;
             continue;
         }
         // 0xa2 is DTS-HD LBR used in HD-DVD and bluray for
@@ -4098,10 +4308,11 @@
             update_ts_streams( stream, pid, HB_SUBSTREAM_BD_DTS,
                                stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_DCA;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_DTS;
 
             update_ts_streams( stream, pid, 0, stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_DCA_HD;
-            stream->pes.list[pes_idx].codec_param = CODEC_ID_DTS;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_DTS;
             continue;
         }
         if ( stype == 0x86 &&
@@ -4112,16 +4323,18 @@
             update_ts_streams( stream, pid, HB_SUBSTREAM_BD_DTS,
                                stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_DCA;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_DTS;
 
             update_ts_streams( stream, pid, 0, stype, A, &pes_idx );
             stream->pes.list[pes_idx].codec = HB_ACODEC_DCA_HD;
-            stream->pes.list[pes_idx].codec_param = CODEC_ID_DTS;
+            stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_DTS;
             continue;
         }
 
         // stype == 0 indicates a type not in st2codec table
         if ( stype != 0 &&
              ( ts_stream_kind( stream, ii ) == A ||
+               ts_stream_kind( stream, ii ) == S ||
                ts_stream_kind( stream, ii ) == V ) )
         {
             // Assuming there are no substreams.
@@ -4156,13 +4369,19 @@
         total_size += buf->size;
 
         if ( total_size > HB_MAX_PROBE_SIZE * 2 )
+        {
+            hb_buffer_close(&buf);
             break;
+        }
 
         int idx;
-        idx = index_of_id( stream, buf->id );
+        idx = index_of_id( stream, buf->s.id );
 
         if (idx < 0 || stream->pes.list[idx].stream_kind != U )
+        {
+            hb_buffer_close(&buf);
             continue;
+        }
 
         hb_pes_stream_t *pes = &stream->pes.list[idx];
 
@@ -4180,6 +4399,7 @@
                         pes->codec_name, pes->stream_id, pes->stream_id_ext);
             }
         }
+        hb_buffer_close(&buf);
     }
     // Clean up any probe buffers and set all remaining unknown
     // streams to 'kind' N
@@ -4203,6 +4423,7 @@
         // stype == 0 indicates a type not in st2codec table
         if ( stype != 0 &&
              ( stream->pes.list[ii].stream_kind == A ||
+               stream->pes.list[ii].stream_kind == S ||
                stream->pes.list[ii].stream_kind == V ) )
         {
             stream->pes.list[ii].codec = st2codec[stype].codec;
@@ -4235,7 +4456,7 @@
             break;
 
         int idx;
-        idx = index_of_id( stream, buf->id );
+        idx = index_of_id( stream, buf->s.id );
 
         if (idx < 0 || stream->pes.list[idx].stream_kind != U )
             continue;
@@ -4418,53 +4639,53 @@
             buf = tmp;
         }
 
-        buf->id = get_id( &stream->pes.list[pes_idx] );
+        buf->s.id = get_id( &stream->pes.list[pes_idx] );
         switch (stream->pes.list[pes_idx].stream_kind)
         {
             case A:
-                buf->type = AUDIO_BUF;
+                buf->s.type = AUDIO_BUF;
                 break;
 
             case V:
-                buf->type = VIDEO_BUF;
+                buf->s.type = VIDEO_BUF;
                 break;
 
             default:
-                buf->type = OTHER_BUF;
+                buf->s.type = OTHER_BUF;
                 break;
         }
 
-        if( b->cur > stream->ts.pcr_out )
+        if( b->sequence > stream->ts.pcr_out )
         {
             // we have a new pcr
-            stream->ts.pcr_out = b->cur;
-            buf->pcr = b->pcr;
-            if( b->cur >= stream->ts.pcr_discontinuity )
+            stream->ts.pcr_out = b->sequence;
+            buf->s.pcr = b->s.pcr;
+            if( b->sequence >= stream->ts.pcr_discontinuity )
                 stream->ts.pcr_current = stream->ts.pcr_discontinuity;
         }
         else
         {
-            buf->pcr = -1;
+            buf->s.pcr = -1;
         }
 
         // check if this packet was referenced to an older pcr and if that
         // pcr was prior to a discontinuity.
-        if( b->cur < stream->ts.pcr_current )
+        if( b->sequence < stream->ts.pcr_current )
         {
             // we've sent up a new pcr but have a packet referenced to an
             // old pcr and the difference was enough to trigger a discontinuity
             // correction. smash the timestamps or we'll mess up the correction.
-            buf->start = -1;
-            buf->renderOffset = -1;
-            buf->stop = -1;
-            buf->pcr = -1;
+            buf->s.start = -1;
+            buf->s.renderOffset = -1;
+            buf->s.stop = -1;
+            buf->s.pcr = -1;
         }
         else
         {
             // put the PTS & possible DTS into 'start' & 'renderOffset'
             // then strip off the PES header.
-            buf->start = pes_info.pts;
-            buf->renderOffset = pes_info.dts;
+            buf->s.start = pes_info.pts;
+            buf->s.renderOffset = pes_info.dts;
         }
         memcpy( buf->data, tdat, size );
     }
@@ -4548,7 +4769,13 @@
         }
         // if there's an adaptation header & PCR_flag is set
         // get the PCR (Program Clock Reference)
-        if ( adapt_len > 7 && ( pkt[5] & 0x10 ) != 0 )
+        //
+        // JAS: I have a badly mastered BD that does adaptation field
+        // stuffing incorrectly which results in invalid PCRs.  Test
+        // for all 0xff to guard against this.
+        if ( adapt_len > 7 && ( pkt[5] & 0x10 ) != 0 &&
+            !(pkt[5] == 0xff && pkt[6] == 0xff && pkt[7] == 0xff &&
+              pkt[8] == 0xff && pkt[9] == 0xff && pkt[10] == 0xff))
         {
             int64_t pcr;
             pcr =    ( (uint64_t)pkt[6] << (33 - 8) ) |
@@ -4718,16 +4945,16 @@
                 // Output data is ready.
                 // remember the pcr that was in effect when we started
                 // this packet.
-                stream->ts.list[curstream].buf->cur = stream->ts.pcr_in;
-                stream->ts.list[curstream].buf->pcr = stream->ts.pcr;
+                stream->ts.list[curstream].buf->sequence = stream->ts.pcr_in;
+                stream->ts.list[curstream].buf->s.pcr = stream->ts.pcr;
                 hb_ts_stream_append_pkt(stream, curstream, pkt + 4 + adapt_len,
                                         184 - adapt_len);
                 return buf;
             }
         }
         // remember the pcr that was in effect when we started this packet.
-        stream->ts.list[curstream].buf->cur = stream->ts.pcr_in;
-        stream->ts.list[curstream].buf->pcr = stream->ts.pcr;
+        stream->ts.list[curstream].buf->sequence = stream->ts.pcr_in;
+        stream->ts.list[curstream].buf->s.pcr = stream->ts.pcr;
     }
 
     // Add the payload for this packet to the current buffer
@@ -4875,13 +5102,13 @@
     return 1;
 
   fail:
-    if ( info_ic ) av_close_input_file( info_ic );
+    if ( info_ic ) avformat_close_input( &info_ic );
     return 0;
 }
 
 static void ffmpeg_close( hb_stream_t *d )
 {
-    av_close_input_file( d->ffmpeg_ic );
+    avformat_close_input( &d->ffmpeg_ic );
     if ( d->ffmpeg_pkt != NULL )
     {
         free( d->ffmpeg_pkt );
@@ -4889,91 +5116,67 @@
     }
 }
 
-static void add_ffmpeg_audio( hb_title_t *title, hb_stream_t *stream, int id )
+static void add_ffmpeg_audio(hb_title_t *title, hb_stream_t *stream, int id)
 {
-    AVStream *st = stream->ffmpeg_ic->streams[id];
-    AVCodecContext *codec = st->codec;
-    AVDictionaryEntry *tag;
-    int layout;
-
-    // DTS: work around lack of 6.0/6.1 support in libhb
-    if( hb_ff_dts_disable_xch( codec ) )
-    {
-        hb_deep_log( 2, "add_ffmpeg_audio: found DTS-ES, requesting DTS core" );
-    }
-
-    // scan will ignore any audio without a bitrate. Since we've already
-    // typed the audio in order to determine its codec we set up the audio
-    // paramters here.
-    layout = hb_ff_layout_xlat( codec->channel_layout, codec->channels );
-    if ( !layout )
-    {
-        // Unsupported layout
-        return;
-    }
-    if ( codec->bit_rate || codec->sample_rate )
-    {
-        hb_audio_t *audio = calloc( 1, sizeof(*audio) );;
+    AVStream *st           = stream->ffmpeg_ic->streams[id];
+    AVCodecContext *codec  = st->codec;
+    AVDictionaryEntry *tag = av_dict_get(st->metadata, "language", NULL, 0);
+
+    hb_audio_t *audio            = calloc(1, sizeof(*audio));
+    audio->id                    = id;
+    audio->config.in.track       = id;
+    audio->config.in.codec       = HB_ACODEC_FFMPEG;
+    audio->config.in.codec_param = codec->codec_id;
+    // set the bitrate to 0; decavcodecaBSInfo will be called and fill the rest
+    audio->config.in.bitrate     = 0;
+
+    // set the input codec and extradata for Passthru
+    switch (codec->codec_id)
+    {
+        case AV_CODEC_ID_AAC:
+        {
+            int len = MIN(codec->extradata_size, HB_CONFIG_MAX_SIZE);
+            memcpy(audio->priv.config.extradata.bytes, codec->extradata, len);
+            audio->priv.config.extradata.length = len;
+            audio->config.in.codec              = HB_ACODEC_FFAAC;
+        } break;
+
+        case AV_CODEC_ID_AC3:
+            audio->config.in.codec       = HB_ACODEC_AC3;
+            audio->config.in.codec_param = 0;
+            break;
 
-        audio->id = id;
-        if ( codec->codec_id == CODEC_ID_AC3 )
-        {
-            audio->config.in.codec = HB_ACODEC_AC3;
-        }
-        /* When we improve handling of channels > 5.1, we should move
-         * DTS_ES down to use libav for decode */
-        else if ( codec->codec_id == CODEC_ID_DTS &&
-                ( codec->profile == FF_PROFILE_DTS ||
-                  codec->profile == FF_PROFILE_DTS_ES ||
-                  codec->profile == FF_PROFILE_DTS_96_24 ) )
-        {
-            audio->config.in.codec = HB_ACODEC_DCA;
-        }
-        else
+        case AV_CODEC_ID_DTS:
         {
-            if ( codec->codec_id == CODEC_ID_DTS &&
-               ( codec->profile == FF_PROFILE_DTS_HD_MA ||
-                 codec->profile == FF_PROFILE_DTS_HD_HRA ) )
-            {
-                audio->config.in.codec = HB_ACODEC_DCA_HD;
-            }
-            else if ( codec->codec_id == CODEC_ID_AAC )
-            {
-                int len = MIN(codec->extradata_size, HB_CONFIG_MAX_SIZE);
-                memcpy(audio->priv.config.extradata.bytes, codec->extradata, len);
-                audio->priv.config.extradata.length = len;
-                audio->config.in.codec = HB_ACODEC_FFAAC;
-            }
-            else if ( codec->codec_id == CODEC_ID_MP3 )
-            {
-                audio->config.in.codec = HB_ACODEC_MP3;
-            }
-            else
+            switch (codec->profile)
             {
-                audio->config.in.codec = HB_ACODEC_FFMPEG;
-            }
-            audio->config.in.codec_param = codec->codec_id;
+                case FF_PROFILE_DTS:
+                case FF_PROFILE_DTS_ES:
+                case FF_PROFILE_DTS_96_24:
+                    audio->config.in.codec = HB_ACODEC_DCA;
+                    break;
 
-            int bps = av_get_bits_per_sample(codec->codec_id);
-            if( bps && codec->sample_rate && codec->channels )
-                audio->config.in.bitrate = bps * codec->sample_rate * codec->channels;
-            else if( codec->bit_rate )
-                audio->config.in.bitrate = codec->bit_rate;
-            else
-                audio->config.in.bitrate = 1;
-            audio->config.in.samplerate = codec->sample_rate;
-            audio->config.in.samples_per_frame = codec->frame_size;
-            audio->config.in.channel_layout = layout;
-            audio->config.in.channel_map = &hb_smpte_chan_map;
-        }
+                case FF_PROFILE_DTS_HD_MA:
+                case FF_PROFILE_DTS_HD_HRA:
+                    audio->config.in.codec = HB_ACODEC_DCA_HD;
+                    break;
 
-        tag = av_dict_get( st->metadata, "language", NULL, 0 );
-        set_audio_description( stream, audio,
-            lang_for_code2( tag ? tag->value : "und" ) );
+                default:
+                    break;
+            }
+        } break;
 
-        audio->config.in.track = id;
-        hb_list_add( title->list_audio, audio );
+        case AV_CODEC_ID_MP3:
+            audio->config.in.codec = HB_ACODEC_MP3;
+            break;
+
+        default:
+            break;
     }
+
+    set_audio_description(stream, audio,
+                          lang_for_code2(tag != NULL ? tag->value : "und"));
+    hb_list_add(title->list_audio, audio);
 }
 
 /*
@@ -5049,6 +5252,7 @@
         int i;
         for (i=0; i<16; i++)
             subtitle->palette[i] = hb_rgb2yuv(rgb[i]);
+        subtitle->palette_set = 1;
         return 0;
     }
     else
@@ -5072,6 +5276,7 @@
             codec->extradata[j+1] << 16 |   // Y
             codec->extradata[j+2] << 8  |   // Cb
             codec->extradata[j+3] << 0;     // Cr
+        subtitle->palette_set = 1;
     }
     if (codec->width <= 0 || codec->height <= 0)
     {
@@ -5109,28 +5314,38 @@
 
     switch ( codec->codec_id )
     {
-        case CODEC_ID_DVD_SUBTITLE:
+        case AV_CODEC_ID_DVD_SUBTITLE:
             subtitle->format = PICTURESUB;
             subtitle->source = VOBSUB;
             subtitle->config.dest = RENDERSUB;  // By default render (burn-in) the VOBSUB.
+            subtitle->codec = WORK_DECVOBSUB;
             if ( ffmpeg_parse_vobsub_extradata( codec, subtitle ) )
                 hb_log( "add_ffmpeg_subtitle: malformed extradata for VOB subtitle track; "
                         "subtitle colors likely to be wrong" );
             break;
-        case CODEC_ID_TEXT:
+        case AV_CODEC_ID_TEXT:
             subtitle->format = TEXTSUB;
             subtitle->source = UTF8SUB;
             subtitle->config.dest = PASSTHRUSUB;
+            subtitle->codec = WORK_DECUTF8SUB;
             break;
-        case CODEC_ID_MOV_TEXT: // TX3G
+        case AV_CODEC_ID_MOV_TEXT: // TX3G
             subtitle->format = TEXTSUB;
             subtitle->source = TX3GSUB;
             subtitle->config.dest = PASSTHRUSUB;
+            subtitle->codec = WORK_DECTX3GSUB;
             break;
-        case CODEC_ID_SSA:
+        case AV_CODEC_ID_SSA:
             subtitle->format = TEXTSUB;
             subtitle->source = SSASUB;
             subtitle->config.dest = PASSTHRUSUB;
+            subtitle->codec = WORK_DECSSASUB;
+            break;
+        case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
+            subtitle->format = PICTURESUB;
+            subtitle->source = PGSSUB;
+            subtitle->config.dest = RENDERSUB;
+            subtitle->codec = WORK_DECPGSSUB;
             break;
         default:
             hb_log( "add_ffmpeg_subtitle: unknown subtitle stream type: 0x%x", (int) codec->codec_id );
@@ -5158,6 +5373,7 @@
 static char *get_ffmpeg_metadata_value( AVDictionary *m, char *key )
 {
     AVDictionaryEntry *tag = NULL;
+
     while ( (tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX)) )
     {
         if ( !strcmp( key, tag->key ) )
@@ -5177,7 +5393,7 @@
     const char *name = get_ffmpeg_metadata_value( st->metadata, "filename" );
     switch ( codec->codec_id )
     {
-        case CODEC_ID_TTF:
+        case AV_CODEC_ID_TTF:
             // Libav sets codec ID based on mime type of the attachment
             type = FONT_TTF_ATTACH;
             break;
@@ -5212,6 +5428,64 @@
     hb_list_add(title->list_attachment, attachment);
 }
 
+static int ffmpeg_decmetadata( AVDictionary *m, hb_title_t *title )
+{
+    int result = 0;
+    AVDictionaryEntry *tag = NULL;
+    while ( (tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX)) )
+    {
+        if ( !strcasecmp( "TITLE", tag->key ) )
+        {
+            hb_metadata_set_name(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "ARTIST", tag->key ) )
+        {
+            hb_metadata_set_artist(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "DIRECTOR", tag->key ) ||
+                  !strcasecmp( "album_artist", tag->key ) )
+        {
+            hb_metadata_set_album_artist(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "COMPOSER", tag->key ) )
+        {
+            hb_metadata_set_composer(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "DATE_RELEASED", tag->key ) ||
+                  !strcasecmp( "date", tag->key ) )
+        {
+            hb_metadata_set_release_date(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "SUMMARY", tag->key ) ||
+                  !strcasecmp( "comment", tag->key ) )
+        {
+            hb_metadata_set_comment(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "GENRE", tag->key ) )
+        {
+            hb_metadata_set_genre(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "DESCRIPTION", tag->key ) )
+        {
+            hb_metadata_set_description(title->metadata, tag->value);
+            result = 1;
+        }
+        else if ( !strcasecmp( "SYNOPSIS", tag->key ) )
+        {
+            hb_metadata_set_long_description(title->metadata, tag->value);
+            result = 1;
+        }
+    }
+    return result;
+}
+
 static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream, hb_title_t *title )
 {
     AVFormatContext *ic = stream->ffmpeg_ic;
@@ -5246,7 +5520,7 @@
              title->video_codec == 0 )
         {
             AVCodecContext *context = ic->streams[i]->codec;
-            if ( context->pix_fmt != PIX_FMT_YUV420P &&
+            if ( context->pix_fmt != AV_PIX_FMT_YUV420P &&
                  !sws_isSupportedInput( context->pix_fmt ) )
             {
                 hb_log( "ffmpeg_title_scan: Unsupported color space" );
@@ -5261,7 +5535,7 @@
                 title->pixel_aspect_height = ic->streams[i]->sample_aspect_ratio.den;
             }
 
-            if ( context->codec_id == CODEC_ID_H264 )
+            if ( context->codec_id == AV_CODEC_ID_H264 )
                 title->flags |= HBTF_NO_IDR;
 
             title->video_codec = WORK_DECAVCODECV;
@@ -5300,15 +5574,33 @@
                 chapter->index    = i+1;
                 chapter->duration = ( m->end / ( (double) m->time_base.num * m->time_base.den ) ) * 90000  - duration_sum;
                 duration_sum     += chapter->duration;
-                chapter->hours    = chapter->duration / 90000 / 3600;
-                chapter->minutes  = ( ( chapter->duration / 90000 ) % 3600 ) / 60;
-                chapter->seconds  = ( chapter->duration / 90000 ) % 60;
+
+                int seconds      = ( chapter->duration + 45000 ) / 90000;
+                chapter->hours   = ( seconds / 3600 );
+                chapter->minutes = ( seconds % 3600 ) / 60;
+                chapter->seconds = ( seconds % 60 );
+
                 tag = av_dict_get( m->metadata, "title", NULL, 0 );
-                strcpy( chapter->title, tag ? tag->value : "" );
+                /* Ignore generic chapter names set by MakeMKV
+                 * ("Chapter 00" etc.).
+                 * Our default chapter names are better. */
+                if( tag && tag->value &&
+                    ( strncmp( "Chapter ", tag->value, 8 ) ||
+                      strlen( tag->value ) > 11 ) )
+                {
+                    hb_chapter_set_title( chapter, tag->value );
+                }
+                else
+                {
+                    char chapter_title[80];
+                    sprintf( chapter_title, "Chapter %d", chapter->index );
+                    hb_chapter_set_title( chapter, chapter_title );
+                }
+
                 hb_deep_log( 2, "Added chapter %i, name='%s', dur=%"PRIu64", (%02i:%02i:%02i)",
-                            chapter->index, chapter->title,
-                            chapter->duration, chapter->hours,
-                            chapter->minutes, chapter->seconds );
+                             chapter->index, chapter->title, chapter->duration,
+                             chapter->hours, chapter->minutes, chapter->seconds );
+
                 hb_list_add( title->list_chapter, chapter );
             }
     }
@@ -5316,7 +5608,11 @@
     /*
      * Fill the metadata.
      */
-    decmetadata( title );
+    // JJJ: is this necessary? can we just get this metadata from libav api's?
+    if (!decmetadata( title ))
+    {
+        ffmpeg_decmetadata( ic->metadata, title );
+    }
 
     if( hb_list_count( title->list_chapter ) == 0 )
     {
@@ -5347,7 +5643,7 @@
 
     switch ( stream->ffmpeg_ic->streams[stream->ffmpeg_video_id]->codec->codec_id )
     {
-        case CODEC_ID_VC1:
+        case AV_CODEC_ID_VC1:
             // XXX the VC1 codec doesn't mark key frames so to get previews
             // we do it ourselves here. The decoder gets messed up if it
             // doesn't get a SEQ header first so we consider that to be a key frame.
@@ -5357,7 +5653,7 @@
 
             return 0;
 
-        case CODEC_ID_WMV3:
+        case AV_CODEC_ID_WMV3:
             // XXX the ffmpeg WMV3 codec doesn't mark key frames.
             // Only M$ could make I-frame detection this complicated: there
             // are two to four bits of unused junk ahead of the frame type
@@ -5450,71 +5746,79 @@
         buf = hb_buffer_init( stream->ffmpeg_pkt->size );
         memcpy( buf->data, stream->ffmpeg_pkt->data, stream->ffmpeg_pkt->size );
     }
-    buf->id = stream->ffmpeg_pkt->stream_index;
+    buf->s.id = stream->ffmpeg_pkt->stream_index;
 
     // compute a conversion factor to go from the ffmpeg
     // timebase for the stream to HB's 90kHz timebase.
     AVStream *s = stream->ffmpeg_ic->streams[stream->ffmpeg_pkt->stream_index];
     double tsconv = 90000. * (double)s->time_base.num / (double)s->time_base.den;
 
-    buf->start = av_to_hb_pts( stream->ffmpeg_pkt->pts, tsconv );
-    buf->renderOffset = av_to_hb_pts( stream->ffmpeg_pkt->dts, tsconv );
-    if ( buf->renderOffset >= 0 && buf->start == -1 )
+    buf->s.start = av_to_hb_pts( stream->ffmpeg_pkt->pts, tsconv );
+    buf->s.renderOffset = av_to_hb_pts( stream->ffmpeg_pkt->dts, tsconv );
+    if ( buf->s.renderOffset >= 0 && buf->s.start == -1 )
     {
-        buf->start = buf->renderOffset;
+        buf->s.start = buf->s.renderOffset;
     }
-    else if ( buf->renderOffset == -1 && buf->start >= 0 )
+    else if ( buf->s.renderOffset == -1 && buf->s.start >= 0 )
     {
-        buf->renderOffset = buf->start;
+        buf->s.renderOffset = buf->s.start;
     }
 
     /*
-     * Fill out buf->stop for subtitle packets
+     * Fill out buf->s.stop for subtitle packets
      *
-     * libavcodec's MKV demuxer stores the duration of UTF-8 subtitles (CODEC_ID_TEXT)
+     * libavcodec's MKV demuxer stores the duration of UTF-8 subtitles (AV_CODEC_ID_TEXT)
      * in the 'convergence_duration' field for some reason.
      *
      * Other subtitles' durations are stored in the 'duration' field.
      *
-     * VOB subtitles (CODEC_ID_DVD_SUBTITLE) do not have their duration stored in
+     * VOB subtitles (AV_CODEC_ID_DVD_SUBTITLE) do not have their duration stored in
      * either field. This is not a problem because the VOB decoder can extract this
      * information from the packet payload itself.
      *
-     * SSA subtitles (CODEC_ID_SSA) do not have their duration stored in
+     * SSA subtitles (AV_CODEC_ID_SSA) do not have their duration stored in
      * either field. This is not a problem because the SSA decoder can extract this
      * information from the packet payload itself.
      */
-    enum CodecID ffmpeg_pkt_codec;
+    enum AVCodecID ffmpeg_pkt_codec;
     enum AVMediaType codec_type;
     ffmpeg_pkt_codec = stream->ffmpeg_ic->streams[stream->ffmpeg_pkt->stream_index]->codec->codec_id;
     codec_type = stream->ffmpeg_ic->streams[stream->ffmpeg_pkt->stream_index]->codec->codec_type;
     switch ( codec_type )
     {
         case AVMEDIA_TYPE_VIDEO:
-            buf->type = VIDEO_BUF;
+            buf->s.type = VIDEO_BUF;
+            /*
+             * libav avcodec_decode_video2() needs AVPacket flagged with AV_PKT_FLAG_KEY
+             * for some codecs. For example, sequence of PNG in a mov container.
+             */
+            if ( stream->ffmpeg_pkt->flags & AV_PKT_FLAG_KEY )
+            {
+                buf->s.frametype |= HB_FRAME_KEY;
+            }
             break;
 
         case AVMEDIA_TYPE_AUDIO:
-            buf->type = AUDIO_BUF;
+            buf->s.type = AUDIO_BUF;
             break;
 
         case AVMEDIA_TYPE_SUBTITLE:
-            buf->type = SUBTITLE_BUF;
+            buf->s.type = SUBTITLE_BUF;
             break;
 
         default:
-            buf->type = OTHER_BUF;
+            buf->s.type = OTHER_BUF;
             break;
     }
-    if ( ffmpeg_pkt_codec == CODEC_ID_TEXT ) {
+    if ( ffmpeg_pkt_codec == AV_CODEC_ID_TEXT ) {
         int64_t ffmpeg_pkt_duration = stream->ffmpeg_pkt->convergence_duration;
         int64_t buf_duration = av_to_hb_pts( ffmpeg_pkt_duration, tsconv );
-        buf->stop = buf->start + buf_duration;
+        buf->s.stop = buf->s.start + buf_duration;
     }
-    if ( ffmpeg_pkt_codec == CODEC_ID_MOV_TEXT ) {
+    if ( ffmpeg_pkt_codec == AV_CODEC_ID_MOV_TEXT ) {
         int64_t ffmpeg_pkt_duration = stream->ffmpeg_pkt->duration;
         int64_t buf_duration = av_to_hb_pts( ffmpeg_pkt_duration, tsconv );
-        buf->stop = buf->start + buf_duration;
+        buf->s.stop = buf->s.start + buf_duration;
     }
 
     /*
@@ -5526,7 +5830,7 @@
      * below handles both the chapters & no chapters case.
      */
     if ( stream->ffmpeg_pkt->stream_index == stream->ffmpeg_video_id &&
-         buf->start >= stream->chapter_end )
+         buf->s.start >= stream->chapter_end )
     {
         hb_chapter_t *chapter = hb_list_item( stream->title->list_chapter,
                                               stream->chapter+1 );
@@ -5534,15 +5838,16 @@
         {
             stream->chapter++;
             stream->chapter_end += chapter->duration;
-            buf->new_chap = stream->chapter + 1;
+            buf->s.new_chap = stream->chapter + 1;
             hb_deep_log( 2, "ffmpeg_read starting chapter %i at %"PRId64,
-                         buf->new_chap, buf->start);
+                         stream->chapter + 1, buf->s.start);
         } else {
             // Must have run out of chapters, stop looking.
             stream->chapter_end = INT64_MAX;
+            buf->s.new_chap = 0;
         }
     } else {
-        buf->new_chap = 0;
+        buf->s.new_chap = 0;
     }
     av_free_packet( stream->ffmpeg_pkt );
     return buf;
@@ -5551,16 +5856,25 @@
 static int ffmpeg_seek( hb_stream_t *stream, float frac )
 {
     AVFormatContext *ic = stream->ffmpeg_ic;
+    int res;
     if ( frac > 0. )
     {
         int64_t pos = (double)stream->ffmpeg_ic->duration * (double)frac +
                 ffmpeg_initial_timestamp( stream );
-        avformat_seek_file( ic, -1, 0, pos, pos, AVSEEK_FLAG_BACKWARD);
+        res = avformat_seek_file( ic, -1, 0, pos, pos, AVSEEK_FLAG_BACKWARD);
+        if (res < 0)
+        {
+            hb_error("avformat_seek_file failed");
+        }
     }
     else
     {
         int64_t pos = ffmpeg_initial_timestamp( stream );
-        avformat_seek_file( ic, -1, 0, pos, pos, AVSEEK_FLAG_BACKWARD);
+        res = avformat_seek_file( ic, -1, 0, pos, pos, AVSEEK_FLAG_BACKWARD);
+        if (res < 0)
+        {
+            hb_error("avformat_seek_file failed");
+        }
     }
     stream->need_keyframe = 1;
     return 1;

HandBrake-0.9.8.tar.bz2/libhb/sync.c -> HandBrake-0.9.9.tar.bz2/libhb/sync.c Changed

@@ -1,8 +1,11 @@
-/* $Id: sync.c,v 1.38 2005/04/14 21:57:58 titer Exp $
+/* sync.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "hbffmpeg.h"
@@ -69,10 +72,6 @@
     uint64_t   st_counts[4];
     uint64_t   st_dates[4];
     uint64_t   st_first;
-    
-    /* Subtitles */
-    hb_buffer_t * sub_list;   /* list of subtitles to be passed thru or rendered */
-    hb_buffer_t * sub_tail;   /* list of subtitles to be passed thru or rendered */
 } hb_sync_video_t;
 
 struct hb_work_private_s
@@ -134,7 +133,12 @@
     ret = w = hb_get_work( WORK_SYNC_VIDEO );
     w->private_data = pv;
     w->fifo_in = job->fifo_raw;
-    w->fifo_out = job->fifo_sync;
+
+    // When doing subtitle indepth scan, the pipeline ends at sync
+    if ( !job->indepth_scan )
+        w->fifo_out = job->fifo_sync;
+    else
+        w->fifo_out = NULL;
 
     pv->job            = job;
     pv->common->pts_offset   = INT64_MIN;
@@ -163,7 +167,7 @@
             duration = 0;
             for( i = job->chapter_start; i <= job->chapter_end; i++ )
             {
-                chapter   = hb_list_item( title->list_chapter, i - 1 );
+                chapter   = hb_list_item( job->list_chapter, i - 1 );
                 duration += chapter->duration;
             }
         }
@@ -175,7 +179,7 @@
     /* Initialize libsamplerate for every audio track we have */
     if ( ! job->indepth_scan )
     {
-        for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+        for( i = 0; i < hb_list_count( job->list_audio ); i++ )
         {
             InitAudio( job, pv->common, i );
         }
@@ -230,7 +234,9 @@
     if ( --pv->common->ref == 0 )
     {
         hb_unlock( pv->common->mutex );
+        hb_cond_close( &pv->common->next_frame );
         hb_lock_close( &pv->common->mutex );
+        free( pv->common->first_pts );
         free( pv->common );
     }
     else
@@ -247,8 +253,6 @@
  ***********************************************************************
  *
  **********************************************************************/
-static hb_buffer_t * copy_subtitle( hb_buffer_t * src );
-
 int syncVideoWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
               hb_buffer_t ** buf_out )
 {
@@ -267,7 +271,7 @@
     /* Wait till we can determine the initial pts of all streams */
     if( next->size != 0 && pv->common->pts_offset == INT64_MIN )
     {
-        pv->common->first_pts[0] = next->start;
+        pv->common->first_pts[0] = next->s.start;
         hb_lock( pv->common->mutex );
         while( pv->common->pts_offset == INT64_MIN )
         {
@@ -287,7 +291,7 @@
     }
 
     hb_lock( pv->common->mutex );
-    next_start = next->start - pv->common->video_pts_slip;
+    next_start = next->s.start - pv->common->video_pts_slip;
     hb_unlock( pv->common->mutex );
 
     /* Wait for start of point-to-point encoding */
@@ -317,7 +321,7 @@
             return HB_WORK_DONE;
         }
         if ( pv->common->count_frames < job->frame_to_start ||
-             next->start < job->pts_to_start )
+             next->s.start < job->pts_to_start )
         {
             // Flush any subtitles that have pts prior to the
             // current frame
@@ -326,7 +330,7 @@
                 subtitle = hb_list_item( job->list_subtitle, i );
                 while( ( sub = hb_fifo_see( subtitle->fifo_raw ) ) )
                 {
-                    if ( sub->start > next->start )
+                    if ( sub->s.start > next->s.start )
                         break;
                     sub = hb_fifo_get( subtitle->fifo_raw );
                     hb_buffer_close( &sub );
@@ -358,12 +362,13 @@
     if( !sync->cur )
     {
         sync->cur = next;
-        if( sync->cur->size == 0 )
+        if (next->size == 0)
         {
             /* we got an end-of-stream as our first video packet? 
              * Feed it downstream & signal that we're done. 
              */
-            *buf_out = hb_buffer_init( 0 );
+            *buf_out = next;
+            sync->cur = NULL;
 
             pv->common->start_found = 1;
             pv->common->first_pts[0] = INT64_MAX - 1;
@@ -395,22 +400,22 @@
         hb_buffer_close( &next );
 
         pv->common->first_pts[0] = INT64_MAX - 1;
-        cur->start = sync->next_start;
-        cur->stop = cur->start + 90000. / ((double)job->vrate / (double)job->vrate_base);
-        sync->next_start += cur->stop - cur->start;;
+        cur->s.start = sync->next_start;
+        cur->s.stop = cur->s.start + 90000. / ((double)job->vrate / (double)job->vrate_base);
+        sync->next_start += cur->s.stop - cur->s.start;;
 
         /* Make sure last frame is reflected in frame count */
         pv->common->count_frames++;
 
         /* Push the frame to the renderer */
-        hb_fifo_push( job->fifo_sync, cur );
+        *buf_out = cur;
         sync->cur = NULL;
 
         /* we got an end-of-stream. Feed it downstream & signal that
          * we're done. Note that this means we drop the final frame of
          * video (we don't know its duration). On DVDs the final frame
          * is often strange and dropping it seems to be a good idea. */
-        *buf_out = hb_buffer_init( 0 );
+        (*buf_out)->next = hb_buffer_init( 0 );
 
         /*
          * Push through any subtitle EOFs in case they were not synced through.
@@ -458,7 +463,7 @@
     {
         // Drop an empty buffer into our output to ensure that things
         // get flushed all the way out.
-        hb_log( "sync: reached pts %"PRId64", exiting early", cur->start );
+        hb_log( "sync: reached pts %"PRId64", exiting early", cur->s.start );
         hb_buffer_close( &sync->cur );
         hb_buffer_close( &next );
         *buf_out = hb_buffer_init( 0 );
@@ -480,7 +485,7 @@
     if( sync->first_frame )
     {
         /* This is our first frame */
-        if ( cur->start > 0 )
+        if ( cur->s.start > 0 )
         {
             /*
              * The first pts from a dvd should always be zero but
@@ -490,8 +495,8 @@
              * as if it started at zero so that our audio timing will
              * be in sync.
              */
-            hb_log( "sync: first pts is %"PRId64, cur->start );
-            cur->start = 0;
+            hb_log( "sync: first pts is %"PRId64, cur->s.start );
+            cur->s.start = 0;
         }
         sync->first_frame = 0;
     }
@@ -507,17 +512,17 @@
      * can deal with overlaps of up to a frame time but anything larger
      * we handle by dropping frames here.
      */
-    if ( next_start - cur->start <= 0 )
+    if ( next_start - cur->s.start <= 0 )
     {
         if ( sync->first_drop == 0 )
         {
             sync->first_drop = next_start;
         }
         ++sync->drop_count;
-        if ( next->new_chap )
+        if ( next->s.new_chap )
         {
             // don't drop a chapter mark when we drop the buffer
-            sync->chap_mark = next->new_chap;
+            sync->chap_mark = next->s.new_chap;
         }
         hb_buffer_close( &next );
         return HB_WORK_OK;
@@ -526,8 +531,8 @@
     {
         hb_log( "sync: video time didn't advance - dropped %d frames "
                 "(delta %d ms, current %"PRId64", next %"PRId64", dur %d)",
-                sync->drop_count, (int)( cur->start - sync->first_drop ) / 90,
-                cur->start, next_start, (int)( next_start - cur->start ) );
+                sync->drop_count, (int)( cur->s.start - sync->first_drop ) / 90,
+                cur->s.start, next_start, (int)( next_start - cur->s.start ) );
         sync->first_drop = 0;
         sync->drop_count = 0;
     }
@@ -539,215 +544,69 @@
     sync->video_sequence = cur->sequence;
     
     /* Process subtitles that apply to this video frame */
-    
-    // NOTE: There is no logic in either subtitle-sync algorithm that waits for the
-    //       subtitle-decoder if it is lagging behind the video-decoder.
+    // NOTE: There is no logic in either subtitle-sync algorithm that waits
+    // for the subtitle-decoder if it is lagging behind the video-decoder.
     //       
-    //       Therefore there is the implicit assumption that the subtitle-decoder 
-    //       is always faster than the video-decoder. This assumption is definitely 
-    //       incorrect in some cases where the SSA subtitle decoder is used.
-    //       Enable the SUBSYNC_VERBOSE_TIMING flag below to debug.
-    
+    // Therefore there is the implicit assumption that the subtitle-decoder 
+    // is always faster than the video-decoder. This assumption is definitely 
+    // incorrect in some cases where the SSA subtitle decoder is used.
 
-/*
- * Enables logging of three kinds of events:
- *   SUB***: Subtitle received by sync object
- *   SUB+++: Subtitle now shown
- *   SUB---: Subtitle now hidden and disposed
- * 
- * Lead times on SUB*** events should be positive.
- *   Negative lead times lead to lag times on SUB+++ or the complete drop of a subtitle.
- * Lag times on SUB+++ and SUB--- should be small positive values in the 0-40ms range.
- */
-#define SUBSYNC_VERBOSE_TIMING 0
-    
-    /*
-     * 1. Find all subtitles that need to be burned into the current video frame
-     *    and attach them to the frame.
-     * 2. Find all subtitles that need to be passed thru and do so immediately.
-     */
     for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
     {
         int64_t sub_start, sub_stop, duration;
 
         subtitle = hb_list_item( job->list_subtitle, i );
         
-        // If this subtitle track's packets are to be passed thru, do so immediately
-        if( subtitle->config.dest == PASSTHRUSUB )
+        // Sanitize subtitle start and stop times, then pass to 
+        // muxer or renderer filter.
+        while ( ( sub = hb_fifo_see( subtitle->fifo_raw ) ) != NULL )
         {
-            while ( ( sub = hb_fifo_see( subtitle->fifo_raw ) ) != NULL )
-            {
-                if ( sub->stop == -1 && hb_fifo_size( subtitle->fifo_raw ) < 2 )
-                    break;
+            hb_lock( pv->common->mutex );
+            sub_start = sub->s.start - pv->common->video_pts_slip;
+            hb_unlock( pv->common->mutex );
 
-                sub = hb_fifo_get( subtitle->fifo_raw );
-                if ( sub->stop == -1 )
+            if (sub->s.stop == -1)
+            {
+                if (subtitle->config.dest != RENDERSUB &&
+                    hb_fifo_size( subtitle->fifo_raw ) < 2)
                 {
-                    hb_buffer_t *next;
-                    next = hb_fifo_see( subtitle->fifo_raw );
-                    sub->stop = next->start;
+                    // For passthru subs, we want to wait for the
+                    // next subtitle so that we can fill in the stop time.
+                    // This way the muxer can compute the duration of
+                    // the subtitle.
+                    //
+                    // For render subs, we need to ensure that they
+                    // get to the renderer before the associated video
+                    // that they are to be applied to.  It is the 
+                    // responsibility of the renderer to handle
+                    // stop == -1.
+                    break;
                 }
-                // Need to re-write subtitle timestamps to account
-                // for any slippage.
-                hb_lock( pv->common->mutex );
-                sub_start = sub->start - pv->common->video_pts_slip;
-                hb_unlock( pv->common->mutex );
-                duration = sub->stop - sub->start;
-                sub_stop = sub_start + duration;
-
-                sub->start = sub_start;
-                sub->stop = sub_stop;
-
-                hb_fifo_push( subtitle->fifo_out, sub );
             }
-        }
-        // If this subtitle track's packets are to be rendered, identify the
-        // packets that need to be rendered on the current video frame
-        else if( subtitle->config.dest == RENDERSUB )
-        {
-            // Migrate subtitles from 'subtitle->fifo_raw' to 'sub_list' 
-            // immediately. This make it so we can scan the list for
-            // all overlapping subtitles that apply to the current
-            // frame.
-            //
-            // Note that the size of 'sub_list' is unbounded.
-            while ( ( sub = hb_fifo_get( subtitle->fifo_raw ) ) != NULL )
+
+            sub = hb_fifo_get( subtitle->fifo_raw );
+            if ( sub->s.stop == -1 )
             {
-                #if SUBSYNC_VERBOSE_TIMING
-                    printf( "\nSUB*** (%"PRId64"/%"PRId64":%"PRId64") @ %"PRId64"/%"PRId64":%"PRId64" (lead by %"PRId64"ms)\n",
-                        sub->start/90, sub->start/90/1000/60, sub->start/90/1000%60,
-                        cur->start/90, cur->start/90/1000/60, cur->start/90/1000%60,
-                        (sub->start - cur->start)/90);
-                    if (pv->common->video_pts_slip)
-                    {
-                        printf( "  VIDEO-LAG: %"PRId64"\n", pv->common->video_pts_slip );
-                    }
-                #endif
-                
-                // Append to sub_list
-                if ( sync->sub_tail )
-                    sync->sub_tail->next = sub;
-                else
-                    sync->sub_list = sub;
-                sync->sub_tail = sub;
+                hb_buffer_t *next;
+                next = hb_fifo_see( subtitle->fifo_raw );
+                if (next != NULL)
+                    sub->s.stop = next->s.start;
             }
-            
-            hb_buffer_t *prev_sub = NULL;
-            hb_buffer_t *cur_sub_tail = NULL;
-            for ( sub = sync->sub_list; sub != NULL; )
+            // Need to re-write subtitle timestamps to account
+            // for any slippage.
+            sub_stop = -1;
+            if ( sub->s.stop != -1 )
             {
-                if ( sub->next && sub->stop == -1 )
-                {
-                    sub->stop = sub->next->start;
-                }
+                duration = sub->s.stop - sub->s.start;
+                sub_stop = sub_start + duration;
+            }
 
-                // Need to re-write subtitle timestamps to account
-                // for any slippage.
-                hb_lock( pv->common->mutex );
-                sub_start = sub->start - pv->common->video_pts_slip;
-                hb_unlock( pv->common->mutex );
-                if ( sub->stop != -1 )
-                {
-                    duration = sub->stop - sub->start;
-                    sub_stop = sub_start + duration;
-                }
-                else
-                {
-                    sub_stop = -1;
-                }
+            sub->s.start = sub_start;
+            sub->s.stop = sub_stop;
 
-                if ( cur->start < sub_start )
-                {
-                    // Subtitle starts in the future
-                    break;
-                }
-                else
-                {
-                    // Subtitle starts now or in the past...
-                    if ( cur->start < sub_stop || sub_stop == -1 )
-                    {
-                        // Subtitle finishes in the future
-                        
-                        // Append a copy of the subtitle packet to the 
-                        // current video packet to be burned in by 
-                        // the 'render' work-object.
-                        // (Can't just alias it because we will have
-                        // to attach to multiple video frames and have
-                        // no easy way of synchronizing disposal)
-                        hb_buffer_t * sub_copy = copy_subtitle( sub );
-                        sub_copy->start = sub_start;
-                        sub_copy->stop = sub_stop;
-                        if ( cur_sub_tail )
-                            cur_sub_tail->next = sub_copy;
-                        else
-                            cur->sub = sub_copy;
-                        cur_sub_tail = sub_copy;
-                        
-                        #if SUBSYNC_VERBOSE_TIMING
-                            if (!(sub->new_chap & 0x01))
-                            {
-                                printf( "\nSUB+++ (%"PRId64"/%"PRId64":%"PRId64") @ %"PRId64"/%"PRId64":%"PRId64" (lag by %"PRId64"ms)\n",
-                                    sub->start/90, sub->start/90/1000/60, sub->start/90/1000%60,
-                                    cur->start/90, cur->start/90/1000/60, cur->start/90/1000%60,
-                                    (cur->start - sub->start)/90 );
-                                if (pv->common->video_pts_slip)
-                                {
-                                    printf( "  VIDEO-LAG: %"PRId64"\n", pv->common->video_pts_slip );
-                                }
-                                
-                                sub->new_chap |= 0x01;
-                            }
-                        #endif
-                        
-                        // (Keep the subtitle in the stream)
-                        prev_sub = sub;
-                        sub = sub->next;
-                    }
-                    else
-                    {
-                        // Subtitle starts in the past and has already finished
-                        
-                        #if SUBSYNC_VERBOSE_TIMING
-                            printf( "\nSUB--- (%"PRId64"/%"PRId64":%"PRId64") @ %"PRId64"/%"PRId64":%"PRId64" (lag by %"PRId64"ms)\n",
-                                sub->start/90, sub->start/90/1000/60, sub->start/90/1000%60,
-                                cur->start/90, cur->start/90/1000/60, cur->start/90/1000%60,
-                                (cur->start - sub->stop)/90 );
-                            if (pv->common->video_pts_slip)
-                            {
-                                printf( "  VIDEO-LAG: %"PRId64"\n", pv->common->video_pts_slip );
-                            }
-                        #endif
-                        
-                        // Remove it from the stream...
-                        if (prev_sub != NULL)
-                        {
-                            prev_sub->next = sub->next;
-                        }
-                        if (sync->sub_list == sub)
-                        {
-                            sync->sub_list = sub->next;
-                            if ( sync->sub_list == NULL )
-                                sync->sub_tail = NULL;
-                        }
-                        else if (sync->sub_tail == sub)
-                        {
-                            sync->sub_tail = prev_sub;
-                        }
-                        
-                        // ...and trash it
-                        hb_buffer_t *next_sub = sub->next;
-                        // Prevent hb_buffer_close from killing the whole list
-                        // before we finish iterating over it
-                        sub->next = NULL;
-                        hb_buffer_close( &sub );
-                        
-                        // (prev_sub remains the same)
-                        sub = next_sub;
-                    }
-                }
-            }
+            hb_fifo_push( subtitle->fifo_out, sub );
         }
-    } // end subtitles
+    }
 
     /*
      * Adjust the pts of the current frame so that it's contiguous
@@ -763,27 +622,27 @@
      * explicit stop time from the start time of the next frame.
      */
     *buf_out = cur;
-    int64_t duration = next_start - cur->start;
+    int64_t duration = next_start - cur->s.start;
     sync->cur = cur = next;
     cur->sub = NULL;
-    cur->start -= pv->common->video_pts_slip;
-    cur->stop -= pv->common->video_pts_slip;
+    cur->s.start -= pv->common->video_pts_slip;
+    cur->s.stop -= pv->common->video_pts_slip;
     sync->pts_skip = 0;
     if ( duration <= 0 )
     {
         hb_log( "sync: invalid video duration %"PRId64", start %"PRId64", next %"PRId64"",
-                duration, cur->start, next_start );
+                duration, cur->s.start, next_start );
     }
 
-    (*buf_out)->start = sync->next_start;
+    (*buf_out)->s.start = sync->next_start;
     sync->next_start += duration;
-    (*buf_out)->stop = sync->next_start;
+    (*buf_out)->s.stop = sync->next_start;
 
     if ( sync->chap_mark )
     {
         // we have a pending chapter mark from a recent drop - put it on this
         // buffer (this may make it one frame late but we can't do any better).
-        (*buf_out)->new_chap = sync->chap_mark;
+        (*buf_out)->s.new_chap = sync->chap_mark;
         sync->chap_mark = 0;
     }
 
@@ -793,23 +652,6 @@
     return HB_WORK_OK;
 }
 
-static hb_buffer_t * copy_subtitle( hb_buffer_t * src_sub )
-{
-    hb_buffer_t * dst_sub = hb_buffer_init( src_sub->size );
-
-    dst_sub->x      = src_sub->x;
-    dst_sub->y      = src_sub->y;
-    dst_sub->width  = src_sub->width;
-    dst_sub->height = src_sub->height;
-    dst_sub->start = src_sub->start;
-    dst_sub->stop = src_sub->stop;
-    dst_sub->next = NULL;
-    
-    memcpy( dst_sub->data, src_sub->data, src_sub->size );
-    
-    return dst_sub;
-}
-
 // sync*Init does nothing because sync has a special initializer
 // that takes care of initializing video and all audio tracks
 int syncVideoInit( hb_work_object_t * w, hb_job_t * job)
@@ -849,7 +691,9 @@
     if ( --pv->common->ref == 0 )
     {
         hb_unlock( pv->common->mutex );
+        hb_cond_close( &pv->common->next_frame );
         hb_lock_close( &pv->common->mutex );
+        free( pv->common->first_pts );
         free( pv->common );
     }
     else
@@ -895,7 +739,7 @@
     /* Wait till we can determine the initial pts of all streams */
     if( pv->common->pts_offset == INT64_MIN )
     {
-        pv->common->first_pts[sync->index+1] = buf->start;
+        pv->common->first_pts[sync->index+1] = buf->s.start;
         hb_lock( pv->common->mutex );
         while( pv->common->pts_offset == INT64_MIN )
         {
@@ -916,7 +760,7 @@
 
     /* Wait for start frame if doing point-to-point */
     hb_lock( pv->common->mutex );
-    start = buf->start - pv->common->audio_pts_slip;
+    start = buf->s.start - pv->common->audio_pts_slip;
     while ( !pv->common->start_found )
     {
         if ( pv->common->audio_pts_thresh < 0 )
@@ -926,14 +770,14 @@
             // after hb_sync_init is called.
             pv->common->audio_pts_thresh = job->pts_to_start;
         }
-        if ( buf->start < pv->common->audio_pts_thresh )
+        if ( buf->s.start < pv->common->audio_pts_thresh )
         {
             hb_buffer_close( &buf );
             hb_unlock( pv->common->mutex );
             return HB_WORK_OK;
         }
         while ( !pv->common->start_found && 
-                buf->start >= pv->common->audio_pts_thresh )
+                buf->s.start >= pv->common->audio_pts_thresh )
         {
             hb_cond_timedwait( pv->common->next_frame, pv->common->mutex, 10 );
             // There is an unfortunate unavoidable deadlock that can occur.
@@ -960,7 +804,7 @@
                 }
             }
         }
-        start = buf->start - pv->common->audio_pts_slip;
+        start = buf->s.start - pv->common->audio_pts_slip;
     }
     if ( start < 0 )
     {
@@ -1067,13 +911,10 @@
     syncAudioClose
 };
 
-#define LVL_PLUS1DB 1.122462048
-
 static void InitAudio( hb_job_t * job, hb_sync_common_t * common, int i )
 {
     hb_work_object_t  * w;
     hb_work_private_t * pv;
-    hb_title_t        * title = job->title;
     hb_sync_audio_t   * sync;
 
     pv = calloc( 1, sizeof( hb_work_private_t ) );
@@ -1086,7 +927,7 @@
 
     w = hb_get_work( WORK_SYNC_AUDIO );
     w->private_data = pv;
-    w->audio = hb_list_item( title->list_audio, i );
+    w->audio = hb_list_item( job->list_audio, i );
     w->fifo_in = w->audio->priv.fifo_raw;
 
     if ( w->audio->config.out.codec & HB_ACODEC_PASS_FLAG )
@@ -1105,109 +946,89 @@
            gap */
         AVCodec        * codec;
         AVCodecContext * c;
-        short          * zeros;
 
         switch ( w->audio->config.out.codec )
         {
             case HB_ACODEC_AC3_PASS:
             {
-                codec = avcodec_find_encoder( CODEC_ID_AC3 );
+                codec = avcodec_find_encoder( AV_CODEC_ID_AC3 );
             } break;
             case HB_ACODEC_AAC_PASS:
             {
-                codec = avcodec_find_encoder( CODEC_ID_AAC );
-            } break;
-            case HB_ACODEC_MP3_PASS:
-            {
-                codec = avcodec_find_encoder( CODEC_ID_MP3 );
+                codec = avcodec_find_encoder( AV_CODEC_ID_AAC );
             } break;
             default:
             {
                 // Never gets here
+                codec = NULL; // Silence compiler warning
             } break;
         }
 
-        c     = avcodec_alloc_context3( codec );
-
+        c              = avcodec_alloc_context3(codec);
         c->bit_rate    = w->audio->config.in.bitrate;
         c->sample_rate = w->audio->config.in.samplerate;
-        c->channels    = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( w->audio->config.in.channel_layout );
-        hb_ff_set_sample_fmt( c, codec );
+        c->channels    =
+            av_get_channel_layout_nb_channels(w->audio->config.in.channel_layout);
+        hb_ff_set_sample_fmt(c, codec, AV_SAMPLE_FMT_FLT);
 
-        switch( w->audio->config.in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK )
+        if (w->audio->config.in.channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
         {
-            case HB_INPUT_CH_LAYOUT_MONO:
-                c->channel_layout = AV_CH_LAYOUT_MONO;
-                break;
-
-            case HB_INPUT_CH_LAYOUT_STEREO:
-            case HB_INPUT_CH_LAYOUT_DOLBY:
-                c->channel_layout = AV_CH_LAYOUT_STEREO;
-                break;
-
-            case HB_INPUT_CH_LAYOUT_3F2R:
-                c->channel_layout = AV_CH_LAYOUT_5POINT0;
-                break;
-
-            case HB_INPUT_CH_LAYOUT_3F1R:
-                c->channel_layout = AV_CH_LAYOUT_4POINT0;
-                break;
-
-            case HB_INPUT_CH_LAYOUT_3F:
-                c->channel_layout = AV_CH_LAYOUT_SURROUND;
-                break;
-
-            case HB_INPUT_CH_LAYOUT_2F1R:
-                c->channel_layout = AV_CH_LAYOUT_2_1;
-                break;
-
-            case HB_INPUT_CH_LAYOUT_2F2R:
-                c->channel_layout = AV_CH_LAYOUT_QUAD;
-                break;
-
-            default:
-                c->channel_layout = AV_CH_LAYOUT_STEREO;
-                hb_log("sync: unrecognized channel layout" );
-                break;
+            c->channel_layout = AV_CH_LAYOUT_STEREO;
         }
-
-        if ( w->audio->config.in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE )
+        else
         {
-            c->channel_layout |= AV_CH_LOW_FREQUENCY;
+            c->channel_layout = w->audio->config.in.channel_layout;
         }
 
-        if( hb_avcodec_open( c, codec, NULL, 0 ) < 0 )
+        if (hb_avcodec_open(c, codec, NULL, 0) < 0)
         {
-            hb_log( "sync: avcodec_open failed" );
-            return;
+            hb_log("sync: track %d, hb_avcodec_open() failed, dropping video to sync",
+                     w->audio->config.out.track);
+            sync->drop_video_to_sync = 1;
         }
-
-        int input_size = c->frame_size * av_get_bytes_per_sample( c->sample_fmt ) * c->channels;
-        zeros = calloc( 1, input_size );
-        // Allocate enough space for the encoded silence
-        // The output should be < the input
-        sync->silence_buf  = malloc( input_size );
-
-        // There is some delay in getting output from some audio encoders.
-        // So encode a few packets till we get output.
-        int ii;
-        for ( ii = 0; ii < 10; ii++ )
+        else
         {
-            sync->silence_size = avcodec_encode_audio( c, sync->silence_buf, 
-                                    input_size, zeros );
-
-            if (sync->silence_size)
+            // Prepare input frame
+            AVFrame frame = { .nb_samples = c->frame_size, .pts = 0, };
+            int input_size = av_samples_get_buffer_size(NULL, c->channels,
+                                                        frame.nb_samples,
+                                                        c->sample_fmt, 1);
+            uint8_t *zeros = calloc(1, input_size);
+            avcodec_fill_audio_frame(&frame, c->channels, c->sample_fmt, zeros,
+                                     input_size, 1);
+
+            // Allocate enough space for the encoded silence
+            // The output should be < the input
+            sync->silence_buf  = malloc( input_size );
+
+            // There is some delay in getting output from some audio encoders.
+            // So encode a few packets till we get output.
+            int ii;
+            for ( ii = 0; ii < 10; ii++ )
             {
-                break;
+                // Prepare output packet
+                AVPacket pkt;
+                int got_packet;
+                av_init_packet(&pkt);
+                pkt.data = sync->silence_buf;
+                pkt.size = input_size;
+
+                int ret = avcodec_encode_audio2( c, &pkt, &frame, &got_packet);
+                if ( ret < 0 )
+                {
+                    hb_log( "sync: avcodec_encode_audio failed" );
+                    break;
+                }
+
+                if ( got_packet )
+                {
+                    sync->silence_size = pkt.size;
+                    break;
+                }
             }
+            free( zeros );
+            hb_avcodec_close( c );
         }
-        if (!sync->silence_size)
-        {
-            hb_log( "sync: avcodec_encode_audio failed" );
-        }
-
-        free( zeros );
-        hb_avcodec_close( c );
         av_free( c );
     }
     else
@@ -1218,16 +1039,16 @@
         }
         else
         {
-            /* Not passthru, Initialize libsamplerate */
+            /* Not passthru, initialize libsamplerate */
             int error;
-            sync->state = src_new( SRC_SINC_MEDIUM_QUALITY, 
-                HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(
-                    w->audio->config.out.mixdown), &error );
+            sync->state = src_new( SRC_SINC_MEDIUM_QUALITY,
+                                   hb_mixdown_get_discrete_channel_count( w->audio->config.out.mixdown ),
+                                   &error );
             sync->data.end_of_input = 0;
         }
     }
 
-    sync->gain_factor = pow(LVL_PLUS1DB, w->audio->config.out.gain);
+    sync->gain_factor = pow(10, w->audio->config.out.gain / 20);
 
     hb_list_add( job->list_work, w );
 }
@@ -1241,10 +1062,10 @@
     // due to integer rounding, so use buf->s.duration when it is set
     // (which should be always if I didn't miss anything)
     double duration;
-    if ( buf->duration > 0 )
-        duration = buf->duration;
+    if ( buf->s.duration > 0 )
+        duration = buf->s.duration;
     else
-        duration = buf->stop - buf->start;
+        duration = buf->s.stop - buf->s.start;
 
     if ( !( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) )
     {
@@ -1255,10 +1076,10 @@
             /* do sample rate conversion */
             int count_in, count_out;
             hb_buffer_t * buf_raw = buf;
-            int channel_count = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown) *
-                                sizeof( float );
+            int sample_size = hb_mixdown_get_discrete_channel_count( audio->config.out.mixdown ) *
+                              sizeof( float );
 
-            count_in  = buf_raw->size / channel_count;
+            count_in  = buf_raw->size / sample_size;
             /*
              * When using stupid rates like 44.1 there will always be some
              * truncation error. E.g., a 1536 sample AC3 frame will turn into a
@@ -1275,7 +1096,7 @@
             sync->data.src_ratio = (double)audio->config.out.samplerate /
                                    (double)audio->config.in.samplerate;
 
-            buf = hb_buffer_init( count_out * channel_count );
+            buf = hb_buffer_init( count_out * sample_size );
             sync->data.data_in  = (float *) buf_raw->data;
             sync->data.data_out = (float *) buf->data;
             if( src_process( sync->state, &sync->data ) )
@@ -1285,7 +1106,14 @@
             }
             hb_buffer_close( &buf_raw );
 
-            buf->size = sync->data.output_frames_gen * channel_count;
+            if (sync->data.output_frames_gen <= 0)
+            {
+                // XXX: don't send empty buffers downstream (EOF)
+                // possibly out-of-sync audio is better than no audio at all
+                hb_buffer_close(&buf);
+                return NULL;
+            }
+            buf->size = sync->data.output_frames_gen * sample_size;
             duration = (double)( sync->data.output_frames_gen * 90000 ) /
                        audio->config.out.samplerate;
         }
@@ -1322,10 +1150,13 @@
             }
         }
     }
-    buf->frametype = HB_FRAME_AUDIO;
-    buf->start = start;
+
+    buf->s.type = AUDIO_BUF;
+    buf->s.frametype = HB_FRAME_AUDIO;
+
+    buf->s.start = start;
     sync->next_start += duration;
-    buf->stop  = (int64_t)sync->next_start;
+    buf->s.stop  = (int64_t)sync->next_start;
     return buf;
 }
 
@@ -1335,7 +1166,7 @@
     hb_sync_audio_t *sync = &pv->type.audio;
     hb_buffer_t     *buf;
     hb_fifo_t       *fifo;
-    int frame_dur, frame_count;
+    int frame_dur;
 
     // to keep pass-thru and regular audio in sync we generate silence in
     // frame-sized units. If the silence duration isn't an integer multiple
@@ -1351,28 +1182,41 @@
         frame_dur = ( 90000 * w->audio->config.out.samples_per_frame ) /
                                             w->audio->config.in.samplerate;
     }
-    frame_count = ( duration + (frame_dur >> 1) ) / frame_dur;
 
-    while ( --frame_count >= 0 )
+    while (duration >= frame_dur >> 2)
     {
         if( w->audio->config.out.codec & HB_ACODEC_PASS_FLAG )
         {
             buf        = hb_buffer_init( sync->silence_size );
-            buf->start = sync->next_start;
-            buf->stop  = buf->start + frame_dur;
+            buf->s.start = sync->next_start;
+            buf->s.stop  = buf->s.start + frame_dur;
             memcpy( buf->data, sync->silence_buf, buf->size );
             fifo = w->audio->priv.fifo_out;
+            duration -= frame_dur;
         }
         else
         {
-            buf = hb_buffer_init( w->audio->config.out.samples_per_frame * 
-                                   sizeof( float ) *
-                                   HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(
-                                         w->audio->config.out.mixdown) );
-            buf->start = sync->next_start;
-            buf->stop  = buf->start + frame_dur;
+            int channel_count = hb_mixdown_get_discrete_channel_count( w->audio->config.out.mixdown );
+            int size = sizeof( float ) *
+                       w->audio->config.out.samples_per_frame *
+                       channel_count;
+            if (frame_dur > duration)
+            {
+                int samples = duration * w->audio->config.in.samplerate / 90000;
+                if (samples == 0)
+                {
+                    break;
+                }
+                size = sizeof(float) * samples * channel_count;
+                frame_dur = (90000 * samples) / w->audio->config.in.samplerate;
+            }
+            buf = hb_buffer_init(size);
+            buf->s.start = sync->next_start;
+            buf->s.duration = frame_dur;
+            buf->s.stop  = buf->s.start + frame_dur;
             memset( buf->data, 0, buf->size );
             fifo = w->audio->priv.fifo_sync;
+            duration -= frame_dur;
         }
         buf = OutputAudioFrame( w->audio, buf, sync );
         hb_fifo_push( fifo, buf );
@@ -1393,6 +1237,14 @@
     }
     pv->common->count_frames++;
 
+    if (pv->job->indepth_scan)
+    {
+        // Progress for indept scan is handled by reader
+        // pv->common->count_frames is used during indepth_scan
+        // to find start & end points.
+        return;
+    }
+
     if( hb_get_date() > sync->st_dates[3] + 1000 )
     {
         memmove( &sync->st_dates[0], &sync->st_dates[1],
@@ -1453,6 +1305,14 @@
     }
     pv->common->count_frames++;
 
+    if (pv->job->indepth_scan)
+    {
+        // Progress for indept scan is handled by reader
+        // pv->common->count_frames is used during indepth_scan
+        // to find start & end points.
+        return;
+    }
+
 #define p state.param.working
     state.state = HB_STATE_SEARCHING;
     if ( pv->job->frame_to_start )
@@ -1468,7 +1328,7 @@
     }
     if (now > sync->st_first)
     {
-        int eta;
+        int eta = 0;
 
         if ( pv->job->frame_to_start )
         {

HandBrake-0.9.9.tar.bz2/libhb/taskset.c Added

@@ -0,0 +1,234 @@
+/* taskset.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "hb.h"
+#include "ports.h"
+#include "taskset.h"
+
+int
+taskset_init( taskset_t *ts, int thread_count, size_t arg_size )
+{
+    int init_step;
+
+    init_step = 0;
+    memset( ts, 0, sizeof( *ts ) );
+    ts->thread_count = thread_count;
+    ts->arg_size = arg_size;
+    ts->bitmap_elements = ( ts->thread_count + 31 ) / 32;
+    ts->task_threads = malloc( sizeof( hb_thread_t* ) * ts->thread_count );
+    if( ts->task_threads == NULL )
+        goto fail;
+    init_step++;
+
+    if( arg_size != 0 )
+    {
+        ts->task_threads_args = malloc( arg_size * ts->thread_count );
+        if( ts->task_threads == NULL )
+            goto fail;
+    }
+    init_step++;
+
+    ts->task_begin_bitmap = malloc( sizeof( uint32_t  ) * ts->bitmap_elements );
+    if( ts->task_begin_bitmap == NULL )
+        goto fail;
+    init_step++;
+
+    ts->task_complete_bitmap = malloc( sizeof( uint32_t ) * ts->bitmap_elements );
+    if( ts->task_complete_bitmap == NULL )
+        goto fail;
+    init_step++;
+
+    ts->task_stop_bitmap = malloc( sizeof( uint32_t ) * ts->bitmap_elements );
+    if( ts->task_stop_bitmap == NULL )
+        goto fail;
+    init_step++;
+
+    ts->task_cond_lock = hb_lock_init();
+    if( ts->task_cond_lock == NULL)
+        goto fail;
+    init_step++;
+
+    ts->task_begin = hb_cond_init();
+    if( ts->task_begin == NULL)
+        goto fail;
+    init_step++;
+
+    ts->task_complete = hb_cond_init();
+    if( ts->task_complete == NULL)
+        goto fail;
+    init_step++;
+
+    /*
+     * Initialize all arg data to 0.
+     */
+    memset(ts->task_threads_args, 0, ts->arg_size * ts->thread_count );
+
+    /*
+     * Inialize bitmaps to all bits set.  This means that any unused bits
+     * in the bitmap are already in the "condition satisfied" state allowing
+     * us to test the bitmap 32bits at a time without having to mask off
+     * the end.
+     */
+    memset(ts->task_begin_bitmap, 0xFF, sizeof( uint32_t ) * ts->bitmap_elements );
+    memset(ts->task_complete_bitmap, 0xFF, sizeof( uint32_t ) * ts->bitmap_elements );
+    memset(ts->task_stop_bitmap, 0, sizeof( uint32_t ) * ts->bitmap_elements );
+    
+    /*
+     * Important to start off with the threads locked waiting
+     * on input, no work completed, and not asked to stop.
+     */
+    bit_nclear( ts->task_begin_bitmap, 0, ts->thread_count - 1 );
+    bit_nclear( ts->task_complete_bitmap, 0, ts->thread_count - 1 );
+    bit_nclear( ts->task_stop_bitmap, 0, ts->thread_count - 1 );
+    return (1);
+
+fail:
+    switch (init_step)
+    {
+        default:
+            hb_cond_close( &ts->task_complete );
+            /* FALL THROUGH */
+        case 7:
+            hb_cond_close( &ts->task_begin );
+            /* FALL THROUGH */
+        case 6:
+            hb_lock_close( &ts->task_cond_lock );
+            /* FALL THROUGH */
+        case 5:
+            free( ts->task_stop_bitmap );
+            /* FALL THROUGH */
+        case 4:
+            free( ts->task_complete_bitmap );
+            /* FALL THROUGH */
+        case 3:
+            free( ts->task_begin_bitmap );
+            /* FALL THROUGH */
+        case 2:
+            if( ts->task_threads_args == NULL )
+                free( ts->task_threads_args );
+            /* FALL THROUGH */
+        case 1:
+            free( ts->task_threads );
+            /* FALL THROUGH */
+        case 0:
+            break;
+    }
+    return (0);
+}
+
+int
+taskset_thread_spawn( taskset_t *ts, int thr_idx, const char *descr,
+                      thread_func_t *func, int priority )
+{
+    ts->task_threads[thr_idx] = hb_thread_init( descr, func,
+                                                taskset_thread_args( ts, thr_idx ),
+                                                priority);
+    return( ts->task_threads[thr_idx] != NULL );
+}
+
+void
+taskset_cycle( taskset_t *ts )
+{
+    hb_lock( ts->task_cond_lock );
+
+    /*
+     * Signal all threads that their work is available.
+     */
+    bit_nset( ts->task_begin_bitmap, 0, ts->thread_count - 1 );
+    hb_cond_broadcast( ts->task_begin );
+
+    /*
+     * Wait until all threads have completed.  Note that we must
+     * loop here as hb_cond_wait() on some platforms (e.g pthead_cond_wait)
+     * may unblock prematurely.
+     */
+    do
+    {
+        hb_cond_wait( ts->task_complete, ts->task_cond_lock );
+    } while ( !allbits_set( ts->task_complete_bitmap, ts->bitmap_elements ) );
+
+    /*
+     * Clear completion indications for next time.
+     */
+    bit_nclear( ts->task_complete_bitmap, 0, ts->thread_count - 1 );
+
+    hb_unlock( ts->task_cond_lock );
+}
+
+/*
+ * Block current thread until work is available for it.
+ */
+void
+taskset_thread_wait4start( taskset_t *ts, int thr_idx )
+{
+    hb_lock( ts->task_cond_lock );
+    while ( bit_is_clear( ts->task_begin_bitmap, thr_idx ) )
+        hb_cond_wait( ts->task_begin, ts->task_cond_lock );
+
+    /*
+     * We've been released for one run.  Insure we block the next
+     * time through the loop.
+     */
+    bit_clear( ts->task_begin_bitmap, thr_idx );
+    hb_unlock( ts->task_cond_lock );
+}
+
+/*
+ * Current thread has completed its work.  Indicate completion,
+ * and if all threads in this task set have completed, wakeup
+ * anyone waiting for this condition.
+ */
+void
+taskset_thread_complete( taskset_t *ts, int thr_idx )
+{
+    hb_lock( ts->task_cond_lock );
+    bit_set( ts->task_complete_bitmap, thr_idx );
+    if( allbits_set( ts->task_complete_bitmap, ts->bitmap_elements ) )
+    {
+        hb_cond_signal( ts->task_complete );
+    }
+    hb_unlock( ts->task_cond_lock );
+}
+
+void
+taskset_fini( taskset_t *ts )
+{
+    int i;
+
+    hb_lock( ts->task_cond_lock );
+    /*
+     * Tell each thread to stop, and then cleanup.
+     */
+    bit_nset( ts->task_stop_bitmap, 0, ts->thread_count - 1 );
+    bit_nset( ts->task_begin_bitmap, 0, ts->thread_count - 1 );
+    hb_cond_broadcast( ts->task_begin );
+
+    /*
+     * Wait for all threads to exit.
+     */
+    hb_cond_wait( ts->task_complete, ts->task_cond_lock );
+    hb_unlock( ts->task_cond_lock );
+
+    /*
+     * Clean up taskset memory.
+     */
+    for( i = 0; i < ts->thread_count; i++)
+    {
+        hb_thread_close( &ts->task_threads[i] );
+    }
+    hb_lock_close( &ts->task_cond_lock );
+    hb_cond_close( &ts->task_begin );
+    hb_cond_close( &ts->task_complete );
+    free( ts->task_threads );
+    if( ts->task_threads_args != NULL )
+        free( ts->task_threads_args );
+    free( ts->task_begin_bitmap );
+    free( ts->task_complete_bitmap );
+    free( ts->task_stop_bitmap );
+}

HandBrake-0.9.9.tar.bz2/libhb/taskset.h Added

@@ -0,0 +1,55 @@
+/* taskset.h
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef HB_TASKSET_H
+#define HB_TASKSET_H
+
+#define TASKSET_POSIX_COMPLIANT 1
+
+#include "bits.h"
+
+typedef struct hb_taskset_s {
+    int                thread_count;
+    int                arg_size;
+    int                bitmap_elements;
+    hb_thread_t     ** task_threads;
+    uint8_t          * task_threads_args;
+    uint32_t         * task_begin_bitmap;    // Threads can begin
+    uint32_t         * task_complete_bitmap; // Threads have completed
+    uint32_t         * task_stop_bitmap;     // Threads should exit
+    hb_lock_t        * task_cond_lock;       // Held during condition tests
+    hb_cond_t        * task_begin;           // Threads can begin work
+    hb_cond_t        * task_complete;        // Threads have finished work.
+} taskset_t;
+
+int taskset_init( taskset_t *, int /*thread_count*/, size_t /*user_arg_size*/ );
+void taskset_cycle( taskset_t * );
+void taskset_fini( taskset_t * );
+
+int  taskset_thread_spawn( taskset_t *, int /*thr_idx*/, const char * /*descr*/,
+                           thread_func_t *, int /*priority*/ );
+void taskset_thread_wait4start( taskset_t *, int );
+void taskset_thread_complete( taskset_t *, int );
+
+static inline void *taskset_thread_args( taskset_t *, int );
+static inline int   taskset_thread_stop( taskset_t *, int );
+
+static inline void *
+taskset_thread_args( taskset_t *ts, int thr_idx )
+{
+    return( ts->task_threads_args + ( ts->arg_size * thr_idx ) );
+}
+
+static inline int
+taskset_thread_stop( taskset_t *ts, int thr_idx )
+{
+    return bit_is_set( ts->task_stop_bitmap, thr_idx );
+}
+
+#endif /* HB_TASKSET_H */

HandBrake-0.9.8.tar.bz2/libhb/update.c -> HandBrake-0.9.9.tar.bz2/libhb/update.c Changed

HandBrake-0.9.9.tar.bz2/libhb/vfr.c Added

@@ -0,0 +1,640 @@
+/* vfr.c
+
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+ 
+#include "hb.h"
+
+struct hb_filter_private_s
+{
+    hb_job_t    * job;
+    int           cfr;
+    int           input_vrate;
+    int           input_vrate_base;
+    int           vrate;
+    int           vrate_base;
+    hb_fifo_t   * delay_queue;
+    int           dropped_frames;
+    int           extended_frames;
+    uint64_t      last_start[4];
+    uint64_t      last_stop[4];
+    uint64_t      lost_time[4];
+    uint64_t      total_lost_time;
+    uint64_t      total_gained_time;
+    int           count_frames;      // frames output so far
+    double        frame_rate;        // 90KHz ticks per frame (for CFR/PFR)
+    uint64_t      out_last_stop;     // where last frame ended (for CFR/PFR)
+    int           drops;             // frames dropped (for CFR/PFR)
+    int           dups;              // frames duped (for CFR/PFR)
+
+    // Duplicate frame detection members
+    float         max_metric;   // highest motion metric since
+                                // last output frame
+    float         frame_metric; // motion metric of last frame
+    float         out_metric;   // motion metric of last output frame
+    int           sync_parity;
+    unsigned      gamma_lut[256];
+};
+
+static int hb_vfr_init( hb_filter_object_t * filter,
+                        hb_filter_init_t * init );
+
+static int hb_vfr_work( hb_filter_object_t * filter,
+                        hb_buffer_t ** buf_in,
+                        hb_buffer_t ** buf_out );
+
+static void hb_vfr_close( hb_filter_object_t * filter );
+static int hb_vfr_info( hb_filter_object_t * filter, hb_filter_info_t * info );
+
+hb_filter_object_t hb_filter_vfr =
+{
+    .id            = HB_FILTER_VFR,
+    .enforce_order = 1,
+    .name          = "Framerate Shaper",
+    .settings      = NULL,
+    .init          = hb_vfr_init,
+    .work          = hb_vfr_work,
+    .close         = hb_vfr_close,
+    .info          = hb_vfr_info,
+};
+
+// Create gamma lookup table.
+// Note that we are creating a scaled integer lookup table that will
+// not cause overflows in sse_block16() below.  This results in
+// small values being truncated to 0 which is ok for this usage.
+static void build_gamma_lut( hb_filter_private_t * pv )
+{
+    int i;
+    for( i = 0; i < 256; i++ )
+    {
+        pv->gamma_lut[i] = 4095 * pow( ( (float)i / (float)255 ), 2.2f );
+    }
+}
+
+// insert buffer 'succ' after buffer chain element 'pred'.
+// caller must guarantee that 'pred' and 'succ' are non-null.
+static hb_buffer_t *insert_buffer_in_chain( 
+    hb_buffer_t *pred, 
+    hb_buffer_t *succ )
+{
+    succ->next = pred->next;
+    pred->next = succ;
+    return succ;
+}
+
+#define DUP_THRESH_SSE 5.0
+
+// Compute ths sum of squared errors for a 16x16 block
+// Gamma adjusts pixel values so that less visible diffreences
+// count less.
+static inline unsigned sse_block16( hb_filter_private_t *pv, uint8_t *a, uint8_t *b, int stride )
+{
+    int x, y;
+    unsigned sum = 0;
+    int diff;
+    unsigned *g = pv->gamma_lut;
+
+    for( y = 0; y < 16; y++ )
+    {
+        for( x = 0; x < 16; x++ )
+        {
+            diff =  g[a[x]] - g[b[x]];
+            sum += diff * diff;
+        }
+        a += stride;
+        b += stride;
+    }
+    return sum;
+}
+
+// Sum of squared errors.  Computes and sums the SSEs for all
+// 16x16 blocks in the images.  Only checks the Y component.
+static float motion_metric( hb_filter_private_t * pv, hb_buffer_t * a, hb_buffer_t * b )
+{
+    int bw = a->f.width / 16;
+    int bh = a->f.height / 16;
+    int stride = a->plane[0].stride;
+    uint8_t * pa = a->plane[0].data;
+    uint8_t * pb = b->plane[0].data;
+    int x, y;
+    uint64_t sum = 0;
+
+    for( y = 0; y < bh; y++ )
+    {
+        for( x = 0; x < bw; x++ )
+        {
+            sum +=  sse_block16( pv, pa + y * 16 * stride + x * 16,
+                                 pb + y * 16 * stride + x * 16, stride );
+        }
+    }
+    return (float)sum / ( a->f.width * a->f.height );;
+}
+
+// This section of the code implements video frame rate control.
+// Since filters are allowed to duplicate and drop frames (which
+// changes the timing), this has to be the last thing done in render.
+//
+// There are three options, selected by the value of cfr:
+//   0 - Variable Frame Rate (VFR) or 'same as source': frame times
+//       are left alone
+//   1 - Constant Frame Rate (CFR): Frame timings are adjusted so that all
+//       frames are exactly vrate_base ticks apart. Frames are dropped
+//       or duplicated if necessary to maintain this spacing.
+//   2 - Peak Frame Rate (PFR): vrate_base is treated as the peak
+//       average frame rate. I.e., the average frame rate (current frame
+//       end time divided by number of frames so far) is never allowed to be
+//       greater than vrate_base and frames are dropped if necessary
+//       to keep the average under this value. Other than those drops, frame
+//       times are left alone.
+//
+
+static void adjust_frame_rate( hb_filter_private_t *pv, hb_buffer_t **buf_out )
+{
+    hb_buffer_t *out = *buf_out;
+
+    if ( out && out->size > 0 )
+    {
+        if ( pv->cfr == 0 )
+        {
+            ++pv->count_frames;
+            pv->out_last_stop = out->s.stop;
+            return;
+        }
+
+        // compute where this frame would stop if the frame rate were constant
+        // (this is our target stopping time for CFR and earliest possible
+        // stopping time for PFR).
+        double cfr_stop = pv->frame_rate * ( pv->count_frames + 1 );
+
+        hb_buffer_t * next = hb_fifo_see( pv->delay_queue );
+
+        float next_metric = 0;
+        if( next )
+            next_metric = motion_metric( pv, out, next );
+
+        if( pv->out_last_stop >= out->s.stop )
+        {
+            ++pv->drops;
+            hb_buffer_close( buf_out );
+
+            pv->frame_metric = next_metric;
+            if( next_metric > pv->max_metric )
+                pv->max_metric = next_metric;
+
+            return;
+        }
+
+        if( out->s.start <= pv->out_last_stop &&
+            out->s.stop > pv->out_last_stop &&
+            next && next->s.stop < cfr_stop )
+        {
+            // This frame starts before the end of the last output
+            // frame and ends after the end of the last output
+            // frame (i.e. it straddles it).  Also the next frame
+            // ends before the end of the next output frame. If the
+            // next frame is not a duplicate, and we haven't seen
+            // a changed frame since the last output frame,
+            // then drop this frame.
+            //
+            // This causes us to sync to the pattern of progressive
+            // 23.976 fps content that has been upsampled to
+            // progressive 59.94 fps.
+            if( pv->out_metric > pv->max_metric &&
+                next_metric > pv->max_metric )
+            {
+                // Pattern: N R R N
+                //          o   c n
+                // N == new frame
+                // R == repeat frame
+                // o == last output frame
+                // c == current frame
+                // n == next frame
+                // We haven't seen a frame change since the last output
+                // frame and the next frame changes. Use the next frame,
+                // drop this one.
+                ++pv->drops;
+                pv->frame_metric = next_metric;
+                pv->max_metric = next_metric;
+                pv->sync_parity = 1;
+                hb_buffer_close( buf_out );
+                return;
+            }
+            else if( pv->sync_parity &&
+                     pv->out_metric < pv->max_metric &&
+                     pv->max_metric > pv->frame_metric &&
+                     pv->frame_metric < next_metric )
+            {
+                // Pattern: R N R N
+                //          o   c n
+                // N == new frame
+                // R == repeat frame
+                // o == last output frame
+                // c == current frame
+                // n == next frame
+                // If we see this pattern, we must not use the next
+                // frame when straddling the current frame.
+                pv->sync_parity = 0;
+            }
+            else if( pv->sync_parity )
+            {
+                // The pattern is indeterminate.  Continue dropping
+                // frames on the same schedule
+                ++pv->drops;
+                pv->frame_metric = next_metric;
+                pv->max_metric = next_metric;
+                pv->sync_parity = 1;
+                hb_buffer_close( buf_out );
+                return;
+            }
+
+        }
+
+        // this frame has to start where the last one stopped.
+        out->s.start = pv->out_last_stop;
+
+        pv->out_metric = pv->frame_metric;
+        pv->frame_metric = next_metric;
+        pv->max_metric = next_metric;
+
+        // at this point we know that this frame doesn't push the average
+        // rate over the limit so we just pass it on for PFR. For CFR we're
+        // going to return it (with its start & stop times modified) and
+        // we may have to dup it.
+        ++pv->count_frames;
+        if ( pv->cfr > 1 )
+        {
+            // PFR - we're going to keep the frame but may need to
+            // adjust it's stop time to meet the average rate constraint.
+            if ( out->s.stop <= cfr_stop )
+            {
+                out->s.stop = cfr_stop;
+            }
+            pv->out_last_stop = out->s.stop;
+        }
+        else
+        {
+            // we're doing CFR so we have to either trim some time from a
+            // buffer that ends too far in the future or, if the buffer is
+            // two or more frame times long, split it into multiple pieces,
+            // each of which is a frame time long.
+            double excess_dur = (double)out->s.stop - cfr_stop;
+            out->s.stop = cfr_stop;
+            pv->out_last_stop = out->s.stop;
+            for ( ; excess_dur >= pv->frame_rate; excess_dur -= pv->frame_rate )
+            {
+                /* next frame too far ahead - dup current frame */
+                hb_buffer_t *dup = hb_buffer_dup( out );
+                dup->s.new_chap = 0;
+                dup->s.start = cfr_stop;
+                cfr_stop += pv->frame_rate;
+                dup->s.stop = cfr_stop;
+                pv->out_last_stop = dup->s.stop;
+                out = insert_buffer_in_chain( out, dup );
+                ++pv->dups;
+                ++pv->count_frames;
+            }
+        }
+    }
+}
+
+static int hb_vfr_init( hb_filter_object_t * filter,
+                        hb_filter_init_t * init )
+{
+    filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+    hb_filter_private_t * pv = filter->private_data;
+
+    build_gamma_lut( pv );
+    pv->cfr = init->cfr;
+    pv->input_vrate = pv->vrate = init->vrate;
+    pv->input_vrate_base = pv->vrate_base = init->vrate_base;
+    if( filter->settings )
+    {
+        sscanf( filter->settings, "%d:%d:%d",
+                &pv->cfr, &pv->vrate, &pv->vrate_base );
+    }
+
+    pv->job = init->job;
+
+    /* Setup FIFO queue for subtitle cache */
+    pv->delay_queue = hb_fifo_init( 8, 1 );
+
+    /* VFR IVTC needs a bunch of time-keeping variables to track
+      how many frames are dropped, how many are extended, what the
+      last 4 start and stop times were (so they can be modified),
+      how much time has been lost and gained overall, how much time
+      the latest 4 frames should be extended by */
+    pv->dropped_frames = 0;
+    pv->extended_frames = 0;
+    pv->last_start[0] = 0;
+    pv->last_stop[0] = 0;
+    pv->total_lost_time = 0;
+    pv->total_gained_time = 0;
+    pv->lost_time[0] = 0; pv->lost_time[1] = 0; pv->lost_time[2] = 0; pv->lost_time[3] = 0;
+    pv->frame_metric = 1000; // Force first frame
+
+    if ( pv->cfr == 0 )
+    {
+        /* Ensure we're using "Same as source" FPS */
+        pv->vrate_base = init->vrate_base;
+        pv->vrate = init->vrate;
+    }
+    else if ( pv->cfr == 2 )
+    {
+        // For PFR, we want the framerate based on the source's actual 
+        // framerate, unless it's higher than the specified peak framerate. 
+        double source_fps = (double)init->vrate / init->vrate_base;
+        double peak_fps = (double)pv->vrate / pv->vrate_base;
+        if ( source_fps > peak_fps )
+        {
+            // peak framerate is lower than source framerate. so signal
+            // that the nominal framerate will be changed.
+            init->vrate = pv->vrate;
+            init->vrate_base = pv->vrate_base;
+        }
+        init->pfr_vrate = pv->vrate;
+        init->pfr_vrate_base = pv->vrate_base;
+    }
+    else
+    {
+        // Constant framerate. Signal the framerate we are using.
+        init->vrate = pv->vrate;
+        init->vrate_base = pv->vrate_base;
+    }
+    init->cfr = pv->cfr;
+    pv->frame_rate = (double)pv->vrate_base * 90000. / pv->vrate;
+
+    return 0;
+}
+
+static int hb_vfr_info( hb_filter_object_t * filter,
+                        hb_filter_info_t * info )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if( !pv )
+        return 1;
+
+    memset( info, 0, sizeof( hb_filter_info_t ) );
+    info->out.vrate_base = pv->vrate_base;
+    info->out.vrate = pv->vrate;
+    info->out.cfr = pv->cfr;
+    if ( pv->cfr == 0 )
+    {
+        /* Ensure we're using "Same as source" FPS */
+        sprintf( info->human_readable_desc, 
+                "frame rate: same as source (around %.3f fps)",
+                (float)pv->vrate / pv->vrate_base );
+    }
+    else if ( pv->cfr == 2 )
+    {
+        // For PFR, we want the framerate based on the source's actual 
+        // framerate, unless it's higher than the specified peak framerate. 
+        double source_fps = (double)pv->input_vrate / pv->input_vrate_base;
+        double peak_fps = (double)pv->vrate / pv->vrate_base;
+        sprintf( info->human_readable_desc, 
+                "frame rate: %.3f fps -> peak rate limited to %.3f fps",
+                source_fps , peak_fps );
+    }
+    else
+    {
+        // Constant framerate. Signal the framerate we are using.
+        double source_fps = (double)pv->input_vrate / pv->input_vrate_base;
+        double constant_fps = (double)pv->vrate / pv->vrate_base;
+        sprintf( info->human_readable_desc, 
+                "frame rate: %.3f fps -> constant %.3f fps",
+                source_fps , constant_fps );
+    }
+
+    return 0;
+}
+
+static void hb_vfr_close( hb_filter_object_t * filter )
+{
+    hb_filter_private_t * pv = filter->private_data;
+
+    if( !pv )
+        return;
+
+    if ( pv->cfr )
+    {
+        hb_log("render: %d frames output, %d dropped and %d duped for CFR/PFR",
+               pv->count_frames, pv->drops, pv->dups );
+    }
+
+    if( pv->job )
+    {
+        hb_interjob_t * interjob = hb_interjob_get( pv->job->h );
+        
+        /* Preserve dropped frame count for more accurate 
+         * framerates in 2nd passes. 
+         */
+        interjob->out_frame_count = pv->count_frames;
+        interjob->total_time = pv->out_last_stop;
+    }
+
+    hb_log("render: lost time: %"PRId64" (%i frames)", 
+           pv->total_lost_time, pv->dropped_frames);
+    hb_log("render: gained time: %"PRId64" (%i frames) (%"PRId64" not accounted for)", 
+           pv->total_gained_time, pv->extended_frames, 
+           pv->total_lost_time - pv->total_gained_time);
+
+    if (pv->dropped_frames)
+    {
+        hb_log("render: average dropped frame duration: %"PRId64, 
+               (pv->total_lost_time / pv->dropped_frames) );
+    }
+
+    if( pv->delay_queue )
+    {
+        hb_fifo_close( &pv->delay_queue );
+    }
+
+    /* Cleanup render work structure */
+    free( pv );
+    filter->private_data = NULL;
+}
+
+static int hb_vfr_work( hb_filter_object_t * filter,
+                        hb_buffer_t ** buf_in,
+                        hb_buffer_t ** buf_out )
+{
+    hb_filter_private_t * pv = filter->private_data;
+    hb_buffer_t * in = *buf_in;
+    hb_buffer_t * out = NULL;
+
+    *buf_in = NULL;
+    *buf_out = NULL;
+    if( in->size <= 0 )
+    {
+        hb_buffer_t *head = NULL, *tail = NULL, *next;
+        int counter = 2;
+
+        /* If the input buffer is end of stream, send out an empty one
+         * to the next stage as well. To avoid losing the contents of
+         * the delay queue connect the buffers in the delay queue in 
+         * the correct order, and add the end of stream buffer to the
+         * end.
+         */     
+        while( ( next = hb_fifo_get( pv->delay_queue ) ) != NULL )
+        {
+            
+            /* We can't use the given time stamps. Previous frames
+               might already have been extended, throwing off the
+               raw values fed to render.c. Instead, their
+               stop and start times are stored in arrays.
+               The 4th cached frame will be the to use.
+               If it needed its duration extended to make up
+               lost time, it will have happened above. */
+            next->s.start = pv->last_start[counter];
+            next->s.stop = pv->last_stop[counter--];
+            
+            adjust_frame_rate( pv, &next );
+
+            if( next )
+            {
+                if( !head && !tail )
+                {
+                    head = next;
+                } else {
+                    tail->next = next;
+                }
+                // Move tail to the end of the list that 
+                // adjust_frame_rate could return
+                while (next)
+                {
+                    tail = next;
+                    next = next->next;
+                }
+            }
+        }
+        if( tail )
+        {
+            tail->next = in;
+            *buf_out = head;
+        } else {
+            *buf_out = in;
+        }     
+        return HB_FILTER_DONE;
+    }
+
+    // If there is a gap between the last stop and the current start
+    // then frame(s) were dropped.
+    if ( in->s.start > pv->last_stop[0] )
+    {
+        /* We need to compensate for the time lost by dropping frame(s).
+           Spread its duration out in quarters, because usually dropped frames
+           maintain a 1-out-of-5 pattern and this spreads it out amongst 
+           the remaining ones.  Store these in the lost_time array, which
+           has 4 slots in it.  Because not every frame duration divides 
+           evenly by 4, and we can't lose the remainder, we have to go 
+           through an awkward process to preserve it in the 4th array index. 
+        */
+        uint64_t temp_duration = in->s.start - pv->last_stop[0];
+        pv->lost_time[0] += (temp_duration / 4);
+        pv->lost_time[1] += (temp_duration / 4);
+        pv->lost_time[2] += (temp_duration / 4);
+        pv->lost_time[3] += ( temp_duration - 3 * (temp_duration / 4) );
+
+        pv->total_lost_time += temp_duration;
+    }
+    else if ( in->s.stop <= pv->last_stop[0] )
+    {
+        // This is generally an error somewhere (bad source or hb bug).
+        // But lets do our best to straighten out the mess.
+        ++pv->drops;
+        hb_buffer_close(&in);
+        return HB_FILTER_OK;
+    }
+
+    /* Cache frame start and stop times, so we can renumber
+       time stamps if dropping frames for VFR.              */
+    int i;
+    for( i = 3; i >= 1; i-- )
+    {
+        pv->last_start[i] = pv->last_start[i-1];
+        pv->last_stop[i] = pv->last_stop[i-1];
+    }
+
+    /* In order to make sure we have continuous time stamps, store
+       the current frame's duration as starting when the last one stopped. */
+    pv->last_start[0] = pv->last_stop[1];
+    pv->last_stop[0] = pv->last_start[0] + (in->s.stop - in->s.start);
+
+    hb_fifo_push( pv->delay_queue, in );
+
+    /*
+     * Keep the last three frames in our queue, this ensures that we have 
+     * the last two always in there should we need to rewrite the 
+     * durations on them.
+     */
+
+    if( hb_fifo_size( pv->delay_queue ) >= 4 )
+    {
+        out = hb_fifo_get( pv->delay_queue );
+    }
+
+    if( out )
+    {
+        /* The current frame exists. That means it hasn't been dropped by a 
+         * filter. We may edit its duration if needed. 
+         */
+        if( pv->lost_time[3] > 0 )
+        {
+            int time_shift = 0;
+
+            for( i = 3; i >= 0; i-- )
+            {
+                /*
+                 * A frame's been dropped earlier by VFR detelecine.
+                 * Gotta make up the lost time. This will also
+                 * slow down the video.
+                 * The dropped frame's has to be accounted for, so
+                 * divvy it up amongst the 4 frames left behind.
+                 * This is what the delay_queue is for;
+                 * telecined sequences start 2 frames before
+                 * the dropped frame, so to slow down the right
+                 * ones you need a 2 frame delay between
+                 * reading input and writing output.
+                 */
+
+                /* We want to extend the outputted frame's duration by the value
+                  stored in the 4th slot of the lost_time array. Because we need
+                  to adjust all the values in the array so they're contiguous,
+                  extend the duration inside the array first, before applying
+                  it to the current frame buffer. */
+                pv->last_start[i] += time_shift;
+                pv->last_stop[i] += pv->lost_time[i] + time_shift;
+
+                /* Log how much time has been added back in to the video. */
+                pv->total_gained_time += pv->lost_time[i];
+                time_shift += pv->lost_time[i];
+
+                pv->lost_time[i] = 0;
+
+                /* Log how many frames have had their durations extended. */
+                pv->extended_frames++;
+            }
+        }
+
+        /* We can't use the given time stamps. Previous frames
+           might already have been extended, throwing off the
+           raw values fed to render.c. Instead, their
+           stop and start times are stored in arrays.
+           The 4th cached frame will be the to use.
+           If it needed its duration extended to make up
+           lost time, it will have happened above. */
+        out->s.start = pv->last_start[3];
+        out->s.stop = pv->last_stop[3];
+
+        adjust_frame_rate( pv, &out );
+    }
+
+    *buf_out = out;
+    return HB_FILTER_OK;
+}
+
+

HandBrake-0.9.8.tar.bz2/libhb/work.c -> HandBrake-0.9.9.tar.bz2/libhb/work.c Changed

@@ -1,12 +1,14 @@
-/* $Id: work.c,v 1.43 2005/03/17 16:38:49 titer Exp $
+/* work.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include "hb.h"
 #include "a52dec/a52.h"
-#include "dca.h"
 #include "libavformat/avformat.h"
 
 typedef struct
@@ -21,6 +23,7 @@
 static void work_func();
 static void do_job( hb_job_t *);
 static void work_loop( void * );
+static void filter_loop( void * );
 
 #define FIFO_UNBOUNDED 65536
 #define FIFO_UNBOUNDED_WAKE 65535
@@ -28,6 +31,8 @@
 #define FIFO_LARGE_WAKE 16
 #define FIFO_SMALL 16
 #define FIFO_SMALL_WAKE 15
+#define FIFO_MINI 4
+#define FIFO_MINI_WAKE 3
 
 /**
  * Allocates work object and launches work thread with work_func.
@@ -106,51 +111,36 @@
     return NULL;
 }
 
-hb_work_object_t * hb_codec_decoder( int codec )
+hb_work_object_t* hb_codec_decoder(int codec)
 {
-    switch( codec )
+    if (codec & HB_ACODEC_FF_MASK)
     {
-        case HB_ACODEC_AC3:  return hb_get_work( WORK_DECA52 );
-        case HB_ACODEC_DCA:  return hb_get_work( WORK_DECDCA );
-        case HB_ACODEC_LPCM: return hb_get_work( WORK_DECLPCM );
-        default:
-            if ( codec & HB_ACODEC_FF_MASK )
-            {
-                return hb_get_work( WORK_DECAVCODEC );
-            }
-            break;
+        return hb_get_work(WORK_DECAVCODEC);
+    }
+    switch (codec)
+    {
+        case HB_ACODEC_AC3:  return hb_get_work(WORK_DECA52);
+        case HB_ACODEC_LPCM: return hb_get_work(WORK_DECLPCM);
+        default:             break;
     }
     return NULL;
 }
 
-hb_work_object_t * hb_codec_encoder( int codec )
+hb_work_object_t* hb_codec_encoder(int codec)
 {
-    hb_work_object_t * w;
-    switch( codec )
+    if (codec & HB_ACODEC_FF_MASK)
     {
-        case HB_ACODEC_FAAC:   return hb_get_work( WORK_ENCFAAC );
-        case HB_ACODEC_LAME:   return hb_get_work( WORK_ENCLAME );
-        case HB_ACODEC_VORBIS: return hb_get_work( WORK_ENCVORBIS );
-        case HB_ACODEC_CA_AAC: return hb_get_work( WORK_ENC_CA_AAC );
-        case HB_ACODEC_CA_HAAC:return hb_get_work( WORK_ENC_CA_HAAC );
-        case HB_ACODEC_FFAAC:
-        {
-            w = hb_get_work( WORK_ENCAVCODEC_AUDIO );
-            w->codec_param = CODEC_ID_AAC;
-            return w;
-        }
-        case HB_ACODEC_FFFLAC:
-        {
-            w = hb_get_work( WORK_ENCAVCODEC_AUDIO );
-            w->codec_param = CODEC_ID_FLAC;
-            return w;
-        }
-        case HB_ACODEC_AC3:
-        {
-            w = hb_get_work( WORK_ENCAVCODEC_AUDIO );
-            w->codec_param = CODEC_ID_AC3;
-            return w;
-        }
+        return hb_get_work(WORK_ENCAVCODEC_AUDIO);
+    }
+    switch (codec)
+    {
+        case HB_ACODEC_AC3:     return hb_get_work(WORK_ENCAVCODEC_AUDIO);
+        case HB_ACODEC_FAAC:    return hb_get_work(WORK_ENCFAAC);
+        case HB_ACODEC_LAME:    return hb_get_work(WORK_ENCLAME);
+        case HB_ACODEC_VORBIS:  return hb_get_work(WORK_ENCVORBIS);
+        case HB_ACODEC_CA_AAC:  return hb_get_work(WORK_ENC_CA_AAC);
+        case HB_ACODEC_CA_HAAC: return hb_get_work(WORK_ENC_CA_HAAC);
+        default:                break;
     }
     return NULL;
 }
@@ -271,6 +261,29 @@
             (float) job->pfr_vrate / (float) job->pfr_vrate_base );
     }
 
+    // Filters can modify dimensions.  So show them first.
+    if( hb_list_count( job->list_filter ) )
+    {
+        hb_log("   + %s", hb_list_count( job->list_filter) > 1 ? "filters" : "filter" );
+        for( i = 0; i < hb_list_count( job->list_filter ); i++ )
+        {
+            hb_filter_object_t * filter = hb_list_item( job->list_filter, i );
+            if( filter->settings )
+                hb_log("     + %s (%s)", filter->name, filter->settings);
+            else
+                hb_log("     + %s (default settings)", filter->name);
+            if( filter->info )
+            {
+                hb_filter_info_t info;
+                filter->info( filter, &info );
+                if( info.human_readable_desc[0] )
+                {
+                    hb_log("       + %s", info.human_readable_desc);
+                }
+            }
+        }
+    }
+    
     if( job->anamorphic.mode )
     {
         hb_log( "   + %s anamorphic", job->anamorphic.mode == 1 ? "strict" : job->anamorphic.mode == 2? "loose" : "custom" );
@@ -278,9 +291,8 @@
         {
             hb_log( "     + keeping source display aspect ratio"); 
         }
-        hb_log( "     + storage dimensions: %d * %d -> %d * %d, crop %d/%d/%d/%d, mod %i",
-                    title->width, title->height, job->width, job->height,
-                    job->crop[0], job->crop[1], job->crop[2], job->crop[3], job->modulus );
+        hb_log( "     + storage dimensions: %d * %d, mod %i",
+                    job->width, job->height, job->modulus );
         if( job->anamorphic.itu_par )
         {
             hb_log( "     + using ITU pixel aspect ratio values"); 
@@ -291,27 +303,13 @@
     }
     else
     {
-        hb_log( "   + dimensions: %d * %d -> %d * %d, crop %d/%d/%d/%d, mod %i",
-                title->width, title->height, job->width, job->height,
-                job->crop[0], job->crop[1], job->crop[2], job->crop[3], job->modulus );
+        hb_log( "   + dimensions: %d * %d, mod %i",
+                job->width, job->height, job->modulus );
     }
 
     if ( job->grayscale )
         hb_log( "   + grayscale mode" );
 
-    if( hb_list_count( job->filters ) )
-    {
-        hb_log("   + %s", hb_list_count( job->filters) > 1 ? "filters" : "filter" );
-        for( i = 0; i < hb_list_count( job->filters ); i++ )
-        {
-            hb_filter_object_t * filter = hb_list_item( job->filters, i );
-            if (filter->settings)
-                hb_log("     + %s (%s)", filter->name, filter->settings);
-            else
-                hb_log("     + %s (default settings)", filter->name);
-        }
-    }
-    
     if( !job->indepth_scan )
     {
         /* Video encoder */
@@ -327,23 +325,27 @@
         if( job->x264_preset && *job->x264_preset &&
             job->vcodec == HB_VCODEC_X264 )
         {
-            hb_log( "     + x264 preset: %s", job->x264_preset);
+            hb_log( "     + x264 preset: %s", job->x264_preset );
         }
         if( job->x264_tune && *job->x264_tune &&
             job->vcodec == HB_VCODEC_X264 )
         {
-            hb_log( "     + x264 tune: %s", job->x264_tune);
+            hb_log( "     + x264 tune: %s", job->x264_tune );
+        }
+        if (job->advanced_opts != NULL && *job->advanced_opts &&
+            (job->vcodec != HB_VCODEC_THEORA))
+        {
+            hb_log("     + options: %s", job->advanced_opts);
         }
-        if( job->advanced_opts && *job->advanced_opts &&
-            ( ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) ||
-              ( job->vcodec == HB_VCODEC_X264 ) ) )
+        if( job->h264_profile && *job->h264_profile &&
+            job->vcodec == HB_VCODEC_X264 )
         {
-            hb_log( "     + options: %s", job->advanced_opts);
+            hb_log( "     + h264 profile: %s", job->h264_profile );
         }
-        if( job->x264_profile && *job->x264_profile &&
+        if( job->h264_level && *job->h264_level &&
             job->vcodec == HB_VCODEC_X264 )
         {
-            hb_log( "     + x264 profile: %s", job->x264_profile);
+            hb_log( "     + h264 level: %s", job->h264_level );
         }
 
         if( job->vquality >= 0 )
@@ -353,30 +355,53 @@
         else
         {
             hb_log( "     + bitrate: %d kbps, pass: %d", job->vbitrate, job->pass );
+            if( job->pass == 1 && job->fastfirstpass == 1 &&
+                job->vcodec == HB_VCODEC_X264 )
+            {
+                hb_log( "     + fast first pass" );
+                hb_log( "     + options: ref=1:8x8dct=0:me=dia:trellis=0" );
+                hb_log( "                analyse=i4x4 (if originally enabled, else analyse=none)" );
+                hb_log( "                subq=2 (if originally greater than 2, else subq unchanged)" );
+            }
         }
     }
 
-    for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
+    if( job->indepth_scan )
     {
-        subtitle =  hb_list_item( title->list_subtitle, i );
+        hb_log( " * Foreign Audio Search: %s%s%s",
+                job->select_subtitle_config.dest == RENDERSUB ? "Render/Burn-in" : "Passthrough",
+                job->select_subtitle_config.force ? ", Forced Only" : "",
+                job->select_subtitle_config.default_track ? ", Default" : "" );
+    }
+
+    for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+    {
+        subtitle = hb_list_item( job->list_subtitle, i );
 
         if( subtitle )
         {
-            if( subtitle->source == SRTSUB )
+            if( job->indepth_scan )
+            {
+                hb_log( "   + subtitle, %s (track %d, id 0x%x) %s [%s]",
+                        subtitle->lang, subtitle->track, subtitle->id,
+                        subtitle->format == PICTURESUB ? "Picture" : "Text",
+                        hb_subsource_name( subtitle->source ) );
+            }
+            else if( subtitle->source == SRTSUB )
             {
                 /* For SRT, print offset and charset too */
-                hb_log( " * subtitle track %i, %s (id 0x%x) %s [%s] -> %s%s, offset: %"PRId64", charset: %s",
-                        subtitle->track, subtitle->lang, subtitle->id, "Text", "SRT", "Pass-Through",
+                hb_log( " * subtitle track %d, %s (track %d, id 0x%x) Text [SRT] -> Passthrough%s, offset: %"PRId64", charset: %s",
+                        subtitle->out_track, subtitle->lang, subtitle->track, subtitle->id,
                         subtitle->config.default_track ? ", Default" : "",
                         subtitle->config.offset, subtitle->config.src_codeset );
             }
             else
             {
-                hb_log( " * subtitle track %i, %s (id 0x%x) %s [%s] -> %s%s%s", subtitle->track, subtitle->lang, subtitle->id,
+                hb_log( " * subtitle track %d, %s (track %d, id 0x%x) %s [%s] -> %s%s%s",
+                        subtitle->out_track, subtitle->lang, subtitle->track, subtitle->id,
                         subtitle->format == PICTURESUB ? "Picture" : "Text",
                         hb_subsource_name( subtitle->source ),
-                        job->indepth_scan ? "Foreign Audio Search" :
-                        subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through",
+                        subtitle->config.dest == RENDERSUB ? "Render/Burn-in" : "Passthrough",
                         subtitle->config.force ? ", Forced Only" : "",
                         subtitle->config.default_track ? ", Default" : "" );
             }
@@ -385,9 +410,9 @@
 
     if( !job->indepth_scan )
     {
-        for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+        for( i = 0; i < hb_list_count( job->list_audio ); i++ )
         {
-            audio = hb_list_item( title->list_audio, i );
+            audio = hb_list_item( job->list_audio, i );
 
             hb_log( " * audio track %d", audio->config.out.track );
             
@@ -396,10 +421,13 @@
 
             hb_log( "   + decoder: %s (track %d, id 0x%x)", audio->config.lang.description, audio->config.in.track + 1, audio->id );
 
-            if( ( audio->config.in.codec == HB_ACODEC_AC3 ) || ( audio->config.in.codec == HB_ACODEC_DCA) )
-            {
-                hb_log( "     + bitrate: %d kbps, samplerate: %d Hz", audio->config.in.bitrate / 1000, audio->config.in.samplerate );
-            }
+            if (audio->config.in.bitrate >= 1000)
+                hb_log("     + bitrate: %d kbps, samplerate: %d Hz",
+                       audio->config.in.bitrate / 1000,
+                       audio->config.in.samplerate);
+            else
+                hb_log("     + samplerate: %d Hz",
+                       audio->config.in.samplerate);
 
             if( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
             {
@@ -422,6 +450,10 @@
                         break;
                     }
                 }
+                if( audio->config.out.normalize_mix_level != 0 )
+                {
+                    hb_log( "   + normalized mixing levels" );
+                }
                 if( audio->config.out.gain != 0.0 )
                 {
                     hb_log( "   + gain: %.fdB", audio->config.out.gain );
@@ -430,6 +462,11 @@
                 {
                     hb_log( "   + dynamic range compression: %f", audio->config.out.dynamic_range_compression );
                 }
+                if (hb_audio_dither_is_supported(audio->config.out.codec))
+                {
+                    hb_log("   + dither: %s",
+                           hb_audio_dither_get_description(audio->config.out.dither_method));
+                }
                 for( j = 0; j < hb_audio_encoders_count; j++ )
                 {
                     if( hb_audio_encoders[j].encoder == audio->config.out.codec )
@@ -482,15 +519,16 @@
     hb_work_object_t * w;
     hb_work_object_t * sync;
     hb_work_object_t * muxer;
+    hb_work_object_t *reader = hb_get_work(WORK_READER);
     hb_interjob_t * interjob;
 
     hb_audio_t   * audio;
     hb_subtitle_t * subtitle;
     unsigned int subtitle_highest = 0;
-    unsigned int subtitle_highest_id = 0;
-    unsigned int subtitle_lowest = -1;
+    unsigned int subtitle_lowest = 0;
     unsigned int subtitle_lowest_id = 0;
     unsigned int subtitle_forced_id = 0;
+    unsigned int subtitle_forced_hits = 0;
     unsigned int subtitle_hit = 0;
 
     title = job->title;
@@ -505,308 +543,462 @@
 
     hb_log( "starting job" );
 
-    if( job->anamorphic.mode )
+    /* Look for the scanned subtitle in the existing subtitle list
+     * select_subtitle implies that we did a scan. */
+    if( !job->indepth_scan && interjob->select_subtitle )
     {
-        hb_set_anamorphic_size(job, &job->width, &job->height, &job->anamorphic.par_width, &job->anamorphic.par_height);
-
-        if( job->vcodec & HB_VCODEC_FFMPEG_MASK )
+        /* Disable forced subtitles if we didn't find any in the scan, so that
+         * we display normal subtitles instead. */
+        if( interjob->select_subtitle->config.force &&
+            interjob->select_subtitle->forced_hits == 0 )
         {
-            /* Just to make working with ffmpeg even more fun,
-               lavc's MPEG-4 encoder can't handle PAR values >= 255,
-               even though AVRational does. Adjusting downwards
-               distorts the display aspect slightly, but such is life. */
-            while ((job->anamorphic.par_width & ~0xFF) ||
-                   (job->anamorphic.par_height & ~0xFF))
+            interjob->select_subtitle->config.force = 0;
+        }
+        for( i = 0; i < hb_list_count( job->list_subtitle ); )
+        {
+            subtitle = hb_list_item( job->list_subtitle, i );
+            if( subtitle )
             {
-                job->anamorphic.par_width >>= 1;
-                job->anamorphic.par_height >>= 1;
+                /* Remove the scanned subtitle from the list if
+                 * it would result in:
+                 * - an emty track (forced and no forced hits)
+                 * - an identical, duplicate subtitle track:
+                 *   -> both (or neither) are forced 
+                 *   -> subtitle is not forced but all its hits are forced */
+                if( ( interjob->select_subtitle->id == subtitle->id ) &&
+                    ( ( subtitle->config.force &&
+                        interjob->select_subtitle->forced_hits == 0 ) ||
+                      ( subtitle->config.force == interjob->select_subtitle->config.force ) ||
+                      ( !subtitle->config.force &&
+                        interjob->select_subtitle->hits == interjob->select_subtitle->forced_hits ) ) )
+                {
+                    hb_list_rem( job->list_subtitle, subtitle );
+                    free( subtitle );
+                    continue;
+                }
+                /* Adjust output track number, in case we removed one.
+                 * Output tracks sadly still need to be in sequential order.
+                 * Note: out.track starts at 1, i starts at 0, and track 1 is interjob->select_subtitle */
+                subtitle->out_track = ++i + 1;
+            }
+            else
+            {
+                // avoid infinite loop is subtitle == NULL
+                i++;
             }
-            hb_reduce( &job->anamorphic.par_width, &job->anamorphic.par_height, job->anamorphic.par_width, job->anamorphic.par_height );
+        }
+
+        /* Add the subtitle that we found on the subtitle scan pass.
+         *
+         * Make sure it's the first subtitle in the list so that it becomes the
+         * first burned subtitle (explicitly or after sanitizing) - which should
+         * ensure that it doesn't get dropped. */
+        interjob->select_subtitle->out_track = 1;
+        if (job->pass == 0 || job->pass == 2)
+        {
+            // final pass, interjob->select_subtitle is no longer needed
+            hb_list_insert(job->list_subtitle, 0, interjob->select_subtitle);
+            interjob->select_subtitle = NULL;
+        }
+        else
+        {
+            // this is not the final pass, so we need to copy it instead
+            hb_list_insert(job->list_subtitle, 0, hb_subtitle_copy(interjob->select_subtitle));
         }
     }
-    
-    /* Keep width and height within these boundaries,
-       but ignore for anamorphic. For "loose" anamorphic encodes,
-       this stuff is covered in the pixel_ratio section above.    */
-    if ( job->maxHeight && ( job->height > job->maxHeight ) && ( !job->anamorphic.mode ) )
-    {
-        job->height = job->maxHeight;
-        hb_fix_aspect( job, HB_KEEP_HEIGHT );
-        hb_log( "Height out of bounds, scaling down to %i", job->maxHeight );
-        hb_log( "New dimensions %i * %i", job->width, job->height );
-    }
-    if ( job->maxWidth && ( job->width > job->maxWidth ) && ( !job->anamorphic.mode ) )
+
+    if ( !job->indepth_scan )
     {
-        job->width = job->maxWidth;
-        hb_fix_aspect( job, HB_KEEP_WIDTH );
-        hb_log( "Width out of bounds, scaling down to %i", job->maxWidth );
-        hb_log( "New dimensions %i * %i", job->width, job->height );
+        // Sanitize subtitles
+        uint8_t one_burned = 0;
+        for( i = 0; i < hb_list_count( job->list_subtitle ); )
+        {
+            subtitle = hb_list_item( job->list_subtitle, i );
+            if ( subtitle->config.dest == RENDERSUB )
+            {
+                if ( one_burned )
+                {
+                    if ( !hb_subtitle_can_pass(subtitle->source, job->mux) )
+                    {
+                        hb_log( "More than one subtitle burn-in requested, dropping track %d.", i );
+                        hb_list_rem( job->list_subtitle, subtitle );
+                        free( subtitle );
+                        continue;
+                    }
+                    else
+                    {
+                        hb_log( "More than one subtitle burn-in requested.  Changing track %d to soft subtitle.", i );
+                        subtitle->config.dest = PASSTHRUSUB;
+                    }
+                }
+                else if ( !hb_subtitle_can_burn(subtitle->source) )
+                {
+                    hb_log( "Subtitle burn-in requested and input track can not be rendered.  Changing track %d to soft subtitle.", i );
+                    subtitle->config.dest = PASSTHRUSUB;
+                }
+                else
+                {
+                    one_burned = 1;
+                }
+            }
+
+            if ( subtitle->config.dest == PASSTHRUSUB &&
+                 !hb_subtitle_can_pass(subtitle->source, job->mux) )
+            {
+                if ( !one_burned )
+                {
+                    hb_log( "Subtitle pass-thru requested and input track is not compatible with container.  Changing track %d to burned-in subtitle.", i );
+                    subtitle->config.dest = RENDERSUB;
+                    subtitle->config.default_track = 0;
+                    one_burned = 1;
+                }
+                else
+                {
+                    hb_log( "Subtitle pass-thru requested and input track is not compatible with container.  One track already burned, dropping track %d.", i );
+                    hb_list_rem( job->list_subtitle, subtitle );
+                    free( subtitle );
+                    continue;
+                }
+            }
+            /* Adjust output track number, in case we removed one.
+             * Output tracks sadly still need to be in sequential order.
+             * Note: out.track starts at 1, i starts at 0 */
+            subtitle->out_track = ++i;
+        }
+        if (one_burned)
+        {
+            // Add subtitle rendering filter
+            // Note that if the filter is already in the filter chain, this
+            // has no effect. Note also that this means the front-end is
+            // not required to add the subtitle rendering filter since
+            // we will always try to do it here.
+            hb_filter_object_t *filter = hb_filter_init(HB_FILTER_RENDER_SUB);
+            char *filter_settings      = hb_strdup_printf("%d:%d:%d:%d",
+                                                          job->crop[0],
+                                                          job->crop[1],
+                                                          job->crop[2],
+                                                          job->crop[3]);
+            hb_add_filter(job, filter, filter_settings);
+            free(filter_settings);
+        }
     }
 
-    if ( job->cfr == 0 )
+    // Filters have an effect on settings.
+    // So initialize the filters and update the job.
+    if( job->list_filter && hb_list_count( job->list_filter ) )
     {
-        /* Ensure we're using "Same as source" FPS */
-        job->vrate = title->rate;
-        job->vrate_base = title->rate_base;
+        hb_filter_init_t init;
+
+        init.job = job;
+        init.pix_fmt = AV_PIX_FMT_YUV420P;
+        init.width = title->width;
+        init.height = title->height;
+        init.par_width = job->anamorphic.par_width;
+        init.par_height = job->anamorphic.par_height;
+        memcpy(init.crop, job->crop, sizeof(int[4]));
+        init.vrate_base = job->vrate_base;
+        init.vrate = job->vrate;
+        init.pfr_vrate_base = job->pfr_vrate_base;
+        init.pfr_vrate = job->pfr_vrate;
+        init.cfr = 0;
+        for( i = 0; i < hb_list_count( job->list_filter ); )
+        {
+            hb_filter_object_t * filter = hb_list_item( job->list_filter, i );
+            if( filter->init( filter, &init ) )
+            {
+                hb_log( "Failure to initialise filter '%s', disabling",
+                        filter->name );
+                hb_list_rem( job->list_filter, filter );
+                hb_filter_close( &filter );
+                continue;
+            }
+            i++;
+        }
+        job->width = init.width;
+        job->height = init.height;
+        job->anamorphic.par_width = init.par_width;
+        job->anamorphic.par_height = init.par_height;
+        memcpy(job->crop, init.crop, sizeof(int[4]));
+        job->vrate_base = init.vrate_base;
+        job->vrate = init.vrate;
+        job->pfr_vrate_base = init.pfr_vrate_base;
+        job->pfr_vrate = init.pfr_vrate;
+        job->cfr = init.cfr;
     }
-    else if ( job->cfr == 2 )
+
+    if( job->anamorphic.mode )
     {
-        job->pfr_vrate = job->vrate;
-        job->pfr_vrate_base = job->vrate_base;
-
-        // Ensure we're using "Same as source" FPS, with peak set by pfr_vrate_* 
-        // For PFR, we want the framerate based on the source's actual 
-        // framerate, unless it's higher than the specified peak framerate. 
-        double source_fps = (double)job->title->rate / job->title->rate_base;
-        double peak_l_fps = (double)job->vrate / job->vrate_base;
-        if ( source_fps < peak_l_fps )
+        /* While x264 is smart enough to reduce fractions on its own, libavcodec and
+         * the MacGUI need some help with the math, so lose superfluous factors. */
+        hb_reduce( &job->anamorphic.par_width, &job->anamorphic.par_height,
+                    job->anamorphic.par_width,  job->anamorphic.par_height );
+        if( job->vcodec & HB_VCODEC_FFMPEG_MASK )
         {
-            job->vrate_base = title->rate_base;
-            job->vrate = title->rate;
+            /* Just to make working with ffmpeg even more fun,
+             * lavc's MPEG-4 encoder can't handle PAR values >= 255,
+             * even though AVRational does. Adjusting downwards
+             * distorts the display aspect slightly, but such is life. */
+            while( ( job->anamorphic.par_width  & ~0xFF ) ||
+                   ( job->anamorphic.par_height & ~0xFF ) )
+            {
+                job->anamorphic.par_width  >>= 1;
+                job->anamorphic.par_height >>= 1;
+                hb_reduce( &job->anamorphic.par_width, &job->anamorphic.par_height,
+                            job->anamorphic.par_width,  job->anamorphic.par_height );
+            }
         }
     }
-
+    
     job->fifo_mpeg2  = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
     job->fifo_raw    = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
     job->fifo_sync   = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
-    job->fifo_render = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
     job->fifo_mpeg4  = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
+    job->fifo_render = NULL; // Attached to filter chain
 
-    /*
-     * Audio fifos must be initialized before sync
-     */
-    if( !job->indepth_scan )
-    {
-    // apply Auto Passthru settings
-    hb_autopassthru_apply_settings( job, title );
-    // sanitize audio settings
-    for( i = 0; i < hb_list_count( title->list_audio ); )
+    /* Audio fifos must be initialized before sync */
+    if (!job->indepth_scan)
     {
-        audio = hb_list_item( title->list_audio, i );
-        if( audio->config.out.codec == HB_ACODEC_AUTO_PASS )
-        {
-            // Auto Passthru should have been handled above
-            // remove track to avoid a crash
-            hb_log( "Auto Passthru error, dropping track %d",
-                    audio->config.out.track  );
-            hb_list_rem( title->list_audio, audio );
-            free( audio );
-            continue;
-        }
-        if( ( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) &&
-           !( audio->config.in.codec & audio->config.out.codec & HB_ACODEC_PASS_MASK ) )
-        {
-            hb_log( "Passthru requested and input codec is not the same as output codec for track %d, dropping track",
-                    audio->config.out.track );
-            hb_list_rem( title->list_audio, audio );
-            free( audio );
-            continue;
-        }
-        if( !(audio->config.out.codec & HB_ACODEC_PASS_FLAG) )
+        // apply Auto Passthru settings
+        hb_autopassthru_apply_settings(job);
+        // sanitize audio settings
+        for (i = 0; i < hb_list_count(job->list_audio);)
         {
-            if( audio->config.out.samplerate > 48000 )
+            audio = hb_list_item(job->list_audio, i);
+            if (audio->config.out.codec == HB_ACODEC_AUTO_PASS)
             {
-                hb_log( "Sample rate %d not supported. Down-sampling to 48kHz.",
-                        audio->config.out.samplerate );
-                audio->config.out.samplerate = 48000;
+                // Auto Passthru should have been handled above
+                // remove track to avoid a crash
+                hb_log("Auto Passthru error, dropping track %d",
+                       audio->config.out.track);
+                hb_list_rem(job->list_audio, audio);
+                free(audio);
+                continue;
             }
-            // if not specified, set to same as input
-            if( audio->config.out.samplerate < 0 )
+            if ((audio->config.out.codec & HB_ACODEC_PASS_FLAG) &&
+                !(audio->config.in.codec &
+                  audio->config.out.codec & HB_ACODEC_PASS_MASK))
             {
-                audio->config.out.samplerate = audio->config.in.samplerate;
+                hb_log("Passthru requested and input codec is not the same as output codec for track %d, dropping track",
+                       audio->config.out.track);
+                hb_list_rem(job->list_audio, audio);
+                free(audio);
+                continue;
             }
+            /* Adjust output track number, in case we removed one.
+             * Output tracks sadly still need to be in sequential order.
+             * Note: out.track starts at 1, i starts at 0 */
+            audio->config.out.track = ++i;
         }
-        if( audio->config.out.codec == HB_ACODEC_CA_HAAC )
+
+        int best_mixdown    = 0;
+        int best_bitrate    = 0;
+        int best_samplerate = 0;
+
+        for (i = 0; i < hb_list_count(job->list_audio); i++)
         {
-            if( !encca_haac_available() )
+            audio = hb_list_item(job->list_audio, i);
+
+            /* set up the audio work structures */
+            audio->priv.fifo_raw  = hb_fifo_init(FIFO_SMALL, FIFO_SMALL_WAKE);
+            audio->priv.fifo_sync = hb_fifo_init(FIFO_SMALL, FIFO_SMALL_WAKE);
+            audio->priv.fifo_out  = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
+            audio->priv.fifo_in   = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
+
+            /* Passthru audio, nothing to sanitize here */
+            if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
+                continue;
+
+            /* Vorbis language information */
+            if (audio->config.out.codec == HB_ACODEC_VORBIS)
+                audio->priv.config.vorbis.language = audio->config.lang.simple;
+
+            /* sense-check the requested samplerate */
+            if (audio->config.out.samplerate < 0)
             {
-                // user chose Core Audio HE-AAC but the encoder is unavailable
-                hb_log( "Core Audio HE-AAC unavailable. Using Core Audio AAC for track %d",
-                        audio->config.out.track );
-                audio->config.out.codec = HB_ACODEC_CA_AAC;
+                // if not specified, set to same as input
+                audio->config.out.samplerate = audio->config.in.samplerate;
             }
-            else if( audio->config.out.samplerate < 32000 )
+            best_samplerate =
+                hb_get_best_samplerate(audio->config.out.codec,
+                                       audio->config.out.samplerate, NULL);
+            if (best_samplerate != audio->config.out.samplerate)
             {
-                // Core Audio HE-AAC doesn't support samplerates < 32 kHz
-                hb_log( "Sample rate %d not supported (ca_haac). Using 32kHz for track %d",
-                        audio->config.out.samplerate, audio->config.out.track );
-                audio->config.out.samplerate = 32000;
+                int ii;
+                for (ii = 0; ii < hb_audio_rates_count; ii++)
+                {
+                    if (best_samplerate == hb_audio_rates[ii].rate)
+                    {
+                        hb_log("work: sanitizing track %d unsupported samplerate %d Hz to %s kHz",
+                               audio->config.out.track, audio->config.out.samplerate,
+                               hb_audio_rates[ii].string);
+                        break;
+                    }
+                }
+                audio->config.out.samplerate = best_samplerate;
             }
-        }
-        /* Adjust output track number, in case we removed one.
-         * Output tracks sadly still need to be in sequential order.
-         * Note: out.track starts at 1, i starts at 0 */
-        audio->config.out.track = ++i;
-    }
-
-    int requested_mixdown = 0;
-    int requested_mixdown_index = 0;
-    int best_mixdown = 0;
-    int best_bitrate = 0;
 
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        audio = hb_list_item( title->list_audio, i );
-
-        /* sense-check the requested mixdown */
-        if( audio->config.out.mixdown <= 0 &&
-            !( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) )
-        {
-            /*
-             * Mixdown wasn't specified and this is not pass-through,
-             * set a default mixdown
-             */
-            audio->config.out.mixdown = hb_get_default_mixdown( audio->config.out.codec,
-                                                                audio->config.in.channel_layout );
-            for (j = 0; j < hb_audio_mixdowns_count; j++)
+            /* sense-check the requested mixdown */
+            if (audio->config.out.mixdown <= HB_AMIXDOWN_NONE)
             {
-                if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown)
+                /* Mixdown not specified, set the default mixdown */
+                audio->config.out.mixdown =
+                    hb_get_default_mixdown(audio->config.out.codec,
+                                           audio->config.in.channel_layout);
+                for (j = 0; j < hb_audio_mixdowns_count; j++)
                 {
-                    hb_log("work: mixdown not specified, track %i setting mixdown %s", audio->config.out.track, hb_audio_mixdowns[j].human_readable_name);
-                    break;
+                    if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown)
+                    {
+                        hb_log("work: mixdown not specified, track %d setting mixdown %s",
+                               audio->config.out.track,
+                               hb_audio_mixdowns[j].human_readable_name);
+                        break;
+                    }
                 }
             }
-        }
-
-        /* log the requested mixdown */
-        for (j = 0; j < hb_audio_mixdowns_count; j++) {
-            if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) {
-                requested_mixdown = audio->config.out.mixdown;
-                requested_mixdown_index = j;
-                break;
+            else
+            {
+                best_mixdown =
+                    hb_get_best_mixdown(audio->config.out.codec,
+                                        audio->config.in.channel_layout,
+                                        audio->config.out.mixdown);
+                if (audio->config.out.mixdown != best_mixdown)
+                {
+                    int prev_mix_idx = 0, best_mix_idx = 0;
+                    for (j = 0; j < hb_audio_mixdowns_count; j++)
+                    {
+                        if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown)
+                        {
+                            prev_mix_idx = j;
+                        }
+                        else if (hb_audio_mixdowns[j].amixdown == best_mixdown)
+                        {
+                            best_mix_idx = j;
+                        }
+                    }
+                    /* log the output mixdown */
+                    hb_log("work: sanitizing track %d mixdown %s to %s",
+                           audio->config.out.track,
+                           hb_audio_mixdowns[prev_mix_idx].human_readable_name,
+                           hb_audio_mixdowns[best_mix_idx].human_readable_name);
+                    audio->config.out.mixdown = best_mixdown;
+                }
             }
-        }
-
-        best_mixdown = hb_get_best_mixdown( audio->config.out.codec,
-                                            audio->config.in.channel_layout, 0 );
-
-        if ( audio->config.out.mixdown > best_mixdown )
-        {
-            audio->config.out.mixdown = best_mixdown;
-        }
 
-        if ( audio->config.out.mixdown != requested_mixdown )
-        {
-            /* log the output mixdown */
-            for (j = 0; j < hb_audio_mixdowns_count; j++)
+            /* sense-check the requested compression level */
+            if (audio->config.out.compression_level < 0)
             {
-                if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown)
+                audio->config.out.compression_level =
+                    hb_get_default_audio_compression(audio->config.out.codec);
+                if (audio->config.out.compression_level >= 0)
                 {
-                    hb_log("work: sanitizing track %i mixdown %s to %s", 
-                        audio->config.out.track, 
-                        hb_audio_mixdowns[requested_mixdown_index].human_readable_name, 
-                        hb_audio_mixdowns[j].human_readable_name);
-                    break;
+                    hb_log("work: compression level not specified, track %d setting compression level %.2f",
+                           audio->config.out.track,
+                           audio->config.out.compression_level);
                 }
             }
-        }
-        
-        /* sense-check the requested compression level */
-        if( audio->config.out.compression_level < 0 )
-        {
-            audio->config.out.compression_level =
-                hb_get_default_audio_compression( audio->config.out.codec );
-            if( audio->config.out.compression_level >= 0 )
+            else
             {
-                hb_log( "work: compression level not specified, track %d setting compression level %.2f",
-                    audio->config.out.track, audio->config.out.compression_level );
+                float best_compression =
+                    hb_get_best_audio_compression(audio->config.out.codec,
+                                                  audio->config.out.compression_level);
+                if (best_compression != audio->config.out.compression_level)
+                {
+                    if (best_compression == -1)
+                    {
+                        hb_log("work: track %d, compression level not supported by codec",
+                               audio->config.out.track);
+                    }
+                    else
+                    {
+                        hb_log("work: sanitizing track %d compression level %.2f to %.2f",
+                               audio->config.out.track,
+                               audio->config.out.compression_level,
+                               best_compression);
+                    }
+                    audio->config.out.compression_level = best_compression;
+                }
             }
-        }
 
-        if( audio->config.out.compression_level >= 0 )
-        {
-            float best_compression = hb_get_best_audio_compression( 
-                                        audio->config.out.codec, 
-                                        audio->config.out.compression_level );
-            if( best_compression != audio->config.out.compression_level )
+            /* sense-check the requested quality */
+            if (audio->config.out.quality != HB_INVALID_AUDIO_QUALITY)
             {
-                if( best_compression == -1 )
+                float best_quality =
+                    hb_get_best_audio_quality(audio->config.out.codec,
+                                              audio->config.out.quality);
+                if (best_quality != audio->config.out.quality)
                 {
-                    hb_log( "work: compression levels not supported by codec" );
-                }
-                else
-                {
-                    hb_log( "work: sanitizing track %d audio compression level %.2f to %.2f", 
-                            audio->config.out.track,
-                            audio->config.out.compression_level,
-                            best_compression );
+                    if (best_quality == HB_INVALID_AUDIO_QUALITY)
+                    {
+                        hb_log("work: track %d, quality mode not supported by codec",
+                               audio->config.out.track);
+                    }
+                    else
+                    {
+                        hb_log("work: sanitizing track %d quality %.2f to %.2f",
+                               audio->config.out.track,
+                               audio->config.out.quality, best_quality);
+                    }
+                    audio->config.out.quality = best_quality;
                 }
-                audio->config.out.compression_level = best_compression;
             }
-        }
-        
-        /* sense-check the requested quality */
-        if( audio->config.out.quality != HB_INVALID_AUDIO_QUALITY )
-        {
-            float best_quality = hb_get_best_audio_quality( 
-                    audio->config.out.codec, audio->config.out.quality );
-            if( best_quality != audio->config.out.quality )
+
+            /* sense-check the requested bitrate */
+            if (audio->config.out.quality == HB_INVALID_AUDIO_QUALITY)
             {
-                if( best_quality == HB_INVALID_AUDIO_QUALITY )
+                if (audio->config.out.bitrate <= 0)
                 {
-                    hb_log( "work: quality mode not supported by codec" );
+                    /* Bitrate not specified, set the default bitrate */
+                    audio->config.out.bitrate =
+                        hb_get_default_audio_bitrate(audio->config.out.codec,
+                                                     audio->config.out.samplerate,
+                                                     audio->config.out.mixdown);
+                    if (audio->config.out.bitrate > 0)
+                    {
+                        hb_log("work: bitrate not specified, track %d setting bitrate %d Kbps",
+                               audio->config.out.track,
+                               audio->config.out.bitrate);
+                    }
                 }
                 else
                 {
-                    hb_log( "work: sanitizing track %d audio quality %.2f to %.2f", 
-                            audio->config.out.track,
-                            audio->config.out.quality,
-                            best_quality );
+                    best_bitrate =
+                        hb_get_best_audio_bitrate(audio->config.out.codec,
+                                                  audio->config.out.bitrate,
+                                                  audio->config.out.samplerate,
+                                                  audio->config.out.mixdown);
+                    if (best_bitrate > 0 &&
+                        best_bitrate != audio->config.out.bitrate)
+                    {
+                        /* log the output bitrate */
+                        hb_log("work: sanitizing track %d bitrate %d to %d Kbps",
+                               audio->config.out.track,
+                               audio->config.out.bitrate, best_bitrate);
+                    }
+                    audio->config.out.bitrate = best_bitrate;
                 }
-                audio->config.out.quality = best_quality;
             }
-        }
-        
-        /* sense-check the requested bitrate */
-        if( audio->config.out.quality == HB_INVALID_AUDIO_QUALITY )
-        {
-            if( audio->config.out.bitrate <= 0 )
+
+            /* sense-check the requested dither */
+            if (hb_audio_dither_is_supported(audio->config.out.codec))
             {
-                /*
-                 * Bitrate wasn't specified and this is not pass-through,
-                 * set a default bitrate
-                 */
-                audio->config.out.bitrate = 
-                    hb_get_default_audio_bitrate( audio->config.out.codec,
-                                                  audio->config.out.samplerate,
-                                                  audio->config.out.mixdown );
-                
-                if( audio->config.out.bitrate > 0 )
+                if (audio->config.out.dither_method ==
+                    hb_audio_dither_get_default())
                 {
-                    hb_log( "work: bitrate not specified, track %d setting bitrate %d",
-                        audio->config.out.track, audio->config.out.bitrate );
+                    /* "auto", enable with default settings */
+                    audio->config.out.dither_method =
+                        hb_audio_dither_get_default_method();
                 }
             }
-            
-            /* log the requested bitrate */
-            best_bitrate = hb_get_best_audio_bitrate( audio->config.out.codec, 
-                                                      audio->config.out.bitrate,
-                                                      audio->config.out.samplerate,
-                                                      audio->config.out.mixdown );
-            
-            if ( audio->config.out.bitrate != best_bitrate && 
-                 best_bitrate > 0 )
+            else if (audio->config.out.dither_method !=
+                     hb_audio_dither_get_default())
             {
-                /* log the output bitrate */
-                hb_log( "work: sanitizing track %d audio bitrate %d to %d", 
-                        audio->config.out.track,
-                        audio->config.out.bitrate,
-                        best_bitrate );
+                /* specific dither requested but dithering not supported */
+                hb_log("work: track %d, dithering not supported by codec",
+                       audio->config.out.track);
             }
-            audio->config.out.bitrate = best_bitrate;
         }
-
-        if (audio->config.out.codec == HB_ACODEC_VORBIS)
-            audio->priv.config.vorbis.language = audio->config.lang.simple;
-
-        /* set up the audio work structures */
-        audio->priv.fifo_raw  = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
-        audio->priv.fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
-        audio->priv.fifo_out  = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
-        audio->priv.fifo_in   = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
     }
 
-    }
     /* Synchronization */
     sync = hb_sync_init( job );
 
@@ -816,7 +1008,7 @@
     if (vcodec == WORK_DECMPEG2)
     {
         vcodec = WORK_DECAVCODECV;
-        title->video_codec_param = CODEC_ID_MPEG2VIDEO;
+        title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
     }
 #endif
     hb_list_add( job->list_work, ( w = hb_get_work( vcodec ) ) );
@@ -824,27 +1016,68 @@
     w->fifo_in  = job->fifo_mpeg2;
     w->fifo_out = job->fifo_raw;
 
-    /* Video renderer */
-    hb_list_add( job->list_work, ( w = hb_get_work( WORK_RENDER ) ) );
-    w->fifo_in  = job->fifo_sync;
-    if( !job->indepth_scan )
-        w->fifo_out = job->fifo_render;
-    else
-        w->fifo_out = NULL;
+    for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+    {
+        subtitle = hb_list_item( job->list_subtitle, i );
+
+        if( subtitle )
+        {
+            subtitle->fifo_in   = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+            // Must set capacity of the raw-FIFO to be set >= the maximum number of subtitle
+            // lines that could be decoded prior to a video frame in order to prevent the following
+            // deadlock condition:
+            //   1. Subtitle decoder blocks trying to generate more subtitle lines than will fit in the FIFO.
+            //   2. Blocks the processing of further subtitle packets read from the input stream.
+            //   3. And that blocks the processing of any further video packets read from the input stream.
+            //   4. And that blocks the sync work-object from running, which is needed to consume the subtitle lines in the raw-FIFO.
+            // Since that number is unbounded, the FIFO must be made (effectively) unbounded in capacity.
+            subtitle->fifo_raw  = hb_fifo_init( FIFO_UNBOUNDED, FIFO_UNBOUNDED_WAKE );
+            subtitle->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+            subtitle->fifo_out  = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
 
+            w = hb_get_work( subtitle->codec );
+            w->fifo_in = subtitle->fifo_in;
+            w->fifo_out = subtitle->fifo_raw;
+            w->subtitle = subtitle;
+            hb_list_add( job->list_work, w );
+        }
+    }
+
+    /* Set up the video filter fifo pipeline */
     if( !job->indepth_scan )
     {
+        if( job->list_filter )
+        {
+            int filter_count = hb_list_count( job->list_filter );
+            int i;
+            hb_fifo_t * fifo_in = job->fifo_sync;
+
+            for( i = 0; i < filter_count; i++ )
+            {
+                hb_filter_object_t * filter = hb_list_item( job->list_filter, i );
+
+                filter->fifo_in = fifo_in;
+                filter->fifo_out = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
+                fifo_in = filter->fifo_out;
+            }
+            job->fifo_render = fifo_in;
+        }
+        else if ( !job->list_filter )
+        {
+            hb_log("work: Internal Error: no filters");
+            job->fifo_render = NULL;
+        }
 
         /* Video encoder */
         switch( job->vcodec )
         {
         case HB_VCODEC_FFMPEG_MPEG4:
             w = hb_get_work( WORK_ENCAVCODEC );
-            w->codec_param = CODEC_ID_MPEG4;
+            w->codec_param = AV_CODEC_ID_MPEG4;
             break;
         case HB_VCODEC_FFMPEG_MPEG2:
             w = hb_get_work( WORK_ENCAVCODEC );
-            w->codec_param = CODEC_ID_MPEG2VIDEO;
+            w->codec_param = AV_CODEC_ID_MPEG2VIDEO;
             break;
         case HB_VCODEC_X264:
             w = hb_get_work( WORK_ENCX264 );
@@ -853,149 +1086,21 @@
             w = hb_get_work( WORK_ENCTHEORA );
             break;
         }
-        w->fifo_in  = job->fifo_render;
+        // Handle case where there are no filters.  
+        // This really should never happen.
+        if ( job->fifo_render )
+            w->fifo_in  = job->fifo_render;
+        else
+            w->fifo_in  = job->fifo_sync;
+
         w->fifo_out = job->fifo_mpeg4;
         w->config   = &job->config;
 
         hb_list_add( job->list_work, w );
-    }
 
-    /*
-     * Look for the scanned subtitle in the existing subtitle list
-     * select_subtitle implies that we did a scan.
-     */
-    if ( !job->indepth_scan && interjob->select_subtitle &&
-         ( job->pass == 0 || job->pass == 2 ) )
-    {
-        /*
-         * Disable forced subtitles if we didn't find any in the scan
-         * so that we display normal subtitles instead.
-         */
-        if( interjob->select_subtitle->config.force && 
-            interjob->select_subtitle->forced_hits == 0 )
-        {
-            interjob->select_subtitle->config.force = 0;
-        }
-        for( i=0; i < hb_list_count(title->list_subtitle); i++ )
+        for( i = 0; i < hb_list_count( job->list_audio ); i++ )
         {
-            subtitle =  hb_list_item( title->list_subtitle, i );
-
-            if( subtitle )
-            {
-                /*
-                * Remove the scanned subtitle from the subtitle list if
-                * it would result in an identical duplicate subtitle track
-                * or an emty track (forced and no forced hits).
-                */
-                if( ( interjob->select_subtitle->id == subtitle->id ) &&
-                    ( ( interjob->select_subtitle->forced_hits == 0 &&
-                        subtitle->config.force ) ||
-                    ( subtitle->config.force == interjob->select_subtitle->config.force ) ) )
-                {
-                    *subtitle = *(interjob->select_subtitle);
-                    free( interjob->select_subtitle );
-                    interjob->select_subtitle = NULL;
-                    break;
-                }
-            }
-        }
-
-        if( interjob->select_subtitle )
-        {
-            /*
-             * Its not in the existing list
-             *
-             * Must be second pass of a two pass with subtitle scan enabled, so
-             * add the subtitle that we found on the first pass for use in this
-             * pass.
-             */
-            hb_list_add( title->list_subtitle, interjob->select_subtitle );
-            interjob->select_subtitle = NULL;
-        }
-    }
-
-
-    for( i=0; i < hb_list_count(title->list_subtitle); i++ )
-    {
-        subtitle =  hb_list_item( title->list_subtitle, i );
-
-        if( subtitle )
-        {
-            subtitle->fifo_in   = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
-            // Must set capacity of the raw-FIFO to be set >= the maximum number of subtitle
-            // lines that could be decoded prior to a video frame in order to prevent the following
-            // deadlock condition:
-            //   1. Subtitle decoder blocks trying to generate more subtitle lines than will fit in the FIFO.
-            //   2. Blocks the processing of further subtitle packets read from the input stream.
-            //   3. And that blocks the processing of any further video packets read from the input stream.
-            //   4. And that blocks the sync work-object from running, which is needed to consume the subtitle lines in the raw-FIFO.
-            // Since that number is unbounded, the FIFO must be made (effectively) unbounded in capacity.
-            subtitle->fifo_raw  = hb_fifo_init( FIFO_UNBOUNDED, FIFO_UNBOUNDED_WAKE );
-            subtitle->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
-            subtitle->fifo_out  = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
-
-            if( (!job->indepth_scan || job->select_subtitle_config.force) && 
-                subtitle->source == VOBSUB ) {
-                /*
-                 * Don't add threads for subtitles when we are scanning, unless
-                 * looking for forced subtitles.
-                 */
-                w = hb_get_work( WORK_DECVOBSUB );
-                w->fifo_in  = subtitle->fifo_in;
-                w->fifo_out = subtitle->fifo_raw;
-                w->subtitle = subtitle;
-                hb_list_add( job->list_work, w );
-            }
-
-            if( !job->indepth_scan && subtitle->source == CC608SUB )
-            {
-                w = hb_get_work( WORK_DECCC608 );
-                w->fifo_in  = subtitle->fifo_in;
-                w->fifo_out = subtitle->fifo_raw;
-                hb_list_add( job->list_work, w );
-            }
-
-            if( !job->indepth_scan && subtitle->source == SRTSUB )
-            {
-                w = hb_get_work( WORK_DECSRTSUB );
-                w->fifo_in  = subtitle->fifo_in;
-                w->fifo_out = subtitle->fifo_raw;
-                w->subtitle = subtitle;
-                hb_list_add( job->list_work, w );
-            }
-            
-            if( !job->indepth_scan && subtitle->source == UTF8SUB )
-            {
-                w = hb_get_work( WORK_DECUTF8SUB );
-                w->fifo_in  = subtitle->fifo_in;
-                w->fifo_out = subtitle->fifo_raw;
-                hb_list_add( job->list_work, w );
-            }
-            
-            if( !job->indepth_scan && subtitle->source == TX3GSUB )
-            {
-                w = hb_get_work( WORK_DECTX3GSUB );
-                w->fifo_in  = subtitle->fifo_in;
-                w->fifo_out = subtitle->fifo_raw;
-                hb_list_add( job->list_work, w );
-            }
-            
-            if( !job->indepth_scan && subtitle->source == SSASUB )
-            {
-                w = hb_get_work( WORK_DECSSASUB );
-                w->fifo_in  = subtitle->fifo_in;
-                w->fifo_out = subtitle->fifo_raw;
-                w->subtitle = subtitle;
-                hb_list_add( job->list_work, w );
-            }
-        }
-    }
-
-    if( !job->indepth_scan )
-    {
-        for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-        {
-            audio = hb_list_item( title->list_audio, i );
+            audio = hb_list_item( job->list_audio, i );
 
             /*
             * Audio Decoder Thread
@@ -1052,7 +1157,6 @@
     hb_display_job_info( job );
 
     /* Init read & write threads */
-    hb_work_object_t *reader = hb_get_work(WORK_READER);
     if ( reader->init( reader, job ) )
     {
         hb_error( "Failure to initialise thread '%s'", reader->name );
@@ -1064,6 +1168,25 @@
 
     job->done = 0;
 
+    if( job->list_filter && !job->indepth_scan )
+    {
+        int filter_count = hb_list_count( job->list_filter );
+        int i;
+
+        for( i = 0; i < filter_count; i++ )
+        {
+            hb_filter_object_t * filter = hb_list_item( job->list_filter, i );
+
+            if( !filter ) continue;
+
+            // Filters were initialized earlier, so we just need
+            // to start the filter's thread
+            filter->done = &job->done;
+            filter->thread = hb_thread_init( filter->name, filter_loop, filter,
+                                             HB_LOW_PRIORITY );
+        }
+    }
+
     /* Launch processing threads */
     for( i = 0; i < hb_list_count( job->list_work ); i++ )
     {
@@ -1175,6 +1298,26 @@
     /* Stop the write thread (thread_close will block until the muxer finishes) */
     job->done = 1;
 
+    // Close render filter pipeline
+    if( job->list_filter )
+    {
+        int filter_count = hb_list_count( job->list_filter );
+        int i;
+
+        for( i = 0; i < filter_count; i++ )
+        {
+            hb_filter_object_t * filter = hb_list_item( job->list_filter, i );
+
+            if( !filter ) continue;
+
+            if( filter->thread != NULL )
+            {
+                hb_thread_close( &filter->thread );
+            }
+            filter->close( filter );
+        }
+    }
+
     /* Close work objects */
     while( ( w = hb_list_item( job->list_work, 0 ) ) )
     {
@@ -1201,11 +1344,11 @@
     hb_fifo_close( &job->fifo_mpeg2 );
     hb_fifo_close( &job->fifo_raw );
     hb_fifo_close( &job->fifo_sync );
-    hb_fifo_close( &job->fifo_render );
     hb_fifo_close( &job->fifo_mpeg4 );
 
-    for (i=0; i < hb_list_count(title->list_subtitle); i++) {
-        subtitle =  hb_list_item( title->list_subtitle, i);
+    for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+    {
+        subtitle = hb_list_item( job->list_subtitle, i );
         if( subtitle )
         {
             hb_fifo_close( &subtitle->fifo_in );
@@ -1214,9 +1357,9 @@
             hb_fifo_close( &subtitle->fifo_out );
         }
     }
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+    for( i = 0; i < hb_list_count( job->list_audio ); i++ )
     {
-        audio = hb_list_item( title->list_audio, i );
+        audio = hb_list_item( job->list_audio, i );
         if( audio->priv.fifo_in != NULL )
             hb_fifo_close( &audio->priv.fifo_in );
         if( audio->priv.fifo_raw != NULL )
@@ -1227,103 +1370,108 @@
             hb_fifo_close( &audio->priv.fifo_out );
     }
 
+    if( job->list_filter )
+    {
+        for( i = 0; i < hb_list_count( job->list_filter ); i++ )
+        {
+            hb_filter_object_t * filter = hb_list_item( job->list_filter, i );
+            hb_fifo_close( &filter->fifo_out );
+        }
+    }
+
     if( job->indepth_scan )
     {
-        /*
-         * Before closing the title print out our subtitle stats if we need to
-         * Find the highest and lowest.
-         */
-        for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
+        /* Before closing the title print out our subtitle stats if we need to
+         * find the highest and lowest. */
+        for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
         {
-            subtitle =  hb_list_item( title->list_subtitle, i );
+            subtitle = hb_list_item( job->list_subtitle, i );
 
-            hb_log( "Subtitle stream 0x%x '%s': %d hits (%d forced)",
-                    subtitle->id, subtitle->lang, subtitle->hits,
-                    subtitle->forced_hits );
+            hb_log( "Subtitle track %d (id 0x%x) '%s': %d hits (%d forced)",
+                    subtitle->track, subtitle->id, subtitle->lang,
+                    subtitle->hits, subtitle->forced_hits );
 
             if( subtitle->hits == 0 )
                 continue;
 
-            if( subtitle->hits > subtitle_highest )
+            if( subtitle_highest < subtitle->hits )
             {
                 subtitle_highest = subtitle->hits;
-                subtitle_highest_id = subtitle->id;
             }
 
-            if( subtitle->hits < subtitle_lowest )
+            if( subtitle_lowest == 0 ||
+                subtitle_lowest > subtitle->hits )
             {
                 subtitle_lowest = subtitle->hits;
                 subtitle_lowest_id = subtitle->id;
             }
 
-            if( subtitle->forced_hits > 0 )
+            // pick the track with fewest forced hits
+            if( subtitle->forced_hits > 0 &&
+                ( subtitle_forced_hits == 0 ||
+                  subtitle_forced_hits > subtitle->forced_hits ) )
             {
-                if( subtitle_forced_id == 0 )
-                {
-                    subtitle_forced_id = subtitle->id;
-                }
+                subtitle_forced_id = subtitle->id;
+                subtitle_forced_hits = subtitle->forced_hits;
             }
         }
 
-        
-        if( subtitle_forced_id )
+        if( subtitle_forced_id && job->select_subtitle_config.force )
         {
-            /*
-             * If there are any subtitle streams with forced subtitles
-             * then select it in preference to the lowest.
-             */
+            /* If there is a subtitle stream with forced subtitles and forced-only
+             * is set, then select it in preference to the lowest. */
             subtitle_hit = subtitle_forced_id;
-            hb_log("Found a subtitle candidate id 0x%x (contains forced subs)",
-                   subtitle_hit);
-        } else if( subtitle_lowest < subtitle_highest )
+            hb_log( "Found a subtitle candidate with id 0x%x (contains forced subs)",
+                    subtitle_hit );
+        }
+        else if( subtitle_lowest > 0 &&
+                 subtitle_lowest < ( subtitle_highest * 0.1 ) )
         {
-            /*
-             * OK we have more than one, and the lowest is lower,
+            /* OK we have more than one, and the lowest is lower,
              * but how much lower to qualify for turning it on by
              * default?
              *
-             * Let's say 10% as a default.
-             */
-            if( subtitle_lowest < ( subtitle_highest * 0.1 ) )
-            {
-                subtitle_hit = subtitle_lowest_id;
-                hb_log( "Found a subtitle candidate id 0x%x",
-                        subtitle_hit );
-            } else {
-                hb_log( "No candidate subtitle detected during subtitle-scan");
-            }
+             * Let's say 10% as a default. */
+            subtitle_hit = subtitle_lowest_id;
+            hb_log( "Found a subtitle candidate with id 0x%x", subtitle_hit );
+        }
+        else
+        {
+            hb_log( "No candidate detected during subtitle scan" );
         }
-    }
 
-    if( job->indepth_scan )
-    {
-        for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
+        for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
         {
-            subtitle =  hb_list_item( title->list_subtitle, i );
+            subtitle = hb_list_item( job->list_subtitle, i );
             if( subtitle->id == subtitle_hit )
             {
                 subtitle->config = job->select_subtitle_config;
-                hb_list_rem( title->list_subtitle, subtitle );
+                // Remove from list since we are taking ownership
+                // of the subtitle.
+                hb_list_rem( job->list_subtitle, subtitle );
                 interjob->select_subtitle = subtitle;
                 break;
             }
         }
     }
 
-    if( job->filters )
-    {
-        for( i = 0; i < hb_list_count( job->filters ); i++ )
-        {
-            hb_filter_object_t * filter = hb_list_item( job->filters, i );
-            hb_filter_close( &filter );
-        }
-        hb_list_close( &job->filters );
-    }
-
     hb_buffer_pool_free();
+    hb_job_close( &job );
+}
 
-    hb_title_close( &job->title );
-    free( job );
+static inline void copy_chapter( hb_buffer_t * dst, hb_buffer_t * src )
+{
+    // Propagate any chapter breaks for the worker if and only if the
+    // output frame has the same time stamp as the input frame (any
+    // worker that delays frames has to propagate the chapter marks itself
+    // and workers that move chapter marks to a different time should set
+    // 'src' to NULL so that this code won't generate spurious duplicates.)
+    if( src && dst && src->s.start == dst->s.start)
+    {
+        // restore log below to debug chapter mark propagation problems
+        //hb_log("work %s: Copying Chapter Break @ %"PRId64, w->name, src->s.start);
+        dst->s.new_chap = src->s.new_chap;
+    }
 }
 
 /**
@@ -1356,17 +1504,7 @@
         buf_out = NULL;
         w->status = w->work( w, &buf_in, &buf_out );
 
-        // Propagate any chapter breaks for the worker if and only if the
-        // output frame has the same time stamp as the input frame (any
-        // worker that delays frames has to propagate the chapter marks itself
-        // and workers that move chapter marks to a different time should set
-        // 'buf_in' to NULL so that this code won't generate spurious duplicates.)
-        if( buf_in && buf_out && buf_in->new_chap && buf_in->start == buf_out->start)
-        {
-            // restore log below to debug chapter mark propagation problems
-            //hb_log("work %s: Copying Chapter Break @ %"PRId64, w->name, buf_in->start);
-            buf_out->new_chap = buf_in->new_chap;
-        }
+        copy_chapter( buf_out, buf_in );
 
         if( buf_in )
         {
@@ -1403,3 +1541,78 @@
             hb_buffer_close( &buf_in );
     }
 }
+
+/**
+ * Performs the filter object's specific work function.
+ * Loops calling work function for associated filter object. 
+ * Sleeps when fifo is full.
+ * Monitors work done indicator.
+ * Exits loop when work indiactor is set.
+ * @param _w Handle to work object.
+ */
+static void filter_loop( void * _f )
+{
+    hb_filter_object_t * f = _f;
+    hb_buffer_t      * buf_in, * buf_out;
+
+    while( !*f->done && f->status != HB_FILTER_DONE )
+    {
+        buf_in = hb_fifo_get_wait( f->fifo_in );
+        if ( buf_in == NULL )
+            continue;
+
+        // Filters can drop buffers.  Remember chapter information
+        // so that it can be propagated to the next buffer
+        if ( buf_in->s.new_chap )
+        {
+            f->chapter_time = buf_in->s.start;
+            f->chapter_val = buf_in->s.new_chap;
+        }
+        if ( *f->done )
+        {
+            if( buf_in )
+            {
+                hb_buffer_close( &buf_in );
+            }
+            break;
+        }
+
+        buf_out = NULL;
+        f->status = f->work( f, &buf_in, &buf_out );
+
+        if ( buf_out && f->chapter_val && f->chapter_time <= buf_out->s.start )
+        {
+            buf_out->s.new_chap = f->chapter_val;
+            f->chapter_val = 0;
+        }
+
+        if( buf_in )
+        {
+            hb_buffer_close( &buf_in );
+        }
+        if ( buf_out && f->fifo_out == NULL )
+        {
+            hb_buffer_close( &buf_out );
+        }
+        if( buf_out )
+        {
+            while ( !*f->done )
+            {
+                if ( hb_fifo_full_wait( f->fifo_out ) )
+                {
+                    hb_fifo_push( f->fifo_out, buf_out );
+                    break;
+                }
+            }
+        }
+    }
+    // Consume data in incoming fifo till job complete so that
+    // residual data does not stall the pipeline
+    while( !*f->done )
+    {
+        buf_in = hb_fifo_get_wait( f->fifo_in );
+        if ( buf_in != NULL )
+            hb_buffer_close( &buf_in );
+    }
+}
+

HandBrake-0.9.8.tar.bz2/macosx/ChapterTitles.h -> HandBrake-0.9.9.tar.bz2/macosx/ChapterTitles.h Changed

HandBrake-0.9.8.tar.bz2/macosx/ChapterTitles.m -> HandBrake-0.9.9.tar.bz2/macosx/ChapterTitles.m Changed

@@ -11,50 +11,62 @@
 - (id)init 
 {
     self = [super init];
-    if( self != nil )
+    if (self != nil)
     {
-        fTitle = NULL;
+        fTitle              = NULL;
+        fChapterTitlesArray = [[[NSMutableArray alloc] init] retain];
     }
-    
     return self;
 }
 
+- (void)dealloc
+{
+    [fChapterTitlesArray release];
+    [super               dealloc];
+}
+
 - (void)resetWithTitle:(hb_title_t *)title
 {
-    int i;
-    NSString *chapterString;
-    
     fTitle = title;
+    [fChapterTitlesArray removeAllObjects];
 
-    if (!title)
+    if (fTitle == NULL)
         return;
 
-    int count = hb_list_count( title->list_chapter );
-
-    for( i = 0; i < count; i++ )
+    for (int i = 0; i < hb_list_count(fTitle->job->list_chapter); i++)
     {
-        hb_chapter_t *chapter = hb_list_item( title->list_chapter, i );
-        
-        if( chapter != NULL && chapter->title[0] == '\0' )
+        hb_chapter_t *chapter = hb_list_item(fTitle->job->list_chapter, i);
+        if (chapter != NULL)
         {
-            chapterString = [NSString stringWithFormat:@"Chapter %2d",(i+1)];
-    
-            strncpy( chapter->title, [chapterString UTF8String], 1023);
-            chapter->title[1023] = '\0';
+            if (chapter->title != NULL)
+            {
+                [fChapterTitlesArray addObject:[NSString
+                                                stringWithUTF8String:chapter->title]];
+            }
+            else
+            {
+                [fChapterTitlesArray addObject:[NSString
+                                                stringWithFormat:@"Chapter %d",
+                                                i + 1]];
+            }
         }
     }
-    
+}
+
+- (NSArray*)chapterTitlesArray
+{
+    return [NSArray arrayWithArray:fChapterTitlesArray];
 }
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-    if( fTitle == NULL )
+    if (fTitle == NULL)
     {
         return 0;
     }
     else
     {
-        return hb_list_count( fTitle->list_chapter );
+        return [fChapterTitlesArray count];
     }
 }
 
@@ -63,18 +75,12 @@
         forTableColumn:(NSTableColumn *)aTableColumn
         row:(NSInteger)rowIndex
 {
-    if(aTableColumn != nil && [[aTableColumn identifier] intValue] == 2)
+    if (aTableColumn != nil && [[aTableColumn identifier] intValue] == 2 &&
+        fTitle       != NULL)
     {
-        if( fTitle )
-        {
-            hb_chapter_t *chapter = hb_list_item( fTitle->list_chapter, rowIndex );
-
-            if( chapter != NULL )
-            {
-                strncpy( chapter->title, [anObject UTF8String], 1023);
-                chapter->title[1023] = '\0';
-            }
-        }
+        [fChapterTitlesArray replaceObjectAtIndex:rowIndex
+                                       withObject:[NSString
+                                                   stringWithString:anObject]];
     }
 }
 
@@ -82,26 +88,16 @@
       objectValueForTableColumn:(NSTableColumn *)aTableColumn
       row:(NSInteger)rowIndex
 {
-    NSString *cellEntry =  @"__DATA ERROR__";
-
-    if([[aTableColumn identifier] intValue] == 1)
+    if ([[aTableColumn identifier] intValue] == 1)
     {
-        cellEntry = [NSString stringWithFormat:@"%d",rowIndex+1];
+        return [NSString stringWithFormat:@"%d", rowIndex + 1];
     }
-    else
+    else if (fTitle != NULL)
     {
-        if( fTitle )
-        {
-            hb_chapter_t *chapter = hb_list_item( fTitle->list_chapter, rowIndex );
-
-            if( chapter != NULL )
-            {
-                cellEntry = [NSString stringWithUTF8String:chapter->title];
-            }
-        }
+        return [NSString stringWithString:[fChapterTitlesArray
+                                           objectAtIndex:rowIndex]];
     }
-
-    return cellEntry;
+    return @"__DATA ERROR__";
 }
 
 /* Method to edit the next chapter when the user presses Return. We have to use

HandBrake-0.9.8.tar.bz2/macosx/Controller.h -> HandBrake-0.9.9.tar.bz2/macosx/Controller.h Changed

@@ -25,6 +25,7 @@
 extern NSString *keyTitleTag;
 
 @class HBOutputPanelController;
+@class DockTextField;
 
 /* We subclass NSView so that our drags show both the icon as well as PresetName columns */
 @interface HBPresetsOutlineView : NSOutlineView
@@ -58,6 +59,29 @@
     /* Picture Preview */
     PreviewController            * fPreviewController;
     
+    /* x264 Presets Box */
+    NSArray                      * fX264PresetNames;
+    NSUInteger                     fX264MediumPresetIndex;
+    IBOutlet NSButton            * fX264UseAdvancedOptionsCheck;
+    IBOutlet NSBox               * fX264PresetsBox;
+    IBOutlet NSSlider            * fX264PresetsSlider;
+    IBOutlet NSTextField         * fX264PresetSliderLabel;
+    IBOutlet NSTextField         * fX264PresetSelectedTextField;
+    IBOutlet NSPopUpButton       * fX264TunePopUp;
+    IBOutlet NSTextField         * fX264TunePopUpLabel;
+    IBOutlet NSPopUpButton       * fX264ProfilePopUp;
+    IBOutlet NSTextField         * fX264ProfilePopUpLabel;
+    IBOutlet NSPopUpButton       * fX264LevelPopUp;
+    IBOutlet NSTextField         * fX264LevelPopUpLabel;
+    IBOutlet NSButton            * fX264FastDecodeCheck;
+    IBOutlet NSTextField         * fDisplayX264PresetsAdditonalOptionsTextField;
+    IBOutlet NSTextField         * fDisplayX264PresetsAdditonalOptionsLabel;
+    // Text Field to show the expanded opts from unparse()
+    IBOutlet NSTextField         * fDisplayX264PresetsUnparseTextField;
+    char                         * fX264PresetsUnparsedUTF8String;
+    NSUInteger                     fX264PresetsHeightForUnparse;
+    NSUInteger                     fX264PresetsWidthForUnparse;
+    
     /* Advanced options tab */
     HBAdvancedController         * fAdvancedOptions;
 	IBOutlet NSBox               * fAdvancedView;
@@ -69,10 +93,12 @@
     IBOutlet NSTextField         * fQueueStatus;
     
     /* Output panel */
-    HBOutputPanelController       *outputPanel;
+    HBOutputPanelController      * outputPanel;
 	
     /* Source box */
 	IBOutlet NSProgressIndicator * fScanIndicator;
+	IBOutlet NSBox               * fScanHorizontalLine;
+    
 	NSString                     * sourceDisplayName;
     IBOutlet NSTextField         * fSrcDVD2Field;
     IBOutlet NSTextField         * fSrcTitleField;
@@ -140,12 +166,9 @@
     IBOutlet NSButton            * fVidTwoPassCheck;
     IBOutlet NSButton            * fVidTurboPassCheck;
 	
-	/* Status read out fileds for picture sizing */
-    IBOutlet NSTextField         * fPictureSizeField;
-    IBOutlet NSTextField         * fPictureCroppingField;
-	
-    /* Status read out fileds for video filters */
-    IBOutlet NSTextField         * fVideoFiltersField;
+    /* Status read out fields for picture settings and video filters */
+    IBOutlet NSTextField         * fPictureSettingsField;
+    IBOutlet NSTextField         * fPictureFiltersField;
 	
 	/* Picture variables */
 	int                        PicOrigOutputWidth;
@@ -174,7 +197,7 @@
     IBOutlet NSButton            * fAudioAllowDTSHDPassCheck;
     IBOutlet NSButton            * fAudioAllowDTSPassCheck;
     IBOutlet NSButton            * fAudioAllowMP3PassCheck;
-    IBOutlet NSButton            * fAudioFallbackPopUp;
+    IBOutlet NSPopUpButton       * fAudioFallbackPopUp;
     
     	    
     /* Chapters box */
@@ -256,7 +279,13 @@
 	NSString                      * currentSource;
     NSString                      * browsedSourceDisplayName;
     
-    double                         dockIconProgress;
+    /* Dock progress variables */
+    double                          dockIconProgress;
+    
+    BOOL                            fWillScan;
+    NSDockTile                    * dockTile;
+    DockTextField                 * percentField;
+    DockTextField                 * timeField;
 }
 - (int) getPidnum;
 - (IBAction) showAboutPanel:(id)sender;
@@ -273,8 +302,13 @@
 
 - (IBAction) cancelScanning:(id)sender;
 
-- (void)     updateUI: (NSTimer *) timer;
-- (void)     enableUI: (bool) enable;
+- (void)     updateUI:                                 (NSTimer*) timer;
+- (void)     enableUI:                                 (bool)     enable;
+- (void)     setupX264PresetsWidgets:                  (id)       sender;
+- (void)     enableX264Widgets:                        (bool)     enable;
+- (IBAction) updateX264Widgets:                        (id)       sender;
+- (IBAction) x264PresetsChangedDisplayExpandedOptions: (id)       sender;
+
 - (IBAction) encodeStartStopPopUpChanged: (id) sender;
 
 
@@ -310,6 +344,11 @@
 - (IBAction) calculatePictureSizing: (id) sender;
 - (IBAction) openMainWindow: (id) sender;
 
+/* Text summaries of various settings */
+- (NSString*) pictureSettingsSummary;
+- (NSString*) pictureFiltersSummary;
+- (NSString*) muxerOptionsSummary;
+
 /* Add All titles to the queue */
 - (IBAction) addAllTitlesToQueue: (id) sender;
 - (void) addAllTitlesToQueueAlertDone: (NSWindow *) sheet
@@ -441,5 +480,27 @@
 + (unsigned int) maximumNumberOfAllowedAudioTracks;
 - (IBAction) addAllAudioTracks: (id) sender;
 
+// Drag & Drop methods
+- (void)openFiles:(NSArray*)filenames;
+- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames;
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
+
+- (void) updateDockIcon:(double)progress withETA:(NSString*)etaStr;
+
+// x264 system methods
+- (NSString*) x264Preset;
+- (NSString*) x264Tune;
+- (NSString*) x264OptionExtra;
+- (NSString*) h264Profile;
+- (NSString*) h264Level;
+- (void)      setX264Preset:            (NSString*) x264Preset;
+- (void)      setX264Tune:              (NSString*) x264Tune;
+- (void)      setX264OptionExtra:       (NSString*) x264OptionExtra;
+- (void)      setH264Profile:           (NSString*) h264Profile;
+- (void)      setH264Level:             (NSString*) h264Level;
+- (IBAction)  x264PresetsSliderChanged: (id)        sender;
+
+
 @end

HandBrake-0.9.8.tar.bz2/macosx/Controller.m -> HandBrake-0.9.9.tar.bz2/macosx/Controller.m Changed

@@ -11,14 +11,21 @@
 #import "HBDVDDetector.h"
 #import "HBPresets.h"
 #import "HBPreviewController.h"
+#import "DockTextField.h"
 
 unsigned int maximumNumberOfAllowedAudioTracks = 24;
-NSString *HBContainerChangedNotification = @"HBContainerChangedNotification";
-NSString *keyContainerTag = @"keyContainerTag";
-NSString *HBTitleChangedNotification = @"HBTitleChangedNotification";
-NSString *keyTitleTag = @"keyTitleTag";
-
-#define DragDropSimplePboardType 	@"MyCustomOutlineViewPboardType"
+NSString *HBContainerChangedNotification       = @"HBContainerChangedNotification";
+NSString *keyContainerTag                      = @"keyContainerTag";
+NSString *HBTitleChangedNotification           = @"HBTitleChangedNotification";
+NSString *keyTitleTag                          = @"keyTitleTag";
+
+NSString *dragDropFiles                        = @"dragDropFiles";
+
+#define DragDropSimplePboardType                 @"MyCustomOutlineViewPboardType"
+
+NSString *dockTilePercentFormat                = @"%2.1f%%";
+// DockTile update freqency in total percent increment
+#define dockTileUpdateFrequency                  0.1f
 
 /* We setup the toolbar values here ShowPreviewIdentifier */
 static NSString *        ToggleDrawerIdentifier             = @"Toggle Drawer Item Identifier";
@@ -26,8 +33,8 @@
 static NSString *        PauseEncodingIdentifier            = @"Pause Encoding Item Identifier";
 static NSString *        ShowQueueIdentifier                = @"Show Queue Item Identifier";
 static NSString *        AddToQueueIdentifier               = @"Add to Queue Item Identifier";
-static NSString *        ShowPictureIdentifier             = @"Show Picture Window Item Identifier";
-static NSString *        ShowPreviewIdentifier             = @"Show Preview Window Item Identifier";
+static NSString *        ShowPictureIdentifier              = @"Show Picture Window Item Identifier";
+static NSString *        ShowPreviewIdentifier              = @"Show Preview Window Item Identifier";
 static NSString *        ShowActivityIdentifier             = @"Debug Output Item Identifier";
 static NSString *        ChooseSourceIdentifier             = @"Choose Source Item Identifier";
 
@@ -47,12 +54,8 @@
         return nil;
     }
 
-    /* replace bundled app icon with one which is 32/64-bit savvy */
-#if defined( __LP64__ )
-    fApplicationIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"HandBrake-64.icns"]];
-#else
     fApplicationIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"HandBrake.icns"]];
-#endif
+
     if( fApplicationIcon != nil )
         [NSApp setApplicationIconImage:fApplicationIcon];
     
@@ -93,9 +96,94 @@
     NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
     [self writeToActivityLog: "%s", [versionStringFull UTF8String]];
     
+    /* Load the dockTile and instiante initial text fields */
+    dockTile = [[NSApplication sharedApplication] dockTile];
+    NSImageView *iv = [[NSImageView alloc] init];
+    [iv setImage:[[NSApplication sharedApplication] applicationIconImage]];
+    [dockTile setContentView:iv];
+    
+    /* We can move the specific values out from here by subclassing NSDockTile and package everything in here */
+    /* If colors are to be chosen once and for all, we can also remove the instantiation with numerical values */
+    percentField = [[DockTextField alloc] initWithFrame:NSMakeRect(0.0f, 32.0f, [dockTile size].width, 30.0f)];
+    [percentField changeGradientColors:[NSColor colorWithDeviceRed:0.4f green:0.6f blue:0.4f alpha:1.0f] endColor:[NSColor colorWithDeviceRed:0.2f green:0.4f blue:0.2f alpha:1.0f]];
+    [iv addSubview:percentField];
+    
+    timeField = [[DockTextField alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, [dockTile size].width, 30.0f)];
+    [timeField changeGradientColors:[NSColor colorWithDeviceRed:0.6f green:0.4f blue:0.4f alpha:1.0f] endColor:[NSColor colorWithDeviceRed:0.4f green:0.2f blue:0.2f alpha:1.0f]];
+    [iv addSubview:timeField];
+    
+    [self updateDockIcon:-1.0 withETA:@""];
+    
+    /*
+     * initialize fX264PresetsUnparsedUTF8String as early as possible
+     * avoids an invalid free
+     */
+    fX264PresetsUnparsedUTF8String = NULL;
+    
     return self;
 }
 
+// This method is triggered at launch (and every launch) whether or not
+// files have been dragged on to the dockTile. As a consequence, [self openFiles]
+// contains the logic to detect the case when no files has been drop on the dock
+- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
+{
+    [self openFiles:filenames];
+    
+    [NSApp replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
+}
+
+- (void)openFiles:(NSArray*)filenames
+{
+    if (filenames.count == 1 && [[filenames objectAtIndex:0] isEqual:@"YES"])
+        return;
+    
+    NSMutableArray* filesList = [[NSMutableArray alloc] initWithArray:filenames];
+    [filesList removeObject:@"YES"];
+    
+    // For now, we just want to accept one file at a time
+    // If for any reason, more than one file is submitted, we will take the first one
+    if (filesList.count > 1)
+    {
+        filesList = [NSMutableArray arrayWithObject:[filesList objectAtIndex:0]];
+    }
+    
+    // The goal of this check is to know if the application was running before the drag & drop
+    // if fSubtitlesDelegate is set, then applicationDidFinishLaunching was called
+    if (fSubtitlesDelegate)
+    {
+        // Handbrake was already running when the user dropped the file(s)
+        // So we get unstack the first one and launch the scan
+        // The other ones remain in the UserDefaults, and will be handled in the updateUI method
+        // when Handbrake is idle
+        id firstItem = [filesList objectAtIndex:0];
+        [filesList removeObjectAtIndex:0];
+        
+        // This variable has only one goal, let the updateUI knows that even if idling
+        // maybe a scan is in preparation
+        fWillScan = YES;
+        
+        if (filesList.count > 0)
+        {
+            [[NSUserDefaults standardUserDefaults] setObject:filesList forKey:dragDropFiles];
+        }
+        else
+        {
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:dragDropFiles];
+        }
+        
+        [browsedSourceDisplayName release];
+        browsedSourceDisplayName = [[firstItem lastPathComponent] retain];
+        [self performScan:firstItem scanTitleNum:0];
+    }
+    else
+    {
+        // Handbrake was not running before the user dropped the file(s)
+        // So we save the file(s) list in the UserDefaults and we will read them
+        // in the applicationDidFinishLaunching method
+        [[NSUserDefaults standardUserDefaults] setObject:filesList forKey:dragDropFiles];
+    }
+}
 
 - (void) applicationDidFinishLaunching: (NSNotification *) notification
 {
@@ -159,7 +247,7 @@
                 [ [NSFileManager defaultManager] removeItemAtPath: [ PreviewDirectory stringByAppendingPathComponent: file ] error: &error ];
                 if( error ) 
                 { 
-                    //an error occurred...
+                    //an error occurred
                     [self writeToActivityLog: "Could not remove existing preview at : %s",[file UTF8String] ];
                 }
             }    
@@ -194,6 +282,9 @@
      */
      applyQueueToScan = NO;
     
+    // We try to get the list of filenames that may have been drag & drop before the application was running
+    id dragDropFilesId = [[NSUserDefaults standardUserDefaults] objectForKey:dragDropFiles];
+    
     /* Now we re-check the queue array to see if there are
      * any remaining encodes to be done in it and ask the
      * user if they want to reload the queue */
@@ -253,26 +344,49 @@
                                           fWindow, self,
                                           nil, @selector(didDimissReloadQueue:returnCode:contextInfo:), nil,
                                           NSLocalizedString(@" Do you want to reload them ?", nil));
+                
+                // After handling the previous queue (reload or empty), if there is files waiting for scanning
+                // we will process them
+                if (dragDropFilesId)
+                {
+                    NSArray *dragDropFiles = (NSArray *)dragDropFilesId;
+                    [self openFiles:dragDropFiles];
+                }
             }
             else
             {
-                /* Since we addressed any pending or previously encoding items above, we go ahead and make sure the queue
-                 * is empty of any finished items or cancelled items */
-                [self clearQueueAllItems];
-                /* We show whichever open source window specified in LaunchSourceBehavior preference key */
-                if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"LaunchSourceBehavior"] isEqualToString: @"Open Source"])
+                // We will open the source window only if there is no dropped files waiting to be scanned
+                if (dragDropFilesId)
                 {
-                    [self browseSources:nil];
+                    NSArray *dragDropFiles = (NSArray *)dragDropFilesId;
+                    [self openFiles:dragDropFiles];
                 }
-                
-                if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"LaunchSourceBehavior"] isEqualToString: @"Open Source (Title Specific)"])
+                else
                 {
-                    [self browseSources:(id)fOpenSourceTitleMMenu];
+                    /* Since we addressed any pending or previously encoding items above, we go ahead and make sure
+                     * the queue is empty of any finished items or cancelled items */
+                    [self clearQueueAllItems];
+                    /* We show whichever open source window specified in LaunchSourceBehavior preference key */
+                    if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"LaunchSourceBehavior"] isEqualToString: @"Open Source"])
+                    {
+                        [self browseSources:nil];
+                    }
+                
+                    if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"LaunchSourceBehavior"] isEqualToString: @"Open Source (Title Specific)"])
+                    {
+                        [self browseSources:(id)fOpenSourceTitleMMenu];
+                    }
                 }
             }
             
         }
     }
+    // We will open the source window only if there is no dropped files waiting to be scanned
+    else if (dragDropFilesId)
+    {
+        NSArray *dragDropFiles = (NSArray *)dragDropFilesId;
+        [self openFiles:dragDropFiles];
+    }
     else
     {
         /* We show whichever open source window specified in LaunchSourceBehavior preference key */
@@ -337,6 +451,49 @@
 }
 
 #pragma mark -
+#pragma mark Drag & drop handling
+
+// This method is used by OSX to know what kind of files can be drag & drop on the NSWindow
+// We only want filenames (and so folders too)
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+{
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    
+    if ([[pboard types] containsObject:NSFilenamesPboardType])
+    {
+        NSArray *paths = [pboard propertyListForType:NSFilenamesPboardType];
+        return paths.count == 1 ? NSDragOperationGeneric : NSDragOperationNone;
+    }
+    
+    return NSDragOperationNone;
+}
+
+// This method is doing the job after the drag & drop operation has been validated by [self draggingEntered] and OSX
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
+{
+    NSPasteboard *pboard;
+    
+    pboard = [sender draggingPasteboard];
+    
+    if ([[pboard types] containsObject:NSFilenamesPboardType])
+    {
+        NSArray *paths = [pboard propertyListForType:NSFilenamesPboardType];
+        
+        if (paths.count > 0)
+        {
+            // For now, we just want to accept one file at a time
+            // If for any reason, more than one file is submitted, we will take the first one
+            NSArray *reducedPaths = [NSArray arrayWithObject:[paths objectAtIndex:0]];
+            paths = reducedPaths;
+        }
+        
+        [self openFiles:paths];
+    }
+    
+    return YES;
+}
+
+#pragma mark -
 
 - (void) didDimissReloadQueue: (NSWindow *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
 {
@@ -411,6 +568,10 @@
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification
 {
+    // When the application is closed and we still have some files in the dragDropFiles array
+    // it's highly probable that the user throw a lot of files and just want to reset this
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:dragDropFiles];
+    
     [currentQueueEncodeNameString release];
     [browsedSourceDisplayName release];
     [outputPanel release];
@@ -523,6 +684,8 @@
     [fVidEncoderPopUp removeAllItems];
     [fVidEncoderPopUp addItemWithTitle: @"FFmpeg"];
     
+    /* setup our x264 presets widgets - this only needs to be done once */
+    [self setupX264PresetsWidgets: nil];
     
     /* Video quality */
 	[fVidBitrateField    setIntValue: 1000];
@@ -578,39 +741,48 @@
 	[self getDefaultPresets:nil];
 	/* lets initialize the current successful scancount here to 0 */
 	currentSuccessfulScanCount = 0;
+    
+    /* Register HBController's Window as a receiver for files/folders drag & drop operations */
+    [fWindow registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
 }
 
 - (void) enableUI: (bool) b
 {
     NSControl * controls[] =
-    { fSrcTitleField, fSrcTitlePopUp,
+    {
+        fSrcTitleField, fSrcTitlePopUp,
         fSrcChapterField, fSrcChapterStartPopUp, fSrcChapterToField,
         fSrcChapterEndPopUp, fSrcDuration1Field, fSrcDuration2Field,
         fDstFormatField, fDstFormatPopUp, fDstFile1Field, fDstFile2Field,
-        fDstBrowseButton, fVidRateField, fVidRatePopUp,fVidEncoderField, fVidEncoderPopUp, fVidQualityField,
-        fPictureSizeField,fPictureCroppingField, fVideoFiltersField,fVidQualityMatrix, fSubField, fSubPopUp,
-        fQueueStatus,fPresetsAdd,fPresetsDelete,fSrcAngleLabel,fSrcAnglePopUp,
-		fCreateChapterMarkers,fVidTurboPassCheck,fDstMp4LargeFileCheck,fSubForcedCheck,fPresetsOutlineView,
-        fDstMp4HttpOptFileCheck,fDstMp4iPodFileCheck,fVidQualityRFField,fVidQualityRFLabel,
-        fEncodeStartStopPopUp,fSrcTimeStartEncodingField,fSrcTimeEndEncodingField,fSrcFrameStartEncodingField,
-        fSrcFrameEndEncodingField, fLoadChaptersButton, fSaveChaptersButton, fFramerateMatrix};
-    
-    for( unsigned i = 0;
-        i < sizeof( controls ) / sizeof( NSControl * ); i++ )
-    {
-        if( [[controls[i] className] isEqualToString: @"NSTextField"] )
-        {
-            NSTextField * tf = (NSTextField *) controls[i];
-            if( ![tf isBezeled] )
-            {
-                [tf setTextColor: b ? [NSColor controlTextColor] :
-                 [NSColor disabledControlTextColor]];
+        fDstBrowseButton, fVidRateField, fVidRatePopUp, fVidEncoderField,
+        fVidEncoderPopUp, fVidQualityField, fVidQualityMatrix,
+        fPictureSettingsField, fPictureFiltersField,
+        fSubField, fSubPopUp, fPresetsAdd, fPresetsDelete, fSrcAngleLabel,
+        fSrcAnglePopUp, fCreateChapterMarkers, fVidTurboPassCheck,
+        fDstMp4LargeFileCheck, fSubForcedCheck, fPresetsOutlineView,
+        fDstMp4HttpOptFileCheck, fDstMp4iPodFileCheck, fVidQualityRFField,
+        fVidQualityRFLabel, fEncodeStartStopPopUp, fSrcTimeStartEncodingField,
+        fSrcTimeEndEncodingField, fSrcFrameStartEncodingField,
+        fSrcFrameEndEncodingField, fLoadChaptersButton, fSaveChaptersButton,
+        fFramerateMatrix,
+        
+    };
+    for (unsigned i = 0; i < (sizeof(controls) / sizeof(NSControl*)); i++)
+    {
+        if ([[controls[i] className] isEqualToString: @"NSTextField"])
+        {
+            NSTextField *tf = (NSTextField*)controls[i];
+            if (![tf isBezeled])
+            {
+                [tf setTextColor: (b ?
+                                   [NSColor controlTextColor] :
+                                   [NSColor disabledControlTextColor])];
                 continue;
             }
         }
         [controls[i] setEnabled: b];
-        
     }
+   
     
 	if (b) 
     {
@@ -628,88 +800,33 @@
     }
     
     [self videoMatrixChanged:nil];
-    [fAdvancedOptions enableUI:b];
+    [self enableX264Widgets:b];
 }
 
 
 /***********************************************************************
- * UpdateDockIcon
+ * updateDockIcon
  ***********************************************************************
- * Shows a progression bar on the dock icon, filled according to
- * 'progress' (0.0 <= progress <= 1.0).
- * Called with progress < 0.0 or progress > 1.0, restores the original
- * icon.
+ * Updates two DockTextFields on the dockTile,
+ * one with total percentage, the other one with the ETA.
+ * The ETA string is formated by the callers
  **********************************************************************/
-- (void) UpdateDockIcon: (float) progress
+- (void) updateDockIcon: (double) progress withETA:(NSString*)etaStr
 {
-    NSData * tiff;
-    NSBitmapImageRep * bmp;
-    uint32_t * pen;
-    uint32_t black = htonl( 0x000000FF );
-    uint32_t red   = htonl( 0xFF0000FF );
-    uint32_t white = htonl( 0xFFFFFFFF );
-    int row_start, row_end;
-    int i, j;
-
-    if( progress < 0.0 || progress > 1.0 )
+    if (progress < 0.0 || progress > 1.0)
     {
-        [NSApp setApplicationIconImage: fApplicationIcon];
-        return;
-    }
-
-    /* Get it in a raw bitmap form */
-    tiff = [fApplicationIcon TIFFRepresentationUsingCompression:
-            NSTIFFCompressionNone factor: 1.0];
-    bmp = [NSBitmapImageRep imageRepWithData: tiff];
-    
-    /* Draw the progression bar */
-    /* It's pretty simple (ugly?) now, but I'm no designer */
-
-    row_start = 3 * (int) [bmp size].height / 4;
-    row_end   = 7 * (int) [bmp size].height / 8;
-
-    for( i = row_start; i < row_start + 2; i++ )
-    {
-        pen = (uint32_t *) ( [bmp bitmapData] + i * [bmp bytesPerRow] );
-        for( j = 0; j < (int) [bmp size].width; j++ )
-        {
-            pen[j] = black;
-        }
-    }
-    for( i = row_start + 2; i < row_end - 2; i++ )
-    {
-        pen = (uint32_t *) ( [bmp bitmapData] + i * [bmp bytesPerRow] );
-        pen[0] = black;
-        pen[1] = black;
-        for( j = 2; j < (int) [bmp size].width - 2; j++ )
-        {
-            if( j < 2 + (int) ( ( [bmp size].width - 4.0 ) * progress ) )
-            {
-                pen[j] = red;
-            }
-            else
-            {
-                pen[j] = white;
-            }
-        }
-        pen[j]   = black;
-        pen[j+1] = black;
+        [percentField setHidden:YES];
+        [timeField setHidden:YES];
     }
-    for( i = row_end - 2; i < row_end; i++ )
+    else
     {
-        pen = (uint32_t *) ( [bmp bitmapData] + i * [bmp bytesPerRow] );
-        for( j = 0; j < (int) [bmp size].width; j++ )
-        {
-            pen[j] = black;
-        }
+        [percentField setTextToDisplay:[NSString stringWithFormat:dockTilePercentFormat,progress * 100]];
+        [percentField setHidden:NO];
+        [timeField setTextToDisplay:etaStr];
+        [timeField setHidden:NO];
     }
-
-    /* Now update the dock icon */
-    tiff = [bmp TIFFRepresentationUsingCompression:
-            NSTIFFCompressionNone factor: 1.0];
-    NSImage* icon = [[NSImage alloc] initWithData: tiff];
-    [NSApp setApplicationIconImage: icon];
-    [icon release];
+    
+    [dockTile display];
 }
 
 - (void) updateUI: (NSTimer *) timer
@@ -729,6 +846,8 @@
         [fScanIndicator setIndeterminate: NO];
         [fScanIndicator setDoubleValue: 0.0];
         [fScanIndicator setHidden: YES];
+        [fScanHorizontalLine setHidden: NO];
+        
 		[self showNewScan:nil];
 	}
     
@@ -742,11 +861,22 @@
 #define p s.param.scanning
         case HB_STATE_SCANNING:
 		{
-            [fSrcDVD2Field setStringValue: [NSString stringWithFormat:
-                                            NSLocalizedString( @"Scanning title %d of %d...", @"" ),
-                                            p.title_cur, p.title_count]];
+            if( p.preview_cur )
+            {
+                [fSrcDVD2Field setStringValue: [NSString stringWithFormat:
+                                                NSLocalizedString( @"Scanning title %d of %d, preview %d…", @"" ),
+                                                p.title_cur, p.title_count,
+                                                p.preview_cur]];
+            }
+            else
+            {
+                [fSrcDVD2Field setStringValue: [NSString stringWithFormat:
+                                                NSLocalizedString( @"Scanning title %d of %d…", @"" ),
+                                                p.title_cur, p.title_count]];
+            }
             [fScanIndicator setHidden: NO];
-            [fScanIndicator setDoubleValue: 100.0 * ((double)( p.title_cur - 1 ) / p.title_count)];
+            [fScanHorizontalLine setHidden: YES];
+            [fScanIndicator setDoubleValue: 100.0 * p.progress];
             break;
 		}
 #undef p
@@ -757,6 +887,7 @@
             [fScanIndicator setIndeterminate: NO];
             [fScanIndicator setDoubleValue: 0.0];
             [fScanIndicator setHidden: YES];
+            [fScanHorizontalLine setHidden: NO];
 			[self writeToActivityLog:"ScanDone state received from fHandle"];
             [self showNewScan:nil];
             [[fWindow toolbar] validateVisibleItems];
@@ -814,14 +945,23 @@
 #define p s.param.scanning
         case HB_STATE_SCANNING:
 		{
-            [fStatusField setStringValue: [NSString stringWithFormat:
-                                           NSLocalizedString( @"Queue Scanning title %d of %d...", @"" ),
-                                           p.title_cur, p.title_count]];
-            
-            /* Set the status string in fQueueController as well */                               
-            [fQueueController setQueueStatusString: [NSString stringWithFormat:
-                                                     NSLocalizedString( @"Queue Scanning title %d of %d...", @"" ),
-                                                     p.title_cur, p.title_count]];
+            NSString *scan_status;
+            if( p.preview_cur )
+            {
+                scan_status = [NSString stringWithFormat:
+                               NSLocalizedString( @"Queue Scanning title %d of %d, preview %d…", @"" ),
+                               p.title_cur, p.title_count, p.preview_cur];
+            }
+            else
+            {
+                scan_status = [NSString stringWithFormat:
+                               NSLocalizedString( @"Queue Scanning title %d of %d…", @"" ),
+                               p.title_cur, p.title_count];
+            }
+            [fStatusField setStringValue: scan_status];
+            
+            /* Set the status string in fQueueController as well */
+            [fQueueController setQueueStatusString: scan_status];
             break;
 		}
 #undef p
@@ -847,14 +987,19 @@
             
             /* Update text field */
             pass_desc = @"";
-            //string = [NSMutableString stringWithFormat: NSLocalizedString( @"Searching for start point: pass %d %@ of %d, %.2f %%", @"" ), p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
-            /* For now, do not announce "pass x of x for the search phase ... */
-            string = [NSMutableString stringWithFormat: NSLocalizedString( @"Searching for start point ... :  %.2f %%", @"" ), 100.0 * p.progress];
+            //string = [NSMutableString stringWithFormat:
+            //          NSLocalizedString( @"Searching for start point: pass %d %@ of %d, %.2f %%", @"" ),
+            //          p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
+            /* For now, do not announce "pass x of x for the search phase */
+            string = [NSMutableString stringWithFormat:
+                      NSLocalizedString( @"Searching for start point… :  %.2f %%", @"" ),
+                      100.0 * p.progress];
             
-			if( p.seconds > -1 )
+            if( p.seconds > -1 )
             {
                 [string appendFormat:
-                 NSLocalizedString( @" (ETA %02dh%02dm%02ds)", @"" ), p.hours, p.minutes, p.seconds];
+                 NSLocalizedString( @" (ETA %02dh%02dm%02ds)", @"" ),
+                 p.hours, p.minutes, p.seconds];
             }
             
             [fStatusField setStringValue: string];
@@ -908,13 +1053,36 @@
                 pass_desc = @"";
             }
             
-			string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
             
-			if( p.seconds > -1 )
+            if ([pass_desc length])
             {
-                [string appendFormat:
-                 NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ),
-                 p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds];
+                string = [NSMutableString stringWithFormat:
+                          NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ),
+                          currentQueueEncodeNameString,
+                          p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
+            }
+            else
+            {
+                string = [NSMutableString stringWithFormat:
+                          NSLocalizedString( @"Encoding: %@ \nPass %d of %d, %.2f %%", @"" ),
+                          currentQueueEncodeNameString,
+                          p.job_cur, p.job_count, 100.0 * p.progress];
+            }
+            
+            if( p.seconds > -1 )
+            {
+                if ( p.rate_cur > 0.0 )
+                {
+                    [string appendFormat:
+                     NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ),
+                     p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds];
+                }
+                else
+                {
+                    [string appendFormat:
+                     NSLocalizedString( @" (ETA %02dh%02dm%02ds)", @"" ),
+                     p.hours, p.minutes, p.seconds];
+                }
             }
             [fStatusField setStringValue: string];
             [fQueueController setQueueStatusString:string];
@@ -943,8 +1111,22 @@
             /* Update dock icon */
             if( dockIconProgress < 100.0 * progress_total )
             {
-                [self UpdateDockIcon: progress_total];
-                dockIconProgress += 5;
+                // ETA format is [XX]X:XX:XX when ETA is greater than one hour
+                // [X]X:XX when ETA is greater than 0 (minutes or seconds)
+                // When these conditions doesn't applied (eg. when ETA is undefined)
+                // we show just a tilde (~)
+                
+                NSString *etaStr = @"";
+                if (p.hours > 0)
+                    etaStr = [NSString stringWithFormat:@"%d:%02d:%02d", p.hours, p.minutes, p.seconds];
+                else if (p.minutes > 0 || p.seconds > 0)
+                    etaStr = [NSString stringWithFormat:@"%d:%02d", p.minutes, p.seconds];
+                else
+                    etaStr = @"~";
+                
+                [self updateDockIcon:progress_total withETA:etaStr];
+
+                dockIconProgress += dockTileUpdateFrequency;
             }
             
             break;
@@ -955,15 +1137,15 @@
         case HB_STATE_MUXING:
         {
             /* Update text field */
-            [fStatusField setStringValue: NSLocalizedString( @"Muxing...", @"" )];
+            [fStatusField setStringValue: NSLocalizedString( @"Muxing…", @"" )];
             /* Set the status string in fQueueController as well */
-            [fQueueController setQueueStatusString: NSLocalizedString( @"Muxing...", @"" )];
+            [fQueueController setQueueStatusString: NSLocalizedString( @"Muxing…", @"" )];
             /* Update slider */
             [fRipIndicator setIndeterminate: YES];
             [fRipIndicator startAnimation: nil];
             
             /* Update dock icon */
-            [self UpdateDockIcon: 1.0];
+            [self updateDockIcon:1.0 withETA:@""];
             
 			break;
         }
@@ -991,7 +1173,7 @@
             [[fWindow toolbar] validateVisibleItems];
             
             /* Restore dock icon */
-            [self UpdateDockIcon: -1.0];
+            [self updateDockIcon:-1.0 withETA:@""];
             dockIconProgress = 0;
             
             if( fRipIndicatorShown )
@@ -1059,7 +1241,49 @@
     {
         [fAudioAutoPassthruBox setHidden:YES];
     }
+ 
     
+    // Finally after all UI updates, we look for a next dragDropItem to scan
+    // fWillScan will signal that a scan will be launched, so we need to wait
+    // the next idle cycle after the scan
+    hb_get_state( fHandle, &s );
+    if (s.state == HB_STATE_IDLE && !fWillScan)
+    {
+        // Continue to loop on the other drag & drop files if any
+        if ([[NSUserDefaults standardUserDefaults] objectForKey:dragDropFiles])
+        {
+            NSMutableArray *filesList = [[NSMutableArray alloc] initWithArray:[[NSUserDefaults standardUserDefaults] objectForKey:dragDropFiles]];
+        
+            if (filesList.count > 0)
+            {
+                // We need to add the previous scan file into the queue (without doing the usual checks)
+                // Before scanning the new one
+                [self doAddToQueue];
+                
+                id nextItem = [filesList objectAtIndex:0];
+                [filesList removeObjectAtIndex:0];
+            
+                [browsedSourceDisplayName release];
+                browsedSourceDisplayName = [[((NSString*)nextItem) lastPathComponent] retain];
+                [self performScan:nextItem scanTitleNum:0];
+            
+                if (filesList.count > 0)
+                {
+                    // Updating the list in the user defaults
+                    [[NSUserDefaults standardUserDefaults] setObject:filesList forKey:dragDropFiles];
+                }
+                else
+                {
+                    // Cleaning if last one was treated
+                    [[NSUserDefaults standardUserDefaults] removeObjectForKey:dragDropFiles];
+                }
+            }
+            else
+            {
+                [[NSUserDefaults standardUserDefaults] removeObjectForKey:dragDropFiles];
+            }
+        }
+    }
 }
 
 /* We use this to write messages to stderr from the macgui which show up in the activity window and log*/
@@ -1106,7 +1330,7 @@
         [item setLabel: @"Toggle Presets"];
         [item setPaletteLabel: @"Toggler Presets"];
         [item setToolTip: @"Open/Close Preset Drawer"];
-        [item setImage: [NSImage imageNamed: @"Drawer"]];
+        [item setImage: [NSImage imageNamed: @"presets"]];
         [item setTarget: self];
         [item setAction: @selector(toggleDrawer:)];
         [item setAutovalidates: NO];
@@ -1116,7 +1340,7 @@
         [item setLabel: @"Start"];
         [item setPaletteLabel: @"Start Encoding"];
         [item setToolTip: @"Start Encoding"];
-        [item setImage: [NSImage imageNamed: @"Play"]];
+        [item setImage: [NSImage imageNamed: @"encode"]];
         [item setTarget: self];
         [item setAction: @selector(Rip:)];
     }
@@ -1125,7 +1349,7 @@
         [item setLabel: @"Show Queue"];
         [item setPaletteLabel: @"Show Queue"];
         [item setToolTip: @"Show Queue"];
-        [item setImage: [NSImage imageNamed: @"Queue"]];
+        [item setImage: [NSImage imageNamed: @"showqueue"]];
         [item setTarget: self];
         [item setAction: @selector(showQueueWindow:)];
         [item setAutovalidates: NO];
@@ -1135,7 +1359,7 @@
         [item setLabel: @"Add to Queue"];
         [item setPaletteLabel: @"Add to Queue"];
         [item setToolTip: @"Add to Queue"];
-        [item setImage: [NSImage imageNamed: @"AddToQueue"]];
+        [item setImage: [NSImage imageNamed: @"addqueue"]];
         [item setTarget: self];
         [item setAction: @selector(addToQueue:)];
     }
@@ -1144,7 +1368,7 @@
         [item setLabel: @"Pause"];
         [item setPaletteLabel: @"Pause Encoding"];
         [item setToolTip: @"Pause Encoding"];
-        [item setImage: [NSImage imageNamed: @"Pause"]];
+        [item setImage: [NSImage imageNamed: @"pauseencode"]];
         [item setTarget: self];
         [item setAction: @selector(Pause:)];
     }
@@ -1153,7 +1377,7 @@
         [item setLabel: @"Picture Settings"];
         [item setPaletteLabel: @"Show Picture Settings"];
         [item setToolTip: @"Show Picture Settings"];
-        [item setImage: [NSImage imageNamed: @"pref-picture"]];
+        [item setImage: [NSImage imageNamed: @"picturesettings"]];
         [item setTarget: self];
         [item setAction: @selector(showPicturePanel:)];
     }
@@ -1163,7 +1387,7 @@
         [item setPaletteLabel: @"Show Preview"];
         [item setToolTip: @"Show Preview"];
         //[item setImage: [NSImage imageNamed: @"pref-picture"]];
-        [item setImage: [NSImage imageNamed: @"Brushed_Window"]];
+        [item setImage: [NSImage imageNamed: @"preview"]];
         [item setTarget: self];
         [item setAction: @selector(showPreviewWindow:)];
     }
@@ -1172,7 +1396,7 @@
         [item setLabel: @"Activity Window"];
         [item setPaletteLabel: @"Show Activity Window"];
         [item setToolTip: @"Show Activity Window"];
-        [item setImage: [NSImage imageNamed: @"ActivityWindow"]];
+        [item setImage: [NSImage imageNamed: @"activity"]];
         [item setTarget: self];
         [item setAction: @selector(showDebugOutputPanel:)];
         [item setAutovalidates: NO];
@@ -1182,7 +1406,7 @@
         [item setLabel: @"Source"];
         [item setPaletteLabel: @"Source"];
         [item setToolTip: @"Choose Video Source"];
-        [item setImage: [NSImage imageNamed: @"Source"]];
+        [item setImage: [NSImage imageNamed: @"source"]];
         [item setTarget: self];
         [item setAction: @selector(browseSources:)];
     }
@@ -1223,7 +1447,7 @@
             
             if ([ident isEqualToString: ChooseSourceIdentifier])
             {
-                [toolbarItem setImage: [NSImage imageNamed: @"Stop"]];
+                [toolbarItem setImage: [NSImage imageNamed: @"stopencode"]];
                 [toolbarItem setLabel: @"Cancel Scan"];
                 [toolbarItem setPaletteLabel: @"Cancel Scanning"];
                 [toolbarItem setToolTip: @"Cancel Scanning Source"];
@@ -1237,7 +1461,7 @@
         {
             if ([ident isEqualToString: ChooseSourceIdentifier])
             {
-                [toolbarItem setImage: [NSImage imageNamed: @"Source"]];
+                [toolbarItem setImage: [NSImage imageNamed: @"source"]];
                 [toolbarItem setLabel: @"Source"];
                 [toolbarItem setPaletteLabel: @"Source"];
                 [toolbarItem setToolTip: @"Choose Video Source"];
@@ -1251,7 +1475,7 @@
         {
             if ([ident isEqualToString: StartEncodingIdentifier])
             {
-                [toolbarItem setImage: [NSImage imageNamed: @"Stop"]];
+                [toolbarItem setImage: [NSImage imageNamed: @"stopencode"]];
                 [toolbarItem setLabel: @"Stop"];
                 [toolbarItem setPaletteLabel: @"Stop"];
                 [toolbarItem setToolTip: @"Stop Encoding"];
@@ -1259,7 +1483,7 @@
             }
             if ([ident isEqualToString: PauseEncodingIdentifier])
             {
-                [toolbarItem setImage: [NSImage imageNamed: @"Pause"]];
+                [toolbarItem setImage: [NSImage imageNamed: @"pauseencode"]];
                 [toolbarItem setLabel: @"Pause"];
                 [toolbarItem setPaletteLabel: @"Pause Encoding"];
                 [toolbarItem setToolTip: @"Pause Encoding"];
@@ -1279,7 +1503,7 @@
         {
             if ([ident isEqualToString: PauseEncodingIdentifier])
             {
-                [toolbarItem setImage: [NSImage imageNamed: @"Play"]];
+                [toolbarItem setImage: [NSImage imageNamed: @"encode"]];
                 [toolbarItem setLabel: @"Resume"];
                 [toolbarItem setPaletteLabel: @"Resume Encoding"];
                 [toolbarItem setToolTip: @"Resume Encoding"];
@@ -1300,7 +1524,7 @@
         {
             if ([ident isEqualToString: StartEncodingIdentifier])
             {
-                [toolbarItem setImage: [NSImage imageNamed: @"Play"]];
+                [toolbarItem setImage: [NSImage imageNamed: @"encode"]];
                 if (hb_count(fHandle) > 0)
                     [toolbarItem setLabel: @"Start Queue"];
                 else
@@ -1415,13 +1639,13 @@
 -(void)showGrowlDoneNotification:(NSString *) filePath
 {
     /* This end of encode action is called as each encode rolls off of the queue */
-    /* Setup the Growl stuff ... */
+    /* Setup the Growl stuff */
     NSString * finishedEncode = filePath;
     /* strip off the path to just show the file name */
     finishedEncode = [finishedEncode lastPathComponent];
     NSString * growlMssg = [NSString stringWithFormat: @"your HandBrake encode %@ is done!",finishedEncode];
     [GrowlApplicationBridge 
-     notifyWithTitle:@"Put down that cocktail..." 
+     notifyWithTitle:@"Put down that cocktail…" 
      description:growlMssg 
      notificationName:SERVICE_NAME
      iconData:nil 
@@ -1460,7 +1684,7 @@
     {
         /*On Screen Notification*/
         int status;
-        status = NSRunAlertPanel(@"Put down that cocktail...",@"Your HandBrake queue is done!", @"OK", nil, nil);
+        status = NSRunAlertPanel(@"Put down that cocktail…",@"Your HandBrake queue is done!", @"OK", nil, nil);
         [NSApp requestUserAttention:NSCriticalRequest];
     }
     
@@ -1684,8 +1908,9 @@
     if(sender == fScanSrcTitleOpenButton)
     {
         /* We setup the scan status in the main window to indicate a source title scan */
-        [fSrcDVD2Field setStringValue: @"Opening a new source title ..."];
-		[fScanIndicator setHidden: NO];
+        [fSrcDVD2Field setStringValue: @"Opening a new source title…"];
+        [fScanIndicator setHidden: NO];
+        [fScanHorizontalLine setHidden: YES];
         [fScanIndicator setIndeterminate: YES];
         [fScanIndicator startAnimation: nil];
 		
@@ -1700,10 +1925,8 @@
 /* Here we actually tell hb_scan to perform the source scan, using the path to source and title number*/
 - (void) performScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum
 {
-    
     /* use a bool to determine whether or not we can decrypt using vlc */
     BOOL cancelScanDecrypt = 0;
-    BOOL vlcFound = 0;
     NSString *path = scanPath;
     HBDVDDetector *detector = [HBDVDDetector detectorForPath:path];
     
@@ -1732,33 +1955,40 @@
         path = [detector devicePath];
         [self writeToActivityLog: "trying to open a physical dvd at: %s", [scanPath UTF8String]];
         
-        /* lets check for vlc here to make sure we have a dylib available to use for decrypting */
+        
+        NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+        NSInteger suppressWarning = [prefs integerForKey:@"suppresslibdvdcss"];
+        
+        /* Notify the user that we don't support removal of copy proteciton. */
         void *dvdcss = dlopen("libdvdcss.2.dylib", RTLD_LAZY);
-        if (dvdcss == NULL) 
+        if (dvdcss == NULL && suppressWarning != 1)
         {
+            /* Only show the user this warning once. They may be using a solution we don't know about. Notifying them each time is annoying. */
+            [prefs setInteger:1 forKey:@"suppresslibdvdcss"];
+            
             /*compatible vlc not found, so we set the bool to cancel scanning to 1 */
             cancelScanDecrypt = 1;
             [self writeToActivityLog: "libdvdcss.2.dylib not found for decrypting physical dvd"];
             int status;
-            status = NSRunAlertPanel(@"HandBrake could not find a compatible version of libdvdcss (32-bit libdvdcss is not compatible with 64-bit HandBrake and vice-versa).",
-                                     @"Please download and install libdvdcss.pkg if you wish to read encrypted DVDs.", @"Get libdvdcss.pkg", @"Cancel Scan", @"Attempt Scan Anyway");
+            status = NSRunAlertPanel(@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish install libdvdcss or any other 3rd party software for this function.",
+                                     @"Videolan.org provides libdvdcss if you are not currently using another solution.", @"Get libdvdcss.pkg", @"Cancel Scan", @"Attempt Scan Anyway");
             [NSApp requestUserAttention:NSCriticalRequest];
             
             if (status == NSAlertDefaultReturn)
             {
                 /* User chose to go download vlc (as they rightfully should) so we send them to the vlc site */
-                [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://download.videolan.org/libdvdcss/last/macosx/"]];
+                [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://download.videolan.org/libdvdcss/1.2.12/macosx/"]];
             }
             else if (status == NSAlertAlternateReturn)
             {
                 /* User chose to cancel the scan */
-                [self writeToActivityLog: "cannot open physical dvd, scan cancelled"];
+                [self writeToActivityLog: "Cannot open physical dvd, scan cancelled"];
             }
             else
             {
                 /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
                 cancelScanDecrypt = 0;
-                [self writeToActivityLog: "user overrode dvdcss warning - trying to open physical dvd without decryption"];
+                [self writeToActivityLog: "User overrode copy-proteciton warning - trying to open physical dvd without decryption"];
             }
             
         }
@@ -1766,18 +1996,23 @@
         {
             /* VLC was found in /Applications so all is well, we can carry on using vlc's libdvdcss.dylib for decrypting if needed */
             [self writeToActivityLog: "libdvdcss.2.dylib found for decrypting physical dvd"];
-            vlcFound = 1;
             dlclose(dvdcss);
         }
     }
     
     if (cancelScanDecrypt == 0)
     {
-        /* we actually pass the scan off to libhb here */
-        /* If there is no title number passed to scan, we use "0"
-         * which causes the default behavior of a full source scan
-         */
-        if (!scanTitleNum)
+        /* We use our advanced pref to determine how many previews to scan */
+        int hb_num_previews = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
+        /* We use our advanced pref to determine the minimum title length to use in seconds*/
+        int min_title_duration_seconds = [[[NSUserDefaults standardUserDefaults] objectForKey:@"MinTitleScanSeconds"] intValue];
+        uint64_t min_title_duration_ticks = 90000LL * min_title_duration_seconds;
+        /* set title to NULL */
+        fTitle = NULL;
+        /* We actually pass the scan off to libhb here.
+         * If there is no title number passed to scan, we use 0
+         * which causes the default behavior of a full source scan */
+        if (scanTitleNum < 0)
         {
             scanTitleNum = 0;
         }
@@ -1785,32 +2020,40 @@
         {
             [self writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
         }
-        /* We use our advanced pref to determine how many previews to scan */
-        int hb_num_previews = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
-        /* We use our advanced pref to determine the minimum title length to use in seconds*/
-        uint64_t min_title_duration_seconds = 90000L * [[[NSUserDefaults standardUserDefaults] objectForKey:@"MinTitleScanSeconds"] intValue];
-        /* set title to NULL */
-        fTitle = NULL;
-        [self writeToActivityLog: "Minimum length of title for scan: %d", min_title_duration_seconds];
-        hb_scan( fHandle, [path UTF8String], scanTitleNum, hb_num_previews, 1 , min_title_duration_seconds );
-        [fSrcDVD2Field setStringValue:@"Scanning new source ..."];
+        else
+        {
+            // minimum title duration doesn't apply to title-specific scan
+            // it doesn't apply to batch scan either, but we can't tell it apart from DVD & BD folders here
+            [self writeToActivityLog: "scanning titles with a duration of %d seconds or more", min_title_duration_seconds];
+        }
+        
+        hb_system_sleep_prevent(fHandle);
+        hb_scan(fHandle, [path UTF8String], scanTitleNum, hb_num_previews, 1 ,
+                min_title_duration_ticks);
+        
+        [fSrcDVD2Field setStringValue:@"Scanning new source…"];
+
+        // After the scan process, we signal to enableUI loop that this scan process is now finished
+        // If remaining drag & drop files are in the UserDefaults array, they will then be processed
+        fWillScan = NO;
     }
 }
 
 - (IBAction) cancelScanning:(id)sender
 {
     hb_scan_stop(fHandle);
+    hb_system_sleep_allow(fHandle);
 }
 
 - (IBAction) showNewScan:(id)sender
 {
-    hb_list_t  * list;
+    hb_title_set_t * title_set;
 	hb_title_t * title = NULL;
 	int feature_title=0; // Used to store the main feature title
 
-        list = hb_get_titles( fHandle );
+        title_set = hb_get_title_set( fHandle );
         
-        if( !hb_list_count( list ) )
+        if( !hb_list_count( title_set->list_title ) )
         {
             /* We display a message if a valid dvd source was not chosen */
             [fSrcDVD2Field setStringValue: @"No Valid Source Found"];
@@ -1858,9 +2101,9 @@
             [[fWindow toolbar] validateVisibleItems];
             
             [fSrcTitlePopUp removeAllItems];
-            for( int i = 0; i < hb_list_count( list ); i++ )
+            for( int i = 0; i < hb_list_count( title_set->list_title ); i++ )
             {
-                title = (hb_title_t *) hb_list_item( list, i );
+                title = (hb_title_t *) hb_list_item( title_set->list_title, i );
                 
                 currentSource = [NSString stringWithUTF8String: title->name];
                 /*Set DVD Name at top of window with the browsedSourceDisplayName grokked right before -performScan */
@@ -1903,7 +2146,7 @@
                 }
                 
                 /* See if this is the main feature according to libhb */
-                if (title->index == title->job->feature)
+                if (title->index == title_set->feature)
                 {
                     feature_title = i;
                 }
@@ -1962,10 +2205,10 @@
                 [self applyQueueSettingsToMainWindow:nil];
                 
             }
-
-            
         }
-
+    
+    /* Done scanning, allow system sleep for the scan handle */
+    hb_system_sleep_allow(fHandle);
 }
 
 
@@ -2271,7 +2514,7 @@
     [queueFileJob setObject:[NSNumber numberWithInt:title->index] forKey:@"TitleNumber"];
     [queueFileJob setObject:[NSNumber numberWithInt:[fSrcAnglePopUp indexOfSelectedItem] + 1] forKey:@"TitleAngle"];
     
-    /* Determine and set a variable to tell hb what start and stop times to use ... chapters vs seconds */
+    /* Determine and set a variable to tell hb what start and stop times to use (chapters, seconds or frames) */
     if( [fEncodeStartStopPopUp indexOfSelectedItem] == 0 )
     {
         [queueFileJob setObject:[NSNumber numberWithInt:0] forKey:@"fEncodeStartStop"];    
@@ -2323,19 +2566,7 @@
      * in our queue, so they can be reapplied in prepareJob when this queue
      * item comes up if Chapter Markers is set to on.
      */
-     int i;
-     NSMutableArray *ChapterNamesArray = [[NSMutableArray alloc] init];
-     int chaptercount = hb_list_count( fTitle->list_chapter );
-     for( i = 0; i < chaptercount; i++ )
-    {
-        hb_chapter_t *chapter = (hb_chapter_t *) hb_list_item( fTitle->list_chapter, i );
-        if( chapter != NULL )
-        {
-          [ChapterNamesArray addObject:[NSString stringWithCString:chapter->title encoding:NSUTF8StringEncoding]];
-        }
-    }
-    [queueFileJob setObject:[NSMutableArray arrayWithArray: ChapterNamesArray] forKey:@"ChapterNames"];
-    [ChapterNamesArray autorelease];
+    [queueFileJob setObject:[fChapterTitlesDelegate chapterTitlesArray] forKey:@"ChapterNames"];
     
     /* Allow Mpeg4 64 bit formatting +4GB file sizes */
 	[queueFileJob setObject:[NSNumber numberWithInt:[fDstMp4LargeFileCheck state]] forKey:@"Mp4LargeFile"];
@@ -2347,8 +2578,25 @@
     /* Codecs */
 	/* Video encoder */
 	[queueFileJob setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
-	/* x264 Option String */
-	[queueFileJob setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
+	
+    /* x264 advanced options */
+    if ([fX264UseAdvancedOptionsCheck state])
+    {
+        // we are using the advanced panel
+        [queueFileJob setObject:[NSNumber numberWithInt:1]       forKey: @"x264UseAdvancedOptions"];
+        [queueFileJob setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
+    }
+    else
+    {
+        // we are using the x264 preset system
+        [queueFileJob setObject:[NSNumber numberWithInt:0] forKey: @"x264UseAdvancedOptions"];
+        [queueFileJob setObject:[self x264Preset]          forKey: @"x264Preset"];
+        [queueFileJob setObject:[self x264Tune]            forKey: @"x264Tune"];
+        [queueFileJob setObject:[self x264OptionExtra]     forKey: @"x264OptionExtra"];
+        [queueFileJob setObject:[self h264Profile]         forKey: @"h264Profile"];
+        [queueFileJob setObject:[self h264Level]           forKey: @"h264Level"];
+    }
+    
     /* FFmpeg (lavc) Option String */
     [queueFileJob setObject:[fAdvancedOptions optionsStringLavc] forKey:@"lavcOption"];
 
@@ -2404,9 +2652,15 @@
         [queueFileJob setObject:[NSNumber numberWithFloat:fTitle->job->anamorphic.dar_height] forKey:@"PicturePARDisplayHeight"];
 
     }
-    NSString * pictureSummary;
-    pictureSummary = [fPictureSizeField stringValue];
-    [queueFileJob setObject:pictureSummary forKey:@"PictureSizingSummary"];                 
+
+    /* Text summaries of various settings */
+    [queueFileJob setObject:[NSString stringWithString:[self pictureSettingsSummary]]
+                     forKey:@"PictureSettingsSummary"];
+    [queueFileJob setObject:[NSString stringWithString:[self pictureFiltersSummary]]
+                     forKey:@"PictureFiltersSummary"];
+    [queueFileJob setObject:[NSString stringWithString:[self muxerOptionsSummary]]
+                     forKey:@"MuxerOptionsSummary"];
+    
     /* Set crop settings here */
 	[queueFileJob setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
     [queueFileJob setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
@@ -2444,9 +2698,7 @@
     [queueFileJob setObject:[NSNumber numberWithInt:[[fAudioFallbackPopUp selectedItem] tag]] forKey: @"JobAudioEncoderFallback"];
     
     /* Audio */
-    [self writeToActivityLog: "createQueueFileItem: Getting Audio from prepareAudioForQueueFileJob ..."];
     [fAudioDelegate prepareAudioForQueueFileJob: queueFileJob];
-    [self writeToActivityLog: "createQueueFileItem: Returned getting audio from prepareAudioForQueueFileJob"];
     
 	/* Subtitles */
     NSMutableArray *subtitlesArray = [[NSMutableArray alloc] initWithArray:[fSubtitlesDelegate getSubtitleArray] copyItems:YES];
@@ -2562,7 +2814,12 @@
     else
     {
         [self writeToActivityLog: "incrementQueueItemDone there are no more pending encodes"];
-        /*Since there are no more items to encode, go to queueCompletedAlerts for user specified alerts after queue completed*/
+        /* Done encoding, allow system sleep for the encode handle */
+        hb_system_sleep_allow(fQueueEncodeLibhb);
+        /*
+         * Since there are no more items to encode, go to queueCompletedAlerts
+         * for user specified alerts after queue completed
+         */
         [self queueCompletedAlerts];
     }
 }
@@ -2587,58 +2844,13 @@
      */
     NSString *path = scanPath;
     HBDVDDetector *detector = [HBDVDDetector detectorForPath:path];
-    
-    if( [detector isVideoDVD] )
-    {
-        // The chosen path was actually on a DVD, so use the raw block
-        // device path instead.
-        path = [detector devicePath];
-        [self writeToActivityLog: "trying to open a physical dvd at: %s", [scanPath UTF8String]];
-
-        /* lets check for vlc here to make sure we have a dylib available to use for decrypting */
-        void *dvdcss = dlopen("libdvdcss.2.dylib", RTLD_LAZY);
-        if (dvdcss == NULL) 
-        {
-            /*vlc not found in /Applications so we set the bool to cancel scanning to 1 */
-            cancelScanDecrypt = 1;
-            [self writeToActivityLog: "VLC app not found for decrypting physical dvd"];
-            int status;
-            status = NSRunAlertPanel(@"HandBrake could not find VLC.",@"Please download and install VLC media player in your /Applications folder if you wish to read encrypted DVDs.", @"Get VLC", @"Cancel Scan", @"Attempt Scan Anyway");
-            [NSApp requestUserAttention:NSCriticalRequest];
-            
-            if (status == NSAlertDefaultReturn)
-            {
-                /* User chose to go download vlc (as they rightfully should) so we send them to the vlc site */
-                [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.videolan.org/"]];
-            }
-            else if (status == NSAlertAlternateReturn)
-            {
-            /* User chose to cancel the scan */
-            [self writeToActivityLog: "cannot open physical dvd , scan cancelled"];
-            }
-            else
-            {
-            /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
-            cancelScanDecrypt = 0;
-            [self writeToActivityLog: "user overrode vlc warning -trying to open physical dvd without decryption"];
-            }
-
-        }
-        else
-        {
-            /* VLC was found in /Applications so all is well, we can carry on using vlc's libdvdcss.dylib for decrypting if needed */
-            dlclose(dvdcss);
-            [self writeToActivityLog: "VLC app found for decrypting physical dvd"];
-        }
-    }
 
     if (cancelScanDecrypt == 0)
     {
-        /* we actually pass the scan off to libhb here */
-        /* If there is no title number passed to scan, we use "0"
-         * which causes the default behavior of a full source scan
-         */
-        if (!scanTitleNum)
+        /* We actually pass the scan off to libhb here.
+         * If there is no title number passed to scan, we use "0"
+         * which causes the default behavior of a full source scan */
+        if (scanTitleNum < 0)
         {
             scanTitleNum = 0;
         }
@@ -2646,10 +2858,13 @@
         {
             [self writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
         }
-        
-        /* Only scan 10 previews before an encode - additional previews are only useful for autocrop and static previews,
-         * which are already taken care of at this point */
-        hb_scan( fQueueEncodeLibhb, [path UTF8String], scanTitleNum, 10, 0, 0 );
+        /*
+         * Only scan 10 previews before an encode - additional previews are
+         * only useful for autocrop and static previews, which are already taken
+         * care of at this point
+         */
+        hb_system_sleep_prevent(fQueueEncodeLibhb);
+        hb_scan(fQueueEncodeLibhb, [path UTF8String], scanTitleNum, 10, 0, 0);
     }
 }
 
@@ -2668,86 +2883,72 @@
     NSMutableDictionary * queueToApply = [QueueFileArray objectAtIndex:currentQueueEncodeIndex];
     [self writeToActivityLog: "Preset: %s", [[queueToApply objectForKey:@"PresetName"] UTF8String]];
     [self writeToActivityLog: "processNewQueueEncode number of passes expected is: %d", ([[queueToApply objectForKey:@"VideoTwoPass"] intValue] + 1)];
-    job->file = [[queueToApply objectForKey:@"DestinationPath"] UTF8String];
+    hb_job_set_file(job, [[queueToApply objectForKey:@"DestinationPath"] UTF8String]);
     [self prepareJob];
     
     /*
      * If scanning we need to do some extra setup of the job.
      */
-    if( job->indepth_scan == 1 )
+    if (job->indepth_scan == 1)
     {
-        char *x264opts_tmp;
-        
+        char *x264_preset_tmp   = job->x264_preset   != NULL ? strdup(job->x264_preset)   : NULL;
+        char *x264_tune_tmp     = job->x264_tune     != NULL ? strdup(job->x264_tune)     : NULL;
+        char *advanced_opts_tmp = job->advanced_opts != NULL ? strdup(job->advanced_opts) : NULL;
+        char *h264_profile_tmp  = job->h264_profile  != NULL ? strdup(job->h264_profile)  : NULL;
+        char *h264_level_tmp    = job->h264_level    != NULL ? strdup(job->h264_level)    : NULL;
         /*
          * When subtitle scan is enabled do a fast pre-scan job
          * which will determine which subtitles to enable, if any.
          */
+        hb_job_set_x264_preset  (job, NULL);
+        hb_job_set_x264_tune    (job, NULL);
+        hb_job_set_advanced_opts(job, NULL);
+        hb_job_set_h264_profile (job, NULL);
+        hb_job_set_h264_level   (job, NULL);
         job->pass = -1;
-        x264opts_tmp = job->advanced_opts;
-        
-        job->advanced_opts = NULL;
-        
-        job->indepth_scan = 1;  
-
-        
+        hb_add(fQueueEncodeLibhb, job);
         /*
-         * Add the pre-scan job
+         * reset the advanced settings
          */
-        hb_add( fQueueEncodeLibhb, job );
-        job->advanced_opts = x264opts_tmp;
+        hb_job_set_x264_preset  (job, x264_preset_tmp);
+        hb_job_set_x264_tune    (job, x264_tune_tmp);
+        hb_job_set_advanced_opts(job, advanced_opts_tmp);
+        hb_job_set_h264_profile (job, h264_profile_tmp);
+        hb_job_set_h264_level   (job, h264_level_tmp);
+        free(x264_preset_tmp);
+        free(x264_tune_tmp);
+        free(advanced_opts_tmp);
+        free(h264_profile_tmp);
+        free(h264_level_tmp);
     }
 
     
-    if( [[queueToApply objectForKey:@"VideoTwoPass"] intValue] == 1 )
+    if ([[queueToApply objectForKey:@"VideoTwoPass"] intValue] == 1)
     {
         job->indepth_scan = 0;
-        
-
-        
         job->pass = 1;
-        
-        hb_add( fQueueEncodeLibhb, job );
-        
+        hb_add(fQueueEncodeLibhb, job);
         job->pass = 2;
-        
-        if( job->vcodec == HB_VCODEC_X264 )
-        {
-            job->advanced_opts = strdup( [[queueToApply objectForKey:@"x264Option"] UTF8String] );
-        }
-        else if( job->vcodec & HB_VCODEC_FFMPEG_MASK )
-        {
-            job->advanced_opts = strdup( [[queueToApply objectForKey:@"lavcOption"] UTF8String] );
-        }
-        
-        hb_add( fQueueEncodeLibhb, job );
+        hb_add(fQueueEncodeLibhb, job);
         
     }
     else
     {
         job->indepth_scan = 0;
         job->pass = 0;
-        
-        hb_add( fQueueEncodeLibhb, job );
+        hb_add(fQueueEncodeLibhb, job);
     }
-	
+
     NSString *destinationDirectory = [[queueToApply objectForKey:@"DestinationPath"] stringByDeletingLastPathComponent];
 	[[NSUserDefaults standardUserDefaults] setObject:destinationDirectory forKey:@"LastDestinationDirectory"];
 	/* Lets mark our new encode as 1 or "Encoding" */
     [queueToApply setObject:[NSNumber numberWithInt:1] forKey:@"Status"];
     [self saveQueueFileItem];
     
-    /* we need to clean up the subtitle tracks after the job(s) have been set  */
-    int num_subtitle_tracks = hb_list_count(job->list_subtitle);
-    int ii;
-    for(ii = 0; ii < num_subtitle_tracks; ii++)
-    {
-        hb_subtitle_t * subtitle;
-        subtitle = (hb_subtitle_t *)hb_list_item(job->list_subtitle, 0);
-        
-
-        hb_list_rem(job->list_subtitle, subtitle);
-        free(subtitle);
-    }
+    /* libhb makes a copy of the job.  So we need to free any resource
+     * that were allocated in construction of the job. This empties
+     * the audio, subtitle, and filter lists */
+    hb_job_reset(job);
     
     /* We should be all setup so let 'er rip */   
     [self doRip];
@@ -2802,11 +3003,38 @@
     /* Mux mp4 with http optimization */
     [fDstMp4HttpOptFileCheck setState:[[queueToApply objectForKey:@"Mp4HttpOptimize"] intValue]];
     
-    /* Video encoder */
-    /* We set the advanced opt string here if applicable*/
+    /* video encoder */
     [fVidEncoderPopUp selectItemWithTitle:[queueToApply objectForKey:@"VideoEncoder"]];
-    [fAdvancedOptions setOptions:[queueToApply objectForKey:@"x264Option"]];
-    [fAdvancedOptions setLavcOptions:[queueToApply objectForKey:@"lavcOption"]];
+    [fAdvancedOptions setLavcOptions:     [queueToApply objectForKey:@"lavcOption"]];
+    /* advanced x264 options */
+    if ([[queueToApply objectForKey:@"x264UseAdvancedOptions"] intValue])
+    {
+        // we are using the advanced panel
+        [fAdvancedOptions setOptions:[queueToApply objectForKey:@"x264Option"]];
+        // preset does not use the x264 preset system, reset the widgets
+        [self setX264Preset:     nil];
+        [self setX264Tune:       nil];
+        [self setX264OptionExtra:[queueToApply objectForKey:@"x264Option"]];
+        [self setH264Profile:    nil];
+        [self setH264Level:      nil];
+        // enable the advanced panel and update the widgets
+        [fX264UseAdvancedOptionsCheck setState:NSOnState];
+        [self updateX264Widgets:nil];
+    }
+    else
+    {
+        // we are using the x264 preset system
+        [self setX264Preset:     [queueToApply objectForKey:@"x264Preset"]];
+        [self setX264Tune:       [queueToApply objectForKey:@"x264Tune"]];
+        [self setX264OptionExtra:[queueToApply objectForKey:@"x264OptionExtra"]];
+        [self setH264Profile:    [queueToApply objectForKey:@"h264Profile"]];
+        [self setH264Level:      [queueToApply objectForKey:@"h264Level"]];
+        // preset does not use the advanced panel, reset it
+        [fAdvancedOptions setOptions:@""];
+        // disable the advanced panel and update the widgets
+        [fX264UseAdvancedOptionsCheck setState:NSOffState];
+        [self updateX264Widgets:nil];
+    }
     
     /* Lets run through the following functions to get variables set there */
     [self videoEncoderPopUpChanged:nil];
@@ -2833,16 +3061,32 @@
     [self videoMatrixChanged:nil];
         
     /* Video framerate */
-    /* For video preset video framerate, we want to make sure that Same as source does not conflict with the
-     detected framerate in the fVidRatePopUp so we use index 0*/
     if ([[queueToApply objectForKey:@"VideoFramerate"] isEqualToString:@"Same as source"])
     {
-        [fVidRatePopUp selectItemAtIndex: 0];
+        /* Now set the Video Frame Rate Mode to either vfr or cfr according to the preset */
+        if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"vfr"])
+        {
+            [fFramerateMatrix selectCellAtRow:0 column:0]; // we want vfr
+        }
+        else
+        {
+            [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
+        }
     }
     else
     {
-        [fVidRatePopUp selectItemWithTitle:[queueToApply objectForKey:@"VideoFramerate"]];
+        /* Now set the Video Frame Rate Mode to either pfr or cfr according to the preset */
+        if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"])
+        {
+            [fFramerateMatrix selectCellAtRow:0 column:0]; // we want pfr
+        }
+        else
+        {
+            [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
+        }
     }
+    [fVidRatePopUp selectItemWithTitle:[queueToApply objectForKey:@"VideoFramerate"]];
+    [self videoFrameRateChanged:nil];
     
     /* 2 Pass Encoding */
     [fVidTwoPassCheck setState:[[queueToApply objectForKey:@"VideoTwoPass"] intValue]];
@@ -2894,19 +3138,30 @@
     
     job->modulus = [[queueToApply objectForKey:@"PictureModulus"]  intValue];
     
-    /* we check to make sure the presets width/height does not exceed the sources width/height */
-    if (fTitle->width < [[queueToApply objectForKey:@"PictureWidth"]  intValue] || fTitle->height < [[queueToApply objectForKey:@"PictureHeight"]  intValue])
+    /*
+     * if the preset specifies neither max. width nor height
+     * (both are 0), use the max. picture size
+     *
+     * if the specified non-zero dimensions exceed those of the
+     * source, also use the max. picture size (no upscaling)
+     */
+    if (([[queueToApply objectForKey:@"PictureWidth"]  intValue] <= 0 &&
+         [[queueToApply objectForKey:@"PictureHeight"] intValue] <= 0)              ||
+        ([[queueToApply objectForKey:@"PictureWidth"]  intValue] >  fTitle->width &&
+         [[queueToApply objectForKey:@"PictureHeight"] intValue] >  fTitle->height) ||
+        ([[queueToApply objectForKey:@"PictureHeight"] intValue] <= 0 &&
+         [[queueToApply objectForKey:@"PictureWidth"]  intValue] >  fTitle->width)  ||
+        ([[queueToApply objectForKey:@"PictureWidth"]  intValue] <= 0 &&
+         [[queueToApply objectForKey:@"PictureHeight"] intValue] >  fTitle->height))
     {
-        /* if so, then we use the sources height and width to avoid scaling up */
-        //job->width = fTitle->width;
-        //job->height = fTitle->height;
+        /* use the source's width/height to avoid upscaling */
         [self revertPictureSizeToMax:nil];
     }
-    else // source width/height is >= the preset height/width
+    else // source width/height is >= preset width/height
     {
-        /* we can go ahead and use the presets values for height and width */
-        job->width = [[queueToApply objectForKey:@"PictureWidth"]  intValue];
-        job->height = [[queueToApply objectForKey:@"PictureHeight"]  intValue];
+        /* use the preset values for width/height */
+        job->width  = [[queueToApply objectForKey:@"PictureWidth"]  intValue];
+        job->height = [[queueToApply objectForKey:@"PictureHeight"] intValue];
     }
     job->keep_ratio = [[queueToApply objectForKey:@"PictureKeepRatio"]  intValue];
     if (job->keep_ratio == 1)
@@ -3057,6 +3312,7 @@
     hb_title_t * title = (hb_title_t *) hb_list_item( list,
             [fSrcTitlePopUp indexOfSelectedItem] );
     hb_job_t * job = title->job;
+    hb_filter_object_t * filter;
     /* set job->angle for libdvdnav */
     job->angle = [fSrcAnglePopUp indexOfSelectedItem] + 1;
     /* Chapter selection */
@@ -3066,22 +3322,60 @@
     /* Format (Muxer) and Video Encoder */
     job->mux = [[fDstFormatPopUp selectedItem] tag];
     job->vcodec = [[fVidEncoderPopUp selectedItem] tag];
+    job->fastfirstpass = 0;
 
     job->chapter_markers = 0;
     
-	if( job->vcodec == HB_VCODEC_X264 )
+	if (job->vcodec == HB_VCODEC_X264)
     {
-		
-		/* Below Sends x264 options to the core library if x264 is selected*/
-		/* Lets use this as per Nyx, Thanks Nyx! */
-		/* For previews we ignore the turbo option for the first pass of two since we only use 1 pass */
-		job->advanced_opts = strdup( [[fAdvancedOptions optionsString] UTF8String] );
-
-        
+        /* advanced x264 options */
+        NSString   *tmpString;
+        // translate zero-length strings to NULL for libhb
+        const char *x264_preset   = NULL;
+        const char *x264_tune     = NULL;
+        const char *advanced_opts = NULL;
+        const char *h264_profile  = NULL;
+        const char *h264_level    = NULL;
+        if ([fX264UseAdvancedOptionsCheck state])
+        {
+            // we are using the advanced panel
+            if ([(tmpString = [fAdvancedOptions optionsString]) length])
+            {
+                advanced_opts = [tmpString UTF8String];
+            }
+        }
+        else
+        {
+            // we are using the x264 preset system
+            if ([(tmpString = [self x264Tune]) length])
+            {
+                x264_tune = [tmpString UTF8String];
+            }
+            if ([(tmpString = [self x264OptionExtra]) length])
+            {
+                advanced_opts = [tmpString UTF8String];
+            }
+            if ([(tmpString = [self h264Profile]) length])
+            {
+                h264_profile = [tmpString UTF8String];
+            }
+            if ([(tmpString = [self h264Level]) length])
+            {
+                h264_level = [tmpString UTF8String];
+            }
+            x264_preset = [[self x264Preset] UTF8String];
+        }
+        hb_job_set_x264_preset  (job, x264_preset);
+        hb_job_set_x264_tune    (job, x264_tune);
+        hb_job_set_advanced_opts(job, advanced_opts);
+        hb_job_set_h264_profile (job, h264_profile);
+        hb_job_set_h264_level   (job, h264_level);
     }
-    else if( job->vcodec & HB_VCODEC_FFMPEG_MASK )
+    else if (job->vcodec & HB_VCODEC_FFMPEG_MASK)
     {
-        job->advanced_opts = strdup( [[fAdvancedOptions optionsStringLavc] UTF8String] );
+        hb_job_set_advanced_opts(job,
+                                 [[fAdvancedOptions optionsStringLavc]
+                                  UTF8String]);
     }
 
     /* Video settings */
@@ -3091,31 +3385,32 @@
         /* a specific framerate has been chosen */
         job->vrate      = 27000000;
         job->vrate_base = hb_video_rates[[fVidRatePopUp indexOfSelectedItem]-1].rate;
-        /* We are not same as source so we set job->cfr to 1 
-         * to enable constant frame rate since user has specified
-         * a specific framerate */
-        if ([fFramerateMatrix selectedRow] == 0) // we are pfr if a specific framerate is set
+        if ([fFramerateMatrix selectedRow] == 1)
         {
-            job->cfr = 2;
+            // CFR
+            job->cfr = 1;
         }
         else
         {
-            job->cfr = 1;
+            // PFR
+            job->cfr = 2;
         }
     }
     else
     {
-        /* We are same as source (variable) */
+        /* same as source */
         job->vrate      = title->rate;
         job->vrate_base = title->rate_base;
-        /* We are same as source so we set job->cfr to 0 
-         * to enable true same as source framerate */
-        job->cfr = 0;
-        /* If the user specifies cfr then ... */
-        if ([fFramerateMatrix selectedRow] == 1) // we are cfr
+        if ([fFramerateMatrix selectedRow] == 1)
         {
+            // CFR
             job->cfr = 1;
         }
+        else
+        {
+            // VFR
+            job->cfr = 0;
+        }
     }
 
     switch( [[fVidQualityMatrix selectedCell] tag] )
@@ -3188,30 +3483,8 @@
             }
             else
             {
-                
-                /* for the actual source tracks, we must subtract the non source entries so 
-                 * that the menu index matches the source subtitle_list index for convenience */
-                if (i == 0)
-                {
-                    /* for the first track, the source tracks start at menu index 2 ( None is 0,
-                     * Foreign Language Search is 1) so subtract 2 */
-                    subtitle = subtitle - 2;
-                }
-                else
-                {
-                    /* for all other tracks, the source tracks start at menu index 1 (None is 0)
-                     * so subtract 1. */
-                    
-                    subtitle = subtitle - 1;
-                }
-                
-                /* We are setting a source subtitle so access the source subtitle info */  
-                hb_subtitle_t * subt;
-                
-                subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, subtitle);
-                
                 /* if we are getting the subtitles from an external srt file */
-                if ([[tempObject objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
+                if ([[tempObject objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
                 {
                     hb_subtitle_config_t sub_config;
                     
@@ -3228,39 +3501,59 @@
                     sub_config.default_track = def;
                     
                     hb_srt_add( job, &sub_config, [[tempObject objectForKey:@"subtitleTrackSrtLanguageIso3"] UTF8String]);
+                    continue;
                 }
                 
-                if (subt != NULL)
+                /* for the actual source tracks, we must subtract the non source entries so 
+                 * that the menu index matches the source subtitle_list index for convenience */
+                if( i == 0 )
+                {
+                    /* for the first track, the source tracks start at menu index 2 ( None is 0,
+                     * Foreign Language Search is 1) so subtract 2 */
+                    subtitle = subtitle - 2;
+                }
+                else
+                {
+                    /* for all other tracks, the source tracks start at menu index 1 (None is 0)
+                     * so subtract 1. */
+                    subtitle = subtitle - 1;
+                }
+                
+                /* We are setting a source subtitle so access the source subtitle info */  
+                hb_subtitle_t * subt = (hb_subtitle_t *) hb_list_item( title->list_subtitle, subtitle );
+                
+                if( subt != NULL )
                 {
                     hb_subtitle_config_t sub_config = subt->config;
                     
-                    if ( !burned && subt->format == PICTURESUB )
+                    if( !burned && hb_subtitle_can_pass( subt->source, job->mux ) )
                     {
                         sub_config.dest = PASSTHRUSUB;
                     }
-                    else if ( burned && subt->format == PICTURESUB )
+                    else if( hb_subtitle_can_burn( subt->source ) )
                     {
                         // Only allow one subtitle to be burned into the video
-                        if (one_burned)
+                        if( one_burned )
                             continue;
                         one_burned = TRUE;
-                    }
-                    
-                    /* Besides VOBSUBS we can also burn in SSA text subs */
-                    if (subt->source == SSASUB && burned)
-                    {
                         sub_config.dest = RENDERSUB;
                     }
                     
                     sub_config.force = force;
                     sub_config.default_track = def;
                     hb_subtitle_add( job, &sub_config, subtitle );
-                }   
-                
+                }
             }
         }
         i++;
     }
+    if( one_burned )
+    {
+        filter = hb_filter_init( HB_FILTER_RENDER_SUB );
+        hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d",
+                                  job->crop[0], job->crop[1],
+                                  job->crop[2], job->crop[3]] UTF8String] );
+    }
    
     
     
@@ -3311,25 +3604,22 @@
         job->grayscale = 0;
     }
     
-    /* Initialize the filters list */
-    job->filters = hb_list_init();
-    
     /* Now lets call the filters if applicable.
     * The order of the filters is critical
     */
     
+
 	/* Detelecine */
-    hb_filter_detelecine.settings = NULL;
+    filter = hb_filter_init( HB_FILTER_DETELECINE );
     if ([fPictureController detelecine] == 1)
     {
         /* use a custom detelecine string */
-        hb_filter_detelecine.settings = (char *) [[fPictureController detelecineCustomString] UTF8String];
-        hb_list_add( job->filters, &hb_filter_detelecine );
+        hb_add_filter( job, filter, [[fPictureController detelecineCustomString] UTF8String] );
     }
-    if ([fPictureController detelecine] == 2)
+    else if ([fPictureController detelecine] == 2)
     {
         /* Default */
-        hb_list_add( job->filters, &hb_filter_detelecine );
+        hb_add_filter( job, filter, NULL );
     }
     
     
@@ -3337,77 +3627,77 @@
     if ([fPictureController useDecomb] == 1)
     {
         /* Decomb */
+        filter = hb_filter_init( HB_FILTER_DECOMB );
         if ([fPictureController decomb] == 1)
         {
             /* use a custom decomb string */
-            hb_filter_decomb.settings = (char *) [[fPictureController decombCustomString] UTF8String];
-            hb_list_add( job->filters, &hb_filter_decomb );
+            hb_add_filter( job, filter, [[fPictureController decombCustomString] UTF8String] );
         }
-        if ([fPictureController decomb] == 2)
+        else if ([fPictureController decomb] == 2)
         {
             /* use libhb defaults */
-            hb_filter_decomb.settings = NULL;
-            hb_list_add( job->filters, &hb_filter_decomb );
+            hb_add_filter( job, filter, NULL );
         }
-        if ([fPictureController decomb] == 3)
+        else if ([fPictureController decomb] == 3)
         {
             /* use old defaults (decomb fast) */
-            hb_filter_decomb.settings = "7:2:6:9:1:80";
-            hb_list_add( job->filters, &hb_filter_decomb );
+            hb_add_filter( job, filter, "7:2:6:9:1:80" );
+        }
+        else if ([fPictureController decomb] == 4)
+        {
+            /* decomb 3 with bobbing enabled */
+            hb_add_filter( job, filter, "455" );
         }
     }
     else
     {
-        
         /* Deinterlace */
+        filter = hb_filter_init( HB_FILTER_DEINTERLACE );
         if ([fPictureController deinterlace] == 1)
         {
             /* we add the custom string if present */
-            hb_filter_deinterlace.settings = (char *) [[fPictureController deinterlaceCustomString] UTF8String];
-            hb_list_add( job->filters, &hb_filter_deinterlace );            
+            hb_add_filter( job, filter, [[fPictureController deinterlaceCustomString] UTF8String] );            
         }
         else if ([fPictureController deinterlace] == 2)
         {
             /* Run old deinterlacer fd by default */
-            hb_filter_deinterlace.settings = "-1"; 
-            hb_list_add( job->filters, &hb_filter_deinterlace );
+            hb_add_filter( job, filter, "0" );
         }
         else if ([fPictureController deinterlace] == 3)
         {
-            /* Yadif mode 0 (without spatial deinterlacing.) */
-            hb_filter_deinterlace.settings = "2"; 
-            hb_list_add( job->filters, &hb_filter_deinterlace );            
+            /* Yadif mode 0 (without spatial deinterlacing) */
+            hb_add_filter( job, filter, "1" );            
         }
         else if ([fPictureController deinterlace] == 4)
         {
             /* Yadif (with spatial deinterlacing) */
-            hb_filter_deinterlace.settings = "0"; 
-            hb_list_add( job->filters, &hb_filter_deinterlace );            
+            hb_add_filter( job, filter, "3" );
+        }
+        else if ([fPictureController deinterlace] == 5)
+        {
+            /* Yadif (with spatial deinterlacing and bobbing) */
+            hb_add_filter( job, filter, "15" );
         }
-        
 	}
     
     /* Denoise */
+    filter = hb_filter_init( HB_FILTER_DENOISE );
 	if ([fPictureController denoise] == 1) // custom in popup
 	{
 		/* we add the custom string if present */
-        hb_filter_denoise.settings = (char *) [[fPictureController denoiseCustomString] UTF8String]; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, [[fPictureController denoiseCustomString] UTF8String] );
 	}
     else if ([fPictureController denoise] == 2) // Weak in popup
 	{
-		hb_filter_denoise.settings = "2:1:2:3"; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, "2:1:2:3" );
 	}
 	else if ([fPictureController denoise] == 3) // Medium in popup
 	{
-		hb_filter_denoise.settings = "3:2:2:3"; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, "3:2:2:3" );
 	}
 	else if ([fPictureController denoise] == 4) // Strong in popup
 	{
-		hb_filter_denoise.settings = "7:7:5:5"; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, "7:7:5:5" );
 	}
     
     
@@ -3416,13 +3706,24 @@
      * the macgui's purposes a value of 0 actually means to not even use the filter
      * current hb_filter_deblock.settings valid ranges are from 5 - 15 
      */
+    filter = hb_filter_init( HB_FILTER_DEBLOCK );
     if ([fPictureController deblock] != 0)
     {
         NSString *deblockStringValue = [NSString stringWithFormat: @"%d",[fPictureController deblock]];
-        hb_filter_deblock.settings = (char *) [deblockStringValue UTF8String];
-        hb_list_add( job->filters, &hb_filter_deblock );
+        hb_add_filter( job, filter, [deblockStringValue UTF8String] );
     }
 
+    /* Add Crop/Scale filter */
+    filter = hb_filter_init( HB_FILTER_CROP_SCALE );
+    hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d:%d:%d",
+                                  job->width,job->height,
+                                  job->crop[0], job->crop[1],
+                                  job->crop[2], job->crop[3]] UTF8String] );
+
+    /* Add framerate shaping filter */
+    filter = hb_filter_init( HB_FILTER_VFR );
+    hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d",
+                                  job->cfr, job->vrate, job->vrate_base] UTF8String] );
 }
 
 
@@ -3438,6 +3739,7 @@
     hb_title_t * title = (hb_title_t *) hb_list_item( list,0 ); // is always zero since now its a single title scan
     hb_job_t * job = title->job;
     hb_audio_config_t * audio;
+    hb_filter_object_t * filter;
     /* Title Angle for dvdnav */
     job->angle = [[queueToApply objectForKey:@"TitleAngle"] intValue];
     
@@ -3451,7 +3753,7 @@
     else if ([[queueToApply objectForKey:@"fEncodeStartStop"] intValue] == 1)
     {
         /* we are pts based start / stop */
-        [self writeToActivityLog: "Start / Stop set to seconds ..."];
+        [self writeToActivityLog: "Start / Stop set to seconds…"];
         
         /* Point A to Point B. Time to time in seconds.*/
         /* get the start seconds from the start seconds field */
@@ -3465,7 +3767,7 @@
     else if ([[queueToApply objectForKey:@"fEncodeStartStop"] intValue] == 2)
     {
         /* we are frame based start / stop */
-        [self writeToActivityLog: "Start / Stop set to frames ..."];
+        [self writeToActivityLog: "Start / Stop set to frames…"];
         
         /* Point A to Point B. Frame to frame */
         /* get the start frame from the start frame field */
@@ -3525,11 +3827,10 @@
         id tempObject;
         while (tempObject = [enumerator nextObject])
         {
-            hb_chapter_t *chapter = (hb_chapter_t *) hb_list_item( title->list_chapter, i );
+            hb_chapter_t *chapter = (hb_chapter_t *) hb_list_item( job->list_chapter, i );
             if( chapter != NULL )
             {
-                strncpy( chapter->title, [tempObject UTF8String], 1023);
-                chapter->title[1023] = '\0';
+                hb_chapter_set_title( chapter, [tempObject UTF8String] );
             }
             i++;
         }
@@ -3539,42 +3840,67 @@
         job->chapter_markers = 0;
     }
     
-    if( job->vcodec == HB_VCODEC_X264 )
+    if (job->vcodec == HB_VCODEC_X264)
     {
-		if ([[queueToApply objectForKey:@"Mp4iPodCompatible"] intValue] == 1)
-	    {
-            job->ipod_atom = 1;
-		}
-        else
+        /* iPod 5G atom */
+        job->ipod_atom = ([[queueToApply objectForKey:@"Mp4iPodCompatible"]
+                           intValue] == 1);
+        
+        /* set fastfirstpass if 2-pass and Turbo are enabled */
+        if ([[queueToApply objectForKey:@"VideoTwoPass"] intValue] == 1)
         {
-            job->ipod_atom = 0;
+            job->fastfirstpass = ([[queueToApply objectForKey:@"VideoTurboTwoPass"]
+                                   intValue] == 1);
         }
-		
-		
-		/* Below Sends x264 options to the core library if x264 is selected */
-		/* Lets use this as per Nyx, Thanks Nyx! */
-		/* Turbo first pass if two pass and Turbo First pass is selected */
-		if( [[queueToApply objectForKey:@"VideoTwoPass"] intValue] == 1 && [[queueToApply objectForKey:@"VideoTurboTwoPass"] intValue] == 1 )
-		{
-			/* pass the "Turbo" string to be appended to the existing x264 opts string into a variable for the first pass */
-			NSString *firstPassOptStringTurbo = @":ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
-			/* append the "Turbo" string variable to the existing opts string.
-             * Note: the "Turbo" string must be appended, not prepended to work properly */
-			NSString *firstPassOptStringCombined = [[queueToApply objectForKey:@"x264Option"] stringByAppendingString:firstPassOptStringTurbo];
-			job->advanced_opts = strdup( [firstPassOptStringCombined UTF8String] );
-		}
-		else
-		{
-			job->advanced_opts = strdup( [[queueToApply objectForKey:@"x264Option"] UTF8String] );
-		}
         
-    }
-    else if( job->vcodec & HB_VCODEC_FFMPEG_MASK )
-    {
-        if ([queueToApply objectForKey:@"lavcOption"])
+        /* advanced x264 options */
+        NSString   *tmpString;
+        // translate zero-length strings to NULL for libhb
+        const char *x264_preset   = NULL;
+        const char *x264_tune     = NULL;
+        const char *advanced_opts = NULL;
+        const char *h264_profile  = NULL;
+        const char *h264_level    = NULL;
+        if ([[queueToApply objectForKey:@"x264UseAdvancedOptions"] intValue])
         {
-            job->advanced_opts = strdup( [[queueToApply objectForKey:@"lavcOption"] UTF8String] );
+            // we are using the advanced panel
+            if ([(tmpString = [queueToApply objectForKey:@"x264Option"]) length])
+            {
+                advanced_opts = [tmpString UTF8String];
+            }
         }
+        else
+        {
+            // we are using the x264 preset system
+            if ([(tmpString = [queueToApply objectForKey:@"x264Tune"]) length])
+            {
+                x264_tune = [tmpString UTF8String];
+            }
+            if ([(tmpString = [queueToApply objectForKey:@"x264OptionExtra"]) length])
+            {
+                advanced_opts = [tmpString UTF8String];
+            }
+            if ([(tmpString = [queueToApply objectForKey:@"h264Profile"]) length])
+            {
+                h264_profile = [tmpString UTF8String];
+            }
+            if ([(tmpString = [queueToApply objectForKey:@"h264Level"]) length])
+            {
+                h264_level = [tmpString UTF8String];
+            }
+            x264_preset = [[queueToApply objectForKey:@"x264Preset"] UTF8String];
+        }
+        hb_job_set_x264_preset  (job, x264_preset);
+        hb_job_set_x264_tune    (job, x264_tune);
+        hb_job_set_advanced_opts(job, advanced_opts);
+        hb_job_set_h264_profile (job, h264_profile);
+        hb_job_set_h264_level   (job, h264_level);
+    }
+    else if (job->vcodec & HB_VCODEC_FFMPEG_MASK)
+    {
+        hb_job_set_advanced_opts(job,
+                                 [[queueToApply objectForKey:@"lavcOption"]
+                                  UTF8String]);
     }
     
     
@@ -3614,32 +3940,32 @@
         /* a specific framerate has been chosen */
         job->vrate      = 27000000;
         job->vrate_base = hb_video_rates[[[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue]-1].rate;
-        /* We are not same as source so we set job->cfr to 1 
-         * to enable constant frame rate since user has specified
-         * a specific framerate*/
-        
-        if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"])
+        if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"cfr"])
         {
-            job->cfr = 2;
+            // CFR
+            job->cfr = 1;
         }
         else
         {
-            job->cfr = 1;
+            // PFR
+            job->cfr = 2;
         }
     }
     else
     {
-        /* We are same as source (variable) */
+        /* same as source */
         job->vrate      = [[queueToApply objectForKey:@"JobVrate"] intValue];
         job->vrate_base = [[queueToApply objectForKey:@"JobVrateBase"] intValue];
-        /* We are same as source so we set job->cfr to 0 
-         * to enable true same as source framerate */
-        job->cfr = 0;
-        /* If the user specifies cfr then ... */
-        if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"cfr"]) // we are cfr
+        if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"cfr"])
         {
+            // CFR
             job->cfr = 1;
         }
+        else
+        {
+            // VFR
+            job->cfr = 0;
+        }
     }
     
     if ( [[queueToApply objectForKey:@"VideoQualityType"] intValue] != 2 )
@@ -3717,30 +4043,8 @@
             }
             else
             {
-                
-                /* for the actual source tracks, we must subtract the non source entries so 
-                 * that the menu index matches the source subtitle_list index for convenience */
-                if (i == 0)
-                {
-                    /* for the first track, the source tracks start at menu index 2 ( None is 0,
-                     * Foreign Language Search is 1) so subtract 2 */
-                    subtitle = subtitle - 2;
-                }
-                else
-                {
-                    /* for all other tracks, the source tracks start at menu index 1 (None is 0)
-                     * so subtract 1. */
-                    
-                    subtitle = subtitle - 1;
-                }
-                
-                /* We are setting a source subtitle so access the source subtitle info */  
-                hb_subtitle_t * subt;
-                
-                subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, subtitle);
-                
                 /* if we are getting the subtitles from an external srt file */
-                if ([[tempObject objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
+                if ([[tempObject objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
                 {
                     hb_subtitle_config_t sub_config;
                     
@@ -3757,40 +4061,59 @@
                     sub_config.default_track = def;
                     
                     hb_srt_add( job, &sub_config, [[tempObject objectForKey:@"subtitleTrackSrtLanguageIso3"] UTF8String]);
+                    continue;
                 }
                 
+                /* for the actual source tracks, we must subtract the non source entries so 
+                 * that the menu index matches the source subtitle_list index for convenience */
+                if( i == 0 )
+                {
+                    /* for the first track, the source tracks start at menu index 2 ( None is 0,
+                     * Foreign Language Search is 1) so subtract 2 */
+                    subtitle = subtitle - 2;
+                }
+                else
+                {
+                    /* for all other tracks, the source tracks start at menu index 1 (None is 0)
+                     * so subtract 1. */
+                    subtitle = subtitle - 1;
+                }
                 
-                if (subt != NULL)
+                /* We are setting a source subtitle so access the source subtitle info */  
+                hb_subtitle_t * subt = (hb_subtitle_t *) hb_list_item( title->list_subtitle, subtitle );
+                
+                if( subt != NULL )
                 {
                     hb_subtitle_config_t sub_config = subt->config;
                     
-                    if ( !burned && subt->format == PICTURESUB )
+                    if( !burned && hb_subtitle_can_pass( subt->source, job->mux ) )
                     {
                         sub_config.dest = PASSTHRUSUB;
                     }
-                    else if ( burned  )
+                    else if( hb_subtitle_can_burn( subt->source ) )
                     {
                         // Only allow one subtitle to be burned into the video
-                        if (one_burned)
+                        if( one_burned )
                             continue;
                         one_burned = TRUE;
-                    }
-                    
-                    /* Besides VOBSUBS we can also burn in SSA text subs */
-                    if (subt->source == SSASUB && burned)
-                    {
                         sub_config.dest = RENDERSUB;
                     }
-
+                    
                     sub_config.force = force;
                     sub_config.default_track = def;
                     hb_subtitle_add( job, &sub_config, subtitle );
-                }   
-                
+                }
             }
         }
         i++;
     }
+    if( one_burned )
+    {
+        filter = hb_filter_init( HB_FILTER_RENDER_SUB );
+        hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d",
+                                  job->crop[0], job->crop[1],
+                                  job->crop[2], job->crop[3]] UTF8String] );
+    }
 
 #pragma mark -
 
@@ -3819,131 +4142,122 @@
     job->acodec_fallback = [[queueToApply objectForKey: @"JobAudioEncoderFallback"] intValue];
     
     /* Audio tracks and mixdowns */
-    /* Lets make sure there arent any erroneous audio tracks in the job list, so lets make sure it's empty */
-    int audiotrack_count = hb_list_count(job->list_audio);
-    for( int i = 0; i < audiotrack_count; i++ )
+    /* Now lets add our new tracks to the audio list here */
+    for (unsigned int counter = 0; counter < maximumNumberOfAllowedAudioTracks; counter++)
     {
-        hb_audio_t * temp_audio = (hb_audio_t*) hb_list_item( job->list_audio, 0 );
-        hb_list_rem(job->list_audio, temp_audio);
+        NSString *prefix    = [NSString stringWithFormat:@"Audio%d",    counter + 1];
+        NSString *jobPrefix = [NSString stringWithFormat:@"JobAudio%d", counter + 1];
+        if ([[queueToApply objectForKey:[prefix stringByAppendingString:@"Track"]] intValue] > 0)
+        {
+            audio           = (hb_audio_config_t*)calloc(1, sizeof(*audio));
+            hb_audio_config_init(audio);
+            audio->in.track = [[queueToApply objectForKey:[prefix stringByAppendingString:@"Track"]] intValue] - 1;
+            /* We go ahead and assign values to our audio->out.<properties> */
+            audio->out.track                     = audio->in.track;
+            audio->out.codec                     = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Encoder"]]           intValue];
+            audio->out.compression_level         = hb_get_default_audio_compression(audio->out.codec);
+            audio->out.mixdown                   = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Mixdown"]]           intValue];
+            audio->out.normalize_mix_level       = 0;
+            audio->out.bitrate                   = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Bitrate"]]           intValue];
+            audio->out.samplerate                = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Samplerate"]]        intValue];
+            audio->out.dynamic_range_compression = [[queueToApply objectForKey:[prefix    stringByAppendingString:@"TrackDRCSlider"]]  floatValue];
+            audio->out.gain                      = [[queueToApply objectForKey:[prefix    stringByAppendingString:@"TrackGainSlider"]] floatValue];
+            audio->out.dither_method             = hb_audio_dither_get_default();
+            
+            hb_audio_add(job, audio);
+            free(audio);
+        }
     }
-    /* Now lets add our new tracks to the audio list here */
-	for (unsigned int counter = 0; counter < maximumNumberOfAllowedAudioTracks; counter++) {
-		NSString *prefix = [NSString stringWithFormat: @"Audio%d", counter + 1];
-		if ([[queueToApply objectForKey: [prefix stringByAppendingString: @"Track"]] intValue] > 0) {
-			audio = (hb_audio_config_t *) calloc(1, sizeof(*audio));
-			hb_audio_config_init(audio);
-			audio->in.track = [[queueToApply objectForKey: [prefix stringByAppendingString: @"Track"]] intValue] - 1;
-			/* We go ahead and assign values to our audio->out.<properties> */
-			audio->out.track = audio->in.track;
-			audio->out.dynamic_range_compression = [[queueToApply objectForKey: [prefix stringByAppendingString: @"TrackDRCSlider"]] floatValue];
-            audio->out.gain = [[queueToApply objectForKey: [prefix stringByAppendingString: @"TrackGainSlider"]] floatValue];
-			prefix = [NSString stringWithFormat: @"JobAudio%d", counter + 1];
-			audio->out.codec = [[queueToApply objectForKey: [prefix stringByAppendingString: @"Encoder"]] intValue];
-			audio->out.compression_level = hb_get_default_audio_compression(audio->out.codec);
-			audio->out.mixdown = [[queueToApply objectForKey: [prefix stringByAppendingString: @"Mixdown"]] intValue];
-			audio->out.bitrate = [[queueToApply objectForKey: [prefix stringByAppendingString: @"Bitrate"]] intValue];
-			audio->out.samplerate = [[queueToApply objectForKey: [prefix stringByAppendingString: @"Samplerate"]] intValue];
-			
-			hb_audio_add( job, audio );
-			free(audio);
-		}
-	}
-    
-    /* Filters */ 
-    job->filters = hb_list_init();
     
     /* Now lets call the filters if applicable.
      * The order of the filters is critical
      */
     /* Detelecine */
-    hb_filter_detelecine.settings = NULL;
+    filter = hb_filter_init( HB_FILTER_DETELECINE );
     if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 1)
     {
         /* use a custom detelecine string */
-        hb_filter_detelecine.settings = (char *) [[queueToApply objectForKey:@"PictureDetelecineCustom"] UTF8String];
-        hb_list_add( job->filters, &hb_filter_detelecine );
+        hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDetelecineCustom"] UTF8String] );
     }
-    if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 2)
+    else if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 2)
     {
         /* Use libhb's default values */
-        hb_list_add( job->filters, &hb_filter_detelecine );
+        hb_add_filter( job, filter, NULL );
     }
     
     if ([[queueToApply objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
     {
         /* Decomb */
+        filter = hb_filter_init( HB_FILTER_DECOMB );
         if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 1)
         {
             /* use a custom decomb string */
-            hb_filter_decomb.settings = (char *) [[queueToApply objectForKey:@"PictureDecombCustom"] UTF8String];
-            hb_list_add( job->filters, &hb_filter_decomb );
+            hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDecombCustom"] UTF8String] );
         }
-        if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 2)
+        else if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 2)
         {
             /* use libhb defaults */
-            hb_filter_decomb.settings = NULL;
-            hb_list_add( job->filters, &hb_filter_decomb );
+            hb_add_filter( job, filter, NULL );
         }
-        if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 3)
+        else if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 3)
         {
             /* use old defaults (decomb fast) */
-            hb_filter_decomb.settings = "7:2:6:9:1:80";
-            hb_list_add( job->filters, &hb_filter_decomb );
+            hb_add_filter( job, filter, "7:2:6:9:1:80" );
+        }
+        else if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 4)
+        {
+            /* decomb 3 with bobbing enabled */
+            hb_add_filter( job, filter, "455" );
         }
-        
     }
     else
     {
-        
         /* Deinterlace */
+        filter = hb_filter_init( HB_FILTER_DEINTERLACE );
         if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 1)
         {
             /* we add the custom string if present */
-            hb_filter_deinterlace.settings = (char *) [[queueToApply objectForKey:@"PictureDeinterlaceCustom"] UTF8String];
-            hb_list_add( job->filters, &hb_filter_deinterlace );            
+            hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDeinterlaceCustom"] UTF8String] );            
         }
         else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 2)
         {
             /* Run old deinterlacer fd by default */
-            hb_filter_deinterlace.settings = "-1"; 
-            hb_list_add( job->filters, &hb_filter_deinterlace );
+            hb_add_filter( job, filter, "0" );
         }
         else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 3)
         {
-            /* Yadif mode 0 (without spatial deinterlacing.) */
-            hb_filter_deinterlace.settings = "2"; 
-            hb_list_add( job->filters, &hb_filter_deinterlace );            
+            /* Yadif mode 0 (without spatial deinterlacing) */
+            hb_add_filter( job, filter, "1" );            
         }
         else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 4)
         {
             /* Yadif (with spatial deinterlacing) */
-            hb_filter_deinterlace.settings = "0"; 
-            hb_list_add( job->filters, &hb_filter_deinterlace );            
+            hb_add_filter( job, filter, "3" );            
+        }
+        else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 5)
+        {
+            /* Yadif (with spatial deinterlacing and bobbing) */
+            hb_add_filter( job, filter, "15" );            
         }
-        
-        
     }
     /* Denoise */
+    filter = hb_filter_init( HB_FILTER_DENOISE );
 	if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 1) // Custom in popup
 	{
 		/* we add the custom string if present */
-        hb_filter_denoise.settings = (char *) [[queueToApply objectForKey:@"PictureDenoiseCustom"] UTF8String];
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDenoiseCustom"] UTF8String] );	
 	}
     else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 2) // Weak in popup
 	{
-		hb_filter_denoise.settings = "2:1:2:3"; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, "2:1:2:3" );	
 	}
 	else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 3) // Medium in popup
 	{
-		hb_filter_denoise.settings = "3:2:2:3"; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, "3:2:2:3" );	
 	}
 	else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 4) // Strong in popup
 	{
-		hb_filter_denoise.settings = "7:7:5:5"; 
-        hb_list_add( job->filters, &hb_filter_denoise );	
+        hb_add_filter( job, filter, "7:7:5:5" );	
 	}
     
     
@@ -3952,11 +4266,24 @@
      * the macgui's purposes a value of 0 actually means to not even use the filter
      * current hb_filter_deblock.settings valid ranges are from 5 - 15 
      */
+    filter = hb_filter_init( HB_FILTER_DEBLOCK );
     if ([[queueToApply objectForKey:@"PictureDeblock"] intValue] != 0)
     {
-        hb_filter_deblock.settings = (char *) [[queueToApply objectForKey:@"PictureDeblock"] UTF8String];
-        hb_list_add( job->filters, &hb_filter_deblock );
+        hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDeblock"] UTF8String] );
     }
+
+    /* Add Crop/Scale filter */
+    filter = hb_filter_init( HB_FILTER_CROP_SCALE );
+    hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d:%d:%d",
+                                  job->width,job->height,
+                                  job->crop[0], job->crop[1],
+                                  job->crop[2], job->crop[3]] UTF8String] );
+
+    /* Add framerate shaping filter */
+    filter = hb_filter_init( HB_FILTER_VFR );
+    hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d",
+                                  job->cfr, job->vrate, job->vrate_base] UTF8String] );
+
 [self writeToActivityLog: "prepareJob exiting"];    
 }
 
@@ -4139,7 +4466,7 @@
                /*Warn that computer will sleep after encoding*/
                int reminduser;
                NSBeep();
-               reminduser = NSRunAlertPanel(@"The computer will sleep after encoding is done.",@"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences.", @"OK", @"Preferences...", nil);
+               reminduser = NSRunAlertPanel(@"The computer will sleep after encoding is done.",@"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences.", @"OK", @"Preferences…", nil);
                [NSApp requestUserAttention:NSCriticalRequest];
                if ( reminduser == NSAlertAlternateReturn )
                {
@@ -4151,7 +4478,7 @@
                /*Warn that computer will shut down after encoding*/
                int reminduser;
                NSBeep();
-               reminduser = NSRunAlertPanel(@"The computer will shut down after encoding is done.",@"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences.", @"OK", @"Preferences...", nil);
+               reminduser = NSRunAlertPanel(@"The computer will shut down after encoding is done.",@"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences.", @"OK", @"Preferences…", nil);
                [NSApp requestUserAttention:NSCriticalRequest];
                if ( reminduser == NSAlertAlternateReturn )
                {
@@ -4180,7 +4507,12 @@
 {
     if (!fQueueController) return;
     
-  hb_pause( fQueueEncodeLibhb );
+    /*
+     * No need to allow system sleep here as we'll either call Cancel:
+     * (which will take care of it) or resume right away
+     */
+    hb_pause(fQueueEncodeLibhb);
+    
     NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"You are currently encoding. What would you like to do ?", nil)];
    
     // Which window to attach the sheet to?
@@ -4204,14 +4536,16 @@
 
 - (void) didDimissCancel: (NSWindow *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
 {
-   hb_resume( fQueueEncodeLibhb );
-     if (returnCode == NSAlertOtherReturn)
+    /* No need to prevent system sleep here as we didn't allow it in Cancel: */
+    hb_resume(fQueueEncodeLibhb);
+    
+    if (returnCode == NSAlertOtherReturn)
     {
         [self doCancelCurrentJob];  // <- this also stops libhb
     }
-    if (returnCode == NSAlertAlternateReturn)
+    else if (returnCode == NSAlertAlternateReturn)
     {
-    [self doCancelCurrentJobAndStop];
+        [self doCancelCurrentJobAndStop];
     }
 }
 
@@ -4228,7 +4562,8 @@
     // remaining jobs.
      
     
-    hb_stop( fQueueEncodeLibhb );
+    hb_stop(fQueueEncodeLibhb);
+    hb_system_sleep_allow(fQueueEncodeLibhb);
     
     // Delete all remaining jobs since libhb doesn't do this on its own.
             hb_job_t * job;
@@ -4239,11 +4574,11 @@
     
     // now that we've stopped the currently encoding job, lets mark it as cancelled
     [[QueueFileArray objectAtIndex:currentQueueEncodeIndex] setObject:[NSNumber numberWithInt:3] forKey:@"Status"];
-    // and as always, save it in the queue .plist...
+    // and as always, save it in Queue.plist
     /* We save all of the Queue data here */
     [self saveQueueFileItem];
     
-    // ... and see if there are more items left in our queue
+    // and see if there are more items left in our queue
     int queueItems = [QueueFileArray count];
     /* If we still have more items in our queue, lets go to the next one */
     /* Check to see if there are any more pending items in the queue */
@@ -4269,7 +4604,8 @@
 
 - (void) doCancelCurrentJobAndStop
 {
-    hb_stop( fQueueEncodeLibhb );
+    hb_stop(fQueueEncodeLibhb);
+    hb_system_sleep_allow(fQueueEncodeLibhb);
     
     // Delete all remaining jobs since libhb doesn't do this on its own.
             hb_job_t * job;
@@ -4281,7 +4617,7 @@
     
     // now that we've stopped the currently encoding job, lets mark it as cancelled
     [[QueueFileArray objectAtIndex:currentQueueEncodeIndex] setObject:[NSNumber numberWithInt:3] forKey:@"Status"];
-    // and as always, save it in the queue .plist...
+    // and as always, save it in Queue.plist
     /* We save all of the Queue data here */
     [self saveQueueFileItem];
     // so now lets move to 
@@ -4291,15 +4627,17 @@
 - (IBAction) Pause: (id) sender
 {
     hb_state_t s;
-    hb_get_state2( fQueueEncodeLibhb, &s );
+    hb_get_state2(fQueueEncodeLibhb, &s);
 
-    if( s.state == HB_STATE_PAUSED )
+    if (s.state == HB_STATE_PAUSED)
     {
-        hb_resume( fQueueEncodeLibhb );
+        hb_system_sleep_prevent(fQueueEncodeLibhb);
+        hb_resume(fQueueEncodeLibhb);
     }
     else
     {
-        hb_pause( fQueueEncodeLibhb );
+        hb_pause(fQueueEncodeLibhb);
+        hb_system_sleep_allow(fQueueEncodeLibhb);
     }
 }
 
@@ -4327,18 +4665,18 @@
     /* first get the currently selected index so we can choose it again after cycling through the available titles. */
     int currentlySelectedTitle = [fSrcTitlePopUp indexOfSelectedItem];
     
-    /* For each title in the fSrcTitlePopUp select it ... */
+    /* For each title in the fSrcTitlePopUp, select it */
     for( int i = 0; i < [fSrcTitlePopUp numberOfItems]; i++ )
     {
         [fSrcTitlePopUp selectItemAtIndex:i];
-        /* Now call titlePopUpChanged to load it up ... */
+        /* Now call titlePopUpChanged to load it up */
         [self titlePopUpChanged:nil];
         /* now add the title to the queue */
         [self addToQueue:nil];   
     }
     /* Now that we are done, reselect the previously selected title.*/
     [fSrcTitlePopUp selectItemAtIndex: currentlySelectedTitle];
-    /* Now call titlePopUpChanged to load it up ... */
+    /* Now call titlePopUpChanged to load it up */
     [self titlePopUpChanged:nil]; 
 }
 
@@ -4423,7 +4761,6 @@
     }
     
     /* Start Get and set the initial pic size for display */
-	hb_job_t * job = title->job;
 	fTitle = title;
     
     /* Set Auto Crop to on upon selecting a new title  */
@@ -4431,12 +4768,12 @@
     
 	/* We get the originial output picture width and height and put them
 	in variables for use with some presets later on */
-	PicOrigOutputWidth = job->width;
-	PicOrigOutputHeight = job->height;
-	AutoCropTop = job->crop[0];
-	AutoCropBottom = job->crop[1];
-	AutoCropLeft = job->crop[2];
-	AutoCropRight = job->crop[3];
+	PicOrigOutputWidth = title->width;
+	PicOrigOutputHeight = title->height;
+	AutoCropTop = title->crop[0];
+	AutoCropBottom = title->crop[1];
+	AutoCropLeft = title->crop[2];
+	AutoCropRight = title->crop[3];
 
 	/* Reset the new title in fPictureController &&  fPreviewController*/
     [fPictureController SetTitle:title];
@@ -4458,16 +4795,6 @@
 								 userInfo: [NSDictionary dictionaryWithObjectsAndKeys:
 											[NSData dataWithBytesNoCopy: &fTitle length: sizeof(fTitle) freeWhenDone: NO], keyTitleTag,
 											nil]]];
-	
-	/* Lets make sure there arent any erroneous audio tracks in the job list, so lets make sure its empty*/
-    int audiotrack_count = hb_list_count(job->list_audio);
-    for( int i = 0; i < audiotrack_count;i++)
-    {
-        hb_audio_t * temp_audio = (hb_audio_t*) hb_list_item( job->list_audio, 0 );
-        hb_list_rem(job->list_audio, temp_audio);
-    }
-
-	
     [fVidRatePopUp selectItemAtIndex: 0];
 
     /* we run the picture size values through calculatePictureSizing to get all picture setting	information*/
@@ -4619,14 +4946,17 @@
         }
     }
     
-    /* if we have a previously selected vid encoder tag, then try to select it */
+    /*
+     * item 0 will be selected by default
+     * deselect it so that we can detect whether the video encoder has changed
+     */
+    [fVidEncoderPopUp selectItem:nil];
     if (selectedVidEncoderTag)
     {
-        [fVidEncoderPopUp selectItemWithTag: selectedVidEncoderTag];
-    }
-    else
-    {
-        [fVidEncoderPopUp selectItemAtIndex: 0];
+        // if we have a tag for previously selected encoder, try to select it
+        // if this fails, [fVidEncoderPopUp selectedItem] will be nil
+        // we'll handle that scenario further down
+        [fVidEncoderPopUp selectItemWithTag:selectedVidEncoderTag];
     }
     
     /* Update the Auto Passtgru Fallback Codec Popup */
@@ -4696,22 +5026,16 @@
     else
         [fDstFile2Field setStringValue: [NSString stringWithFormat:@"%@.%s", [string stringByDeletingPathExtension], ext]];
 
-    if( SuccessfulScan )
+    if (SuccessfulScan)
     {
-        /* Add/replace to the correct extension */
-
-        if( [fVidEncoderPopUp selectedItem] == nil )
+        if ([fVidEncoderPopUp selectedItem] == nil)
         {
-
+            /* this means the above call to selectItemWithTag failed */
             [fVidEncoderPopUp selectItemAtIndex:0];
             [self videoEncoderPopUpChanged:nil];
-
-            /* We call the method to properly enable/disable turbo 2 pass */
-            [self twoPassCheckboxChanged: sender];
-            /* We call method method to change UI to reflect whether a preset is used or not*/
         }
     }
-	[self customSettingUsed: sender];
+	[self customSettingUsed:sender];
 }
 
 - (IBAction) autoSetM4vExtension: (id) sender
@@ -4765,15 +5089,20 @@
     int videoEncoder = [[fVidEncoderPopUp selectedItem] tag];
     
     [fAdvancedOptions setHidden:YES];
-    /* If we are using x264 then show the x264 advanced panel */
+    /* If we are using x264 then show the x264 advanced panel and the x264 presets box */
     if (videoEncoder == HB_VCODEC_X264)
     {
         [fAdvancedOptions setHidden:NO];
+        
+        // show the x264 presets box
+        [fX264PresetsBox setHidden:NO];
+                
         [self autoSetM4vExtension: sender];
     }
     else // we are FFmpeg (lavc) or Theora
     {
         [fAdvancedOptions setHidden:YES];
+        [fX264PresetsBox setHidden:YES];
         
         // We Are Lavc
         if ([[fVidEncoderPopUp selectedItem] tag] & HB_VCODEC_FFMPEG_MASK)
@@ -4782,7 +5111,7 @@
         }
         else /// We are Theora
         {
-          [fAdvancedOptions setLavcOptsEnabled:NO];  
+            [fAdvancedOptions setLavcOptsEnabled:NO];  
         }
     }
 
@@ -4945,6 +5274,7 @@
 
 - (IBAction) qualitySliderChanged: (id) sender
 {
+    
     /* Our constant quality slider is in a range based
      * on each encoders qp/rf values. The range depends
      * on the encoder. Also, the range is inverse of quality
@@ -4978,6 +5308,7 @@
     [self customSettingUsed: sender];
 }
 
+
 - (void) controlTextDidChange: (NSNotification *) notification
 {
     [self calculateBitrate:nil];
@@ -5012,6 +5343,358 @@
 }
 
 #pragma mark -
+#pragma mark - Video x264 Presets
+
+- (IBAction) setupX264PresetsWidgets: (id) sender
+{
+    NSUInteger i;
+    /*
+     * now we populate the x264 preset system widgets via hb_x264_presets(),
+     * hb_x264_tunes(), hb_h264_profiles(), hb_h264_levels()
+     */
+    // store x264 preset names
+    const char * const * x264_presets = hb_x264_presets();
+    NSMutableArray *tmp_array = [[NSMutableArray alloc] init];
+    for (i = 0; x264_presets[i] != NULL; i++)
+    {
+        [tmp_array addObject:[NSString stringWithUTF8String:x264_presets[i]]];
+        if (!strcasecmp(x264_presets[i], "medium"))
+        {
+            fX264MediumPresetIndex = i;
+        }
+    }
+    fX264PresetNames = [[NSArray alloc] initWithArray:tmp_array];
+    [tmp_array release];
+    // setup the x264 preset slider
+    [fX264PresetsSlider setMinValue:0];
+    [fX264PresetsSlider setMaxValue:[fX264PresetNames count]-1];
+    [fX264PresetsSlider setNumberOfTickMarks:[fX264PresetNames count]];
+    [fX264PresetsSlider setIntegerValue:fX264MediumPresetIndex];
+    [fX264PresetsSlider setTickMarkPosition:NSTickMarkAbove];
+    [fX264PresetsSlider setAllowsTickMarkValuesOnly:YES];
+    [self x264PresetsSliderChanged: sender];
+    // setup the x264 tune popup
+    [fX264TunePopUp removeAllItems];
+    [fX264TunePopUp addItemWithTitle: @"none"];
+    const char * const * x264_tunes = hb_x264_tunes();
+    for (int i = 0; x264_tunes[i] != NULL; i++)
+    {
+        // we filter out "fastdecode" as we have a dedicated checkbox for it
+        if (strcasecmp(x264_tunes[i], "fastdecode") != 0)
+        {
+            [fX264TunePopUp addItemWithTitle: [NSString stringWithUTF8String:x264_tunes[i]]];
+        }
+    }
+    // the fastdecode checkbox is off by default
+    [fX264FastDecodeCheck setState: NSOffState];
+    // setup the h264 profile popup
+    [fX264ProfilePopUp removeAllItems];
+    const char * const * h264_profiles = hb_h264_profiles();
+    for (int i = 0; h264_profiles[i] != NULL; i++)
+    {
+        [fX264ProfilePopUp addItemWithTitle: [NSString stringWithUTF8String:h264_profiles[i]]];
+    }
+    // setup the h264 level popup
+    [fX264LevelPopUp removeAllItems];
+    const char * const * h264_levels = hb_h264_levels();
+    for (int i = 0; h264_levels[i] != NULL; i++)
+    {
+        [fX264LevelPopUp addItemWithTitle: [NSString stringWithUTF8String:h264_levels[i]]];
+    }
+    // clear the additional x264 options
+    [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:@""];
+}
+
+- (void) enableX264Widgets: (bool) enable
+{
+    NSControl *controls[] =
+    {
+        fX264PresetsSlider, fX264PresetSliderLabel, fX264PresetSelectedTextField,
+        fX264TunePopUp, fX264TunePopUpLabel, fX264FastDecodeCheck,
+        fDisplayX264PresetsAdditonalOptionsTextField, fDisplayX264PresetsAdditonalOptionsLabel,
+        fX264ProfilePopUp, fX264ProfilePopUpLabel,
+        fX264LevelPopUp, fX264LevelPopUpLabel,
+        fDisplayX264PresetsUnparseTextField,
+    };
+    
+    // check whether the x264 preset system and the advanced panel should be enabled
+    BOOL enable_x264_controls  = (enable && [fX264UseAdvancedOptionsCheck state] == NSOffState);
+    BOOL enable_advanced_panel = (enable && [fX264UseAdvancedOptionsCheck state] == NSOnState);
+    
+    // enable/disable the checkbox and advanced panel
+    [fX264UseAdvancedOptionsCheck setEnabled:enable];
+    [fAdvancedOptions enableUI:enable_advanced_panel];
+    
+    // enable/disable the x264 preset system controls
+    for (unsigned i = 0; i < (sizeof(controls) / sizeof(NSControl*)); i++)
+    {
+        if ([[controls[i] className] isEqualToString: @"NSTextField"])
+        {
+            NSTextField *tf = (NSTextField*)controls[i];
+            if (![tf isBezeled])
+            {
+                [tf setTextColor:(enable_x264_controls       ?
+                                  [NSColor controlTextColor] :
+                                  [NSColor disabledControlTextColor])];
+                continue;
+            }
+        }
+        [controls[i] setEnabled:enable_x264_controls];
+    }
+}
+
+- (IBAction) updateX264Widgets: (id) sender
+{
+    if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
+    {
+        /*
+         * we are using or switching to the advanced panel
+         *
+         * if triggered by selectPreset or applyQueueSettingToMainWindow,
+         * the options string will have been specified explicitly - leave it.
+         *
+         * if triggered by the advanced panel on/off checkbox, set the options
+         * string to the value of the unparsed x264 preset system string.
+         */
+        if (sender == fX264UseAdvancedOptionsCheck)
+        {
+            if (fX264PresetsUnparsedUTF8String != NULL)
+            {
+                [fAdvancedOptions setOptions:
+                 [NSString stringWithUTF8String:fX264PresetsUnparsedUTF8String]];
+            }
+            else
+            {
+                [fAdvancedOptions setOptions:@""];
+            }
+        }
+    }
+    // enable/disable, populate and update the various widgets
+    [self             enableX264Widgets:       YES];
+    [self             x264PresetsSliderChanged:nil];
+    [fAdvancedOptions X264AdvancedOptionsSet:  nil];
+}
+
+#pragma mark -
+#pragma mark x264 preset system
+
+- (NSString*) x264Preset
+{
+    return (NSString*)[fX264PresetNames objectAtIndex:[fX264PresetsSlider intValue]];
+}
+
+- (NSString*) x264Tune
+{
+    NSString *x264Tune = @"";
+    if ([fX264TunePopUp indexOfSelectedItem])
+    {
+        x264Tune = [x264Tune stringByAppendingString:
+                    [fX264TunePopUp titleOfSelectedItem]];
+    }
+    if ([fX264FastDecodeCheck state])
+    {
+        if ([x264Tune length])
+        {
+            x264Tune = [x264Tune stringByAppendingString: @","];
+        }
+        x264Tune = [x264Tune stringByAppendingString: @"fastdecode"];
+    }
+    return x264Tune;
+}
+
+- (NSString*) x264OptionExtra
+{
+    return [fDisplayX264PresetsAdditonalOptionsTextField stringValue];
+}
+
+- (NSString*) h264Profile
+{
+    if ([fX264ProfilePopUp indexOfSelectedItem])
+    {
+        return [fX264ProfilePopUp titleOfSelectedItem];
+    }
+    return @"";
+}
+
+- (NSString*) h264Level
+{
+    if ([fX264LevelPopUp indexOfSelectedItem])
+    {
+        return [fX264LevelPopUp titleOfSelectedItem];
+    }
+    return @"";
+}
+
+- (void) setX264Preset: (NSString*)x264Preset
+{
+    if (x264Preset)
+    {
+        NSString *name;
+        NSEnumerator *enumerator = [fX264PresetNames objectEnumerator];
+        while ((name = (NSString *)[enumerator nextObject]))
+        {
+            if ([name isEqualToString:x264Preset])
+            {
+                [fX264PresetsSlider setIntegerValue:
+                 [fX264PresetNames indexOfObject:name]];
+                return;
+            }
+        }
+    }
+    [fX264PresetsSlider setIntegerValue:fX264MediumPresetIndex];
+}
+
+- (void) setX264Tune: (NSString*)x264Tune
+{
+    if (!x264Tune)
+    {
+        [fX264TunePopUp selectItemAtIndex:0];
+        [fX264FastDecodeCheck setState:NSOffState];
+        return;
+    }
+    // handle fastdecode
+    if ([x264Tune rangeOfString:@"fastdecode"].location != NSNotFound)
+    {
+        [fX264FastDecodeCheck setState:NSOnState];
+    }
+    else
+    {
+        [fX264FastDecodeCheck setState:NSOffState];
+    }
+    // filter out fastdecode
+    x264Tune = [x264Tune stringByReplacingOccurrencesOfString:@","
+                                                   withString:@""];
+    x264Tune = [x264Tune stringByReplacingOccurrencesOfString:@"fastdecode"
+                                                   withString:@""];
+    // set the tune
+    [fX264TunePopUp selectItemWithTitle:x264Tune];
+    // fallback
+    if ([fX264TunePopUp indexOfSelectedItem] == -1)
+    {
+        [fX264TunePopUp selectItemAtIndex:0];
+    }
+}
+
+- (void) setX264OptionExtra: (NSString*)x264OptionExtra
+{
+    if (!x264OptionExtra)
+    {
+        [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:@""];
+        return;
+    }
+    [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:x264OptionExtra];
+}
+
+- (void) setH264Profile: (NSString*)h264Profile
+{
+    if (!h264Profile)
+    {
+        [fX264ProfilePopUp selectItemAtIndex:0];
+        return;
+    }
+    // set the profile
+    [fX264ProfilePopUp selectItemWithTitle:h264Profile];
+    // fallback
+    if ([fX264ProfilePopUp indexOfSelectedItem] == -1)
+    {
+        [fX264ProfilePopUp selectItemAtIndex:0];
+    }
+}
+
+- (void) setH264Level: (NSString*)h264Level
+{
+    if (!h264Level)
+    {
+        [fX264LevelPopUp selectItemAtIndex:0];
+        return;
+    }
+    // set the level
+    [fX264LevelPopUp selectItemWithTitle:h264Level];
+    // fallback
+    if ([fX264LevelPopUp indexOfSelectedItem] == -1)
+    {
+        [fX264LevelPopUp selectItemAtIndex:0];
+    }
+}
+
+
+- (IBAction) x264PresetsSliderChanged: (id) sender
+{ 
+    // we assume the preset names and slider were setup properly
+    [fX264PresetSelectedTextField setStringValue: [self x264Preset]];
+    [self x264PresetsChangedDisplayExpandedOptions:nil];
+    
+}
+
+/* This is called everytime a x264 widget in the video tab is changed to 
+   display the expanded options in a text field via outlet fDisplayX264PresetsUnparseTextField
+ */
+- (IBAction) x264PresetsChangedDisplayExpandedOptions: (id) sender
+
+{
+   /* API reference:
+    *
+    * char * hb_x264_param_unparse(const char *x264_preset,
+    *                              const char *x264_tune,
+    *                              const char *x264_encopts,
+    *                              const char *h264_profile,
+    *                              const char *h264_level,
+    *                              int width, int height);
+    */
+    NSString   *tmpString;
+    const char *x264_preset   = [[self x264Preset] UTF8String];
+    const char *x264_tune     = NULL;
+    const char *advanced_opts = NULL;
+    const char *h264_profile  = NULL;
+    const char *h264_level    = NULL;
+    int         width         = 1;
+    int         height        = 1;
+    // prepare the tune, advanced options, profile and level
+    if ([(tmpString = [self x264Tune]) length])
+    {
+        x264_tune = [tmpString UTF8String];
+    }
+    if ([(tmpString = [self x264OptionExtra]) length])
+    {
+        advanced_opts = [tmpString UTF8String];
+    }
+    if ([(tmpString = [self h264Profile]) length])
+    {
+        h264_profile = [tmpString UTF8String];
+    }
+    if ([(tmpString = [self h264Level]) length])
+    {
+        h264_level = [tmpString UTF8String];
+    }
+    // width and height must be non-zero
+    if (fX264PresetsWidthForUnparse && fX264PresetsHeightForUnparse)
+    {
+        width  = fX264PresetsWidthForUnparse;
+        height = fX264PresetsHeightForUnparse;
+    }
+    // free the previous unparsed string
+    free(fX264PresetsUnparsedUTF8String);
+    // now, unparse
+    fX264PresetsUnparsedUTF8String = hb_x264_param_unparse(x264_preset,
+                                                           x264_tune,
+                                                           advanced_opts,
+                                                           h264_profile,
+                                                           h264_level,
+                                                           width, height);
+    // update the text field
+    if (fX264PresetsUnparsedUTF8String != NULL)
+    {
+        [fDisplayX264PresetsUnparseTextField setStringValue:
+         [NSString stringWithFormat:@"x264 Unparse: %s",
+          fX264PresetsUnparsedUTF8String]];
+    }
+    else
+    {
+        [fDisplayX264PresetsUnparseTextField setStringValue:@"x264 Unparse:"];
+    }
+}
+
+#pragma mark -
 #pragma mark - Picture
 
 /* lets set the picture size back to the max from right after title scan
@@ -5042,128 +5725,198 @@
 /* Get and Display Current Pic Settings in main window */
 - (IBAction) calculatePictureSizing: (id) sender
 {
-	if (fTitle->job->anamorphic.mode > 0)
-	{
-        fTitle->job->keep_ratio = 0;
-	}
-    
-    if (fTitle->job->anamorphic.mode != 1) // we are not strict so show the modulus
-	{
-        [fPictureSizeField setStringValue: [NSString stringWithFormat:@"Picture Size: %@, Modulus: %d", [fPictureController getPictureSizeInfoString], fTitle->job->modulus]];
-    }
-    else
+    if (fTitle->job->anamorphic.mode > 0)
     {
-        [fPictureSizeField setStringValue: [NSString stringWithFormat:@"Picture Size: %@", [fPictureController getPictureSizeInfoString]]];
+        fTitle->job->keep_ratio = 0;
     }
-    NSString *picCropping;
-    /* Set the display field for crop as per boolean */
-	if (![fPictureController autoCrop])
-	{
-        picCropping =  @"Custom";
-	}
-	else
-	{
-		picCropping =  @"Auto";
-	}
-    picCropping = [picCropping stringByAppendingString:[NSString stringWithFormat:@" %d/%d/%d/%d",fTitle->job->crop[0],fTitle->job->crop[1],fTitle->job->crop[2],fTitle->job->crop[3]]];
-    
-    [fPictureCroppingField setStringValue: [NSString stringWithFormat:@"Picture Cropping: %@",picCropping]];
     
-    NSString *videoFilters;
-    videoFilters = @"";
-    /* Detelecine */
-    if ([fPictureController detelecine] == 2) 
-    {
-        videoFilters = [videoFilters stringByAppendingString:@" - Detelecine (Default)"];
-    }
-    else if ([fPictureController detelecine] == 1) 
+    // align picture settings and video filters in the UI using tabs
+    [fPictureSettingsField setStringValue:[NSString stringWithFormat:@"Picture Settings:  \t %@",
+                                           [self pictureSettingsSummary]]];
+    [fPictureFiltersField  setStringValue:[NSString stringWithFormat:@"Picture Filters: \t\t %@",
+                                           [self pictureFiltersSummary]]];
+    
+    /* Store storage resolution for unparse */
+    fX264PresetsWidthForUnparse  = fTitle->job->width;
+    fX264PresetsHeightForUnparse = fTitle->job->height;
+    // width or height may have changed, unparse
+    [self x264PresetsChangedDisplayExpandedOptions:nil];
+    
+    // reload still previews
+    // note: fTitle->job->deinterlace is set by fPictureController now
+    [fPictureController decombDeinterlacePreviewImage];
+}
+
+#pragma mark -
+#pragma mark - Text Summaries
+
+- (NSString*) pictureSettingsSummary
+{
+    NSMutableString *summary = [NSMutableString stringWithString:@""];
+    if (fPictureController && fTitle && fTitle->job)
     {
-        videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[fPictureController detelecineCustomString]]];
+        [summary appendString:[fPictureController getPictureSizeInfoString]];
+        if (fTitle->job->anamorphic.mode != 1)
+        {
+            // anamorphic is not Strict, show the modulus
+            [summary appendFormat:@", Modulus: %d", fTitle->job->modulus];
+        }
+        [summary appendFormat:@", Crop: %s %d/%d/%d/%d",
+         [fPictureController autoCrop] ? "Auto" : "Custom",
+         fTitle->job->crop[0], fTitle->job->crop[1],
+         fTitle->job->crop[2], fTitle->job->crop[3]];
     }
-    
-    
-    if ([fPictureController useDecomb] == 1)
+    return [NSString stringWithString:summary];
+}
+
+- (NSString*) pictureFiltersSummary
+{
+    NSMutableString *summary = [NSMutableString stringWithString:@""];
+    if (fPictureController)
     {
-        /* Decomb */
-        if ([fPictureController decomb] == 3)
+        /* Detelecine */
+        switch ([fPictureController detelecine])
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Fast)"];
+            case 1:
+                [summary appendFormat:@" - Detelecine (%@)",
+                 [fPictureController detelecineCustomString]];
+                break;
+                
+            case 2:
+                [summary appendString:@" - Detelecine (Default)"];
+                break;
+                
+            default:
+                break;
         }
-        else if ([fPictureController decomb] == 2)
+        
+        if ([fPictureController useDecomb] == 1)
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Default)"];
+            /* Decomb */
+            switch ([fPictureController decomb])
+            {
+                case 1:
+                    [summary appendFormat:@" - Decomb (%@)",
+                     [fPictureController decombCustomString]];
+                    break;
+                    
+                case 2:
+                    [summary appendString:@" - Decomb (Default)"];
+                    break;
+                    
+                case 3:
+                    [summary appendString:@" - Decomb (Fast)"];
+                    break;
+                    
+                case 4:
+                    [summary appendString:@" - Decomb (Bob)"];
+                    break;
+                    
+                default:
+                    break;
+            }
         }
-        else if ([fPictureController decomb] == 1)
+        else
         {
-            videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[fPictureController decombCustomString]]];
+            /* Deinterlace */
+            switch ([fPictureController deinterlace])
+            {
+                case 1:
+                    [summary appendFormat:@" - Deinterlace (%@)",
+                     [fPictureController deinterlaceCustomString]];
+                    break;
+                    
+                case 2:
+                    [summary appendString:@" - Deinterlace (Fast)"];
+                    break;
+                    
+                case 3:
+                    [summary appendString:@" - Deinterlace (Slow)"];
+                    break;
+                    
+                case 4:
+                    [summary appendString:@" - Deinterlace (Slower)"];
+                    break;
+                    
+                case 5:
+                    [summary appendString:@" - Deinterlace (Bob)"];
+                    break;
+                    
+                default:
+                    break;
+            }
         }
-    }
-    else
-    {
-        /* Deinterlace */
-        if ([fPictureController deinterlace] > 0)
+        
+        /* Deblock */
+        if ([fPictureController deblock] > 0)
         {
-            fTitle->job->deinterlace  = 1;
+            [summary appendFormat:@" - Deblock (%d)",
+             [fPictureController deblock]];
         }
-        else
+        
+        /* Denoise */
+        switch ([fPictureController denoise])
         {
-            fTitle->job->deinterlace  = 0;
+            case 1:
+                [summary appendFormat:@" - Denoise (%@)",
+                 [fPictureController denoiseCustomString]];
+                break;
+                
+            case 2:
+                [summary appendString:@" - Denoise (Weak)"];
+                break;
+                
+            case 3:
+                [summary appendString:@" - Denoise (Medium)"];
+                break;
+                
+            case 4:
+                [summary appendString:@" - Denoise (Strong)"];
+                break;
+                
+            default:
+                break;
         }
         
-        if ([fPictureController deinterlace] == 2)
+        /* Grayscale */
+        if ([fPictureController grayscale]) 
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"];
+            [summary appendString:@" - Grayscale"];
         }
-        else if ([fPictureController deinterlace] == 3)
+    }
+    if ([summary hasPrefix:@" - "])
+    {
+        [summary deleteCharactersInRange:NSMakeRange(0, 3)];
+    }
+    return [NSString stringWithString:summary];
+}
+
+- (NSString*) muxerOptionsSummary
+{
+    NSMutableString *summary = [NSMutableString stringWithString:@""];
+    if (([fDstFormatPopUp selectedItem]) &&
+        [[fDstFormatPopUp selectedItem] tag] == HB_MUX_MP4)
+    {
+        if ([fDstMp4LargeFileCheck state])
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slow)"];
+            [summary appendString:@" - Large file size"];
         }
-        else if ([fPictureController deinterlace] == 4)
+        if ([fDstMp4HttpOptFileCheck state])
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"];
+            [summary appendString:@" - Web optimized"];
         }
-        else if ([fPictureController deinterlace] == 1)
+        if ([fDstMp4iPodFileCheck state])
         {
-            videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[fPictureController deinterlaceCustomString]]];
+            [summary appendString:@" - iPod 5G support"];
         }
-	}
-    
-    
-    /* Denoise */
-	if ([fPictureController denoise] == 2)
-	{
-		videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Weak)"];
-    }
-	else if ([fPictureController denoise] == 3)
-	{
-		videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Medium)"];
-    }
-	else if ([fPictureController denoise] == 4)
-	{
-		videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Strong)"];
-	}
-    else if ([fPictureController denoise] == 1)
-	{
-		videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[fPictureController denoiseCustomString]]];
-	}
-    
-    /* Deblock */
-    if ([fPictureController deblock] > 0) 
-    {
-        videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deblock (%d)",[fPictureController deblock]]];
     }
-	
-    /* Grayscale */
-    if ([fPictureController grayscale]) 
+    if ([summary hasPrefix:@" - "])
     {
-        videoFilters = [videoFilters stringByAppendingString:@" - Grayscale"];
+        [summary deleteCharactersInRange:NSMakeRange(0, 3)];
     }
-    [fVideoFiltersField setStringValue: [NSString stringWithFormat:@"Video Filters: %@", videoFilters]];
-    
-    //[fPictureController reloadStillPreview]; 
+    return [NSString stringWithString:summary];
 }
 
-
 #pragma mark -
 #pragma mark - Audio and Subtitles
 
@@ -5269,7 +6022,8 @@
 }
 
 
-- (IBAction) toggleDrawer:(id)sender {
+- (IBAction) toggleDrawer:(id)sender
+{
     [fPresetDrawer toggle:self];
 }
 
@@ -5462,12 +6216,12 @@
             
             
         }
-        /* We use Bold Text for the HB Default */
-        if ([[item objectForKey:@"Default"] intValue] == 1)// 1 is HB default
+        /* We use bold text for the default preset */
+        if (presetUserDefault == nil &&                    // no User default found
+            [[item objectForKey:@"Default"] intValue] == 1)// 1 is HB default
         {
             txtFont = [NSFont boldSystemFontOfSize: [NSFont smallSystemFontSize]];
         }
-        /* We use Bold Text for the User Specified Default */
         if ([[item objectForKey:@"Default"] intValue] == 2)// 2 is User default
         {
             txtFont = [NSFont boldSystemFontOfSize: [NSFont smallSystemFontSize]];
@@ -5671,15 +6425,55 @@
         /* Video encoder */
         [fVidEncoderPopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoEncoder"]];
         [self videoEncoderPopUpChanged:nil];
-        /* We set the advanced opt string here if applicable*/
-        if ([chosenPreset objectForKey:@"x264Option"])
-        {
-            [fAdvancedOptions setOptions:[chosenPreset objectForKey:@"x264Option"]];
-        }
-        else
+        
+        if ([[chosenPreset objectForKey:@"VideoEncoder"] isEqualToString:@"H.264 (x264)"])
         {
-            [fAdvancedOptions setOptions:@""];   
+            if (![chosenPreset objectForKey:@"x264UseAdvancedOptions"] ||
+                [[chosenPreset objectForKey:@"x264UseAdvancedOptions"] intValue])
+            {
+                /*
+                 * x264UseAdvancedOptions is not set (legacy preset)
+                 * or set to 1 (enabled), so we use the old advanced panel
+                 */
+                if ([chosenPreset objectForKey:@"x264Option"])
+                {
+                    /* we set the advanced options string here if applicable */
+                    [fAdvancedOptions setOptions:        [chosenPreset objectForKey:@"x264Option"]];
+                    [self             setX264OptionExtra:[chosenPreset objectForKey:@"x264Option"]];
+                }
+                else
+                {
+                    [fAdvancedOptions setOptions:        @""];
+                    [self             setX264OptionExtra:nil];
+                }
+                /* preset does not use the x264 preset system, reset the widgets */
+                [self setX264Preset: nil];
+                [self setX264Tune:   nil];
+                [self setH264Profile:nil];
+                [self setH264Level:  nil];
+                /* we enable the advanced panel and update the widgets */
+                [fX264UseAdvancedOptionsCheck setState:NSOnState];
+                [self updateX264Widgets:nil];
+            }
+            else
+            {
+                /*
+                 * x264UseAdvancedOptions is set to 0 (disabled),
+                 * so we use the x264 preset system
+                 */
+                [self setX264Preset:     [chosenPreset objectForKey:@"x264Preset"]];
+                [self setX264Tune:       [chosenPreset objectForKey:@"x264Tune"]];
+                [self setX264OptionExtra:[chosenPreset objectForKey:@"x264OptionExtra"]];
+                [self setH264Profile:    [chosenPreset objectForKey:@"h264Profile"]];
+                [self setH264Level:      [chosenPreset objectForKey:@"h264Level"]];
+                /* preset does not use the advanced panel, reset it */
+                [fAdvancedOptions setOptions:@""];
+                /* we disable the advanced panel and update the widgets */
+                [fX264UseAdvancedOptionsCheck setState:NSOffState];
+                [self updateX264Widgets:nil];
+            }
         }
+        
         if ([chosenPreset objectForKey:@"lavcOption"])
         {
             [fAdvancedOptions setLavcOptions:[chosenPreset objectForKey:@"lavcOption"]];
@@ -5725,35 +6519,33 @@
         [self videoMatrixChanged:nil];
         
         /* Video framerate */
-        /* For video preset video framerate, we want to make sure that Same as source does not conflict with the
-         detected framerate in the fVidRatePopUp so we use index 0*/
         if ([[chosenPreset objectForKey:@"VideoFramerate"] isEqualToString:@"Same as source"])
         {
-            [fVidRatePopUp selectItemAtIndex: 0];
             /* Now set the Video Frame Rate Mode to either vfr or cfr according to the preset */
-            if (![chosenPreset objectForKey:@"VideoFramerateMode"] || [[chosenPreset objectForKey:@"VideoFramerateMode"] isEqualToString:@"vfr"])
+            if (![chosenPreset objectForKey:@"VideoFramerateMode"] ||
+                [[chosenPreset objectForKey:@"VideoFramerateMode"] isEqualToString:@"vfr"])
             {
-                [fFramerateMatrix selectCellAtRow: 0 column: 0]; // we want vfr
+                [fFramerateMatrix selectCellAtRow:0 column:0]; // we want vfr
             }
             else
             {
-                [fFramerateMatrix selectCellAtRow: 1 column: 0]; // we want cfr
+                [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
             }
         }
         else
         {
-            [fVidRatePopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoFramerate"]];
             /* Now set the Video Frame Rate Mode to either pfr or cfr according to the preset */
-            if ([[chosenPreset objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"] || [[chosenPreset objectForKey:@"VideoFrameratePFR"] intValue] == 1)
+            if ([[chosenPreset objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"] ||
+                [[chosenPreset objectForKey:@"VideoFrameratePFR"]  intValue] == 1)
             {
-                [fFramerateMatrix selectCellAtRow: 0 column: 0]; // we want pfr
+                [fFramerateMatrix selectCellAtRow:0 column:0]; // we want pfr
             }
             else
             {
-                [fFramerateMatrix selectCellAtRow: 1 column: 0]; // we want cfr
+                [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
             }
         }
-        
+        [fVidRatePopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoFramerate"]];
         [self videoFrameRateChanged:nil];
         
         /* 2 Pass Encoding */
@@ -5870,8 +6662,10 @@
                 job->modulus = 16;
             }
              
-            /* Check to see if the objectForKey:@"UsesPictureSettings is 2 which is "Use Max for the source */
-            if ([[chosenPreset objectForKey:@"UsesPictureSettings"]  intValue] == 2 || [[chosenPreset objectForKey:@"UsesMaxPictureSettings"]  intValue] == 1)
+            /* Check to see if the objectForKey:@"UsesPictureSettings" is 2,
+             * which means "Use max. picture size for the source" */
+            if ([[chosenPreset objectForKey:@"UsesPictureSettings"]    intValue] == 2 ||
+                [[chosenPreset objectForKey:@"UsesMaxPictureSettings"] intValue] == 1)
             {
                 /* Use Max Picture settings for whatever the dvd is.*/
                 [self revertPictureSizeToMax:nil];
@@ -5887,21 +6681,34 @@
                 }
                 job->anamorphic.mode = [[chosenPreset objectForKey:@"PicturePAR"]  intValue];
             }
-            else // /* If not 0 or 2 we assume objectForKey:@"UsesPictureSettings is 1 which is "Use picture sizing from when the preset was set" */
+            /* If not 0 or 2 we assume objectForKey:@"UsesPictureSettings" is 1,
+             * which means "Use the picture size specified in the preset" */
+            else
             {
-                /* we check to make sure the presets width/height does not exceed the sources width/height */
-                if (fTitle->width < [[chosenPreset objectForKey:@"PictureWidth"]  intValue] || fTitle->height < [[chosenPreset objectForKey:@"PictureHeight"]  intValue])
+                /*
+                 * if the preset specifies neither max. width nor height
+                 * (both are 0), use the max. picture size
+                 *
+                 * if the specified non-zero dimensions exceed those of the
+                 * source, also use the max. picture size (no upscaling)
+                 */
+                if (([[chosenPreset objectForKey:@"PictureWidth"]  intValue] <= 0 &&
+                     [[chosenPreset objectForKey:@"PictureHeight"] intValue] <= 0)              ||
+                    ([[chosenPreset objectForKey:@"PictureWidth"]  intValue] >  fTitle->width &&
+                     [[chosenPreset objectForKey:@"PictureHeight"] intValue] >  fTitle->height) ||
+                    ([[chosenPreset objectForKey:@"PictureHeight"] intValue] <= 0 &&
+                     [[chosenPreset objectForKey:@"PictureWidth"]  intValue] >  fTitle->width)  ||
+                    ([[chosenPreset objectForKey:@"PictureWidth"]  intValue] <= 0 &&
+                     [[chosenPreset objectForKey:@"PictureHeight"] intValue] >  fTitle->height))
                 {
-                    /* if so, then we use the sources height and width to avoid scaling up */
-                    //job->width = fTitle->width;
-                    //job->height = fTitle->height;
+                    /* use the source's width/height to avoid upscaling */
                     [self revertPictureSizeToMax:nil];
                 }
-                else // source width/height is >= the preset height/width
+                else // source width/height is >= preset width/height
                 {
-                    /* we can go ahead and use the presets values for height and width */
-                    job->width = [[chosenPreset objectForKey:@"PictureWidth"]  intValue];
-                    job->height = [[chosenPreset objectForKey:@"PictureHeight"]  intValue];
+                    /* use the preset values for width/height */
+                    job->width  = [[chosenPreset objectForKey:@"PictureWidth"]  intValue];
+                    job->height = [[chosenPreset objectForKey:@"PictureHeight"] intValue];
                 }
                 job->keep_ratio = [[chosenPreset objectForKey:@"PictureKeepRatio"]  intValue];
                 if (job->keep_ratio == 1)
@@ -6108,7 +6915,7 @@
             /*On Screen Notification*/
             int status;
             NSBeep();
-            status = NSRunAlertPanel(@"HandBrake has determined your built in presets are out of date...",@"HandBrake will now update your built-in presets.", @"OK", nil, nil);
+            status = NSRunAlertPanel(@"HandBrake has determined your built in presets are out of date…",@"HandBrake will now update your built-in presets.", @"OK", nil, nil);
             [NSApp requestUserAttention:NSCriticalRequest];
         }
         /* when alert is dismissed, go ahead and update the built in presets */
@@ -6120,9 +6927,9 @@
 
 - (IBAction) addPresetPicDropdownChanged: (id) sender
 {
-    if ([fPresetNewPicSettingsPopUp indexOfSelectedItem] == 1)
+    if ([[fPresetNewPicSettingsPopUp selectedItem] tag] == 1)
     {
-        [fPresetNewPicWidthHeightBox setHidden:NO];  
+        [fPresetNewPicWidthHeightBox setHidden:NO];
     }
     else
     {
@@ -6135,13 +6942,29 @@
     /* Deselect the currently selected Preset if there is one*/
     [fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
 
-    /* Populate the preset picture settings popup here */
+    /*
+     * Populate the preset picture settings popup.
+     *
+     * Custom is not applicable when the anamorphic mode is Strict.
+     *
+     * Use [NSMenuItem tag] to store preset values for each option.
+     */
     [fPresetNewPicSettingsPopUp removeAllItems];
     [fPresetNewPicSettingsPopUp addItemWithTitle:@"None"];
-    [fPresetNewPicSettingsPopUp addItemWithTitle:@"Custom"];
+    [[fPresetNewPicSettingsPopUp lastItem] setTag: 0];
+    if (fTitle->job->anamorphic.mode != 1)
+    {
+        // not Strict, Custom is applicable
+        [fPresetNewPicSettingsPopUp addItemWithTitle:@"Custom"];
+        [[fPresetNewPicSettingsPopUp lastItem] setTag: 1];
+    }
     [fPresetNewPicSettingsPopUp addItemWithTitle:@"Source Maximum (post source scan)"];
-    /* Use current width and height by default (Custom) */
-    [fPresetNewPicSettingsPopUp selectItemAtIndex: 1];
+    [[fPresetNewPicSettingsPopUp lastItem] setTag: 2];
+    /*
+     * Default to Source Maximum for anamorphic Strict
+     * Default to Custom for all other anamorphic modes
+     */
+    [fPresetNewPicSettingsPopUp selectItemWithTag: (1 + (fTitle->job->anamorphic.mode == 1))];
     /* Save the current filters in the preset by default */
     [fPresetNewPicFiltersCheck setState:NSOnState];
     // fPresetNewFolderCheck
@@ -6242,10 +7065,10 @@
     else // we are not creating a preset folder, so we go ahead with the rest of the preset info
     {
         /*Get the whether or not to apply pic Size and Cropping (includes Anamorphic)*/
-        [preset setObject:[NSNumber numberWithInt:[fPresetNewPicSettingsPopUp indexOfSelectedItem]] forKey:@"UsesPictureSettings"];
+        [preset setObject:[NSNumber numberWithInteger:[[fPresetNewPicSettingsPopUp selectedItem] tag]] forKey:@"UsesPictureSettings"];
         /* Get whether or not to use the current Picture Filter settings for the preset */
         [preset setObject:[NSNumber numberWithInt:[fPresetNewPicFiltersCheck state]] forKey:@"UsesPictureFilters"];
-        
+
         /* Get New Preset Description from the field in the AddPresetPanel*/
         [preset setObject:[fPresetNewDesc stringValue] forKey:@"PresetDescription"];
         /* File Format */
@@ -6262,8 +7085,38 @@
         /* Codecs */
         /* Video encoder */
         [preset setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
-        /* x264 Option String */
-        [preset setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
+        /* x264 Options, this will either be advanced panel or the video tabs x264 presets panel with modded option string */
+        
+        if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
+        {
+            /* use the old advanced panel */
+            [preset setObject:[NSNumber numberWithInt:1]       forKey:@"x264UseAdvancedOptions"];
+            [preset setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
+        }
+        else
+        {
+            /* use the x264 preset system */
+            [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+            [preset setObject:[self x264Preset]          forKey:@"x264Preset"];
+            [preset setObject:[self x264Tune]            forKey:@"x264Tune"];
+            [preset setObject:[self x264OptionExtra]     forKey:@"x264OptionExtra"];
+            [preset setObject:[self h264Profile]         forKey:@"h264Profile"];
+            [preset setObject:[self h264Level]           forKey:@"h264Level"];
+            /*
+             * bonus: set the unparsed options to make the preset compatible
+             * with old HB versions
+             */
+            if (fX264PresetsUnparsedUTF8String != NULL)
+            {
+                [preset setObject:[NSString stringWithUTF8String:fX264PresetsUnparsedUTF8String]
+                           forKey:@"x264Option"];
+            }
+            else
+            {
+                [preset setObject:@"" forKey:@"x264Option"];
+            }
+        }
+
         /* FFmpeg (lavc) Option String */
         [preset setObject:[fAdvancedOptions optionsStringLavc] forKey:@"lavcOption"];

HandBrake-0.9.9.tar.bz2/macosx/DockTextField.h Added

HandBrake-0.9.9.tar.bz2/macosx/DockTextField.m Added

@@ -0,0 +1,71 @@
+/*  DockTextField.m $
+ 
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "DockTextField.h"
+
+#define DOCK_TEXTFIELD_ALPHA 0.8
+#define DOCK_TEXTFIELD_FONTSIZE 28.0
+
+@implementation DockTextField
+
+@synthesize textToDisplay = _textToDisplay;
+@synthesize startColor = _startColor;
+@synthesize endColor = _endColor;
+
+- (id)initWithFrame:(NSRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [[self cell] setBezelStyle: NSTextFieldRoundedBezel];
+        _textToDisplay = @"";
+        [self changeGradientColors:[NSColor grayColor] endColor:[NSColor blackColor]];
+    }
+    
+    return self;
+}
+
+- (void)changeGradientColors:(NSColor*)startColor endColor:(NSColor*)endColor
+{
+    self.startColor = [startColor colorWithAlphaComponent:DOCK_TEXTFIELD_ALPHA];
+    self.endColor = [endColor colorWithAlphaComponent:DOCK_TEXTFIELD_ALPHA];
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    if (self.isHidden)
+        return;
+    
+    NSRect blackOutlineFrame = NSMakeRect(0.0, 0.0, [self bounds].size.width, [self bounds].size.height-1.0);
+    double radius = self.bounds.size.height / 2;
+
+    NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:self.startColor endingColor:self.endColor];
+    [gradient drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:blackOutlineFrame xRadius:radius yRadius:radius] angle:90];
+    [gradient release];
+    
+    NSMutableDictionary *drawStringAttributes = [[NSMutableDictionary alloc] init];
+	[drawStringAttributes setValue:[NSColor whiteColor] forKey:NSForegroundColorAttributeName];
+    [drawStringAttributes setValue:[NSFont boldSystemFontOfSize:DOCK_TEXTFIELD_FONTSIZE] forKey:NSFontAttributeName];
+	NSShadow *stringShadow = [[NSShadow alloc] init];
+	[stringShadow setShadowColor:[NSColor blackColor]];
+	NSSize shadowSize;
+	shadowSize.width = 2;
+	shadowSize.height = -2;
+	[stringShadow setShadowOffset:shadowSize];
+	[stringShadow setShadowBlurRadius:6];
+	[drawStringAttributes setValue:stringShadow forKey:NSShadowAttributeName];
+	[stringShadow release];
+	
+    NSString *MRString = _textToDisplay;
+	NSString *budgetString = [NSString stringWithFormat:@"%@", MRString];
+	NSSize stringSize = [budgetString sizeWithAttributes:drawStringAttributes];
+	NSPoint centerPoint;
+	centerPoint.x = (dirtyRect.size.width / 2) - (stringSize.width / 2);
+	centerPoint.y = dirtyRect.size.height / 2 - (stringSize.height / 2) - 2;
+	[budgetString drawAtPoint:centerPoint withAttributes:drawStringAttributes];
+	[drawStringAttributes release];
+}
+
+@end

HandBrake-0.9.8.tar.bz2/macosx/English.lproj/MainMenu.xib -> HandBrake-0.9.9.tar.bz2/macosx/English.lproj/MainMenu.xib Changed

@@ -2,47 +2,47 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSTabView</string>
-			<string>NSScroller</string>
-			<string>NSMenu</string>
-			<string>NSSliderCell</string>
+			<string>NSArrayController</string>
+			<string>NSBox</string>
 			<string>NSButton</string>
-			<string>NSTableHeaderView</string>
-			<string>NSMatrix</string>
+			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
-			<string>NSArrayController</string>
-			<string>NSImageView</string>
-			<string>NSTableView</string>
 			<string>NSCustomView</string>
-			<string>NSSlider</string>
+			<string>NSDrawer</string>
 			<string>NSImageCell</string>
-			<string>NSTextField</string>
+			<string>NSImageView</string>
+			<string>NSMatrix</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
 			<string>NSNumberFormatter</string>
-			<string>NSWindowTemplate</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
-			<string>NSTableColumn</string>
-			<string>NSBox</string>
-			<string>NSView</string>
 			<string>NSOutlineView</string>
+			<string>NSPopUpButton</string>
 			<string>NSPopUpButtonCell</string>
+			<string>NSProgressIndicator</string>
 			<string>NSScrollView</string>
+			<string>NSScroller</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
+			<string>NSTabView</string>
 			<string>NSTabViewItem</string>
-			<string>NSProgressIndicator</string>
+			<string>NSTableColumn</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
 			<string>NSUserDefaultsController</string>
-			<string>NSPopUpButton</string>
-			<string>NSMenuItem</string>
-			<string>NSDrawer</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -91,7 +91,7 @@
 							<reference key="NSNextKeyView" ref="1007421233"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="10523918">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4325376</int>
 								<string type="base64-UTF8" key="NSContents">RE8gTk9UIFRSQU5TTEFURSBUSElTIE5JQiBGSUxFLAo</string>
 								<object class="NSFont" key="NSSupport" id="26">
@@ -119,14 +119,15 @@
 									</object>
 								</object>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSProgressIndicator" id="222334056">
 							<reference key="NSNextResponder" ref="168918359"/>
 							<int key="NSvFlags">1288</int>
-							<object class="NSPSMatrix" key="NSDrawMatrix"/>
 							<string key="NSFrame">{{18, -26}, {930, 20}}</string>
 							<reference key="NSSuperview" ref="168918359"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<int key="NSpiFlags">16396</int>
 							<double key="NSMaxValue">100</double>
 						</object>
@@ -136,23 +137,26 @@
 							<string key="NSFrame">{{13, 28}, {940, 343}}</string>
 							<reference key="NSSuperview" ref="168918359"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1053078401"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSTabViewItem" id="107038816">
 									<string key="NSIdentifier">1</string>
 									<object class="NSView" key="NSView" id="1053078401">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="712502892"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
 											<object class="NSTextField" id="521019277">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 205}, {94, 19}}</string>
+												<string key="NSFrame">{{14, 247}, {94, 19}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="888819828"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="200565868">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4194304</int>
 													<string key="NSContents">Video Quality:</string>
 													<reference key="NSSupport" ref="26"/>
@@ -160,15 +164,18 @@
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="783405221">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{170, 166}, {84, 19}}</string>
+												<string key="NSFrame">{{170, 209}, {84, 19}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="1000247853"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="351953267">
-													<int key="NSCellFlags">-1804468671</int>
+													<int key="NSCellFlags">-1804599231</int>
 													<int key="NSCellFlags2">4326400</int>
 													<string key="NSContents"/>
 													<reference key="NSSupport" ref="26"/>
@@ -190,15 +197,18 @@
 														<reference key="NSColor" ref="544409939"/>
 													</object>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSSlider" id="239657287">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{281, 186}, {622, 16}}</string>
+												<string key="NSFrame">{{281, 229}, {622, 16}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="783405221"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSSliderCell" key="NSCell" id="160453387">
-													<int key="NSCellFlags">67501824</int>
+													<int key="NSCellFlags">67371264</int>
 													<int key="NSCellFlags2">262144</int>
 													<object class="NSMutableString" key="NSContents">
 														<characters key="NS.bytes"/>
@@ -218,31 +228,37 @@
 													<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
 													<bool key="NSVertical">NO</bool>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="987137669">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 63}, {892, 14}}</string>
+												<string key="NSFrame">{{16, 20}, {892, 14}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="503933842"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="537000521">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Picture Size: </string>
+													<string key="NSContents">Picture Settings:</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="987137669"/>
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="690304958">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{192, 188}, {65, 14}}</string>
+												<string key="NSFrame">{{192, 231}, {65, 14}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="239657287"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="923732752">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">-2143158272</int>
 													<string key="NSContents"/>
 													<reference key="NSSupport" ref="26"/>
@@ -260,7 +276,7 @@
 																<string>numberStyle</string>
 																<string>positiveInfinitySymbol</string>
 															</object>
-															<object class="NSMutableArray" key="dict.values">
+															<object class="NSArray" key="dict.values">
 																<bool key="EncodedWithXMLCoder">YES</bool>
 																<boolean value="YES"/>
 																<integer value="1040"/>
@@ -317,15 +333,18 @@
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="323705695">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{167, 188}, {28, 14}}</string>
+												<string key="NSFrame">{{167, 231}, {28, 14}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="690304958"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="936221726">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4325376</int>
 													<string key="NSContents">RF:</string>
 													<reference key="NSSupport" ref="26"/>
@@ -333,51 +352,41 @@
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
-											</object>
-											<object class="NSTextField" id="690364175">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 45}, {892, 14}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="508148739">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Picture Cropping:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="690364175"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="503933842">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 17}, {892, 14}}</string>
+												<string key="NSFrame">{{16, 4}, {892, 14}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="109092334">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Video Filters:</string>
+													<string key="NSContents">Picture Filters:</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="503933842"/>
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSPopUpButton" id="222980245">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{372, 254}, {158, 22}}</string>
+												<string key="NSFrame">{{372, 272}, {158, 22}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="521019277"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="343952154">
-													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags">-2076180416</int>
 													<int key="NSCellFlags2">132096</int>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="222980245"/>
-													<int key="NSButtonFlags">109199615</int>
+													<int key="NSButtonFlags">109199360</int>
 													<int key="NSButtonFlags2">1</int>
 													<reference key="NSAlternateImage" ref="26"/>
 													<string key="NSAlternateContents"/>
@@ -419,20 +428,23 @@
 													<bool key="NSAltersState">YES</bool>
 													<int key="NSArrowPosition">1</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSButton" id="1000247853">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{279, 166}, {124, 18}}</string>
+												<string key="NSFrame">{{279, 209}, {124, 18}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="447003158"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="860863090">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">131072</int>
 													<string key="NSContents">2-pass encoding</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="1000247853"/>
-													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags">1211912448</int>
 													<int key="NSButtonFlags2">2</int>
 													<object class="NSButtonImageSource" key="NSAlternateImage" id="624832340">
 														<string key="NSImageName">NSSwitch</string>
@@ -442,20 +454,23 @@
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSButton" id="447003158">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{416, 167}, {107, 16}}</string>
+												<string key="NSFrame">{{416, 210}, {107, 16}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="954159030"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="1070893195">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">131072</int>
 													<string key="NSContents">Turbo first pass</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="447003158"/>
-													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags">1211912448</int>
 													<int key="NSButtonFlags2">2</int>
 													<object class="NSCustomResource" key="NSNormalImage" id="887198214">
 														<string key="NSClassName">NSImage</string>
@@ -467,19 +482,22 @@
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSPopUpButton" id="12330413">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{98, 254}, {149, 22}}</string>
+												<string key="NSFrame">{{98, 272}, {149, 22}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="463960465"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="1018849574">
-													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags">-2076180416</int>
 													<int key="NSCellFlags2">132096</int>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="12330413"/>
-													<int key="NSButtonFlags">109199615</int>
+													<int key="NSButtonFlags">109199360</int>
 													<int key="NSButtonFlags2">1</int>
 													<reference key="NSAlternateImage" ref="26"/>
 													<string key="NSAlternateContents"/>
@@ -515,15 +533,18 @@
 													<bool key="NSAltersState">YES</bool>
 													<int key="NSArrowPosition">1</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="463960465">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{278, 256}, {92, 17}}</string>
+												<string key="NSFrame">{{278, 274}, {92, 17}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="222980245"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="509250281">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">71303168</int>
 													<string key="NSContents">Framerate (FPS):</string>
 													<reference key="NSSupport" ref="26"/>
@@ -531,15 +552,18 @@
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSTextField" id="1064150725">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 256}, {79, 17}}</string>
+												<string key="NSFrame">{{14, 274}, {79, 17}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="12330413"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="451922400">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4194304</int>
 													<string key="NSContents">Video Codec:</string>
 													<reference key="NSSupport" ref="26"/>
@@ -547,25 +571,29 @@
 													<reference key="NSBackgroundColor" ref="242973447"/>
 													<reference key="NSTextColor" ref="701609070"/>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSMatrix" id="1036976683">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{17, 166}, {145, 38}}</string>
+												<string key="NSFrame">{{17, 209}, {145, 38}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="323705695"/>
 												<bool key="NSEnabled">YES</bool>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 												<int key="NSNumRows">2</int>
 												<int key="NSNumCols">1</int>
 												<object class="NSMutableArray" key="NSCells">
 													<bool key="EncodedWithXMLCoder">YES</bool>
 													<object class="NSButtonCell" id="613962178">
-														<int key="NSCellFlags">-2080244224</int>
+														<int key="NSCellFlags">-2080374784</int>
 														<int key="NSCellFlags2">131072</int>
 														<string key="NSContents">Constant Quality</string>
 														<reference key="NSSupport" ref="26"/>
 														<reference key="NSControlView" ref="1036976683"/>
 														<int key="NSTag">1</int>
-														<int key="NSButtonFlags">1211912703</int>
+														<int key="NSButtonFlags">1211912448</int>
 														<int key="NSButtonFlags2">0</int>
 														<object class="NSButtonImageSource" key="NSAlternateImage" id="860784734">
 															<string key="NSImageName">NSRadioButton</string>
@@ -576,12 +604,12 @@
 														<int key="NSPeriodicInterval">25</int>
 													</object>
 													<object class="NSButtonCell" id="878990764">
-														<int key="NSCellFlags">67239424</int>
+														<int key="NSCellFlags">67108864</int>
 														<int key="NSCellFlags2">131072</int>
 														<string key="NSContents">Average Bitrate (kbps):</string>
 														<reference key="NSSupport" ref="26"/>
 														<reference key="NSControlView" ref="1036976683"/>
-														<int key="NSButtonFlags">1211912703</int>
+														<int key="NSButtonFlags">1211912448</int>
 														<int key="NSButtonFlags2">0</int>
 														<object class="NSImage" key="NSNormalImage">
 															<int key="NSImageFlags">549453824</int>
@@ -689,7 +717,7 @@
 												<int key="NSMatrixFlags">1151868928</int>
 												<string key="NSCellClass">NSActionCell</string>
 												<object class="NSButtonCell" key="NSProtoCell" id="121093497">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">0</int>
 													<string key="NSContents">Radio</string>
 													<object class="NSFont" key="NSSupport" id="273283760">
@@ -697,7 +725,7 @@
 														<double key="NSSize">13</double>
 														<int key="NSfFlags">1044</int>
 													</object>
-													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags">1211912448</int>
 													<int key="NSButtonFlags2">0</int>
 													<object class="NSImage" key="NSNormalImage">
 														<int key="NSImageFlags">549453824</int>
@@ -752,21 +780,24 @@
 											<object class="NSMatrix" id="888819828">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{540, 237}, {157, 38}}</string>
+												<string key="NSFrame">{{540, 255}, {157, 38}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="1036976683"/>
 												<bool key="NSEnabled">YES</bool>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 												<int key="NSNumRows">2</int>
 												<int key="NSNumCols">1</int>
 												<object class="NSMutableArray" key="NSCells">
 													<bool key="EncodedWithXMLCoder">YES</bool>
 													<object class="NSButtonCell" id="329026312">
-														<int key="NSCellFlags">-2080244224</int>
+														<int key="NSCellFlags">-2080374784</int>
 														<int key="NSCellFlags2">131072</int>
 														<string key="NSContents">Variable Framerate</string>
 														<reference key="NSSupport" ref="26"/>
 														<reference key="NSControlView" ref="888819828"/>
 														<int key="NSTag">1</int>
-														<int key="NSButtonFlags">1211912703</int>
+														<int key="NSButtonFlags">1211912448</int>
 														<int key="NSButtonFlags2">0</int>
 														<reference key="NSAlternateImage" ref="860784734"/>
 														<string key="NSAlternateContents"/>
@@ -775,12 +806,12 @@
 														<int key="NSPeriodicInterval">25</int>
 													</object>
 													<object class="NSButtonCell" id="995154792">
-														<int key="NSCellFlags">67239424</int>
+														<int key="NSCellFlags">67108864</int>
 														<int key="NSCellFlags2">131072</int>
 														<string key="NSContents">Constant Framerate</string>
 														<reference key="NSSupport" ref="26"/>
 														<reference key="NSControlView" ref="888819828"/>
-														<int key="NSButtonFlags">1211912703</int>
+														<int key="NSButtonFlags">1211912448</int>
 														<int key="NSButtonFlags2">0</int>
 														<object class="NSImage" key="NSNormalImage">
 															<int key="NSImageFlags">549453824</int>
@@ -885,11 +916,11 @@
 												<int key="NSMatrixFlags">1151868928</int>
 												<string key="NSCellClass">NSActionCell</string>
 												<object class="NSButtonCell" key="NSProtoCell" id="217044635">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">0</int>
 													<string key="NSContents">Radio</string>
 													<reference key="NSSupport" ref="273283760"/>
-													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags">1211912448</int>
 													<int key="NSButtonFlags2">0</int>
 													<object class="NSImage" key="NSNormalImage">
 														<int key="NSImageFlags">549453824</int>
@@ -941,8 +972,501 @@
 												<reference key="NSCellBackgroundColor" ref="809784795"/>
 												<reference key="NSFont" ref="273283760"/>
 											</object>
+											<object class="NSBox" id="954159030">
+												<reference key="NSNextResponder" ref="1053078401"/>
+												<int key="NSvFlags">12</int>
+												<object class="NSMutableArray" key="NSSubviews">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<object class="NSView" id="443817184">
+														<reference key="NSNextResponder" ref="954159030"/>
+														<int key="NSvFlags">274</int>
+														<object class="NSMutableArray" key="NSSubviews">
+															<bool key="EncodedWithXMLCoder">YES</bool>
+															<object class="NSSlider" id="480823072">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{243, 105}, {629, 16}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="1031662534"/>
+																<string key="NSReuseIdentifierKey">_NS:779</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSSliderCell" key="NSCell" id="690637620">
+																	<int key="NSCellFlags">-2080112384</int>
+																	<int key="NSCellFlags2">262144</int>
+																	<string key="NSContents"/>
+																	<string key="NSCellIdentifier">_NS:779</string>
+																	<reference key="NSControlView" ref="480823072"/>
+																	<double key="NSMaxValue">5</double>
+																	<double key="NSMinValue">0.0</double>
+																	<double key="NSValue">0.0</double>
+																	<double key="NSAltIncValue">0.0</double>
+																	<int key="NSNumberOfTickMarks">2</int>
+																	<int key="NSTickMarkPosition">1</int>
+																	<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+																	<bool key="NSVertical">NO</bool>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="139432403">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{15, 107}, {79, 13}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="527737261"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="367754591">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">71303168</int>
+																	<string key="NSContents">x264 Preset:</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="139432403"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="1031662534">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{15, 86}, {79, 13}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="610425389"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="444043003">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">71303168</int>
+																	<string key="NSContents">x264 Tune:</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="1031662534"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="102651997">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{15, 65}, {79, 13}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="112458239"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="858212432">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">71303168</int>
+																	<string key="NSContents">H.264 Profile:</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="102651997"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="8023338">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{15, 43}, {79, 13}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="144142005"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="248169798">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">71303168</int>
+																	<string key="NSContents">H.264 Level:</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="8023338"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSPopUpButton" id="610425389">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{98, 84}, {126, 15}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="884471415"/>
+																<string key="NSReuseIdentifierKey">_NS:868</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSPopUpButtonCell" key="NSCell" id="1050851477">
+																	<int key="NSCellFlags">-2076180416</int>
+																	<int key="NSCellFlags2">264192</int>
+																	<reference key="NSSupport" ref="22"/>
+																	<string key="NSCellIdentifier">_NS:868</string>
+																	<reference key="NSControlView" ref="610425389"/>
+																	<int key="NSButtonFlags">109199360</int>
+																	<int key="NSButtonFlags2">129</int>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">400</int>
+																	<int key="NSPeriodicInterval">75</int>
+																	<object class="NSMenuItem" key="NSMenuItem" id="791223578">
+																		<reference key="NSMenu" ref="353982019"/>
+																		<string key="NSTitle">Item 1</string>
+																		<string key="NSKeyEquiv"/>
+																		<int key="NSKeyEquivModMask">1048576</int>
+																		<int key="NSMnemonicLoc">2147483647</int>
+																		<int key="NSState">1</int>
+																		<reference key="NSOnImage" ref="447995298"/>
+																		<reference key="NSMixedImage" ref="760317610"/>
+																		<string key="NSAction">_popUpItemAction:</string>
+																		<reference key="NSTarget" ref="1050851477"/>
+																	</object>
+																	<bool key="NSMenuItemRespectAlignment">YES</bool>
+																	<object class="NSMenu" key="NSMenu" id="353982019">
+																		<string key="NSTitle">OtherViews</string>
+																		<object class="NSMutableArray" key="NSMenuItems">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<reference ref="791223578"/>
+																			<object class="NSMenuItem" id="645526467">
+																				<reference key="NSMenu" ref="353982019"/>
+																				<string key="NSTitle">Item 2</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="447995298"/>
+																				<reference key="NSMixedImage" ref="760317610"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="1050851477"/>
+																			</object>
+																			<object class="NSMenuItem" id="1035566125">
+																				<reference key="NSMenu" ref="353982019"/>
+																				<string key="NSTitle">Item 3</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="447995298"/>
+																				<reference key="NSMixedImage" ref="760317610"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="1050851477"/>
+																			</object>
+																		</object>
+																		<reference key="NSMenuFont" ref="273283760"/>
+																	</object>
+																	<int key="NSPreferredEdge">3</int>
+																	<bool key="NSUsesItemFromMenu">YES</bool>
+																	<bool key="NSAltersState">YES</bool>
+																	<int key="NSArrowPosition">1</int>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSPopUpButton" id="112458239">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{98, 63}, {126, 15}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="796460997"/>
+																<string key="NSReuseIdentifierKey">_NS:868</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSPopUpButtonCell" key="NSCell" id="1012707648">
+																	<int key="NSCellFlags">-2076180416</int>
+																	<int key="NSCellFlags2">264192</int>
+																	<reference key="NSSupport" ref="22"/>
+																	<string key="NSCellIdentifier">_NS:868</string>
+																	<reference key="NSControlView" ref="112458239"/>
+																	<int key="NSButtonFlags">109199360</int>
+																	<int key="NSButtonFlags2">129</int>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">400</int>
+																	<int key="NSPeriodicInterval">75</int>
+																	<object class="NSMenuItem" key="NSMenuItem" id="56675133">
+																		<reference key="NSMenu" ref="349551230"/>
+																		<string key="NSTitle">Item 1</string>
+																		<string key="NSKeyEquiv"/>
+																		<int key="NSKeyEquivModMask">1048576</int>
+																		<int key="NSMnemonicLoc">2147483647</int>
+																		<int key="NSState">1</int>
+																		<reference key="NSOnImage" ref="447995298"/>
+																		<reference key="NSMixedImage" ref="760317610"/>
+																		<string key="NSAction">_popUpItemAction:</string>
+																		<reference key="NSTarget" ref="1012707648"/>
+																	</object>
+																	<bool key="NSMenuItemRespectAlignment">YES</bool>
+																	<object class="NSMenu" key="NSMenu" id="349551230">
+																		<string key="NSTitle">OtherViews</string>
+																		<object class="NSMutableArray" key="NSMenuItems">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<reference ref="56675133"/>
+																			<object class="NSMenuItem" id="603447176">
+																				<reference key="NSMenu" ref="349551230"/>
+																				<string key="NSTitle">Item 2</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="447995298"/>
+																				<reference key="NSMixedImage" ref="760317610"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="1012707648"/>
+																			</object>
+																			<object class="NSMenuItem" id="691985983">
+																				<reference key="NSMenu" ref="349551230"/>
+																				<string key="NSTitle">Item 3</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="447995298"/>
+																				<reference key="NSMixedImage" ref="760317610"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="1012707648"/>
+																			</object>
+																		</object>
+																		<reference key="NSMenuFont" ref="273283760"/>
+																	</object>
+																	<int key="NSPreferredEdge">3</int>
+																	<bool key="NSUsesItemFromMenu">YES</bool>
+																	<bool key="NSAltersState">YES</bool>
+																	<int key="NSArrowPosition">1</int>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSPopUpButton" id="144142005">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{98, 41}, {126, 15}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="487526549"/>
+																<string key="NSReuseIdentifierKey">_NS:868</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSPopUpButtonCell" key="NSCell" id="379682863">
+																	<int key="NSCellFlags">-2076180416</int>
+																	<int key="NSCellFlags2">264192</int>
+																	<reference key="NSSupport" ref="22"/>
+																	<string key="NSCellIdentifier">_NS:868</string>
+																	<reference key="NSControlView" ref="144142005"/>
+																	<int key="NSButtonFlags">109199360</int>
+																	<int key="NSButtonFlags2">129</int>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">400</int>
+																	<int key="NSPeriodicInterval">75</int>
+																	<object class="NSMenuItem" key="NSMenuItem" id="658841842">
+																		<reference key="NSMenu" ref="957749846"/>
+																		<string key="NSTitle">Item 1</string>
+																		<string key="NSKeyEquiv"/>
+																		<int key="NSKeyEquivModMask">1048576</int>
+																		<int key="NSMnemonicLoc">2147483647</int>
+																		<int key="NSState">1</int>
+																		<reference key="NSOnImage" ref="447995298"/>
+																		<reference key="NSMixedImage" ref="760317610"/>
+																		<string key="NSAction">_popUpItemAction:</string>
+																		<reference key="NSTarget" ref="379682863"/>
+																	</object>
+																	<bool key="NSMenuItemRespectAlignment">YES</bool>
+																	<object class="NSMenu" key="NSMenu" id="957749846">
+																		<string key="NSTitle">OtherViews</string>
+																		<object class="NSMutableArray" key="NSMenuItems">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<reference ref="658841842"/>
+																			<object class="NSMenuItem" id="442645374">
+																				<reference key="NSMenu" ref="957749846"/>
+																				<string key="NSTitle">Item 2</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="447995298"/>
+																				<reference key="NSMixedImage" ref="760317610"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="379682863"/>
+																			</object>
+																			<object class="NSMenuItem" id="831415388">
+																				<reference key="NSMenu" ref="957749846"/>
+																				<string key="NSTitle">Item 3</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="447995298"/>
+																				<reference key="NSMixedImage" ref="760317610"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="379682863"/>
+																			</object>
+																		</object>
+																		<reference key="NSMenuFont" ref="273283760"/>
+																	</object>
+																	<int key="NSPreferredEdge">3</int>
+																	<bool key="NSUsesItemFromMenu">YES</bool>
+																	<bool key="NSAltersState">YES</bool>
+																	<int key="NSArrowPosition">1</int>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSButton" id="884471415">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{240, 84}, {108, 18}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="102651997"/>
+																<string key="NSReuseIdentifierKey">_NS:771</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSButtonCell" key="NSCell" id="140128742">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">131072</int>
+																	<string key="NSContents">Fast Decode</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<string key="NSCellIdentifier">_NS:771</string>
+																	<reference key="NSControlView" ref="884471415"/>
+																	<int key="NSButtonFlags">1211912448</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="887198214"/>
+																	<reference key="NSAlternateImage" ref="624832340"/>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="796460997">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{240, 65}, {110, 13}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="8023338"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="934066385">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">71303168</int>
+																	<string key="NSContents">Additional Options:</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="796460997"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="487526549">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{355, 43}, {517, 36}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="349581420"/>
+																<string key="NSReuseIdentifierKey">_NS:354</string>
+																<string key="NSAntiCompressionPriority">{250, 750}</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="284269747">
+																	<int key="NSCellFlags">-1805647871</int>
+																	<int key="NSCellFlags2">272760832</int>
+																	<string key="NSContents"/>
+																	<reference key="NSSupport" ref="26"/>
+																	<string key="NSCellIdentifier">_NS:354</string>
+																	<reference key="NSControlView" ref="487526549"/>
+																	<bool key="NSDrawsBackground">YES</bool>
+																	<reference key="NSBackgroundColor" ref="138233214"/>
+																	<reference key="NSTextColor" ref="378140636"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="527737261">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{96, 107}, {129, 13}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="480823072"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="513519725">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">4194304</int>
+																	<string key="NSContents"/>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="527737261"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSButton" id="902460295">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">268</int>
+																<string key="NSFrame">{{20, 127}, {209, 18}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="139432403"/>
+																<string key="NSReuseIdentifierKey">_NS:771</string>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSButtonCell" key="NSCell" id="191360965">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">131072</int>
+																	<string key="NSContents">Use x264 Advanced Options Panel</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<string key="NSCellIdentifier">_NS:771</string>
+																	<reference key="NSControlView" ref="902460295"/>
+																	<int key="NSButtonFlags">1211912448</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="887198214"/>
+																	<reference key="NSAlternateImage" ref="624832340"/>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+															<object class="NSTextField" id="349581420">
+																<reference key="NSNextResponder" ref="443817184"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{12, 6}, {863, 29}}</string>
+																<reference key="NSSuperview" ref="443817184"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSTextFieldCell" key="NSCell" id="812860538">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">4194304</int>
+																	<string key="NSContents">x264 Unparse:</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSControlView" ref="349581420"/>
+																	<reference key="NSBackgroundColor" ref="242973447"/>
+																	<reference key="NSTextColor" ref="701609070"/>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+														</object>
+														<string key="NSFrame">{{1, 1}, {890, 155}}</string>
+														<reference key="NSSuperview" ref="954159030"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="902460295"/>
+														<string key="NSReuseIdentifierKey">_NS:21</string>
+													</object>
+												</object>
+												<string key="NSFrame">{{14, 46}, {892, 157}}</string>
+												<reference key="NSSuperview" ref="1053078401"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="443817184"/>
+												<string key="NSReuseIdentifierKey">_NS:18</string>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">x264 Presets</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSBackgroundColor" ref="138233214"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<reference key="NSContentView" ref="443817184"/>
+												<int key="NSBorderType">1</int>
+												<int key="NSBoxType">0</int>
+												<int key="NSTitlePosition">0</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
 										</object>
 										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
+										<reference key="NSSuperview" ref="712502892"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="1064150725"/>
 									</object>
 									<string key="NSLabel">Video</string>
 									<reference key="NSColor" ref="242973447"/>
@@ -951,7 +1475,7 @@
 								<object class="NSTabViewItem" id="157300012">
 									<string key="NSIdentifier">2</string>
 									<object class="NSView" key="NSView" id="738554558">
-										<reference key="NSNextResponder" ref="712502892"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -975,15 +1499,15 @@
 																		<int key="NSvFlags">256</int>
 																		<string key="NSFrameSize">{884, 236}</string>
 																		<reference key="NSSuperview" ref="528259747"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="496546489"/>
 																		<bool key="NSEnabled">YES</bool>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																		<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 																		<object class="NSTableHeaderView" key="NSHeaderView" id="146611085">
 																			<reference key="NSNextResponder" ref="230332532"/>
 																			<int key="NSvFlags">256</int>
 																			<string key="NSFrameSize">{884, 17}</string>
 																			<reference key="NSSuperview" ref="230332532"/>
-																			<reference key="NSWindow"/>
 																			<reference key="NSNextKeyView" ref="528259747"/>
 																			<reference key="NSTableView" ref="792464451"/>
 																		</object>
@@ -992,7 +1516,6 @@
 																			<int key="NSvFlags">-2147483392</int>
 																			<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
 																			<reference key="NSSuperview" ref="933946879"/>
-																			<reference key="NSWindow"/>
 																			<reference key="NSNextKeyView" ref="230332532"/>
 																		</object>
 																		<object class="NSMutableArray" key="NSTableColumns">
@@ -1003,7 +1526,7 @@
 																				<double key="NSMinWidth">40</double>
 																				<double key="NSMaxWidth">1000</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents">Track</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1019,11 +1542,11 @@
 																					</object>
 																				</object>
 																				<object class="NSPopUpButtonCell" key="NSDataCell" id="871837653">
-																					<int key="NSCellFlags">-2076049856</int>
+																					<int key="NSCellFlags">-2076180416</int>
 																					<int key="NSCellFlags2">133120</int>
 																					<reference key="NSSupport" ref="26"/>
 																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags">-2038284288</int>
 																					<int key="NSButtonFlags2">129</int>
 																					<object class="NSFont" key="NSAlternateImage" id="995413175">
 																						<string key="NSName">LucidaGrande</string>
@@ -1069,7 +1592,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents">Codec</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1082,11 +1605,11 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSPopUpButtonCell" key="NSDataCell" id="4014313">
-																					<int key="NSCellFlags">-2076049856</int>
+																					<int key="NSCellFlags">-2076180416</int>
 																					<int key="NSCellFlags2">133120</int>
 																					<reference key="NSSupport" ref="26"/>
 																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags">-2038284288</int>
 																					<int key="NSButtonFlags2">129</int>
 																					<reference key="NSAlternateImage" ref="995413175"/>
 																					<string key="NSAlternateContents"/>
@@ -1129,7 +1652,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents">Mixdown</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1137,11 +1660,11 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSPopUpButtonCell" key="NSDataCell" id="1037917692">
-																					<int key="NSCellFlags">-2076049856</int>
+																					<int key="NSCellFlags">-2076180416</int>
 																					<int key="NSCellFlags2">133120</int>
 																					<reference key="NSSupport" ref="26"/>
 																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags">-2038284288</int>
 																					<int key="NSButtonFlags2">129</int>
 																					<reference key="NSAlternateImage" ref="995413175"/>
 																					<string key="NSAlternateContents"/>
@@ -1184,7 +1707,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents">Samplerate</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1192,11 +1715,11 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSPopUpButtonCell" key="NSDataCell" id="257530638">
-																					<int key="NSCellFlags">-2076049856</int>
+																					<int key="NSCellFlags">-2076180416</int>
 																					<int key="NSCellFlags2">133120</int>
 																					<reference key="NSSupport" ref="26"/>
 																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags">-2038284288</int>
 																					<int key="NSButtonFlags2">129</int>
 																					<reference key="NSAlternateImage" ref="995413175"/>
 																					<string key="NSAlternateContents"/>
@@ -1239,7 +1762,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents">Bitrate</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1247,11 +1770,11 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSPopUpButtonCell" key="NSDataCell" id="238248766">
-																					<int key="NSCellFlags">-2076049856</int>
+																					<int key="NSCellFlags">-2076180416</int>
 																					<int key="NSCellFlags2">133120</int>
 																					<reference key="NSSupport" ref="26"/>
 																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags">-2038284288</int>
 																					<int key="NSButtonFlags2">129</int>
 																					<reference key="NSAlternateImage" ref="995413175"/>
 																					<string key="NSAlternateContents"/>
@@ -1294,7 +1817,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028234663852886e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">134219776</int>
 																					<string key="NSContents">Gain</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1302,7 +1825,7 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSSliderCell" key="NSDataCell" id="723141526">
-																					<int key="NSCellFlags">-2079981824</int>
+																					<int key="NSCellFlags">-2080112384</int>
 																					<int key="NSCellFlags2">131072</int>
 																					<string key="NSContents"/>
 																					<reference key="NSControlView" ref="792464451"/>
@@ -1327,7 +1850,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028234663852886e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents"/>
 																					<reference key="NSSupport" ref="26"/>
@@ -1335,7 +1858,7 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSTextFieldCell" key="NSDataCell" id="718953459">
-																					<int key="NSCellFlags">337772096</int>
+																					<int key="NSCellFlags">337641536</int>
 																					<int key="NSCellFlags2">133120</int>
 																					<string key="NSContents">Text Cell</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1359,7 +1882,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">134219776</int>
 																					<string key="NSContents">DRC</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1367,7 +1890,7 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSSliderCell" key="NSDataCell" id="852982078">
-																					<int key="NSCellFlags">-2079981824</int>
+																					<int key="NSCellFlags">-2080112384</int>
 																					<int key="NSCellFlags2">131072</int>
 																					<string key="NSContents"/>
 																					<reference key="NSControlView" ref="792464451"/>
@@ -1392,7 +1915,7 @@
 																				<double key="NSMinWidth">10</double>
 																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75628096</int>
+																					<int key="NSCellFlags">75497536</int>
 																					<int key="NSCellFlags2">2048</int>
 																					<string key="NSContents"/>
 																					<reference key="NSSupport" ref="26"/>
@@ -1400,7 +1923,7 @@
 																					<reference key="NSTextColor" ref="188451177"/>
 																				</object>
 																				<object class="NSTextFieldCell" key="NSDataCell" id="750418243">
-																					<int key="NSCellFlags">337772096</int>
+																					<int key="NSCellFlags">337641536</int>
 																					<int key="NSCellFlags2">272761856</int>
 																					<string key="NSContents">Text</string>
 																					<reference key="NSSupport" ref="26"/>
@@ -1439,7 +1962,6 @@
 																</object>
 																<string key="NSFrame">{{1, 17}, {884, 236}}</string>
 																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="792464451"/>
 																<reference key="NSDocView" ref="792464451"/>
 																<reference key="NSBGColor" ref="355843302"/>
@@ -1450,8 +1972,8 @@
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{-100, -100}, {15, 206}}</string>
 																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="821562152"/>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																<reference key="NSTarget" ref="933946879"/>
 																<string key="NSAction">_doScroller:</string>
 																<double key="NSCurValue">37</double>
@@ -1462,8 +1984,8 @@
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{-100, -100}, {685, 15}}</string>
 																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="727606062"/>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																<int key="NSsFlags">1</int>
 																<reference key="NSTarget" ref="933946879"/>
 																<string key="NSAction">_doScroller:</string>
@@ -1478,7 +2000,6 @@
 																</object>
 																<string key="NSFrame">{{1, 0}, {884, 17}}</string>
 																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="146611085"/>
 																<reference key="NSDocView" ref="146611085"/>
 																<reference key="NSBGColor" ref="355843302"/>
@@ -1488,37 +2009,38 @@
 														</object>
 														<string key="NSFrame">{{17, 17}, {886, 254}}</string>
 														<reference key="NSSuperview" ref="577274772"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="528259747"/>
 														<int key="NSsFlags">133650</int>
 														<reference key="NSVScroller" ref="496546489"/>
 														<reference key="NSHScroller" ref="821562152"/>
 														<reference key="NSContentView" ref="528259747"/>
 														<reference key="NSHeaderClipView" ref="230332532"/>
-														<reference key="NSCornerView" ref="727606062"/>
 														<bytes key="NSScrollAmts">QSAAAEEgAABB2AAAQdgAAA</bytes>
+														<double key="NSMinMagnification">0.25</double>
+														<double key="NSMaxMagnification">4</double>
+														<double key="NSMagnification">1</double>
 													</object>
 													<object class="NSButton" id="883603583">
 														<reference key="NSNextResponder" ref="577274772"/>
 														<int key="NSvFlags">268</int>
 														<string key="NSFrame">{{16, 282}, {116, 16}}</string>
 														<reference key="NSSuperview" ref="577274772"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="334448622"/>
 														<bool key="NSEnabled">YES</bool>
 														<object class="NSButtonCell" key="NSCell" id="327570663">
-															<int key="NSCellFlags">67239424</int>
+															<int key="NSCellFlags">67108864</int>
 															<int key="NSCellFlags2">134479872</int>
 															<string key="NSContents">Add All Tracks</string>
 															<reference key="NSSupport" ref="22"/>
 															<reference key="NSControlView" ref="883603583"/>
-															<int key="NSButtonFlags">-2038284033</int>
+															<int key="NSButtonFlags">-2038284288</int>
 															<int key="NSButtonFlags2">129</int>
 															<string key="NSAlternateContents"/>
 															<string key="NSKeyEquivalent"/>
 															<int key="NSPeriodicDelay">200</int>
 															<int key="NSPeriodicInterval">25</int>
 														</object>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													</object>
 													<object class="NSBox" id="334448622">
 														<reference key="NSNextResponder" ref="577274772"/>
@@ -1535,18 +2057,17 @@
 																		<int key="NSvFlags">268</int>
 																		<string key="NSFrame">{{85, 8}, {41, 18}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="354328979"/>
 																		<string key="NSReuseIdentifierKey">_NS:771</string>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="707344957">
-																			<int key="NSCellFlags">-2080244224</int>
+																			<int key="NSCellFlags">-2080374784</int>
 																			<int key="NSCellFlags2">262144</int>
 																			<string key="NSContents">MP3</string>
 																			<reference key="NSSupport" ref="22"/>
 																			<string key="NSCellIdentifier">_NS:771</string>
 																			<reference key="NSControlView" ref="162512199"/>
-																			<int key="NSButtonFlags">1211912703</int>
+																			<int key="NSButtonFlags">1211912448</int>
 																			<int key="NSButtonFlags2">2</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1555,24 +2076,24 @@
 																			<int key="NSPeriodicDelay">200</int>
 																			<int key="NSPeriodicInterval">25</int>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSButton" id="354328979">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">268</int>
 																		<string key="NSFrame">{{130, 8}, {47, 18}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="453548414"/>
 																		<string key="NSReuseIdentifierKey">_NS:771</string>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="243873688">
-																			<int key="NSCellFlags">-2080244224</int>
+																			<int key="NSCellFlags">-2080374784</int>
 																			<int key="NSCellFlags2">262144</int>
 																			<string key="NSContents">AAC</string>
 																			<reference key="NSSupport" ref="22"/>
 																			<string key="NSCellIdentifier">_NS:771</string>
 																			<reference key="NSControlView" ref="354328979"/>
-																			<int key="NSButtonFlags">1211912703</int>
+																			<int key="NSButtonFlags">1211912448</int>
 																			<int key="NSButtonFlags2">2</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1581,24 +2102,24 @@
 																			<int key="NSPeriodicDelay">200</int>
 																			<int key="NSPeriodicInterval">25</int>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSButton" id="453548414">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">268</int>
 																		<string key="NSFrame">{{179, 8}, {47, 18}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="485809563"/>
 																		<string key="NSReuseIdentifierKey">_NS:771</string>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="368344404">
-																			<int key="NSCellFlags">-2080244224</int>
+																			<int key="NSCellFlags">-2080374784</int>
 																			<int key="NSCellFlags2">262144</int>
 																			<string key="NSContents">AC3</string>
 																			<reference key="NSSupport" ref="22"/>
 																			<string key="NSCellIdentifier">_NS:771</string>
 																			<reference key="NSControlView" ref="453548414"/>
-																			<int key="NSButtonFlags">1211912703</int>
+																			<int key="NSButtonFlags">1211912448</int>
 																			<int key="NSButtonFlags2">2</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1607,24 +2128,24 @@
 																			<int key="NSPeriodicDelay">200</int>
 																			<int key="NSPeriodicInterval">25</int>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSButton" id="485809563">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">268</int>
 																		<string key="NSFrame">{{226, 8}, {48, 18}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="1024961404"/>
 																		<string key="NSReuseIdentifierKey">_NS:771</string>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="118300837">
-																			<int key="NSCellFlags">-2080244224</int>
+																			<int key="NSCellFlags">-2080374784</int>
 																			<int key="NSCellFlags2">262144</int>
 																			<string key="NSContents">DTS</string>
 																			<reference key="NSSupport" ref="22"/>
 																			<string key="NSCellIdentifier">_NS:771</string>
 																			<reference key="NSControlView" ref="485809563"/>
-																			<int key="NSButtonFlags">1211912703</int>
+																			<int key="NSButtonFlags">1211912448</int>
 																			<int key="NSButtonFlags2">2</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1633,24 +2154,24 @@
 																			<int key="NSPeriodicDelay">200</int>
 																			<int key="NSPeriodicInterval">25</int>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSButton" id="1024961404">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">268</int>
 																		<string key="NSFrame">{{271, 8}, {58, 18}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="431725280"/>
 																		<string key="NSReuseIdentifierKey">_NS:771</string>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSButtonCell" key="NSCell" id="735750065">
-																			<int key="NSCellFlags">-2080244224</int>
+																			<int key="NSCellFlags">-2080374784</int>
 																			<int key="NSCellFlags2">262144</int>
 																			<string key="NSContents">DTS-HD</string>
 																			<reference key="NSSupport" ref="22"/>
 																			<string key="NSCellIdentifier">_NS:771</string>
 																			<reference key="NSControlView" ref="1024961404"/>
-																			<int key="NSButtonFlags">1211912703</int>
+																			<int key="NSButtonFlags">1211912448</int>
 																			<int key="NSButtonFlags2">2</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1659,23 +2180,23 @@
 																			<int key="NSPeriodicDelay">200</int>
 																			<int key="NSPeriodicInterval">25</int>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSPopUpButton" id="586044455">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">268</int>
 																		<string key="NSFrame">{{442, 8}, {100, 15}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="933946879"/>
 																		<string key="NSReuseIdentifierKey">_NS:868</string>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSPopUpButtonCell" key="NSCell" id="141259846">
-																			<int key="NSCellFlags">-2076049856</int>
+																			<int key="NSCellFlags">-2076180416</int>
 																			<int key="NSCellFlags2">264192</int>
 																			<reference key="NSSupport" ref="22"/>
 																			<string key="NSCellIdentifier">_NS:868</string>
 																			<reference key="NSControlView" ref="586044455"/>
-																			<int key="NSButtonFlags">109199615</int>
+																			<int key="NSButtonFlags">109199360</int>
 																			<int key="NSButtonFlags2">129</int>
 																			<string key="NSAlternateContents"/>
 																			<string key="NSKeyEquivalent"/>
@@ -1729,17 +2250,17 @@
 																			<bool key="NSAltersState">YES</bool>
 																			<int key="NSArrowPosition">2</int>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSTextField" id="1010907474">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">264</int>
 																		<string key="NSFrame">{{2, -7}, {78, 28}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="162512199"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSTextFieldCell" key="NSCell" id="935575109">
-																			<int key="NSCellFlags">67239424</int>
+																			<int key="NSCellFlags">67108864</int>
 																			<int key="NSCellFlags2">71565312</int>
 																			<string key="NSContents">Auto Passthru:</string>
 																			<reference key="NSSupport" ref="22"/>
@@ -1747,17 +2268,17 @@
 																			<reference key="NSBackgroundColor" ref="242973447"/>
 																			<reference key="NSTextColor" ref="701609070"/>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																	<object class="NSTextField" id="431725280">
 																		<reference key="NSNextResponder" ref="754802956"/>
 																		<int key="NSvFlags">264</int>
 																		<string key="NSFrame">{{354, 7}, {86, 14}}</string>
 																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="586044455"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="NSTextFieldCell" key="NSCell" id="121164790">
-																			<int key="NSCellFlags">67239424</int>
+																			<int key="NSCellFlags">67108864</int>
 																			<int key="NSCellFlags2">71565312</int>
 																			<string key="NSContents">Passthru Fallback:</string>
 																			<reference key="NSSupport" ref="22"/>
@@ -1765,23 +2286,22 @@
 																			<reference key="NSBackgroundColor" ref="242973447"/>
 																			<reference key="NSTextColor" ref="701609070"/>
 																		</object>
+																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																	</object>
 																</object>
 																<string key="NSFrame">{{1, 1}, {552, 29}}</string>
 																<reference key="NSSuperview" ref="334448622"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="1010907474"/>
 																<string key="NSReuseIdentifierKey">_NS:21</string>
 															</object>
 														</object>
 														<string key="NSFrame">{{349, 275}, {554, 31}}</string>
 														<reference key="NSSuperview" ref="577274772"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="754802956"/>
 														<string key="NSReuseIdentifierKey">_NS:18</string>
 														<string key="NSOffsets">{0, 0}</string>
 														<object class="NSTextFieldCell" key="NSTitleCell">
-															<int key="NSCellFlags">67239424</int>
+															<int key="NSCellFlags">67108864</int>
 															<int key="NSCellFlags2">0</int>
 															<string key="NSContents">Auto Passthru</string>
 															<reference key="NSSupport" ref="26"/>
@@ -1800,13 +2320,10 @@
 												</object>
 												<string key="NSFrame">{{0, -3}, {920, 305}}</string>
 												<reference key="NSSuperview" ref="738554558"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="883603583"/>
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
-										<reference key="NSSuperview" ref="712502892"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="577274772"/>
 									</object>
 									<string key="NSLabel">Audio</string>
@@ -1836,6 +2353,8 @@
 																<string key="NSFrameSize">{884, 241}</string>
 																<reference key="NSSuperview" ref="705918581"/>
 																<bool key="NSEnabled">YES</bool>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 																<object class="NSTableHeaderView" key="NSHeaderView" id="569585004">
 																	<reference key="NSNextResponder" ref="139191276"/>
 																	<int key="NSvFlags">256</int>
@@ -1857,7 +2376,7 @@
 																		<double key="NSMinWidth">40</double>
 																		<double key="NSMaxWidth">1000</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Track</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -1868,11 +2387,11 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSPopUpButtonCell" key="NSDataCell" id="426946554">
-																			<int key="NSCellFlags">-2076049856</int>
+																			<int key="NSCellFlags">-2076180416</int>
 																			<int key="NSCellFlags2">264192</int>
 																			<reference key="NSSupport" ref="22"/>
 																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">100679935</int>
+																			<int key="NSButtonFlags">100679680</int>
 																			<int key="NSButtonFlags2">129</int>
 																			<string key="NSAlternateContents"/>
 																			<string key="NSKeyEquivalent"/>
@@ -1912,7 +2431,7 @@
 																		<double key="NSMinWidth">10</double>
 																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">134219776</int>
 																			<string key="NSContents">Forced Only</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -1920,12 +2439,12 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSButtonCell" key="NSDataCell" id="13236417">
-																			<int key="NSCellFlags">67239424</int>
+																			<int key="NSCellFlags">67108864</int>
 																			<int key="NSCellFlags2">131072</int>
 																			<string key="NSContents">Check</string>
 																			<reference key="NSSupport" ref="26"/>
 																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">1215582719</int>
+																			<int key="NSButtonFlags">1215582464</int>
 																			<int key="NSButtonFlags2">130</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1945,7 +2464,7 @@
 																		<double key="NSMinWidth">10</double>
 																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">134219776</int>
 																			<string key="NSContents">Burned In</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -1953,12 +2472,12 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSButtonCell" key="NSDataCell" id="704907857">
-																			<int key="NSCellFlags">67239424</int>
+																			<int key="NSCellFlags">67108864</int>
 																			<int key="NSCellFlags2">131072</int>
 																			<string key="NSContents">Check</string>
 																			<reference key="NSSupport" ref="26"/>
 																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">1215582719</int>
+																			<int key="NSButtonFlags">1215582464</int>
 																			<int key="NSButtonFlags2">130</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -1978,7 +2497,7 @@
 																		<double key="NSMinWidth">10</double>
 																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">134219776</int>
 																			<string key="NSContents">Default</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -1986,12 +2505,12 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSButtonCell" key="NSDataCell" id="299034685">
-																			<int key="NSCellFlags">67239424</int>
+																			<int key="NSCellFlags">67108864</int>
 																			<int key="NSCellFlags2">131072</int>
 																			<string key="NSContents">Check</string>
 																			<reference key="NSSupport" ref="26"/>
 																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">1215582719</int>
+																			<int key="NSButtonFlags">1215582464</int>
 																			<int key="NSButtonFlags2">130</int>
 																			<reference key="NSNormalImage" ref="887198214"/>
 																			<reference key="NSAlternateImage" ref="624832340"/>
@@ -2011,7 +2530,7 @@
 																		<double key="NSMinWidth">10</double>
 																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Srt Language</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -2019,11 +2538,11 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSPopUpButtonCell" key="NSDataCell" id="688461412">
-																			<int key="NSCellFlags">-2076049856</int>
+																			<int key="NSCellFlags">-2076180416</int>
 																			<int key="NSCellFlags2">133120</int>
 																			<reference key="NSSupport" ref="26"/>
 																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">100679935</int>
+																			<int key="NSButtonFlags">100679680</int>
 																			<int key="NSButtonFlags2">129</int>
 																			<string key="NSAlternateContents"/>
 																			<string key="NSKeyEquivalent"/>
@@ -2065,7 +2584,7 @@
 																		<double key="NSMinWidth">10</double>
 																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Srt Char Code</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -2073,11 +2592,11 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSPopUpButtonCell" key="NSDataCell" id="483232645">
-																			<int key="NSCellFlags">-2076049856</int>
+																			<int key="NSCellFlags">-2076180416</int>
 																			<int key="NSCellFlags2">133120</int>
 																			<reference key="NSSupport" ref="26"/>
 																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">100679935</int>
+																			<int key="NSButtonFlags">100679680</int>
 																			<int key="NSButtonFlags2">129</int>
 																			<string key="NSAlternateContents"/>
 																			<string key="NSKeyEquivalent"/>
@@ -2119,7 +2638,7 @@
 																		<double key="NSMinWidth">10</double>
 																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Srt Offset</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -2127,7 +2646,7 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSTextFieldCell" key="NSDataCell" id="43785715">
-																			<int key="NSCellFlags">337772096</int>
+																			<int key="NSCellFlags">337641536</int>
 																			<int key="NSCellFlags2">272630784</int>
 																			<string key="NSContents">Text</string>
 																			<reference key="NSSupport" ref="273283760"/>
@@ -2169,6 +2688,7 @@
 														<int key="NSvFlags">-2147483392</int>
 														<string key="NSFrame">{{-100, -100}, {15, 206}}</string>
 														<reference key="NSSuperview" ref="596256174"/>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<reference key="NSTarget" ref="596256174"/>
 														<string key="NSAction">_doScroller:</string>
 														<double key="NSCurValue">37</double>
@@ -2179,6 +2699,7 @@
 														<int key="NSvFlags">-2147483392</int>
 														<string key="NSFrame">{{-100, -100}, {685, 15}}</string>
 														<reference key="NSSuperview" ref="596256174"/>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<int key="NSsFlags">1</int>
 														<reference key="NSTarget" ref="596256174"/>
 														<string key="NSAction">_doScroller:</string>
@@ -2209,6 +2730,9 @@
 												<reference key="NSContentView" ref="705918581"/>
 												<reference key="NSHeaderClipView" ref="139191276"/>
 												<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+												<double key="NSMinMagnification">0.25</double>
+												<double key="NSMaxMagnification">4</double>
+												<double key="NSMagnification">1</double>
 											</object>
 											<object class="NSButton" id="377401502">
 												<reference key="NSNextResponder" ref="756255803"/>
@@ -2217,18 +2741,19 @@
 												<reference key="NSSuperview" ref="756255803"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="206924163">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">134479872</int>
 													<string key="NSContents">Add External SRT ...</string>
 													<reference key="NSSupport" ref="22"/>
 													<reference key="NSControlView" ref="377401502"/>
-													<int key="NSButtonFlags">-2038284033</int>
+													<int key="NSButtonFlags">-2038284288</int>
 													<int key="NSButtonFlags2">129</int>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
@@ -2258,9 +2783,10 @@
 												</object>
 												<string key="NSFrame">{{7, 8}, {907, 290}}</string>
 												<reference key="NSSuperview" ref="833271282"/>
+												<reference key="NSNextKeyView" ref="815869140"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">0</int>
 													<string key="NSContents">Box</string>
 													<reference key="NSSupport" ref="26"/>
@@ -2278,6 +2804,7 @@
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
+										<reference key="NSNextKeyView" ref="231506045"/>
 									</object>
 									<string key="NSLabel">Advanced</string>
 									<reference key="NSColor" ref="242973447"/>
@@ -2307,6 +2834,8 @@
 																<reference key="NSSuperview" ref="272816362"/>
 																<reference key="NSNextKeyView" ref="1033243513"/>
 																<bool key="NSEnabled">YES</bool>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 																<object class="NSTableHeaderView" key="NSHeaderView" id="928480858">
 																	<reference key="NSNextResponder" ref="814110287"/>
 																	<int key="NSvFlags">256</int>
@@ -2330,7 +2859,7 @@
 																		<double key="NSMinWidth">40</double>
 																		<double key="NSMaxWidth">1000</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Chapter</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -2341,7 +2870,7 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSTextFieldCell" key="NSDataCell" id="686068440">
-																			<int key="NSCellFlags">337772096</int>
+																			<int key="NSCellFlags">337641536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Text Cell</string>
 																			<reference key="NSSupport" ref="995413175"/>
@@ -2359,7 +2888,7 @@
 																		<double key="NSMinWidth">77.217290000000006</double>
 																		<double key="NSMaxWidth">1000</double>
 																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75628096</int>
+																			<int key="NSCellFlags">75497536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Chapter Title</string>
 																			<reference key="NSSupport" ref="26"/>
@@ -2367,7 +2896,7 @@
 																			<reference key="NSTextColor" ref="188451177"/>
 																		</object>
 																		<object class="NSTextFieldCell" key="NSDataCell" id="237660698">
-																			<int key="NSCellFlags">337772096</int>
+																			<int key="NSCellFlags">337641536</int>
 																			<int key="NSCellFlags2">2048</int>
 																			<string key="NSContents">Text Cell</string>
 																			<reference key="NSSupport" ref="995413175"/>
@@ -2409,6 +2938,7 @@
 														<int key="NSvFlags">256</int>
 														<string key="NSFrame">{{870, 17}, {15, 242}}</string>
 														<reference key="NSSuperview" ref="307620967"/>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<reference key="NSTarget" ref="307620967"/>
 														<string key="NSAction">_doScroller:</string>
 														<double key="NSPercent">0.9736842</double>
@@ -2419,6 +2949,7 @@
 														<string key="NSFrame">{{-100, -100}, {488, 15}}</string>
 														<reference key="NSSuperview" ref="307620967"/>
 														<reference key="NSNextKeyView" ref="814110287"/>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 														<int key="NSsFlags">1</int>
 														<reference key="NSTarget" ref="307620967"/>
 														<string key="NSAction">_doScroller:</string>
@@ -2449,6 +2980,9 @@
 												<reference key="NSContentView" ref="272816362"/>
 												<reference key="NSHeaderClipView" ref="814110287"/>
 												<bytes key="NSScrollAmts">AAAAAAAAAABBmAAAQZgAAA</bytes>
+												<double key="NSMinMagnification">0.25</double>
+												<double key="NSMaxMagnification">4</double>
+												<double key="NSMagnification">1</double>
 											</object>
 											<object class="NSButton" id="262106913">
 												<reference key="NSNextResponder" ref="440990725"/>
@@ -2458,12 +2992,12 @@
 												<reference key="NSNextKeyView" ref="307620967"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="719511430">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">131072</int>
 													<string key="NSContents">Create chapter markers</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="262106913"/>
-													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags">1211912448</int>
 													<int key="NSButtonFlags2">2</int>
 													<reference key="NSAlternateImage" ref="624832340"/>
 													<string key="NSAlternateContents"/>
@@ -2471,6 +3005,7 @@
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSButton" id="959722284">
 												<reference key="NSNextResponder" ref="440990725"/>
@@ -2479,18 +3014,19 @@
 												<reference key="NSSuperview" ref="440990725"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="100898939">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">134479872</int>
 													<string key="NSContents">Import Chapters ...</string>
 													<reference key="NSSupport" ref="22"/>
 													<reference key="NSControlView" ref="959722284"/>
-													<int key="NSButtonFlags">-2038284033</int>
+													<int key="NSButtonFlags">-2038284288</int>
 													<int key="NSButtonFlags2">129</int>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 											<object class="NSButton" id="931485910">
 												<reference key="NSNextResponder" ref="440990725"/>
@@ -2499,18 +3035,19 @@
 												<reference key="NSSuperview" ref="440990725"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="843416672">
-													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">134479872</int>
 													<string key="NSContents">Export Chapters ...</string>
 													<reference key="NSSupport" ref="22"/>
 													<reference key="NSControlView" ref="931485910"/>
-													<int key="NSButtonFlags">-2038284033</int>
+													<int key="NSButtonFlags">-2038284288</int>
 													<int key="NSButtonFlags2">129</int>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
 										</object>
 										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
@@ -2521,14 +3058,14 @@
 									<reference key="NSTabView" ref="712502892"/>
 								</object>
 							</object>
-							<reference key="NSSelectedTabViewItem" ref="157300012"/>
+							<reference key="NSSelectedTabViewItem" ref="107038816"/>
 							<reference key="NSFont" ref="26"/>
 							<int key="NSTvFlags">134217728</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<reference ref="738554558"/>
+								<reference ref="1053078401"/>
 							</object>
 						</object>
 						<object class="NSTextField" id="586321835">
@@ -2540,7 +3077,7 @@
 							<reference key="NSNextKeyView" ref="854767306"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="121574898">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4325376</int>
 								<string key="NSContents">Source:</string>
 								<object class="NSFont" key="NSSupport" id="27">
@@ -2552,6 +3089,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="806469067">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2562,7 +3100,7 @@
 							<reference key="NSNextKeyView" ref="766125203"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="177567437">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Title:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -2570,6 +3108,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="766125203">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2580,11 +3119,11 @@
 							<reference key="NSNextKeyView" ref="303369850"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="821198683">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">263168</int>
 								<reference key="NSSupport" ref="22"/>
 								<reference key="NSControlView" ref="766125203"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<object class="NSFont" key="NSAlternateImage" id="1010451086">
 									<string key="NSName">LucidaGrande</string>
@@ -2624,6 +3163,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="482831442">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2634,11 +3174,11 @@
 							<reference key="NSNextKeyView" ref="971754180"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="266952854">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">263168</int>
 								<reference key="NSSupport" ref="22"/>
 								<reference key="NSControlView" ref="482831442"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="1010451086"/>
 								<string key="NSAlternateContents"/>
@@ -2663,6 +3203,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="303369850">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2673,7 +3214,7 @@
 							<reference key="NSNextKeyView" ref="460320725"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="677126774">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Angle:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -2681,6 +3222,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="460320725">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2691,11 +3233,11 @@
 							<reference key="NSNextKeyView" ref="482831442"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="567459641">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">263168</int>
 								<reference key="NSSupport" ref="22"/>
 								<reference key="NSControlView" ref="460320725"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="1010451086"/>
 								<string key="NSAlternateContents"/>
@@ -2731,6 +3273,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="1023408378">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2741,7 +3284,7 @@
 							<reference key="NSNextKeyView" ref="186223550"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="834340599">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">File:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -2749,6 +3292,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="713493964">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2759,7 +3303,7 @@
 							<reference key="NSNextKeyView" ref="955053416"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1038625481">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Duration:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -2767,6 +3311,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="955053416">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2777,7 +3322,7 @@
 							<reference key="NSNextKeyView" ref="138115732"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="362196160">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4194304</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
@@ -2788,6 +3333,7 @@
 								</object>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="138115732">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2798,7 +3344,7 @@
 							<reference key="NSNextKeyView" ref="104002862"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="510160694">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4325376</int>
 								<string key="NSContents">Destination</string>
 								<reference key="NSSupport" ref="27"/>
@@ -2806,6 +3352,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="732193996">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2816,11 +3363,11 @@
 							<reference key="NSNextKeyView" ref="553453876"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="264217237">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">132096</int>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="732193996"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="26"/>
 								<string key="NSAlternateContents"/>
@@ -2854,6 +3401,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="210289606">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2864,12 +3412,12 @@
 							<reference key="NSNextKeyView" ref="35106907"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="295879492">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134348800</int>
 								<string key="NSContents">Browse…</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="210289606"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="995413175"/>
 								<string key="NSAlternateContents"/>
@@ -2879,6 +3427,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSBox" id="10346684">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2889,7 +3438,7 @@
 							<reference key="NSNextKeyView" ref="1023408378"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="273283760"/>
@@ -2913,7 +3462,7 @@
 							<reference key="NSNextKeyView" ref="519699512"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="689580100">
-								<int key="NSCellFlags">69336641</int>
+								<int key="NSCellFlags">69206081</int>
 								<int key="NSCellFlags2">4327936</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
@@ -2924,6 +3473,7 @@
 								</object>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="186223550">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2934,7 +3484,7 @@
 							<reference key="NSNextKeyView" ref="210289606"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="988599137">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">4326400</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
@@ -2943,6 +3493,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="104002862">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2953,7 +3504,7 @@
 							<reference key="NSNextKeyView" ref="978025076"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="371961838">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">71566336</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="22"/>
@@ -2962,6 +3513,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="398989741">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2972,7 +3524,7 @@
 							<reference key="NSNextKeyView" ref="453345136"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="506346481">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">71566336</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="22"/>
@@ -2981,6 +3533,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="19055068">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -2991,7 +3544,7 @@
 							<reference key="NSNextKeyView" ref="164276139"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="778187711">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">4457472</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="22"/>
@@ -3000,6 +3553,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="164276139">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3010,7 +3564,7 @@
 							<reference key="NSNextKeyView" ref="10346684"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1039518079">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">4457472</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="22"/>
@@ -3019,6 +3573,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="35106907">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3029,7 +3584,7 @@
 							<reference key="NSNextKeyView" ref="574185541"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="293028864">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4325376</int>
 								<string key="NSContents">Output Settings:</string>
 								<reference key="NSSupport" ref="27"/>
@@ -3037,6 +3592,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSBox" id="151388399">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3047,7 +3603,7 @@
 							<reference key="NSNextKeyView" ref="87961628"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="273283760"/>
@@ -3071,7 +3627,7 @@
 							<reference key="NSNextKeyView" ref="151388399"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="488791842">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="27"/>
@@ -3079,6 +3635,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="1007421233">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3089,7 +3646,7 @@
 							<reference key="NSNextKeyView" ref="222334056"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="224806210">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71434240</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
@@ -3097,6 +3654,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="87961628">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3107,7 +3665,7 @@
 							<reference key="NSNextKeyView" ref="732193996"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="51600927">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Format:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -3115,6 +3673,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSBox" id="454206717">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3125,7 +3684,7 @@
 							<reference key="NSNextKeyView" ref="806469067"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="273283760"/>
@@ -3142,8 +3701,7 @@
 						</object>
 						<object class="NSProgressIndicator" id="519699512">
 							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">-2147482356</int>
-							<object class="NSPSMatrix" key="NSDrawMatrix"/>
+							<int key="NSvFlags">-2147483380</int>
 							<string key="NSFrame">{{385, 532}, {562, 12}}</string>
 							<reference key="NSSuperview" ref="168918359"/>
 							<reference key="NSWindow"/>
@@ -3160,12 +3718,12 @@
 							<reference key="NSNextKeyView" ref="921877174"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="832863281">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Web optimized</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="581806074"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="887198214"/>
 								<reference key="NSAlternateImage" ref="624832340"/>
@@ -3174,6 +3732,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="553453876">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3184,12 +3743,12 @@
 							<reference key="NSNextKeyView" ref="581806074"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="294332300">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Large file size</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="553453876"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="887198214"/>
 								<reference key="NSAlternateImage" ref="624832340"/>
@@ -3198,6 +3757,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="921877174">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3208,12 +3768,12 @@
 							<reference key="NSNextKeyView" ref="712502892"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="547085070">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">iPod 5G support</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="921877174"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="887198214"/>
 								<reference key="NSAlternateImage" ref="624832340"/>
@@ -3222,6 +3782,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="978025076">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3232,7 +3793,7 @@
 							<reference key="NSNextKeyView" ref="398989741"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="138681808">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">138412032</int>
 								<string key="NSContents">through</string>
 								<reference key="NSSupport" ref="26"/>
@@ -3240,6 +3801,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="971754180">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3250,11 +3812,11 @@
 							<reference key="NSNextKeyView" ref="713493964"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="286887304">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">263168</int>
 								<reference key="NSSupport" ref="22"/>
 								<reference key="NSControlView" ref="971754180"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="1010451086"/>
 								<string key="NSAlternateContents"/>
@@ -3290,6 +3852,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="453345136">
 							<reference key="NSNextResponder" ref="168918359"/>
@@ -3300,11 +3863,11 @@
 							<reference key="NSNextKeyView" ref="19055068"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="564669343">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">263168</int>
 								<reference key="NSSupport" ref="22"/>
 								<reference key="NSControlView" ref="453345136"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="1010451086"/>
 								<string key="NSAlternateContents"/>
@@ -3340,6 +3903,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</object>
 					<string key="NSFrameSize">{959, 558}</string>
@@ -3347,7 +3911,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="586321835"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -4102,7 +4666,7 @@
 							<reference key="NSSuperview" ref="168254512"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="72412547">
-								<int key="NSCellFlags">130560</int>
+								<int key="NSCellFlags">134217728</int>
 								<int key="NSCellFlags2">33554432</int>
 								<object class="NSCustomResource" key="NSContents">
 									<string key="NSClassName">NSImage</string>
@@ -4113,6 +4677,7 @@
 								<int key="NSStyle">0</int>
 								<bool key="NSAnimates">NO</bool>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							<bool key="NSEditable">YES</bool>
 						</object>
 						<object class="NSButton" id="764659803">
@@ -4122,12 +4687,12 @@
 							<reference key="NSSuperview" ref="168254512"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="938246142">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">137887744</int>
 								<string key="NSContents">Ahuh !</string>
 								<reference key="NSSupport" ref="273283760"/>
 								<reference key="NSControlView" ref="764659803"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<object class="NSFont" key="NSAlternateImage">
 									<string key="NSName">Helvetica</string>
@@ -4139,6 +4704,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="640205151">
 							<reference key="NSNextResponder" ref="168254512"/>
@@ -4147,7 +4713,7 @@
 							<reference key="NSSuperview" ref="168254512"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="160092001">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">138412032</int>
 								<string key="NSContents">Rip done !</string>
 								<reference key="NSSupport" ref="273283760"/>
@@ -4155,11 +4721,12 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</object>
 					<string key="NSFrameSize">{300, 233}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -4196,6 +4763,8 @@
 										<string key="NSFrameSize">{247, 506}</string>
 										<reference key="NSSuperview" ref="421228634"/>
 										<bool key="NSEnabled">YES</bool>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 										<object class="_NSCornerView" key="NSCornerView">
 											<nil key="NSNextResponder"/>
 											<int key="NSvFlags">256</int>
@@ -4209,7 +4778,7 @@
 												<double key="NSMinWidth">40</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
+													<int key="NSCellFlags">75497536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Presets</string>
 													<reference key="NSSupport" ref="26"/>
@@ -4220,7 +4789,7 @@
 													<reference key="NSTextColor" ref="188451177"/>
 												</object>
 												<object class="NSTextFieldCell" key="NSDataCell" id="384895213">
-													<int key="NSCellFlags">337772096</int>
+													<int key="NSCellFlags">337641536</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
 													<reference key="NSSupport" ref="995413175"/>
@@ -4268,6 +4837,7 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{248, 1}, {11, 506}}</string>
 								<reference key="NSSuperview" ref="33643505"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">256</int>
 								<reference key="NSTarget" ref="33643505"/>
 								<string key="NSAction">_doScroller:</string>
@@ -4278,6 +4848,7 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {183, 15}}</string>
 								<reference key="NSSuperview" ref="33643505"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="33643505"/>
 								<string key="NSAction">_doScroller:</string>
@@ -4292,6 +4863,9 @@
 						<reference key="NSHScroller" ref="573337548"/>
 						<reference key="NSContentView" ref="421228634"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
 					</object>
 					<object class="NSButton" id="241719587">
 						<reference key="NSNextResponder" ref="621751818"/>
@@ -4300,7 +4874,7 @@
 						<reference key="NSSuperview" ref="621751818"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="501219161">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents"/>
 							<object class="NSFont" key="NSSupport" id="575851035">
@@ -4309,7 +4883,7 @@
 								<int key="NSfFlags">2072</int>
 							</object>
 							<reference key="NSControlView" ref="241719587"/>
-							<int key="NSButtonFlags">-2030804737</int>
+							<int key="NSButtonFlags">-2030804992</int>
 							<int key="NSButtonFlags2">34</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
@@ -4320,6 +4894,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="699919504">
 						<reference key="NSNextResponder" ref="621751818"/>
@@ -4328,12 +4903,12 @@
 						<reference key="NSSuperview" ref="621751818"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="489159603">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="575851035"/>
 							<reference key="NSControlView" ref="699919504"/>
-							<int key="NSButtonFlags">-2032901889</int>
+							<int key="NSButtonFlags">-2032902144</int>
 							<int key="NSButtonFlags2">34</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
@@ -4344,6 +4919,7 @@
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="886184281">
 						<reference key="NSNextResponder" ref="621751818"/>
@@ -4352,11 +4928,11 @@
 						<reference key="NSSuperview" ref="621751818"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="492120702">
-							<int key="NSCellFlags">71433792</int>
+							<int key="NSCellFlags">71303232</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="273283760"/>
 							<reference key="NSControlView" ref="886184281"/>
-							<int key="NSButtonFlags">-2031075073</int>
+							<int key="NSButtonFlags">-2031075328</int>
 							<int key="NSButtonFlags2">162</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -4415,6 +4991,7 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</object>
 				<string key="NSFrameSize">{270, 550}</string>
@@ -4445,12 +5022,12 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="107603394">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134217728</int>
 								<string key="NSContents">Add</string>
 								<reference key="NSSupport" ref="273283760"/>
 								<reference key="NSControlView" ref="636581183"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<object class="NSFont" key="NSAlternateImage" id="212993004">
 									<string key="NSName">LucidaGrande</string>
@@ -4462,6 +5039,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="586136427">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4470,12 +5048,12 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="231870318">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134217728</int>
 								<string key="NSContents">Cancel</string>
 								<reference key="NSSupport" ref="273283760"/>
 								<reference key="NSControlView" ref="586136427"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="212993004"/>
 								<string key="NSAlternateContents"/>
@@ -4483,6 +5061,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="978853241">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4491,7 +5070,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="479246832">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">272761856</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
@@ -4500,6 +5079,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="167356719">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4508,11 +5088,11 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="17688962">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">133120</int>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="167356719"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="995413175"/>
 								<string key="NSAlternateContents"/>
@@ -4570,6 +5150,7 @@
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="343391844">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4578,7 +5159,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="658438349">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272760832</int>
 								<string type="base64-UTF8" key="NSContents">UHJlc2V0IE5hbWU6Cg</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4586,6 +5167,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="340554114">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4594,7 +5176,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="70981869">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272760832</int>
 								<string key="NSContents">Picture Settings:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4602,6 +5184,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="384547934">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4610,7 +5193,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="207651610">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272760832</int>
 								<string key="NSContents">Description:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4618,6 +5201,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="511645357">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4626,7 +5210,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="855042909">
-								<int key="NSCellFlags">-1805517311</int>
+								<int key="NSCellFlags">-1805647871</int>
 								<int key="NSCellFlags2">272760832</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
@@ -4635,6 +5219,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="31472093">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4643,7 +5228,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="31665321">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71434240</int>
 								<string key="NSContents">Use Picture Size:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4651,6 +5236,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="1024752086">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4659,12 +5245,12 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="625635488">
-								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags">-2080374784</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="1024752086"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="887198214"/>
 								<reference key="NSAlternateImage" ref="624832340"/>
@@ -4673,6 +5259,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="786415813">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4681,12 +5268,12 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="977106207">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Preset Folder ( if checked disregard below )</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="786415813"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="887198214"/>
 								<reference key="NSAlternateImage" ref="624832340"/>
@@ -4695,6 +5282,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSBox" id="5085381">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4703,7 +5291,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="273283760"/>
@@ -4725,7 +5313,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="273283760"/>
@@ -4747,7 +5335,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="155469085">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71434240</int>
 								<string key="NSContents">Use Picture Filters:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4755,6 +5343,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSBox" id="277759901">
 							<reference key="NSNextResponder" ref="69290042"/>
@@ -4773,7 +5362,7 @@
 											<reference key="NSSuperview" ref="956968044"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="862361869">
-												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags">-1804599231</int>
 												<int key="NSCellFlags2">71566336</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="22"/>
@@ -4782,6 +5371,7 @@
 												<reference key="NSBackgroundColor" ref="138233214"/>
 												<reference key="NSTextColor" ref="378140636"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSTextField" id="358179065">
 											<reference key="NSNextResponder" ref="956968044"/>
@@ -4790,7 +5380,7 @@
 											<reference key="NSSuperview" ref="956968044"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="14541127">
-												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">138543104</int>
 												<string key="NSContents">X</string>
 												<reference key="NSSupport" ref="26"/>
@@ -4798,6 +5388,7 @@
 												<reference key="NSBackgroundColor" ref="242973447"/>
 												<reference key="NSTextColor" ref="701609070"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSTextField" id="525081109">
 											<reference key="NSNextResponder" ref="956968044"/>
@@ -4806,7 +5397,7 @@
 											<reference key="NSSuperview" ref="956968044"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="945554305">
-												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags">-1804599231</int>
 												<int key="NSCellFlags2">4457472</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="22"/>
@@ -4815,6 +5406,7 @@
 												<reference key="NSBackgroundColor" ref="138233214"/>
 												<reference key="NSTextColor" ref="378140636"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</object>
 									<string key="NSFrameSize">{155, 32}</string>
@@ -4825,7 +5417,7 @@
 							<reference key="NSSuperview" ref="69290042"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4844,7 +5436,7 @@
 					</object>
 					<string key="NSFrameSize">{338, 318}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{338, 254}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -4875,7 +5467,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="874724779">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">Source Path Here</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4883,6 +5475,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="293908248">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -4891,7 +5484,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="290236859">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">for</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4899,6 +5492,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="535532677">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -4907,7 +5501,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1026393301">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Scan title number</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4915,6 +5509,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="290568055">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -4923,7 +5518,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="412266408">
-								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">138544128</int>
 								<string key="NSContents">0</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4932,6 +5527,7 @@
 								<reference key="NSBackgroundColor" ref="138233214"/>
 								<reference key="NSTextColor" ref="378140636"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="35126402">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -4940,12 +5536,12 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="935162329">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134348800</int>
 								<string key="NSContents">Cancel</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="35126402"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="995413175"/>
 								<string key="NSAlternateContents"/>
@@ -4955,6 +5551,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="1029080172">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -4963,12 +5560,12 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1020926636">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134348800</int>
 								<string key="NSContents">Open Title</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="1029080172"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="995413175"/>
 								<string key="NSAlternateContents"/>
@@ -4976,6 +5573,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="1010749064">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -4984,7 +5582,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="938406174">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4194304</int>
 								<string key="NSContents">Note: (entering 0 or leaving blank will result in a full source scan)</string>
 								<reference key="NSSupport" ref="26"/>
@@ -4992,6 +5590,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="610976437">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -5000,7 +5599,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="802225466">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">Source Path:</string>
 								<reference key="NSSupport" ref="26"/>
@@ -5008,6 +5607,7 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="655257851">
 							<reference key="NSNextResponder" ref="867624722"/>
@@ -5016,7 +5616,7 @@
 							<reference key="NSSuperview" ref="867624722"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="19595360">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">Small System Font Text</string>
 								<reference key="NSSupport" ref="26"/>
@@ -5024,11 +5624,12 @@
 								<reference key="NSBackgroundColor" ref="242973447"/>
 								<reference key="NSTextColor" ref="701609070"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</object>
 					<string key="NSFrameSize">{392, 144}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -6059,7 +6660,7 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSizeField</string>
+						<string key="label">fPictureSettingsField</string>
 						<reference key="source" ref="2258723"/>
 						<reference key="destination" ref="987137669"/>
 					</object>
@@ -6067,15 +6668,7 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureCroppingField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="690364175"/>
-					</object>
-					<int key="connectionID">5170</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVideoFiltersField</string>
+						<string key="label">fPictureFiltersField</string>
 						<reference key="source" ref="2258723"/>
 						<reference key="destination" ref="503933842"/>
 					</object>
@@ -6483,6 +7076,190 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264PresetsBox</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="954159030"/>
+					</object>
+					<int key="connectionID">5973</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264TunePopUp</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="610425389"/>
+					</object>
+					<int key="connectionID">5974</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264ProfilePopUp</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="112458239"/>
+					</object>
+					<int key="connectionID">5975</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264LevelPopUp</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="144142005"/>
+					</object>
+					<int key="connectionID">5976</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264FastDecodeCheck</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="884471415"/>
+					</object>
+					<int key="connectionID">5977</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fDisplayX264PresetsAdditonalOptionsTextField</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="487526549"/>
+					</object>
+					<int key="connectionID">5979</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264PresetsSlider</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="480823072"/>
+					</object>
+					<int key="connectionID">5980</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264PresetSelectedTextField</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="527737261"/>
+					</object>
+					<int key="connectionID">5983</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x264PresetsSliderChanged:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="480823072"/>
+					</object>
+					<int key="connectionID">5984</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264PresetSliderLabel</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="139432403"/>
+					</object>
+					<int key="connectionID">5985</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264TunePopUpLabel</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="1031662534"/>
+					</object>
+					<int key="connectionID">5986</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264ProfilePopUpLabel</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="102651997"/>
+					</object>
+					<int key="connectionID">5987</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264LevelPopUpLabel</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="8023338"/>
+					</object>
+					<int key="connectionID">5988</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fDisplayX264PresetsAdditonalOptionsLabel</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="796460997"/>
+					</object>
+					<int key="connectionID">5989</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fX264UseAdvancedOptionsCheck</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="902460295"/>
+					</object>
+					<int key="connectionID">5994</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">updateX264Widgets:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="902460295"/>
+					</object>
+					<int key="connectionID">5995</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fDisplayX264PresetsUnparseTextField</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="349581420"/>
+					</object>
+					<int key="connectionID">5998</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="610425389"/>
+					</object>
+					<int key="connectionID">5999</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="112458239"/>
+					</object>
+					<int key="connectionID">6000</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="144142005"/>
+					</object>
+					<int key="connectionID">6001</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="487526549"/>
+					</object>
+					<int key="connectionID">6002</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="884471415"/>
+					</object>
+					<int key="connectionID">6003</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fScanHorizontalLine</string>
+						<reference key="source" ref="2258723"/>
+						<reference key="destination" ref="454206717"/>
+					</object>
+					<int key="connectionID">6004</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">parentWindow</string>
 						<reference key="source" ref="972647787"/>
 						<reference key="destination" ref="192660081"/>
@@ -6615,7 +7392,7 @@
 									<string>NSCreatesSortDescriptor</string>
 									<string>NSValidatesImmediately</string>
 								</object>
-								<object class="NSMutableArray" key="dict.values">
+								<object class="NSArray" key="dict.values">
 									<bool key="EncodedWithXMLCoder">YES</bool>
 									<boolean value="NO"/>
 									<boolean value="YES"/>
@@ -6994,7 +7771,7 @@
 									<string>NSCreatesSortDescriptor</string>
 									<string>NSValidatesImmediately</string>
 								</object>
-								<object class="NSMutableArray" key="dict.values">
+								<object class="NSArray" key="dict.values">
 									<bool key="EncodedWithXMLCoder">YES</bool>
 									<boolean value="NO"/>
 									<boolean value="YES"/>
@@ -7214,9 +7991,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="987137669"/>
-							<reference ref="690364175"/>
 							<reference ref="503933842"/>
-							<reference ref="222980245"/>
 							<reference ref="783405221"/>
 							<reference ref="690304958"/>
 							<reference ref="323705695"/>
@@ -7228,6 +8003,8 @@
 							<reference ref="1036976683"/>
 							<reference ref="521019277"/>
 							<reference ref="1064150725"/>
+							<reference ref="222980245"/>
+							<reference ref="954159030"/>
 							<reference ref="888819828"/>
 						</object>
 						<reference key="parent" ref="107038816"/>
@@ -7314,15 +8091,6 @@
 						<reference key="parent" ref="1053078401"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">2375</int>
-						<reference key="object" ref="690364175"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="508148739"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">1989</int>
 						<reference key="object" ref="291470012"/>
 						<object class="NSMutableArray" key="children">
@@ -8544,11 +9312,6 @@
 						<reference key="parent" ref="447003158"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">4893</int>
-						<reference key="object" ref="508148739"/>
-						<reference key="parent" ref="690364175"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">4904</int>
 						<reference key="object" ref="719511430"/>
 						<reference key="parent" ref="262106913"/>
@@ -10088,6 +10851,314 @@
 						<reference key="object" ref="121164790"/>
 						<reference key="parent" ref="431725280"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5934</int>
+						<reference key="object" ref="954159030"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="480823072"/>
+							<reference ref="139432403"/>
+							<reference ref="1031662534"/>
+							<reference ref="102651997"/>
+							<reference ref="610425389"/>
+							<reference ref="8023338"/>
+							<reference ref="144142005"/>
+							<reference ref="112458239"/>
+							<reference ref="796460997"/>
+							<reference ref="487526549"/>
+							<reference ref="527737261"/>
+							<reference ref="902460295"/>
+							<reference ref="349581420"/>
+							<reference ref="884471415"/>
+						</object>
+						<reference key="parent" ref="1053078401"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5932</int>
+						<reference key="object" ref="480823072"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="690637620"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5933</int>
+						<reference key="object" ref="690637620"/>
+						<reference key="parent" ref="480823072"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5937</int>
+						<reference key="object" ref="139432403"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="367754591"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5938</int>
+						<reference key="object" ref="367754591"/>
+						<reference key="parent" ref="139432403"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5939</int>
+						<reference key="object" ref="1031662534"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="444043003"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5940</int>
+						<reference key="object" ref="444043003"/>
+						<reference key="parent" ref="1031662534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5941</int>
+						<reference key="object" ref="102651997"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="858212432"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5942</int>
+						<reference key="object" ref="858212432"/>
+						<reference key="parent" ref="102651997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5943</int>
+						<reference key="object" ref="8023338"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="248169798"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5944</int>
+						<reference key="object" ref="248169798"/>
+						<reference key="parent" ref="8023338"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5945</int>
+						<reference key="object" ref="610425389"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1050851477"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5946</int>
+						<reference key="object" ref="1050851477"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="353982019"/>
+						</object>
+						<reference key="parent" ref="610425389"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5947</int>
+						<reference key="object" ref="353982019"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="791223578"/>
+							<reference ref="645526467"/>
+							<reference ref="1035566125"/>
+						</object>
+						<reference key="parent" ref="1050851477"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5948</int>
+						<reference key="object" ref="791223578"/>
+						<reference key="parent" ref="353982019"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5949</int>
+						<reference key="object" ref="645526467"/>
+						<reference key="parent" ref="353982019"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5950</int>
+						<reference key="object" ref="1035566125"/>
+						<reference key="parent" ref="353982019"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5951</int>
+						<reference key="object" ref="112458239"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1012707648"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5952</int>
+						<reference key="object" ref="1012707648"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="349551230"/>
+						</object>
+						<reference key="parent" ref="112458239"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5953</int>
+						<reference key="object" ref="349551230"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="691985983"/>
+							<reference ref="603447176"/>
+							<reference ref="56675133"/>
+						</object>
+						<reference key="parent" ref="1012707648"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5954</int>
+						<reference key="object" ref="691985983"/>
+						<reference key="parent" ref="349551230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5955</int>
+						<reference key="object" ref="603447176"/>
+						<reference key="parent" ref="349551230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5956</int>
+						<reference key="object" ref="56675133"/>
+						<reference key="parent" ref="349551230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5957</int>
+						<reference key="object" ref="144142005"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="379682863"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5958</int>
+						<reference key="object" ref="379682863"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="957749846"/>
+						</object>
+						<reference key="parent" ref="144142005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5959</int>
+						<reference key="object" ref="957749846"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="658841842"/>
+							<reference ref="442645374"/>
+							<reference ref="831415388"/>
+						</object>
+						<reference key="parent" ref="379682863"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5960</int>
+						<reference key="object" ref="658841842"/>
+						<reference key="parent" ref="957749846"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5961</int>
+						<reference key="object" ref="442645374"/>
+						<reference key="parent" ref="957749846"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5962</int>
+						<reference key="object" ref="831415388"/>
+						<reference key="parent" ref="957749846"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5963</int>
+						<reference key="object" ref="884471415"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="140128742"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5964</int>
+						<reference key="object" ref="140128742"/>
+						<reference key="parent" ref="884471415"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5967</int>
+						<reference key="object" ref="796460997"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="934066385"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5968</int>
+						<reference key="object" ref="934066385"/>
+						<reference key="parent" ref="796460997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5971</int>
+						<reference key="object" ref="487526549"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="284269747"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5972</int>
+						<reference key="object" ref="284269747"/>
+						<reference key="parent" ref="487526549"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5981</int>
+						<reference key="object" ref="527737261"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="513519725"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5982</int>
+						<reference key="object" ref="513519725"/>
+						<reference key="parent" ref="527737261"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5992</int>
+						<reference key="object" ref="902460295"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="191360965"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5993</int>
+						<reference key="object" ref="191360965"/>
+						<reference key="parent" ref="902460295"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5996</int>
+						<reference key="object" ref="349581420"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="812860538"/>
+						</object>
+						<reference key="parent" ref="954159030"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5997</int>
+						<reference key="object" ref="812860538"/>
+						<reference key="parent" ref="349581420"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -10228,7 +11299,6 @@
 					<string>2364.IBAttributePlaceholdersKey</string>
 					<string>2364.IBPluginDependency</string>
 					<string>2368.IBPluginDependency</string>
-					<string>2375.IBPluginDependency</string>
 					<string>240.IBPluginDependency</string>
 					<string>2421.IBPluginDependency</string>
 					<string>2443.IBPluginDependency</string>
@@ -10291,7 +11361,6 @@
 					<string>4879.IBPluginDependency</string>
 					<string>4880.IBPluginDependency</string>
 					<string>4892.IBPluginDependency</string>
-					<string>4893.IBPluginDependency</string>
 					<string>4904.IBPluginDependency</string>
 					<string>4905.IBPluginDependency</string>
 					<string>4906.IBPluginDependency</string>
@@ -10511,11 +11580,52 @@
 					<string>5922.IBPluginDependency</string>
 					<string>5923.IBPluginDependency</string>
 					<string>5924.IBPluginDependency</string>
+					<string>5932.IBPluginDependency</string>
+					<string>5933.IBPluginDependency</string>
+					<string>5934.IBPluginDependency</string>
+					<string>5937.IBPluginDependency</string>
+					<string>5938.IBPluginDependency</string>
+					<string>5939.IBPluginDependency</string>
+					<string>5940.IBPluginDependency</string>
+					<string>5941.IBPluginDependency</string>
+					<string>5942.IBPluginDependency</string>
+					<string>5943.IBPluginDependency</string>
+					<string>5944.IBPluginDependency</string>
+					<string>5945.IBPluginDependency</string>
+					<string>5946.IBPluginDependency</string>
+					<string>5947.IBPluginDependency</string>
+					<string>5948.IBPluginDependency</string>
+					<string>5949.IBPluginDependency</string>
+					<string>5950.IBPluginDependency</string>
+					<string>5951.IBPluginDependency</string>
+					<string>5952.IBPluginDependency</string>
+					<string>5953.IBPluginDependency</string>
+					<string>5954.IBPluginDependency</string>
+					<string>5955.IBPluginDependency</string>
+					<string>5956.IBPluginDependency</string>
+					<string>5957.IBPluginDependency</string>
+					<string>5958.IBPluginDependency</string>
+					<string>5959.IBPluginDependency</string>
+					<string>5960.IBPluginDependency</string>
+					<string>5961.IBPluginDependency</string>
+					<string>5962.IBPluginDependency</string>
+					<string>5963.IBPluginDependency</string>
+					<string>5964.IBPluginDependency</string>
+					<string>5967.IBPluginDependency</string>
+					<string>5968.IBPluginDependency</string>
+					<string>5971.IBPluginDependency</string>
+					<string>5972.IBPluginDependency</string>
+					<string>5981.IBPluginDependency</string>
+					<string>5982.IBPluginDependency</string>
+					<string>5992.IBPluginDependency</string>
+					<string>5993.IBPluginDependency</string>
+					<string>5996.IBPluginDependency</string>
+					<string>5997.IBPluginDependency</string>
 					<string>970.IBPluginDependency</string>
 					<string>971.IBPluginDependency</string>
 					<string>973.IBPluginDependency</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10683,7 +11793,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{72, 712}, {392, 144}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10721,7 +11830,7 @@
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="581806074"/>
-							<string key="toolTip">Mixed</string>
+							<string key="toolTip">This rearranges the header of the MP4 file to optimize it for streaming across the web.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10781,7 +11890,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -10802,7 +11910,7 @@
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="921877174"/>
-							<string key="toolTip">Mixed</string>
+							<string key="toolTip">This option adds an atom to the MP4 file which allows older iPods (5th Generation classic style) to play the file.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10965,6 +12073,47 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -10979,7 +12128,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">5931</int>
+			<int key="maxID">6004</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -11052,11 +12201,14 @@
 							<string>startEndSecValueChanged:</string>
 							<string>titlePopUpChanged:</string>
 							<string>twoPassCheckboxChanged:</string>
+							<string>updateX264Widgets:</string>
 							<string>videoEncoderPopUpChanged:</string>
 							<string>videoFrameRateChanged:</string>
 							<string>videoMatrixChanged:</string>
+							<string>x264PresetsChangedDisplayExpandedOptions:</string>
+							<string>x264PresetsSliderChanged:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
@@ -11114,6 +12266,9 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -11173,11 +12328,14 @@
 							<string>startEndSecValueChanged:</string>
 							<string>titlePopUpChanged:</string>
 							<string>twoPassCheckboxChanged:</string>
+							<string>updateX264Widgets:</string>
 							<string>videoEncoderPopUpChanged:</string>
 							<string>videoFrameRateChanged:</string>
 							<string>videoMatrixChanged:</string>
+							<string>x264PresetsChangedDisplayExpandedOptions:</string>
+							<string>x264PresetsSliderChanged:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBActionInfo">
 								<string key="name">Cancel:</string>
@@ -11392,6 +12550,10 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">updateX264Widgets:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">videoEncoderPopUpChanged:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -11403,6 +12565,14 @@
 								<string key="name">videoMatrixChanged:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">x264PresetsChangedDisplayExpandedOptions:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">x264PresetsSliderChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -11417,11 +12587,15 @@
 							<string>fAudioAllowDTSPassCheck</string>
 							<string>fAudioAllowMP3PassCheck</string>
 							<string>fAudioAutoPassthruBox</string>
+							<string>fAudioDelegate</string>
 							<string>fAudioFallbackPopUp</string>
 							<string>fBrowseSrtFileButton</string>
 							<string>fChapterTable</string>
 							<string>fChapterTableNameColumn</string>
 							<string>fCreateChapterMarkers</string>
+							<string>fDisplayX264PresetsAdditonalOptionsLabel</string>
+							<string>fDisplayX264PresetsAdditonalOptionsTextField</string>
+							<string>fDisplayX264PresetsUnparseTextField</string>
 							<string>fDstBrowseButton</string>
 							<string>fDstFile1Field</string>
 							<string>fDstFile2Field</string>
@@ -11435,8 +12609,7 @@
 							<string>fFramerateMatrix</string>
 							<string>fFramerateVfrPfrCell</string>
 							<string>fLoadChaptersButton</string>
-							<string>fPictureCroppingField</string>
-							<string>fPictureSizeField</string>
+							<string>fPictureSettingsField</string>
 							<string>fPresetDrawer</string>
 							<string>fPresetNewDesc</string>
 							<string>fPresetNewFolderCheck</string>
@@ -11454,6 +12627,7 @@
 							<string>fQueueStatus</string>
 							<string>fRipIndicator</string>
 							<string>fSaveChaptersButton</string>
+							<string>fScanHorizontalLine</string>
 							<string>fScanIndicator</string>
 							<string>fScanSrcTitleCancelButton</string>
 							<string>fScanSrcTitleNumField</string>
@@ -11495,10 +12669,22 @@
 							<string>fVidRatePopUp</string>
 							<string>fVidTurboPassCheck</string>
 							<string>fVidTwoPassCheck</string>
-							<string>fVideoFiltersField</string>
+							<string>fPictureFiltersField</string>
 							<string>fWindow</string>
+							<string>fX264FastDecodeCheck</string>
+							<string>fX264LevelPopUp</string>
+							<string>fX264LevelPopUpLabel</string>
+							<string>fX264PresetSelectedTextField</string>
+							<string>fX264PresetSliderLabel</string>
+							<string>fX264PresetsBox</string>
+							<string>fX264PresetsSlider</string>
+							<string>fX264ProfilePopUp</string>
+							<string>fX264ProfilePopUpLabel</string>
+							<string>fX264TunePopUp</string>
+							<string>fX264TunePopUpLabel</string>
+							<string>fX264UseAdvancedOptionsCheck</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSPanel</string>
 							<string>NSBox</string>
@@ -11508,11 +12694,15 @@
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSBox</string>
-							<string>NSButton</string>
+							<string>HBAudioController</string>
+							<string>NSPopUpButton</string>
 							<string>NSButton</string>
 							<string>NSTableView</string>
 							<string>NSTableColumn</string>
 							<string>NSButton</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSTextField</string>
@@ -11527,7 +12717,6 @@
 							<string>NSButtonCell</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
-							<string>NSTextField</string>
 							<string>NSDrawer</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
@@ -11545,6 +12734,7 @@
 							<string>NSTextField</string>
 							<string>NSProgressIndicator</string>
 							<string>NSButton</string>
+							<string>NSBox</string>
 							<string>NSProgressIndicator</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
@@ -11588,6 +12778,18 @@
 							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSWindow</string>
+							<string>NSButton</string>
+							<string>NSPopUpButton</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>NSBox</string>
+							<string>NSSlider</string>
+							<string>NSPopUpButton</string>
+							<string>NSTextField</string>
+							<string>NSPopUpButton</string>
+							<string>NSTextField</string>
+							<string>NSButton</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -11602,11 +12804,15 @@
 							<string>fAudioAllowDTSPassCheck</string>
 							<string>fAudioAllowMP3PassCheck</string>
 							<string>fAudioAutoPassthruBox</string>
+							<string>fAudioDelegate</string>
 							<string>fAudioFallbackPopUp</string>
 							<string>fBrowseSrtFileButton</string>
 							<string>fChapterTable</string>
 							<string>fChapterTableNameColumn</string>
 							<string>fCreateChapterMarkers</string>
+							<string>fDisplayX264PresetsAdditonalOptionsLabel</string>
+							<string>fDisplayX264PresetsAdditonalOptionsTextField</string>
+							<string>fDisplayX264PresetsUnparseTextField</string>
 							<string>fDstBrowseButton</string>
 							<string>fDstFile1Field</string>
 							<string>fDstFile2Field</string>
@@ -11620,8 +12826,7 @@
 							<string>fFramerateMatrix</string>
 							<string>fFramerateVfrPfrCell</string>
 							<string>fLoadChaptersButton</string>
-							<string>fPictureCroppingField</string>
-							<string>fPictureSizeField</string>
+							<string>fPictureSettingsField</string>
 							<string>fPresetDrawer</string>
 							<string>fPresetNewDesc</string>
 							<string>fPresetNewFolderCheck</string>
@@ -11639,6 +12844,7 @@
 							<string>fQueueStatus</string>
 							<string>fRipIndicator</string>
 							<string>fSaveChaptersButton</string>
+							<string>fScanHorizontalLine</string>
 							<string>fScanIndicator</string>
 							<string>fScanSrcTitleCancelButton</string>
 							<string>fScanSrcTitleNumField</string>
@@ -11680,10 +12886,22 @@
 							<string>fVidRatePopUp</string>
 							<string>fVidTurboPassCheck</string>
 							<string>fVidTwoPassCheck</string>
-							<string>fVideoFiltersField</string>
+							<string>fPictureFiltersField</string>
 							<string>fWindow</string>
+							<string>fX264FastDecodeCheck</string>
+							<string>fX264LevelPopUp</string>
+							<string>fX264LevelPopUpLabel</string>
+							<string>fX264PresetSelectedTextField</string>
+							<string>fX264PresetSliderLabel</string>
+							<string>fX264PresetsBox</string>
+							<string>fX264PresetsSlider</string>
+							<string>fX264ProfilePopUp</string>
+							<string>fX264ProfilePopUpLabel</string>
+							<string>fX264TunePopUp</string>
+							<string>fX264TunePopUpLabel</string>
+							<string>fX264UseAdvancedOptionsCheck</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
 								<string key="name">fAddPresetPanel</string>
@@ -11718,8 +12936,12 @@
 								<string key="candidateClassName">NSBox</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">fAudioDelegate</string>
+								<string key="candidateClassName">HBAudioController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">fAudioFallbackPopUp</string>
-								<string key="candidateClassName">NSButton</string>
+								<string key="candidateClassName">NSPopUpButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">fBrowseSrtFileButton</string>
@@ -11738,6 +12960,18 @@
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">fDisplayX264PresetsAdditonalOptionsLabel</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fDisplayX264PresetsAdditonalOptionsTextField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fDisplayX264PresetsUnparseTextField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">fDstBrowseButton</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
@@ -11790,11 +13024,7 @@
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureCroppingField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureSizeField</string>
+								<string key="name">fPictureSettingsField</string>
 								<string key="candidateClassName">NSTextField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
@@ -11866,6 +13096,10 @@
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">fScanHorizontalLine</string>
+								<string key="candidateClassName">NSBox</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">fScanIndicator</string>
 								<string key="candidateClassName">NSProgressIndicator</string>
 							</object>
@@ -12030,13 +13264,61 @@
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fVideoFiltersField</string>
+								<string key="name">fPictureFiltersField</string>
 								<string key="candidateClassName">NSTextField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">fWindow</string>
 								<string key="candidateClassName">NSWindow</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264FastDecodeCheck</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264LevelPopUp</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264LevelPopUpLabel</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264PresetSelectedTextField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264PresetSliderLabel</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264PresetsBox</string>
+								<string key="candidateClassName">NSBox</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264PresetsSlider</string>
+								<string key="candidateClassName">NSSlider</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264ProfilePopUp</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264ProfilePopUpLabel</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264TunePopUp</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264TunePopUpLabel</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fX264UseAdvancedOptionsCheck</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -12108,13 +13390,13 @@
 				<string>NSRemoveTemplate</string>
 				<string>NSSwitch</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>{128, 128}</string>
 				<string>{15, 15}</string>
 				<string>{8, 8}</string>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
 				<string>{8, 8}</string>
 				<string>{15, 15}</string>
 			</object>

HandBrake-0.9.8.tar.bz2/macosx/English.lproj/OutputPanel.xib -> HandBrake-0.9.9.tar.bz2/macosx/English.lproj/OutputPanel.xib Changed

@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9G55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
-		<string key="IBDocument.AppKitVersion">949.43</string>
-		<string key="IBDocument.HIToolboxVersion">353.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+		<string key="IBDocument.SystemVersion">11G63</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.51</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">1938</string>
+		</object>
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="11"/>
-			<integer value="6"/>
+			<string>NSView</string>
+			<string>NSMenu</string>
+			<string>NSScrollView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSMenuItem</string>
+			<string>NSTextView</string>
+			<string>NSScroller</string>
+			<string>NSCustomObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="640353287">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,8 +50,8 @@
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="NSWindowContentMinSize">{214.502, 107}</string>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{214.50200000000001, 107}</string>
 				<object class="NSView" key="NSWindowView" id="1055997608">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -83,22 +88,20 @@
 													<nil key="NSDelegate"/>
 												</object>
 												<reference key="NSTextView" ref="123567529"/>
-												<double key="NSWidth">3.630000e+02</double>
+												<double key="NSWidth">363</double>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
 												<int key="NSFlags">11109</int>
+												<int key="NSTextCheckingTypes">0</int>
+												<nil key="NSMarkedAttributes"/>
 												<object class="NSColor" key="NSBackgroundColor" id="913007966">
 													<int key="NSColorSpace">3</int>
 													<bytes key="NSWhite">MQA</bytes>
 												</object>
-												<object class="NSColor" key="NSInsertionColor" id="76040784">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MAA</bytes>
-												</object>
 												<object class="NSDictionary" key="NSSelectedAttributes">
 													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSMutableArray" key="dict.sortedKeys">
+													<object class="NSArray" key="dict.sortedKeys">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<string>NSBackgroundColor</string>
 														<string>NSColor</string>
@@ -111,21 +114,24 @@
 															<string key="NSColorName">selectedTextBackgroundColor</string>
 															<object class="NSColor" key="NSColor">
 																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 															</object>
 														</object>
 														<object class="NSColor">
 															<int key="NSColorSpace">6</int>
 															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">selectedTextColor</string>
-															<reference key="NSColor" ref="76040784"/>
+															<object class="NSColor" key="NSColor" id="76040784">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
 														</object>
 													</object>
 												</object>
-												<nil key="NSMarkedAttributes"/>
+												<reference key="NSInsertionColor" ref="76040784"/>
 												<object class="NSDictionary" key="NSLinkAttributes">
 													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSMutableArray" key="dict.sortedKeys">
+													<object class="NSArray" key="dict.sortedKeys">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<string>NSColor</string>
 														<string>NSUnderline</string>
@@ -136,13 +142,15 @@
 															<int key="NSColorSpace">1</int>
 															<bytes key="NSRGB">MCAwIDEAA</bytes>
 														</object>
-														<integer value="1" id="9"/>
+														<integer value="1"/>
 													</object>
 												</object>
 												<nil key="NSDefaultParagraphStyle"/>
+												<nil key="NSTextFinder"/>
+												<int key="NSPreferredTextFinderStyle">1</int>
 											</object>
 											<int key="NSTVFlags">6</int>
-											<string key="NSMaxSize">{743, 1e+07}</string>
+											<string key="NSMaxSize">{743, 10000000}</string>
 											<string key="NSMinize">{83, 0}</string>
 											<nil key="NSDelegate"/>
 										</object>
@@ -153,8 +161,30 @@
 									<reference key="NSDocView" ref="123567529"/>
 									<reference key="NSBGColor" ref="913007966"/>
 									<object class="NSCursor" key="NSCursor">
-										<string key="NSHotSpot">{4, -5}</string>
-										<int key="NSCursorType">1</int>
+										<string key="NSHotSpot">{4, 5}</string>
+										<object class="NSImage" key="NSImage">
+											<int key="NSImageFlags">12582912</int>
+											<object class="NSMutableArray" key="NSReps">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSArray">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<integer value="0"/>
+													<object class="NSBitmapImageRep">
+														<object class="NSData" key="NSTIFFRepresentation">
+															<bytes key="NS.bytes">TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym
+SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA
+AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA
+AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA
+AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
+														</object>
+													</object>
+												</object>
+											</object>
+											<object class="NSColor" key="NSColor">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MCAwAA</bytes>
+											</object>
+										</object>
 									</object>
 									<int key="NScvFlags">4</int>
 								</object>
@@ -165,24 +195,24 @@
 									<reference key="NSSuperview" ref="777989256"/>
 									<reference key="NSTarget" ref="777989256"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">6.003236e-01</double>
+									<double key="NSPercent">0.60032359999999996</double>
 								</object>
 								<object class="NSScroller" id="446620405">
 									<reference key="NSNextResponder" ref="777989256"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="777989256"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="777989256"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1.000000e+00</double>
-									<double key="NSPercent">9.456522e-01</double>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.94565220000000005</double>
 								</object>
 							</object>
 							<string key="NSFrame">{{-1, -1}, {380, 373}}</string>
 							<reference key="NSSuperview" ref="1055997608"/>
 							<reference key="NSNextKeyView" ref="630219039"/>
-							<int key="NSsFlags">18</int>
+							<int key="NSsFlags">133138</int>
 							<reference key="NSVScroller" ref="821320990"/>
 							<reference key="NSHScroller" ref="446620405"/>
 							<reference key="NSContentView" ref="630219039"/>
@@ -192,9 +222,10 @@
 					<string key="NSFrameSize">{378, 371}</string>
 					<reference key="NSSuperview"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{214.502, 129}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMinSize">{214.50200000000001, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSMenu" id="391216144">
 				<string key="NSTitle">Menu</string>
@@ -282,30 +313,6 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1026712888"/>
-						<reference key="destination" ref="282956917"/>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="123567529"/>
-						<reference key="destination" ref="282956917"/>
-					</object>
-					<int key="connectionID">21</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menu</string>
-						<reference key="source" ref="123567529"/>
-						<reference key="destination" ref="391216144"/>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">textView</string>
 						<reference key="source" ref="282956917"/>
 						<reference key="destination" ref="123567529"/>
@@ -360,6 +367,30 @@
 					</object>
 					<int key="connectionID">44</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1026712888"/>
+						<reference key="destination" ref="282956917"/>
+					</object>
+					<int key="connectionID">17</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="123567529"/>
+						<reference key="destination" ref="282956917"/>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="123567529"/>
+						<reference key="destination" ref="391216144"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -376,7 +407,7 @@
 						<int key="objectID">-2</int>
 						<reference key="object" ref="282956917"/>
 						<reference key="parent" ref="650019074"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+						<string key="objectName">File's Owner</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
@@ -490,174 +521,92 @@
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
+				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.IBPluginDependency</string>
 					<string>-2.IBPluginDependency</string>
 					<string>-3.IBPluginDependency</string>
-					<string>-3.ImportedFromIB2</string>
-					<string>11.IBEditorWindowLastContentRect</string>
 					<string>11.IBPluginDependency</string>
-					<string>11.ImportedFromIB2</string>
 					<string>12.IBPluginDependency</string>
-					<string>12.ImportedFromIB2</string>
 					<string>19.IBPluginDependency</string>
-					<string>19.ImportedFromIB2</string>
 					<string>20.IBPluginDependency</string>
-					<string>20.ImportedFromIB2</string>
 					<string>24.IBPluginDependency</string>
-					<string>24.ImportedFromIB2</string>
 					<string>33.IBPluginDependency</string>
-					<string>33.ImportedFromIB2</string>
 					<string>35.IBPluginDependency</string>
-					<string>35.ImportedFromIB2</string>
 					<string>37.IBPluginDependency</string>
-					<string>37.ImportedFromIB2</string>
 					<string>39.IBPluginDependency</string>
 					<string>39.IBShouldRemoveOnLegacySave</string>
 					<string>40.IBPluginDependency</string>
 					<string>40.IBShouldRemoveOnLegacySave</string>
 					<string>42.IBPluginDependency</string>
-					<string>42.ImportedFromIB2</string>
 					<string>43.IBPluginDependency</string>
-					<string>43.ImportedFromIB2</string>
-					<string>5.IBEditorWindowLastContentRect</string>
+					<string>5.IBPluginDependency</string>
 					<string>5.IBWindowTemplateEditedContentRect</string>
-					<string>5.ImportedFromIB2</string>
-					<string>5.windowTemplate.hasMaxSize</string>
-					<string>5.windowTemplate.hasMinSize</string>
-					<string>5.windowTemplate.maxSize</string>
-					<string>5.windowTemplate.minSize</string>
 					<string>6.IBPluginDependency</string>
-					<string>6.ImportedFromIB2</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{319, 676}, {300, 123}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
+					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{597, 246}, {378, 371}}</string>
 					<string>{{597, 246}, {378, 371}}</string>
-					<reference ref="9"/>
-					<boolean value="NO"/>
-					<reference ref="9"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{214.502, 107}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.sortedKeys" ref="650019074"/>
+				<reference key="dict.values" ref="650019074"/>
 			</object>
 			<nil key="activeLocalization"/>
 			<object class="NSMutableDictionary" key="localizations">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.sortedKeys" ref="650019074"/>
+				<reference key="dict.values" ref="650019074"/>
 			</object>
 			<nil key="sourceID"/>
 			<int key="maxID">44</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FirstResponder</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBOutputPanelController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearActivityLogFile:</string>
-							<string>clearOutput:</string>
-							<string>copyAllOutputToPasteboard:</string>
-							<string>openActivityLogFile:</string>
-							<string>openEncodeLogDirectory:</string>
-							<string>showOutputPanel:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">textView</string>
-						<string key="NS.object.0">NSTextView</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">HBOutputPanelController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBOutputPanelController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
+				<string>NSMenuCheckmark</string>
+				<string>NSMenuMixedState</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
 			</object>
 		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 	</data>
 </archive>

HandBrake-0.9.8.tar.bz2/macosx/English.lproj/PicturePreview.xib -> HandBrake-0.9.9.tar.bz2/macosx/English.lproj/PicturePreview.xib Changed

@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<string key="IBDocument.SystemVersion">12D61</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
@@ -13,32 +13,30 @@
 				<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string>com.apple.QTKitIBPlugin</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>1938</string>
-				<string>822</string>
+				<string>3084</string>
+				<string>2053</string>
 			</object>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSPopUpButton</string>
+			<string>NSBox</string>
 			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
 			<string>NSMenu</string>
-			<string>NSTextFieldCell</string>
 			<string>NSMenuItem</string>
-			<string>NSButtonCell</string>
-			<string>NSBox</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
 			<string>NSProgressIndicator</string>
-			<string>NSImageView</string>
-			<string>NSImageCell</string>
-			<string>QTMovieView</string>
 			<string>NSSlider</string>
 			<string>NSSliderCell</string>
-			<string>NSCustomObject</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
 			<string>NSView</string>
 			<string>NSWindowTemplate</string>
-			<string>NSTextField</string>
-			<string>NSPopUpButtonCell</string>
+			<string>QTMovieView</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -63,7 +61,7 @@
 			<object class="NSWindowTemplate" id="616825745">
 				<int key="NSWindowStyleMask">7</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{142, 519}, {480, 360}}</string>
+				<string key="NSWindowRect">{{142, 519}, {490, 360}}</string>
 				<int key="NSWTFlags">1886913536</int>
 				<string key="NSWindowTitle">HandBrake Preview</string>
 				<string key="NSWindowClass">NSPanel</string>
@@ -76,782 +74,779 @@
 					<int key="NSvFlags">274</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSBox" id="289177107">
+						<object class="QTMovieView" id="48693112">
 							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">18</int>
+							<int key="NSvFlags">274</int>
+							<object class="NSMutableSet" key="NSDragTypes">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="set.sortedObjects">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>Apple URL pasteboard type</string>
+									<string>CorePasteboardFlavorType 0x6D6F6F76</string>
+									<string>NSFilenamesPboardType</string>
+									<string>QTMoviePasteboardType</string>
+								</object>
+							</object>
+							<string key="NSFrameSize">{490, 360}</string>
+							<reference key="NSSuperview" ref="49161063"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="768906858"/>
+							<object class="NSColor" key="kCoderFillColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
+							</object>
+							<boolean value="YES" key="kCoderControllerVisible"/>
+							<boolean value="YES" key="kCoderPreservesAspectRatio"/>
+							<nil key="kCoderMovie"/>
+							<boolean value="NO" key="kCoderEditable"/>
+						</object>
+						<object class="NSBox" id="92351498">
+							<reference key="NSNextResponder" ref="49161063"/>
+							<int key="NSvFlags">-2147483611</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="353606868">
-									<reference key="NSNextResponder" ref="289177107"/>
+								<object class="NSView" id="385854969">
+									<reference key="NSNextResponder" ref="92351498"/>
 									<int key="NSvFlags">274</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSImageView" id="844127024">
-											<reference key="NSNextResponder" ref="353606868"/>
-											<int key="NSvFlags">274</int>
-											<object class="NSMutableSet" key="NSDragTypes">
+										<object class="NSButton" id="798240356">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">292</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+											</object>
+											<string key="NSFrame">{{17, 11}, {77, 16}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="66510867"/>
+											<object class="NSArray" key="NSViewContentFilters">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSArray" key="set.sortedObjects">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<string>Apple PDF pasteboard type</string>
-													<string>Apple PICT pasteboard type</string>
-													<string>Apple PNG pasteboard type</string>
-													<string>NSFilenamesPboardType</string>
-													<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-													<string>NeXT TIFF v4.0 pasteboard type</string>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
 												</object>
 											</object>
-											<string key="NSFrame">{{-3, -3}, {488, 368}}</string>
-											<reference key="NSSuperview" ref="353606868"/>
-											<reference key="NSNextKeyView" ref="48693112"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSImageCell" key="NSCell" id="955430771">
-												<int key="NSCellFlags">130560</int>
-												<int key="NSCellFlags2">33554432</int>
-												<int key="NSAlign">0</int>
-												<int key="NSScale">1</int>
-												<int key="NSStyle">3</int>
-												<bool key="NSAnimates">NO</bool>
+											<object class="NSButtonCell" key="NSCell" id="975305481">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134479872</int>
+												<string key="NSContents">Live Preview</string>
+												<object class="NSFont" key="NSSupport" id="22">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">9</double>
+													<int key="NSfFlags">3614</int>
+												</object>
+												<reference key="NSControlView" ref="798240356"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<reference key="NSAlternateImage" ref="22"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
 											</object>
-											<bool key="NSEditable">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="QTMovieView" id="48693112">
-											<reference key="NSNextResponder" ref="353606868"/>
-											<int key="NSvFlags">274</int>
-											<object class="NSMutableSet" key="NSDragTypes">
+										<object class="NSButton" id="141370142">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">289</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+											</object>
+											<string key="NSFrame">{{370, 11}, {59, 16}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="700607930"/>
+											<object class="NSArray" key="NSViewContentFilters">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSArray" key="set.sortedObjects">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<string>Apple URL pasteboard type</string>
-													<string>CorePasteboardFlavorType 0x6D6F6F76</string>
-													<string>NSFilenamesPboardType</string>
-													<string>QTMoviePasteboardType</string>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
 												</object>
 											</object>
-											<string key="NSFrameSize">{482, 362}</string>
-											<reference key="NSSuperview" ref="353606868"/>
-											<reference key="NSNextKeyView" ref="768906858"/>
-											<object class="NSColor" key="kCoderFillColor">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="606007744">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134479872</int>
+												<string key="NSContents">Settings</string>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="141370142"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<reference key="NSAlternateImage" ref="22"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
 											</object>
-											<boolean value="YES" key="kCoderControllerVisible"/>
-											<boolean value="YES" key="kCoderPreservesAspectRatio"/>
-											<nil key="kCoderMovie"/>
-											<boolean value="NO" key="kCoderEditable"/>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="NSBox" id="92351498">
-											<reference key="NSNextResponder" ref="353606868"/>
-											<int key="NSvFlags">-2147483611</int>
+										<object class="NSButton" id="81685190">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">289</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSView" id="385854969">
-													<reference key="NSNextResponder" ref="92351498"/>
-													<int key="NSvFlags">274</int>
-													<object class="NSMutableArray" key="NSSubviews">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSButton" id="798240356">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">292</int>
-															<string key="NSFrame">{{20, 9}, {77, 16}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="66510867"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="975305481">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134479872</int>
-																<string key="NSContents">Live Preview</string>
-																<object class="NSFont" key="NSSupport" id="22">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">9</double>
-																	<int key="NSfFlags">3614</int>
-																</object>
-																<reference key="NSControlView" ref="798240356"/>
-																<int key="NSButtonFlags">-2038284033</int>
-																<int key="NSButtonFlags2">129</int>
-																<reference key="NSAlternateImage" ref="22"/>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSButton" id="141370142">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">289</int>
-															<string key="NSFrame">{{357, 10}, {59, 16}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="700607930"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="606007744">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134479872</int>
-																<string key="NSContents">Settings</string>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="141370142"/>
-																<int key="NSButtonFlags">-2038284033</int>
-																<int key="NSButtonFlags2">129</int>
-																<reference key="NSAlternateImage" ref="22"/>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSButton" id="81685190">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">289</int>
-															<string key="NSFrame">{{259, 10}, {92, 16}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="141370142"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="847033897">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134479872</int>
-																<string key="NSContents">Scale To Screen</string>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="81685190"/>
-																<int key="NSButtonFlags">-2038284033</int>
-																<int key="NSButtonFlags2">129</int>
-																<object class="NSFont" key="NSAlternateImage" id="354866114">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">9</double>
-																	<int key="NSfFlags">16</int>
-																</object>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSTextField" id="66510867">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">289</int>
-															<string key="NSFrame">{{101, 14}, {75, 11}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="598619000"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="567286013">
-																<int key="NSCellFlags">68288064</int>
-																<int key="NSCellFlags2">71566336</int>
-																<string key="NSContents">Duration (sec):</string>
-																<object class="NSFont" key="NSSupport" id="811969608">
-																	<string key="NSName">LucidaGrande-Bold</string>
-																	<double key="NSSize">9</double>
-																	<int key="NSfFlags">16</int>
-																</object>
-																<reference key="NSControlView" ref="66510867"/>
-																<object class="NSColor" key="NSBackgroundColor" id="407686733">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">controlColor</string>
-																	<object class="NSColor" key="NSColor">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-																	</object>
-																</object>
-																<object class="NSColor" key="NSTextColor">
-																	<int key="NSColorSpace">1</int>
-																	<bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
-																</object>
-															</object>
-														</object>
-														<object class="NSPopUpButton" id="598619000">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">289</int>
-															<string key="NSFrame">{{184, 11}, {58, 15}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="81685190"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSPopUpButtonCell" key="NSCell" id="953108737">
-																<int key="NSCellFlags">-2076049856</int>
-																<int key="NSCellFlags2">264192</int>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="598619000"/>
-																<int key="NSButtonFlags">109199615</int>
-																<int key="NSButtonFlags2">1</int>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">400</int>
-																<int key="NSPeriodicInterval">75</int>
-																<object class="NSMenuItem" key="NSMenuItem" id="372655630">
-																	<reference key="NSMenu" ref="501672847"/>
-																	<string key="NSTitle">Item 1</string>
-																	<string key="NSKeyEquiv"/>
-																	<int key="NSKeyEquivModMask">1048576</int>
-																	<int key="NSMnemonicLoc">2147483647</int>
-																	<int key="NSState">1</int>
-																	<object class="NSCustomResource" key="NSOnImage" id="858043985">
-																		<string key="NSClassName">NSImage</string>
-																		<string key="NSResourceName">NSMenuCheckmark</string>
-																	</object>
-																	<object class="NSCustomResource" key="NSMixedImage" id="700487240">
-																		<string key="NSClassName">NSImage</string>
-																		<string key="NSResourceName">NSMenuMixedState</string>
-																	</object>
-																	<string key="NSAction">_popUpItemAction:</string>
-																	<reference key="NSTarget" ref="953108737"/>
-																</object>
-																<bool key="NSMenuItemRespectAlignment">YES</bool>
-																<object class="NSMenu" key="NSMenu" id="501672847">
-																	<string key="NSTitle">OtherViews</string>
-																	<object class="NSMutableArray" key="NSMenuItems">
-																		<bool key="EncodedWithXMLCoder">YES</bool>
-																		<reference ref="372655630"/>
-																		<object class="NSMenuItem" id="607756368">
-																			<reference key="NSMenu" ref="501672847"/>
-																			<string key="NSTitle">Item 2</string>
-																			<string key="NSKeyEquiv"/>
-																			<int key="NSKeyEquivModMask">1048576</int>
-																			<int key="NSMnemonicLoc">2147483647</int>
-																			<reference key="NSOnImage" ref="858043985"/>
-																			<reference key="NSMixedImage" ref="700487240"/>
-																			<string key="NSAction">_popUpItemAction:</string>
-																			<reference key="NSTarget" ref="953108737"/>
-																		</object>
-																		<object class="NSMenuItem" id="272743761">
-																			<reference key="NSMenu" ref="501672847"/>
-																			<string key="NSTitle">Item 3</string>
-																			<string key="NSKeyEquiv"/>
-																			<int key="NSKeyEquivModMask">1048576</int>
-																			<int key="NSMnemonicLoc">2147483647</int>
-																			<reference key="NSOnImage" ref="858043985"/>
-																			<reference key="NSMixedImage" ref="700487240"/>
-																			<string key="NSAction">_popUpItemAction:</string>
-																			<reference key="NSTarget" ref="953108737"/>
-																		</object>
-																	</object>
-																</object>
-																<int key="NSPreferredEdge">1</int>
-																<bool key="NSUsesItemFromMenu">YES</bool>
-																<bool key="NSAltersState">YES</bool>
-																<int key="NSArrowPosition">2</int>
-															</object>
-														</object>
-														<object class="NSSlider" id="396925210">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">290</int>
-															<string key="NSFrame">{{18, 39}, {402, 16}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="798240356"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSSliderCell" key="NSCell" id="639767004">
-																<int key="NSCellFlags">67501824</int>
-																<int key="NSCellFlags2">262144</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="396925210"/>
-																<double key="NSMaxValue">9</double>
-																<double key="NSMinValue">0.0</double>
-																<double key="NSValue">0.0</double>
-																<double key="NSAltIncValue">0.0</double>
-																<int key="NSNumberOfTickMarks">10</int>
-																<int key="NSTickMarkPosition">1</int>
-																<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-																<bool key="NSVertical">NO</bool>
-															</object>
-														</object>
-														<object class="NSTextField" id="628196212">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">290</int>
-															<string key="NSFrame">{{15, 55}, {408, 20}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="396925210"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="921881842">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">4325376</int>
-																<string key="NSContents"/>
-																<object class="NSFont" key="NSSupport" id="476446081">
-																	<string key="NSName">LucidaGrande-Bold</string>
-																	<double key="NSSize">11</double>
-																	<int key="NSfFlags">16</int>
-																</object>
-																<reference key="NSControlView" ref="628196212"/>
-																<bool key="NSDrawsBackground">YES</bool>
-																<reference key="NSBackgroundColor" ref="407686733"/>
-																<object class="NSColor" key="NSTextColor" id="978544139">
-																	<int key="NSColorSpace">1</int>
-																	<bytes key="NSRGB">MSAxIDEAA</bytes>
-																</object>
-															</object>
-														</object>
-														<object class="NSTextField" id="245200984">
-															<reference key="NSNextResponder" ref="385854969"/>
-															<int key="NSvFlags">290</int>
-															<string key="NSFrame">{{16, 80}, {408, 12}}</string>
-															<reference key="NSSuperview" ref="385854969"/>
-															<reference key="NSNextKeyView" ref="628196212"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="1032360651">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">4456448</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="811969608"/>
-																<reference key="NSControlView" ref="245200984"/>
-																<bool key="NSDrawsBackground">YES</bool>
-																<reference key="NSBackgroundColor" ref="407686733"/>
-																<reference key="NSTextColor" ref="978544139"/>
-															</object>
-														</object>
+											</object>
+											<string key="NSFrame">{{272, 11}, {92, 16}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="141370142"/>
+											<object class="NSArray" key="NSViewContentFilters">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
 													</object>
-													<string key="NSFrame">{{1, 1}, {438, 97}}</string>
-													<reference key="NSSuperview" ref="92351498"/>
-													<reference key="NSNextKeyView" ref="245200984"/>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
 												</object>
 											</object>
-											<string key="NSFrame">{{21, 121}, {440, 99}}</string>
-											<reference key="NSSuperview" ref="353606868"/>
-											<reference key="NSNextKeyView" ref="385854969"/>
-											<string key="NSOffsets">{0, 0}</string>
-											<object class="NSTextFieldCell" key="NSTitleCell">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Picture Controls</string>
-												<object class="NSFont" key="NSSupport" id="26">
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="847033897">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134479872</int>
+												<string key="NSContents">Scale To Screen</string>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="81685190"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<object class="NSFont" key="NSAlternateImage" id="354866114">
 													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">11</double>
-													<int key="NSfFlags">3100</int>
+													<double key="NSSize">9</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="66510867">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">289</int>
+											<string key="NSFrame">{{108, 14}, {75, 11}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="598619000"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="567286013">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">71566336</int>
+												<string key="NSContents">Duration (sec):</string>
+												<object class="NSFont" key="NSSupport" id="811969608">
+													<string key="NSName">LucidaGrande-Bold</string>
+													<double key="NSSize">9</double>
+													<int key="NSfFlags">16</int>
 												</object>
-												<object class="NSColor" key="NSBackgroundColor" id="384686844">
+												<reference key="NSControlView" ref="66510867"/>
+												<object class="NSColor" key="NSBackgroundColor" id="407686733">
 													<int key="NSColorSpace">6</int>
 													<string key="NSCatalogName">System</string>
-													<string key="NSColorName">textBackgroundColor</string>
+													<string key="NSColorName">controlColor</string>
 													<object class="NSColor" key="NSColor">
 														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MQA</bytes>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 													</object>
 												</object>
-												<object class="NSColor" key="NSTextColor">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+												<object class="NSColor" key="NSTextColor" id="978544139">
+													<int key="NSColorSpace">1</int>
+													<bytes key="NSRGB">MSAxIDEAA</bytes>
 												</object>
 											</object>
-											<reference key="NSContentView" ref="385854969"/>
-											<int key="NSBorderType">1</int>
-											<int key="NSBoxType">4</int>
-											<int key="NSTitlePosition">0</int>
-											<bool key="NSTransparent">NO</bool>
-											<double key="NSCornerRadius2">12</double>
-											<object class="NSColor" key="NSBorderColor2">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MSAxIDEgMC41AA</bytes>
-											</object>
-											<object class="NSColor" key="NSFillColor2">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
-											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="NSBox" id="700607930">
-											<reference key="NSNextResponder" ref="353606868"/>
-											<int key="NSvFlags">-2147483611</int>
-											<object class="NSMutableArray" key="NSSubviews">
+										<object class="NSPopUpButton" id="598619000">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">289</int>
+											<string key="NSFrame">{{187, 12}, {58, 15}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="81685190"/>
+											<object class="NSArray" key="NSViewContentFilters">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSView" id="1068222891">
-													<reference key="NSNextResponder" ref="700607930"/>
-													<int key="NSvFlags">274</int>
-													<object class="NSMutableArray" key="NSSubviews">
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
+												</object>
+											</object>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="953108737">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">264192</int>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="598619000"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="372655630">
+													<reference key="NSMenu" ref="501672847"/>
+													<string key="NSTitle">Item 1</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<object class="NSCustomResource" key="NSOnImage" id="858043985">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuCheckmark</string>
+													</object>
+													<object class="NSCustomResource" key="NSMixedImage" id="700487240">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuMixedState</string>
+													</object>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="953108737"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="501672847">
+													<string key="NSTitle">OtherViews</string>
+													<object class="NSMutableArray" key="NSMenuItems">
 														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSSlider" id="886140787">
-															<reference key="NSNextResponder" ref="1068222891"/>
-															<int key="NSvFlags">290</int>
-															<string key="NSFrame">{{18, 27}, {407, 21}}</string>
-															<reference key="NSSuperview" ref="1068222891"/>
-															<reference key="NSNextKeyView" ref="964331174"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSSliderCell" key="NSCell" id="493667684">
-																<int key="NSCellFlags">67501824</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents"/>
-																<reference key="NSControlView" ref="886140787"/>
-																<double key="NSMaxValue">100</double>
-																<double key="NSMinValue">0.0</double>
-																<double key="NSValue">0.0</double>
-																<double key="NSAltIncValue">0.0</double>
-																<int key="NSNumberOfTickMarks">0</int>
-																<int key="NSTickMarkPosition">1</int>
-																<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
-																<bool key="NSVertical">NO</bool>
-															</object>
-														</object>
-														<object class="NSButton" id="102183813">
-															<reference key="NSNextResponder" ref="1068222891"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{200, 53}, {39, 25}}</string>
-															<reference key="NSSuperview" ref="1068222891"/>
-															<reference key="NSNextKeyView" ref="894608246"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="19809002">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134217728</int>
-																<string key="NSContents"/>
-																<object class="NSFont" key="NSSupport" id="353643025">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">13</double>
-																	<int key="NSfFlags">1044</int>
-																</object>
-																<reference key="NSControlView" ref="102183813"/>
-																<int key="NSButtonFlags">-2038169345</int>
-																<int key="NSButtonFlags2">134</int>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
+														<reference ref="372655630"/>
+														<object class="NSMenuItem" id="607756368">
+															<reference key="NSMenu" ref="501672847"/>
+															<string key="NSTitle">Item 2</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="858043985"/>
+															<reference key="NSMixedImage" ref="700487240"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="953108737"/>
 														</object>
-														<object class="NSButton" id="897614796">
-															<reference key="NSNextResponder" ref="1068222891"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{171, 53}, {30, 25}}</string>
-															<reference key="NSSuperview" ref="1068222891"/>
-															<reference key="NSNextKeyView" ref="102183813"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="913339095">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134217728</int>
-																<string key="NSContents">|&lt;</string>
-																<reference key="NSSupport" ref="353643025"/>
-																<reference key="NSControlView" ref="897614796"/>
-																<int key="NSButtonFlags">-2038038273</int>
-																<int key="NSButtonFlags2">134</int>
-																<object class="NSFont" key="NSAlternateImage">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">13</double>
-																	<int key="NSfFlags">16</int>
-																</object>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSButton" id="894608246">
-															<reference key="NSNextResponder" ref="1068222891"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{238, 53}, {32, 25}}</string>
-															<reference key="NSSuperview" ref="1068222891"/>
-															<reference key="NSNextKeyView" ref="630042886"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="117507013">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134479872</int>
-																<string key="NSContents">&gt;|</string>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="894608246"/>
-																<int key="NSButtonFlags">-2038169345</int>
-																<int key="NSButtonFlags2">134</int>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSButton" id="630042886">
-															<reference key="NSNextResponder" ref="1068222891"/>
-															<int key="NSvFlags">292</int>
-															<string key="NSFrame">{{331, 56}, {77, 16}}</string>
-															<reference key="NSSuperview" ref="1068222891"/>
-															<reference key="NSNextKeyView" ref="886140787"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="999505395">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134479872</int>
-																<string key="NSContents">Still Previews</string>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="630042886"/>
-																<int key="NSButtonFlags">-2038284033</int>
-																<int key="NSButtonFlags2">129</int>
-																<reference key="NSAlternateImage" ref="22"/>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSTextField" id="964331174">
-															<reference key="NSNextResponder" ref="1068222891"/>
-															<int key="NSvFlags">290</int>
-															<string key="NSFrame">{{18, 10}, {399, 12}}</string>
-															<reference key="NSSuperview" ref="1068222891"/>
-															<reference key="NSNextKeyView"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="113790059">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">4456448</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="811969608"/>
-																<reference key="NSControlView" ref="964331174"/>
-																<bool key="NSDrawsBackground">YES</bool>
-																<reference key="NSBackgroundColor" ref="407686733"/>
-																<reference key="NSTextColor" ref="978544139"/>
-															</object>
+														<object class="NSMenuItem" id="272743761">
+															<reference key="NSMenu" ref="501672847"/>
+															<string key="NSTitle">Item 3</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="858043985"/>
+															<reference key="NSMixedImage" ref="700487240"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="953108737"/>
 														</object>
 													</object>
-													<string key="NSFrame">{{1, 1}, {438, 97}}</string>
-													<reference key="NSSuperview" ref="700607930"/>
-													<reference key="NSNextKeyView" ref="897614796"/>
+												</object>
+												<int key="NSPreferredEdge">1</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">2</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="396925210">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">290</int>
+											<string key="NSFrame">{{18, 39}, {410, 16}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="798240356"/>
+											<object class="NSArray" key="NSViewContentFilters">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
+												</object>
+											</object>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="639767004">
+												<int key="NSCellFlags">67371264</int>
+												<int key="NSCellFlags2">262144</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="396925210"/>
+												<double key="NSMaxValue">9</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">0.0</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">10</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="628196212">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">290</int>
+											<string key="NSFrame">{{15, 55}, {420, 20}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="396925210"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="921881842">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4325376</int>
+												<string key="NSContents"/>
+												<object class="NSFont" key="NSSupport" id="476446081">
+													<string key="NSName">LucidaGrande-Bold</string>
+													<double key="NSSize">11</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<reference key="NSControlView" ref="628196212"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<reference key="NSBackgroundColor" ref="407686733"/>
+												<reference key="NSTextColor" ref="978544139"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="245200984">
+											<reference key="NSNextResponder" ref="385854969"/>
+											<int key="NSvFlags">290</int>
+											<string key="NSFrame">{{15, 77}, {416, 12}}</string>
+											<reference key="NSSuperview" ref="385854969"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="628196212"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="1032360651">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4456448</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="811969608"/>
+												<reference key="NSControlView" ref="245200984"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<reference key="NSBackgroundColor" ref="407686733"/>
+												<reference key="NSTextColor" ref="978544139"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</object>
+									<string key="NSFrame">{{2, 2}, {446, 96}}</string>
+									<reference key="NSSuperview" ref="92351498"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="245200984"/>
+								</object>
+							</object>
+							<string key="NSFrame">{{15, 132}, {460, 100}}</string>
+							<reference key="NSSuperview" ref="49161063"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="385854969"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Picture Controls</string>
+								<object class="NSFont" key="NSSupport" id="26">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<object class="NSColor" key="NSBackgroundColor" id="384686844">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="385854969"/>
+							<int key="NSBorderType">1</int>
+							<int key="NSBoxType">4</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+							<real value="2" key="NSBorderWidth2"/>
+							<double key="NSCornerRadius2">12</double>
+							<object class="NSColor" key="NSBorderColor2">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MSAxIDEgMC44AA</bytes>
+							</object>
+							<object class="NSColor" key="NSFillColor2">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
+							</object>
+						</object>
+						<object class="NSBox" id="700607930">
+							<reference key="NSNextResponder" ref="49161063"/>
+							<int key="NSvFlags">-2147483611</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSView" id="1068222891">
+									<reference key="NSNextResponder" ref="700607930"/>
+									<int key="NSvFlags">274</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSSlider" id="886140787">
+											<reference key="NSNextResponder" ref="1068222891"/>
+											<int key="NSvFlags">290</int>
+											<string key="NSFrame">{{16, 16}, {355, 21}}</string>
+											<reference key="NSSuperview" ref="1068222891"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="964331174"/>
+											<object class="NSArray" key="NSViewContentFilters">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
 												</object>
 											</object>
-											<string key="NSFrame">{{21, 16}, {440, 99}}</string>
-											<reference key="NSSuperview" ref="353606868"/>
-											<reference key="NSNextKeyView" ref="1068222891"/>
-											<string key="NSOffsets">{0, 0}</string>
-											<object class="NSTextFieldCell" key="NSTitleCell">
-												<int key="NSCellFlags">67239424</int>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="493667684">
+												<int key="NSCellFlags">67371264</int>
 												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Playback Controls</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSBackgroundColor" ref="384686844"/>
-												<object class="NSColor" key="NSTextColor">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+												<string key="NSContents"/>
+												<reference key="NSControlView" ref="886140787"/>
+												<double key="NSMaxValue">100</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">0.0</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">0</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="102183813">
+											<reference key="NSNextResponder" ref="1068222891"/>
+											<int key="NSvFlags">268</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+											</object>
+											<string key="NSFrame">{{205, 43}, {36, 36}}</string>
+											<reference key="NSSuperview" ref="1068222891"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="894608246"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="19809002">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents"/>
+												<object class="NSFont" key="NSSupport" id="353643025">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">1044</int>
+												</object>
+												<reference key="NSControlView" ref="102183813"/>
+												<int key="NSButtonFlags">-931921920</int>
+												<int key="NSButtonFlags2">134</int>
+												<object class="NSCustomResource" key="NSNormalImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">play-p</string>
 												</object>
+												<object class="NSCustomResource" key="NSAlternateImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">pause-p</string>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
 											</object>
-											<reference key="NSContentView" ref="1068222891"/>
-											<int key="NSBorderType">1</int>
-											<int key="NSBoxType">4</int>
-											<int key="NSTitlePosition">0</int>
-											<bool key="NSTransparent">NO</bool>
-											<double key="NSCornerRadius2">12</double>
-											<object class="NSColor" key="NSBorderColor2">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MSAxIDEgMC41AA</bytes>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="897614796">
+											<reference key="NSNextResponder" ref="1068222891"/>
+											<int key="NSvFlags">268</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
 											</object>
-											<object class="NSColor" key="NSFillColor2">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
+											<string key="NSFrame">{{163, 48}, {32, 26}}</string>
+											<reference key="NSSuperview" ref="1068222891"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="102183813"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="913339095">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="353643025"/>
+												<reference key="NSControlView" ref="897614796"/>
+												<int key="NSButtonFlags">-2041839616</int>
+												<int key="NSButtonFlags2">134</int>
+												<object class="NSCustomResource" key="NSNormalImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">prev-p</string>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="NSBox" id="768906858">
-											<reference key="NSNextResponder" ref="353606868"/>
-											<int key="NSvFlags">-2147483611</int>
+										<object class="NSButton" id="894608246">
+											<reference key="NSNextResponder" ref="1068222891"/>
+											<int key="NSvFlags">268</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSView" id="1067699710">
-													<reference key="NSNextResponder" ref="768906858"/>
-													<int key="NSvFlags">274</int>
-													<object class="NSMutableArray" key="NSSubviews">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSProgressIndicator" id="196868285">
-															<reference key="NSNextResponder" ref="1067699710"/>
-															<int key="NSvFlags">-2147482368</int>
-															<object class="NSPSMatrix" key="NSDrawMatrix"/>
-															<string key="NSFrame">{{23, 26}, {336, 12}}</string>
-															<reference key="NSSuperview" ref="1067699710"/>
-															<reference key="NSNextKeyView" ref="569473100"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<int key="NSpiFlags">16650</int>
-															<double key="NSMinValue">20</double>
-															<double key="NSMaxValue">100</double>
-														</object>
-														<object class="NSButton" id="569473100">
-															<reference key="NSNextResponder" ref="1067699710"/>
-															<int key="NSvFlags">265</int>
-															<string key="NSFrame">{{366, 24}, {58, 16}}</string>
-															<reference key="NSSuperview" ref="1067699710"/>
-															<reference key="NSNextKeyView" ref="92351498"/>
-															<object class="NSArray" key="NSViewContentFilters">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="CIColorMonochrome">
-																	<object class="CIColor" key="CI_inputColor">
-																		<float key="red">0.70196080207824707</float>
-																		<float key="green">0.70196080207824707</float>
-																		<float key="blue">0.70196080207824707</float>
-																		<float key="alpha">1</float>
-																	</object>
-																	<integer value="1" key="CI_inputIntensity"/>
-																	<bool key="CIEnabled">YES</bool>
-																</object>
-															</object>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="908165435">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134479872</int>
-																<string key="NSContents">Cancel</string>
-																<reference key="NSSupport" ref="22"/>
-																<reference key="NSControlView" ref="569473100"/>
-																<int key="NSButtonFlags">-2038284033</int>
-																<int key="NSButtonFlags2">129</int>
-																<reference key="NSAlternateImage" ref="354866114"/>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">200</int>
-																<int key="NSPeriodicInterval">25</int>
-															</object>
-														</object>
-														<object class="NSTextField" id="986015194">
-															<reference key="NSNextResponder" ref="1067699710"/>
-															<int key="NSvFlags">256</int>
-															<string key="NSFrame">{{21, 59}, {394, 14}}</string>
-															<reference key="NSSuperview" ref="1067699710"/>
-															<reference key="NSNextKeyView" ref="196868285"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="304208899">
-																<int key="NSCellFlags">68288064</int>
-																<int key="NSCellFlags2">4326400</int>
-																<string key="NSContents">Preparing Preview</string>
-																<reference key="NSSupport" ref="476446081"/>
-																<reference key="NSControlView" ref="986015194"/>
-																<object class="NSColor" key="NSBackgroundColor">
-																	<int key="NSColorSpace">2</int>
-																	<bytes key="NSRGB">MC45MDE5NjA4NSAwLjkwMTk2MDg1IDAuOTAxOTYwODUgMAA</bytes>
-																</object>
-																<reference key="NSTextColor" ref="978544139"/>
-															</object>
-														</object>
+											</object>
+											<string key="NSFrame">{{251, 48}, {32, 26}}</string>
+											<reference key="NSSuperview" ref="1068222891"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="630042886"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="117507013">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134479872</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="894608246"/>
+												<int key="NSButtonFlags">-2042363904</int>
+												<int key="NSButtonFlags2">134</int>
+												<object class="NSCustomResource" key="NSNormalImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">next-p</string>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="630042886">
+											<reference key="NSNextResponder" ref="1068222891"/>
+											<int key="NSvFlags">292</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+											</object>
+											<string key="NSFrame">{{348, 53}, {81, 16}}</string>
+											<reference key="NSSuperview" ref="1068222891"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="886140787"/>
+											<object class="NSArray" key="NSViewContentFilters">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
 													</object>
-													<string key="NSFrame">{{1, 1}, {438, 98}}</string>
-													<reference key="NSSuperview" ref="768906858"/>
-													<reference key="NSNextKeyView" ref="986015194"/>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
 												</object>
 											</object>
-											<string key="NSFrame">{{21, 233}, {440, 100}}</string>
-											<reference key="NSSuperview" ref="353606868"/>
-											<reference key="NSNextKeyView" ref="1067699710"/>
-											<string key="NSOffsets">{0, 0}</string>
-											<object class="NSTextFieldCell" key="NSTitleCell">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Encoding Controls</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSBackgroundColor" ref="384686844"/>
-												<object class="NSColor" key="NSTextColor">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="999505395">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134479872</int>
+												<string key="NSContents">Still Previews</string>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="630042886"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<reference key="NSAlternateImage" ref="22"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="964331174">
+											<reference key="NSNextResponder" ref="1068222891"/>
+											<int key="NSvFlags">290</int>
+											<string key="NSFrame">{{364, 19}, {67, 14}}</string>
+											<reference key="NSSuperview" ref="1068222891"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="113790059">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">71565312</int>
+												<string key="NSContents">00:00:00</string>
+												<reference key="NSSupport" ref="476446081"/>
+												<reference key="NSControlView" ref="964331174"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<reference key="NSBackgroundColor" ref="407686733"/>
+												<reference key="NSTextColor" ref="978544139"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</object>
+									<string key="NSFrame">{{2, 2}, {446, 96}}</string>
+									<reference key="NSSuperview" ref="700607930"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="897614796"/>
+								</object>
+							</object>
+							<string key="NSFrame">{{15, 30}, {460, 100}}</string>
+							<reference key="NSSuperview" ref="49161063"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1068222891"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Playback Controls</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="384686844"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="1068222891"/>
+							<int key="NSBorderType">1</int>
+							<int key="NSBoxType">4</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+							<real value="2" key="NSBorderWidth2"/>
+							<double key="NSCornerRadius2">12</double>
+							<object class="NSColor" key="NSBorderColor2">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MSAxIDEgMC44AA</bytes>
+							</object>
+							<object class="NSColor" key="NSFillColor2">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
+							</object>
+						</object>
+						<object class="NSBox" id="768906858">
+							<reference key="NSNextResponder" ref="49161063"/>
+							<int key="NSvFlags">-2147483611</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSView" id="1067699710">
+									<reference key="NSNextResponder" ref="768906858"/>
+									<int key="NSvFlags">274</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSProgressIndicator" id="196868285">
+											<reference key="NSNextResponder" ref="1067699710"/>
+											<int key="NSvFlags">1280</int>
+											<string key="NSFrame">{{18, 26}, {346, 12}}</string>
+											<reference key="NSSuperview" ref="1067699710"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="569473100"/>
+											<object class="NSArray" key="NSViewContentFilters">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
+												</object>
+											</object>
+											<int key="NSpiFlags">16650</int>
+											<double key="NSMaxValue">100</double>
+										</object>
+										<object class="NSButton" id="569473100">
+											<reference key="NSNextResponder" ref="1067699710"/>
+											<int key="NSvFlags">265</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+											</object>
+											<string key="NSFrame">{{371, 24}, {58, 16}}</string>
+											<reference key="NSSuperview" ref="1067699710"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="92351498"/>
+											<object class="NSArray" key="NSViewContentFilters">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="CIColorMonochrome">
+													<object class="CIColor" key="CI_inputColor">
+														<float key="red">0.70196080207824707</float>
+														<float key="green">0.70196080207824707</float>
+														<float key="blue">0.70196080207824707</float>
+														<float key="alpha">1</float>
+													</object>
+													<integer value="1" key="CI_inputIntensity"/>
+													<bool key="CIEnabled">YES</bool>
 												</object>
 											</object>
-											<reference key="NSContentView" ref="1067699710"/>
-											<int key="NSBorderType">1</int>
-											<int key="NSBoxType">4</int>
-											<int key="NSTitlePosition">0</int>
-											<bool key="NSTransparent">NO</bool>
-											<double key="NSCornerRadius2">11</double>
-											<object class="NSColor" key="NSBorderColor2">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MSAxIDEgMC41AA</bytes>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="908165435">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134479872</int>
+												<string key="NSContents">Cancel</string>
+												<reference key="NSSupport" ref="22"/>
+												<reference key="NSControlView" ref="569473100"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<reference key="NSAlternateImage" ref="354866114"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
 											</object>
-											<object class="NSColor" key="NSFillColor2">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="986015194">
+											<reference key="NSNextResponder" ref="1067699710"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{15, 59}, {406, 14}}</string>
+											<reference key="NSSuperview" ref="1067699710"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="196868285"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="304208899">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">4326400</int>
+												<string key="NSContents">Preparing Preview</string>
+												<reference key="NSSupport" ref="476446081"/>
+												<reference key="NSControlView" ref="986015194"/>
+												<object class="NSColor" key="NSBackgroundColor">
+													<int key="NSColorSpace">2</int>
+													<bytes key="NSRGB">MC45MDE5NjA4NSAwLjkwMTk2MDg1IDAuOTAxOTYwODUgMAA</bytes>
+												</object>
+												<reference key="NSTextColor" ref="978544139"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</object>
-									<string key="NSFrameSize">{480, 360}</string>
-									<reference key="NSSuperview" ref="289177107"/>
-									<reference key="NSNextKeyView" ref="844127024"/>
+									<string key="NSFrame">{{2, 2}, {446, 96}}</string>
+									<reference key="NSSuperview" ref="768906858"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="986015194"/>
 								</object>
 							</object>
-							<string key="NSFrameSize">{480, 360}</string>
+							<string key="NSFrame">{{15, 235}, {460, 100}}</string>
 							<reference key="NSSuperview" ref="49161063"/>
-							<reference key="NSNextKeyView" ref="353606868"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1067699710"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
+								<string key="NSContents">Encoding Controls</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSBackgroundColor" ref="384686844"/>
 								<object class="NSColor" key="NSTextColor">
@@ -859,27 +854,29 @@
 									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
 								</object>
 							</object>
-							<reference key="NSContentView" ref="353606868"/>
+							<reference key="NSContentView" ref="1067699710"/>
 							<int key="NSBorderType">1</int>
 							<int key="NSBoxType">4</int>
 							<int key="NSTitlePosition">0</int>
 							<bool key="NSTransparent">NO</bool>
-							<real value="0.0" key="NSBorderWidth2"/>
+							<real value="2" key="NSBorderWidth2"/>
+							<double key="NSCornerRadius2">12</double>
 							<object class="NSColor" key="NSBorderColor2">
-								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MCAwLjQ0AA</bytes>
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MSAxIDEgMC44AA</bytes>
 							</object>
 							<object class="NSColor" key="NSFillColor2">
 								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC43MDE5NjA4IDAuNzAxOTYwOCAwLjcwMTk2MDgAA</bytes>
+								<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{480, 360}</string>
+					<string key="NSFrameSize">{490, 360}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView" ref="289177107"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="48693112"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -889,43 +886,51 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fInfoField</string>
+						<string key="label">window</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="628196212"/>
+						<reference key="destination" ref="616825745"/>
 					</object>
-					<int key="connectionID">73</int>
+					<int key="connectionID">184</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureView</string>
+						<string key="label">fCreatePreviewMovieButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="844127024"/>
+						<reference key="destination" ref="798240356"/>
 					</object>
-					<int key="connectionID">181</int>
+					<int key="connectionID">217</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
+						<string key="label">fscaleInfoField</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="616825745"/>
+						<reference key="destination" ref="245200984"/>
 					</object>
-					<int key="connectionID">184</int>
+					<int key="connectionID">282</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieView</string>
+						<string key="label">fPreviewMovieLengthPopUp</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="48693112"/>
+						<reference key="destination" ref="598619000"/>
 					</object>
-					<int key="connectionID">208</int>
+					<int key="connectionID">232</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">previewDurationPopUpChanged:</string>
+						<reference key="source" ref="355312334"/>
+						<reference key="destination" ref="598619000"/>
+					</object>
+					<int key="connectionID">233</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSlider</string>
+						<string key="label">fPictureControlBox</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="396925210"/>
+						<reference key="destination" ref="92351498"/>
 					</object>
-					<int key="connectionID">211</int>
+					<int key="connectionID">254</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -936,236 +941,204 @@
 					<int key="connectionID">212</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieCreationProgressIndicator</string>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">createMoviePreview:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="196868285"/>
+						<reference key="destination" ref="798240356"/>
 					</object>
-					<int key="connectionID">214</int>
+					<int key="connectionID">218</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCreatePreviewMovieButton</string>
+						<string key="label">fPictureSettingsToggleButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="798240356"/>
+						<reference key="destination" ref="141370142"/>
 					</object>
-					<int key="connectionID">217</int>
+					<int key="connectionID">273</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">createMoviePreview:</string>
+						<string key="label">toggleScaleToScreen:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="798240356"/>
+						<reference key="destination" ref="81685190"/>
 					</object>
-					<int key="connectionID">218</int>
+					<int key="connectionID">279</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPreviewMovieStatusField</string>
+						<string key="label">fScaleToScreenToggleButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="986015194"/>
+						<reference key="destination" ref="81685190"/>
 					</object>
-					<int key="connectionID">225</int>
+					<int key="connectionID">277</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPreviewMovieLengthPopUp</string>
+						<string key="label">fPictureSlider</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="598619000"/>
+						<reference key="destination" ref="396925210"/>
 					</object>
-					<int key="connectionID">232</int>
+					<int key="connectionID">211</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">previewDurationPopUpChanged:</string>
+						<string key="label">showPictureSettings:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="598619000"/>
+						<reference key="destination" ref="141370142"/>
 					</object>
-					<int key="connectionID">233</int>
+					<int key="connectionID">274</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPreviewWindow</string>
+						<string key="label">fInfoField</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="616825745"/>
+						<reference key="destination" ref="628196212"/>
 					</object>
-					<int key="connectionID">244</int>
+					<int key="connectionID">73</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fEncodingControlBox</string>
+						<string key="label">fGoToBeginningButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="768906858"/>
+						<reference key="destination" ref="897614796"/>
 					</object>
-					<int key="connectionID">253</int>
+					<int key="connectionID">380</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureControlBox</string>
+						<string key="label">fMovieScrubberSlider</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="92351498"/>
+						<reference key="destination" ref="886140787"/>
 					</object>
-					<int key="connectionID">254</int>
+					<int key="connectionID">371</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureViewArea</string>
+						<string key="label">fMovieInfoField</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="289177107"/>
+						<reference key="destination" ref="964331174"/>
 					</object>
-					<int key="connectionID">258</int>
+					<int key="connectionID">374</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCancelPreviewMovieButton</string>
+						<string key="label">fGoToEndButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="569473100"/>
+						<reference key="destination" ref="894608246"/>
 					</object>
-					<int key="connectionID">263</int>
+					<int key="connectionID">381</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSettingsToggleButton</string>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moviePlaybackGoToEnd:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="141370142"/>
+						<reference key="destination" ref="894608246"/>
 					</object>
-					<int key="connectionID">273</int>
+					<int key="connectionID">383</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">showPictureSettings:</string>
+						<string key="label">toggleMoviePreviewPlayPause:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="141370142"/>
+						<reference key="destination" ref="102183813"/>
 					</object>
-					<int key="connectionID">274</int>
+					<int key="connectionID">370</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScaleToScreenToggleButton</string>
+						<string key="label">fPlayPauseButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="81685190"/>
+						<reference key="destination" ref="102183813"/>
 					</object>
-					<int key="connectionID">277</int>
+					<int key="connectionID">364</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleScaleToScreen:</string>
+						<string key="label">moviePlaybackGoToBeginning:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="81685190"/>
+						<reference key="destination" ref="897614796"/>
 					</object>
-					<int key="connectionID">279</int>
+					<int key="connectionID">382</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fscaleInfoField</string>
+						<string key="label">fGoToStillPreviewButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="245200984"/>
+						<reference key="destination" ref="630042886"/>
 					</object>
-					<int key="connectionID">282</int>
+					<int key="connectionID">368</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMoviePlaybackControlBox</string>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">previewScrubberChanged:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="700607930"/>
+						<reference key="destination" ref="886140787"/>
 					</object>
-					<int key="connectionID">363</int>
+					<int key="connectionID">384</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPlayPauseButton</string>
+						<string key="label">fMoviePlaybackControlBox</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="102183813"/>
+						<reference key="destination" ref="700607930"/>
 					</object>
-					<int key="connectionID">364</int>
+					<int key="connectionID">363</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGoToStillPreviewButton</string>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showPicturesPreview:</string>
 						<reference key="source" ref="355312334"/>
 						<reference key="destination" ref="630042886"/>
 					</object>
-					<int key="connectionID">368</int>
+					<int key="connectionID">396</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pictureSliderChanged:</string>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fMovieCreationProgressIndicator</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="630042886"/>
+						<reference key="destination" ref="196868285"/>
 					</object>
-					<int key="connectionID">369</int>
+					<int key="connectionID">214</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleMoviePreviewPlayPause:</string>
+						<string key="label">cancelCreateMoviePreview:</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="102183813"/>
+						<reference key="destination" ref="569473100"/>
 					</object>
-					<int key="connectionID">370</int>
+					<int key="connectionID">395</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieScrubberSlider</string>
+						<string key="label">fPreviewMovieStatusField</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="886140787"/>
+						<reference key="destination" ref="986015194"/>
 					</object>
-					<int key="connectionID">371</int>
+					<int key="connectionID">225</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieInfoField</string>
+						<string key="label">fCancelPreviewMovieButton</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="964331174"/>
+						<reference key="destination" ref="569473100"/>
 					</object>
-					<int key="connectionID">374</int>
+					<int key="connectionID">263</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGoToBeginningButton</string>
+						<string key="label">fEncodingControlBox</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="897614796"/>
+						<reference key="destination" ref="768906858"/>
 					</object>
-					<int key="connectionID">380</int>
+					<int key="connectionID">253</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGoToEndButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="894608246"/>
-					</object>
-					<int key="connectionID">381</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">moviePlaybackGoToBeginning:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="897614796"/>
-					</object>
-					<int key="connectionID">382</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">moviePlaybackGoToEnd:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="894608246"/>
-					</object>
-					<int key="connectionID">383</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">previewScrubberChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="886140787"/>
-					</object>
-					<int key="connectionID">384</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cancelCreateMoviePreview:</string>
+						<string key="label">fMovieView</string>
 						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="569473100"/>
+						<reference key="destination" ref="48693112"/>
 					</object>
-					<int key="connectionID">395</int>
+					<int key="connectionID">208</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1212,168 +1185,121 @@
 						<reference key="object" ref="49161063"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="289177107"/>
-						</object>
-						<reference key="parent" ref="616825745"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">257</int>
-						<reference key="object" ref="289177107"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="844127024"/>
-							<reference ref="92351498"/>
+							<reference ref="700607930"/>
 							<reference ref="768906858"/>
+							<reference ref="92351498"/>
 							<reference ref="48693112"/>
-							<reference ref="700607930"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">252</int>
-						<reference key="object" ref="768906858"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="196868285"/>
-							<reference ref="986015194"/>
-							<reference ref="569473100"/>
-						</object>
-						<reference key="parent" ref="289177107"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">213</int>
-						<reference key="object" ref="196868285"/>
-						<reference key="parent" ref="768906858"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">223</int>
-						<reference key="object" ref="986015194"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="304208899"/>
 						</object>
-						<reference key="parent" ref="768906858"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">224</int>
-						<reference key="object" ref="304208899"/>
-						<reference key="parent" ref="986015194"/>
+						<reference key="parent" ref="616825745"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">251</int>
-						<reference key="object" ref="92351498"/>
+						<int key="objectID">335</int>
+						<reference key="object" ref="700607930"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="628196212"/>
-							<reference ref="396925210"/>
-							<reference ref="245200984"/>
-							<reference ref="66510867"/>
-							<reference ref="598619000"/>
-							<reference ref="81685190"/>
-							<reference ref="798240356"/>
-							<reference ref="141370142"/>
+							<reference ref="102183813"/>
+							<reference ref="894608246"/>
+							<reference ref="897614796"/>
+							<reference ref="964331174"/>
+							<reference ref="886140787"/>
+							<reference ref="630042886"/>
 						</object>
-						<reference key="parent" ref="289177107"/>
+						<reference key="parent" ref="49161063"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">38</int>
-						<reference key="object" ref="628196212"/>
+						<int key="objectID">365</int>
+						<reference key="object" ref="630042886"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="921881842"/>
+							<reference ref="999505395"/>
 						</object>
-						<reference key="parent" ref="92351498"/>
+						<reference key="parent" ref="700607930"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">215</int>
-						<reference key="object" ref="798240356"/>
+						<int key="objectID">375</int>
+						<reference key="object" ref="897614796"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="975305481"/>
+							<reference ref="913339095"/>
 						</object>
-						<reference key="parent" ref="92351498"/>
+						<reference key="parent" ref="700607930"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">234</int>
-						<reference key="object" ref="66510867"/>
+						<int key="objectID">378</int>
+						<reference key="object" ref="894608246"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="567286013"/>
+							<reference ref="117507013"/>
 						</object>
-						<reference key="parent" ref="92351498"/>
+						<reference key="parent" ref="700607930"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="598619000"/>
+						<int key="objectID">361</int>
+						<reference key="object" ref="102183813"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="953108737"/>
+							<reference ref="19809002"/>
 						</object>
-						<reference key="parent" ref="92351498"/>
+						<reference key="parent" ref="700607930"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">209</int>
-						<reference key="object" ref="396925210"/>
+						<int key="objectID">372</int>
+						<reference key="object" ref="964331174"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="639767004"/>
+							<reference ref="113790059"/>
 						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">210</int>
-						<reference key="object" ref="639767004"/>
-						<reference key="parent" ref="396925210"/>
+						<reference key="parent" ref="700607930"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">227</int>
-						<reference key="object" ref="953108737"/>
+						<int key="objectID">341</int>
+						<reference key="object" ref="886140787"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="501672847"/>
+							<reference ref="493667684"/>
 						</object>
-						<reference key="parent" ref="598619000"/>
+						<reference key="parent" ref="700607930"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">228</int>
-						<reference key="object" ref="501672847"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="372655630"/>
-							<reference ref="607756368"/>
-							<reference ref="272743761"/>
-						</object>
-						<reference key="parent" ref="953108737"/>
+						<int key="objectID">346</int>
+						<reference key="object" ref="493667684"/>
+						<reference key="parent" ref="886140787"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">231</int>
-						<reference key="object" ref="372655630"/>
-						<reference key="parent" ref="501672847"/>
+						<int key="objectID">373</int>
+						<reference key="object" ref="113790059"/>
+						<reference key="parent" ref="964331174"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">230</int>
-						<reference key="object" ref="607756368"/>
-						<reference key="parent" ref="501672847"/>
+						<int key="objectID">362</int>
+						<reference key="object" ref="19809002"/>
+						<reference key="parent" ref="102183813"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">229</int>
-						<reference key="object" ref="272743761"/>
-						<reference key="parent" ref="501672847"/>
+						<int key="objectID">379</int>
+						<reference key="object" ref="117507013"/>
+						<reference key="parent" ref="894608246"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">235</int>
-						<reference key="object" ref="567286013"/>
-						<reference key="parent" ref="66510867"/>
+						<int key="objectID">376</int>
+						<reference key="object" ref="913339095"/>
+						<reference key="parent" ref="897614796"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">216</int>
-						<reference key="object" ref="975305481"/>
-						<reference key="parent" ref="798240356"/>
+						<int key="objectID">366</int>
+						<reference key="object" ref="999505395"/>
+						<reference key="parent" ref="630042886"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">165</int>
-						<reference key="object" ref="921881842"/>
-						<reference key="parent" ref="628196212"/>
+						<int key="objectID">252</int>
+						<reference key="object" ref="768906858"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="569473100"/>
+							<reference ref="986015194"/>
+							<reference ref="196868285"/>
+						</object>
+						<reference key="parent" ref="49161063"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">261</int>
@@ -1385,37 +1311,72 @@
 						<reference key="parent" ref="768906858"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">223</int>
+						<reference key="object" ref="986015194"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="304208899"/>
+						</object>
+						<reference key="parent" ref="768906858"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">213</int>
+						<reference key="object" ref="196868285"/>
+						<reference key="parent" ref="768906858"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="304208899"/>
+						<reference key="parent" ref="986015194"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">262</int>
 						<reference key="object" ref="908165435"/>
 						<reference key="parent" ref="569473100"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="141370142"/>
+						<int key="objectID">251</int>
+						<reference key="object" ref="92351498"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="606007744"/>
+							<reference ref="66510867"/>
+							<reference ref="598619000"/>
+							<reference ref="141370142"/>
+							<reference ref="798240356"/>
+							<reference ref="81685190"/>
+							<reference ref="245200984"/>
+							<reference ref="396925210"/>
+							<reference ref="628196212"/>
+						</object>
+						<reference key="parent" ref="49161063"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">38</int>
+						<reference key="object" ref="628196212"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="921881842"/>
 						</object>
 						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">272</int>
-						<reference key="object" ref="606007744"/>
-						<reference key="parent" ref="141370142"/>
+						<int key="objectID">165</int>
+						<reference key="object" ref="921881842"/>
+						<reference key="parent" ref="628196212"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">275</int>
-						<reference key="object" ref="81685190"/>
+						<int key="objectID">209</int>
+						<reference key="object" ref="396925210"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="847033897"/>
+							<reference ref="639767004"/>
 						</object>
 						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="847033897"/>
-						<reference key="parent" ref="81685190"/>
+						<int key="objectID">210</int>
+						<reference key="object" ref="639767004"/>
+						<reference key="parent" ref="396925210"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">280</int>
@@ -1432,121 +1393,109 @@
 						<reference key="parent" ref="245200984"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">179</int>
-						<reference key="object" ref="844127024"/>
+						<int key="objectID">275</int>
+						<reference key="object" ref="81685190"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="955430771"/>
+							<reference ref="847033897"/>
 						</object>
-						<reference key="parent" ref="289177107"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">180</int>
-						<reference key="object" ref="955430771"/>
-						<reference key="parent" ref="844127024"/>
+						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">207</int>
-						<reference key="object" ref="48693112"/>
-						<reference key="parent" ref="289177107"/>
+						<int key="objectID">276</int>
+						<reference key="object" ref="847033897"/>
+						<reference key="parent" ref="81685190"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">335</int>
-						<reference key="object" ref="700607930"/>
+						<int key="objectID">215</int>
+						<reference key="object" ref="798240356"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="886140787"/>
-							<reference ref="964331174"/>
-							<reference ref="102183813"/>
-							<reference ref="894608246"/>
-							<reference ref="630042886"/>
-							<reference ref="897614796"/>
+							<reference ref="975305481"/>
 						</object>
-						<reference key="parent" ref="289177107"/>
+						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">341</int>
-						<reference key="object" ref="886140787"/>
+						<int key="objectID">216</int>
+						<reference key="object" ref="975305481"/>
+						<reference key="parent" ref="798240356"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">271</int>
+						<reference key="object" ref="141370142"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="493667684"/>
+							<reference ref="606007744"/>
 						</object>
-						<reference key="parent" ref="700607930"/>
+						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">346</int>
-						<reference key="object" ref="493667684"/>
-						<reference key="parent" ref="886140787"/>
+						<int key="objectID">272</int>
+						<reference key="object" ref="606007744"/>
+						<reference key="parent" ref="141370142"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">361</int>
-						<reference key="object" ref="102183813"/>
+						<int key="objectID">226</int>
+						<reference key="object" ref="598619000"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="19809002"/>
+							<reference ref="953108737"/>
 						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">362</int>
-						<reference key="object" ref="19809002"/>
-						<reference key="parent" ref="102183813"/>
+						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">365</int>
-						<reference key="object" ref="630042886"/>
+						<int key="objectID">227</int>
+						<reference key="object" ref="953108737"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="999505395"/>
+							<reference ref="501672847"/>
 						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">366</int>
-						<reference key="object" ref="999505395"/>
-						<reference key="parent" ref="630042886"/>
+						<reference key="parent" ref="598619000"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="964331174"/>
+						<int key="objectID">228</int>
+						<reference key="object" ref="501672847"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="113790059"/>
+							<reference ref="272743761"/>
+							<reference ref="607756368"/>
+							<reference ref="372655630"/>
 						</object>
-						<reference key="parent" ref="700607930"/>
+						<reference key="parent" ref="953108737"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">373</int>
-						<reference key="object" ref="113790059"/>
-						<reference key="parent" ref="964331174"/>
+						<int key="objectID">231</int>
+						<reference key="object" ref="372655630"/>
+						<reference key="parent" ref="501672847"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">375</int>
-						<reference key="object" ref="897614796"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="913339095"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
+						<int key="objectID">230</int>
+						<reference key="object" ref="607756368"/>
+						<reference key="parent" ref="501672847"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">376</int>
-						<reference key="object" ref="913339095"/>
-						<reference key="parent" ref="897614796"/>
+						<int key="objectID">229</int>
+						<reference key="object" ref="272743761"/>
+						<reference key="parent" ref="501672847"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">378</int>
-						<reference key="object" ref="894608246"/>
+						<int key="objectID">234</int>
+						<reference key="object" ref="66510867"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="117507013"/>
+							<reference ref="567286013"/>
 						</object>
-						<reference key="parent" ref="700607930"/>
+						<reference key="parent" ref="92351498"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">379</int>
-						<reference key="object" ref="117507013"/>
-						<reference key="parent" ref="894608246"/>
+						<int key="objectID">235</int>
+						<reference key="object" ref="567286013"/>
+						<reference key="parent" ref="66510867"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="48693112"/>
+						<reference key="parent" ref="49161063"/>
 					</object>
 				</object>
 			</object>
@@ -1558,8 +1507,6 @@
 					<string>-2.IBPluginDependency</string>
 					<string>-3.IBPluginDependency</string>
 					<string>165.IBPluginDependency</string>
-					<string>179.IBPluginDependency</string>
-					<string>180.IBPluginDependency</string>
 					<string>207.IBPluginDependency</string>
 					<string>209.IBPluginDependency</string>
 					<string>210.IBPluginDependency</string>
@@ -1592,7 +1539,6 @@
 					<string>252.IBViewIntegration.shadowColor</string>
 					<string>252.IBViewIntegration.shadowOffsetHeight</string>
 					<string>252.IBViewIntegration.shadowOffsetWidth</string>
-					<string>257.IBPluginDependency</string>
 					<string>261.IBAttributePlaceholdersKey</string>
 					<string>261.IBPluginDependency</string>
 					<string>262.IBPluginDependency</string>
@@ -1641,15 +1587,17 @@
 					<string>5.IBPluginDependency</string>
 					<string>5.IBWindowTemplateEditedContentRect</string>
 					<string>6.IBPluginDependency</string>
+					<string>6.IBViewIntegration.shadowBlurRadius</string>
+					<string>6.IBViewIntegration.shadowColor</string>
+					<string>6.IBViewIntegration.shadowOffsetHeight</string>
+					<string>6.IBViewIntegration.shadowOffsetWidth</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.QTKitIBPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1699,7 +1647,6 @@
 					<reference ref="864448722"/>
 					<integer value="0"/>
 					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
@@ -1795,8 +1742,12 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{262, 474}, {480, 360}}</string>
+					<string>{{262, 474}, {490, 360}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<real value="0.0"/>
+					<reference ref="864448722"/>
+					<real value="0.0"/>
+					<real value="0.0"/>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -1811,9 +1762,323 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">395</int>
+			<int key="maxID">396</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">PreviewController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cancelCreateMoviePreview:</string>
+							<string>createMoviePreview:</string>
+							<string>moviePlaybackGoBackwardOneFrame:</string>
+							<string>moviePlaybackGoForwardOneFrame:</string>
+							<string>moviePlaybackGoToBeginning:</string>
+							<string>moviePlaybackGoToEnd:</string>
+							<string>pictureSliderChanged:</string>
+							<string>previewDurationPopUpChanged:</string>
+							<string>previewScrubberChanged:</string>
+							<string>settingsChanged:</string>
+							<string>showMoviePreview:</string>
+							<string>showPictureSettings:</string>
+							<string>showPicturesPreview:</string>
+							<string>toggleMoviePreviewPlayPause:</string>
+							<string>toggleScaleToScreen:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSString</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cancelCreateMoviePreview:</string>
+							<string>createMoviePreview:</string>
+							<string>moviePlaybackGoBackwardOneFrame:</string>
+							<string>moviePlaybackGoForwardOneFrame:</string>
+							<string>moviePlaybackGoToBeginning:</string>
+							<string>moviePlaybackGoToEnd:</string>
+							<string>pictureSliderChanged:</string>
+							<string>previewDurationPopUpChanged:</string>
+							<string>previewScrubberChanged:</string>
+							<string>settingsChanged:</string>
+							<string>showMoviePreview:</string>
+							<string>showPictureSettings:</string>
+							<string>showPicturesPreview:</string>
+							<string>toggleMoviePreviewPlayPause:</string>
+							<string>toggleScaleToScreen:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">cancelCreateMoviePreview:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">createMoviePreview:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moviePlaybackGoBackwardOneFrame:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moviePlaybackGoForwardOneFrame:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moviePlaybackGoToBeginning:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moviePlaybackGoToEnd:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">pictureSliderChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">previewDurationPopUpChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">previewScrubberChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">settingsChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showMoviePreview:</string>
+								<string key="candidateClassName">NSString</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showPictureSettings:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showPicturesPreview:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">toggleMoviePreviewPlayPause:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">toggleScaleToScreen:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>fCancelPreviewMovieButton</string>
+							<string>fCreatePreviewMovieButton</string>
+							<string>fEncodingControlBox</string>
+							<string>fGoBackwardOneFrameButton</string>
+							<string>fGoForwardOneFrameButton</string>
+							<string>fGoToBeginningButton</string>
+							<string>fGoToEndButton</string>
+							<string>fGoToStillPreviewButton</string>
+							<string>fInfoField</string>
+							<string>fMovieCreationProgressIndicator</string>
+							<string>fMovieInfoField</string>
+							<string>fMoviePlaybackControlBox</string>
+							<string>fMovieScrubberSlider</string>
+							<string>fMovieView</string>
+							<string>fPictureControlBox</string>
+							<string>fPictureSettingsToggleButton</string>
+							<string>fPictureSlider</string>
+							<string>fPlayPauseButton</string>
+							<string>fPreviewMovieLengthPopUp</string>
+							<string>fPreviewMovieStatusField</string>
+							<string>fScaleToScreenToggleButton</string>
+							<string>fShowPreviewMovieButton</string>
+							<string>fscaleInfoField</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSBox</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSTextField</string>
+							<string>NSProgressIndicator</string>
+							<string>NSTextField</string>
+							<string>NSBox</string>
+							<string>NSSlider</string>
+							<string>QTMovieView</string>
+							<string>NSBox</string>
+							<string>NSButton</string>
+							<string>NSSlider</string>
+							<string>NSButton</string>
+							<string>NSPopUpButton</string>
+							<string>NSTextField</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSTextField</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>fCancelPreviewMovieButton</string>
+							<string>fCreatePreviewMovieButton</string>
+							<string>fEncodingControlBox</string>
+							<string>fGoBackwardOneFrameButton</string>
+							<string>fGoForwardOneFrameButton</string>
+							<string>fGoToBeginningButton</string>
+							<string>fGoToEndButton</string>
+							<string>fGoToStillPreviewButton</string>
+							<string>fInfoField</string>
+							<string>fMovieCreationProgressIndicator</string>
+							<string>fMovieInfoField</string>
+							<string>fMoviePlaybackControlBox</string>
+							<string>fMovieScrubberSlider</string>
+							<string>fMovieView</string>
+							<string>fPictureControlBox</string>
+							<string>fPictureSettingsToggleButton</string>
+							<string>fPictureSlider</string>
+							<string>fPlayPauseButton</string>
+							<string>fPreviewMovieLengthPopUp</string>
+							<string>fPreviewMovieStatusField</string>
+							<string>fScaleToScreenToggleButton</string>
+							<string>fShowPreviewMovieButton</string>
+							<string>fscaleInfoField</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fCancelPreviewMovieButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fCreatePreviewMovieButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fEncodingControlBox</string>
+								<string key="candidateClassName">NSBox</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fGoBackwardOneFrameButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fGoForwardOneFrameButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fGoToBeginningButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fGoToEndButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fGoToStillPreviewButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fInfoField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fMovieCreationProgressIndicator</string>
+								<string key="candidateClassName">NSProgressIndicator</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fMovieInfoField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fMoviePlaybackControlBox</string>
+								<string key="candidateClassName">NSBox</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fMovieScrubberSlider</string>
+								<string key="candidateClassName">NSSlider</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fMovieView</string>
+								<string key="candidateClassName">QTMovieView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fPictureControlBox</string>
+								<string key="candidateClassName">NSBox</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fPictureSettingsToggleButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fPictureSlider</string>
+								<string key="candidateClassName">NSSlider</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fPlayPauseButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fPreviewMovieLengthPopUp</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fPreviewMovieStatusField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fScaleToScreenToggleButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fShowPreviewMovieButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fscaleInfoField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PreviewController.h</string>
+					</object>
+				</object>
+			</object>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@@ -1832,11 +2097,19 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>NSMenuCheckmark</string>
 				<string>NSMenuMixedState</string>
+				<string>next-p</string>
+				<string>pause-p</string>
+				<string>play-p</string>
+				<string>prev-p</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
+				<string>{48, 48}</string>
+				<string>{48, 48}</string>
+				<string>{48, 48}</string>
+				<string>{48, 48}</string>
 			</object>
 		</object>
 	</data>

HandBrake-0.9.8.tar.bz2/macosx/English.lproj/Preferences.xib -> HandBrake-0.9.9.tar.bz2/macosx/English.lproj/Preferences.xib Changed

HandBrake-0.9.8.tar.bz2/macosx/Growl.framework/Versions/A/Growl -> HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/Growl Changed

HandBrake-0.9.8.tar.bz2/macosx/Growl.framework/Versions/A/Headers/Growl.h -> HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/Headers/Growl.h Changed

HandBrake-0.9.8.tar.bz2/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h -> HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h Changed

@@ -18,14 +18,11 @@
 
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
-#import "GrowlDefines.h"
+#import <Growl/GrowlDefines.h>
 
 //Forward declarations
 @protocol GrowlApplicationBridgeDelegate;
 
-//Internal notification when the user chooses not to install (to avoid continuing to cache notifications awaiting installation)
-#define GROWL_USER_CHOSE_NOT_TO_INSTALL_NOTIFICATION @"User chose not to install"
-
 //------------------------------------------------------------------------------
 #pragma mark -
 
@@ -45,9 +42,9 @@
  *	@method isGrowlInstalled
  *	@abstract Detects whether Growl is installed.
  *	@discussion Determines if the Growl prefpane and its helper app are installed.
- *	@result Returns YES if Growl is installed, NO otherwise.
+ *	@result this method will forever return YES.
  */
-+ (BOOL) isGrowlInstalled;
++ (BOOL) isGrowlInstalled __attribute__((deprecated));
 
 /*!
  *	@method isGrowlRunning
@@ -57,6 +54,34 @@
  */
 + (BOOL) isGrowlRunning;
 
+
+/*!
+ *	@method isMistEnabled
+ *	@abstract Gives the caller a fairly good indication of whether or not built-in notifications(Mist) will be used.
+ *	@discussion since this call makes use of isGrowlRunning it is entirely possible for this value to change between call and
+ *    executing a notification dispatch
+ *	@result Returns YES if Growl isn't reachable and the developer has not opted-out of
+ *    Mist and the user hasn't set the global mist enable key to false.
+ */
++ (BOOL)isMistEnabled;
+
+/*!
+ *	@method setShouldUseBuiltInNotifications
+ *	@abstract opt-out mechanism for the mist notification style in the event growl can't be reached.
+ *	@discussion if growl is unavailable due to not being installed or as a result of being turned off then
+ *    this option can enable/disable a built-in fire and forget display style
+ *	@param should Specifies whether or not the developer wants to opt-in (default) or opt out
+ *    of the built-in Mist style in the event Growl is unreachable.
+ */
++ (void)setShouldUseBuiltInNotifications:(BOOL)should;
+
+/*!
+ *	@method shouldUseBuiltInNotifications
+ *	@abstract returns the current opt-in state of the framework's use of the Mist display style.
+ *	@result Returns NO if the developer opt-ed out of Mist, the default value is YES.
+ */
++ (BOOL)shouldUseBuiltInNotifications;
+
 #pragma mark -
 
 /*!
@@ -87,7 +112,7 @@
  *
  *	@param inDelegate The delegate for the GrowlApplicationBridge. It must conform to the GrowlApplicationBridgeDelegate protocol.
  */
-+ (void) setGrowlDelegate:(NSObject<GrowlApplicationBridgeDelegate> *)inDelegate;
++ (void) setGrowlDelegate:(id<GrowlApplicationBridgeDelegate>)inDelegate;
 
 /*!
  *	@method growlDelegate
@@ -95,7 +120,7 @@
  *	@discussion See setGrowlDelegate: for details.
  *	@result The Growl delegate.
  */
-+ (NSObject<GrowlApplicationBridgeDelegate> *) growlDelegate;
++ (id<GrowlApplicationBridgeDelegate>) growlDelegate;
 
 #pragma mark -
 
@@ -235,6 +260,7 @@
  *	 Growl when next it is ready; <code>NO</code> if not.
  */
 + (void) setWillRegisterWhenGrowlIsReady:(BOOL)flag;
+
 /*!	@method	willRegisterWhenGrowlIsReady
  *	@abstract	Reports whether GrowlApplicationBridge will register with Growl
  *	 when Growl next launches.
@@ -323,7 +349,7 @@
  *	 Key							             Value
  *	 ---							             -----
  *	 <code>GROWL_APP_NAME</code>                 <code>CFBundleExecutableName</code>
- *	 <code>GROWL_APP_ICON</code>                 The icon of the application.
+ *	 <code>GROWL_APP_ICON_DATA</code>            The data of the icon of the application.
  *	 <code>GROWL_APP_LOCATION</code>             The location of the application.
  *	 <code>GROWL_NOTIFICATIONS_DEFAULT</code>    <code>GROWL_NOTIFICATIONS_ALL</code>
  *
@@ -336,6 +362,7 @@
  *	 copy of <code>regDict</code>.
  */
 + (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict;
+
 /*!	@method	registrationDictionaryByFillingInDictionary:restrictToKeys:
  *	@abstract	Tries to fill in missing keys in a registration dictionary.
  *	@discussion	This method examines the passed-in dictionary for missing keys,
@@ -344,7 +371,7 @@
  *	 Key							             Value
  *	 ---							             -----
  *	 <code>GROWL_APP_NAME</code>                 <code>CFBundleExecutableName</code>
- *	 <code>GROWL_APP_ICON</code>                 The icon of the application.
+ *	 <code>GROWL_APP_ICON_DATA</code>            The data of the icon of the application.
  *	 <code>GROWL_APP_LOCATION</code>             The location of the application.
  *	 <code>GROWL_NOTIFICATIONS_DEFAULT</code>    <code>GROWL_NOTIFICATIONS_ALL</code>
  *
@@ -368,30 +395,38 @@
  *	 the keys that it will look for are:
  *
  *	 \li <code>GROWL_APP_NAME</code>
- *	 \li <code>GROWL_APP_ICON</code>
+ *	 \li <code>GROWL_APP_ICON_DATA</code>
  *
  *	@since Growl.framework 1.1
  */
 + (NSDictionary *) notificationDictionaryByFillingInDictionary:(NSDictionary *)regDict;
 
 + (NSDictionary *) frameworkInfoDictionary;
-@end
 
-//------------------------------------------------------------------------------
 #pragma mark -
 
 /*!
- *	@protocol GrowlApplicationBridgeDelegate
- *	@abstract Required protocol for the Growl delegate.
- *	@discussion The methods in this protocol are required and are called
- *	 automatically as needed by GrowlApplicationBridge. See
- *	 <code>+[GrowlApplicationBridge setGrowlDelegate:]</code>.
- *	 See also <code>GrowlApplicationBridgeDelegate_InformalProtocol</code>.
+ *@method growlURLSchemeAvailable
+ *@abstract Lets the app know whether growl:// is registered on the system, used for certain methods below this
+ *@return Returns whether growl:// is registered on the system
+ *@discussion Methods such as openGrowlPreferences rely on the growl:// URL scheme to function
+ * Further, this method can provide a check on whether Growl is installed, 
+ * however, the framework will not be relying on this method for choosing when/how to notify, 
+ * and it is not recommended that the app rely on it for other than whether to use growl:// methods
+ *@since Growl.framework 1.4
  */
++ (BOOL) isGrowlURLSchemeAvailable;
 
-@protocol GrowlApplicationBridgeDelegate
-
-// -registrationDictionaryForGrowl has moved to the informal protocol as of 0.7.
+/*!
+ * @method openGrowlPreferences:
+ * @abstract Open Growl preferences, optionally to this app's settings, growl:// method
+ * @param showApp Whether to show the application's settings, otherwise just opens to the last position
+ * @return Return's whether opening the URL was succesfull or not.  
+ * @discussion Will launch if Growl is installed, but not running, and open the preferences window
+ * Uses growl:// URL scheme
+ * @since Growl.framework 1.4
+ */
++ (BOOL) openGrowlPreferences:(BOOL)showApp;
 
 @end
 
@@ -399,11 +434,17 @@
 #pragma mark -
 
 /*!
- *	@category NSObject(GrowlApplicationBridgeDelegate_InformalProtocol)
- *	@abstract Methods which may be optionally implemented by the GrowlDelegate.
- *	@discussion The methods in this informal protocol will only be called if implemented by the delegate.
+ *	@protocol GrowlApplicationBridgeDelegate
+ *	@abstract Required protocol for the Growl delegate.
+ *	@discussion The methods in this protocol are optional and are called
+ *	 automatically as needed by GrowlApplicationBridge. See
+ *	 <code>+[GrowlApplicationBridge setGrowlDelegate:]</code>.
+ *	 See also <code>GrowlApplicationBridgeDelegate_InformalProtocol</code>.
  */
-@interface NSObject (GrowlApplicationBridgeDelegate_InformalProtocol)
+
+@protocol GrowlApplicationBridgeDelegate <NSObject>
+
+@optional
 
 /*!
  *	@method registrationDictionaryForGrowl
@@ -510,66 +551,17 @@
  */
 - (void) growlNotificationTimedOut:(id)clickContext;
 
-@end
-
-#pragma mark -
-/*!
- *	@category NSObject(GrowlApplicationBridgeDelegate_Installation_InformalProtocol)
- *	@abstract Methods which may be optionally implemented by the Growl delegate when used with Growl-WithInstaller.framework.
- *	@discussion The methods in this informal protocol will only be called if
- *	 implemented by the delegate.  They allow greater control of the information
- *	 presented to the user when installing or upgrading Growl from within your
- *	 application when using Growl-WithInstaller.framework.
- */
-@interface NSObject (GrowlApplicationBridgeDelegate_Installation_InformalProtocol)
-
-/*!
- *	@method growlInstallationWindowTitle
- *	@abstract Return the title of the installation window.
- *	@discussion If not implemented, Growl will use a default, localized title.
- *	@result An NSString object to use as the title.
- */
-- (NSString *)growlInstallationWindowTitle;
-
-/*!
- *	@method growlUpdateWindowTitle
- *	@abstract Return the title of the upgrade window.
- *	@discussion If not implemented, Growl will use a default, localized title.
- *	@result An NSString object to use as the title.
- */
-- (NSString *)growlUpdateWindowTitle;
-
-/*!
- *	@method growlInstallationInformation
- *	@abstract Return the information to display when installing.
- *	@discussion This information may be as long or short as desired (the window
- *	 will be sized to fit it).  It will be displayed to the user as an
- *	 explanation of what Growl is and what it can do in your application.  It
- *	 should probably note that no download is required to install.
- *
- *	 If this is not implemented, Growl will use a default, localized explanation.
- *	@result An NSAttributedString object to display.
- */
-- (NSAttributedString *)growlInstallationInformation;
 
 /*!
- *	@method growlUpdateInformation
- *	@abstract Return the information to display when upgrading.
- *	@discussion This information may be as long or short as desired (the window
- *	 will be sized to fit it).  It will be displayed to the user as an
- *	 explanation that an updated version of Growl is included in your
- *	 application and no download is required.
- *
- *	 If this is not implemented, Growl will use a default, localized explanation.
- *	@result An NSAttributedString object to display.
+ * @method hasNetworkClientEntitlement
+ * @abstract Used only in sandboxed situations since we don't know whether the app has com.apple.security.network.client entitlement
+ * @discussion GrowlDelegate calls to find out if we have the com.apple.security.network.client entitlement,
+ *  since we can't find this out without hitting the sandbox.  We only call it if we detect that the application is sandboxed.
  */
-- (NSAttributedString *)growlUpdateInformation;
+- (BOOL) hasNetworkClientEntitlement;
 
 @end
 
-//private
-@interface GrowlApplicationBridge (GrowlInstallationPrompt_private)
-+ (void) _userChoseNotToInstallGrowl;
-@end
+#pragma mark -
 
 #endif /* __GrowlApplicationBridge_h__ */

HandBrake-0.9.8.tar.bz2/macosx/Growl.framework/Versions/A/Headers/GrowlDefines.h -> HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/Headers/GrowlDefines.h Changed

@@ -7,10 +7,8 @@
 
 #ifdef __OBJC__
 #define XSTR(x) (@x)
-#define STRING_TYPE NSString *
 #else
 #define XSTR CFSTR
-#define STRING_TYPE CFStringRef
 #endif
 
 /*!	@header GrowlDefines.h
@@ -56,7 +54,7 @@
  *   This key is optional.
  */
 #define GROWL_APP_ID					XSTR("ApplicationId")
-/*!	@defined GROWL_APP_ICON
+/*!	@defined GROWL_APP_ICON_DATA
  *	@abstract The image data for your application's icon.
  *	@discussion Image data representing your application's icon. This may be
  *	 superimposed on a notification icon as a badge, used as the notification
@@ -66,7 +64,7 @@
  *
  *	 Optional. Not supported by all display plugins.
  */
-#define GROWL_APP_ICON					XSTR("ApplicationIcon")
+#define GROWL_APP_ICON_DATA				XSTR("ApplicationIcon")
 /*!	@defined GROWL_NOTIFICATIONS_DEFAULT
  *	@abstract The array of notifications to turn on by default.
  *	@discussion These are the names of the notifications that should be enabled
@@ -101,6 +99,14 @@
 *  This key is optional.
 */
 #define GROWL_NOTIFICATIONS_DESCRIPTIONS		XSTR("NotificationDescriptions")
+/*! @defined GROWL_NOTIFICATIONS_ICONS
+ *  @abstract A dictionary of icons for each notification
+ *  @discussion This is an NSDictionary whose keys are GROWL_NOTIFICATION_NAME strings and whose objects are
+ *  icons for each notification, for GNTP spec
+ *
+ *  This key is optional.
+ */
+#define GROWL_NOTIFICATIONS_ICONS XSTR("NotificationIcons")
 
 /*!	@defined	GROWL_TICKET_VERSION
  *	@abstract	The version of your registration ticket.
@@ -144,20 +150,20 @@
  */
 #define GROWL_NOTIFICATION_DESCRIPTION  	XSTR("NotificationDescription")
 /*!	@defined GROWL_NOTIFICATION_ICON
- *	@discussion Image data for the notification icon. Must be in a format
+ *	@discussion Image data for the notification icon. Image data must be in a format
  *	 supported by NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF.
  *
  *	 Optional. Not supported by all display plugins.
  */
-#define GROWL_NOTIFICATION_ICON			XSTR("NotificationIcon")
+#define GROWL_NOTIFICATION_ICON_DATA			XSTR("NotificationIcon")
 /*!	@defined GROWL_NOTIFICATION_APP_ICON
  *	@discussion Image data for the application icon, in case GROWL_APP_ICON does
- *	 not apply for some reason. Must be in a format supported by NSImage, such
+ *	 not apply for some reason. Image data be in a format supported by NSImage, such
  *	 as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF.
  *
  *	 Optional. Not supported by all display plugins.
  */
-#define GROWL_NOTIFICATION_APP_ICON		XSTR("NotificationAppIcon")
+#define GROWL_NOTIFICATION_APP_ICON_DATA		XSTR("NotificationAppIcon")
 /*!	@defined GROWL_NOTIFICATION_PRIORITY
  *	@discussion The priority of the notification as an integer number from
  *	 -2 to +2 (+2 being highest).
@@ -185,16 +191,6 @@
  */
 #define GROWL_NOTIFICATION_CLICK_CONTEXT			XSTR("NotificationClickContext")
 
-/*!	@defined GROWL_DISPLAY_PLUGIN
- *	@discussion The name of a display plugin which should be used for this notification.
- *    Optional. If this key is not set or the specified display plugin does not
- *    exist, the display plugin stored in the application ticket is used. This key
- *    allows applications to use different default display plugins for their
- *    notifications. The user can still override those settings in the preference
- *    pane.
- */
-#define GROWL_DISPLAY_PLUGIN				XSTR("NotificationDisplayPlugin")
-
 /*!	@defined GROWL_NOTIFICATION_IDENTIFIER
  *	@abstract An identifier for the notification for coalescing purposes.
  *   Notifications with the same identifier fall into the same class; only
@@ -224,6 +220,19 @@
 */
 #define GROWL_NOTIFICATION_PROGRESS		XSTR("NotificationProgress")
 
+/*!	@defined GROWL_NOTIFICATION_ALREADY_SHOWN
+ *	@abstract If this key is set, it should contain a bool value wrapped
+ *   in a NSNumber which describes whether the notification has
+ *   already been displayed, for instance by built in Notification
+ *   Center support.  This value can be used to allow display
+ *   plugins to skip a notification, while still allowing Growl
+ *   actions to run on them.
+ *
+ *	 Optional. Not supported by all display plugins.
+ */
+#define GROWL_NOTIFICATION_ALREADY_SHOWN		XSTR("AlreadyShown")
+
+
 // Notifications
 #pragma mark Notifications
 
@@ -245,7 +254,7 @@
  *	 The userInfo dictionary for this notification can contain these keys:
  *	 <ul>
  *	 	<li>GROWL_APP_NAME</li>
- *	 	<li>GROWL_APP_ICON</li>
+ *	 	<li>GROWL_APP_ICON_DATA</li>
  *	 	<li>GROWL_NOTIFICATIONS_ALL</li>
  *	 	<li>GROWL_NOTIFICATIONS_DEFAULT</li>
  *	 </ul>
@@ -288,12 +297,6 @@
  *	 Growl_PostNotification.
  */
 #define GROWL_NOTIFICATION				XSTR("GrowlNotification")
-/*!	@defined GROWL_SHUTDOWN
-*	@abstract The distributed notification name that tells Growl to shutdown.
-*	@discussion The Growl preference pane posts this notification when the
-*	 "Stop Growl" button is clicked.
-*/
-#define GROWL_SHUTDOWN					XSTR("GrowlShutdown")
 /*!	@defined GROWL_PING
  *	@abstract A distributed notification to check whether Growl is running.
  *	@discussion This is used by the Growl preference pane. If it receives a
@@ -313,15 +316,48 @@
  *	 registration dictionary supplied by its delegate.
  */
 #define GROWL_IS_READY					XSTR("Lend Me Some Sugar; I Am Your Neighbor!")
-/*!	@defined GROWL_NOTIFICATION_CLICKED
- *	@abstract The distributed notification sent when a supported notification is clicked.
+
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_CLICKED_SUFFIX
+ *	@abstract Part of the name of the distributed notification sent when a supported notification is clicked.
  *	@discussion When a Growl notification with a click context is clicked on by
- *	 the user, Growl posts this distributed notification.
- *	 The GrowlApplicationBridge responds to this notification by calling a
- *	 callback in its delegate.
+ *	 the user, Growl posts a distributed notification whose name is in the format:
+ *        [NSString stringWithFormat:@"%@-%d-%@", appName, pid, GROWL_DISTRIBUTED_NOTIFICATION_CLICKED_SUFFIX]
+ *	 The GrowlApplicationBridge responds to this notification by calling a callback in its delegate.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_CLICKED_SUFFIX		XSTR("GrowlClicked!")
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_TIMED_OUT_SUFFIX
+ *	@abstract Part of the name of the distributed notification sent when a supported notification times out without being clicked.
+ *	@discussion When a Growl notification with a click context times out, Growl posts a distributed notification
+ *	 whose name is in the format:
+ *		  [NSString stringWithFormat:@"%@-%d-%@", appName, pid, GROWL_DISTRIBUTED_NOTIFICATION_TIMED_OUT_SUFFIX]
+ *	 The GrowlApplicationBridge responds to this notification by calling a callback in its delegate.
+ *   NOTE: The user may have actually clicked the 'close' button; this triggers an *immediate* time-out of the notification.
  */
-#define GROWL_NOTIFICATION_CLICKED		XSTR("GrowlClicked!")
-#define GROWL_NOTIFICATION_TIMED_OUT	XSTR("GrowlTimedOut!")
+#define GROWL_DISTRIBUTED_NOTIFICATION_TIMED_OUT_SUFFIX		XSTR("GrowlTimedOut!")
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_ON
+ *	@abstract The distributed notification sent when the Notification Center support is toggled on in Growl 2.0
+ *	@discussion When the user enables Notification Center support in Growl 2.0, this notification is sent
+ *      to inform all running apps that they should now speak to Notification Center directly.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_ON		XSTR("GrowlNotificationCenterOn!")
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_OFF
+ *	@abstract The distributed notification sent when the Notification Center support is toggled off in Growl 2.0
+ *	@discussion When the user enables Notification Center support in Growl 2.0, this notification is sent
+ *      to inform all running apps that they should no longer speak to Notification Center directly.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_OFF		XSTR("GrowlNotificationCenterOff!")
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_QUERY
+ *	@abstract The distributed notification sent by an application to query Growl 2.0's notification center support.
+ *	@discussion When an app starts up, it will send this query to get Growl 2.0 to spit out whether notification
+ *      center support is on or off.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_QUERY		XSTR("GrowlNotificationCenterYN?")
+
 
 /*!	@group Other symbols */
 /* Symbols which don't fit into any of the other categories. */
@@ -345,4 +381,6 @@
 
 #define GROWL_POSITION_PREFERENCE_KEY			@"GrowlSelectedPosition"
 
+#define GROWL_PLUGIN_CONFIG_ID XSTR("GrowlPluginConfigurationID")
+
 #endif //ndef _GROWLDEFINES_H

HandBrake-0.9.8.tar.bz2/macosx/Growl.framework/Versions/A/Resources/Info.plist -> HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/Resources/Info.plist Changed

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>10J869</string>
+	<string>12C60</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -15,25 +15,25 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>GRRR</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.2</string>
+	<string>2.0.1</string>
 	<key>DTCompiler</key>
-	<string>4.0</string>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10M2518</string>
+	<string>4G2008a</string>
 	<key>DTPlatformVersion</key>
-	<string>PG</string>
+	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>9L31a</string>
+	<string>12C37</string>
 	<key>DTSDKName</key>
-	<string>macosx10.5</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>0400</string>
+	<string>0452</string>
 	<key>DTXcodeBuild</key>
-	<string>10M2518</string>
+	<string>4G2008a</string>
 	<key>NSPrincipalClass</key>
 	<string>GrowlApplicationBridge</string>
 </dict>

HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/_CodeSignature Added

HandBrake-0.9.9.tar.bz2/macosx/Growl.framework/Versions/A/_CodeSignature/CodeResources Added

HandBrake-0.9.8.tar.bz2/macosx/HBAudio.m -> HandBrake-0.9.9.tar.bz2/macosx/HBAudio.m Changed

@@ -70,28 +70,26 @@
 {
     if ([HBAudio class] == self)
     {
-        int i, audioMustMatch, shouldAdd;
+        int i, audioMustMatch;
         BOOL muxMKV, muxMP4;
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         NSDictionary *dict;
 
         masterCodecArray = [[NSMutableArray alloc] init]; // knowingly leaked
-        for( i = 0; i < hb_audio_encoders_count; i++ )
+        for (i = 0; i < hb_audio_encoders_count; i++)
         {
-            if( ( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) &&
-                ( hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS ) )
+            if ((hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG) &&
+                (hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS))
             {
-                audioMustMatch = ( hb_audio_encoders[i].encoder & ~HB_ACODEC_PASS_FLAG );
+                audioMustMatch = (hb_audio_encoders[i].encoder & ~HB_ACODEC_PASS_FLAG);
             }
             else
             {
                 audioMustMatch = 0;
             }
-            // don't add HE-AAC encoder if it's unavailable
-            shouldAdd = ( hb_audio_encoders[i].encoder != HB_ACODEC_CA_HAAC ) || encca_haac_available();
-            muxMKV = ( hb_audio_encoders[i].muxers & HB_MUX_MKV ) ? YES : NO;
-            muxMP4 = ( hb_audio_encoders[i].muxers & HB_MUX_MP4 ) ? YES : NO;
-            if( shouldAdd && audioMustMatch )
+            muxMKV = (hb_audio_encoders[i].muxers & HB_MUX_MKV) ? YES : NO;
+            muxMP4 = (hb_audio_encoders[i].muxers & HB_MUX_MP4) ? YES : NO;
+            if (audioMustMatch)
             {
                 [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
                                               [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name], keyAudioCodecName,
@@ -101,7 +99,7 @@
                                               [NSNumber numberWithInt: audioMustMatch], keyAudioMustMatchTrack,
                                               nil]];
             }
-            else if( shouldAdd )
+            else
             {
                 [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
                                               [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name], keyAudioCodecName,
@@ -226,37 +224,19 @@
 {
     NSMutableArray *permittedMixdowns = [NSMutableArray array];
     NSDictionary *dict;
-    BOOL shouldAdd;
     int currentMixdown;
 
+    unsigned long long channelLayout = [[track objectForKey: keyAudioInputChannelLayout] unsignedLongLongValue];
     unsigned int count = [masterMixdownArray count];
     int codecCodec = [[codec objectForKey: keyAudioCodec] intValue];
-    int channelLayout = [[track objectForKey: keyAudioInputChannelLayout] intValue];
     int theDefaultMixdown = hb_get_default_mixdown(codecCodec, channelLayout);
-    int theBestMixdown = hb_get_best_mixdown(codecCodec, channelLayout, 0);
 
     for (unsigned int i = 0; i < count; i++)
     {
         dict = [masterMixdownArray objectAtIndex: i];
         currentMixdown = [[dict objectForKey: keyAudioMixdown] intValue];
 
-        // Basically with the way the mixdowns are stored, the assumption from the libhb point of view
-        // currently is that all mixdowns from the best down to mono are supported.
-        if ((currentMixdown != HB_AMIXDOWN_NONE) && (currentMixdown <= theBestMixdown))
-        {
-            shouldAdd = YES;
-        }
-        else if ((currentMixdown == HB_AMIXDOWN_NONE) && (codecCodec & HB_ACODEC_PASS_FLAG))
-        {
-            // "None" mixdown (passthru)
-            shouldAdd = YES;
-        }
-        else
-        {
-            shouldAdd = NO;
-        }
-
-        if (shouldAdd)
+        if (hb_mixdown_is_supported(currentMixdown, codecCodec, channelLayout))
         {
             [permittedMixdowns addObject: dict];
         }

HandBrake-0.9.8.tar.bz2/macosx/HBAudioController.m -> HandBrake-0.9.9.tar.bz2/macosx/HBAudioController.m Changed

@@ -90,9 +90,9 @@
         if ([anAudio enabled])
         {
             NSString *prefix = [NSString stringWithFormat: @"Audio%d", counter + 1];
-            NSNumber *sampleRateToUse = (0 == [[[anAudio sampleRate] objectForKey: keyAudioSamplerate] intValue]) ?
-            [[anAudio track] objectForKey: keyAudioInputSampleRate] :
-            [[anAudio sampleRate] objectForKey: keyAudioSamplerate];
+            NSNumber *sampleRateToUse = ([[[anAudio sampleRate] objectForKey: keyAudioSamplerate] intValue] == 0 ?
+                                         [[anAudio track] objectForKey: keyAudioInputSampleRate] :
+                                         [[anAudio sampleRate] objectForKey: keyAudioSamplerate]);
 
             [aDict setObject: [[anAudio track] objectForKey: keyAudioTrackIndex] forKey: [prefix stringByAppendingString: @"Track"]];
             [aDict setObject: [[anAudio track] objectForKey: keyAudioTrackName] forKey: [prefix stringByAppendingString: @"TrackDescription"]];
@@ -150,25 +150,27 @@
     unsigned int audioArrayCount = [self countOfAudioArray];
     for (i = 0; i < audioArrayCount; i++)
     {
-        HBAudio *anAudio = [self objectInAudioArrayAtIndex: i];
+        HBAudio *anAudio = [self objectInAudioArrayAtIndex:i];
         if ([anAudio enabled])
         {
-            NSNumber *sampleRateToUse = (0 == [[[anAudio sampleRate] objectForKey: keyAudioSamplerate] intValue]) ?
-            [[anAudio track] objectForKey: keyAudioInputSampleRate] :
-            [[anAudio sampleRate] objectForKey: keyAudioSamplerate];
+            NSNumber *sampleRateToUse = ([[[anAudio sampleRate] objectForKey:keyAudioSamplerate] intValue] == 0 ?
+                                         [[anAudio track]       objectForKey:keyAudioInputSampleRate] :
+                                         [[anAudio sampleRate]  objectForKey:keyAudioSamplerate]);
 
-            hb_audio_config_t *audio = (hb_audio_config_t *) calloc(1, sizeof(*audio));
+            hb_audio_config_t *audio = (hb_audio_config_t*)calloc(1, sizeof(*audio));
             hb_audio_config_init(audio);
-            audio->in.track = [[[anAudio track] objectForKey: keyAudioTrackIndex] intValue] - 1;
+            audio->in.track          = [[[anAudio track] objectForKey:keyAudioTrackIndex] intValue] - 1;
             /* We go ahead and assign values to our audio->out.<properties> */
-            audio->out.track = audio->in.track;
-            audio->out.codec = [[[anAudio codec] objectForKey: keyAudioCodec] intValue];
-            audio->out.compression_level = hb_get_default_audio_compression(audio->out.codec);
-            audio->out.mixdown = [[[anAudio mixdown] objectForKey: keyAudioMixdown] intValue];
-            audio->out.bitrate = [[[anAudio bitRate] objectForKey: keyAudioBitrate] intValue];
-            audio->out.samplerate = [sampleRateToUse intValue];
-            audio->out.dynamic_range_compression = [[anAudio drc] floatValue];
-            audio->out.gain = [[anAudio gain] floatValue];
+            audio->out.track                     = audio->in.track;
+            audio->out.codec                     = [[[anAudio codec]   objectForKey:keyAudioCodec]   intValue];
+            audio->out.compression_level         = hb_get_default_audio_compression(audio->out.codec);
+            audio->out.mixdown                   = [[[anAudio mixdown] objectForKey:keyAudioMixdown] intValue];
+            audio->out.normalize_mix_level       = 0;
+            audio->out.bitrate                   = [[[anAudio bitRate] objectForKey:keyAudioBitrate] intValue];
+            audio->out.samplerate                = [sampleRateToUse  intValue];
+            audio->out.dynamic_range_compression = [[anAudio drc]  floatValue];
+            audio->out.gain                      = [[anAudio gain] floatValue];
+            audio->out.dither_method             = hb_audio_dither_get_default();
 
             hb_audio_add(aJob, audio);
             free(audio);
@@ -345,7 +347,7 @@
                 [dict setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
             }
 
-            // map legacy passthru mixdowns
+            // map legacy mixdowns
             key = [dict objectForKey: @"AudioMixdown"];
             if ([key isEqualToString: @"AC3 Passthru"] ||
                 [key isEqualToString: @"DTS Passthru"] ||
@@ -353,6 +355,10 @@
             {
                 [dict setObject: @"None" forKey: @"AudioMixdown"];
             }
+            else if ([key isEqualToString: @"6-channel discrete"])
+            {
+                [dict setObject: @"5.1 Channels" forKey: @"AudioMixdown"];
+            }
 
             // If our preset wants us to support a codec that the track does not support, instead
             // of changing the codec we remove the audio instead.
@@ -426,24 +432,51 @@
 
 {
     id whatToUse = [self _presetAudioArrayFromPreset: aPreset];
-    NSString *preferredLanguageName = [[NSUserDefaults standardUserDefaults] stringForKey: @"DefaultLanguage"];
-    int preferredLanguage = [self _trackWithTitlePrefix: preferredLanguageName defaultIfNotFound: 1];
+    NSMutableArray *tracksToAdd = [[NSMutableArray alloc] init];
 
-    // Reinitialize the configured list of audio tracks
-    [self _clearAudioArray];
+    NSArray* preferredLanguages = [NSArray arrayWithObjects: 
+                          [[NSUserDefaults standardUserDefaults] stringForKey: @"DefaultLanguage"],
+                          [[NSUserDefaults standardUserDefaults] stringForKey: @"AlternateLanguage"],
+                          nil];
+
+    // Add tracks of Default and Alternate Language by name
+    for(id languageName in preferredLanguages)
+    {
+        int trackNumber = [self _trackWithTitlePrefix: languageName defaultIfNotFound: 0];
+        
+        if(trackNumber > 0 && [tracksToAdd indexOfObject:[NSNumber numberWithInt:trackNumber]] == NSNotFound)
+        {
+            [tracksToAdd addObject:[NSNumber numberWithInt:trackNumber]];
+        }
+    }
 
-    [self _processPresetAudioArray: whatToUse forTrack: preferredLanguage andType: [[aPreset objectForKey: @"Type"] intValue]];
+    // If no preferred Language was found, add standard track 1
+    if([tracksToAdd count] == 0)
+    {
+        [tracksToAdd addObject:[NSNumber numberWithInt:1]];
+    }
+
+    // If all tracks should be added, add all track numbers that are not yet processed
     if (allTracks)
     {
         unsigned int count = [masterTrackArray count];
         for (unsigned int i = 1; i < count; i++)
         {
-            if (i != preferredLanguage)
+            NSNumber *trackNumber = [NSNumber numberWithInt:i];
+            if([tracksToAdd indexOfObject:trackNumber] == NSNotFound)
             {
-                [self _processPresetAudioArray: whatToUse forTrack: i andType: [[aPreset objectForKey: @"Type"] intValue]];
+               [tracksToAdd addObject:trackNumber];
             }
         }
     }
+         
+    // Reinitialize the configured list of audio tracks
+    [self _clearAudioArray];
+
+    for(id trackNumber in tracksToAdd)
+    {
+        [self _processPresetAudioArray: whatToUse forTrack:[trackNumber intValue] andType: [[aPreset objectForKey: @"Type"] intValue]];
+    }
 }
 
 - (void) _ensureAtLeastOneNonEmptyTrackExists
@@ -598,7 +631,7 @@
                                        [NSNumber numberWithInt: audio->in.bitrate / 1000], keyAudioInputBitrate,
                                        [NSNumber numberWithInt: audio->in.samplerate], keyAudioInputSampleRate,
                                        [NSNumber numberWithInt: audio->in.codec], keyAudioInputCodec,
-                                       [NSNumber numberWithInt: audio->in.channel_layout], keyAudioInputChannelLayout,
+                                       [NSNumber numberWithUnsignedLongLong: audio->in.channel_layout], keyAudioInputChannelLayout,
                                        nil]];
         }
         self.masterTrackArray = newTrackArray;

HandBrake-0.9.8.tar.bz2/macosx/HBPreferencesController.m -> HandBrake-0.9.9.tar.bz2/macosx/HBPreferencesController.m Changed

@@ -111,25 +111,25 @@
     {
         return [self toolbarItemWithIdentifier:ident
                                          label:NSLocalizedString(@"General", @"Preferences General Toolbar Item")
-                                         image:[NSImage imageNamed:NSImageNamePreferencesGeneral]];
+                                         image:[NSImage imageNamed:@"settings"]];
     }
     else if ( [ident isEqualToString:TOOLBAR_PICTURE] )
     {
         return [self toolbarItemWithIdentifier:ident
                                          label:NSLocalizedString(@"Picture", @"Preferences Picture Toolbar Item")
-                                         image:[NSImage imageNamed:@"pref-picture"]];
+                                         image:[NSImage imageNamed:@"picturesettings"]];
     }
     else if ( [ident isEqualToString:TOOLBAR_AUDIO] )
     {
         return [self toolbarItemWithIdentifier:ident
                                          label:NSLocalizedString(@"Audio", @"Preferences Audio Toolbar Item")
-                                         image:[NSImage imageNamed:@"pref-audio"]];
+                                         image:[NSImage imageNamed:@"audio"]];
     }
     else if ( [ident isEqualToString:TOOLBAR_ADVANCED] )
     {
         return [self toolbarItemWithIdentifier:ident
                                          label:NSLocalizedString(@"Advanced", @"Preferences Advanced Toolbar Item")
-                                         image:[NSImage imageNamed:NSImageNameAdvanced]];
+                                         image:[NSImage imageNamed:@"advanced"]];
     }
 
     return nil;

HandBrake-0.9.8.tar.bz2/macosx/HBPresets.h -> HandBrake-0.9.9.tar.bz2/macosx/HBPresets.h Changed

@@ -1,35 +1,33 @@
 /*  HBPresets.h $
- 
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
 
-#import <Cocoa/Cocoa.h>
+   This file is part of the HandBrake source code.
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License. */
 
+#import <Cocoa/Cocoa.h>
 
 @interface HBPresets : NSObject {}
 
-/* Called by -addFactoryPresets in Controller.mm */
-- (NSMutableArray *) generateBuiltinPresets: (NSMutableArray *) UserPresets;
+/* Called by -addFactoryPresets in Controller.m */
+- (NSMutableArray *)generateBuiltinPresets:(NSMutableArray *)UserPresets;
 
-/* Built-In Preset Dictionaries (one for each built in preset) */
+/* Dictionaries for preset folders ("Devices, "Regular") */
 - (NSDictionary *)createDevicesPresetFolder;
 - (NSDictionary *)createRegularPresetFolder;
-- (NSDictionary *)createLegacyPresetFolder;
 
+/* Dictionaries for individual presets ("Devices" folder) */
+- (NSDictionary *)createUniversalPreset;
+- (NSDictionary *)createiPodPreset;
+- (NSDictionary *)createiPhoneiPodtouchPreset;
 - (NSDictionary *)createiPadPreset;
-- (NSDictionary *)createiPhone4Preset;
-- (NSDictionary *)createAppleTv2Preset;
 - (NSDictionary *)createAppleTVPreset;
-- (NSDictionary *)createAppleTv3Preset;
-- (NSDictionary *)createAppleUniversalPreset;
-- (NSDictionary *)createClassicPreset;
-- (NSDictionary *)createiPhonePreset;
-- (NSDictionary *)createIpodHighPreset;
-- (NSDictionary *)createIpodLowPreset;
+- (NSDictionary *)createAppleTV2Preset;
+- (NSDictionary *)createAppleTV3Preset;
+- (NSDictionary *)createAndroidPreset;
+- (NSDictionary *)createAndroidTabletPreset;
+
+/* Dictionaries for individual presets ("Regular" folder) */
 - (NSDictionary *)createNormalPreset;
 - (NSDictionary *)createHighProfilePreset;
-- (NSDictionary *)createAndroidMidPreset;
-- (NSDictionary *)createAndroidHighPreset;
 
 @end

HandBrake-0.9.8.tar.bz2/macosx/HBPresets.m -> HandBrake-0.9.9.tar.bz2/macosx/HBPresets.m Changed

@@ -1,80 +1,72 @@
 /*  HBPresets.m $
- 
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
+
+   This file is part of the HandBrake source code.
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License. */
 
 #import "HBPresets.h"
 
 @implementation HBPresets
+
 - (id)init 
 {
     self = [super init];
-    return self;
+   return self;
 }
 
-/* Called by -addFactoryPresets in Controller.mm */
-- (NSMutableArray *) generateBuiltinPresets: (NSMutableArray *) UserPresets
+/* Called by -addFactoryPresets in Controller.m */
+- (NSMutableArray *)generateBuiltinPresets:(NSMutableArray *)UserPresets
 {
-    /* We receive the user presets array of dictionaries from controller.mm */
-    /* We re-create new built in presets programmatically and add them to our presets array */
-    
-    /* Note: the built in presets will *not* sort themselves alphabetically, so they will
-     * appear in the order you create them
+    /*
+     * We receive the user presets array of dictionaries from Controller.m
+     *
+     * Re-create new built-in presets programmatically and add them to the array
+     *
+     * Note: the built-in presets will *not* sort themselves alphabetically,
+     * so they will appear in the order you create them.
      */
-    /* Built in preset folders at the root of the hierarchy */
+    
+    /* Built-in preset folders at the root of the hierarchy */
     [UserPresets addObject:[self createDevicesPresetFolder]];
     [UserPresets addObject:[self createRegularPresetFolder]];
-    [UserPresets addObject:[self createLegacyPresetFolder]];
     
     /* Independent presets at the root hierarchy level would go here */
     
-    /* return the newly regenerated preset array back to Controller.mm */
+    /* Return the newly-regenerated preset array back to Controller.m */
     return UserPresets;
 }
 
 #pragma mark -
-
-#pragma mark Built In Preset Folder Definitions
+#pragma mark Preset Folder Definitions
 
 - (NSDictionary *)createDevicesPresetFolder
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: YES] forKey:@"Folder"];
-    
-    
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Devices" forKey:@"PresetName"];
     
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"Devices"                    forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:YES] forKey:@"Folder"];
     
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /* Lets initalize the child array of dictionaries for folders, this
-     is an array of dictionaries much like the root level of presets and
-     may contain folders and presets alike, etc.*/
+    /* Initialize a child array, and add the individual presets to it */
     NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
-    /* we actually call the methods for the nests here */
-    [childrenArray addObject:[self createAppleUniversalPreset]];
-    [childrenArray addObject:[self createIpodLowPreset]];
-    [childrenArray addObject:[self createiPhonePreset]];
-	[childrenArray addObject:[self createiPhone4Preset]];
+    [childrenArray addObject:[self createUniversalPreset]];
+    [childrenArray addObject:[self createiPodPreset]];
+    [childrenArray addObject:[self createiPhoneiPodtouchPreset]];
     [childrenArray addObject:[self createiPadPreset]];
     [childrenArray addObject:[self createAppleTVPreset]];
-	[childrenArray addObject:[self createAppleTv2Preset]];
-    [childrenArray addObject:[self createAppleTv3Preset]];
-    [childrenArray addObject:[self createAndroidMidPreset]];
-    [childrenArray addObject:[self createAndroidHighPreset]];
+    [childrenArray addObject:[self createAppleTV2Preset]];
+    [childrenArray addObject:[self createAppleTV3Preset]];
+    [childrenArray addObject:[self createAndroidPreset]];
+    [childrenArray addObject:[self createAndroidTabletPreset]];
     
-    [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
+    /* Add the individual presets to the folder */
+    [preset setObject:[NSMutableArray arrayWithArray:childrenArray]
+               forKey:@"ChildrenArray"];
     
+    /* Clean up and return the folder */
     [childrenArray autorelease];
-    
-    
-    
     [preset autorelease];
     return preset;
 }
@@ -82,1208 +74,1009 @@
 - (NSDictionary *)createRegularPresetFolder
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: YES] forKey:@"Folder"];
-    
-    
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Regular" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
     
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"Regular"                    forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:YES] forKey:@"Folder"];
     
-    /* Lets initalize the child array of dictionaries for folders, this
-     is an array of dictionaries much like the root level of presets and
-     may contain folders and presets alike, etc.*/
+    /* Initialize a child array, and add the individual presets to it */
     NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
-    /* we actually call the methods for the nests here */
     [childrenArray addObject:[self createNormalPreset]];
     [childrenArray addObject:[self createHighProfilePreset]];
-    [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
-    
-    [childrenArray autorelease];
-    
-    
-    
-    [preset autorelease];
-    return preset;
-}
-
-- (NSDictionary *)createLegacyPresetFolder
-{
-    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: YES] forKey:@"Folder"];
-    
-    
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Legacy" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
     
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /* Lets initalize the child array of dictionaries for folders, this
-     is an array of dictionaries much like the root level of presets and
-     may contain folders and presets alike, etc.*/
-    NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
-    /* we actually call the methods for the nests here */
-    [childrenArray addObject:[self createClassicPreset]];
-    [childrenArray addObject:[self createIpodHighPreset]];
-    [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
+    /* Add the individual presets to the folder */
+    [preset setObject:[NSMutableArray arrayWithArray:childrenArray]
+               forKey:@"ChildrenArray"];
     
+    /* Clean up and return the folder */
     [childrenArray autorelease];
-    
-    
-    
     [preset autorelease];
     return preset;
 }
 
-
 #pragma mark -
+#pragma mark Individual Preset Definitions
+/* These NSDictionary definitions contain settings for one built-in preset */
 
-#pragma mark Built In Preset Definitions
-
-/* These NSDictionary Buit-In Preset definitions contain all of the settings for one built in preset */
-/* Note: For now, you can no longer have reference to any main window fields in your key values */
-
-- (NSDictionary *)createAppleTVPreset
+- (NSDictionary *)createUniversalPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"AppleTV" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's settings for the AppleTV and 2009's iPhone and iPod Touch lineup. Provides a good balance between quality and file size, and pushes the devices to their limits. Includes Dolby Digital 5.1 AC3 sound for the AppleTV." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"Universal"                 forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for compatibility with all Apple devices (including the iPod 6G and later). Includes Dolby Digital audio for surround sound."
+               forKey:@"PresetDescription"];
     
-    /* 64-bit MP4 file */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Chapter Markers*/
+    /* Chapter markers */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    
-    /* x264 Option String (We can use this to tweak the appleTV output)*/
-    [preset setObject:@"cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"fast"                    forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"baseline"                forKey:@"h264Profile"];
+    [preset setObject:@"3.0"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
     
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-    
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-    
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:960] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:576] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-    
     /* Track 2 */
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
-    [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
-    [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
-    /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
-     * the sources bitrate, however we need to initially set the value to something so
-     * the macgui doesnt barf, so 160 seems as good as anything */
+    [audioTrack2Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack2Array setObject:@"AC3 Passthru"                forKey:@"AudioEncoder"];
+    [audioTrack2Array setObject:@"None"                        forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack2Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack2Array autorelease];
     [audioListArray addObject:audioTrack2Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createAppleUniversalPreset
+- (NSDictionary *)createiPodPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Universal" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs" forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"iPod"                      forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for playback on the iPod with Video (all generations)."
+               forKey:@"PresetDescription"];
     
-    /* 64-bit MP4 file */
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
     
-    /* Chapter Markers*/
+    /* Chapter markers */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    
-    /* x264 Option String (We can use this to tweak the appleTV output)*/
-    [preset setObject:@"cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
-    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-    
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-    
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"baseline"                forKey:@"h264Profile"];
+    [preset setObject:@"1.3"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
+    [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
     
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:320] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:240] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"PicturePAR"]; //none
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"PictureKeepRatio"];
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    /* Track 2 */
-    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
-    [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
-    [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
-    /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
-     * the sources bitrate, however we need to initially set the value to something so
-     * the macgui doesnt barf, so 160 seems as good as anything */
-    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
-    [audioTrack2Array autorelease];
-    [audioListArray addObject:audioTrack2Array];
-    
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createiPadPreset
+- (NSDictionary *)createiPhoneiPodtouchPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"iPad" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"iPhone & iPod touch"       forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for handheld iOS devices (iPhone 4, iPod touch 3G and later)."
+               forKey:@"PresetDescription"];
     
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's preset for the iPad (all generations) is optimized for a good balance between quality and filesize." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-    
-    /* 64-bit MP4 file */
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Chapter Markers*/
+    /* Chapter markers */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    
-    /* x264 Option String (We can use this to tweak the output)*/
-    [preset setObject:@"" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
-    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"high"                    forKey:@"h264Profile"];
+    [preset setObject:@"3.1"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
+    [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
     
-    /* Video framerate */
-    [preset setObject:@"29.97 (NTSC Video)" forKey:@"VideoFramerate"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
     [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-    
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-    
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:960] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:640] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createiPhone4Preset
+- (NSDictionary *)createiPadPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-	
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"iPhone 4" forKey:@"PresetName"];
-	
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-	
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-	
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's preset for the iPhone 4 is optimized for viewing on its 960x480 display." forKey:@"PresetDescription"];
-	
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-	
-    /* 64-bit MP4 file */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
-	
-    /* Chapter Markers*/
-	[preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-	
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-	
-    /* x264 Option String (We can use this to tweak the output)*/
-    [preset setObject:@"" forKey:@"x264Option"];
-	
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
-    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-	
-    /* Video framerate */
-    [preset setObject:@"29.97 (NTSC Video)" forKey:@"VideoFramerate"];
-    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-	
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-	
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:960] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-	
-    /* Explicitly set the filters for built-in presets */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-	
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-	
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"iPad"                      forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for playback on the iPad (all generations)."
+               forKey:@"PresetDescription"];
     
-    /* Track 1 */        
-    NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
-    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
-    [audioTrack1Array autorelease];
-    [audioListArray addObject:audioTrack1Array];
-	
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-	
-    /* Subtitles*/
-    [preset setObject:@"None" forKey:@"Subtitles"];
-	
-    [preset autorelease];
-    return preset;
-}
-
-- (NSDictionary *)createAppleTv2Preset
-{
-    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-	
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"AppleTV 2" forKey:@"PresetName"];
-	
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-	
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-	
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's preset for the Apple TV (2nd gen) is optimized for viewing on its 1280x720 display." forKey:@"PresetDescription"];
-	
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-	
-    /* 64-bit MP4 file */
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
-	
-    /* Chapter Markers*/
-	[preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-	
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-	
-    /* x264 Option String (We can use this to tweak the output)*/
-    [preset setObject:@"" forKey:@"x264Option"];
-	
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
-    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-	
-    /* Video framerate */
-    [preset setObject:@"29.97 (NTSC Video)" forKey:@"VideoFramerate"];
-    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-	
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-	
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-	
-    /* Explicitly set the filters for built-in presets */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-	
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-	
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Chapter markers */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Track 1 */        
-    NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
-    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
-    [audioTrack1Array autorelease];
-    [audioListArray addObject:audioTrack1Array];
-	
-    /* Track 2 */
-    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
-    [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
-    [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
-    /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
-     * the sources bitrate, however we need to initially set the value to something so
-     * the macgui doesnt barf, so 160 seems as good as anything */
-    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
-    [audioTrack2Array autorelease];
-    [audioListArray addObject:audioTrack2Array];
-	
-	
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-	
-    /* Subtitles*/
-    [preset setObject:@"None" forKey:@"Subtitles"];
-	
-    [preset autorelease];
-    return preset;
-}
-
-- (NSDictionary *)createAppleTv3Preset
-{
-    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-	
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"AppleTV 3" forKey:@"PresetName"];
-	
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-	
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-	
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's preset for the Apple TV (3rd gen) is optimized for up to 1080p playback." forKey:@"PresetDescription"];
-	
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-	
-    /* 64-bit MP4 file */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
-	
-    /* Chapter Markers*/
-	[preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-	
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-	
-    /* x264 Option String (We can use this to tweak the output)*/
-    [preset setObject:@"b-adapt=2" forKey:@"x264Option"];
-	
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"high"                    forKey:@"h264Profile"];
+    [preset setObject:@"3.1"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-	
-    /* Video framerate */
-    [preset setObject:@"30" forKey:@"VideoFramerate"];
+    
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
     [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-	
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-	
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:1920] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]    forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:720]  forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* We use Loose Anamorphic with a Modulus of 2 */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
-	
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-    /* Note: decided to use Fast Decomb. This makes this the only device preset using
-     * decomb that we have. Fast Decomb is better than no decomb imo and has basically no
-     * speed hit on progressive sources. Once Default decomb is sped up, we can switch */
-    [preset setObject:[NSNumber numberWithInt:3] forKey:@"PictureDecomb"];
-	
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-	
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
     
-    /* Track 1 */        
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
+    
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-	
-    /* Track 2 */
-    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
-    [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
-    [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
-    /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
-     * the sources bitrate, however we need to initially set the value to something so
-     * the macgui doesnt barf, so 160 seems as good as anything */
-    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
-    [audioTrack2Array autorelease];
-    [audioListArray addObject:audioTrack2Array];
-	
-	
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-	
-    /* Subtitles*/
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
+    
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
-	
+    
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-
-- (NSDictionary *)createClassicPreset
+- (NSDictionary *)createAppleTVPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Classic" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's traditional, faster, lower-quality settings." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-    
-    /* Chapter Markers*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
-    
-    /* Video encoder */
-    [preset setObject:@"MPEG-4 (FFmpeg)" forKey:@"VideoEncoder"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"AppleTV"                   forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for the original AppleTV. Includes Dolby Digital audio for surround sound. Also compatible with iOS devices released since 2009."
+               forKey:@"PresetDescription"];
     
-    /* x264 Option String */
-    [preset setObject:@"" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
-    [preset setObject:@"1000" forKey:@"VideoAvgBitrate"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
+    /* Chapter markers */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500"
+               forKey:@"x264OptionExtra"];
+    [preset setObject:@"high"                    forKey:@"h264Profile"];
+    [preset setObject:@"3.1"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
+    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
     
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /*Picture Settings*/
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:960] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Track 2 */
+    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+    [audioTrack2Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack2Array setObject:@"AC3 Passthru"                forKey:@"AudioEncoder"];
+    [audioTrack2Array setObject:@"None"                        forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack2Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
+    [audioTrack2Array autorelease];
+    [audioListArray addObject:audioTrack2Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createHighProfilePreset
+- (NSDictionary *)createAppleTV2Preset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"High Profile" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"AppleTV 2"                 forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for the second-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV."
+               forKey:@"PresetDescription"];
     
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-    
-    /* 64-bit MP4 file */
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Chapter Markers*/
+    /* Chapter markers */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    
-    /* x264 Option String */
-    [preset setObject:@"b-adapt=2:rc-lookahead=50" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"1800" forKey:@"VideoAvgBitrate"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"high"                    forKey:@"h264Profile"];
+    [preset setObject:@"3.1"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
     
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-    
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-    
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /*Picture Settings*/
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]    forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:720]  forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureDecomb"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-    
     /* Track 2 */
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
-    [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
-    [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
-    /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
-     * the sources bitrate, however we need to initially set the value to something so
-     * the macgui doesnt barf, so 160 seems as good as anything */
+    [audioTrack2Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack2Array setObject:@"AC3 Passthru"                forKey:@"AudioEncoder"];
+    [audioTrack2Array setObject:@"None"                        forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack2Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack2Array autorelease];
     [audioListArray addObject:audioTrack2Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createiPhonePreset
+- (NSDictionary *)createAppleTV3Preset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"iPhone & iPod Touch" forKey:@"PresetName"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"AppleTV 3"                 forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for the third-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV. May stutter on the second-generation AppleTV."
+               forKey:@"PresetDescription"];
     
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's settings for all iPhones and iPod Touches going back to the original iPhone 2G." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Chapter Markers*/
+    /* Chapter markers */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
-    /* x264 Option String */
-    [preset setObject:@"cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"960" forKey:@"VideoAvgBitrate"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"high"                    forKey:@"h264Profile"];
+    [preset setObject:@"4.0"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
     
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-    
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-    
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /*Picture Settings*/
-    /* Use a width of 480 for the iPhone*/
-    [preset setObject:[NSNumber numberWithInt:480] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]    forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:1920] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:1080] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:3] forKey:@"PictureDecomb"]; //fast
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Track 2 */
+    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+    [audioTrack2Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack2Array setObject:@"AC3 Passthru"                forKey:@"AudioEncoder"];
+    [audioTrack2Array setObject:@"None"                        forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack2Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
+    [audioTrack2Array autorelease];
+    [audioListArray addObject:audioTrack2Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createIpodHighPreset
+- (NSDictionary *)createAndroidPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"iPod Legacy" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-    
-    /* Chapter Markers*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-    
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
-    /* x264 Option String */
-    [preset setObject:@"level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"Android"                   forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's settings for midrange devices running Android 2.3 or later."
+               forKey:@"PresetDescription"];
     
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
-    [preset setObject:@"1500" forKey:@"VideoAvgBitrate"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
+    /* Chapter markers */
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"main"                    forKey:@"h264Profile"];
+    [preset setObject:@"3.0"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
+    [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
     
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /*Picture Settings*/
-    /* Use a width of 640 for iPod TV-out */
-    [preset setObject:[NSNumber numberWithInt:640] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:576] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]   forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"128"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createIpodLowPreset
+- (NSDictionary *)createAndroidTabletPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"iPod" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size." forKey:@"PresetDescription"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"Android Tablet"            forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's preset for tablets running Android 2.3 or later."
+               forKey:@"PresetDescription"];
     
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-    
-    /* Chapter Markers*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-    
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
-    /* x264 Option String */
-    [preset setObject:@"level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
-    [preset setObject:@"700" forKey:@"VideoAvgBitrate"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
+    /* Chapter markers */
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"main"                    forKey:@"h264Profile"];
+    [preset setObject:@"3.1"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
+    [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
     
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"30"  forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
-    /*Picture Settings*/
-    /* Use a width of 320 for the iPod screen */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
-    [preset setObject:[NSNumber numberWithInt:320] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1]    forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:720]  forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2]    forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0]    forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"128"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
@@ -1292,289 +1085,219 @@
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Normal" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Default"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"Normal"                    forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:1]   forKey:@"Default"]; //default
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's normal, default settings."
+               forKey:@"PresetDescription"];
     
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's normal, default settings." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     
-    /* Chapter Markers*/
+    /* Chapter markers */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-    
-    /* x264 Option String */
-    [preset setObject:@"ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"1500" forKey:@"VideoAvgBitrate"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"veryfast"                forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"main"                    forKey:@"h264Profile"];
+    [preset setObject:@"4.0"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
     
-    /* Video framerate */
+    /* Video frame rate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
+    [preset setObject:@"vfr"            forKey:@"VideoFramerateMode"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-    
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
-    
-    /*Picture Settings*/
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PicturePAR"];
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createAndroidMidPreset
+- (NSDictionary *)createHighProfilePreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
     
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Android Mid" forKey:@"PresetName"];
-    
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-    
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's settings for Mid-range Android 2.3 or better devices." forKey:@"PresetDescription"];
-    
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-    
-    /* 64-bit MP4 file */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
-    
-    /* Chapter Markers*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
+    /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+    [preset setObject:@"High Profile"              forKey:@"PresetName"];
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Type"]; //factory
+    [preset setObject:[NSNumber numberWithInt:0]   forKey:@"Default"];
+    [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
+    [preset setObject:@"HandBrake's general-purpose preset for High Profile H.264 video."
+               forKey:@"PresetDescription"];
     
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
+    /* Container format and related settings */
+    [preset setObject:@"MP4 file"                forKey:@"FileFormat"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
-    /* x264 Option String */
-    [preset setObject:@"cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
-    
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"960" forKey:@"VideoAvgBitrate"];
-    [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
     
-    /* Video framerate */
-    [preset setObject:@"29.97 (NTSC Video)" forKey:@"VideoFramerate"];
-    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
+    /* Chapter markers */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
     
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    /* Video encoder and advanced options */
+    [preset setObject:@"H.264 (x264)"            forKey:@"VideoEncoder"];
+    [preset setObject:@""                        forKey:@"lavcOption"];
+    [preset setObject:@""                        forKey:@"x264Option"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
+    [preset setObject:@"medium"                  forKey:@"x264Preset"];
+    [preset setObject:@""                        forKey:@"x264Tune"];
+    [preset setObject:@""                        forKey:@"x264OptionExtra"];
+    [preset setObject:@"high"                    forKey:@"h264Profile"];
+    [preset setObject:@"4.1"                     forKey:@"h264Level"];
+    
+    /* Video rate control */
+    [preset setObject:@"2500"                         forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:0]      forKey:@"VideoTurboTwoPass"];
+    [preset setObject:[NSNumber numberWithInt:2]      forKey:@"VideoQualityType"]; //cq
+    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
     
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    /* Video frame rate */
+    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
+    [preset setObject:@"vfr"            forKey:@"VideoFramerateMode"];
     
-    /*Picture Settings*/
-    /* Use a width of 480 for the iPhone*/
-    [preset setObject:[NSNumber numberWithInt:480] forKey:@"PictureWidth"];
+    /* Picture size */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
     
-    /* Explicitly set the filters for built-in presets */
+    /* Picture filters */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureDecomb"]; //default
+    [preset setObject:@""                        forKey:@"PictureDecombCustom"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:@""                        forKey:@"PictureDeinterlaceCustom"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:@""                        forKey:@"PictureDetelecineCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:@""                        forKey:@"PictureDenoiseCustom"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
     
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    /* Picture crop */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
     
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Auto Passthru */
+    [preset setObject:@"AC3 (ffmpeg)"            forKey:@"AudioEncoderFallback"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
     
-    /* Track 1 */        
+    /* Audio track list - no need to add "None" at the end */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+    /* Track 2 */
+    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+    [audioTrack2Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
+    [audioTrack2Array setObject:@"AC3 Passthru"                forKey:@"AudioEncoder"];
+    [audioTrack2Array setObject:@"None"                        forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
+    [audioTrack2Array setObject:@"160"                         forKey:@"AudioBitrate"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
+    [audioTrack2Array autorelease];
+    [audioListArray addObject:audioTrack2Array];
+    /* Add the audio track(s) to the preset's audio list */
+    [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
     
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-    
-    /* Subtitles*/
+    /* Subtitles (note: currently ignored) */
     [preset setObject:@"None" forKey:@"Subtitles"];
     
+    /* Clean up and return the preset */
     [preset autorelease];
     return preset;
 }
 
-- (NSDictionary *)createAndroidHighPreset
-{
-    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-	
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Android High" forKey:@"PresetName"];
-	
-    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-    /*Set whether or not this is a folder, 1 is bool for folder*/
-    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
-    /*Set whether or not this is default, at creation set to 0*/
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-	
-    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-	
-    /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's preset for the Higher end Anroid 2.3 or better devices." forKey:@"PresetDescription"];
-	
-    /* File Format */
-    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-	
-    /* 64-bit MP4 file */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
-	
-    /* Chapter Markers*/
-	[preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
-	
-    /* Video encoder */
-    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-	
-    /* x264 Option String (We can use this to tweak the output)*/
-    [preset setObject:@"weightp=0:cabac=0" forKey:@"x264Option"];
-	
-    /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
-    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
-    [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
-	
-    /* Video framerate */
-    [preset setObject:@"29.97 (NTSC Video)" forKey:@"VideoFramerate"];
-    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
-    
-    /* GrayScale */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-	
-    /* 2 Pass Encoding */
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-	
-    /* Basic Picture Settings */
-    /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureWidth"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-	
-    /* Explicitly set the filters for built-in presets */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-	
-    /* Set crop settings here */
-    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-	
-    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
-     * not listed will be set to "None" and not encoded */
-    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
-    
-    /* Track 1 */        
-    NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
-    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
-    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
-    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
-    [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"];
-    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
-    [audioTrack1Array autorelease];
-    [audioListArray addObject:audioTrack1Array];
-	
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-	
-    /* Subtitles*/
-    [preset setObject:@"None" forKey:@"Subtitles"];
-	
-    [preset autorelease];
-    return preset;
-}
-
-
 @end

HandBrake-0.9.8.tar.bz2/macosx/HBPreviewController.h -> HandBrake-0.9.9.tar.bz2/macosx/HBPreviewController.h Changed

@@ -12,22 +12,18 @@
 
 @class HBController;
 
-#define HB_NUM_HBLIB_PICTURES      20   // # of preview pictures libhb should generate
-
-@interface PreviewController : NSWindowController
+@interface PreviewController : NSWindowController <NSWindowDelegate>
 {
     hb_handle_t              * fHandle;
     hb_title_t               * fTitle;
 
-    HBController             *fHBController;        // reference to HBController
+    HBController             * fHBController;     // reference to HBController
     
-    IBOutlet NSWindow        * fPreviewWindow;
-    NSWindow                 * fFullScreenWindow; // Full Screen window
     NSMutableDictionary      * fPicturePreviews;  // NSImages, one for each preview libhb creates, created lazily
     int                        fPicture;
 
-    IBOutlet NSImageView     * fPictureView;
-    IBOutlet NSBox           * fPictureViewArea;
+    CALayer                  * fWhiteBackground;
+    CALayer                  * fPictureLayer;
     IBOutlet NSBox           * fPictureControlBox;
     IBOutlet NSBox           * fEncodingControlBox;
     IBOutlet NSBox           * fMoviePlaybackControlBox;
@@ -36,23 +32,16 @@
     IBOutlet NSTextField     * fInfoField;
     IBOutlet NSTextField     * fscaleInfoField;
     
-    BOOL                     isEncoding;
-
-	
-    int                      MaxOutputWidth;
-    int                      MaxOutputHeight;
-
-    int output_width, output_height, output_par_width, output_par_height;
-    int display_width;
+    CGFloat                  backingScaleFactor;
     
     /* Hud Control Overlay */
     NSTimer                         * fHudTimer;
     int                               hudTimerSeconds;
     
     /* Full Screen Mode Toggle */
+    BOOL                              scaleToScreen;
     IBOutlet NSButton               * fScaleToScreenToggleButton;
     IBOutlet NSButton               * fPictureSettingsToggleButton;
-    BOOL                              scaleToScreen;
     
     /* Movie Previews */
     QTMovie                         * aMovie;
@@ -68,13 +57,13 @@
     IBOutlet NSTextField            * fMovieInfoField;
     NSTimer                         * fMovieTimer;
     
-    
     IBOutlet NSButton               * fCreatePreviewMovieButton;
     IBOutlet NSButton               * fCancelPreviewMovieButton;
     IBOutlet NSButton               * fShowPreviewMovieButton;
     NSString                        * fPreviewMoviePath;
     IBOutlet NSProgressIndicator    * fMovieCreationProgressIndicator;
     hb_handle_t                     * fPreviewLibhb;           // private libhb for creating previews
+    NSInteger                         fEncodeState;
     NSTimer                         * fLibhbTimer;             // timer for retrieving state from libhb
     IBOutlet NSTextField            * fPreviewMovieStatusField; 
     IBOutlet NSPopUpButton          * fPreviewMovieLengthPopUp; // popup of choices for length of preview in seconds
@@ -83,18 +72,15 @@
 
 - (void) SetHandle: (hb_handle_t *) handle;
 - (void) SetTitle:  (hb_title_t *)  title;
-- (void)setHBController: (HBController *)controller;
-- (IBAction) showPreviewWindow: (id)sender;
-- (BOOL)acceptsMouseMovedEvents;
+- (void) setHBController: (HBController *)controller;
 - (void) displayPreview;
 
-- (IBAction) SettingsChanged: (id) sender;
+- (IBAction) settingsChanged: (id) sender;
 - (IBAction) pictureSliderChanged: (id) sender;
-- (IBAction)showPictureSettings:(id)sender;
+- (IBAction) showPictureSettings:(id)sender;
 - (NSString*) pictureSizeInfoString;
 
-- (IBAction)toggleScaleToScreen:(id)sender;
-- (IBAction)goWindowedScreen:(id)sender;
+- (IBAction) toggleScaleToScreen:(id)sender;
 
 /* HUD overlay */
 - (void) enableHudControls;
@@ -108,37 +94,36 @@
 - (void) stopReceivingLibhbNotifications;
 
 - (void) installMovieCallbacks;
-- (void)removeMovieCallbacks;
+- (void) removeMovieCallbacks;
 
 - (IBAction) cancelCreateMoviePreview: (id) sender;
 - (IBAction) createMoviePreview: (id) sender;
 - (void) libhbStateChanged: (hb_state_t ) state;
 - (IBAction) showMoviePreview: (NSString *) path;
+- (IBAction) showPicturesPreview: (id) sender;
 - (IBAction) toggleMoviePreviewPlayPause: (id) sender;
 - (IBAction) moviePlaybackGoToBeginning: (id) sender;
 - (IBAction) moviePlaybackGoToEnd: (id) sender;
 - (IBAction) moviePlaybackGoBackwardOneFrame: (id) sender;
 - (IBAction) moviePlaybackGoForwardOneFrame: (id) sender;
 
--(void) initPreviewScrubberForMovie;
--(void) adjustPreviewScrubberForCurrentMovieTime;
+- (void) initPreviewScrubberForMovie;
+- (void) adjustPreviewScrubberForCurrentMovieTime;
 - (IBAction) previewScrubberChanged: (id) sender;
--(void)setTime:(int)timeValue;
--(void)timeToQTTime:(long)timeValue resultTime:(QTTime *)aQTTime;
+- (BOOL) isPlaying;
+
 - (void) startMovieTimer;
 - (void) stopMovieTimer;
-- (NSString*) calculatePlaybackSMTPETimecodeForDisplay;
 
+- (NSString*) SMTPETimecode: (QTTime)time;
+- (QTTime)SliderToQTTime:(double)time;
 
 - (IBAction) previewDurationPopUpChanged: (id) sender;
 
-
-- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
-
-+ (NSImage *) makeImageForPicture: (int)pictureIndex
++ (NSImage *) makeImageForPicture: (NSInteger)pictureIndex
                 libhb:(hb_handle_t*)handle
                 title:(hb_title_t*)title;
-- (NSImage *) imageForPicture: (int) pictureIndex;
+- (NSImage *) imageForPicture: (NSInteger) pictureIndex;
 - (void) purgeImageCache;
 @end

HandBrake-0.9.8.tar.bz2/macosx/HBPreviewController.m -> HandBrake-0.9.9.tar.bz2/macosx/HBPreviewController.m Changed

@@ -7,22 +7,28 @@
 #import "HBPreviewController.h"
 #import "Controller.h"
 
-@implementation QTMovieView ( HBQTkitExt )
+#define BORDER_SIZE 2.0
+#define HB_NUM_HBLIB_PICTURES 20   // # of preview pictures libhb should generate
+
+@implementation QTMovieView (HBExtensions)
 - (void) mouseMoved:(NSEvent *)theEvent
 {
     [super mouseMoved:theEvent];
 }
 @end
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+@interface NSWindow(HBExtensions)
+
+@property (readonly) CGFloat backingScaleFactor;
 
+@end
+#endif
 
 @interface PreviewController (Private)
 
 - (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize;
-- (void)resizeSheetForViewSize: (NSSize)viewSize;
-- (void)setViewSize: (NSSize)viewSize;
-- (BOOL)viewNeedsToResizeToSize: (NSSize)newSize;
-
+- (void)resizeWindowForViewSize: (NSSize)viewSize;
 @end
 
 @implementation PreviewController
@@ -45,29 +51,10 @@
         /* Init libhb with check for updates libhb style set to "0" so its ignored and lets sparkle take care of it */
         int loggingLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:@"LoggingLevel"] intValue];
         fPreviewLibhb = hb_init(loggingLevel, 0);
-        
-        
-
 	}
 	return self;
 }
 
-
-//------------------------------------------------------------------------------------
-// Displays and brings the picture window to the front
-//------------------------------------------------------------------------------------
-- (IBAction) showPreviewWindow: (id)sender
-{
-    [self showWindow:sender];
-    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PreviewWindowIsOpen"];
-    
-    /* lets set the preview window to accept mouse moved events */
-    [fPreviewWindow setAcceptsMouseMovedEvents:YES];
-    hudTimerSeconds = 0;
-    [self pictureSliderChanged:nil];
-    [self startReceivingLibhbNotifications];
-}
-
 - (void)setHBController: (HBController *)controller
 {
     fHBController = controller;
@@ -75,15 +62,16 @@
 
 - (void)awakeFromNib
 {
-    [fPreviewWindow setDelegate:self];
+    [[self window] setDelegate:self];
+
     if( ![[self window] setFrameUsingName:@"Preview"] )
         [[self window] center];
+
     [self setWindowFrameAutosaveName:@"Preview"];
     [[self window] setExcludedFromWindowsMenu:YES];
     
     /* lets set the preview window to accept mouse moved events */
-    [fPreviewWindow setAcceptsMouseMovedEvents:YES];
-    //[self pictureSliderChanged:nil];
+    [[self window] setAcceptsMouseMovedEvents:YES];
     [self startReceivingLibhbNotifications];
     
     hudTimerSeconds = 0;
@@ -92,35 +80,82 @@
     */
     [fMovieCreationProgressIndicator setUsesThreadedAnimation:NO];
     
-    /* Setup our layers for core animation */
-    [fPictureViewArea setWantsLayer:YES];
-    [fPictureView setWantsLayer:YES];
+    /* we set the preview length popup in seconds */
+    [fPreviewMovieLengthPopUp removeAllItems];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"15"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"30"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"45"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"60"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"90"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"105"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"120"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"135"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"150"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"165"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"180"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"195"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"210"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"225"];
+    [fPreviewMovieLengthPopUp addItemWithTitle: @"240"];
 
-    [fCancelPreviewMovieButton setWantsLayer:YES];
-    [fMovieCreationProgressIndicator setWantsLayer:YES];
+	[fMovieView setHidden:YES];
+    [fMovieView setDelegate:self];
 
+    /* Setup our layers for core animation */
+    [[[self window] contentView] setWantsLayer:YES];
     [fPictureControlBox setWantsLayer:YES];
     [fEncodingControlBox setWantsLayer:YES];
-	[fMovieView setWantsLayer:YES];
-	[fMovieView setHidden:YES];
-    [fMovieView setDelegate:self];
+    [fMoviePlaybackControlBox setWantsLayer:YES];
+    
+    fWhiteBackground = [CALayer layer];
+    [fWhiteBackground setBounds:CGRectMake(0.0, 0.0, 480.0, 360.0)];
+    [fWhiteBackground setPosition:CGPointMake([[[self window] contentView] frame].size.width /2,
+                                 [[[self window] contentView] frame].size.height /2)];
+    
+    [fWhiteBackground setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+    CGColorRef white = CGColorCreateGenericRGB(1.0, 1.0, 1.0, 1.0);
+    [fWhiteBackground setBackgroundColor: white];
+    CFRelease(white);
+    [fWhiteBackground setShadowOpacity:0.5f];
+    [fWhiteBackground setShadowOffset:CGSizeMake(0, 0)];
 
-    /* Since the xib has everything off center for easy acess
-     * we align our views and windows here we an align to anything
-     * since it will actually change later upon source load, but
-     * for convenience we will use the fPictureViewArea
-     */
-     
-     /* Align the still preview image view to the picture box */
-     [fPictureView setFrameSize:[fPictureViewArea frame].size];
-     [fMovieView setFrameSize:[fPictureViewArea frame].size];
-     //[fPreviewWindow setFrameSize:[fPictureViewArea frame].size];
+    fPictureLayer = [CALayer layer];
+    [fPictureLayer setBounds:CGRectMake(0.0, 0.0, 476.0, 356.0)];
+    [fPictureLayer setPosition:CGPointMake([[[self window] contentView] frame].size.width /2,
+                                             [[[self window] contentView] frame].size.height /2)];
+    
+    [fPictureLayer setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+
+    NSMutableDictionary *actions = [NSMutableDictionary
+                                    dictionaryWithDictionary:[fPictureLayer actions]];
+
+    // Disable fade on contents change
+    [actions setObject:[NSNull null] forKey:@"contents"];
+    [fPictureLayer setActions:actions];
+
+    [[[[self window] contentView] layer] insertSublayer:fWhiteBackground below: [fMovieView layer]];
+    [[[[self window] contentView] layer] insertSublayer:fPictureLayer below: [fMovieView layer]];
+
+    /* relocate our hud origins */
+    NSPoint hudControlBoxOrigin = [fMoviePlaybackControlBox frame].origin;
+    [fPictureControlBox setFrameOrigin:hudControlBoxOrigin];
+    [fEncodingControlBox setFrameOrigin:hudControlBoxOrigin];
+    [fMoviePlaybackControlBox setFrameOrigin:hudControlBoxOrigin];
     
+    if( [[self window] respondsToSelector:@selector( backingScaleFactor )] )
+        backingScaleFactor = [[self window] backingScaleFactor];
+    else
+        backingScaleFactor = 1.0;
     
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object:nil];
 }
-- (BOOL)acceptsMouseMovedEvents
+
+- (void) titleChanged: (NSNotification *) aNotification
 {
-    return YES;
+    /* Notification from HBController, only used to stop
+     * an encoding while the HBController is scanning a new title
+     */
+    [self cancelCreateMoviePreview:self];
 }
 
 - (void)windowWillClose:(NSNotification *)aNotification
@@ -131,22 +166,18 @@
      * to go back to still previews .. just in case nothing is loaded up like in
      * a Launch, cancel new scan then quit type scenario.
      */
-    if (fPicture)
+
+    if (fEncodeState || [self isPlaying])
     {
-        [self pictureSliderChanged:nil];
-        [fMovieTimer invalidate];
-        [fMovieTimer release];
+        [self cancelCreateMoviePreview:self];
+        [fMovieView pause:self];
+        [self stopMovieTimer];
     }
-    
+
     hudTimerSeconds = 0;
     [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PreviewWindowIsOpen"];
 }
 
-- (BOOL)windowShouldClose:(id)fPictureWindow
-{
-     return YES;
-}
-
 - (void) dealloc
 {
     hb_stop(fPreviewLibhb);
@@ -154,7 +185,7 @@
     {
         [[NSFileManager defaultManager] removeItemAtPath:fPreviewMoviePath error:nil];
         [fPreviewMoviePath release];
-    }    
+    }
     
     [fLibhbTimer invalidate];
     [fLibhbTimer release];
@@ -166,7 +197,6 @@
     [fMovieTimer release];
     
     [fPicturePreviews release];
-    [fFullScreenWindow release];
     
     hb_close(&fPreviewLibhb);
     
@@ -179,18 +209,6 @@
 {
     fHandle = handle;
     
-
-    
-    /* we set the preview length popup in seconds */
-    [fPreviewMovieLengthPopUp removeAllItems];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"15"];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"30"];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"45"];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"60"];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"90"];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"105"];
-    [fPreviewMovieLengthPopUp addItemWithTitle: @"120"];
-    
     /* adjust the preview slider length */
     /* We use our advance pref to determine how many previews we scanned */
     int hb_num_previews = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
@@ -203,56 +221,53 @@
     }
     else
     {
-        /* currently hard set default to 10 seconds */
-        [fPreviewMovieLengthPopUp selectItemAtIndex: 1];
+        /* currently hard set default to 15 seconds */
+        [fPreviewMovieLengthPopUp selectItemAtIndex: 0];
     }
 }
 
 - (void) SetTitle: (hb_title_t *) title
 {
-    hb_job_t * job = title->job;
-    
     fTitle = title;
     fPicture = 0;
-    MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
-    MaxOutputHeight = title->height - job->crop[0] - job->crop[1];
-    
-    [self SettingsChanged: nil];
 
+    [self settingsChanged:nil];
 }
 
-
+- (void)windowDidChangeBackingProperties:(NSNotification *)notification {
+    
+    NSWindow *theWindow = (NSWindow *)[notification object];
+    
+    CGFloat newBackingScaleFactor = [theWindow backingScaleFactor];
+    CGFloat oldBackingScaleFactor = [[[notification userInfo]
+                                      objectForKey:@"NSBackingPropertyOldScaleFactorKey"]
+                                     doubleValue];
+    if( newBackingScaleFactor != oldBackingScaleFactor )
+    {
+        // Scale factor changed, update the preview window
+        // to the new situation
+        backingScaleFactor = newBackingScaleFactor;
+        if (fTitle)
+            [self pictureSliderChanged:self];
+    }
+}
 
 // Adjusts the window to draw the current picture (fPicture) adjusting its size as
 // necessary to display as much of the picture as possible.
-- (void) displayPreview 
+- (void) displayPreview
 {
     hb_job_t * job = fTitle->job;
-    /* lets make sure that the still picture view is not hidden and that 
-     * the movie preview is 
-     */
-     aMovie = nil;
-    [fMovieView pause:nil];
-    [fMovieView setHidden:YES];
-	[fMovieView setMovie:nil];
-    [fMovieCreationProgressIndicator stopAnimation: nil];
-    [fMovieCreationProgressIndicator setHidden: YES];
-    [fMoviePlaybackControlBox setHidden: YES];
-    if( fMovieTimer )
-    {
-        [self stopMovieTimer];
-    }
-    [fPictureControlBox setHidden: NO];
-    
-    [fPictureView setHidden:NO];
-    
+
     NSImage *fPreviewImage = [self imageForPicture: fPicture];
     NSSize imageScaledSize = [fPreviewImage size];
-    [fPictureView setImage: fPreviewImage];
-    
+    [fPictureLayer setContents:fPreviewImage];
+
     NSSize displaySize = NSMakeSize( ( CGFloat )fTitle->width, ( CGFloat )fTitle->height );
     NSString *sizeInfoString;
+
     /* Set the picture size display fields below the Preview Picture*/
+    int output_width, output_height, output_par_width, output_par_height;
+    int display_width;
     if( fTitle->job->anamorphic.mode == 1 ) // Original PAR Implementation
     {
         output_width = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
@@ -265,7 +280,7 @@
         displaySize.width = display_width;
         displaySize.height = fTitle->height;
         imageScaledSize.width = display_width;
-        imageScaledSize.height = output_height;   
+        imageScaledSize.height = output_height;
     }
     else if (fTitle->job->anamorphic.mode == 2) // Loose Anamorphic
     {
@@ -283,7 +298,6 @@
     else if (fTitle->job->anamorphic.mode == 3) // Custom Anamorphic
     {
         hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
-        display_width = output_width * output_par_width / output_par_height;
         sizeInfoString = [NSString stringWithFormat:
                           @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Custom",
                           fTitle->width, fTitle->height, output_width, output_height, fTitle->job->anamorphic.dar_width, fTitle->job->anamorphic.dar_height];
@@ -291,8 +305,8 @@
         displaySize.width = fTitle->job->anamorphic.dar_width + fTitle->job->crop[2] + fTitle->job->crop[3] ;
         displaySize.height = fTitle->job->anamorphic.dar_height + fTitle->job->crop[0] + fTitle->job->crop[1];
         imageScaledSize.width = (int)fTitle->job->anamorphic.dar_width;
-        imageScaledSize.height = (int)fTitle->job->height;   
-    } 
+        imageScaledSize.height = (int)fTitle->job->height;
+    }
     else // No Anamorphic
     {
         sizeInfoString = [NSString stringWithFormat:
@@ -304,113 +318,94 @@
         imageScaledSize.width = fTitle->job->width;
         imageScaledSize.height = fTitle->job->height;
     }
-    
-    
-    
-    NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
-    [self resizeSheetForViewSize:viewSize];
 
-    NSSize windowSize = [[self window] frame].size;    
+    if( backingScaleFactor != 1.0 )
+    {
+        // HiDPI mode usually display everything
+        // with douple pixel count, but we don't
+        // want to double the size of the video
+        displaySize.height /= backingScaleFactor;
+        displaySize.width /= backingScaleFactor;
+        imageScaledSize.height /= backingScaleFactor;
+        imageScaledSize.width /= backingScaleFactor;
+    }
+
+    // Get the optimal view size for the image
+    NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
+    viewSize.width += BORDER_SIZE * 2;
+    viewSize.height += BORDER_SIZE * 2;
     
+    NSSize windowSize;
+    if (scaleToScreen == YES)
+        // Scale the window to the max possible size
+        windowSize = [[[self window] screen] visibleFrame].size;
+    else
+        // Scale the window to the image size
+        windowSize = viewSize;
+
+    [self resizeWindowForViewSize:windowSize];
+    NSSize areaSize = [[[self window] contentView] frame].size;
+    areaSize.width -= BORDER_SIZE * 2;
+    areaSize.height -= BORDER_SIZE * 2;
+
     if (scaleToScreen == YES)
     {
-        /* Note: this should probably become a utility function */
         /* We are in Scale To Screen mode so, we have to get the ratio for height and width against the window
          *size so we can scale from there.
          */
-        CGFloat deltaWidth = imageScaledSize.width / displaySize.width;
-        CGFloat deltaHeight = imageScaledSize.height /displaySize.height;
-        NSSize windowSize = [[self window] frame].size;  
         CGFloat pictureAspectRatio = imageScaledSize.width / imageScaledSize.height;
+        CGFloat areaAspectRatio = areaSize.width / areaSize.height;
         
-        /* Set our min size to the storage size */
-        NSSize minSize;
-        minSize.width = fTitle->width;
-        minSize.height = fTitle->height;
-
-        /* Set delta's based on minimum size */
-        if (imageScaledSize.width <  minSize.width)
-        {
-            deltaWidth = imageScaledSize.width / minSize.width;
-        }
-        else
-        {
-            deltaWidth = 1.0;
-        }
-        
-        if (imageScaledSize.height <  minSize.height)
+        if (pictureAspectRatio > areaAspectRatio)
         {
-            deltaHeight =  imageScaledSize.height / minSize.height;
-        }
-        else
-        {
-            deltaHeight = 1.0;
-        }
-        
-        /* Now apply our deltas to the full screen view */
-        if (pictureAspectRatio > 1.0) // we are wider than taller, so expand the width to fill the area and scale the height
-        {
-            viewSize.width = windowSize.width * deltaWidth;
+            viewSize.width = areaSize.width;
             viewSize.height = viewSize.width / pictureAspectRatio;
-            
         }
         else
         {
-            viewSize.height = windowSize.height * deltaHeight; 
+            viewSize.height = areaSize.height;
             viewSize.width = viewSize.height * pictureAspectRatio;
         }
-        
     }
     else
     {
-        viewSize.width = viewSize.width - (viewSize.width - imageScaledSize.width);
-        viewSize.height = viewSize.height - (viewSize.height - imageScaledSize.height);
-        
-        if (fTitle->width > windowSize.width || fTitle->height > windowSize.height)
+        // If the image is larger then the window, scale the image
+        viewSize = imageScaledSize;
+
+        if (imageScaledSize.width > areaSize.width || imageScaledSize.height > areaSize.height)
         {
-            CGFloat viewSizeAspect = viewSize.width / viewSize.height;
-            if (viewSizeAspect > 1.0) // we are wider than taller, so expand the width to fill the area and scale the height
+            CGFloat pictureAspectRatio = imageScaledSize.width / imageScaledSize.height;
+            CGFloat areaAspectRatio = areaSize.width / areaSize.height;
+            
+            if (pictureAspectRatio > areaAspectRatio)
             {
-                viewSize.width = viewSize.width * (windowSize.width / fTitle->width) ;
-                viewSize.height = viewSize.width / viewSizeAspect;
+                viewSize.width = areaSize.width;
+                viewSize.height = viewSize.width / pictureAspectRatio;
             }
             else
             {
-                viewSize.height = viewSize.height * (windowSize.height / fTitle->height);
-                viewSize.width = viewSize.height * viewSizeAspect;
+                viewSize.height = areaSize.height;
+                viewSize.width = viewSize.height * pictureAspectRatio;
             }
         }
-        
     }
-    
-    [self setViewSize:viewSize];
-    
-    /* relocate our hud origins as per setViewSize */
-    NSPoint hudControlBoxOrigin = [fPictureControlBox frame].origin;
-    hudControlBoxOrigin.y = ([[self window] frame].size.height / 2) - (viewSize.height / 2);
-    hudControlBoxOrigin.x = ([[self window] frame].size.width / 2) - ([fPictureControlBox frame].size.width / 2);
-    [fPictureControlBox setFrameOrigin:hudControlBoxOrigin];
-    [fEncodingControlBox setFrameOrigin:hudControlBoxOrigin];
-    [fMoviePlaybackControlBox setFrameOrigin:hudControlBoxOrigin];
 
+    // Resize the CALayers
+    [fWhiteBackground setBounds:CGRectMake(0, 0, viewSize.width + (BORDER_SIZE * 2), viewSize.height + (BORDER_SIZE * 2))];
+    [fPictureLayer setBounds:CGRectMake(0, 0, viewSize.width, viewSize.height)];
 
     NSString *scaleString;
-    CGFloat scale = ( ( CGFloat )[fPictureView frame].size.width) / ( ( CGFloat )imageScaledSize.width);
+    CGFloat scale = ( ( CGFloat )[fPictureLayer frame].size.width) / ( ( CGFloat )imageScaledSize.width);
     if (scale * 100.0 != 100)
-    {
         scaleString = [NSString stringWithFormat:
                        NSLocalizedString( @" (%.0f%% actual size)",
                                          @"String shown when a preview is scaled" ), scale * 100.0];
-    }
     else
-    {
         scaleString = @"(Actual size)";
-    }
     
     if (scaleToScreen == YES)
-    {
         scaleString = [scaleString stringByAppendingString:@" Scaled To Screen"];
-    }
+
     /* Set the info fields in the hud controller */
     [fInfoField setStringValue: [NSString stringWithFormat:
                                  @"%@", sizeInfoString]];
@@ -423,17 +418,15 @@
 
 - (IBAction) previewDurationPopUpChanged: (id) sender
 {
-    
     [[NSUserDefaults standardUserDefaults] setObject:[fPreviewMovieLengthPopUp titleOfSelectedItem] forKey:@"PreviewLength"];
+}
     
-}    
-    
-- (IBAction) SettingsChanged: (id) sender
+- (IBAction) settingsChanged: (id) sender
 {
-         // Purge the existing picture previews so they get recreated the next time
-        // they are needed.
-        [self purgeImageCache];
-        [self pictureSliderChanged:nil];
+    // Purge the existing picture previews so they get recreated the next time
+    // they are needed.
+    [self purgeImageCache];
+    [self pictureSliderChanged:nil];
 }
 
 - (IBAction) pictureSliderChanged: (id) sender
@@ -442,11 +435,14 @@
     [self cancelCreateMoviePreview:nil];
     
     // Show the picture view
-    [fPictureView setHidden:NO];
-    [fMovieView pause:nil];
-    [fMovieView setHidden:YES];
-	[fMovieView setMovie:nil];
-    [fEncodingControlBox setHidden: YES];
+    if (aMovie)
+    {
+        [fMoviePlaybackControlBox setHidden:YES];
+        [fMovieView pause:nil];
+        [fMovieView setHidden:YES];
+        [fMovieView setMovie:nil];
+        aMovie = nil;
+    }
     
     int newPicture = [fPictureSlider intValue];
     if (newPicture != fPicture)
@@ -457,23 +453,13 @@
     
 }
 
-- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
+- (IBAction)showWindow:(id)sender
 {
-    if ([fPreviewWindow isVisible])
-    {
-        [fPreviewWindow close];
-    }
-    else
-    {
-        [self showWindow:sender];
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PreviewWindowIsOpen"];
-        [fPreviewWindow setAcceptsMouseMovedEvents:YES];
-        scaleToScreen = NO;
-        [self pictureSliderChanged:nil];
-    }
+    if (aMovie)
+        [self startMovieTimer];
     
+    [super showWindow:sender];
 }
-
 - (NSString*) pictureSizeInfoString
 {
     return [fInfoField stringValue];
@@ -495,7 +481,6 @@
     [fScaleToScreenToggleButton setEnabled:YES];
     [fCreatePreviewMovieButton setEnabled:YES];
     [fGoToStillPreviewButton setEnabled:YES];
-    [fHBController writeToActivityLog: "Preview: Enabling HUD Controls"];
 }
 
 - (void) disableHudControls
@@ -504,7 +489,6 @@
     [fScaleToScreenToggleButton setEnabled:NO];
     [fCreatePreviewMovieButton setEnabled:NO];
     [fGoToStillPreviewButton setEnabled:NO];
-    [fHBController writeToActivityLog: "Preview: Disabling HUD Controls"];
 }
 
 - (void) mouseMoved:(NSEvent *)theEvent
@@ -513,12 +497,12 @@
     NSPoint mouseLoc = [theEvent locationInWindow];
     
     /* Test for mouse location to show/hide hud controls */
-    if( isEncoding == NO ) 
+    if( fEncodeState != 1 )
     {
         /* Since we are not encoding, verify which control hud to show
          * or hide based on aMovie ( aMovie indicates we need movie controls )
          */
-        NSBox           * hudBoxToShow;
+        NSBox *hudBoxToShow;
         if ( aMovie == nil ) // No movie loaded up
         {
             hudBoxToShow = fPictureControlBox;
@@ -533,7 +517,7 @@
             [[hudBoxToShow animator] setHidden: NO];
             [self stopHudTimer];
         }
-		else if( NSPointInRect( mouseLoc, [fPictureViewArea frame] ) )
+		else if( NSPointInRect( mouseLoc, [[[self window] contentView] frame] ) )
         {
             [[hudBoxToShow animator] setHidden: NO];
             [self startHudTimer];
@@ -580,8 +564,6 @@
     }
 }
 
-
-
 - (IBAction)toggleScaleToScreen:(id)sender
 {
     if (scaleToScreen == YES)
@@ -601,85 +583,14 @@
     
 }
 
-
-
-// Title-less windows normally don't receive key presses, override this
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
-
-// Title-less windows normally can't become main which means that another
-// non-fullscreen window will have the "active" titlebar in expose. Bad, fix it.
-- (BOOL)canBecomeMainWindow
-{
-    return YES;
-}
-
-
-- (IBAction)goWindowedScreen:(id)sender
-{
-    
-    /* Get the screen info to release the display but don't actually do
-     * it until the windowed screen is setup.
-     */
-    scaleToScreen = NO;
-    [self pictureSliderChanged:nil];
-    [fScaleToScreenToggleButton setTitle:@"<->"];
-        
-    NSScreen* mainScreen = [NSScreen mainScreen]; 
-    NSDictionary* screenInfo = [mainScreen deviceDescription]; 
-    NSNumber* screenID = [screenInfo objectForKey:@"NSScreenNumber"];
-    CGDirectDisplayID displayID = (CGDirectDisplayID)[screenID longValue]; 
-    
-    [fFullScreenWindow dealloc];
-    [fFullScreenWindow release];
-    
-    
-    [fPreviewWindow setContentView:fPictureViewArea]; 
-    [fPictureViewArea setNeedsDisplay:YES];
-    [self setWindow:fPreviewWindow];
-    
-    // Show the window. 
-    [fPreviewWindow makeKeyAndOrderFront:self];
-    
-    /* Set the window back to regular level */
-    [fPreviewWindow setLevel:NSNormalWindowLevel];
-    
-    /* Set the isFullScreen flag back to NO */
-    //isFullScreen = NO;
-    scaleToScreen = NO;
-    /* make sure we are set to a still preview */
-    [self pictureSliderChanged:nil];
-    [self showPreviewWindow:nil];
-    
-    /* Change the name of fFullScreenToggleButton appropriately */
-    //[fFullScreenToggleButton setTitle: @"Full Screen"];
-    // [fScaleToScreenToggleButton setHidden:YES];
-    /* set the picture settings pallete back to normal level */
-    [fHBController picturePanelWindowed];
-    
-    /* Release the display now that the we are back in windowed mode */
-    CGDisplayRelease(displayID);
-    
-    [fPreviewWindow setAcceptsMouseMovedEvents:YES];
-    //[fFullScreenWindow setAcceptsMouseMovedEvents:NO];
-    
-    hudTimerSeconds = 0;
-    [self startHudTimer];
-    
-}
-
-
 #pragma mark Still Preview Image Processing
 
-
 // This function converts an image created by libhb (specified via pictureIndex) into
 // an NSImage suitable for the GUI code to use. If removeBorders is YES,
 // makeImageForPicture crops the image generated by libhb stripping off the gray
 // border around the content. This is the low-level method that generates the image.
 // -imageForPicture calls this function whenever it can't find an image in its cache.
-+ (NSImage *) makeImageForPicture: (int)pictureIndex
++ (NSImage *) makeImageForPicture: (NSInteger)pictureIndex
                 libhb:(hb_handle_t*)handle
                 title:(hb_title_t*)title
 {
@@ -698,7 +609,7 @@
         buffer     = (uint8_t *) realloc( buffer, bufferSize );
     }
 
-    hb_get_preview( handle, title, pictureIndex, buffer );
+    hb_get_preview( handle, title->job, (int)pictureIndex, buffer );
 
     // Create an NSBitmapImageRep and copy the libhb image into it, converting it from
     // libhb's format to one suitable for NSImage. Along the way, we'll strip off the
@@ -744,11 +655,11 @@
 // cache or by calling makeImageForPicture if it is not cached. Generally, you should
 // use imageForPicture so that images are cached. Calling makeImageForPicture will
 // always generate a new copy of the image.
-- (NSImage *) imageForPicture: (int) pictureIndex
+- (NSImage *) imageForPicture: (NSInteger) pictureIndex
 {
     // The preview for the specified index may not currently exist, so this method
     // generates it if necessary.
-    NSString * key = [NSString stringWithFormat:@"%d", pictureIndex];
+    NSNumber * key = [NSNumber numberWithInteger:pictureIndex];
     NSImage * theImage = [fPicturePreviews objectForKey:key];
     if (!theImage)
     {
@@ -765,59 +676,35 @@
     [fPicturePreviews removeAllObjects];
 }
 
- 
-
 #pragma mark Movie Preview
 
 - (IBAction) cancelCreateMoviePreview: (id) sender
 {
-    
     hb_state_t s;
-    hb_get_state2( fPreviewLibhb, &s );
+    hb_get_state2(fPreviewLibhb, &s);
     
-    if(isEncoding && (s.state == HB_STATE_WORKING || s.state == HB_STATE_PAUSED))
+    if (fEncodeState && (s.state == HB_STATE_WORKING ||
+                         s.state == HB_STATE_PAUSED))
     {
-        hb_stop( fPreviewLibhb );
-        [fPictureView setHidden:NO];
-        [fMovieView pause:nil];
-        [fMovieView setHidden:YES];
-		[fMovieView setMovie:nil];
-        [fPictureSlider setHidden:NO];
-        isEncoding = NO;
-        
-        [self pictureSliderChanged:nil];
-        
+        fEncodeState = 2;
+        hb_stop(fPreviewLibhb);
+        hb_system_sleep_allow(fPreviewLibhb);
+        [NSAnimationContext beginGrouping];
+        [[NSAnimationContext currentContext] setDuration:0.2];
+        [[fEncodingControlBox animator] setHidden:YES];
+        [[fPictureControlBox animator] setHidden:NO];
+        [NSAnimationContext endGrouping];
+
         return;
     }
-    
 }
 
 - (IBAction) createMoviePreview: (id) sender
-{
-    
-    
-    /* Lets make sure the still picture previews are showing in case
-     * there is currently a movie showing */
-    [self pictureSliderChanged:nil];
-    
+{    
     /* Rip or Cancel ? */
     hb_state_t s;
     hb_get_state2( fPreviewLibhb, &s );
     
-    if(sender == fCancelPreviewMovieButton && (s.state == HB_STATE_WORKING || s.state == HB_STATE_PAUSED))
-    {
-        hb_stop( fPreviewLibhb );
-        [fPictureView setHidden:NO];
-        [fMovieView pause:nil];
-        [fMovieView setHidden:YES];
-		[fMovieView setMovie:nil];
-        [fPictureSlider setHidden:NO];
-        isEncoding = NO;
-        
-        return;
-    }
-    
-    
     /* we use controller.mm's prepareJobForPreview to go ahead and set all of our settings
      * however, we want to use a temporary destination field of course
      * so that we do not put our temp preview in the users chosen
@@ -861,7 +748,7 @@
     }
     
     /* We now direct our preview encode to fPreviewMoviePath */
-    fTitle->job->file = [fPreviewMoviePath UTF8String];
+    hb_job_set_file(fTitle->job, [fPreviewMoviePath UTF8String]);
     
     /* We use our advance pref to determine how many previews to scan */
     int hb_num_previews = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
@@ -905,17 +792,22 @@
     job->indepth_scan = 0;
     job->pass = 0;
     hb_add( fPreviewLibhb, job );
-    
-    [fEncodingControlBox setHidden: NO];
-    [fPictureControlBox setHidden: YES];
-    
-    [fMovieCreationProgressIndicator setHidden: NO];
-    [fPreviewMovieStatusField setHidden: NO];
-    
-    isEncoding = YES;
+
+    /* we need to clean up the various lists after the job(s) have been set  */
+    hb_job_reset( job );
+
+    [fMovieCreationProgressIndicator setDoubleValue:0];
+
+    [NSAnimationContext beginGrouping];
+    [[NSAnimationContext currentContext] setDuration:0.2];
+    [[fEncodingControlBox animator] setHidden: NO];
+    [[fPictureControlBox animator] setHidden: YES];
+    [NSAnimationContext endGrouping];
 
     /* Let fPreviewLibhb do the job */
-    hb_start( fPreviewLibhb );
+    fEncodeState = 1;
+    hb_system_sleep_prevent(fPreviewLibhb);
+    hb_start(fPreviewLibhb);
 	
 }
 
@@ -942,7 +834,6 @@
     hb_state_t s;
     hb_get_state( fPreviewLibhb, &s );
     [self libhbStateChanged: s];
-    
 }
 
 - (void) libhbStateChanged: (hb_state_t)state
@@ -957,7 +848,6 @@
         case HB_STATE_WORKING:
         {
 #define p state.param.working
-            
             NSMutableString * string;
 			/* Update text field */
 			string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding preview:  %.2f %%", @"" ), 100.0 * p.progress];
@@ -972,23 +862,20 @@
             
             [fMovieCreationProgressIndicator setIndeterminate: NO];
             /* Update slider */
-			[fMovieCreationProgressIndicator setDoubleValue: 100.0 * p.progress];
-            
-            [fCreatePreviewMovieButton setTitle: @"Cancel Preview"];
+            [fMovieCreationProgressIndicator setDoubleValue: 100.0 * p.progress];
             
             break;
             
         }
 #undef p
             
-#define p state.param.muxing            
+#define p state.param.muxing
         case HB_STATE_MUXING:
         {
             // Update fMovieCreationProgressIndicator
             [fMovieCreationProgressIndicator setIndeterminate: YES];
             [fMovieCreationProgressIndicator startAnimation: nil];
-            [fPreviewMovieStatusField setStringValue: [NSString stringWithFormat:
-                                         NSLocalizedString( @"Muxing Preview ...", @"" )]];
+            [fPreviewMovieStatusField setStringValue: NSLocalizedString( @"Muxing Preview ...", @"" )];
             break;
         }
 #undef p			
@@ -1004,18 +891,17 @@
                 hb_rem( fHandle, job );
             
             [fPreviewMovieStatusField setStringValue: @""];
-            [fPreviewMovieStatusField setHidden: YES];
-            
             [fMovieCreationProgressIndicator stopAnimation: nil];
-            [fMovieCreationProgressIndicator setHidden: YES];
-            [fEncodingControlBox setHidden: YES];
-            [fPictureControlBox setHidden: YES];
-            isEncoding = NO;
-
-            // Show the movie view
-            [self showMoviePreview:fPreviewMoviePath];
-            [fCreatePreviewMovieButton setTitle: @"Live Preview"];
 
+            if (fEncodeState != 2)
+            {
+                // Show the movie view
+                [self showMoviePreview:fPreviewMoviePath];
+            }
+            
+            fEncodeState = 0;
+            /* Done encoding, allow system sleep for the preview handle */
+            hb_system_sleep_allow(fPreviewLibhb);
             break;
         }
     }
@@ -1030,18 +916,17 @@
          * object, given that, we detect the rate to determine whether the movie
          * is playing or not.
          */
-        if ([aMovie rate] != 0) // we are playing 
+        if ([self isPlaying]) // we are playing
         {
             [fMovieView pause:aMovie];
-            [fPlayPauseButton setTitle: @">"];
+            [fPlayPauseButton setState: NSOnState];
         }
         else // we are paused or stopped
         {
             [fMovieView play:aMovie];
-            [fPlayPauseButton setTitle: @"||"];   
+            [fPlayPauseButton setState: NSOffState];
         }
     }
-    
 }
 
 - (IBAction) moviePlaybackGoToBeginning: (id) sender
@@ -1050,8 +935,7 @@
     if (aMovie != nil)
     {
         [fMovieView gotoBeginning:aMovie];
-     }
-    
+    }
 }
 
 - (IBAction) moviePlaybackGoToEnd: (id) sender
@@ -1060,8 +944,7 @@
     if (aMovie != nil)
     {
         [fMovieView gotoEnd:aMovie];
-     }
-    
+    }
 }
 
 - (IBAction) moviePlaybackGoBackwardOneFrame: (id) sender
@@ -1072,7 +955,6 @@
         [fMovieView pause:aMovie]; // Pause the movie
         [fMovieView stepBackward:aMovie];
      }
-    
 }
 
 - (IBAction) moviePlaybackGoForwardOneFrame: (id) sender
@@ -1083,10 +965,8 @@
         [fMovieView pause:aMovie]; // Pause the movie
         [fMovieView stepForward:aMovie];
      }
-    
 }
 
-
 - (void) startMovieTimer
 {
 	if( fMovieTimer ) {
@@ -1109,13 +989,28 @@
 
 - (void) movieTimerFired: (NSTimer*)theTimer
 {
-     if (aMovie != nil)
+    if (aMovie != nil)
     {
         [self adjustPreviewScrubberForCurrentMovieTime];
-        [fMovieInfoField setStringValue: [NSString stringWithFormat:NSLocalizedString( @"%@", @"" ),[self calculatePlaybackSMTPETimecodeForDisplay]]];    
+        [fMovieInfoField setStringValue: [self SMTPETimecode:[aMovie currentTime]]];
     }
 }
 
+- (IBAction) showPicturesPreview: (id) sender
+{
+    [fMovieView pause:self];
+    [self stopMovieTimer];
+
+    [NSAnimationContext beginGrouping];
+    [[NSAnimationContext currentContext] setDuration:0.2];
+    [[fMoviePlaybackControlBox animator] setHidden:YES];
+    [[fMovieView animator] setHidden:YES];
+    [[fPictureControlBox animator] setHidden:NO];
+    [NSAnimationContext endGrouping];
+
+    [fMovieView setMovie:nil];
+    aMovie = nil;
+}
 
 
 - (IBAction) showMoviePreview: (NSString *) path
@@ -1130,7 +1025,6 @@
     /* Load the new movie into fMovieView */
     if (path) 
     {
-		//QTMovie * aMovie;
 		NSError	 *outError;
 		NSURL *movieUrl = [NSURL fileURLWithPath:path];
 		NSDictionary *movieAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -1145,36 +1039,22 @@
         
         aMovie = [[[QTMovie alloc] initWithAttributes:movieAttributes error:&outError] autorelease];
         
-        
 		if (!aMovie) 
         {
-			NSLog(@"Unable to open movie");
+            [fHBController writeToActivityLog: "showMoviePreview: Unable to open movie"];
 		}
         else 
         {
             NSRect movieBounds;
+
+            [fMovieView setControllerVisible:NO];
+
             /* we get some size information from the preview movie */
-            NSSize movieSize= [[aMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
+            NSSize movieSize = [[aMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
             movieBounds = [fMovieView movieBounds];
             movieBounds.size.height = movieSize.height;
             /* We also get our view size to use for scaling fMovieView's size */
-            NSSize scaledMovieViewSize = [fPictureView frame].size;
-            [fMovieView setControllerVisible:FALSE];
-            if ([fMovieView isControllerVisible]) 
-            {
-                CGFloat controllerBarHeight = [fMovieView controllerBarHeight];
-                if ( controllerBarHeight != 0 ) //Check if QTKit return a real value or not.
-                {
-                    movieBounds.size.height += controllerBarHeight;
-                    scaledMovieViewSize.height += controllerBarHeight;
-                }
-                else
-                {
-                    movieBounds.size.height += 15;
-                    scaledMovieViewSize.height += 15;
-                }
-            }
-            
+            NSSize scaledMovieViewSize = [fPictureLayer frame].size;
             movieBounds.size.width = movieSize.width;
             
             /* we need to account for an issue where the scaledMovieViewSize > the window size */
@@ -1183,23 +1063,18 @@
                 [fHBController writeToActivityLog: "showMoviePreview: Our window is not tall enough to show the controller bar ..."];
             }
             
-            
-            
             /* Scale the fMovieView to scaledMovieViewSize */
             [fMovieView setFrameSize:scaledMovieViewSize];
             
             /*set our origin try using fPictureViewArea or fPictureView */
-            NSPoint origin = [fPictureView frame].origin;
-            origin.x += trunc( ( [fPictureView frame].size.width -
+            NSPoint origin = [fPictureLayer frame].origin;
+            origin.x += trunc( ( [fPictureLayer frame].size.width -
                                 [fMovieView frame].size.width ) / 2.0 );
-            origin.y += trunc( ( ( [fPictureView frame].size.height -
-                                      [fMovieView frame].size.height ) / 2.0 ) - 7.5 );
+            origin.y += trunc( ( ( [fPictureLayer frame].size.height -
+                                      [fMovieView frame].size.height ) / 2.0 ) );
 
             [fMovieView setFrameOrigin:origin];
             [fMovieView setMovie:aMovie];
-            [fMovieView setHidden:NO];
-            [fMoviePlaybackControlBox setHidden: NO];
-            [fPictureControlBox setHidden: YES];
             
             // get and enable subtitles
             NSArray *subtitlesArray;
@@ -1222,87 +1097,47 @@
             }
             
             // to actually play the movie
-            
+            [NSAnimationContext beginGrouping];
+            [[NSAnimationContext currentContext] setDuration:0.2];
+            [[fEncodingControlBox animator] setHidden: YES];
+            [[fMovieView animator] setHidden:NO];
+            [[fMoviePlaybackControlBox animator] setHidden: NO];
+            [NSAnimationContext endGrouping];
+
             [self initPreviewScrubberForMovie];
             [self startMovieTimer];
             /* Install amovie notifications */
             [aMovie setDelegate:self];
             [self installMovieCallbacks];
             [fMovieView play:aMovie];
-
         }
     }
-    isEncoding = NO;
-}
-#pragma mark *** Movie Playback Scrubber and time code methods ***
-
-/* Since MacOSX Leopard QTKit has taken over some responsibility for assessing movie playback
- * information from the old QuickTime carbon api ( time code information as well as fps, etc.).
- * However, the QTKit devs at apple were not really big on documentation and further ...
- * QuickTimes ability to playback HB's largely variable framerate output makes perfectly frame
- * accurate information at best convoluted. Still, for the purpose of a custom hud based custom
- * playback scrubber slider this has so far proven to be as accurate as I have found. To say it
- * could use some better accuracy is not understating it enough probably.
- * Most of this was gleaned from this obscure Apple Mail list thread:
- * http://www.mailinglistarchive.com/quicktime-api@lists.apple.com/msg05642.html
- * Now as we currently do not show a QTKit control bar with scrubber for display sizes > container
- * size, this seems to facilitate playback control from the HB custom HUD controller fairly close
- * to the built in controller bar.
- * Further work needs to be done to try to get accurate frame by frame playback display if we want it.
- * Note that the keyboard commands for frame by frame step through etc. work as always.
- */ 
-
-// Returns a human readable string from the currentTime of movie playback
-- (NSString*) calculatePlaybackSMTPETimecodeForDisplay
-{
-    QTTime time = [aMovie currentTime];
-    
-    NSString *smtpeTimeCodeString;
-    int days, hour, minute, second, frame;
-    long long result;
-    
-    result = time.timeValue / time.timeScale; // second
-    frame = (time.timeValue % time.timeScale) / 100;
-    
-    second = result % 60;
-    
-    result = result / 60; // minute
-    minute = result % 60;
-    
-    result = result / 60; // hour
-    hour = result % 24;	 
-    days = result;
-    
-    smtpeTimeCodeString = [NSString stringWithFormat:@"Time: %02d:%02d:%02d", hour, minute, second]; // hh:mm:ss
-    return smtpeTimeCodeString;
-    
 }
 
+#pragma mark *** Movie Playback Scrubber and time code methods ***
 
 // Initialize the preview scrubber min/max to appropriate values for the current movie
 -(void) initPreviewScrubberForMovie
 {
     if (aMovie)
     {
-        
         QTTime duration = [aMovie duration];
-        float result = duration.timeValue / duration.timeScale;
+        CGFloat result = duration.timeValue / duration.timeScale;
         
         [fMovieScrubberSlider setMinValue:0.0];
-        [fMovieScrubberSlider setMaxValue: (float)result];
-        [fMovieScrubberSlider setFloatValue: 0.0];
+        [fMovieScrubberSlider setMaxValue: result];
+        [fMovieScrubberSlider setDoubleValue: 0.0];
     }
 }
 
-
 -(void) adjustPreviewScrubberForCurrentMovieTime
 {
     if (aMovie)
     {
         QTTime time = [aMovie currentTime];
         
-        float result = (float)time.timeValue / (float)time.timeScale;;
-        [fMovieScrubberSlider setFloatValue:result];
+        CGFloat result = (CGFloat)time.timeValue / (CGFloat)time.timeScale;;
+        [fMovieScrubberSlider setDoubleValue:result];
     }
 }
 
@@ -1310,28 +1145,43 @@
 {
     if (aMovie)
     {
-        [fMovieView pause:aMovie]; // Pause the movie
-        QTTime time = [aMovie currentTime];
-        [self setTime: time.timeScale * [fMovieScrubberSlider floatValue]];
-        [self calculatePlaybackSMTPETimecodeForDisplay];
+        [fMovieView pause:aMovie];
+        QTTime time = [self SliderToQTTime:[fMovieScrubberSlider doubleValue]];
+        [aMovie setCurrentTime:time];
+        [fMovieInfoField setStringValue: [self SMTPETimecode:time]];
     }
 }
-#pragma mark *** Movie Notifications ***
 
-- (void) installMovieCallbacks
+- (BOOL) isPlaying
 {
+    if (aMovie != nil)
+    {
+        /* For some stupid reason there is no "isPlaying" method for a QTMovie
+         * object, given that, we detect the rate to determine whether the movie
+         * is playing or not.
+         */
+        if ([aMovie rate] != 0.0f) // we are playing
+            return YES;
+        else // we are paused or stopped
+            return NO;
+    }
+    return NO;
+}
 
+#pragma mark *** Movie Notifications ***
 
-/*Notification for any time the movie rate changes */
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(movieRateDidChange:)
-                                                     name:@"QTMovieRateDidChangeNotification"
-                                                   object:aMovie];
-        /*Notification for when the movie ends */
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(movieDidEnd:)
-                                                     name:@"QTMovieDidEndNotification"
-                                                   object:aMovie];
+- (void) installMovieCallbacks
+{
+    /*Notification for any time the movie rate changes */
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(movieRateDidChange:)
+                                                 name:@"QTMovieRateDidChangeNotification"
+                                               object:aMovie];
+    /*Notification for when the movie ends */
+    [[NSNotificationCenter defaultCenter] addObserver:self  
+                                             selector:@selector(movieDidEnd:)
+                                                 name:@"QTMovieDidEndNotification"
+                                               object:aMovie];
 }
 
 - (void)removeMovieCallbacks
@@ -1353,59 +1203,129 @@
 {
     if (aMovie != nil)
     {
-        /* For some stupid reason there is no "isPlaying" method for a QTMovie
-         * object, given that, we detect the rate to determine whether the movie
-         * is playing or not.
-         */
-        //[self adjustPreviewScrubberForCurrentMovieTime];
-        if ([aMovie rate] != 0) // we are playing 
-        {
-            [fPlayPauseButton setTitle: @"||"];
-        }
-        else // we are paused or stopped
-        {
-            [fPlayPauseButton setTitle: @">"];
-        }
+        if ([self isPlaying])
+            [fPlayPauseButton setState: NSOnState];
+        else
+            [fPlayPauseButton setState: NSOffState];
     }
 }
+
 /* This notification is not currently used. However we should keep it "just in case" as
  * live preview playback is enhanced.
  */
 - (void)movieDidEnd:(NSNotification *)notification
 {
-
     //[fHBController writeToActivityLog: "Movie DidEnd Notification Received"];
 }
 
+/* fMovieView Keyboard controls */
+- (void)keyDown:(NSEvent *)event
+{
+    unichar key = [[event charactersIgnoringModifiers] characterAtIndex:0];
+
+    if (aMovie)
+    {
+        if (key == 32)
+        {
+            if ([self isPlaying])
+                [fMovieView pause:aMovie];
+            else
+                [fMovieView play:aMovie];
+        }
+        else if (key == 'k')
+            [fMovieView pause:aMovie];
+        else if (key == 'l')
+        {
+            float rate = [aMovie rate];
+            rate += 1.0f;
+            [fMovieView play:aMovie];
+            [aMovie setRate:rate];
+        }
+        else if (key == 'j')
+        {
+            float rate = [aMovie rate];
+            rate -= 1.0f;
+            [fMovieView play:aMovie];
+            [aMovie setRate:rate];
+        }
+        else if ([event modifierFlags] & NSAlternateKeyMask && key == NSLeftArrowFunctionKey)
+            [fMovieView gotoBeginning:self];
+        else if ([event modifierFlags] & NSAlternateKeyMask && key == NSRightArrowFunctionKey)
+            [fMovieView gotoEnd:self];
+        else if (key == NSLeftArrowFunctionKey)
+            [fMovieView stepBackward:self];
+        else if (key == NSRightArrowFunctionKey)
+            [fMovieView stepForward:self];
+        else
+            [super keyDown:event];
+    }
+    else if (!fEncodeState)
+    {
+        if (key == NSLeftArrowFunctionKey)
+        {
+            [fPictureSlider setIntegerValue:fPicture > [fPictureSlider minValue] ? fPicture - 1 : fPicture];
+            [self pictureSliderChanged:self];
+        }
+        else if (key == NSRightArrowFunctionKey)
+        {
+            [fPictureSlider setIntegerValue:fPicture < [fPictureSlider maxValue] ? fPicture + 1 : fPicture];
+            [self pictureSliderChanged:self];
+        }
+        else
+            [super keyDown:event];
+    }
+    else
+        [super keyDown:event];
+}
 
 #pragma mark *** QTTime Utilities ***
 
 	// convert a time value (long) to a QTTime structure
--(void)timeToQTTime:(long)timeValue resultTime:(QTTime *)aQTTime
+-(QTTime)SliderToQTTime:(double)value
 {
-	NSNumber *timeScaleObj;
-	long timeScaleValue;
-
-	timeScaleObj = [aMovie attributeForKey:QTMovieTimeScaleAttribute];
-	timeScaleValue = [timeScaleObj longValue];
-
-	*aQTTime = QTMakeTime(timeValue, timeScaleValue);
+	long timeScale = [[aMovie attributeForKey:QTMovieTimeScaleAttribute] longValue];
+	return QTMakeTime(value * timeScale, timeScale);
 }
 
-	// set the movie's current time
--(void)setTime:(int)timeValue
-{
-	QTTime movieQTTime;
-	NSValue *valueForQTTime;
-	
-	[self timeToQTTime:timeValue resultTime:&movieQTTime];
-
-	valueForQTTime = [NSValue valueWithQTTime:movieQTTime];
+/* Since MacOSX Leopard QTKit has taken over some responsibility for assessing movie playback
+ * information from the old QuickTime carbon api ( time code information as well as fps, etc.).
+ * However, the QTKit devs at apple were not really big on documentation and further ...
+ * QuickTimes ability to playback HB's largely variable framerate output makes perfectly frame
+ * accurate information at best convoluted. Still, for the purpose of a custom hud based custom
+ * playback scrubber slider this has so far proven to be as accurate as I have found. To say it
+ * could use some better accuracy is not understating it enough probably.
+ * Most of this was gleaned from this obscure Apple Mail list thread:
+ * http://www.mailinglistarchive.com/quicktime-api@lists.apple.com/msg05642.html
+ * Now as we currently do not show a QTKit control bar with scrubber for display sizes > container
+ * size, this seems to facilitate playback control from the HB custom HUD controller fairly close
+ * to the built in controller bar.
+ * Further work needs to be done to try to get accurate frame by frame playback display if we want it.
+ * Note that the keyboard commands for frame by frame step through etc. work as always.
+ */
 
-	[aMovie setAttribute:valueForQTTime forKey:QTMovieCurrentTimeAttribute];
+// Returns a human readable string from the currentTime of movie playback
+- (NSString*) SMTPETimecode:(QTTime)time
+{
+    NSString *smtpeTimeCodeString;
+    int days, hour, minute, second, frame;
+    long long result;
+    
+    result = time.timeValue / time.timeScale; // second
+    frame = (time.timeValue % time.timeScale) / 100;
+    
+    second = result % 60;
+    
+    result = result / 60; // minute
+    minute = result % 60;
+    
+    result = result / 60; // hour
+    hour = result % 24;
+    days = result;
+    
+    smtpeTimeCodeString = [NSString stringWithFormat:@"%02d:%02d:%02d", hour, minute, second]; // hh:mm:ss
+    return smtpeTimeCodeString;
 }
 
-
 @end
 
 @implementation PreviewController (Private)
@@ -1423,56 +1343,16 @@
     CGFloat minHeight = 360.0;
 
     NSSize screenSize = [[[self window] screen] visibleFrame].size;
-    NSSize sheetSize = [[self window] frame].size;
-    NSSize viewAreaSize = [fPictureViewArea frame].size;
-    CGFloat paddingX = 0.00;
-    CGFloat paddingY = 0.00;
-    
-    if (fTitle->width > screenSize.width || fTitle->height > screenSize.height)
-    {
-        if (scaleToScreen == YES)
-        {
-            paddingX = screenSize.width - imageSize.width;
-            paddingY = screenSize.height - imageSize.height;
-        }
-        
-        else
-        {
-            paddingX = sheetSize.width - viewAreaSize.width;
-            paddingY = sheetSize.height - viewAreaSize.height;  
-        }
+    CGFloat maxWidth = screenSize.width;
+    CGFloat maxHeight = screenSize.height;
 
-    }
-    
-    CGFloat maxWidth;
-    CGFloat maxHeight;
-    maxWidth =  screenSize.width - paddingX;
-    maxHeight = screenSize.height - paddingY;
-    
     NSSize resultSize = imageSize;
     CGFloat resultPar = resultSize.width / resultSize.height;
 
     //note, a mbp 15" at 1440 x 900 is a 1.6 ar
     CGFloat screenAspect = screenSize.width / screenSize.height;
-    // Note, a standard dvd will use 720 x 480 which is a 1.5
-    CGFloat viewAreaAspect = viewAreaSize.width / viewAreaSize.height;
-    
-    if (scaleToScreen == YES)
-    {
-        
-        if (screenAspect < viewAreaAspect)
-        {
-            resultSize.width = screenSize.width;
-            resultSize.height = (screenSize.width / viewAreaAspect);
-        }
-        else
-        {
-            resultSize.height = screenSize.height;
-            resultSize.width = resultSize.height * viewAreaAspect;
-        }
-        
-    }
-    else if ( resultSize.width > maxWidth || resultSize.height > maxHeight )
+
+    if ( resultSize.width > maxWidth || resultSize.height > maxHeight )
     {
     	// Source is larger than screen in one or more dimensions
         if ( resultPar > screenAspect )
@@ -1491,56 +1371,51 @@
 
     // If necessary, grow to minimum dimensions to ensure controls overlay is not obstructed
     if ( resultSize.width < minWidth )
-    {
         resultSize.width = minWidth;
-    }
     if ( resultSize.height < minHeight )
-    {
         resultSize.height = minHeight;
-    }
-    
-    return resultSize;
 
-    
+    return resultSize;
 }
 
 //
-// -[PictureController(Private) resizePanelForViewSize:animate:]
+// -[PictureController(Private) resizeWindowForViewSize:]
 //
 // Resizes the entire window to accomodate a view of a particular size.
 //
-- (void)resizeSheetForViewSize: (NSSize)viewSize
+- (void)resizeWindowForViewSize: (NSSize)viewSize
 {
     // Figure out the deltas for the new frame area
-    NSSize currentSize = [fPictureViewArea frame].size;
+    NSSize currentSize = [[[self window] contentView] frame].size;
     CGFloat deltaX = viewSize.width - currentSize.width;
     CGFloat deltaY = viewSize.height - currentSize.height;
     
     // Now resize the whole panel by those same deltas, but don't exceed the min
     NSRect frame = [[self window] frame];
     NSSize maxSize = [[[self window] screen] visibleFrame].size;
-    /* if we are not Scale To Screen, put an 85% of visible screen on the window */
+    /* if we are not Scale To Screen, put an 10% of visible screen on the window */
     if (scaleToScreen == NO )
     {
-        maxSize.width = maxSize.width * 0.85;
-        maxSize.height = maxSize.height * 0.85;
+        maxSize.width = maxSize.width * 0.90;
+        maxSize.height = maxSize.height * 0.90;
     }
     
     /* Set our min size to the storage size */
     NSSize minSize;
-    minSize.width = fTitle->width;
-    minSize.height = fTitle->height;
+    minSize.width = fTitle->width / backingScaleFactor;
+    minSize.height = fTitle->height / backingScaleFactor;
     
     frame.size.width += deltaX;
     frame.size.height += deltaY;
     if( frame.size.width < minSize.width )
     {
         frame.size.width = minSize.width;
+        deltaX = frame.size.width - currentSize.width;
     }
-    
     if( frame.size.height < minSize.height )
     {
         frame.size.height = minSize.height;
+        deltaY = frame.size.height - currentSize.height;
     }
     /* compare frame to max size of screen */
     
@@ -1554,103 +1429,41 @@
         frame.size.height = maxSize.height;
     }
     
-    
-    
-
-    
     // But now the sheet is off-center, so also shift the origin to center it and
     // keep the top aligned.
     if( frame.size.width != [[self window] frame].size.width )
         frame.origin.x -= (deltaX / 2.0);
     
-        
-        /* Since upon launch we can open up the preview window if it was open
-         * the last time we quit (and at the size it was) we want to make
-         * sure that upon resize we do not have the window off the screen
-         * So check the origin against the screen origin and adjust if
-         * necessary.
-         */
-        NSSize screenSize = [[[self window] screen] visibleFrame].size;
-        NSPoint screenOrigin = [[[self window] screen] frame].origin;
-        if (screenSize.height < frame.size.height)
-        {
-            frame.size.height = screenSize.height;
-        }
-        if (screenSize.width < frame.size.width)
-        {
-            frame.size.width = screenSize.width;
-        }
-        
-        
-        /* our origin is off the screen to the left*/
-        if (frame.origin.x < screenOrigin.x)
-        {
-            /* so shift our origin to the right */
-            frame.origin.x = screenOrigin.x;
-        }
-        else if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
-        {
-            /* the right side of the preview is off the screen, so shift to the left */
-            frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
-        }
-        
-        [[self window] setFrame:frame display:YES animate:YES];
-    
-    
-}
-
-//
-// -[PictureController(Private) setViewSize:]
-//
-// Changes the view's size and centers it vertically inside of its area.
-// Assumes resizeSheetForViewSize: has already been called.
-//
-- (void)setViewSize: (NSSize)viewSize
-{   
-    
-    /* special case for scaleToScreen */
-    NSSize areaSize = [fPictureViewArea frame].size;
-    CGFloat viewSizeAspect = viewSize.width / viewSize.height;
-    
-    if (viewSize.width > areaSize.width || viewSize.height > areaSize.height)
+    /* Since upon launch we can open up the preview window if it was open
+     * the last time we quit (and at the size it was) we want to make
+     * sure that upon resize we do not have the window off the screen
+     * So check the origin against the screen origin and adjust if
+     * necessary.
+     */
+    NSSize screenSize = [[[self window] screen] visibleFrame].size;
+    NSPoint screenOrigin = [[[self window] screen] frame].origin;
+    if (screenSize.height < frame.size.height)
     {
-        
-        if (viewSizeAspect > 1.0) // we are wider than taller, so expand the width to fill the area and scale the height
-        {
-            viewSize.width = areaSize.width;
-            viewSize.height = viewSize.width / viewSizeAspect;
-        }
-        else
-        {
-            viewSize.height = areaSize.height;
-            viewSize.width = viewSize.height * viewSizeAspect;
-        }
-        
+        frame.size.height = screenSize.height;
+    }
+    if (screenSize.width < frame.size.width)
+    {
+        frame.size.width = screenSize.width;
     }
     
-    [fPictureView setFrameSize:viewSize];
-    
-    
-    // center it vertically and horizontally
-    NSPoint origin = [fPictureViewArea frame].origin;
-    origin.y += ([fPictureViewArea frame].size.height -
-                 [fPictureView frame].size.height) / 2.0;
-    
-    origin.x += ([fPictureViewArea frame].size.width -
-                 [fPictureView frame].size.width) / 2.0; 
-
-    origin.x = floor( origin.x );
-    origin.y = floor( origin.y );
-    
-    [fPictureView setFrameOrigin:origin];
+    /* our origin is off the screen to the left*/
+    if (frame.origin.x < screenOrigin.x)
+    {
+        /* so shift our origin to the right */
+        frame.origin.x = screenOrigin.x;
+    }
+    else if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
+    {
+        /* the right side of the preview is off the screen, so shift to the left */
+        frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
+    }
     
-}
-
-
-- (BOOL)viewNeedsToResizeToSize: (NSSize)newSize
-{
-    NSSize viewSize = [fPictureViewArea frame].size;
-    return (newSize.width != viewSize.width || newSize.height != viewSize.height);
+    [[self window] setFrame:frame display:YES animate:YES];
 }
 
 @end

HandBrake-0.9.8.tar.bz2/macosx/HBQueueController.mm -> HandBrake-0.9.9.tar.bz2/macosx/HBQueueController.mm Changed

@@ -340,7 +340,7 @@
 
         // Set up a reasonable tooltip, and image
         [toolbarItem setToolTip: @"Start Encoding"];
-        [toolbarItem setImage: [NSImage imageNamed: @"Play"]];
+        [toolbarItem setImage: [NSImage imageNamed: @"encode"]];
 
         // Tell the item what message to send when it is clicked
         [toolbarItem setTarget: self];
@@ -357,7 +357,7 @@
 
         // Set up a reasonable tooltip, and image
         [toolbarItem setToolTip: @"Pause Encoding"];
-        [toolbarItem setImage: [NSImage imageNamed: @"Pause"]];
+        [toolbarItem setImage: [NSImage imageNamed: @"pauseencode"]];
 
         // Tell the item what message to send when it is clicked
         [toolbarItem setTarget: self];
@@ -420,7 +420,7 @@
         if ((s.state == HB_STATE_PAUSED) || (s.state == HB_STATE_WORKING) || (s.state == HB_STATE_MUXING))
         {
             enable = YES;
-            [toolbarItem setImage:[NSImage imageNamed: @"Stop"]];
+            [toolbarItem setImage:[NSImage imageNamed: @"stopencode"]];
             [toolbarItem setLabel: @"Stop"];
             [toolbarItem setToolTip: @"Stop Encoding"];
         }
@@ -428,7 +428,7 @@
         else if (fPendingCount > 0)
         {
             enable = YES;
-            [toolbarItem setImage:[NSImage imageNamed: @"Play"]];
+            [toolbarItem setImage:[NSImage imageNamed: @"encode"]];
             [toolbarItem setLabel: @"Start"];
             [toolbarItem setToolTip: @"Start Encoding"];
         }
@@ -436,7 +436,7 @@
         else
         {
             enable = NO;
-            [toolbarItem setImage:[NSImage imageNamed: @"Play"]];
+            [toolbarItem setImage:[NSImage imageNamed: @"encode"]];
             [toolbarItem setLabel: @"Start"];
             [toolbarItem setToolTip: @"Start Encoding"];
         }
@@ -447,7 +447,7 @@
         if (s.state == HB_STATE_PAUSED)
         {
             enable = YES;
-            [toolbarItem setImage:[NSImage imageNamed: @"Play"]];
+            [toolbarItem setImage:[NSImage imageNamed: @"encode"]];
             [toolbarItem setLabel: @"Resume"];
             [toolbarItem setToolTip: @"Resume Encoding"];
        }
@@ -455,14 +455,14 @@
         else if ((s.state == HB_STATE_WORKING) || (s.state == HB_STATE_MUXING))
         {
             enable = YES;
-            [toolbarItem setImage:[NSImage imageNamed: @"Pause"]];
+            [toolbarItem setImage:[NSImage imageNamed: @"pauseencode"]];
             [toolbarItem setLabel: @"Pause"];
             [toolbarItem setToolTip: @"Pause Encoding"];
         }
         else
         {
             enable = NO;
-            [toolbarItem setImage:[NSImage imageNamed: @"Pause"]];
+            [toolbarItem setImage:[NSImage imageNamed: @"pauseencode"]];
             [toolbarItem setLabel: @"Pause"];
             [toolbarItem setToolTip: @"Pause Encoding"];
         }
@@ -839,66 +839,26 @@
         int itemRowNum = [outlineView rowForItem: item];
         NSMutableDictionary *queueItemToCheck = [outlineView itemAtRow: itemRowNum];
         
-        /* Check to see if we need to allow for mp4 opts */
-        BOOL mp4OptsPresent = NO;
-        if ([[queueItemToCheck objectForKey:@"FileFormat"] isEqualToString: @"MP4 file"])
+        /* Check to see if we need to allow for container options */
+        if ([[queueItemToCheck objectForKey:@"MuxerOptionsSummary"] length])
         {
-            
-            if( [[queueItemToCheck objectForKey:@"Mp4LargeFile"] intValue] == 1)
-            {
-                mp4OptsPresent = YES;
-            }
-            if( [[queueItemToCheck objectForKey:@"Mp4HttpOptimize"] intValue] == 1)
-            {
-                mp4OptsPresent = YES;
-            }
-            if( [[queueItemToCheck objectForKey:@"Mp4iPodCompatible"] intValue] == 1)
-            {
-                mp4OptsPresent = YES;
-            }
-        }
-        
-        if (mp4OptsPresent == YES)
-        {
-            itemHeightForDisplay +=  rowHeightNonTitle;   
+            itemHeightForDisplay += rowHeightNonTitle;
         }
         
         /* check to see if we need to allow for the Picture Filters row */
-        BOOL pictureFiltersPresent = NO;
-        if( [[queueItemToCheck objectForKey:@"PictureDetelecine"] intValue] > 0)
+        if ([[queueItemToCheck objectForKey:@"PictureFiltersSummary"] length])
         {
-            pictureFiltersPresent = YES;
-        }
-        if( [[queueItemToCheck objectForKey:@"PictureDecomb"] intValue] > 0)
-        {
-            pictureFiltersPresent = YES;
-        }
-        if( [[queueItemToCheck objectForKey:@"PictureDeinterlace"] intValue] > 0)
-        {
-            pictureFiltersPresent = YES;
-        }
-        if( [[queueItemToCheck objectForKey:@"PictureDenoise"] intValue] > 0)
-        {
-            pictureFiltersPresent = YES;
-        }
-        if( [[queueItemToCheck objectForKey:@"PictureDeblock"] intValue] > 0)
-        {
-            pictureFiltersPresent = YES;
-        }
-        if( [[queueItemToCheck objectForKey:@"VideoGrayScale"] intValue] > 0)
-        {
-            pictureFiltersPresent = YES;
+            itemHeightForDisplay += rowHeightNonTitle;
         }
         
-        if (pictureFiltersPresent == YES)
+        /* check to see if we need a line to display x264/lavc options */
+        if ([[queueItemToCheck objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"])
         {
-            itemHeightForDisplay +=  rowHeightNonTitle;
+            itemHeightForDisplay += rowHeightNonTitle * 2;
         }
-        
-        /* check to see if we need a line to display x264 options */
-        if ([[queueItemToCheck objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"])
+        else if (![[queueItemToCheck objectForKey:@"VideoEncoder"] isEqualToString: @"VP3 (Theora)"])
         {
-            itemHeightForDisplay +=  rowHeightNonTitle;
+            itemHeightForDisplay += rowHeightNonTitle;
         }
         
         /* check to see how many audio track lines to allow for */
@@ -915,7 +875,7 @@
                 autoPassthruPresent = YES;
             }
 		}
-		itemHeightForDisplay += (actualCountOfAudioTracks * rowHeightNonTitle);
+		itemHeightForDisplay += (actualCountOfAudioTracks * rowHeightNonTitle * 2);
         
         if (autoPassthruPresent == YES)
         {
@@ -1113,33 +1073,14 @@
         [finalString appendString: @"Format: " withAttributes:detailBoldAttr];
         [finalString appendString: jobFormatInfo withAttributes:detailAttr];
         
-        /* Optional String for mp4 options */
-        if ([[item objectForKey:@"FileFormat"] isEqualToString: @"MP4 file"])
+        /* Optional String for muxer options */
+        if ([[item objectForKey:@"MuxerOptionsSummary"] length])
         {
-            NSString * MP4Opts = @"";
-            BOOL mp4OptsPresent = NO;
-            if( [[item objectForKey:@"Mp4LargeFile"] intValue] == 1)
-            {
-                mp4OptsPresent = YES;
-                MP4Opts = [MP4Opts stringByAppendingString:@" - Large file size"];
-            }
-            if( [[item objectForKey:@"Mp4HttpOptimize"] intValue] == 1)
-            {
-                mp4OptsPresent = YES;
-                MP4Opts = [MP4Opts stringByAppendingString:@" - Web optimized"];
-            }
-            
-            if( [[item objectForKey:@"Mp4iPodCompatible"] intValue] == 1)
-            {
-                mp4OptsPresent = YES;
-                MP4Opts = [MP4Opts stringByAppendingString:@" - iPod 5G support "];
-            }
-            if (mp4OptsPresent == YES)
-            {
-                [finalString appendString: @"MP4 Options: " withAttributes:detailBoldAttr];
-                [finalString appendString: MP4Opts withAttributes:detailAttr];
-                [finalString appendString:@"\n" withAttributes:detailAttr];
-            }
+            NSString *containerOptions = [NSString stringWithFormat:@"%@",
+                                          [item objectForKey:@"MuxerOptionsSummary"]];
+            [finalString appendString:@"Container Options: " withAttributes:detailBoldAttr];
+            [finalString appendString:containerOptions       withAttributes:detailAttr];
+            [finalString appendString:@"\n"                  withAttributes:detailAttr];
         }
         
         /* Fourth Line (Destination Path)*/
@@ -1148,121 +1089,24 @@
         [finalString appendString:@"\n" withAttributes:detailAttr];
         
         /* Fifth Line Picture Details*/
-        NSString * pictureInfo;
-        pictureInfo = [NSString stringWithFormat:@"%@", [item objectForKey:@"PictureSizingSummary"]];
+        NSString *pictureInfo = [NSString stringWithFormat:@"%@",
+                                 [item objectForKey:@"PictureSettingsSummary"]];
         if ([[item objectForKey:@"PictureKeepRatio"] intValue] == 1)
         {
             pictureInfo = [pictureInfo stringByAppendingString:@" Keep Aspect Ratio"];
         }
-        
-        if ([[item objectForKey:@"VideoGrayScale"] intValue] == 1)
-        {
-            pictureInfo = [pictureInfo stringByAppendingString:@", Grayscale"];
-        }
-        
-        [finalString appendString: @"Picture: " withAttributes:detailBoldAttr];
-        [finalString appendString: pictureInfo withAttributes:detailAttr];
-        [finalString appendString:@"\n" withAttributes:detailAttr];
+        [finalString appendString:@"Picture: " withAttributes:detailBoldAttr];
+        [finalString appendString:pictureInfo  withAttributes:detailAttr];
+        [finalString appendString:@"\n"        withAttributes:detailAttr];
         
         /* Optional String for Picture Filters */
-        
-        NSString * pictureFilters = @"";
-        BOOL pictureFiltersPresent = NO;
-        
-        if( [[item objectForKey:@"PictureDetelecine"] intValue] == 1)
-        {
-            pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[item objectForKey:@"PictureDetelecineCustom"]]];
-        }
-        else if( [[item objectForKey:@"PictureDetelecine"] intValue] == 2)
-        {
-            pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString:@" - Detelecine (Default)"];
-        }
-        
-        if( [[item objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
-        {
-            if ([[item objectForKey:@"PictureDecomb"] intValue] != 0)
-            {
-                if( [[item objectForKey:@"PictureDecomb"] intValue] == 1)
-                {
-                    pictureFiltersPresent = YES;
-                    pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[item objectForKey:@"PictureDecombCustom"]]];
-                }
-                else if( [[item objectForKey:@"PictureDecomb"] intValue] == 2)
-                {
-                    pictureFiltersPresent = YES;
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Default)"];
-                }
-                else if( [[item objectForKey:@"PictureDecomb"] intValue] == 3)
-                {
-                    pictureFiltersPresent = YES;
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Fast)"];
-                }
-            }
-        }
-        else
-        {
-            if ([[item objectForKey:@"PictureDeinterlace"] intValue] != 0)
-            {
-                pictureFiltersPresent = YES;
-                if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 1)
-                {
-                    pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[item objectForKey:@"PictureDeinterlaceCustom"]]];            
-                }
-                else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 2)
-                {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Fast)"];
-                }
-                else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 3)
-                {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slow)"];           
-                }
-                else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 4)
-                {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slower)"];            
-                }
-                
-            }
-        }
-        if ([[item objectForKey:@"PictureDenoise"] intValue] != 0)
-        {
-            pictureFiltersPresent = YES;
-            if ([[item objectForKey:@"PictureDenoise"] intValue] == 1)
-            {
-                pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[item objectForKey:@"PictureDenoiseCustom"]]];            
-            }
-            else if ([[item objectForKey:@"PictureDenoise"] intValue] == 2)
-            {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Weak)"];
-            }
-            else if ([[item objectForKey:@"PictureDenoise"] intValue] == 3)
-            {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Medium)"];           
-            }
-            else if ([[item objectForKey:@"PictureDenoise"] intValue] == 4)
-            {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Strong)"];            
-            }
-            
-        }
-        if ([[item objectForKey:@"PictureDeblock"] intValue] != 0)
+        if ([[item objectForKey:@"PictureFiltersSummary"] length])
         {
-            pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString: [NSString stringWithFormat:@" - Deblock (pp7) (%d)",[[item objectForKey:@"PictureDeblock"] intValue]]];
-        }
-        
-        if ([[item objectForKey:@"VideoGrayScale"] intValue] == 1)
-        {
-            pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString:@" - Grayscale"];
-        }
-        
-        if (pictureFiltersPresent == YES)
-        {
-            [finalString appendString: @"Filters: " withAttributes:detailBoldAttr];
-            [finalString appendString: pictureFilters withAttributes:detailAttr];
-            [finalString appendString:@"\n" withAttributes:detailAttr];
+            NSString *pictureFilters = [NSString stringWithFormat:@"%@",
+                                        [item objectForKey:@"PictureFiltersSummary"]];
+            [finalString appendString:@"Filters: "   withAttributes:detailBoldAttr];
+            [finalString appendString:pictureFilters withAttributes:detailAttr];
+            [finalString appendString:@"\n"          withAttributes:detailAttr];
         }
         
         /* Sixth Line Video Details*/
@@ -1315,29 +1159,61 @@
         
         if ([[item objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"])
         {
-            [finalString appendString: @"x264 Options: " withAttributes:detailBoldAttr];
-            if ([item objectForKey:@"x264Option"])
+            /* we are using x264 */
+            NSString *x264Info = @"";
+            if ([[item objectForKey:@"x264UseAdvancedOptions"] intValue])
             {
-                [finalString appendString: [item objectForKey:@"x264Option"] withAttributes:detailAttr];
+                // we are using the old advanced panel
+                if ([item objectForKey:@"x264Option"] &&
+                    [[item objectForKey:@"x264Option"] length])
+                {
+                    x264Info = [x264Info stringByAppendingString: [item objectForKey:@"x264Option"]];
+                }
+                else
+                {
+                    x264Info = [x264Info stringByAppendingString: @"default settings"];
+                }
             }
             else
             {
-                [finalString appendString: @"x264 defaults" withAttributes:detailAttr];   
+                // we are using the x264 system
+                x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@"Preset: %@", [item objectForKey:@"x264Preset"]]];
+                if ([[item objectForKey:@"x264Tune"] length])
+                {
+                    x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Tune: %@", [item objectForKey:@"x264Tune"]]];
+                }
+                if ([[item objectForKey:@"x264OptionExtra"] length])
+                {
+                    x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Options: %@", [item objectForKey:@"x264OptionExtra"]]];
+                }
+                if ([[item objectForKey:@"h264Profile"] length])
+                {
+                    x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Profile: %@", [item objectForKey:@"h264Profile"]]];
+                }
+                if ([[item objectForKey:@"h264Level"] length])
+                {
+                    x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Level: %@", [item objectForKey:@"h264Level"]]];
+                }
             }
+            [finalString appendString: @"x264: " withAttributes:detailBoldAttr];
+            [finalString appendString: x264Info withAttributes:detailAttr];
             [finalString appendString:@"\n" withAttributes:detailAttr];
         }
-        /*If we are not x264 and we are not Theora then we must be FFmpeg (lavc) */
         else if (![[item objectForKey:@"VideoEncoder"] isEqualToString: @"VP3 (Theora)"])
         {
-            [finalString appendString: @"FFmpeg (lavc) Options: " withAttributes:detailBoldAttr];
-            if ([item objectForKey:@"lavcOption"])
+            /* we are using libavcodec */
+            NSString *lavcInfo = @"";
+            if ([item objectForKey:@"lavcOption"] &&
+                [[item objectForKey:@"lavcOption"] length])
             {
-                [finalString appendString: [item objectForKey:@"lavcOption"] withAttributes:detailAttr];
+                lavcInfo = [lavcInfo stringByAppendingString: [item objectForKey:@"lavcOption"]];
             }
             else
             {
-                [finalString appendString: @"FFmpeg (lavc) defaults" withAttributes:detailAttr];   
+                lavcInfo = [lavcInfo stringByAppendingString: @"default settings"];
             }
+            [finalString appendString: @"ffmpeg: " withAttributes:detailBoldAttr];
+            [finalString appendString: lavcInfo withAttributes:detailAttr];
             [finalString appendString:@"\n" withAttributes:detailAttr];
         }

HandBrake-0.9.8.tar.bz2/macosx/HBSubtitles.h -> HandBrake-0.9.9.tar.bz2/macosx/HBSubtitles.h Changed

HandBrake-0.9.8.tar.bz2/macosx/HBSubtitles.m -> HandBrake-0.9.9.tar.bz2/macosx/HBSubtitles.m Changed

@@ -3,18 +3,10 @@
    This file is part of the HandBrake source code.
    Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
-//
 
 #import "HBSubtitles.h"
 #include "hb.h"
 
-
-
-
-
-
-
-
 @implementation HBSubtitles
 - (id)init 
 {
@@ -260,12 +252,11 @@
 
 - (void)resetWithTitle:(hb_title_t *)title
 {
-    fTitle = title;
-    
     if (!title)
     {
         return;
     }
+    fTitle = title;
     
     /* reset the subtitle source array */
     if (subtitleSourceArray)
@@ -275,42 +266,71 @@
     subtitleSourceArray = [[NSMutableArray alloc] init];
     
     /* now populate the array with the source subtitle track info */
-    if (fTitle)
+    int i;
+    hb_subtitle_t *subtitle;
+    NSMutableArray *forcedSourceNamesArray = [[NSMutableArray alloc] init];
+    for (i = 0; i < hb_list_count(fTitle->list_subtitle); i++)
+    {
+        subtitle = (hb_subtitle_t*)hb_list_item(fTitle->list_subtitle, i);
+        
+        /* Subtitle source features */
+        int canBeBurnedIn       = hb_subtitle_can_burn(subtitle->source);
+        int supportsForcedFlags = hb_subtitle_can_force(subtitle->source);
+        /* Human-readable representation of subtitle->source */
+        NSString *bitmapOrText  = subtitle->format == PICTURESUB ? @"Bitmap" : @"Text";
+        NSString *subSourceName = [NSString stringWithUTF8String:hb_subsource_name(subtitle->source)];
+        /* if the subtitle track can be forced, add its source name to the array */
+        if (supportsForcedFlags &&
+            [forcedSourceNamesArray containsObject:subSourceName] == NO)
         {
-            hb_subtitle_t *subtitle;
-            hb_subtitle_config_t sub_config;
-            int i;
-            for(i = 0; i < hb_list_count( fTitle->list_subtitle ); i++ )
+            [forcedSourceNamesArray addObject:subSourceName];
+        }
+        
+        /* create a dictionary of source subtitle information to store in our array */
+        NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init];
+        /* Subtitle Source track name */
+        [newSubtitleSourceTrack setObject:[NSString stringWithFormat:@"%d - %@ - (%@) (%@)",
+                                           i, [NSString stringWithUTF8String:subtitle->lang],
+                                           bitmapOrText,subSourceName]
+                                   forKey:@"sourceTrackName"];
+        /* Subtitle Source track number, type and features */
+        [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:i]                   forKey:@"sourceTrackNum"];
+        [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:subtitle->source]    forKey:@"sourceTrackType"];
+        [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:canBeBurnedIn]       forKey:@"sourceTrackCanBeBurnedIn"];
+        [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:supportsForcedFlags] forKey:@"sourceTrackSupportsForcedFlags"];
+        [subtitleSourceArray addObject:newSubtitleSourceTrack];
+        [newSubtitleSourceTrack autorelease];
+    }
+    
+    /* now set the name of the Foreign Audio Search track */
+    if ([forcedSourceNamesArray count])
+    {
+        [forcedSourceNamesArray sortUsingComparator:^(id obj1, id obj2)
+         {
+             return [((NSString*)obj1) compare:((NSString*)obj2)];
+         }];
+        NSString *tempString;
+        NSString *tempList       = @"";
+        NSEnumerator *enumerator = [forcedSourceNamesArray objectEnumerator];
+        while (tempString = (NSString*)[enumerator nextObject])
+        {
+            if ([tempList length])
             {
-                subtitle = (hb_subtitle_t *) hb_list_item( fTitle->list_subtitle, i );
-                sub_config = subtitle->config;
-                
-                int canBeBurnedIn = subtitle->source == VOBSUB || subtitle->source == SSASUB;
-                int supportsForcedFlags = subtitle->source == VOBSUB;
-                
-                /* create a dictionary of source subtitle information to store in our array */
-                NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init];
-                /* Subtitle Source track popup index */
-                [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:i] forKey:@"sourceTrackNum"];
-                /* Human-readable representation of subtitle->source */
-                NSString *subSourceName = [NSString stringWithUTF8String:hb_subsource_name( subtitle->source )];
-                NSString *bitmapOrText = subtitle->source == PICTURESUB ? @"Bitmap" : @"Text";
-                /* Subtitle Source track name */
-                NSString *popupName = [NSString stringWithFormat:@"%d - %@ - (%@) (%@)",i,[NSString stringWithUTF8String:subtitle->lang],bitmapOrText,subSourceName];
-                [newSubtitleSourceTrack setObject:popupName forKey:@"sourceTrackName"];
-                /* Subtitle Source track type (VobSub, Srt, etc.) */
-                [newSubtitleSourceTrack setObject:subSourceName forKey:@"sourceTrackType"];
-                /* Subtitle Source track canBeBurnedIn */
-                [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:canBeBurnedIn] forKey:@"sourceTrackCanBeBurnedIn"];
-                /* Subtitle Source track supportsForcedFlags */
-                [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:supportsForcedFlags] forKey:@"sourceTrackSupportsForcedFlags"];
-                
-                [subtitleSourceArray addObject:newSubtitleSourceTrack];
-                [newSubtitleSourceTrack autorelease];
+                tempList = [tempList stringByAppendingString:@", "];
             }
+            tempList = [tempList stringByAppendingString:tempString];
         }
-    
-    
+        [foreignAudioSearchTrackName release];
+        foreignAudioSearchTrackName = [[NSString stringWithFormat:@"Foreign Audio Search - (Bitmap) (%@)", tempList]
+                                       retain];
+    }
+    else
+    {
+        [foreignAudioSearchTrackName release];
+        foreignAudioSearchTrackName = [[NSString stringWithString:@"Foreign Audio Search - (Bitmap)"]
+                                       retain];
+    }
+    [forcedSourceNamesArray release];
     
     /* reset the subtitle output array */
     if (subtitleArray)
@@ -363,8 +383,8 @@
     /* Subtitle Source track name */
     [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"];
     /* Subtitle Source track type (VobSub, Srt, etc.) */
-    [newSubtitleSourceTrack setObject:@"SRT" forKey:@"sourceTrackType"];
-    [newSubtitleSourceTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
+    [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"sourceTrackType"];
+    [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"subtitleSourceTrackType"];
     /* Subtitle Source file path */
     [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
     /* Subtitle Source track canBeBurnedIn */
@@ -392,8 +412,8 @@
         [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]] forKey:@"subtitleSourceTrackNum"];
     }
     
-    [newSubtitleSrtTrack setObject:@"SRT" forKey:@"sourceTrackType"];
-    [newSubtitleSrtTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
+    [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"sourceTrackType"];
+    [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"subtitleSourceTrackType"];
     /* Subtitle Source track popup language */
     [newSubtitleSrtTrack setObject:displayname forKey:@"subtitleSourceTrackName"];
     /* Subtitle track forced state */
@@ -452,7 +472,7 @@
     while ( tempObject = [enumerator nextObject] )  
     {
         /* We have an srt track */
-        if ([[tempObject objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
+        if ([[tempObject objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
         {
             NSString *filePath = [tempObject objectForKey:@"subtitleSourceSrtFilePath"];
             /* Start replicate the add new srt code above */
@@ -465,8 +485,8 @@
             /* Subtitle Source track name */
             [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"];
             /* Subtitle Source track type (VobSub, Srt, etc.) */
-            [newSubtitleSourceTrack setObject:@"SRT" forKey:@"sourceTrackType"];
-            [newSubtitleSourceTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
+            [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"sourceTrackType"];
+            [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"subtitleSourceTrackType"];
             /* Subtitle Source file path */
             [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
             /* Subtitle Source track canBeBurnedIn */
@@ -530,7 +550,10 @@
         /* Foreign Audio Search (index 1 in the popup) is only available for the first track */
         if (rowIndex == 0)
         {
-            [[cellTrackPopup menu] addItemWithTitle: @"Foreign Audio Search - (Bitmap)" action: NULL keyEquivalent: @""];
+            // TODO: hide the track when no force-able subtitles are present in the source
+            [[cellTrackPopup menu] addItemWithTitle:foreignAudioSearchTrackName
+                                             action:NULL
+                                      keyEquivalent:@""];
         }
         
         int i;
@@ -638,38 +661,49 @@
         /* Set the array to track if we are vobsub (picture sub) */
         if ([anObject intValue] != 0)
         {
-            int sourceSubtitleIndex;
-            
-            if (rowIndex == 0)
-            {
-                sourceSubtitleIndex = [anObject intValue] - 2;
-            }
-            else
-            {
-                sourceSubtitleIndex = [anObject intValue] - 1;
-            }
+            /* The first row has an additional track (Foreign Audio Search) */
+            int sourceSubtitleIndex = [anObject intValue] - 1 - (rowIndex == 0);
             
-            if(rowIndex == 0 && [anObject intValue] == 1) // we are foreign lang search, which is inherently vobsub
+            if(rowIndex == 0 && [anObject intValue] == 1)
             {
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSString stringWithUTF8String:hb_subsource_name( VOBSUB )] forKey:@"subtitleSourceTrackType"];
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleSourceTrackCanBeBurnedIn"];
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleSourceTrackSupportsForcedFlags"];
+                /*
+                 * we are foreign lang search, which is inherently bitmap
+                 *
+                 * since it can be either VOBSUB or PGS and the latter can't be
+                 * passed through to MP4, we need to know whether there are any
+                 * PGS tracks in the source - otherwise we can just set the
+                 * source track type to VOBSUB
+                 */
+                int subtitleTrackType = VOBSUB;
+                if ([foreignAudioSearchTrackName rangeOfString:
+                     [NSString stringWithUTF8String:
+                      hb_subsource_name(PGSSUB)]].location != NSNotFound)
+                {
+                    subtitleTrackType = PGSSUB;
+                }
+                // now set the track type
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:subtitleTrackType] forKey:@"subtitleSourceTrackType"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1]                 forKey:@"subtitleSourceTrackCanBeBurnedIn"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1]                 forKey:@"subtitleSourceTrackSupportsForcedFlags"];
                 // foreign lang search is most useful when combined w/Forced Only - make it default
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackForced"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1]                 forKey:@"subtitleTrackForced"];
             }
             /* check to see if we are an srt, in which case set our file path and source track type kvp's*/
-            else if ([[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"] isEqualToString:@"SRT"])
+            else if ([[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"] intValue] == SRTSUB)
             {
-                [[subtitleArray objectAtIndex:rowIndex] setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceSrtFilePath"] forKey:@"subtitleSourceSrtFilePath"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:SRTSUB]
+                                                           forKey:@"subtitleSourceTrackType"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceSrtFilePath"]
+                                                           forKey:@"subtitleSourceSrtFilePath"];
             }
             else
             {
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"] forKey:@"subtitleSourceTrackType"];
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackCanBeBurnedIn"] intValue]]
-                                                        forKey:@"subtitleSourceTrackCanBeBurnedIn"];
-                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackSupportsForcedFlags"] intValue]]
-                                                        forKey:@"subtitleSourceTrackSupportsForcedFlags"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"]
+                                                           forKey:@"subtitleSourceTrackType"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackCanBeBurnedIn"]
+                                                           forKey:@"subtitleSourceTrackCanBeBurnedIn"];
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackSupportsForcedFlags"]
+                                                           forKey:@"subtitleSourceTrackSupportsForcedFlags"];
             } 
             
             if([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackCanBeBurnedIn"] intValue] == 0)
@@ -769,7 +803,7 @@
          */
         if (container == HB_MUX_MP4 && [anObject intValue] != 0)
         {
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:[NSString stringWithUTF8String:hb_subsource_name( VOBSUB )]])
+            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == VOBSUB)
             {
                 /* lets see if there are currently any burned in subs specified */
                 NSEnumerator *enumerator = [subtitleArray objectEnumerator];
@@ -783,7 +817,7 @@
                     }
                 }
                 /* if we have no current vobsub set to burn it in ... burn it in by default */
-                if(!subtrackBurnedInFound)
+                if (!subtrackBurnedInFound)
                 {
                     [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"];
                     /* Burned In and Default are mutually exclusive */
@@ -858,8 +892,8 @@
         {
             [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackForced"] intValue]];
             /* Disable the "Forced Only" checkbox if a) the track is "None" or b) the subtitle track doesn't support forced flags */
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] == 0 ||
-                [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackSupportsForcedFlags"] intValue] == 0)
+            if (![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] ||
+                ![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackSupportsForcedFlags"] intValue])
             {
                 [aCell setEnabled:NO];
             }
@@ -871,9 +905,15 @@
         else if ([[aTableColumn identifier] isEqualToString:@"burned"])
         {
             [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackBurned"] intValue]];
-            /* Disable the "Burned In" checkbox if a) the track is "None" or b) the subtitle track can't be burned in */
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] == 0 ||
-                [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackCanBeBurnedIn"] intValue] == 0)
+            /*
+             * Disable the "Burned In" checkbox if:
+             * a) the track is "None" OR
+             * b) the subtitle track can't be burned in OR
+             * c) the subtitle track can't be passed through (e.g. PGS w/MP4)
+             */
+            if (![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] ||
+                ![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackCanBeBurnedIn"] intValue] ||
+                !hb_subtitle_can_pass([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue], container))
             {
                 [aCell setEnabled:NO];
             }
@@ -884,13 +924,28 @@
         }
         else if ([[aTableColumn identifier] isEqualToString:@"default"])
         {
-            [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackDefault"] intValue]];   
+            /*
+             * Disable the "Default" checkbox if:
+             * a) the track is "None" OR
+             * b) the subtitle track can't be passed through (e.g. PGS w/MP4)
+             */
+            if (![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] ||
+                !hb_subtitle_can_pass([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue], container))
+            {
+                [aCell setState:NSOffState];
+                [aCell setEnabled:NO];
+            }
+            else
+            {
+                [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackDefault"] intValue]];
+                [aCell setEnabled:YES];
+            }
         }
         /* These next three columns only apply to srt's. they are disabled for source subs */
         else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
         {
             /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
+            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
             {
                 [aCell setEnabled:YES];
                 if([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtLanguageIndex"])
@@ -914,7 +969,7 @@
         else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
         {
             /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
+            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
             {
                 [aCell setEnabled:YES];
                 if ([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtCharCodeIndex"])
@@ -935,7 +990,7 @@
         }
         else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
         {
-            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] isEqualToString:@"SRT"])
+            if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
             {
                 [aCell setEnabled:YES];
             }
@@ -945,8 +1000,65 @@
             }
         }
         
+        /*
+         * Let's check whether any subtitles in the list cannot be passed through.
+         * Set the first of any such subtitles to burned-in, remove the others.
+         */
+        id tempObject;
+        int subtitleTrackType;
+        BOOL convertToBurnInUsed       = NO;
+        NSMutableArray *tracksToDelete = [[NSMutableArray alloc] init];
+        NSEnumerator *enumerator       = [subtitleArray objectEnumerator];
+        /* convert any non-None incompatible tracks to burn-in or remove them */
+        while ((tempObject = [enumerator nextObject]) &&
+               [tempObject objectForKey:@"subtitleSourceTrackType"])
+        {
+            subtitleTrackType = [[tempObject objectForKey:@"subtitleSourceTrackType"] intValue];
+            if (!hb_subtitle_can_pass(subtitleTrackType, container))
+            {
+                if (convertToBurnInUsed == NO)
+                {
+                    /* we haven't set any track to burned-in yet, so we can */
+                    [tempObject setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"];
+                    convertToBurnInUsed = YES; //remove any additional tracks
+                }
+                else
+                {
+                    /* we already have a burned-in track, we must remove others */
+                    [tracksToDelete addObject:tempObject];
+                }
+            }
+        }
+        /* if we converted a track to burned-in, unset it for tracks that support passthru */
+        if (convertToBurnInUsed == YES)
+        {
+            enumerator = [subtitleArray objectEnumerator];
+            while ((tempObject = [enumerator nextObject]) &&
+                   [tempObject objectForKey:@"subtitleSourceTrackType"])
+            {
+                subtitleTrackType = [[tempObject objectForKey:@"subtitleSourceTrackType"] intValue];
+                if (hb_subtitle_can_pass(subtitleTrackType, container))
+                {
+                    [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
+                }
+            }
+        }
+        /* this is where the actual removal takes place */
+        if ([tracksToDelete count] > 0)
+        {
+            [subtitleArray removeObjectsInArray:tracksToDelete];
+            [aTableView reloadData];
+            /* this must be called after reloadData so as to not block the UI */
+            [[NSAlert alertWithMessageText:@"Subtitle tack(s) removed"
+                             defaultButton:@"OK"
+                           alternateButton:nil
+                               otherButton:nil
+                 informativeTextWithFormat:@"%d subtitle %@ could neither be converted to burn-in nor passed through",
+              [tracksToDelete count],
+              [tracksToDelete count] > 1 ? @"tracks" : @"track"] runModal];
+        }
+        [tracksToDelete release];
     }
-     
 }

HandBrake-0.9.8.tar.bz2/macosx/HandBrake.icns -> HandBrake-0.9.9.tar.bz2/macosx/HandBrake.icns Changed

HandBrake-0.9.8.tar.bz2/macosx/HandBrake.xcodeproj/project.pbxproj -> HandBrake-0.9.9.tar.bz2/macosx/HandBrake.xcodeproj/project.pbxproj Changed

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		226268E01572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; };
+		226268E11572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; };
 		273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; };
 		273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202514ADB8A40021BE6D /* libz.dylib */; };
 		273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202714ADB8BE0021BE6D /* libbz2.dylib */; };
@@ -41,16 +43,10 @@
 		273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202F14ADB9790021BE6D /* AudioToolbox.framework */; };
 		273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; };
 		273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; };
-		273F214614ADCBF80021BE6D /* HandBrake-64.icns in Resources */ = {isa = PBXBuildFile; fileRef = 273F211E14ADCBF70021BE6D /* HandBrake-64.icns */; };
-		273F214714ADCBF80021BE6D /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 273F211F14ADCBF70021BE6D /* HandBrake.icns */; };
-		273F214814ADCBF80021BE6D /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F212114ADCBF70021BE6D /* ActivityWindow.tiff */; };
-		273F214914ADCBF80021BE6D /* AddToQueue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F212214ADCBF70021BE6D /* AddToQueue.tiff */; };
-		273F214B14ADCBF80021BE6D /* Brushed_Window.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212414ADCBF70021BE6D /* Brushed_Window.png */; };
 		273F214C14ADCBF80021BE6D /* Delete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212514ADCBF70021BE6D /* Delete.png */; };
 		273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212614ADCBF70021BE6D /* DeleteHighlight.png */; };
 		273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */; };
 		273F214F14ADCBF80021BE6D /* DeletePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212814ADCBF70021BE6D /* DeletePressed.png */; };
-		273F215014ADCBF80021BE6D /* Drawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F212914ADCBF80021BE6D /* Drawer.tiff */; };
 		273F215114ADCBF80021BE6D /* EncodeCanceled.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212A14ADCBF80021BE6D /* EncodeCanceled.png */; };
 		273F215214ADCBF80021BE6D /* EncodeComplete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212B14ADCBF80021BE6D /* EncodeComplete.png */; };
 		273F215314ADCBF80021BE6D /* EncodeWorking0.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212C14ADCBF80021BE6D /* EncodeWorking0.png */; };
@@ -59,23 +55,15 @@
 		273F215614ADCBF80021BE6D /* EncodeWorking3.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212F14ADCBF80021BE6D /* EncodeWorking3.png */; };
 		273F215714ADCBF80021BE6D /* EncodeWorking4.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213014ADCBF80021BE6D /* EncodeWorking4.png */; };
 		273F215814ADCBF80021BE6D /* EncodeWorking5.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213114ADCBF80021BE6D /* EncodeWorking5.png */; };
-		273F215A14ADCBF80021BE6D /* JobLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213314ADCBF80021BE6D /* JobLarge.png */; };
 		273F215B14ADCBF80021BE6D /* JobPassFirstSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */; };
 		273F215D14ADCBF80021BE6D /* JobPassSecondSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */; };
 		273F215F14ADCBF80021BE6D /* JobPassSubtitleSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */; };
 		273F216014ADCBF80021BE6D /* JobPassUnknownSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */; };
 		273F216114ADCBF80021BE6D /* JobSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213A14ADCBF80021BE6D /* JobSmall.png */; };
-		273F216214ADCBF80021BE6D /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213B14ADCBF80021BE6D /* Pause.tiff */; };
-		273F216314ADCBF80021BE6D /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213C14ADCBF80021BE6D /* Play.tiff */; };
-		273F216414ADCBF80021BE6D /* pref-audio.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213D14ADCBF80021BE6D /* pref-audio.tiff */; };
-		273F216514ADCBF80021BE6D /* pref-picture.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213E14ADCBF80021BE6D /* pref-picture.tiff */; };
-		273F216614ADCBF80021BE6D /* Queue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213F14ADCBF80021BE6D /* Queue.tiff */; };
 		273F216714ADCBF80021BE6D /* Reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214014ADCBF80021BE6D /* Reveal.png */; };
 		273F216814ADCBF80021BE6D /* RevealHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214114ADCBF80021BE6D /* RevealHighlight.png */; };
 		273F216914ADCBF80021BE6D /* RevealHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */; };
 		273F216A14ADCBF80021BE6D /* RevealPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214314ADCBF80021BE6D /* RevealPressed.png */; };
-		273F216B14ADCBF80021BE6D /* Source.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F214414ADCBF80021BE6D /* Source.tiff */; };
-		273F216C14ADCBF80021BE6D /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F214514ADCBF80021BE6D /* Stop.tiff */; };
 		273F218A14ADDDA10021BE6D /* AdvancedView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F217A14ADDDA10021BE6D /* AdvancedView.xib */; };
 		273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 273F217C14ADDDA10021BE6D /* InfoPlist.strings */; };
 		273F218C14ADDDA10021BE6D /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F217E14ADDDA10021BE6D /* MainMenu.xib */; };
@@ -100,8 +88,6 @@
 		27D6C74A14B102DA00B785E4 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72B14B102DA00B785E4 /* libavutil.a */; };
 		27D6C74B14B102DA00B785E4 /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; };
 		27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; };
-		27D6C74D14B102DA00B785E4 /* libdca.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72D14B102DA00B785E4 /* libdca.a */; };
-		27D6C74E14B102DA00B785E4 /* libdca.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72D14B102DA00B785E4 /* libdca.a */; };
 		27D6C74F14B102DA00B785E4 /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; };
 		27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; };
 		27D6C75114B102DA00B785E4 /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; };
@@ -138,6 +124,39 @@
 		27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73F14B102DA00B785E4 /* libx264.a */; };
 		27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C74014B102DA00B785E4 /* libxml2.a */; };
 		27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C74014B102DA00B785E4 /* libxml2.a */; };
+		3490BCB41614CF8D002A5AD7 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3490BCB31614CF8D002A5AD7 /* HandBrake.icns */; };
+		46AB433515F98A2B009C0961 /* DockTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 46AB433415F98A2B009C0961 /* DockTextField.m */; };
+		A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */; };
+		A9E1468016BC2AD800C307BC /* next-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467C16BC2AD800C307BC /* next-p.pdf */; };
+		A9E1468116BC2AD800C307BC /* pause-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467D16BC2AD800C307BC /* pause-p.pdf */; };
+		A9E1468216BC2AD800C307BC /* play-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467E16BC2AD800C307BC /* play-p.pdf */; };
+		A9E1468316BC2AD800C307BC /* prev-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467F16BC2AD800C307BC /* prev-p.pdf */; };
+		D2BCB10916F5152C0084604C /* activity.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F616F515230084604C /* activity.png */; };
+		D2BCB10A16F5152C0084604C /* activity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F716F515230084604C /* activity@2x.png */; };
+		D2BCB10B16F5152C0084604C /* addqueue.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F816F515240084604C /* addqueue.png */; };
+		D2BCB10C16F5152C0084604C /* addqueue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F916F515240084604C /* addqueue@2x.png */; };
+		D2BCB10D16F5152C0084604C /* advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0FA16F515250084604C /* advanced.png */; };
+		D2BCB10E16F5152C0084604C /* advanced@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0FB16F515250084604C /* advanced@2x.png */; };
+		D2BCB10F16F5152C0084604C /* audio.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0FC16F515260084604C /* audio.png */; };
+		D2BCB11016F5152C0084604C /* audio@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0FD16F515260084604C /* audio@2x.png */; };
+		D2BCB11116F5152C0084604C /* encode.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0FE16F515270084604C /* encode.png */; };
+		D2BCB11216F5152C0084604C /* encode@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0FF16F515270084604C /* encode@2x.png */; };
+		D2BCB11316F5152C0084604C /* pauseencode.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10016F515280084604C /* pauseencode.png */; };
+		D2BCB11416F5152C0084604C /* pauseencode@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10116F515280084604C /* pauseencode@2x.png */; };
+		D2BCB11516F5152C0084604C /* picturesettings.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10216F515290084604C /* picturesettings.png */; };
+		D2BCB11616F5152C0084604C /* picturesettings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10316F515290084604C /* picturesettings@2x.png */; };
+		D2BCB11716F5152C0084604C /* presets.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10416F5152A0084604C /* presets.png */; };
+		D2BCB11816F5152C0084604C /* presets@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10516F5152A0084604C /* presets@2x.png */; };
+		D2BCB11916F5152C0084604C /* preview.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10616F5152B0084604C /* preview.png */; };
+		D2BCB11A16F5152C0084604C /* preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10716F5152B0084604C /* preview@2x.png */; };
+		D2BCB11B16F5152C0084604C /* settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB10816F5152C0084604C /* settings@2x.png */; };
+		D2BCB12316F5154E0084604C /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB11C16F5154A0084604C /* settings.png */; };
+		D2BCB12416F5154E0084604C /* showqueue.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB11D16F5154B0084604C /* showqueue.png */; };
+		D2BCB12516F5154E0084604C /* showqueue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB11E16F5154B0084604C /* showqueue@2x.png */; };
+		D2BCB12616F5154E0084604C /* source.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB11F16F5154C0084604C /* source.png */; };
+		D2BCB12716F5154E0084604C /* source@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB12016F5154C0084604C /* source@2x.png */; };
+		D2BCB12816F5154E0084604C /* stopencode.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB12116F5154D0084604C /* stopencode.png */; };
+		D2BCB12916F5154E0084604C /* stopencode@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB12216F5154D0084604C /* stopencode@2x.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -181,6 +200,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		226268DF1572CC7300477B4E /* libavresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavresample.a; path = external/contrib/lib/libavresample.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		271BA4C014B119F800BC1D2C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = external/macosx/Info.plist; sourceTree = BUILT_PRODUCTS_DIR; };
 		273F1FFF14ADAE950021BE6D /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; };
 		273F202214ADB8650021BE6D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
@@ -231,16 +251,10 @@
 		273F20BF14ADC1250021BE6D /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
 		273F20C014ADC1250021BE6D /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		273F20C714ADC4FF0021BE6D /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
-		273F211E14ADCBF70021BE6D /* HandBrake-64.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "HandBrake-64.icns"; sourceTree = "<group>"; };
-		273F211F14ADCBF70021BE6D /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
-		273F212114ADCBF70021BE6D /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; };
-		273F212214ADCBF70021BE6D /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; };
-		273F212414ADCBF70021BE6D /* Brushed_Window.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brushed_Window.png; sourceTree = "<group>"; };
 		273F212514ADCBF70021BE6D /* Delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Delete.png; sourceTree = "<group>"; };
 		273F212614ADCBF70021BE6D /* DeleteHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlight.png; sourceTree = "<group>"; };
 		273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; };
 		273F212814ADCBF70021BE6D /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; };
-		273F212914ADCBF80021BE6D /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Drawer.tiff; sourceTree = "<group>"; };
 		273F212A14ADCBF80021BE6D /* EncodeCanceled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeCanceled.png; sourceTree = "<group>"; };
 		273F212B14ADCBF80021BE6D /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; };
 		273F212C14ADCBF80021BE6D /* EncodeWorking0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking0.png; sourceTree = "<group>"; };
@@ -249,23 +263,15 @@
 		273F212F14ADCBF80021BE6D /* EncodeWorking3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking3.png; sourceTree = "<group>"; };
 		273F213014ADCBF80021BE6D /* EncodeWorking4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking4.png; sourceTree = "<group>"; };
 		273F213114ADCBF80021BE6D /* EncodeWorking5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking5.png; sourceTree = "<group>"; };
-		273F213314ADCBF80021BE6D /* JobLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobLarge.png; sourceTree = "<group>"; };
 		273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassFirstSmall.png; sourceTree = "<group>"; };
 		273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSecondSmall.png; sourceTree = "<group>"; };
 		273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSubtitleSmall.png; sourceTree = "<group>"; };
 		273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassUnknownSmall.png; sourceTree = "<group>"; };
 		273F213A14ADCBF80021BE6D /* JobSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobSmall.png; sourceTree = "<group>"; };
-		273F213B14ADCBF80021BE6D /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; };
-		273F213C14ADCBF80021BE6D /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
-		273F213D14ADCBF80021BE6D /* pref-audio.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-audio.tiff"; sourceTree = "<group>"; };
-		273F213E14ADCBF80021BE6D /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-picture.tiff"; sourceTree = "<group>"; };
-		273F213F14ADCBF80021BE6D /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Queue.tiff; sourceTree = "<group>"; };
 		273F214014ADCBF80021BE6D /* Reveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Reveal.png; sourceTree = "<group>"; };
 		273F214114ADCBF80021BE6D /* RevealHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlight.png; sourceTree = "<group>"; };
 		273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlightPressed.png; sourceTree = "<group>"; };
 		273F214314ADCBF80021BE6D /* RevealPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealPressed.png; sourceTree = "<group>"; };
-		273F214414ADCBF80021BE6D /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Source.tiff; sourceTree = "<group>"; };
-		273F214514ADCBF80021BE6D /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; };
 		273F217B14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AdvancedView.xib; sourceTree = "<group>"; };
 		273F217D14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
 		273F217F14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MainMenu.xib; sourceTree = "<group>"; };
@@ -274,10 +280,6 @@
 		273F218514ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = PictureSettings.xib; sourceTree = "<group>"; };
 		273F218714ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Preferences.xib; sourceTree = "<group>"; };
 		273F218914ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Queue.xib; sourceTree = "<group>"; };
-		273F219614ADDE9A0021BE6D /* Brushed Window.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "Brushed Window.tiff"; sourceTree = "<group>"; };
-		273F21A514ADDE9A0021BE6D /* Info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Info.png; sourceTree = "<group>"; };
-		273F21A814ADDE9A0021BE6D /* JobPassLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassLarge.png; sourceTree = "<group>"; };
-		273F21AA14ADDE9A0021BE6D /* JobPassSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSmall.png; sourceTree = "<group>"; };
 		275916DA14B2AB27007211E9 /* native.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = native.xcconfig; sourceTree = "<group>"; };
 		276941FA14B161B70027798C /* osx107.i386.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = osx107.i386.xcconfig; sourceTree = "<group>"; };
 		277A3FD014AE84C500A835E4 /* osx106.i386.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx106.i386.xcconfig; sourceTree = "<group>"; };
@@ -290,7 +292,6 @@
 		27D6C72A14B102DA00B785E4 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = external/contrib/lib/libavformat.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72B14B102DA00B785E4 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = external/contrib/lib/libavutil.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72C14B102DA00B785E4 /* libbluray.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbluray.a; path = external/contrib/lib/libbluray.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		27D6C72D14B102DA00B785E4 /* libdca.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdca.a; path = external/contrib/lib/libdca.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72E14B102DA00B785E4 /* libdvdnav.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdnav.a; path = external/contrib/lib/libdvdnav.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72F14B102DA00B785E4 /* libdvdread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdread.a; path = external/contrib/lib/libdvdread.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73014B102DA00B785E4 /* libfaac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaac.a; path = external/contrib/lib/libfaac.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -309,7 +310,41 @@
 		27D6C73E14B102DA00B785E4 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = external/contrib/lib/libvorbisenc.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73F14B102DA00B785E4 /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = external/contrib/lib/libx264.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C74014B102DA00B785E4 /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = external/contrib/lib/libxml2.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		3490BCB31614CF8D002A5AD7 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
 		34FF2FC014EEC363004C2400 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
+		46AB433315F98A2B009C0961 /* DockTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockTextField.h; sourceTree = "<group>"; };
+		46AB433415F98A2B009C0961 /* DockTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockTextField.m; sourceTree = "<group>"; };
+		A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
+		A9E1467C16BC2AD800C307BC /* next-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "next-p.pdf"; sourceTree = "<group>"; };
+		A9E1467D16BC2AD800C307BC /* pause-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "pause-p.pdf"; sourceTree = "<group>"; };
+		A9E1467E16BC2AD800C307BC /* play-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "play-p.pdf"; sourceTree = "<group>"; };
+		A9E1467F16BC2AD800C307BC /* prev-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "prev-p.pdf"; sourceTree = "<group>"; };
+		D2BCB0F616F515230084604C /* activity.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = activity.png; sourceTree = "<group>"; };
+		D2BCB0F716F515230084604C /* activity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "activity@2x.png"; sourceTree = "<group>"; };
+		D2BCB0F816F515240084604C /* addqueue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = addqueue.png; sourceTree = "<group>"; };
+		D2BCB0F916F515240084604C /* addqueue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "addqueue@2x.png"; sourceTree = "<group>"; };
+		D2BCB0FA16F515250084604C /* advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = advanced.png; sourceTree = "<group>"; };
+		D2BCB0FB16F515250084604C /* advanced@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "advanced@2x.png"; sourceTree = "<group>"; };
+		D2BCB0FC16F515260084604C /* audio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = audio.png; sourceTree = "<group>"; };
+		D2BCB0FD16F515260084604C /* audio@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "audio@2x.png"; sourceTree = "<group>"; };
+		D2BCB0FE16F515270084604C /* encode.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = encode.png; sourceTree = "<group>"; };
+		D2BCB0FF16F515270084604C /* encode@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "encode@2x.png"; sourceTree = "<group>"; };
+		D2BCB10016F515280084604C /* pauseencode.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pauseencode.png; sourceTree = "<group>"; };
+		D2BCB10116F515280084604C /* pauseencode@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pauseencode@2x.png"; sourceTree = "<group>"; };
+		D2BCB10216F515290084604C /* picturesettings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = picturesettings.png; sourceTree = "<group>"; };
+		D2BCB10316F515290084604C /* picturesettings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "picturesettings@2x.png"; sourceTree = "<group>"; };
+		D2BCB10416F5152A0084604C /* presets.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = presets.png; sourceTree = "<group>"; };
+		D2BCB10516F5152A0084604C /* presets@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "presets@2x.png"; sourceTree = "<group>"; };
+		D2BCB10616F5152B0084604C /* preview.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preview.png; sourceTree = "<group>"; };
+		D2BCB10716F5152B0084604C /* preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "preview@2x.png"; sourceTree = "<group>"; };
+		D2BCB10816F5152C0084604C /* settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings@2x.png"; sourceTree = "<group>"; };
+		D2BCB11C16F5154A0084604C /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = "<group>"; };
+		D2BCB11D16F5154B0084604C /* showqueue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = showqueue.png; sourceTree = "<group>"; };
+		D2BCB11E16F5154B0084604C /* showqueue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "showqueue@2x.png"; sourceTree = "<group>"; };
+		D2BCB11F16F5154C0084604C /* source.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = source.png; sourceTree = "<group>"; };
+		D2BCB12016F5154C0084604C /* source@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "source@2x.png"; sourceTree = "<group>"; };
+		D2BCB12116F5154D0084604C /* stopencode.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = stopencode.png; sourceTree = "<group>"; };
+		D2BCB12216F5154D0084604C /* stopencode@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stopencode@2x.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -328,9 +363,9 @@
 				27D6C74414B102DA00B785E4 /* libass.a in Frameworks */,
 				27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */,
 				27D6C74814B102DA00B785E4 /* libavformat.a in Frameworks */,
+				226268E11572CC7300477B4E /* libavresample.a in Frameworks */,
 				27D6C74A14B102DA00B785E4 /* libavutil.a in Frameworks */,
 				27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */,
-				27D6C74E14B102DA00B785E4 /* libdca.a in Frameworks */,
 				27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */,
 				27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */,
 				27D6C75414B102DA00B785E4 /* libfaac.a in Frameworks */,
@@ -356,6 +391,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */,
 				273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */,
 				273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */,
 				273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */,
@@ -370,9 +406,9 @@
 				27D6C74314B102DA00B785E4 /* libass.a in Frameworks */,
 				27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */,
 				27D6C74714B102DA00B785E4 /* libavformat.a in Frameworks */,
+				226268E01572CC7300477B4E /* libavresample.a in Frameworks */,
 				27D6C74914B102DA00B785E4 /* libavutil.a in Frameworks */,
 				27D6C74B14B102DA00B785E4 /* libbluray.a in Frameworks */,
-				27D6C74D14B102DA00B785E4 /* libdca.a in Frameworks */,
 				27D6C74F14B102DA00B785E4 /* libdvdnav.a in Frameworks */,
 				27D6C75114B102DA00B785E4 /* libdvdread.a in Frameworks */,
 				27D6C75314B102DA00B785E4 /* libfaac.a in Frameworks */,
@@ -405,9 +441,9 @@
 				27D6C72814B102DA00B785E4 /* libass.a */,
 				27D6C72914B102DA00B785E4 /* libavcodec.a */,
 				27D6C72A14B102DA00B785E4 /* libavformat.a */,
+				226268DF1572CC7300477B4E /* libavresample.a */,
 				27D6C72B14B102DA00B785E4 /* libavutil.a */,
 				27D6C72C14B102DA00B785E4 /* libbluray.a */,
-				27D6C72D14B102DA00B785E4 /* libdca.a */,
 				27D6C72E14B102DA00B785E4 /* libdvdnav.a */,
 				27D6C72F14B102DA00B785E4 /* libdvdread.a */,
 				27D6C73014B102DA00B785E4 /* libfaac.a */,
@@ -477,6 +513,7 @@
 		273F203414ADBAC30021BE6D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */,
 				273F20C714ADC4FF0021BE6D /* QTKit.framework */,
 				273F202F14ADB9790021BE6D /* AudioToolbox.framework */,
 				273F203B14ADBC210021BE6D /* Cocoa.framework */,
@@ -507,6 +544,8 @@
 				273F208D14ADBE670021BE6D /* ChapterTitles.m */,
 				273F208E14ADBE670021BE6D /* Controller.h */,
 				273F208F14ADBE670021BE6D /* Controller.m */,
+				46AB433315F98A2B009C0961 /* DockTextField.h */,
+				46AB433415F98A2B009C0961 /* DockTextField.m */,
 				34FF2FC014EEC363004C2400 /* HBAdvancedController.h */,
 				273F209014ADBE670021BE6D /* HBAdvancedController.m */,
 				273F209114ADBE670021BE6D /* HBAudio.h */,
@@ -541,10 +580,9 @@
 		273F20CD14ADC8E60021BE6D /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				3490BCB31614CF8D002A5AD7 /* HandBrake.icns */,
 				273F217914ADDDA10021BE6D /* English.lproj */,
 				273F212014ADCBF70021BE6D /* icons */,
-				273F211E14ADCBF70021BE6D /* HandBrake-64.icns */,
-				273F211F14ADCBF70021BE6D /* HandBrake.icns */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -561,14 +599,40 @@
 		273F212014ADCBF70021BE6D /* icons */ = {
 			isa = PBXGroup;
 			children = (
-				273F212114ADCBF70021BE6D /* ActivityWindow.tiff */,
-				273F212214ADCBF70021BE6D /* AddToQueue.tiff */,
-				273F212414ADCBF70021BE6D /* Brushed_Window.png */,
+				D2BCB11C16F5154A0084604C /* settings.png */,
+				D2BCB11D16F5154B0084604C /* showqueue.png */,
+				D2BCB11E16F5154B0084604C /* showqueue@2x.png */,
+				D2BCB11F16F5154C0084604C /* source.png */,
+				D2BCB12016F5154C0084604C /* source@2x.png */,
+				D2BCB12116F5154D0084604C /* stopencode.png */,
+				D2BCB12216F5154D0084604C /* stopencode@2x.png */,
+				D2BCB0F616F515230084604C /* activity.png */,
+				D2BCB0F716F515230084604C /* activity@2x.png */,
+				D2BCB0F816F515240084604C /* addqueue.png */,
+				D2BCB0F916F515240084604C /* addqueue@2x.png */,
+				D2BCB0FA16F515250084604C /* advanced.png */,
+				D2BCB0FB16F515250084604C /* advanced@2x.png */,
+				D2BCB0FC16F515260084604C /* audio.png */,
+				D2BCB0FD16F515260084604C /* audio@2x.png */,
+				D2BCB0FE16F515270084604C /* encode.png */,
+				D2BCB0FF16F515270084604C /* encode@2x.png */,
+				D2BCB10016F515280084604C /* pauseencode.png */,
+				D2BCB10116F515280084604C /* pauseencode@2x.png */,
+				D2BCB10216F515290084604C /* picturesettings.png */,
+				D2BCB10316F515290084604C /* picturesettings@2x.png */,
+				D2BCB10416F5152A0084604C /* presets.png */,
+				D2BCB10516F5152A0084604C /* presets@2x.png */,
+				D2BCB10616F5152B0084604C /* preview.png */,
+				D2BCB10716F5152B0084604C /* preview@2x.png */,
+				D2BCB10816F5152C0084604C /* settings@2x.png */,
+				A9E1467C16BC2AD800C307BC /* next-p.pdf */,
+				A9E1467D16BC2AD800C307BC /* pause-p.pdf */,
+				A9E1467E16BC2AD800C307BC /* play-p.pdf */,
+				A9E1467F16BC2AD800C307BC /* prev-p.pdf */,
 				273F212514ADCBF70021BE6D /* Delete.png */,
 				273F212614ADCBF70021BE6D /* DeleteHighlight.png */,
 				273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */,
 				273F212814ADCBF70021BE6D /* DeletePressed.png */,
-				273F212914ADCBF80021BE6D /* Drawer.tiff */,
 				273F212A14ADCBF80021BE6D /* EncodeCanceled.png */,
 				273F212B14ADCBF80021BE6D /* EncodeComplete.png */,
 				273F212C14ADCBF80021BE6D /* EncodeWorking0.png */,
@@ -577,23 +641,15 @@
 				273F212F14ADCBF80021BE6D /* EncodeWorking3.png */,
 				273F213014ADCBF80021BE6D /* EncodeWorking4.png */,
 				273F213114ADCBF80021BE6D /* EncodeWorking5.png */,
-				273F213314ADCBF80021BE6D /* JobLarge.png */,
 				273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */,
 				273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */,
 				273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */,
 				273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */,
 				273F213A14ADCBF80021BE6D /* JobSmall.png */,
-				273F213B14ADCBF80021BE6D /* Pause.tiff */,
-				273F213C14ADCBF80021BE6D /* Play.tiff */,
-				273F213D14ADCBF80021BE6D /* pref-audio.tiff */,
-				273F213E14ADCBF80021BE6D /* pref-picture.tiff */,
-				273F213F14ADCBF80021BE6D /* Queue.tiff */,
 				273F214014ADCBF80021BE6D /* Reveal.png */,
 				273F214114ADCBF80021BE6D /* RevealHighlight.png */,
 				273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */,
 				273F214314ADCBF80021BE6D /* RevealPressed.png */,
-				273F214414ADCBF80021BE6D /* Source.tiff */,
-				273F214514ADCBF80021BE6D /* Stop.tiff */,
 			);
 			path = icons;
 			sourceTree = "<group>";
@@ -624,10 +680,6 @@
 		273F219314ADDE9A0021BE6D /* icons */ = {
 			isa = PBXGroup;
 			children = (
-				273F219614ADDE9A0021BE6D /* Brushed Window.tiff */,
-				273F21A514ADDE9A0021BE6D /* Info.png */,
-				273F21A814ADDE9A0021BE6D /* JobPassLarge.png */,
-				273F21AA14ADDE9A0021BE6D /* JobPassSmall.png */,
 			);
 			path = icons;
 			sourceTree = "<group>";
@@ -743,16 +795,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				273F214614ADCBF80021BE6D /* HandBrake-64.icns in Resources */,
-				273F214714ADCBF80021BE6D /* HandBrake.icns in Resources */,
-				273F214814ADCBF80021BE6D /* ActivityWindow.tiff in Resources */,
-				273F214914ADCBF80021BE6D /* AddToQueue.tiff in Resources */,
-				273F214B14ADCBF80021BE6D /* Brushed_Window.png in Resources */,
 				273F214C14ADCBF80021BE6D /* Delete.png in Resources */,
 				273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */,
 				273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */,
 				273F214F14ADCBF80021BE6D /* DeletePressed.png in Resources */,
-				273F215014ADCBF80021BE6D /* Drawer.tiff in Resources */,
 				273F215114ADCBF80021BE6D /* EncodeCanceled.png in Resources */,
 				273F215214ADCBF80021BE6D /* EncodeComplete.png in Resources */,
 				273F215314ADCBF80021BE6D /* EncodeWorking0.png in Resources */,
@@ -761,23 +807,15 @@
 				273F215614ADCBF80021BE6D /* EncodeWorking3.png in Resources */,
 				273F215714ADCBF80021BE6D /* EncodeWorking4.png in Resources */,
 				273F215814ADCBF80021BE6D /* EncodeWorking5.png in Resources */,
-				273F215A14ADCBF80021BE6D /* JobLarge.png in Resources */,
 				273F215B14ADCBF80021BE6D /* JobPassFirstSmall.png in Resources */,
 				273F215D14ADCBF80021BE6D /* JobPassSecondSmall.png in Resources */,
 				273F215F14ADCBF80021BE6D /* JobPassSubtitleSmall.png in Resources */,
 				273F216014ADCBF80021BE6D /* JobPassUnknownSmall.png in Resources */,
 				273F216114ADCBF80021BE6D /* JobSmall.png in Resources */,
-				273F216214ADCBF80021BE6D /* Pause.tiff in Resources */,
-				273F216314ADCBF80021BE6D /* Play.tiff in Resources */,
-				273F216414ADCBF80021BE6D /* pref-audio.tiff in Resources */,
-				273F216514ADCBF80021BE6D /* pref-picture.tiff in Resources */,
-				273F216614ADCBF80021BE6D /* Queue.tiff in Resources */,
 				273F216714ADCBF80021BE6D /* Reveal.png in Resources */,
 				273F216814ADCBF80021BE6D /* RevealHighlight.png in Resources */,
 				273F216914ADCBF80021BE6D /* RevealHighlightPressed.png in Resources */,
 				273F216A14ADCBF80021BE6D /* RevealPressed.png in Resources */,
-				273F216B14ADCBF80021BE6D /* Source.tiff in Resources */,
-				273F216C14ADCBF80021BE6D /* Stop.tiff in Resources */,
 				273F218A14ADDDA10021BE6D /* AdvancedView.xib in Resources */,
 				273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */,
 				273F218C14ADDDA10021BE6D /* MainMenu.xib in Resources */,
@@ -786,6 +824,37 @@
 				273F218F14ADDDA10021BE6D /* PictureSettings.xib in Resources */,
 				273F219014ADDDA10021BE6D /* Preferences.xib in Resources */,
 				273F219114ADDDA10021BE6D /* Queue.xib in Resources */,
+				3490BCB41614CF8D002A5AD7 /* HandBrake.icns in Resources */,
+				A9E1468016BC2AD800C307BC /* next-p.pdf in Resources */,
+				A9E1468116BC2AD800C307BC /* pause-p.pdf in Resources */,
+				A9E1468216BC2AD800C307BC /* play-p.pdf in Resources */,
+				A9E1468316BC2AD800C307BC /* prev-p.pdf in Resources */,
+				D2BCB10916F5152C0084604C /* activity.png in Resources */,
+				D2BCB10A16F5152C0084604C /* activity@2x.png in Resources */,
+				D2BCB10B16F5152C0084604C /* addqueue.png in Resources */,
+				D2BCB10C16F5152C0084604C /* addqueue@2x.png in Resources */,
+				D2BCB10D16F5152C0084604C /* advanced.png in Resources */,
+				D2BCB10E16F5152C0084604C /* advanced@2x.png in Resources */,
+				D2BCB10F16F5152C0084604C /* audio.png in Resources */,
+				D2BCB11016F5152C0084604C /* audio@2x.png in Resources */,
+				D2BCB11116F5152C0084604C /* encode.png in Resources */,
+				D2BCB11216F5152C0084604C /* encode@2x.png in Resources */,
+				D2BCB11316F5152C0084604C /* pauseencode.png in Resources */,
+				D2BCB11416F5152C0084604C /* pauseencode@2x.png in Resources */,
+				D2BCB11516F5152C0084604C /* picturesettings.png in Resources */,
+				D2BCB11616F5152C0084604C /* picturesettings@2x.png in Resources */,
+				D2BCB11716F5152C0084604C /* presets.png in Resources */,
+				D2BCB11816F5152C0084604C /* presets@2x.png in Resources */,
+				D2BCB11916F5152C0084604C /* preview.png in Resources */,
+				D2BCB11A16F5152C0084604C /* preview@2x.png in Resources */,
+				D2BCB11B16F5152C0084604C /* settings@2x.png in Resources */,
+				D2BCB12316F5154E0084604C /* settings.png in Resources */,
+				D2BCB12416F5154E0084604C /* showqueue.png in Resources */,
+				D2BCB12516F5154E0084604C /* showqueue@2x.png in Resources */,
+				D2BCB12616F5154E0084604C /* source.png in Resources */,
+				D2BCB12716F5154E0084604C /* source@2x.png in Resources */,
+				D2BCB12816F5154E0084604C /* stopencode.png in Resources */,
+				D2BCB12916F5154E0084604C /* stopencode@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -822,6 +891,7 @@
 				273F20B914ADBE670021BE6D /* HBSubtitles.m in Sources */,
 				273F20BA14ADBE670021BE6D /* PictureController.m in Sources */,
 				273F20BE14ADC09F0021BE6D /* main.mm in Sources */,
+				46AB433515F98A2B009C0961 /* DockTextField.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -961,7 +1031,10 @@
 		273F200814ADAE950021BE6D /* debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+				HEADER_SEARCH_PATHS = (
+					"\"$(EXTERNAL_BUILD)/libhb\"",
+					"\"$(EXTERNAL_BUILD)/contrib/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -974,7 +1047,10 @@
 		273F200914ADAE950021BE6D /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+				HEADER_SEARCH_PATHS = (
+					"\"$(EXTERNAL_BUILD)/libhb\"",
+					"\"$(EXTERNAL_BUILD)/contrib/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -991,7 +1067,10 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+				HEADER_SEARCH_PATHS = (
+					"\"$(EXTERNAL_BUILD)/libhb\"",
+					"\"$(EXTERNAL_BUILD)/contrib/include\"",
+				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1010,7 +1089,10 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+				HEADER_SEARCH_PATHS = (
+					"\"$(EXTERNAL_BUILD)/libhb\"",
+					"\"$(EXTERNAL_BUILD)/contrib/include\"",
+				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",

HandBrake-0.9.8.tar.bz2/macosx/Info.plist.m4 -> HandBrake-0.9.9.tar.bz2/macosx/Info.plist.m4 Changed

HandBrake-0.9.8.tar.bz2/macosx/PictureController.h -> HandBrake-0.9.9.tar.bz2/macosx/PictureController.h Changed

HandBrake-0.9.8.tar.bz2/macosx/PictureController.m -> HandBrake-0.9.9.tar.bz2/macosx/PictureController.m Changed

@@ -1041,12 +1041,11 @@
     [fCropRightStepper  setIntValue: job->crop[3]];
     [fCropRightField    setIntValue: job->crop[3]];
     
-    //[fPreviewController SetTitle:fTitle];
-    
-    /* Sanity Check Here for < 16 px preview to avoid
-     crashing hb_get_preview. In fact, just for kicks
-     lets getting previews at a min limit of 32, since
-     no human can see any meaningful detail below that */
+    /*
+     * Sanity-check here for previews < 16 pixels to avoid crashing
+     * hb_get_preview(). In fact, let's get previews at least 64 pixels in both
+     * dimensions; no human can see any meaningful detail below that.
+     */
     if (job->width >= 64 && job->height >= 64)
     {
         [self reloadStillPreview];
@@ -1073,27 +1072,8 @@
 }
 
 - (void)reloadStillPreview
-{ 
-   hb_job_t * job = fTitle->job; 
-   
-   [fPreviewController SetTitle:fTitle];
-    /* Sanity Check Here for < 16 px preview to avoid
-     crashing hb_get_preview. In fact, just for kicks
-     lets getting previews at a min limit of 32, since
-     no human can see any meaningful detail below that */
-    if (job->width >= 64 && job->height >= 64)
-    {
-       
-         // Purge the existing picture previews so they get recreated the next time
-        // they are needed.
-      //  [fPreviewController purgeImageCache];
-        /* We actually call displayPreview now from pictureSliderChanged which keeps
-         * our picture preview slider in sync with the previews being shown
-         */
-
-    //[fPreviewController pictureSliderChanged:nil];
-    }
-    
+{
+    [fPreviewController SetTitle:fTitle];
 }
 
 
@@ -1137,6 +1117,7 @@
     [fDecombPopUp addItemWithTitle: @"Custom"];
     [fDecombPopUp addItemWithTitle: @"Default"];
     [fDecombPopUp addItemWithTitle: @"Fast"];
+    [fDecombPopUp addItemWithTitle: @"Bob"];
     
     [fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
     
@@ -1146,7 +1127,8 @@
     [fDeinterlacePopUp addItemWithTitle: @"Custom"];
     [fDeinterlacePopUp addItemWithTitle: @"Fast"];
     [fDeinterlacePopUp addItemWithTitle: @"Slow"];
-	[fDeinterlacePopUp addItemWithTitle: @"Slower"];
+    [fDeinterlacePopUp addItemWithTitle: @"Slower"];
+    [fDeinterlacePopUp addItemWithTitle: @"Bob"];
     
 	/* Set deinterlaces level according to the integer in the main window */
 	[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
@@ -1231,6 +1213,8 @@
     
     fPictureFilterSettings.grayscale = [fGrayscaleCheck state];
     
+    [self decombDeinterlacePreviewImage];
+    
     if (sender != nil)
     {
         [fHBController pictureSettingsDidChange];
@@ -1239,7 +1223,45 @@
 
 }
 
-
+- (void) decombDeinterlacePreviewImage
+{
+    /* XXX: make sure we actually have a title before de-referencing it */
+    if (fTitle == NULL)
+    {
+        return;
+    }
+    
+    if ([fDecombDeinterlaceSlider floatValue] < 0.50)
+    {
+        /* Since Libhb only shows a deinterlaced preview image via deinterlace .. for decomb we
+         do a quick switch to get libhb to show a deinterlaced image if needed even though deinterlace
+         has not been changed by the user. so we temporarily switch deinterace accoring to decomb then
+         call reloadStillPreview quickly and then switch deinterlace back to its proper state.
+         */
+        
+        // decomb is chosen
+        if (fPictureFilterSettings.decomb > 0)
+        {
+            /* Temporarily turn on deinterlacing .... */
+            fTitle->job->deinterlace  = 1;
+            /* Grab a still preview ... */
+            [self reloadStillPreview];
+            /* ... then reset deinterlace back to where specified in the ui */
+            fTitle->job->deinterlace  = [fDeinterlacePopUp indexOfSelectedItem];
+            
+        }
+        else
+        {
+            [self reloadStillPreview];   
+        }
+        
+    }
+    else
+    {
+        fTitle->job->deinterlace  = [fDeinterlacePopUp indexOfSelectedItem];
+        [self reloadStillPreview];
+    }
+}
 #pragma mark -
 
 - (IBAction) deblockSliderChanged: (id) sender

HandBrake-0.9.9.tar.bz2/macosx/icons/activity.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/activity@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/addqueue.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/addqueue@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/advanced.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/advanced@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/audio.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/audio@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/encode.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/encode@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/next-p.pdf Added

HandBrake-0.9.9.tar.bz2/macosx/icons/pause-p.pdf Added

HandBrake-0.9.9.tar.bz2/macosx/icons/pauseencode.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/pauseencode@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/picturesettings.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/picturesettings@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/play-p.pdf Added

HandBrake-0.9.9.tar.bz2/macosx/icons/presets.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/presets@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/prev-p.pdf Added

HandBrake-0.9.9.tar.bz2/macosx/icons/preview.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/preview@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/settings.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/settings@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/showqueue.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/showqueue@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/source.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/source@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/stopencode.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/stopencode@2x.png Added

HandBrake-0.9.8.tar.bz2/macosx/main.mm -> HandBrake-0.9.9.tar.bz2/macosx/main.mm Changed

@@ -23,10 +23,10 @@
  * this is the only place I could find that looked like C :)
 ****************************************************************************/
 extern "C" {
-void hb_error_handler( const char *errmsg )
-{
-    fprintf(stderr, "GUI ERROR dialog: %s\n", errmsg );
-}
+    void hb_error_handler( const char *errmsg )
+    {
+         fprintf(stderr, "GUI ERROR dialog: %s\n", errmsg );
+    }
 }
 
 char * str_printf(const char *fmt, ...)
@@ -64,80 +64,8 @@
     }
 }
 
-#define EXTRA_VLC_DYLD_PATH "/Applications/VLC.app/Contents/MacOS/lib"
-#define DEFAULT_DYLD_PATH "/usr/local/lib:/usr/lib"
-
 int main( int argc, const char ** argv )
 {
-    char *dylib_path;
-    int no_exec = 0;
-
-    // Check for flag that prevents exec bomb.  It
-    // incidentally can be used to prevent adding
-    // our modifications to the dyld env vars.
-    if ( argc > 1 && strncmp(argv[1], "-n", 2) == 0 )
-        no_exec = 1;
-
-    if ( !no_exec )
-    {
-        dylib_path = getenv("DYLD_FALLBACK_LIBRARY_PATH");
-        if ( dylib_path == NULL ||
-             strstr( dylib_path, "/Applications/VLC.app/Contents/MacOS/lib" ) == NULL )
-        {
-            char *path = NULL;
-            char *home;
-            int result = -1;
-
-            home = getenv("HOME");
-
-            if ( dylib_path == NULL )
-            {
-                // Set the system default of $HOME/lib:/usr/local/lib:/usr/lib
-                // And add our extra path
-                if ( home != NULL )
-                {
-                    path = str_printf("%s/lib:%s:%s:%s%s", home, 
-                                      DEFAULT_DYLD_PATH, 
-                                      EXTRA_VLC_DYLD_PATH, 
-                                      home, EXTRA_VLC_DYLD_PATH);
-                }
-                else
-                {
-                    path = str_printf("%s:%s", DEFAULT_DYLD_PATH, EXTRA_VLC_DYLD_PATH);
-                }
-                if ( path != NULL )
-                    result = setenv("DYLD_FALLBACK_LIBRARY_PATH", path, 1);
-            }
-            else
-            {
-                // add our extra path
-                if ( home != NULL )
-                {
-                    path = str_printf("%s:%s:%s%s", dylib_path, EXTRA_VLC_DYLD_PATH,
-                                                        home, EXTRA_VLC_DYLD_PATH);
-                }
-                else
-                {
-                    path = str_printf("%s:%s", dylib_path, EXTRA_VLC_DYLD_PATH);
-                }
-                if ( path != NULL )
-                    result = setenv("DYLD_FALLBACK_LIBRARY_PATH", path, 1);
-            }
-            if ( result == 0 )
-            {
-                const char ** new_argv;
-                int i;
-
-                new_argv = (const char**)malloc( (argc + 2) * sizeof(char*) );
-                new_argv[0] = argv[0];
-                new_argv[1] = "-n";
-                for (i = 1; i < argc; i++)
-                    new_argv[i+1] = argv[i];
-                new_argv[i+1] = NULL;
-                execv(new_argv[0], (char* const*)new_argv);
-            }
-        }
-    }
     signal( SIGINT, SigHandler );
     hb_register_error_handler(&hb_error_handler);
     return NSApplicationMain( argc, argv );

HandBrake-0.9.8.tar.bz2/macosx/module.defs -> HandBrake-0.9.9.tar.bz2/macosx/module.defs Changed

HandBrake-0.9.8.tar.bz2/make/config.guess -> HandBrake-0.9.9.tar.bz2/make/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-09-18'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -56,8 +54,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +179,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +222,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -333,6 +335,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +396,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +482,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +496,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,7 +553,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -591,52 +596,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -727,22 +732,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -766,14 +771,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,13 +790,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -800,19 +804,22 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -854,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -863,7 +877,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -875,23 +889,40 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-gnu
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -918,15 +949,11 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -952,7 +979,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -960,14 +987,17 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -976,11 +1006,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1012,7 +1042,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1040,13 +1070,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1081,8 +1111,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1125,10 +1155,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1154,11 +1184,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1223,6 +1253,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1268,13 +1301,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1292,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1314,11 +1350,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif

HandBrake-0.9.8.tar.bz2/make/configure.py -> HandBrake-0.9.9.tar.bz2/make/configure.py Changed

@@ -570,6 +570,8 @@
                 self.mode.mode = 'ppc64'
         elif host.match( '*-*-linux*' ):
             pass
+        elif host.match( '*-*-solaris*' ):
+            pass
         else:
             self.msg_pass = 'WARNING'
 
@@ -697,7 +699,7 @@
         self.root      = 'svn://nowhere.com/project'
         self.branch    = 'unknown'
         self.uuid      = '00000000-0000-0000-0000-000000000000';
-        self.rev       = 4860
+        self.rev       = 5474
         self.date      = '0000-00-00 00:00:00 -0000'
         self.official  = 0
         self.type      = 'unofficial'
@@ -764,7 +766,7 @@
 
         self.vmajor = 0
         self.vminor = 9
-        self.vpoint = 8
+        self.vpoint = 9
 
     def _action( self ):
         ## add architecture to URL only for Mac
@@ -816,6 +818,7 @@
         self.name = self.names[0]
         self.pretext = self.name
         self.pathname = self.names[0]
+        self.minversion = kwargs.get('minversion', None)
 
     def _action( self ):
         self.session = []
@@ -830,6 +833,8 @@
                 break
         if self.fail:
             self.msg_end = 'not found'
+        elif self.minversion:
+            self.version = VersionProbe( [self.pathname, '--version'], minversion=self.minversion )
 
     def cli_add_option( self, parser ):
         parser.add_option( '--'+self.name, metavar='PROG',
@@ -845,6 +850,93 @@
 
 ###############################################################################
 
+###############################################################################
+##
+## version probe: passes --version to command and only cares about first line
+## of output. If probe fails, a default version of '0.0.0' results.
+## The default rexpr is useful for some very simple version strings. A Custom
+## expression would be required for more complex version strings.
+##
+## command = full command and arguments to pipe
+## rexpr   = a regular expression which must return named subgroups:
+##              name: mandatory. The tool name.
+##              svers: mandatory. The whole version tuple to be represented as string.
+##              i0: mandatory. First element of version tuple to be parsed as int.
+##              i1: optional. Second element of version tuple to be parsed as int.
+##              i2: optional. Third element of version tuple to be parsed as int.
+##           All matching is case-insensitive.
+## abort   = if true configure will exit on probe fail
+## session = result. array of lines (stdout/stderr) from command
+## fail    = result. true if probe failed
+## svers   = result. string of version tuple
+## ivers   = result. int[3] of version tuple
+##
+class VersionProbe( Action ):
+    def __init__( self, command, minversion=None, rexpr=None, abort=False ):
+        super( VersionProbe, self ).__init__( 'version probe', os.path.basename(command[0]), abort )
+        self.command = command
+        self.minversion = minversion
+        if not rexpr:
+            rexpr = '(?P<name>[^.]+)\s+(?P<svers>(?P<i0>\d+)(\.(?P<i1>\d+))?(\.(?P<i2>\d+))?)'
+        self.rexpr = rexpr
+
+    def _action( self ):
+        ## pipe and redirect stderr to stdout; effects communicate result
+        pipe = subprocess.Popen( self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
+
+        ## read data into memory buffers
+        data = pipe.communicate()
+        self.fail = pipe.returncode != 0
+
+        if data[0]:
+            self.session = data[0].splitlines()
+        else:
+            self.session = []
+
+        self.svers = '0.0.0'
+        self.ivers = [0,0,0]
+
+        try:
+            if not self.fail and self.session and len(self.session):
+                self.fail = True
+                self._parse()
+            self.fail = False
+            self.msg_end = self.svers
+        except Exception, x:
+            self.svers = '0.0.0'
+            self.ivers = [0,0,0]
+            self.msg_end = str(x)
+
+    def _dumpSession( self, printf ):
+        printf( '  + %s\n', ' '.join(self.command) )
+        super( VersionProbe, self )._dumpSession( printf )
+
+    def _parse( self ):
+        mo = re.match( self.rexpr, self.session[0], re.IGNORECASE )
+        md = mo.groupdict()
+        self.svers = md['svers']
+        if 'i0' in md and md['i0']:
+            self.ivers[0] = int(md['i0'])
+        if 'i1' in md and md['i1']:
+            self.ivers[1] = int(md['i1'])
+        if 'i2' in md and md['i2']:
+            self.ivers[2] = int(md['i2'])
+
+    def inadequate( self ):
+        if not self.minversion:
+            return False
+        return self.lesser( self.minversion )
+
+    def lesser( self, ivers ):
+        for i in range(0,3):
+            if self.ivers[i] < ivers[i]:
+                return True
+            elif self.ivers[i] > ivers[i]:
+                return False
+        return False
+
+###############################################################################
+
 class SelectTool( Action ):
     selects = []
 
@@ -1084,6 +1176,9 @@
     h = IfHost( 'enable use of ffmpeg mpeg2 decoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value
     grp.add_option( '--enable-ff-mpeg2', default=False, action='store_true', help=h )
 
+    h = IfHost( 'enable use of fdk-aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+    grp.add_option( '--enable-fdk-aac', default=False, action='store_true', help=h )
+
     cli.add_option_group( grp )
 
     ## add launch options
@@ -1111,6 +1206,8 @@
 
     h = IfHost( 'Build and use local yasm', '*-*-*', none=optparse.SUPPRESS_HELP ).value
     grp.add_option( '--enable-local-yasm', default=False, action='store_true', help=h )
+    h = IfHost( 'Build and use local autotools', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+    grp.add_option( '--enable-local-autotools', default=False, action='store_true', help=h )
 
     cli.add_option_group( grp )
 
@@ -1269,15 +1366,18 @@
         else:
             gmake = ToolProbe( 'GMAKE.exe', 'gmake', 'make' )
 
-        m4     = ToolProbe( 'M4.exe',     'm4' )
-        mkdir  = ToolProbe( 'MKDIR.exe',  'mkdir' )
-        patch  = ToolProbe( 'PATCH.exe',  'gpatch', 'patch' )
-        rm     = ToolProbe( 'RM.exe',     'rm' )
-        ranlib = ToolProbe( 'RANLIB.exe', 'ranlib' )
-        strip  = ToolProbe( 'STRIP.exe',  'strip' )
-        tar    = ToolProbe( 'TAR.exe',    'gtar', 'tar' )
-        wget   = ToolProbe( 'WGET.exe',   'wget', abort=False )
-        yasm   = ToolProbe( 'YASM.exe',   'yasm', abort=False )
+        m4       = ToolProbe( 'M4.exe',       'm4' )
+        mkdir    = ToolProbe( 'MKDIR.exe',    'mkdir' )
+        patch    = ToolProbe( 'PATCH.exe',    'gpatch', 'patch' )
+        rm       = ToolProbe( 'RM.exe',       'rm' )
+        ranlib   = ToolProbe( 'RANLIB.exe',   'ranlib' )
+        strip    = ToolProbe( 'STRIP.exe',    'strip' )
+        tar      = ToolProbe( 'TAR.exe',      'gtar', 'tar' )
+        wget     = ToolProbe( 'WGET.exe',     'wget', abort=False )
+        yasm     = ToolProbe( 'YASM.exe',     'yasm', abort=False, minversion=[1,2,0] )
+        autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
+        automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
+        libtool  = ToolProbe( 'LIBTOOL.exe',  'libtool', abort=False )
 
         xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
         lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
@@ -1334,9 +1434,20 @@
     for action in Action.actions:
         action.run()
 
-    ## enable local yasm when yasm probe fails
-    if Tools.yasm.fail and not options.enable_local_yasm:
-        options.enable_local_yasm = True
+    ## enable local yasm when yasm probe fails or version is too old
+    ## x264 requires 1.2.0+
+    if not options.enable_local_yasm:
+        if Tools.yasm.fail:
+            stdout.write( 'note: enabling local yasm: missing system yasm\n' )
+            options.enable_local_yasm = True
+        elif Tools.yasm.version.inadequate():
+            stdout.write( 'note: enabling local yasm: minimum required version is %s and %s is %s\n' % ('.'.join([str(i) for i in Tools.yasm.version.minversion]),Tools.yasm.pathname,Tools.yasm.version.svers) )
+            options.enable_local_yasm = True
+
+    ## enable local autotools when any of { autoconf, automake, libtool } probe fails
+    if not options.enable_local_autotools and (Tools.autoconf.fail or Tools.automake.fail or Tools.libtool.fail):
+        stdout.write( 'note: enabling local autotools\n' )
+        options.enable_local_autotools = True
 
     if build.system == 'mingw':
         dlfcn_test = """
@@ -1499,13 +1610,15 @@
     doc.add( 'PREFIX/', cfg.prefix_final + os.sep )
     
     doc.addBlank()
-    doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ) )
+    doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ))
+    doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools ))
     doc.add( 'FEATURE.asm',        'disabled' )
     doc.add( 'FEATURE.gtk',        int( not options.disable_gtk ))
     doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks ))
     doc.add( 'FEATURE.gtk.mingw',  int( options.enable_gtk_mingw ))
     doc.add( 'FEATURE.gst',        int( not options.disable_gst ))
     doc.add( 'FEATURE.ff.mpeg2',   int( options.enable_ff_mpeg2 ))
+    doc.add( 'FEATURE.fdk_aac',   int( options.enable_fdk_aac ))
     doc.add( 'FEATURE.xcode',      int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) ))
 
     if not Tools.xcodebuild.fail and not options.disable_xcode:

HandBrake-0.9.8.tar.bz2/make/include/contrib.defs -> HandBrake-0.9.9.tar.bz2/make/include/contrib.defs Changed

@@ -19,7 +19,8 @@
     ##
     $(1).src/   = $$(SRC/)contrib/$($(1).name)/
     $(1).build/ = $$(CONTRIB.build/)$($(1).name)/
-    $(1).deps   = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target))
+    ## add prerequisites and autotool modules for all contribs
+    $(1).deps   = $$(foreach n,$($(1).prerequisites) $(if $(filter $1,$(AUTOTOOL_MODULES)),,$(AUTOTOOL_MODULES)),$$($$n.INSTALL.target))
 
     ##
     ## target: fetch
@@ -46,9 +47,9 @@
     ##
     ## target: patch
     ##
-    $(1).PATCH.srcs = $$(wildcard \
+    $(1).PATCH.srcs = $$(sort $$(wildcard \
         $$($(1).src/)A??-*.patch \
-        $$($(1).src/)P??-$$(BUILD.system)*.patch )
+        $$($(1).src/)P??-$$(BUILD.system)*.patch ))
 
     # extra line feed is required
     define $(1).PATCH.item
@@ -90,18 +91,18 @@
     ## debug=max or optimizations=none.  Otherwise, use the contribs defaults
     ifeq (max,$$($(1).GCC.g))
         ifeq (none,$$($(1).GCC.O))
-            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O)"
-            $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O)"
+            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
+            $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
         else
-            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g)"
-            $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g)"
+            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
+            $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
         endif
     else
-        $(1).CONFIGURE.env.CFLAGS   = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
-        $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
+        $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
+        $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
     endif
-    $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
-    $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe)"
+    $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
+    $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)"
     $(1).CONFIGURE.env.PKG_CONFIG_PATH  = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig"
 
     $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH

HandBrake-0.9.8.tar.bz2/make/include/main.defs -> HandBrake-0.9.9.tar.bz2/make/include/main.defs Changed

@@ -8,6 +8,17 @@
 
 ###############################################################################
 
+ifeq (1,$(FEATURE.local_autotools))
+    MODULES += contrib/autoconf
+    MODULES += contrib/automake
+    MODULES += contrib/libtool
+    MODULES += contrib/m4
+    AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4
+    PATH := $(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)
+else
+    AUTOTOOL_MODULES =
+endif
+
 MODULES += contrib/a52dec
 
 ifneq (,$(filter $(BUILD.system),cygwin mingw))
@@ -17,26 +28,28 @@
 endif
 
 ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+    MODULES += contrib/fontconfig
+    MODULES += contrib/freetype
     MODULES += contrib/fribidi
+    MODULES += contrib/libxml2
+    MODULES += contrib/libass
+    MODULES += contrib/libogg
+    MODULES += contrib/libvorbis
+    MODULES += contrib/libtheora
+    MODULES += contrib/libsamplerate
 endif
 
+ifeq (1,$(FEATURE.fdk_aac))
+    MODULES += contrib/fdk-aac
+endif
 
+MODULES += contrib/lame
 MODULES += contrib/faac
 MODULES += contrib/ffmpeg
-MODULES += contrib/fontconfig
-MODULES += contrib/freetype
-MODULES += contrib/lame
-MODULES += contrib/libass
-MODULES += contrib/libdca
 MODULES += contrib/libdvdread
 MODULES += contrib/libdvdnav
 MODULES += contrib/libbluray
 MODULES += contrib/libmkv
-MODULES += contrib/libogg
-MODULES += contrib/libsamplerate
-MODULES += contrib/libtheora
-MODULES += contrib/libvorbis
-MODULES += contrib/libxml2
 MODULES += contrib/mp4v2
 MODULES += contrib/mpeg2dec

HandBrake-0.9.8.tar.bz2/make/variant/mingw.defs -> HandBrake-0.9.9.tar.bz2/make/variant/mingw.defs Changed

HandBrake-0.9.8.tar.bz2/make/xcodemake -> HandBrake-0.9.9.tar.bz2/make/xcodemake Changed

HandBrake-0.9.8.tar.bz2/pkg/appcast.xml.m4 -> HandBrake-0.9.9.tar.bz2/pkg/appcast.xml.m4 Changed

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.maverick Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkit-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkit-1.0-2, libnotify1
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.9.8.tar.bz2/pkg/linux/debian/control.natty -> HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.natty Changed

HandBrake-0.9.8.tar.bz2/pkg/linux/debian/control.oneiric -> HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.oneiric Changed

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.precise Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkitgtk-1.0-0, libnotify4
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.quantal Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, subversion, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.raring Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, subversion, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.natty Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --enable-local-yasm --disable-gtk-update-checks --prefix=/usr
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zbzip2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.oneiric Added

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.precise Added

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.quantal Added

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.raring Added

HandBrake-0.9.8.tar.bz2/pkg/linux/module.defs -> HandBrake-0.9.9.tar.bz2/pkg/linux/module.defs Changed

HandBrake-0.9.8.tar.bz2/pkg/linux/module.rules -> HandBrake-0.9.9.tar.bz2/pkg/linux/module.rules Changed

@@ -1,6 +1,21 @@
 pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb)
 pkg.create.rpm:: $(PKG.gui.rpm)
 pkg.create.src.deb:: $(PKG.src.deb.stamp)
+pkg.create.tar:: pkg.create $(PKG.cli.tar)
+
+#
+# CLI Tar Package
+#
+
+$(PKG.cli.tar): | $(dir $(PKG.cli.tar))
+$(PKG.cli.tar): | $(STAGE.out.cli/)
+	cd $(STAGE.out.cli/) && $(TAR.exe) cjf $(call fn.ABSOLUTE,$(PKG.cli.tar)) .
+
+
+$(STAGE.out.cli/):
+	-$(MKDIR.exe) -p $@
+	$(CP.exe) HandBrakeCLI $(STAGE.out.cli/)
+	$(call STAGE.doc,$(STAGE.out.cli/))
 
 #
 # RPM binary package rules
@@ -61,18 +76,55 @@
 # Debian source package rules
 #
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
+	(cd $(STAGE.out.src/)raring && dput handbrake-snapshots handbrake_$(HB.version)ppa1~raring1_source.changes )
+	(cd $(STAGE.out.src/)quantal && dput handbrake-snapshots handbrake_$(HB.version)ppa1~quantal1_source.changes )
+	(cd $(STAGE.out.src/)precise && dput handbrake-snapshots handbrake_$(HB.version)ppa1~precise1_source.changes )
 	(cd $(STAGE.out.src/)oneiric && dput handbrake-snapshots handbrake_$(HB.version)ppa1~oneiric1_source.changes )
-	(cd $(STAGE.out.src/)natty && dput handbrake-snapshots handbrake_$(HB.version)ppa1~natty1_source.changes )
-	(cd $(STAGE.out.src/)maverick && dput handbrake-snapshots handbrake_$(HB.version)ppa1~maverick1_source.changes )
-	(cd $(STAGE.out.src/)lucid && dput handbrake-snapshots handbrake_$(HB.version)ppa1~lucid1_source.changes )
 
 $(PKG.src.deb.stamp): GNUmakefile
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
+	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)raring/$(PKG.deb.basename)
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)raring/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)raring/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/control.raring $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/rules.raring $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/rules
+	echo "handbrake ($(HB.version)ppa1~raring1) raring; urgency=low" > $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
+	echo "  * Snapshot" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
+	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)raring/$(PKG.src.deb.tar) -C $(STAGE.out.src/)raring $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)raring/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)quantal/$(PKG.deb.basename)
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)quantal/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)quantal/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/control.quantal $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/rules.quantal $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/rules
+	echo "handbrake ($(HB.version)ppa1~quantal1) quantal; urgency=low" > $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
+	echo "  * Snapshot" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
+	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)quantal/$(PKG.src.deb.tar) -C $(STAGE.out.src/)quantal $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)quantal/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)precise/$(PKG.deb.basename)
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)precise/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)precise/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/control.precise $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/rules.precise $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/rules
+	echo "handbrake ($(HB.version)ppa1~precise1) precise; urgency=low" > $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
+	echo "  * Snapshot" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
+	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)precise/$(PKG.src.deb.tar) -C $(STAGE.out.src/)precise $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)precise/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
 	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
 	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
 	$(CP.exe) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/control.oneiric $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/rules.oneiric $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/rules
 	echo "handbrake ($(HB.version)ppa1~oneiric1) oneiric; urgency=low" > $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
 	echo "  * Snapshot" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
 	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
@@ -80,40 +132,3 @@
 	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
 	$(TAR.exe) czf $(STAGE.out.src/)oneiric/$(PKG.src.deb.tar) -C $(STAGE.out.src/)oneiric $(PKG.deb.basename)
 	(cd $(STAGE.out.src/)oneiric/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)natty/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)natty/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)natty/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/control.natty $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/control
-	echo "handbrake ($(HB.version)ppa1~natty1) natty; urgency=low" > $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/changelog
-	echo "  * Snapshot" >> $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/changelog
-	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)natty/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)natty/$(PKG.src.deb.tar) -C $(STAGE.out.src/)natty $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)natty/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)maverick/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)maverick/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)maverick/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control.karmic $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control
-	echo "handbrake ($(HB.version)ppa1~maverick1) maverick; urgency=low" > $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
-	echo "  * Snapshot" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
-	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)maverick/$(PKG.src.deb.tar) -C $(STAGE.out.src/)maverick $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)maverick/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)lucid/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)lucid/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)lucid/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/control.lucid $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/rules.lucid $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~lucid1) lucid; urgency=low" > $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
-	echo "  * Snapshot" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
-	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com>  Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)lucid/$(PKG.src.deb.tar) -C $(STAGE.out.src/)lucid $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)lucid/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	$(TOUCH.exe) $(PKG.src.deb.stamp)
-
-

HandBrake-0.9.8.tar.bz2/pkg/module.defs -> HandBrake-0.9.9.tar.bz2/pkg/module.defs Changed

HandBrake-0.9.8.tar.bz2/pkg/module.rules -> HandBrake-0.9.9.tar.bz2/pkg/module.rules Changed

HandBrake-0.9.8.tar.bz2/scripts/manicure.rb -> HandBrake-0.9.9.tar.bz2/scripts/manicure.rb Changed

@@ -248,7 +248,7 @@
     (depth+1).times do
       commandString << "<"
     end
-    commandString << " " << hash["PresetName"] << "\n\n"
+    commandString << " " << hash["PresetName"] << "\n"
     puts commandString
   end
   
@@ -260,7 +260,7 @@
     (depth+1).times do
       commandString << ">"
     end
-    commandString << "\n\n"
+    commandString << "\n"
     puts commandString
   end
   
@@ -349,18 +349,28 @@
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -524,36 +534,50 @@
     if hash["UsesPictureFilters"] == 1
       
       case hash["PictureDeinterlace"]
+      when 1
+        commandString << " --deinterlace=" << hash["PictureDeinterlaceCustom"].to_s
       when 2
-        commandString << " --deinterlace=\"fast\""
+        commandString << " --deinterlace=fast"
       when 3
-        commandString << " --deinterlace=\slow\""
+        commandString << " --deinterlace=slow"
       when 4
-        commandString << " --deinterlace=\"slower\""
+        commandString << " --deinterlace=slower"
       when 5
-        commandString << " --deinterlace=\"slowest\""
+        commandString << " --deinterlace=bob"
       end
       
       case hash["PictureDenoise"]
+      when 1
+        commandString << " --denoise=" << hash["PictureDenoiseCustom"].to_s
       when 2
-        commandString << " --denoise=\"weak\""
+        commandString << " --denoise=weak"
       when 3
-        commandString << " --denoise=\"medium\""
+        commandString << " --denoise=medium"
       when 4
-        commandString << " --denoise=\"strong\""
+        commandString << " --denoise=strong"
       end
       
       case hash["PictureDecomb"]
       when 1
-        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+        commandString << " --decomb=" << hash["PictureDecombCustom"].to_s
       when 2
         commandString << " --decomb"
       when 3
-        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+        commandString << " --decomb=fast"
+      when 4
+        commandString << " --decomb=bob"
+      end
+
+      case hash["PictureDetelecine"]
+        when 1
+          commandString << " --detelecine=" << hash["PictureDetelecineCustom"].to_s
+        when 2
+          commandString << " --detelecine"
+      end
+
+      if hash["PictureDeblock"] != 0
+        commandString << " --deblock=" << hash["PictureDeblock"].to_s
       end
-      
-      if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
-      if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
       
     end
     
@@ -578,17 +602,34 @@
     if hash["VideoTurboTwoPass"] == 1 then commandString << " -T" end
 
     #Advanced Options
-    if hash["x264Option"] != ""
+    if hash["x264UseAdvancedOptions"] != 1
+      if hash["x264Preset"] != ""
+        commandString << " --x264-preset "
+        commandString << hash["x264Preset"]
+      end
+      if hash["x264Tune"] != "" && hash["x264Tune"] != "none"
+        commandString << " --x264-tune "
+        commandString << hash["x264Tune"]
+      end
+      if hash["h264Profile"] != "" && hash["h264Profile"] != "auto"
+        commandString << " --h264-profile "
+        commandString << hash["h264Profile"]
+      end
+      if hash["h264Level"] != "" && hash["h264Level"] != "auto"
+        commandString << " --h264-level "
+        commandString << hash["h264Level"]
+      end
+      if hash["x264OptionExtra"] != ""
+        commandString << " -x "
+        commandString << hash["x264OptionExtra"]
+      end
+    elsif hash["x264Option"] != ""
       commandString << " -x "
       commandString << hash["x264Option"]
     end
     
     # That's it, print to screen now
     puts commandString
-    
-    #puts "*" * @columnWidth
-
-    puts  "\n"
   end
   
   def generateCLIFolderParse( hash, depth ) # Shows the folder for wrappers to parse
@@ -599,7 +640,7 @@
     (depth+1).times do
       commandString << "<"
     end
-    commandString << " " << hash["PresetName"] << "\n\n"
+    commandString << " " << hash["PresetName"] << "\n"
     puts commandString
   end
   
@@ -611,7 +652,7 @@
     (depth+1).times do
       commandString << ">"
     end
-    commandString << "\n\n"
+    commandString << "\n"
     puts commandString
   end
   
@@ -692,18 +733,28 @@
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -867,37 +918,51 @@
     if hash["UsesPictureFilters"] == 1
       
       case hash["PictureDeinterlace"]
+      when 1
+        commandString << " --deinterlace=" << hash["PictureDeinterlaceCustom"].to_s
       when 2
-        commandString << " --deinterlace=\"fast\""
+        commandString << " --deinterlace=fast"
       when 3
-        commandString << " --deinterlace=\slow\""
+        commandString << " --deinterlace=slow"
       when 4
-        commandString << " --deinterlace=\"slower\""
+        commandString << " --deinterlace=slower"
       when 5
-        commandString << " --deinterlace=\"slowest\""
+        commandString << " --deinterlace=bob"
       end
       
       case hash["PictureDenoise"]
+      when 1
+        commandString << " --denoise=" << hash["PictureDenoiseCustom"].to_s
       when 2
-        commandString << " --denoise=\"weak\""
+        commandString << " --denoise=weak"
       when 3
-        commandString << " --denoise=\"medium\""
+        commandString << " --denoise=medium"
       when 4
-        commandString << " --denoise=\"strong\""
+        commandString << " --denoise=strong"
       end
       
       case hash["PictureDecomb"]
       when 1
-        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+        commandString << " --decomb=" << hash["PictureDecombCustom"].to_s
       when 2
         commandString << " --decomb"
       when 3
-        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+        commandString << " --decomb=fast"
+      when 4
+        commandString << " --decomb=bob"
       end
-      
-      if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
-      if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      
+
+      case hash["PictureDetelecine"]
+        when 1
+          commandString << " --detelecine=" << hash["PictureDetelecineCustom"].to_s
+        when 2
+          commandString << " --detelecine"
+      end
+
+      if hash["PictureDeblock"] != 0
+        commandString << " --deblock=" << hash["PictureDeblock"].to_s
+      end
+
     end
 
     #Anamorphic
@@ -913,7 +978,7 @@
     if hash["PictureModulus"]
       commandString << " --modulus " << hash["PictureModulus"].to_s
     end
-    
+
     #Booleans
     if hash["ChapterMarkers"] == 1 then commandString << " -m" end
     if hash["VideoGrayScale"] == 1 then commandString << " -g" end
@@ -921,22 +986,39 @@
     if hash["VideoTurboTwoPass"] == 1 then commandString << " -T" end
 
     #Advanced Options
-    if hash["x264Option"] != ""
+    if hash["x264UseAdvancedOptions"] != 1
+      if hash["x264Preset"] != ""
+        commandString << " --x264-preset "
+        commandString << hash["x264Preset"]
+      end
+      if hash["x264Tune"] != "" && hash["x264Tune"] != "none"
+        commandString << " --x264-tune "
+        commandString << hash["x264Tune"]
+      end
+      if hash["h264Profile"] != "" && hash["h264Profile"] != "auto"
+        commandString << " --h264-profile "
+        commandString << hash["h264Profile"]
+      end
+      if hash["h264Level"] != "" && hash["h264Level"] != "auto"
+        commandString << " --h264-level "
+        commandString << hash["h264Level"]
+      end
+      if hash["x264OptionExtra"] != ""
+        commandString << " -x "
+        commandString << hash["x264OptionExtra"]
+      end
+    elsif hash["x264Option"] != ""
       commandString << " -x "
       commandString << hash["x264Option"]
     end
     
     # That's it, print to screen now
     puts commandString
-    
-    #puts "*" * @columnWidth
-
-    puts  "\n"
   end
 
   def generateAPIcalls(hash) # Makes a C version of the preset ready for coding into the CLI
     
-    commandString = "if (!strcmp(preset_name, \"" << hash["PresetName"] << "\"))\n{\n    "
+    commandString = "if (!strcasecmp(preset_name, \"" << hash["PresetName"] << "\"))\n{\n    "
     
     #Filename suffix
     commandString << "if( !mux )\n    "
@@ -995,8 +1077,9 @@
       elsif hash["VideoFramerate"] == "29.97 (NTSC Video)"
         commandString << "job->vrate_base = " << "900900;\n    "
       elsif hash["VideoFramerate"] == "25 (PAL Film/Video)"
-        commandString << "job->vrate_base = " << "1080000\n    "
-      # Gotta add the rest of the framerates for completion's sake.
+        commandString << "job->vrate_base = " << "1080000;\n    "
+      else
+        commandString << "job->vrate_base = " << (27000000 / hash["VideoFramerate"].to_i).to_s << ";\n    "
       end
       # not same as source: pfr, else default (cfr)
       if hash["VideoFramerateMode"] == "pfr"
@@ -1036,18 +1119,28 @@
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -1152,24 +1245,33 @@
     
     case hash["AudioEncoderFallback"]
       when /AC3/
-        audioEncoderFallback << "HB_ACODEC_AC3"
+        audioEncoderFallback << "ffac3"
+      when "AAC (FDK)"
+        audioEncoderFallback << "fdk_aac"
+      when "AAC (faac)"
+        audioEncoderFallback << "faac"
       when "AAC (ffmpeg)"
-        audioEncoderFallback << "HB_ACODEC_FFAAC"
-      when /AAC/
-        audioEncoderFallback << "HB_ACODEC_FAAC"
+        audioEncoderFallback << "ffaac"
+      when "AAC (CoreAudio)"
+        audioEncoderFallback << "ca_aac"
+      when "HE-AAC (FDK)"
+        audioEncoderFallback << "fdk_haac"
+      when "HE-AAC (CoreAudio)"
+        audioEncoderFallback << "ca_haac"
       when /Vorbis/
-        audioEncoderFallback << "HB_ACODEC_VORBIS"
+        audioEncoderFallback << "vorbis"
       when /MP3/
-        audioEncoderFallback << "HB_ACODEC_LAME"
-      when /FLAC/
-        audioEncoderFallback << "HB_ACODEC_FFFLAC"
+        audioEncoderFallback << "lame"
+      when "FLAC (ffmpeg)"
+        audioEncoderFallback << "ffflac"
+      when "FLAC (24-bit)"
+        audioEncoderFallback << "ffflac24"
     end
     
     if audioEncoderFallback.size > 0
-      commandString << "if( !acodec_fallback )\n    "
+      commandString << "if( acodec_fallback == NULL )\n    "
       commandString << "{\n    "
-      commandString << "    acodec_fallback = " << audioEncoderFallback
-      commandString << ";\n    "
+      commandString << "    acodec_fallback = \"" << audioEncoderFallback << "\";\n    "
       commandString << "}\n    "
     end
     
@@ -1202,8 +1304,45 @@
     end
     
     #Advanced Options
-    if hash["x264Option"] != ""
-      commandString << "if( !advanced_opts )\n    "
+    if hash["x264UseAdvancedOptions"] != 1
+      if hash["x264Preset"] != ""
+        commandString << "if (x264_preset == NULL)\n    "
+        commandString << "{\n    "
+        commandString << "    x264_preset = strdup(\""
+        commandString << hash["x264Preset"] << "\");\n    "
+        commandString << "}\n    "
+      end
+      if hash["x264Tune"] != "" && hash["x264Tune"] != "none"
+        commandString << "if (x264_tune == NULL)\n    "
+        commandString << "{\n    "
+        commandString << "    x264_tune = strdup(\""
+        commandString << hash["x264Tune"]
+        commandString << "\");\n    "
+        commandString << "}\n    "
+      end
+      if hash["h264Profile"] != "" && hash["h264Profile"] != "auto"
+        commandString << "if (h264_profile == NULL)\n    "
+        commandString << "{\n    "
+        commandString << "    h264_profile = strdup(\""
+        commandString << hash["h264Profile"] << "\");\n    "
+        commandString << "}\n    "
+      end
+      if hash["h264Level"] != "" && hash["h264Level"] != "auto"
+        commandString << "if (h264_level == NULL)\n    "
+        commandString << "{\n    "
+        commandString << "    h264_level = strdup(\""
+        commandString << hash["h264Level"] << "\");\n    "
+        commandString << "}\n    "
+      end
+      if hash["x264OptionExtra"] != ""
+        commandString << "if (advanced_opts == NULL)\n    "
+        commandString << "{\n    "
+        commandString << "    advanced_opts = strdup(\""
+        commandString << hash["x264OptionExtra"] << "\");\n    "
+        commandString << "}\n    "
+      end
+    elsif hash["x264Option"] != ""
+      commandString << "if (advanced_opts == NULL)\n    "
       commandString << "{\n    "
       commandString << "    advanced_opts = strdup(\""
       commandString << hash["x264Option"] << "\");\n    "
@@ -1213,50 +1352,64 @@
     #Video Filters
     if hash["UsesPictureFilters"] == 1
       
+      if hash["PictureDeinterlace"].to_i != 0
+        commandString << "deinterlace = 1;\n    "
+      end
+
       case hash["PictureDeinterlace"]
+      when 1
+        commandString << "deinterlace_opt = \"" << hash["PictureDeinterlaceCustom"].to_s << "\";\n    "
       when 2
-        commandString << "deinterlace = 1;\n    "
-        commandString << "deinterlace_opt = \"-1\";\n    "
+        commandString << "deinterlace_opt = \"0\";\n    "
       when 3
-        commandString << "deinterlace = 1;\n    "
-        commandString << "deinterlace_opt = \"2\";\n    "
+        commandString << "deinterlace_opt = \"1\";\n    "
       when 4
-        commandString << "deinterlace = 1;\n    "
-        commandString << "deinterlace_opt = \"0\";\n    "
+        commandString << "deinterlace_opt = \"3\";\n    "
       when 5
-        commandString << "deinterlace = 1;\n    "
-        commandString << "deinterlace_opt = \"1:-1:1\";\n    "
+        commandString << "deinterlace_opt = \"15\";\n    "
       end
       
+      if hash["PictureDenoise"].to_i != 0
+        commandString << "denoise = 1;\n    "
+      end
+
       case hash["PictureDenoise"]
+      when 1
+        commandString << "denoise_opt = \"" << hash["PictureDenoiseCustom"].to_s << "\";\n    "
       when 2
-        commandString << "denoise = 1;\n    "
         commandString << "denoise_opt = \"2:1:2:3\";\n    "
       when 3
-        commandString << "denoise = 1;\n    "
         commandString << "denoise_opt = \"3:2:2:3\";\n    "
       when 4
-        commandString << "denoise = 1;\n    "
         commandString << "denoise_opt = \"7:7:5:5\";\n    "
       end
       
+      if hash["PictureDecomb"].to_i != 0
+        commandString << "decomb = 1;\n    "
+      end
+
       case hash["PictureDecomb"]
       when 1
-        commandString << "decomb = 1;\n    "
-        commandString << "decomb_opt = strdup(\"" << hash["PictureDecombCustom"].to_s << "\");\n    "
-      when 2
-        commandString << "decomb = 1;\n    "
+        commandString << "decomb_opt = \"" << hash["PictureDecombCustom"].to_s << "\";\n    "
       when 3
-        commandString << "decomb = 1;\n    "
-        commandString << "decomb_opt = strdup(\"7:2:6:9:1:80\");\n    "
+        commandString << "decomb_opt = \"7:2:6:9:1:80\";\n    "
+      when 4
+        commandString << "decomb_opt = \"455\";\n    "
       end
-      
-      if hash["PictureDetelecine"] == 2 then commandString << "detelecine = 1;\n    " end
+
+      if hash["PictureDetelecine"].to_i != 0
+        commandString << "detelecine = 1;\n    "
+      end
+
+      case hash["PictureDetelecine"]
+        when 1
+          commandString << "detelecine_opt = \"" << hash["PictureDetelecineCustom"].to_s << "\";\n    "
+      end
+
       if hash["PictureDeblock"] != 0
-        then
-          commandString << "deblock = 1;\n    "
-          commandString << "deblock_opt = \"" << hash["PictureDeblock"].to_s << "\";\n    "
-        end
+        commandString << "deblock = 1;\n    "
+        commandString << "deblock_opt = \"" << hash["PictureDeblock"].to_s << "\";\n    "
+      end
       
     end
     
@@ -1278,19 +1431,30 @@
     if hash["PictureModulus"]
       commandString << "modulus = " << hash["PictureModulus"].to_s << ";\n    "
     end
-    
+
     #Booleans
-    if hash["ChapterMarkers"] == 1 then commandString << "job->chapter_markers = 1;\n    " end
-    if hash["VideoGrayScale"] == 1 then commandString << "job->grayscale = 1;\n    " end
-    if hash["VideoTwoPass"] == 1 then commandString << "twoPass = 1;\n    " end
-    if hash["VideoTurboTwoPass"] == 1 then commandString << "turbo_opts_enabled = 1;\n" end
-    commandString << "\n"
-    commandString << "}"
-    
+    if hash["ChapterMarkers"] == 1
+      commandString << "job->chapter_markers = 1;\n    "
+    end
+
+    if hash["VideoGrayScale"] == 1
+      commandString << "job->grayscale = 1;\n    "
+    end
+
+    if hash["VideoTwoPass"] == 1
+      commandString << "twoPass = 1;\n    "
+    end
+
+    if hash["VideoTurboTwoPass"] == 1
+      commandString << "turbo_opts_enabled = 1;\n    "
+    end
+
+    #Finish
+    commandString = commandString.rstrip
+    commandString << "\n}"
+
     # That's it, print to screen now
     puts commandString
-    #puts "*" * @columnWidth
-    puts  "\n"
   end
   
   def generateAPIFolderList( hash, depth )
@@ -1304,7 +1468,7 @@
       commandString << "<"
     end
     commandString << " " << hash["PresetName"]
-    commandString << "\\n\");\n\n"    
+    commandString << "\\n\");\n"    
     puts commandString
   end
   
@@ -1318,7 +1482,7 @@
     (depth+1).times do
       commandString << ">"
     end
-    commandString << "\\n\");\n\n"    
+    commandString << "\\n\");\n"
     puts commandString
   end
   
@@ -1401,18 +1565,28 @@
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -1576,37 +1750,51 @@
     if hash["UsesPictureFilters"] == 1
       
       case hash["PictureDeinterlace"]
+      when 1
+        commandString << " --deinterlace=" << hash["PictureDeinterlaceCustom"].to_s
       when 2
-        commandString << " --deinterlace=\\\"fast\\\""
+        commandString << " --deinterlace=fast"
       when 3
-        commandString << " --deinterlace=\\\slow\\\""
+        commandString << " --deinterlace=slow"
       when 4
-        commandString << " --deinterlace=\\\"slower\\\""
+        commandString << " --deinterlace=slower"
       when 5
-        commandString << " --deinterlace=\\\"slowest\\\""
+        commandString << " --deinterlace=bob"
       end
       
       case hash["PictureDenoise"]
+      when 1
+        commandString << " --denoise=" << hash["PictureDenoiseCustom"].to_s
       when 2
-        commandString << " --denoise=\\\"weak\\\""
+        commandString << " --denoise=weak"
       when 3
-        commandString << " --denoise=\\\"medium\\\""
+        commandString << " --denoise=medium"
       when 4
-        commandString << " --denoise=\\\"strong\\\""
+        commandString << " --denoise=strong"
       end
       
       case hash["PictureDecomb"]
       when 1
-        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+        commandString << " --decomb=" << hash["PictureDecombCustom"].to_s
       when 2
         commandString << " --decomb"
       when 3
-        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+        commandString << " --decomb=fast"
+      when 4
+        commandString << " --decomb=bob"
       end
-      
-      if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
-      if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      
+
+      case hash["PictureDetelecine"]
+        when 1
+          commandString << " --detelecine=" << hash["PictureDetelecineCustom"].to_s
+        when 2
+          commandString << " --detelecine"
+      end
+
+      if hash["PictureDeblock"] != 0
+        commandString << " --deblock=" << hash["PictureDeblock"].to_s
+      end
+
     end
     
     #Anamorphic
@@ -1622,24 +1810,44 @@
     if hash["PictureModulus"]
       commandString << " --modulus " << hash["PictureModulus"].to_s
     end
-    
+
     #Booleans
     if hash["ChapterMarkers"] == 1 then commandString << " -m" end
     if hash["VideoGrayScale"] == 1 then commandString << " -g" end
     if hash["VideoTwoPass"] == 1 then commandString << " -2" end
     if hash["VideoTurboTwoPass"] == 1 then commandString << " -T" end
     
-      #Advanced Options
-      if hash["x264Option"] != ""
+    #Advanced Options
+    if hash["x264UseAdvancedOptions"] != 1
+      if hash["x264Preset"] != ""
+        commandString << " --x264-preset "
+        commandString << hash["x264Preset"]
+      end
+      if hash["x264Tune"] != "" && hash["x264Tune"] != "none"
+        commandString << " --x264-tune "
+        commandString << hash["x264Tune"]
+      end
+      if hash["h264Profile"] != "" && hash["h264Profile"] != "auto"
+        commandString << " --h264-profile "
+        commandString << hash["h264Profile"]
+      end
+      if hash["h264Level"] != "" && hash["h264Level"] != "auto"
+        commandString << " --h264-level "
+        commandString << hash["h264Level"]
+      end
+      if hash["x264OptionExtra"] != ""
         commandString << " -x "
-        commandString << hash["x264Option"]
+        commandString << hash["x264OptionExtra"]
       end
+    elsif hash["x264Option"] != ""
+      commandString << " -x "
+      commandString << hash["x264Option"]
+    end
     
     commandString << "\\n\");"
     
     # That's it, print to screen now
     puts commandString
-    puts  "\n"
   end
   
 end

HandBrake-0.9.8.tar.bz2/test/module.defs -> HandBrake-0.9.9.tar.bz2/test/module.defs Changed

@@ -9,35 +9,22 @@
 
 TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
 
-TEST.libs = $(LIBHB.a) $(foreach n, \
-        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
-        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
-        $(CONTRIB.build/)lib/lib$(n).a )
+TEST.GCC.L = $(CONTRIB.build/)lib
 
-TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
+TEST.libs = $(LIBHB.a)
 
-ifeq (1,$(PTHREADW32.enabled))
-    TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
-endif
-ifeq (1,$(LIBICONV.enabled))
-    TEST.libs += $(CONTRIB.build/)lib/libiconv.a
-endif
-ifeq (1,$(BZIP2.enabled))
-    TEST.libs += $(CONTRIB.build/)lib/libbz2.a
-else
-	TEST.GCC.l += bz2
-endif
-ifeq (1,$(ZLIB.enabled))
-    TEST.libs += $(CONTRIB.build/)lib/libz.a
-else
-	TEST.GCC.l += z
-endif
-ifeq (1,$(FRIBIDI.enabled))
-    TEST.libs += $(CONTRIB.build/)lib/libfribidi.a
-else
-	TEST.GCC.l += fribidi
+TEST.GCC.l = \
+        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
+        fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
+        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+        bluray xml2 bz2 z
+
+ifeq (1,$(FEATURE.fdk_aac))
+TEST.GCC.l += fdk-aac
 endif
 
+TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
+
 ###############################################################################
 
 TEST.out += $(TEST.c.o)
@@ -56,18 +43,12 @@
 else ifeq ($(BUILD.system),linux)
     TEST.GCC.l += pthread dl m
 else ifeq ($(BUILD.system),solaris)
-    TEST.GCC.l += pthread nsl socket
+    TEST.GCC.l += pthread nsl socket iconv
 else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
-ifeq ($(HAS.iconv),1)
-    TEST.GCC.l += iconv
-endif
-ifeq ($(HAS.pthread),1)
-    TEST.GCC.l += pthreadGC2
-endif
 ifeq ($(HAS.dlfcn),1)
     TEST.GCC.l += dl
 endif
+    TEST.GCC.l += pthreadGC2 iconv ws2_32
     TEST.GCC.D += PTW32_STATIC_LIB
-    TEST.GCC.l += iberty ws2_32
 	TEST.GCC.args.extra.exe++ += -static
 endif

HandBrake-0.9.8.tar.bz2/test/parsecsv.c -> HandBrake-0.9.9.tar.bz2/test/parsecsv.c Changed

HandBrake-0.9.8.tar.bz2/test/parsecsv.h -> HandBrake-0.9.9.tar.bz2/test/parsecsv.h Changed

HandBrake-0.9.8.tar.bz2/test/test.c -> HandBrake-0.9.9.tar.bz2/test/test.c Changed

@@ -1,8 +1,11 @@
-/* $Id: test.c,v 1.82 2005/11/19 08:25:54 titer Exp $
+/* test.c
 
-   This file is part of the HandBrake source code.
+   Copyright (c) 2003-2013 HandBrake Team
+   This file is part of the HandBrake source code
    Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+   It may be used under the terms of the GNU General Public License v2.
+   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 #include <signal.h>
 #include <getopt.h>
@@ -31,12 +34,6 @@
 #endif
 
 /* Options */
-#if defined( __APPLE_CC__ )
-#define EXTRA_VLC_DYLD_PATH "/Applications/VLC.app/Contents/MacOS/lib"
-#define DEFAULT_DYLD_PATH "/usr/local/lib:/usr/lib"
-
-static int    no_vlc_dylib = 0;
-#endif
 static int    debug       = HB_DEBUG_ALL;
 static int    update      = 0;
 static int    dvdnav      = 1;
@@ -61,6 +58,7 @@
 static char * decomb_opt            = 0;
 static int    rotate                = 0;
 static char * rotate_opt            = 0;
+static int    rotate_val            = 0;
 static int    grayscale   = 0;
 static int    vcodec      = HB_VCODEC_FFMPEG_MPEG4;
 static hb_list_t * audios = NULL;
@@ -70,6 +68,8 @@
 static char * mixdowns    = NULL;
 static char * dynamic_range_compression = NULL;
 static char * audio_gain  = NULL;
+static char ** audio_dither = NULL;
+static char ** normalize_mix_level  = NULL;
 static char * atracks     = NULL;
 static char * arates      = NULL;
 static char ** abitrates  = NULL;
@@ -78,11 +78,6 @@
 static char * acodec_fallback = NULL;
 static char * acodecs     = NULL;
 static char ** anames      = NULL;
-#ifdef __APPLE_CC__
-static int    default_acodec = HB_ACODEC_CA_AAC;
-#else
-static int    default_acodec = HB_ACODEC_FAAC;
-#endif
 static int    audio_explicit = 0;
 static char ** subtracks   = NULL;
 static char ** subforce    = NULL;
@@ -114,15 +109,14 @@
 static int    chapter_end   = 0;
 static int    chapter_markers = 0;
 static char * marker_file   = NULL;
-static char	  *advanced_opts = NULL;
-static char	  *advanced_opts2 = NULL;
-static char       *x264_profile = NULL;
-static char       *x264_preset = NULL;
-static char       *x264_tune = NULL;
-static int	  maxHeight		= 0;
-static int	  maxWidth		= 0;
+static char * x264_preset   = NULL;
+static char * x264_tune     = NULL;
+static char * advanced_opts = NULL;
+static char * h264_profile  = NULL;
+static char * h264_level    = NULL;
+static int    maxHeight     = 0;
+static int    maxWidth      = 0;
 static int    turbo_opts_enabled = 0;
-static char * turbo_opts = "ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
 static int    largeFileSize = 0;
 static int    preset        = 0;
 static char * preset_name   = 0;
@@ -135,12 +129,8 @@
 static int    start_at_preview = 0;
 static int64_t start_at_pts    = 0;
 static int    start_at_frame = 0;
-static char * start_at_string = NULL;
-static char * start_at_token = NULL;
 static int64_t stop_at_pts    = 0;
 static int    stop_at_frame = 0;
-static char * stop_at_string = NULL;
-static char * stop_at_token = NULL;
 static uint64_t min_title_duration = 10;
 
 /* Exit cleanly on Ctrl-C */
@@ -148,15 +138,25 @@
 static void SigHandler( int );
 
 /* Utils */
-static void ShowCommands();
 static void ShowHelp();
 static void ShowPresets();
+static void ShowCommands()
+{
+    fprintf(stdout, "\nCommands:\n");
+    fprintf(stdout, " [h]elp    Show this message\n");
+    fprintf(stdout, " [q]uit    Exit HandBrakeCLI\n");
+    fprintf(stdout, " [p]ause   Pause encoding\n");
+    fprintf(stdout, " [r]esume  Resume encoding\n");
+}
 
 static int  ParseOptions( int argc, char ** argv );
 static int  CheckOptions( int argc, char ** argv );
 static int  HandleEvents( hb_handle_t * h );
 
-static int get_acodec_for_string( char *codec );
+static       int   get_dither_for_string(const char *dither);
+static       int   get_acodec_for_string(const char *codec);
+static const char* get_string_for_acodec(int acodec);
+
 static int is_sample_rate_valid(int rate);
 static void str_vfree( char **strv );
 static char** str_split( char *str, char delem );
@@ -253,7 +253,9 @@
         titleindex = 0;
     }
 
-    hb_scan( h, input, titleindex, preview_count, store_previews, min_title_duration * 90000LL );
+    hb_system_sleep_prevent(h);
+    hb_scan(h, input, titleindex, preview_count, store_previews,
+            min_title_duration * 90000LL);
 
     /* Wait... */
     while( !die )
@@ -268,11 +270,14 @@
                     die = 1;
                     break;
                 case 'p':
-                    fprintf( stdout, "\nEncoding Paused by user command, 'r' to resume\n" );
-                    hb_pause( h );
+                    fprintf(stdout,
+                            "\nEncoding Paused by user command, 'r' to resume\n");
+                    hb_pause(h);
+                    hb_system_sleep_allow(h);
                     break;
                 case 'r':
-                    hb_resume( h );
+                    hb_system_sleep_prevent(h);
+                    hb_resume(h);
                     break;
                 case 'h':
                     ShowCommands();
@@ -316,11 +321,14 @@
                         die = 1;
                         break;
                     case 'p':
-                        fprintf( stdout, "\nEncoding Paused by user command, 'r' to resume\n" );
-                        hb_pause( h );
+                        fprintf(stdout,
+                                "\nEncoding Paused by user command, 'r' to resume\n");
+                        hb_pause(h);
+                        hb_system_sleep_allow(h);
                         break;
                     case 'r':
-                        hb_resume( h );
+                        hb_system_sleep_prevent(h);
+                        hb_resume(h);
                         break;
                     case 'h':
                         ShowCommands();
@@ -337,67 +345,58 @@
     }
 
     /* Clean up */
-    hb_close( &h );
+    hb_close(&h);
     hb_global_close();
-    if( input )  free( input );
-    if( output ) free( output );
-    if( format ) free( format );
-    if( audios )
-    {
-        while( ( audio = hb_list_item( audios, 0 ) ) )
-        {
-            hb_list_rem( audios, audio );
-            if( audio->out.name )
-            {
-                free( audio->out.name );
-            }
-            free( audio );
-        }
-        hb_list_close( &audios );
-    }
-    if( mixdowns ) free( mixdowns );
-    if( dynamic_range_compression ) free( dynamic_range_compression );
-    if( audio_gain ) free( audio_gain );
-    if( atracks ) free( atracks );
-    if( arates ) free( arates );
-    str_vfree( abitrates );
-    str_vfree( aqualities );
-    str_vfree( acompressions );
-    if( acodecs ) free( acodecs );
-    if (native_language ) free (native_language );
-	if( advanced_opts ) free (advanced_opts );
-	if( advanced_opts2 ) free (advanced_opts2 );
-    if (preset_name) free (preset_name);
-    if( stop_at_string ) free( stop_at_string );
-    if( start_at_string ) free( start_at_string );
-    free( x264_profile );
-    free( x264_preset );
-    free( x264_tune );
-
-    // write a carriage return to stdout - avoids overlap / line wrapping when stderr is redirected
-    fprintf( stdout, "\n" );
-    fprintf( stderr, "HandBrake has exited.\n" );
+    if (audios != NULL)
+    {
+        while ((audio = hb_list_item(audios, 0)) != NULL)
+        {
+            hb_list_rem(audios, audio);
+            if (audio->out.name != NULL)
+            {
+                free(audio->out.name);
+            }
+            free(audio);
+        }
+        hb_list_close(&audios);
+    }
+    str_vfree(abitrates);
+    str_vfree(acompressions);
+    str_vfree(aqualities);
+    str_vfree(audio_dither);
+    free(acodecs);
+    free(arates);
+    free(atracks);
+    free(audio_gain);
+    free(dynamic_range_compression);
+    free(mixdowns);
+    free(native_language);
+    free(format);
+    free(input);
+    free(output);
+    free(preset_name);
+    free(x264_preset);
+    free(x264_tune);
+    free(advanced_opts);
+    free(h264_profile);
+    free(h264_level);
+
+    // write a carriage return to stdout
+    // avoids overlap / line wrapping when stderr is redirected
+    fprintf(stdout, "\n");
+    fprintf(stderr, "HandBrake has exited.\n");
 
     return 0;
 }
 
-static void ShowCommands()
-{
-    fprintf( stdout, "\nCommands:\n" );
-    fprintf( stdout, " [h]elp    Show this message\n" );
-    fprintf( stdout, " [q]uit    Exit HandBrakeCLI\n" );
-    fprintf( stdout, " [p]ause   Pause encoding\n" );
-    fprintf( stdout, " [r]esume  Resume encoding\n" );
-}
-
-static void PrintTitleInfo( hb_title_t * title )
+static void PrintTitleInfo( hb_title_t * title, int feature )
 {
     hb_chapter_t  * chapter;
     hb_subtitle_t * subtitle;
     int i;
 
     fprintf( stderr, "+ title %d:\n", title->index );
-    if ( title->index == title->job->feature )
+    if ( title->index == feature )
     {
         fprintf( stderr, "  + Main Feature\n" );
     }
@@ -477,6 +476,18 @@
 
 }
 
+static void PrintTitleSetInfo( hb_title_set_t * title_set )
+{
+    int i;
+    hb_title_t * title;
+
+    for( i = 0; i < hb_list_count( title_set->list_title ); i++ )
+    {
+        title = hb_list_item( title_set->list_title, i );
+        PrintTitleInfo( title, title_set->feature );
+    }
+}
+
 static int test_sub_list( char ** list, int pos )
 {
     int i;
@@ -578,16 +589,23 @@
 #define p s.param.scanning
         case HB_STATE_SCANNING:
             /* Show what title is currently being scanned */
-            fprintf( stderr, "Scanning title %d", p.title_cur );
-            if( !titleindex || titlescan )
-                fprintf( stderr, " of %d", p.title_count );
-            fprintf( stderr, "...\n" );
+            if (p.preview_cur)
+            {
+                fprintf(stderr, "\rScanning title %d of %d, preview %d, %.2f %%",
+                        p.title_cur, p.title_count, p.preview_cur, 100 * p.progress);
+            }
+            else
+            {
+                fprintf(stderr, "\rScanning title %d of %d, %.2f %%",
+                        p.title_cur, p.title_count, 100 * p.progress);
+            }
+            fflush(stderr);
             break;
 #undef p
 
         case HB_STATE_SCANDONE:
         {
-            hb_list_t  * list;
+            hb_title_set_t * title_set;
             hb_title_t * title;
             hb_job_t   * job;
             int i;
@@ -604,9 +622,9 @@
             double gain = 0;
             /* Audio argument string parsing variables */
 
-            list = hb_get_titles( h );
+            title_set = hb_get_title_set( h );
 
-            if( !hb_list_count( list ) )
+            if( !title_set || !hb_list_count( title_set->list_title ) )
             {
                 /* No valid title, stop right there */
                 fprintf( stderr, "No title found.\n" );
@@ -623,9 +641,9 @@
 
                 fprintf( stderr, "Searching for main feature title...\n" );
 
-                for( i = 0; i < hb_list_count( list ); i++ )
+                for( i = 0; i < hb_list_count( title_set->list_title ); i++ )
                 {
-                    title = hb_list_item( list, i );
+                    title = hb_list_item( title_set->list_title, i );
                     title_time = (title->hours*60*60 ) + (title->minutes *60) + (title->seconds);
                     fprintf( stderr, " + Title (%d) index %d has length %dsec\n",
                              i, title->index, title_time );
@@ -635,7 +653,7 @@
                         main_feature_pos = i;
                         main_feature_idx = title->index;
                     }
-                    if( title->job->feature == title->index )
+                    if( title_set->feature == title->index )
                     {
                         main_feature_time = title_time;
                         main_feature_pos = i;
@@ -653,28 +671,24 @@
                 fprintf( stderr, "Found main feature title, setting title to %d\n",
                          main_feature_idx);
 
-                title = hb_list_item( list, main_feature_pos);
+                title = hb_list_item( title_set->list_title, main_feature_pos);
             } else {
-                title = hb_list_item( list, 0 );
+                title = hb_list_item( title_set->list_title, 0 );
             }
 
             if( !titleindex || titlescan )
             {
                 /* Scan-only mode, print infos and exit */
-                int i;
-                for( i = 0; i < hb_list_count( list ); i++ )
-                {
-                    title = hb_list_item( list, i );
-                    PrintTitleInfo( title );
-                }
+                PrintTitleSetInfo( title_set );
                 die = 1;
                 break;
             }
 
+            PrintTitleInfo( title, title_set->feature );
+
             /* Set job settings */
-            job   = title->job;
+            job = hb_job_init( title );
 
-            PrintTitleInfo( title );
 
             if( chapter_start && chapter_end && !stop_at_pts && !start_at_preview && !stop_at_frame && !start_at_pts && !start_at_frame )
             {
@@ -695,7 +709,7 @@
             {
                 fprintf( stderr, "+ Using preset: %s\n", preset_name);
 
-                if (!strcmp(preset_name, "Universal"))
+                if (!strcasecmp(preset_name, "Universal"))
                 {
                     if( !mux )
                     {
@@ -703,6 +717,8 @@
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
+                    job->vrate_base = 900000;
+                    job->cfr = 2;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
@@ -727,20 +743,42 @@
                     {
                         dynamic_range_compression = strdup("0.0,0.0");
                     }
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
                     maxWidth = 720;
-                    if( !advanced_opts )
+                    maxHeight = 576;
+                    if (x264_preset == NULL)
                     {
-                        advanced_opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6");
+                        x264_preset = strdup("fast");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("baseline");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("3.0");
                     }
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "iPod"))
+                if (!strcasecmp(preset_name, "iPod"))
                 {
                     if( !mux )
                     {
@@ -748,7 +786,9 @@
                     }
                     job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 700;
+                    job->vquality = 22.0;
+                    job->vrate_base = 900000;
+                    job->cfr = 2;
                     if( !atracks )
                     {
                         atracks = strdup("1");
@@ -773,57 +813,38 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
-                    maxWidth = 320;
-                    if( !advanced_opts )
-                    {
-                        advanced_opts = strdup("level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0");
-                    }
-                    job->chapter_markers = 1;
-                    
-                }
-
-                if (!strcmp(preset_name, "iPhone & iPod Touch"))
-                {
-                    if( !mux )
-                    {
-                        mux = HB_MUX_MP4;
-                    }
-                    vcodec = HB_VCODEC_X264;
-                    job->vquality = 20.0;
-                    if( !atracks )
+                    if( allowed_audio_copy == -1 )
                     {
-                        atracks = strdup("1");
-                    }
-                    if( !acodecs )
-                    {
-                        acodecs = strdup("faac");
-                    }
-                    if( !abitrates )
-                    {
-                        abitrates = str_split("128", ',');
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
                     }
-                    if( !mixdowns )
+                    if( acodec_fallback == NULL )
                     {
-                        mixdowns = strdup("dpl2");
+                        acodec_fallback = "ffac3";
                     }
-                    if( !arates )
+                    maxWidth = 320;
+                    maxHeight = 240;
+                    if (x264_preset == NULL)
                     {
-                        arates = strdup("Auto");
+                        x264_preset = strdup("medium");
                     }
-                    if( !dynamic_range_compression )
+                    if (h264_profile == NULL)
                     {
-                        dynamic_range_compression = strdup("0.0");
+                        h264_profile = strdup("baseline");
                     }
-                    maxWidth = 480;
-                    if( !advanced_opts )
+                    if (h264_level == NULL)
                     {
-                        advanced_opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
+                        h264_level = strdup("1.3");
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "iPhone 4"))
+                if (!strcasecmp(preset_name, "iPhone & iPod touch"))
                 {
                     if( !mux )
                     {
@@ -831,8 +852,8 @@
                     }
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 20.0;
-                    job->vrate_base = 900900;
+                    job->vquality = 22.0;
+                    job->vrate_base = 900000;
                     job->cfr = 2;
                     if( !atracks )
                     {
@@ -858,16 +879,42 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
                     maxWidth = 960;
+                    maxHeight = 640;
+                    if (x264_preset == NULL)
+                    {
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("high");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("3.1");
+                    }
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "iPad"))
+                if (!strcasecmp(preset_name, "iPad"))
                 {
                     if( !mux )
                     {
@@ -876,7 +923,7 @@
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->vrate_base = 900900;
+                    job->vrate_base = 900000;
                     job->cfr = 2;
                     if( !atracks )
                     {
@@ -902,16 +949,42 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
                     maxWidth = 1280;
+                    maxHeight = 720;
+                    if (x264_preset == NULL)
+                    {
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("high");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("3.1");
+                    }
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "AppleTV"))
+                if (!strcasecmp(preset_name, "AppleTV"))
                 {
                     if( !mux )
                     {
@@ -920,6 +993,8 @@
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
+                    job->vrate_base = 900000;
+                    job->cfr = 2;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
@@ -944,20 +1019,46 @@
                     {
                         dynamic_range_compression = strdup("0.0,0.0");
                     }
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
                     maxWidth = 960;
-                    if( !advanced_opts )
+                    maxHeight = 720;
+                    if (x264_preset == NULL)
                     {
-                        advanced_opts = strdup("cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500");
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("high");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("3.1");
+                    }
+                    if (advanced_opts == NULL)
+                    {
+                        advanced_opts = strdup("qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500");
                     }
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "AppleTV 2"))
+                if (!strcasecmp(preset_name, "AppleTV 2"))
                 {
                     if( !mux )
                     {
@@ -966,7 +1067,7 @@
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->vrate_base = 900900;
+                    job->vrate_base = 900000;
                     job->cfr = 2;
                     if( !atracks )
                     {
@@ -992,16 +1093,42 @@
                     {
                         dynamic_range_compression = strdup("0.0,0.0");
                     }
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
                     maxWidth = 1280;
+                    maxHeight = 720;
+                    if (x264_preset == NULL)
+                    {
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("high");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("3.1");
+                    }
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-                
-                if (!strcmp(preset_name, "AppleTV 3"))
+                if (!strcasecmp(preset_name, "AppleTV 3"))
                 {
                     if( !mux )
                     {
@@ -1010,6 +1137,7 @@
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
+                    job->vrate_base = 900000;
                     job->cfr = 2;
                     if( !atracks )
                     {
@@ -1035,23 +1163,44 @@
                     {
                         dynamic_range_compression = strdup("0.0,0.0");
                     }
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
                     maxWidth = 1920;
-                    if( !advanced_opts )
+                    maxHeight = 1080;
+                    if (x264_preset == NULL)
                     {
-                        advanced_opts = strdup("b-adapt=2");
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("high");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("4.0");
                     }
                     decomb = 1;
-                    decomb_opt = strdup("7:2:6:9:1:80");
+                    decomb_opt = "7:2:6:9:1:80";
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
                     modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "Android Mid"))
+                if (!strcasecmp(preset_name, "Android"))
                 {
                     if( !mux )
                     {
@@ -1059,7 +1208,7 @@
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 22.0;
-                    job->vrate_base = 900900;
+                    job->vrate_base = 900000;
                     job->cfr = 2;
                     if( !atracks )
                     {
@@ -1085,15 +1234,41 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
-                    maxWidth = 480;
-                    if( !advanced_opts )
+                    if( allowed_audio_copy == -1 )
                     {
-                        advanced_opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
                     }
-                    
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
+                    maxWidth = 720;
+                    maxHeight = 576;
+                    if (x264_preset == NULL)
+                    {
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("main");
+                    }
+                    if (h264_level == NULL)
+                    {
+                        h264_level = strdup("3.0");
+                    }
+                    if( !anamorphic_mode )
+                    {
+                        anamorphic_mode = 2;
+                    }
+                    modulus = 2;
                 }
-
-                if (!strcmp(preset_name, "Android High"))
+                if (!strcasecmp(preset_name, "Android Tablet"))
                 {
                     if( !mux )
                     {
@@ -1101,7 +1276,7 @@
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 22.0;
-                    job->vrate_base = 900900;
+                    job->vrate_base = 900000;
                     job->cfr = 2;
                     if( !atracks )
                     {
@@ -1127,19 +1302,41 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
-                    maxWidth = 720;
-                    if( !advanced_opts )
+                    if( allowed_audio_copy == -1 )
+                    {
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+                    }
+                    if( acodec_fallback == NULL )
+                    {
+                        acodec_fallback = "ffac3";
+                    }
+                    maxWidth = 1280;
+                    maxHeight = 720;
+                    if (x264_preset == NULL)
+                    {
+                        x264_preset = strdup("medium");
+                    }
+                    if (h264_profile == NULL)
+                    {
+                        h264_profile = strdup("main");
+                    }
+                    if (h264_level == NULL)
                     {
-                        advanced_opts = strdup("weightp=0:cabac=0");
+                        h264_level = strdup("3.1");
                     }
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
-                    
+                    modulus = 2;
                 }
-
-                if (!strcmp(preset_name, "Normal"))
+                if (!strcasecmp(preset_name, "Normal"))
                 {
                     if( !mux )
                     {
@@ -1171,140 +1368,106 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
-                    if( !advanced_opts )
-                    {
-                        advanced_opts = strdup("ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0");
-                    }
-                    if( !anamorphic_mode )
-                    {
-                        anamorphic_mode = 1;
-                    }
-                    job->chapter_markers = 1;
-                    
-                }
-
-                if (!strcmp(preset_name, "High Profile"))
-                {
-                    if( !mux )
-                    {
-                        mux = HB_MUX_MP4;
-                    }
-                    job->largeFileSize = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vquality = 20.0;
-                    if( !atracks )
+                    if( allowed_audio_copy == -1 )
                     {
-                        atracks = strdup("1,1");
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
                     }
-                    if( !acodecs )
+                    if( acodec_fallback == NULL )
                     {
-                        acodecs = strdup("faac,copy:ac3");
-                    }
-                    if( !abitrates )
-                    {
-                        abitrates = str_split("160,160", ',');
-                    }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("dpl2,auto");
+                        acodec_fallback = "ffac3";
                     }
-                    if( !arates )
+                    if (x264_preset == NULL)
                     {
-                        arates = strdup("Auto,Auto");
+                        x264_preset = strdup("veryfast");
                     }
-                    if( !dynamic_range_compression )
+                    if (h264_profile == NULL)
                     {
-                        dynamic_range_compression = strdup("0.0,0.0");
+                        h264_profile = strdup("main");
                     }
-                    if( !advanced_opts )
+                    if (h264_level == NULL)
                     {
-                        advanced_opts = strdup("b-adapt=2:rc-lookahead=50");
+                        h264_level = strdup("4.0");
                     }
-                    decomb = 1;
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
-                if (!strcmp(preset_name, "Classic"))
+                if (!strcasecmp(preset_name, "High Profile"))
                 {
                     if( !mux )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->vbitrate = 1000;
+                    job->largeFileSize = 1;
+                    vcodec = HB_VCODEC_X264;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
-                        atracks = strdup("1");
+                        atracks = strdup("1,1");
                     }
                     if( !acodecs )
                     {
-                        acodecs = strdup("faac");
+                        acodecs = strdup("faac,copy:ac3");
                     }
                     if( !abitrates )
                     {
-                        abitrates = str_split("160", ',');
+                        abitrates = str_split("160,160", ',');
                     }
                     if( !mixdowns )
                     {
-                        mixdowns = strdup("dpl2");
+                        mixdowns = strdup("dpl2,auto");
                     }
                     if( !arates )
                     {
-                        arates = strdup("Auto");
+                        arates = strdup("Auto,Auto");
                     }
                     if( !dynamic_range_compression )
                     {
-                        dynamic_range_compression = strdup("0.0");
-                    }
-                    
-                }
-
-                if (!strcmp(preset_name, "iPod Legacy"))
-                {
-                    if( !mux )
-                    {
-                        mux = HB_MUX_MP4;
-                    }
-                    job->ipod_atom = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1500;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
+                        dynamic_range_compression = strdup("0.0,0.0");
                     }
-                    if( !acodecs )
+                    if( allowed_audio_copy == -1 )
                     {
-                        acodecs = strdup("faac");
+                        allowed_audio_copy = 0;
+                        allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+                        allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+                        allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+                        allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+                        allowed_audio_copy &= HB_ACODEC_PASS_MASK;
                     }
-                    if( !abitrates )
+                    if( acodec_fallback == NULL )
                     {
-                        abitrates = str_split("160", ',');
+                        acodec_fallback = "ffac3";
                     }
-                    if( !mixdowns )
+                    if (x264_preset == NULL)
                     {
-                        mixdowns = strdup("dpl2");
+                        x264_preset = strdup("medium");
                     }
-                    if( !arates )
+                    if (h264_profile == NULL)
                     {
-                        arates = strdup("Auto");
+                        h264_profile = strdup("high");
                     }
-                    if( !dynamic_range_compression )
+                    if (h264_level == NULL)
                     {
-                        dynamic_range_compression = strdup("0.0");
+                        h264_level = strdup("4.1");
                     }
-                    maxWidth = 640;
-                    if( !advanced_opts )
+                    decomb = 1;
+                    if( !anamorphic_mode )
                     {
-                        advanced_opts = strdup("level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0");
+                        anamorphic_mode = 2;
                     }
+                    modulus = 2;
                     job->chapter_markers = 1;
-                    
                 }
-
             }
 
 			if ( chapter_markers )
@@ -1344,34 +1507,17 @@
                                 {
                                     hb_chapter_t * chapter_s;
 
-                                    chapter_s = hb_list_item( job->title->list_chapter, chapter - 1);
-                                    strncpy(chapter_s->title, cell->cell_text, 1023);
-                                    chapter_s->title[1023] = '\0';
+                                    chapter_s = hb_list_item( job->list_chapter, chapter - 1);
+                                    hb_chapter_set_title(chapter_s, cell->cell_text);
                                 }
                             }
 
 
                             hb_dispose_cell( cell );
                         }
-
                         hb_close_csv_file( file );
                     }
                 }
-                else
-                {
-                    /* No marker file */
-
-                    int number_of_chapters = hb_list_count(job->title->list_chapter);
-                    int chapter;
-
-                    for(chapter = 0; chapter <= number_of_chapters - 1 ; chapter++)
-                    {
-                        hb_chapter_t * chapter_s;
-                        chapter_s = hb_list_item( job->title->list_chapter, chapter);
-                        snprintf( chapter_s->title, 1023, "Chapter %i", chapter + 1 );
-                        chapter_s->title[1023] = '\0';
-                    }
-                }
 			}
 
             if( crop[0] >= 0 && crop[1] >= 0 &&
@@ -1390,44 +1536,50 @@
             job->deinterlace = deinterlace;
             job->grayscale   = grayscale;
             
+            hb_filter_object_t * filter;
+
             /* Add selected filters */
-            job->filters = hb_list_init();
-            
-            if( rotate )
-            {
-                hb_filter_rotate.settings = rotate_opt;
-                hb_list_add( job->filters, &hb_filter_rotate);
-            }
             if( detelecine )
             {
-                hb_filter_detelecine.settings = detelecine_opt;
-                hb_list_add( job->filters, &hb_filter_detelecine );
+                filter = hb_filter_init( HB_FILTER_DETELECINE );
+                hb_add_filter( job, filter, detelecine_opt );
             }
             if( decomb )
             {
-                hb_filter_decomb.settings = decomb_opt;
-                hb_list_add( job->filters, &hb_filter_decomb );
+                filter = hb_filter_init( HB_FILTER_DECOMB );
+                hb_add_filter( job, filter, decomb_opt );
             }
             if( deinterlace )
             {
-                hb_filter_deinterlace.settings = deinterlace_opt;
-                hb_list_add( job->filters, &hb_filter_deinterlace );
+                filter = hb_filter_init( HB_FILTER_DEINTERLACE );
+                hb_add_filter( job, filter, deinterlace_opt );
             }
             if( deblock )
             {
-                hb_filter_deblock.settings = deblock_opt;
-                hb_list_add( job->filters, &hb_filter_deblock );
+                filter = hb_filter_init( HB_FILTER_DEBLOCK );
+                hb_add_filter( job, filter, deblock_opt );
             }
             if( denoise )
             {
-                hb_filter_denoise.settings = denoise_opt;
-                hb_list_add( job->filters, &hb_filter_denoise );
+                filter = hb_filter_init( HB_FILTER_DENOISE );
+                hb_add_filter( job, filter, denoise_opt );
             }
+            if( rotate )
+            {
+                filter = hb_filter_init( HB_FILTER_ROTATE );
+                hb_add_filter( job, filter, rotate_opt);
+            }
+
+
+            if (maxWidth)
+                job->maxWidth = maxWidth;
+            if (maxHeight)
+                job->maxHeight = maxHeight;
 
             switch( anamorphic_mode )
             {
                 case 0: // Non-anamorphic
-                    
+
                     if (modulus)
                     {
                         job->modulus = modulus;
@@ -1587,21 +1739,19 @@
                     
                 break;
             }
+            // Validate and adjust job picture dimensions
+            hb_validate_size( job );
 
-            if( vquality >= 0.0 )
-            {
-                job->vquality = vquality;
-                job->vbitrate = 0;
-            }
-            else if( vbitrate )
-            {
-                job->vquality = -1.0;
-                job->vbitrate = vbitrate;
-            }
-            if( vcodec )
-            {
-                job->vcodec = vcodec;
-            }
+            // Add filter that does cropping and scaling
+            char * filter_str;
+            filter_str = hb_strdup_printf("%d:%d:%d:%d:%d:%d",
+                job->width, job->height, 
+                job->crop[0], job->crop[1], job->crop[2], job->crop[3] );
+            filter = hb_filter_init( HB_FILTER_CROP_SCALE );
+            hb_add_filter( job, filter, filter_str );
+            free( filter_str );
+
+            // Add framerate shaping filter
             if( vrate )
             {
                 job->cfr = cfr;
@@ -1616,56 +1766,107 @@
                 job->vrate = title->rate;
                 job->vrate_base = title->rate_base;
             }
+            filter_str = hb_strdup_printf("%d:%d:%d",
+                job->cfr, job->vrate, job->vrate_base );
+            filter = hb_filter_init( HB_FILTER_VFR );
+            hb_add_filter( job, filter, filter_str );
+            free( filter_str );
+
+            // hb_job_init() will set a default muxer for us
+            // only override it if a specific muxer has been set
+            // note: the muxer must be set after presets, but before encoders
+            if (mux)
+            {
+                job->mux = mux;
+            }
+            // then, muxer options
+            if (largeFileSize)
+            {
+                job->largeFileSize = 1;
+            }
+            if (mp4_optimize)
+            {
+                job->mp4_optimize = 1;
+            }
+            if (ipod_atom)
+            {
+                job->ipod_atom = 1;
+            }
+
+            if( vquality >= 0.0 )
+            {
+                job->vquality = vquality;
+                job->vbitrate = 0;
+            }
+            else if( vbitrate )
+            {
+                job->vquality = -1.0;
+                job->vbitrate = vbitrate;
+            }
+            if( vcodec )
+            {
+                job->vcodec = vcodec;
+            }
 
             /* Grab audio tracks */
             if( atracks )
             {
-                char * token = strtok(atracks, ",");
-                if (token == NULL)
+                char * token = strtok( atracks, "," );
+                if( token == NULL )
                     token = optarg;
                 int track_start, track_end;
-                while( token != NULL )
+                for( ; token != NULL; token = strtok( NULL, "," ) )
                 {
-                    audio = calloc(1, sizeof(*audio));
-                    hb_audio_config_init(audio);
-                    if (strlen(token) >= 3)
+                    if( strlen( token ) >= 3 )
                     {
-                        if (sscanf(token, "%d-%d", &track_start, &track_end) == 2)
+                        if( sscanf( token, "%d-%d", &track_start, &track_end ) == 2 )
                         {
                             int i;
-                            for (i = track_start - 1; i < track_end; i++)
+                            for( i = track_start - 1; i < track_end; i++ )
                             {
-                                if (i != track_start - 1)
+                                if( hb_list_item( title->list_audio, i ) == NULL ) 
                                 {
-                                    audio = calloc(1, sizeof(*audio));
-                                    hb_audio_config_init(audio);
+                                    fprintf( stderr, "Warning: Could not find audio track %d, skipped\n", i + 1 );
+                                    continue;
                                 }
+                                audio = calloc( 1, sizeof( *audio ) );
+                                hb_audio_config_init( audio );
                                 audio->in.track = i;
                                 audio->out.track = num_audio_tracks++;
-                                hb_list_add(audios, audio);
+                                hb_list_add( audios, audio );
                             }
                         }
                         else if( !strcasecmp(token, "none" ) )
                         {
+                            audio = calloc( 1, sizeof( *audio ) );
+                            hb_audio_config_init( audio );
                             audio->in.track = audio->out.track = -1;
                             audio->out.codec = 0;
-                            hb_list_add(audios, audio);
+                            hb_list_add( audios, audio );
                             break;
                         }
                         else
                         {
-                            fprintf(stderr, "ERROR: Unable to parse audio input \"%s\", skipping.\n",
-                                    token);
-                            free(audio);
+                            fprintf( stderr, "ERROR: unable to parse audio input \"%s\", skipping\n",
+                                     token);
                         }
                     }
                     else
                     {
-                        audio->in.track = atoi(token) - 1;
+                        int i = atoi( token ) - 1;
+                        if( hb_list_item( title->list_audio, i ) == NULL ) 
+                        {
+                            fprintf(stderr,
+                                    "Warning: Could not find audio track '%s', skipped\n",
+                                    token);
+                            continue;
+                        }
+                        audio = calloc( 1, sizeof( *audio ) );
+                        hb_audio_config_init( audio );
+                        audio->in.track = i;
                         audio->out.track = num_audio_tracks++;
-                        hb_list_add(audios, audio);
+                        hb_list_add( audios, audio );
                     }
-                    token = strtok(NULL, ",");
                 }
             }
 
@@ -1689,69 +1890,67 @@
                              * Replace any existing audio tracks that a preset may
                              * have put here.
                              */
-                            if( hb_list_count(audios) == 0) {
-                                audio = calloc(1, sizeof(*audio));
-                                hb_audio_config_init(audio);
+                            if( hb_list_count( audios ) == 0 )
+                            {
+                                audio = calloc( 1, sizeof( *audio ) );
+                                hb_audio_config_init( audio );
                                 audio->in.track = track;
                                 audio->out.track = num_audio_tracks++;
                                 /* Add it to our audios */
-                                hb_list_add(audios, audio);
-                            } else {
+                                hb_list_add( audios, audio );
+                            }
+                            else
+                            {
                                 /*
                                  * Update the track numbers on what is already in
                                  * there.
                                  */
-                                for( i=0; i < hb_list_count( audios ); i++ )
+                                for( i = 0; i < hb_list_count( audios ); i++ )
                                 {
                                     audio = hb_list_item( audios, i );
-
                                     audio->in.track = track;
                                 }
                             }
                             break;
                         }
                     }
-                } else {
-                    fprintf( stderr, "Warning: Native language (dubbing) selection ignored since an audio track has already been selected\n");
+                }
+                else
+                {
+                    fprintf( stderr, "Warning: Native language (dubbing) selection ignored since an audio track has already been selected\n" );
                 }
             }
 
             if( hb_list_count(audios) == 0 &&
-                hb_list_count(job->title->list_audio) > 0 )
+                hb_list_count(title->list_audio) > 0 )
             {        
                 /* Create a new audio track with default settings */
-                audio = calloc(1, sizeof(*audio));
-                hb_audio_config_init(audio);
+                audio = calloc( 1, sizeof( *audio ) );
+                hb_audio_config_init( audio );
                 /* Add it to our audios */
-                hb_list_add(audios, audio);
+                hb_list_add( audios, audio );
             }
-
-            tmp_num_audio_tracks = num_audio_tracks = hb_list_count(audios);
-            for (i = 0; i < tmp_num_audio_tracks; i++)
+            tmp_num_audio_tracks = num_audio_tracks = hb_list_count( audios );
+            for( i = 0; i < tmp_num_audio_tracks; i++ )
             {
-                audio = hb_list_item(audios, 0);
-                if( (audio == NULL) || (audio->in.track == -1) ||
-                    (audio->out.track == -1) || (audio->out.codec == 0) )
+                audio = hb_list_item( audios, 0 );
+                if( audio == NULL || 
+                    audio->in.track  == -1 ||
+                    audio->out.track == -1 ||
+                    audio->out.codec ==  0 ||
+                    hb_audio_add( job, audio ) == 0 )
                 {
                     num_audio_tracks--;
                 }
-                else
+                if( audio != NULL )
                 {
-                    if( hb_audio_add( job, audio ) == 0 )
-                    {
-                        fprintf(stderr, "ERROR: Invalid audio input track '%u', exiting.\n", 
-                                audio->in.track + 1 );
-                        num_audio_tracks--;
-                        exit(3);
-                    }
-                }
-                hb_list_rem(audios, audio);
-                if( audio != NULL)
+                    hb_list_rem( audios, audio );
                     if( audio->out.name )
                     {
-                        free( audio->out.name);
+                        free( audio->out.name );
                     }
                     free( audio );
+                }
             }
 
             /* Audio Codecs */
@@ -1766,7 +1965,7 @@
                     if ((acodec = get_acodec_for_string(token)) == -1)
                     {
                         fprintf(stderr, "Invalid codec %s, using default for container.\n", token);
-                        acodec = default_acodec;
+                        acodec = hb_get_default_audio_encoder(job->mux);
                     }
                     if( i < num_audio_tracks )
                     {
@@ -1804,7 +2003,7 @@
                  * then use that codec instead.
                  */
                 if (i != 1)
-                    acodec = default_acodec;
+                    acodec = hb_get_default_audio_encoder(job->mux);
                 for ( ; i < num_audio_tracks; i++)
                 {
                     audio = hb_list_audio_config_item(job->list_audio, i);
@@ -2090,6 +2289,93 @@
             }
             /* Audio Gain */
 
+            /* Audio Dither */
+            if (audio_dither != NULL)
+            {
+                int dither_method = hb_audio_dither_get_default();
+                for (i = 0; audio_dither[i] != NULL; i++)
+                {
+                    dither_method = get_dither_for_string(audio_dither[i]);
+                    audio = hb_list_audio_config_item(job->list_audio, i);
+                    if (audio != NULL)
+                    {
+                        if (hb_audio_dither_is_supported(audio->out.codec))
+                        {
+                            audio->out.dither_method = dither_method;
+                        }
+                        else if (dither_method != hb_audio_dither_get_default())
+                        {
+                            fprintf(stderr,
+                                    "Ignoring dither %s, not supported by codec\n",
+                                    audio_dither[i]);
+                        }
+                    }
+                    else
+                    {
+                        fprintf(stderr, "Ignoring dither %s, no audio tracks\n",
+                                audio_dither[i]);
+                    }
+                }
+                if (i < num_audio_tracks && i == 1)
+                {
+                    /*
+                     * We have fewer inputs than audio tracks, and we only have
+                     * one input: use that for all tracks.
+                     */
+                    while (i < num_audio_tracks)
+                    {
+                        audio = hb_list_audio_config_item(job->list_audio, i);
+                        if (hb_audio_dither_is_supported(audio->out.codec))
+                        {
+                            audio->out.dither_method = dither_method;
+                        }
+                        else if (dither_method != hb_audio_dither_get_default())
+                        {
+                            fprintf(stderr,
+                                    "Ignoring dither %s, not supported by codec\n",
+                                    audio_dither[0]);
+                        }
+                        i++;
+                    }
+                }
+            }
+            /* Audio Dither */
+
+            /* Audio Mix Normalization */
+            i = 0;
+            int norm = 0;
+            if( normalize_mix_level )
+            {
+                for ( i = 0; normalize_mix_level[i] != NULL && i < num_audio_tracks; i++ )
+                {
+                    char * token = normalize_mix_level[i];
+                    norm = atoi(token);
+                    audio = hb_list_audio_config_item(job->list_audio, i);
+
+                    if( audio != NULL )
+                    {
+                        audio->out.normalize_mix_level = norm;
+                    }
+                    else
+                    {
+                        fprintf(stderr, "Ignoring normalization %d, no audio tracks\n", norm);
+                    }
+                }
+            }
+            if (i < num_audio_tracks && i == 1)
+            {
+                /* We have fewer inputs than audio tracks,
+                 * and we only have one input, use
+                 * that for all tracks.
+                 */
+                for (; i < num_audio_tracks; i++)
+                {
+                    audio = hb_list_audio_config_item(job->list_audio, i);
+                    audio->out.normalize_mix_level = norm;
+                }
+            }
+            /* Audio Mix Normalization */
+
             /* Audio Track Names */
             if ( anames )
             {
@@ -2144,11 +2430,7 @@
                     {
                         fprintf( stderr, "AAC Passthru requested and input codec is not AAC for track %d, using AAC encoder\n",
                                  audio->out.track );
-#ifdef __APPLE_CC__
-                        audio->out.codec = HB_ACODEC_CA_AAC;
-#else
-                        audio->out.codec = HB_ACODEC_FAAC;
-#endif
+                        audio->out.codec = hb_audio_encoders[0].encoder;
                     }
                     else if( audio->out.codec == HB_ACODEC_AC3_PASS )
                     {
@@ -2236,7 +2518,9 @@
                         subtitle = hb_list_item(title->list_subtitle, track);
                         if( subtitle == NULL ) 
                         {
-                            fprintf( stderr, "Warning: Could not find subtitle track %d, skipped\n", track+1 );
+                            fprintf(stderr,
+                                    "Warning: Could not find subtitle track '%s', skipped\n",
+                                    token);
                             continue;
                         }
                         sub_config = subtitle->config;
@@ -2254,11 +2538,10 @@
 
                         force = test_sub_list(subforce, i+1);
                         
-                        int supports_burn =
-                            ( subtitle->source == VOBSUB ) ||
-                            ( subtitle->source == SSASUB );
+                        int supports_burn = hb_subtitle_can_burn( subtitle->source );
                         
-                        if ( burn && supports_burn )
+                        if ( ( burn && supports_burn ) ||
+                             !hb_subtitle_can_pass( subtitle->source, mux ) )
                         {
                             // Only allow one subtitle to be burned into video
                             if ( sub_burned )
@@ -2282,9 +2565,18 @@
                 }
             }
 
+            if ( sub_burned )
+            {
+                char * filter_str;
+                filter_str = hb_strdup_printf("%d:%d:%d:%d",
+                    job->crop[0], job->crop[1], job->crop[2], job->crop[3] );
+                filter = hb_filter_init( HB_FILTER_RENDER_SUB );
+                hb_add_filter( job, filter, filter_str);
+                free( filter_str );
+            }
+
             if( srtfile )
             {
-                char * token;
                 int i;
                 hb_subtitle_config_t sub_config;
 
@@ -2294,7 +2586,6 @@
                     int64_t offset = 0;
                     char *lang = "und";
 
-                    token = srtfile[i];
                     if( srtcodeset && srtcodeset[i] )
                     {
                         codeset = srtcodeset[i];
@@ -2391,42 +2682,18 @@
                 }
             }
 
-            if( job->mux )
-            {
-                job->mux = mux;
-            }
-
-            if ( largeFileSize )
-            {
-                job->largeFileSize = 1;
-            }
-            if ( mp4_optimize )
-            {
-                job->mp4_optimize = 1;
-            }
-            if ( ipod_atom )
-            {
-                job->ipod_atom = 1;
-            }
-
-            job->file = strdup( output );
+            hb_job_set_file( job, output );
 
             if( color_matrix_code )
             {
                 job->color_matrix_code = color_matrix_code;
             }
 
-            if( advanced_opts != NULL && *advanced_opts != '\0' )
-            {
-                job->advanced_opts = advanced_opts;
-            }
-            else /*avoids a bus error crash when options aren't specified*/
-            {
-                job->advanced_opts =  NULL;
-            }
-            job->x264_profile = x264_profile;
-            job->x264_preset = x264_preset;
-            job->x264_tune = x264_tune;
+            hb_job_set_x264_preset(job, x264_preset);
+            hb_job_set_x264_tune(job, x264_tune);
+            hb_job_set_h264_profile(job, h264_profile);
+            hb_job_set_h264_level(job, h264_level);
+
             if (maxWidth)
                 job->maxWidth = maxWidth;
             if (maxHeight)
@@ -2464,17 +2731,13 @@
             
             if( subtitle_scan )
             {
-                char *advanced_opts_tmp;
-
                 /*
                  * When subtitle scan is enabled do a fast pre-scan job
                  * which will determine which subtitles to enable, if any.
                  */
                 job->pass = -1;
 
-                advanced_opts_tmp = job->advanced_opts;
-
-                job->advanced_opts = NULL;
+                hb_job_set_advanced_opts(job, NULL);
 
                 job->indepth_scan = subtitle_scan;
                 fprintf( stderr, "Subtitle Scan Enabled - enabling "
@@ -2484,10 +2747,10 @@
                  * Add the pre-scan job
                  */
                 hb_add( h, job );
-
-                job->advanced_opts = advanced_opts_tmp;
             }
 
+            hb_job_set_advanced_opts(job, advanced_opts);
+
             if( twoPass )
             {
                 /*
@@ -2499,41 +2762,16 @@
 
                 job->indepth_scan = 0;
 
-                if (advanced_opts)
+                /* Turbo first pass */
+                if( turbo_opts_enabled )
                 {
-                    advanced_opts2 = strdup(advanced_opts);
+                    job->fastfirstpass = 1;
                 }
-
-                /*
-                 * If turbo options have been selected then append them
-                 * to the advanced_opts now (size includes one ':' and the '\0')
-                 */
-                if( turbo_opts_enabled )
+                else
                 {
-                    int size = (advanced_opts ? strlen(advanced_opts) : 0) + strlen(turbo_opts) + 2;
-                    char *tmp_advanced_opts;
-
-                    tmp_advanced_opts = malloc(size * sizeof(char));
-                    if( advanced_opts )
-                    {
-                        snprintf( tmp_advanced_opts, size, "%s:%s",
-                                  advanced_opts, turbo_opts );
-                        free( advanced_opts );
-                    } else {
-                        /*
-                         * No advanced_opts to modify, but apply the turbo options
-                         * anyway as they may be modifying defaults
-                         */
-                        snprintf( tmp_advanced_opts, size, "%s",
-                                  turbo_opts );
-                    }
-                    advanced_opts = tmp_advanced_opts;
-
-                    fprintf( stderr, "Modified x264 options for pass 1 to append turbo options: %s\n",
-                             advanced_opts );
-
-                    job->advanced_opts = advanced_opts;
+                    job->fastfirstpass = 0;
                 }
+
                 hb_add( h, job );
 
                 job->pass = 2;
@@ -2545,8 +2783,6 @@
                  */
                 job->indepth_scan = 0;
 
-                job->advanced_opts = advanced_opts2;
-
                 hb_add( h, job );
             }
             else
@@ -2558,8 +2794,10 @@
 
                 job->indepth_scan = 0;
                 job->pass = 0;
+
                 hb_add( h, job );
             }
+            hb_job_close( &job );
             hb_start( h );
             break;
         }
@@ -2666,7 +2904,6 @@
     "                            double quotation marks\n"
     "    -z, --preset-list       See a list of available built-in presets\n"
     "        --no-dvdnav         Do not use dvdnav for reading DVDs\n"
-    "                            (experimental, enabled by default for testing)\n"
     "\n"
 
     "### Source Options-----------------------------------------------------------\n\n"
@@ -2680,8 +2917,8 @@
     "    -c, --chapters <string> Select chapters (e.g. \"1-3\" for chapters\n"
     "                            1 to 3, or \"3\" for chapter 3 only,\n"
     "                            default: all chapters)\n"
-    "        --angle <number>    Select the DVD angle\n"
-    "        --previews <#:B>    Select how many preview images are generated (max 30),\n"
+    "        --angle <number>    Select the video angle (DVD or Blu-ray only)\n"
+    "        --previews <#:B>    Select how many preview images are generated,\n"
     "                            and whether or not they're stored to disk (0 or 1).\n"
     "                            (default: 10:0)\n"
     "    --start-at-preview <#>  Start encoding at a given preview.\n"
@@ -2695,10 +2932,10 @@
     "    -o, --output <string>   Set output file name\n"
     "    -f, --format <string>   Set output format (mp4/mkv, default:\n"
     "                            autodetected from file name)\n"
-    "    -m, --markers           Add chapter markers (mp4 and mkv output formats only)\n"
-    "    -4, --large-file        Use 64-bit mp4 files that can hold more than\n"
-    "                            4 GB. Note: Breaks iPod, PS3 compatibility.\n"""
-    "    -O, --optimize          Optimize mp4 files for HTTP streaming\n"
+    "    -m, --markers           Add chapter markers\n"
+    "    -4, --large-file        Create 64-bit mp4 files that can hold more than 4 GB\n"
+    "                            of data. Note: breaks pre-iOS iPod compatibility.\n"
+    "    -O, --optimize          Optimize mp4 files for HTTP streaming (\"fast start\")\n"
     "    -I, --ipod-atom         Mark mp4 files so 5.5G iPods will accept them\n"
     "\n"
 
@@ -2769,10 +3006,32 @@
     "    -x, --encopts <string>  Specify advanced encoder options in the\n"
     "                            same style as mencoder (x264 and ffmpeg only):\n"
     "                            option1=value1:option2=value2\n"
-    "        --x264-profile      When using x264, ensures compliance with the\n"
-    "          <string>          specified h.264 profile:\n"
+    "        --h264-profile      When using x264, ensures compliance with the\n"
+    "          <string>          specified H.264 profile:\n"
+    "                            ");
+    x264_opts = hb_h264_profiles();
+    tmp[0] = 0;
+    len = 0;
+    while( x264_opts && *x264_opts )
+    {
+        strncat( tmp, *x264_opts++, 79 - len );
+        if( *x264_opts )
+            strcat( tmp, "/" );
+        len = strlen( tmp );
+        if( len > 40 && *x264_opts )
+        {
+            fprintf( out, "%s\n                            ", tmp );
+            len = 0;
+            tmp[0] = 0;
+        }
+    }
+    if( len )
+        fprintf( out, "%s\n", tmp );
+    fprintf( out,
+    "        --h264-level        When using x264, ensures compliance with the\n"
+    "          <string>          specified H.264 level:\n"
     "                            ");
-    x264_opts = hb_x264_profiles();
+    x264_opts = hb_h264_levels();
     tmp[0] = 0;
     len = 0;
     while( x264_opts && *x264_opts )
@@ -2794,10 +3053,8 @@
     "    -q, --quality <number>  Set video quality\n"
     "    -b, --vb <kb/s>         Set video bitrate (default: 1000)\n"
     "    -2, --two-pass          Use two-pass mode\n"
-    "    -T, --turbo             When using 2-pass use the turbo options\n"
-    "                            on the first pass to improve speed\n"
-    "                            (only works with x264, affects PSNR by about 0.05dB,\n"
-    "                            and increases first pass speed two to four times)\n"
+    "    -T, --turbo             When using 2-pass use \"turbo\" options on the\n"
+    "                            1st pass to improve speed (only works with x264)\n"
     "    -r, --rate              Set video framerate (" );
     for( i = 0; i < hb_video_rates_count; i++ )
     {
@@ -2827,35 +3084,36 @@
     "                             tracks, default: first one).\n"
     "                            Multiple output tracks can be used for one input.\n"
     "    -E, --aencoder <string> Audio encoder(s):\n" );
-    for( i = 0; i < hb_audio_encoders_count; i++ )
+    for (i = 0; i < hb_audio_encoders_count; i++)
     {
-        fprintf( out, "                               %s\n",
-                 hb_audio_encoders[i].short_name );
+        fprintf(out, "                               %s\n",
+                hb_audio_encoders[i].short_name);
     }
-    fprintf( out,
+    fprintf(out,
     "                            copy:* will passthrough the corresponding\n"
     "                            audio unmodified to the muxer if it is a\n"
     "                            supported passthrough audio type.\n"
     "                            Separated by commas for more than one audio track.\n"
-#ifdef __APPLE_CC__
-    "                            (default: ca_aac)\n"
-#else
-    "                            (default: faac for mp4, lame for mkv)\n"
-#endif
+    "                            (default: %s for mp4, %s for mkv)\n",
+            get_string_for_acodec(hb_get_default_audio_encoder(HB_MUX_MP4)),
+            get_string_for_acodec(hb_get_default_audio_encoder(HB_MUX_MKV)));
+    fprintf(out,
     "        --audio-copy-mask   Set audio codecs that are permitted when the\n"
     "                <string>    \"copy\" audio encoder option is specified\n"
     "                            (" );
-    for( i = 0, j = 0; i < hb_audio_encoders_count; i++ )
+    for (i = j = 0; i < hb_audio_encoders_count; i++)
     {
-        if( !strncmp( hb_audio_encoders[i].short_name, "copy:", 5 ) )
+        if ((hb_audio_encoders[i].encoder &  HB_ACODEC_PASS_FLAG) &&
+            (hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS))
         {
-            if( j != 0 )
-                fprintf( out, "/" );
-            fprintf( out, "%s", hb_audio_encoders[i].short_name + 5 );
+            if (j)
+                fprintf(out, "/");
+            // skip "copy:"
+            fprintf(out, "%s", hb_audio_encoders[i].short_name + 5);
             j = 1;
         }
     }
-    fprintf( out, ", default: all).\n"
+    fprintf(out, ", default: all).\n"
     "                            Separated by commas for multiple allowed options.\n"
     "        --audio-fallback    Set audio codec to use when it is not possible\n"
     "                <string>    to copy an audio track without re-encoding.\n"
@@ -2868,10 +3126,34 @@
     "    -C, --ac <compression>  Set audio compression metric (default: depends on the\n"
     "                            selected codec)\n"
     "                            Separated by commas for more than one audio track.\n"
-    "    -6, --mixdown <string>  Format(s) for surround sound downmixing\n"
+    "    -6, --mixdown <string>  Format(s) for audio downmixing/upmixing:\n");
+    // skip HB_AMIXDOWN_NONE
+    for (i = 1; i < hb_audio_mixdowns_count; i++)
+    {
+        fprintf(out, "                               %s\n",
+                hb_audio_mixdowns[i].short_name);
+    }
+    fprintf(out,
     "                            Separated by commas for more than one audio track.\n"
-    "                            (mono/stereo/dpl1/dpl2/6ch, default: up to 6ch for ac3,\n"
-    "                            up to dpl2 for other encoders)\n"
+    "                            Defaults:\n");
+    for (i = 0; i < hb_audio_encoders_count; i++)
+    {
+        if (!(hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG))
+        {
+            // layout: UINT64_MAX (all channels) should work with any mixdown
+            int mixdown = hb_get_default_mixdown(hb_audio_encoders[i].encoder,
+                                                 UINT64_MAX);
+            // assumes that the encoder short name is <= 16 characters long
+            fprintf(out, "                               %-16s up to %s\n",
+                    hb_audio_encoders[i].short_name,
+                    hb_mixdown_get_short_name_from_mixdown(mixdown));
+        }
+    }
+    fprintf(out,
+    "        --normalize-mix     Normalize audio mix levels to prevent clipping.\n"
+    "               <string>     Separated by commas for more than one audio track.\n"
+    "                            0 = Disable Normalization (default)\n"
+    "                            1 = Enable Normalization\n"
     "    -R, --arate             Set audio samplerate(s) (" );
     for( i = 0; i < hb_audio_rates_count; i++ )
     {
@@ -2889,19 +3171,49 @@
     "                            NOT work with audio passthru (copy). Values are in\n"
     "                            dB.  Negative values attenuate, positive values\n"
     "                            amplify. A 1 dB difference is barely audible.\n"
+    "        --adither <string>  Apply dithering to the audio before encoding.\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "                            Only supported by some encoders (");
+    for (i = j = 0; i < hb_audio_encoders_count; i++)
+    {
+        if (hb_audio_dither_is_supported(hb_audio_encoders[i].encoder))
+        {
+            if (j)
+                fprintf(out, "/");
+            fprintf(out, "%s", hb_audio_encoders[i].short_name);
+            j = 1;
+        }
+    }
+    fprintf(out, ").\n");
+    fprintf(out,
+    "                            Options:\n");
+    for (i = 0; i < hb_audio_dithers_count; i++)
+    {
+        if (hb_audio_dithers[i].method == hb_audio_dither_get_default())
+        {
+            fprintf(out, "                               %s (default)\n",
+                    hb_audio_dithers[i].short_name);
+        }
+        else
+        {
+            fprintf(out, "                               %s\n",
+                    hb_audio_dithers[i].short_name);
+        }
+    }
+    fprintf(out,
     "    -A, --aname <string>    Audio track name(s),\n"
     "                            Separated by commas for more than one audio track.\n"
     "\n"
 
     "### Picture Settings---------------------------------------------------------\n\n"
-    "    -w, --width <number>    Set picture width\n"
+    "    -w, --width  <number>   Set picture width\n"
     "    -l, --height <number>   Set picture height\n"
-    "        --crop <T:B:L:R>    Set cropping values (default: autocrop)\n"
-    "        --loose-crop        Always crop to a multiple of the modulus\n"
-    "          <#>               Specifies the maximum number of extra pixels\n"
+    "        --crop  <T:B:L:R>   Set cropping values (default: autocrop)\n"
+    "        --loose-crop  <#>   Always crop to a multiple of the modulus\n"
+    "                            Specifies the maximum number of extra pixels\n"
     "                            which may be cropped (default: 15)\n"
-    "    -Y, --maxHeight <#>     Set maximum height\n"
-    "    -X, --maxWidth <#>      Set maximum width\n"
+    "    -Y, --maxHeight   <#>   Set maximum height\n"
+    "    -X, --maxWidth    <#>   Set maximum width\n"
     "    --strict-anamorphic     Store pixel aspect ratio in video stream\n"
     "    --loose-anamorphic      Store pixel aspect ratio with specified width\n"
     "    --custom-anamorphic     Store pixel aspect ratio in video stream and\n"
@@ -2919,29 +3231,31 @@
     "    --modulus               Set the number you want the scaled pixel dimensions\n"
     "      <number>              to divide cleanly by. Does not affect strict\n"
     "                            anamorphic mode, which is always mod 2 (default: 16)\n"
-    "    -M  --color-matrix      Set the color space signaled by the output\n"
-    "          <601 or 709>      (Bt.601 is mostly for SD content, Bt.709 for HD,\n"
-    "                             default: set by resolution)\n"
+    "    -M, --color-matrix      Set the color space signaled by the output\n"
+    "                            Values: 709, pal, ntsc, 601 (same as ntsc)\n"
+    "                            (default: detected from source)\n"
     "\n"
 
     "### Filters---------------------------------------------------------\n\n"
 
-     "    -d, --deinterlace       Deinterlace video with yadif/mcdeint filter\n"
-     "          <YM:FD:MM:QP>     (default 0:-1:-1:1)\n"
+     "    -d, --deinterlace       Deinterlace video with Libav, yadif or mcdeint\n"
+     "          <fast/slow/slower/bob> or omitted (default settings)\n"
      "           or\n"
-     "          <fast/slow/slower>\n"
+     "          <YM:FD:MM:QP>     (default 0:-1:-1:1)\n"
      "    -5, --decomb            Selectively deinterlaces when it detects combing\n"
+     "          <fast/bob> or omitted (default settings)\n"
+     "           or\n"
      "          <MO:ME:MT:ST:BT:BX:BY:MG:VA:LA:DI:ER:NO:MD:PP:FD>\n"
      "          (default: 7:2:6:9:80:16:16:10:20:20:4:2:50:24:1:-1)\n"
      "    -9, --detelecine        Detelecine (ivtc) video with pullup filter\n"
      "                            Note: this filter drops duplicate frames to\n"
      "                            restore the pre-telecine framerate, unless you\n"
      "                            specify a constant framerate (--rate 29.97)\n"
-     "          <L:R:T:B:SB:MP:FD>   (default 1:1:4:4:0:0:-1)\n"
+     "          <L:R:T:B:SB:MP:FD> (default 1:1:4:4:0:0:-1)\n"
      "    -8, --denoise           Denoise video with hqdn3d filter\n"
-     "          <SL:SC:TL:TC>     (default 4:3:6:4.5)\n"
+     "          <weak/medium/strong> or omitted (default settings)\n"
      "           or\n"
-     "          <weak/medium/strong>\n"
+     "          <SL:SC:TL:TC>     (default 4:3:6:4.5)\n"
      "    -7, --deblock           Deblock video with pp7 filter\n"
      "          <QP:M>            (default 5:2)\n"
      "        --rotate            Flips images axes\n"
@@ -2993,14 +3307,14 @@
     "                            subtitle track is used instead.\n"
     "        --srt-file <string> SubRip SRT filename(s), separated by commas.\n"
     "        --srt-codeset       Character codeset(s) that the SRT file(s) are\n"
-    "          <string>          encoded in, separted by commas.\n"
+    "          <string>          encoded in, separated by commas.\n"
     "                            Use 'iconv -l' for a list of valid\n"
-    "                            codesets. If not specified latin1 is assumed\n"
-    "        --srt-offset        Offset in milli-seconds to apply to the SRT file(s)\n"
-    "          <string>          separted by commas. If not specified zero is assumed.\n"
+    "                            codesets. If not specified, 'latin1' is assumed\n"
+    "        --srt-offset        Offset (in milliseconds) to apply to the SRT file(s),\n"
+    "          <string>          separated by commas. If not specified, zero is assumed.\n"
     "                            Offsets may be negative.\n"
     "        --srt-lang <string> Language as an iso639-2 code fra, eng, spa et cetera)\n"
-    "                            for the SRT file(s) separated by commas. If not specified\n"
+    "                            for the SRT file(s), separated by commas. If not specified,\n"
     "                            then 'und' is used.\n"
     "        --srt-default       Flag the selected srt as the default subtitle\n"
     "          <number>          to be displayed upon playback.  Setting no default\n"
@@ -3021,45 +3335,20 @@
     fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
 
     printf("\n< Devices\n");
-    
-    printf("\n   + Universal:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6\n");
-    
-    printf("\n   + iPod:  -e x264  -b 700 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n");
-    
-    printf("\n   + iPhone & iPod Touch:  -e x264  -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
-    
-    printf("\n   + iPhone 4:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 960 --loose-anamorphic -m\n");
-    
-    printf("\n   + iPad:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
-    
-    printf("\n   + AppleTV:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
-    
-    printf("\n   + AppleTV 2:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
-    
-    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1920 --decomb=\"7:2:6:9:1:80\" --loose-anamorphic --modulus 2 -m -x b-adapt=2\n");
-    
-    printf("\n   + Android Mid:  -e x264  -q 22.0 -r 29.97 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
-    
-    printf("\n   + Android High:  -e x264  -q 22.0 -r 29.97 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 720 --loose-anamorphic -x weightp=0:cabac=0\n");
-    
+    printf("\n   + Universal:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 -m --x264-preset fast --h264-profile baseline --h264-level 3.0\n");
+    printf("\n   + iPod:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -I -X 320 -Y 240 --modulus 2 -m --x264-preset medium --h264-profile baseline --h264-level 1.3\n");
+    printf("\n   + iPhone & iPod touch:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 640 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+    printf("\n   + iPad:  -e x264  -q 20.0 -r 30 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+    printf("\n   + AppleTV:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1 -x qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
+    printf("\n   + AppleTV 2:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1920 -Y 1080 --decomb=fast --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.0\n");
+    printf("\n   + Android:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.0\n");
+    printf("\n   + Android Tablet:  -e x264  -q 22.0 -r 30 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.1\n");
     printf("\n>\n");
-    
     printf("\n< Regular\n");
-    
-    printf("\n   + Normal:  -e x264  -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 --strict-anamorphic -m -x ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0\n");
-    
-    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
-    
+    printf("\n   + Normal:  -e x264  -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 --loose-anamorphic --modulus 2 -m --x264-preset veryfast --h264-profile main --h264-level 4.0\n");
+    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 --decomb --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.1\n");
     printf("\n>\n");
-    
-    printf("\n< Legacy\n");
-    
-    printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\n");
-    
-    printf("\n   + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n");
-    
-    printf("\n>\n");
-
 }
 
 static char * hb_strndup( char * str, int len )
@@ -3124,6 +3413,21 @@
     free( strv );
 }
 
+static double parse_hhmmss_strtok()
+{
+    /* Assumes strtok has already been called on a string.  Intends to parse
+     * hh:mm:ss.ss or mm:ss.ss or ss.ss or ss into double seconds.  Actually
+     * parses a list of doubles separated by colons, multiplying the current
+     * result by 60 then adding in the next value.  Malformed input does not
+     * result in a explicit error condition but instead returns an
+     * intermediate result. */
+    double duration = 0;
+    char* str;
+    while ((str = strtok(NULL, ":")) != NULL)
+        duration = 60*duration + strtod(str, NULL);
+    return duration;
+}
+
 /****************************************************************************
  * ParseOptions:
  ****************************************************************************/
@@ -3156,9 +3460,12 @@
     #define ALLOWED_AUDIO_COPY  280
     #define AUDIO_FALLBACK      281
     #define LOOSE_CROP          282
-    #define X264_PROFILE        283
-    #define X264_PRESET         284
-    #define X264_TUNE           285
+    #define X264_PRESET         283
+    #define X264_TUNE           284
+    #define H264_PROFILE        285
+    #define H264_LEVEL          286
+    #define NORMALIZE_MIX       287
+    #define AUDIO_DITHER        288
     
     for( ;; )
     {
@@ -3185,8 +3492,10 @@
             { "markers",     optional_argument, NULL,    'm' },
             { "audio",       required_argument, NULL,    'a' },
             { "mixdown",     required_argument, NULL,    '6' },
+            { "normalize-mix", required_argument, NULL,  NORMALIZE_MIX },
             { "drc",         required_argument, NULL,    'D' },
             { "gain",        required_argument, NULL,    AUDIO_GAIN },
+            { "adither",     required_argument, NULL,    AUDIO_DITHER },
             { "subtitle",    required_argument, NULL,    's' },
             { "subtitle-forced", optional_argument,   NULL,    'F' },
             { "subtitle-burned", optional_argument,   NULL,    SUB_BURNED },
@@ -3228,10 +3537,12 @@
             { "ac",          required_argument, NULL,    'C' },
             { "rate",        required_argument, NULL,    'r' },
             { "arate",       required_argument, NULL,    'R' },
-            { "encopts",     required_argument, NULL,    'x' },
-            { "x264-profile", required_argument, NULL,   X264_PROFILE },
             { "x264-preset", required_argument, NULL,    X264_PRESET },
             { "x264-tune",   required_argument, NULL,    X264_TUNE },
+            { "encopts",     required_argument, NULL,    'x' },
+            { "x264-profile", required_argument, NULL,   H264_PROFILE },
+            { "h264-profile", required_argument, NULL,   H264_PROFILE },
+            { "h264-level",  required_argument, NULL,    H264_LEVEL },
             { "turbo",       no_argument,       NULL,    'T' },
             { "maxHeight",   required_argument, NULL,    'Y' },
             { "maxWidth",    required_argument, NULL,    'X' },
@@ -3247,9 +3558,6 @@
             { "vfr",         no_argument,       &cfr,    0 },
             { "cfr",         no_argument,       &cfr,    1 },
             { "pfr",         no_argument,       &cfr,    2 },
-#if defined( __APPLE_CC__ )
-            { "no-vlc-dylib-path", no_argument, &no_vlc_dylib,    1 },
-#endif
             { "audio-copy-mask", required_argument, NULL, ALLOWED_AUDIO_COPY },
             { "audio-fallback",  required_argument, NULL, AUDIO_FALLBACK },
             { 0, 0, 0, 0 }
@@ -3402,6 +3710,18 @@
                     audio_gain = strdup( optarg );
                 }
                 break;
+            case AUDIO_DITHER:
+                if (optarg != NULL)
+                {
+                    audio_dither = str_split(optarg, ',');
+                }
+                break;
+            case NORMALIZE_MIX:
+                if( optarg != NULL )
+                {
+                    normalize_mix_level = str_split( optarg, ',' );
+                }
+                break;
             case 's':
                 subtracks = str_split( optarg, ',' );
                 break;
@@ -3464,15 +3784,19 @@
                 {
                     if (!( strcmp( optarg, "fast" ) ))
                     {
-                        deinterlace_opt = "-1";
+                        deinterlace_opt = "0";
                     }
                     else if (!( strcmp( optarg, "slow" ) ))
                     {
-                        deinterlace_opt = "2";
+                        deinterlace_opt = "1";
                     }
                     else if (!( strcmp( optarg, "slower" ) ))
                     {
-                        deinterlace_opt = "0";
+                        deinterlace_opt = "3";
+                    }
+                    else if (!( strcmp( optarg, "bob" ) ))
+                    {
+                        deinterlace_opt = "15";
                     }
                     else
                     {
@@ -3520,7 +3844,18 @@
             case '5':
                 if( optarg != NULL )
                 {
-                    decomb_opt = strdup( optarg );
+                    if (!( strcmp( optarg, "fast" ) ))
+                    {
+                        decomb_opt = "7:2:6:9:1:80";
+                    }
+                    else if (!( strcmp( optarg, "bob" ) ))
+                    {
+                        decomb_opt = "455";
+                    }
+                    else
+                    {
+                        decomb_opt = strdup( optarg );
+                    }
                 }
                 decomb = 1;
                 break;
@@ -3531,6 +3866,7 @@
                 if( optarg != NULL )
                 {
                     rotate_opt = strdup( optarg );
+                    rotate_val = atoi( optarg );
                 }
                 rotate = 1;
                 break;
@@ -3641,18 +3977,21 @@
             case 'C':
                 acompressions = str_split( optarg, ',' );
                 break;
-            case 'x':
-                advanced_opts = strdup( optarg );
-                break;
-            case X264_PROFILE:
-                x264_profile = strdup( optarg );
-                break;
             case X264_PRESET:
                 x264_preset = strdup( optarg );
                 break;
             case X264_TUNE:
                 x264_tune = strdup( optarg );
                 break;
+            case 'x':
+                advanced_opts = strdup( optarg );
+                break;
+            case H264_PROFILE:
+                h264_profile = strdup( optarg );
+                break;
+            case H264_LEVEL:
+                h264_level = strdup( optarg );
+                break;
             case 'T':
                 turbo_opts_enabled = 1;
                 break;
@@ -3675,6 +4014,9 @@
                 start_at_preview = atoi( optarg );
                 break;
             case START_AT:
+            {
+                char * start_at_string = NULL;
+                char * start_at_token = NULL;
                 start_at_string = strdup( optarg );
                 start_at_token = strtok( start_at_string, ":");
                 if( !strcmp( start_at_token, "frame" ) )
@@ -3689,12 +4031,16 @@
                 }
                 else if( !strcmp( start_at_token, "duration" ) )
                 {
-                    start_at_token = strtok( NULL, ":");
-                    sscanf( start_at_token, "%"SCNd64, &start_at_pts );
-                    start_at_pts *= 90000LL;
+                    double duration_seconds = parse_hhmmss_strtok();
+                    start_at_pts = (int64_t)(duration_seconds * 90e3);
                 }
+                free( start_at_string );
                 break;
+            }
             case STOP_AT:
+            {
+                char * stop_at_string = NULL;
+                char * stop_at_token = NULL;
                 stop_at_string = strdup( optarg );
                 stop_at_token = strtok( stop_at_string, ":");
                 if( !strcmp( stop_at_token, "frame" ) )
@@ -3709,11 +4055,12 @@
                 }
                 else if( !strcmp( stop_at_token, "duration" ) )
                 {
-                    stop_at_token = strtok( NULL, ":");
-                    sscanf( stop_at_token, "%"SCNd64, &stop_at_pts );
-                    stop_at_pts *= 90000LL;
+                    double duration_seconds = parse_hhmmss_strtok();
+                    stop_at_pts = (int64_t)(duration_seconds * 90e3);
                 }
+                free( stop_at_string );
                 break;
+            }
             case ALLOWED_AUDIO_COPY:
             {
                 int i, j;
@@ -3724,7 +4071,7 @@
                 {
                     for( j = 0; j < hb_audio_encoders_count; j++ )
                     {
-                        char * encoder = hb_audio_encoders[j].short_name;
+                        const char *encoder = hb_audio_encoders[j].short_name;
                         // skip "copy:"
                         if( strlen( encoder ) > 5 )
                             encoder += 5;
@@ -3742,11 +4089,16 @@
                 acodec_fallback = strdup( optarg );
                 break;
             case 'M':
-                if( atoi( optarg ) == 601 )
-                    color_matrix_code = 1;
-                else if( atoi( optarg ) == 709 )
-                    color_matrix_code = 2;
-                break;
+                if( optarg != NULL )
+                {
+                    if( !strcmp( optarg, "601" ) ||
+                        !strcmp( optarg, "ntsc" ) )
+                        color_matrix_code = 1;
+                    else if( !strcmp( optarg, "pal" ) )
+                        color_matrix_code = 2;
+                    else if( !strcmp( optarg, "709" ) )
+                        color_matrix_code = 3;
+                } break;
             case MIN_DURATION:
                 min_title_duration = strtol( optarg, NULL, 0 );
                 break;
@@ -3761,72 +4113,6 @@
 
 static int CheckOptions( int argc, char ** argv )
 {
-#if defined( __APPLE_CC__ )
-    // If OSX, add VLC dylib path and exec to make it stick.
-    char *dylib_path;
-
-    if ( !no_vlc_dylib )
-    {
-        dylib_path = getenv("DYLD_FALLBACK_LIBRARY_PATH");
-        if ( dylib_path == NULL ||
-             strstr( dylib_path, "/Applications/VLC.app/Contents/MacOS/lib" ) == NULL )
-        {
-            char *path = NULL;
-            char *home;
-            int result = -1;
-
-            home = getenv("HOME");
-
-            if ( dylib_path == NULL )
-            {
-                // Set the system default of $HOME/lib:/usr/local/lib:/usr/lib
-                // And add our extra path
-                if ( home != NULL )
-                {
-                    path = hb_strdup_printf("%s/lib:%s:%s:%s%s", home, 
-                                      DEFAULT_DYLD_PATH, 
-                                      EXTRA_VLC_DYLD_PATH, 
-                                      home, EXTRA_VLC_DYLD_PATH);
-                }
-                else
-                {
-                    path = hb_strdup_printf("%s:%s", DEFAULT_DYLD_PATH, EXTRA_VLC_DYLD_PATH);
-                }
-                if ( path != NULL )
-                    result = setenv("DYLD_FALLBACK_LIBRARY_PATH", path, 1);
-            }
-            else
-            {
-                // add our extra path
-                if ( home != NULL )
-                {
-                    path = hb_strdup_printf("%s:%s:%s%s", dylib_path, EXTRA_VLC_DYLD_PATH,
-                                                        home, EXTRA_VLC_DYLD_PATH);
-                }
-                else
-                {
-                    path = hb_strdup_printf("%s:%s", dylib_path, EXTRA_VLC_DYLD_PATH);
-                }
-                if ( path != NULL )
-                    result = setenv("DYLD_FALLBACK_LIBRARY_PATH", path, 1);
-            }
-            if ( result == 0 )
-            {
-                const char ** new_argv;
-                int i;
-
-                new_argv = (const char**)malloc( (argc + 2) * sizeof(char*) );
-                new_argv[0] = argv[0];
-                new_argv[1] = "--no-vlc-dylib-path";
-                for (i = 1; i < argc; i++)
-                    new_argv[i+1] = argv[i];
-                new_argv[i+1] = NULL;
-                execv(new_argv[0], (char* const*)new_argv);
-            }
-        }
-    }
-#endif
-
     if( update )
     {
         return 0;
@@ -3862,10 +4148,6 @@
             else if( p && !strcasecmp(p, ".mkv" ) )
             {
                 mux = HB_MUX_MKV;
-#ifndef __APPLE_CC__
-                // default to Lame for MKV (except under OS X where Core Audio is available)
-                default_acodec = HB_ACODEC_LAME;
-#endif
             }
             else
             {
@@ -3882,10 +4164,6 @@
         else if( !strcasecmp( format, "mkv" ) )
         {
             mux = HB_MUX_MKV;
-#ifndef __APPLE_CC__
-            // default to Lame for MKV (except under OS X where Core Audio is available)
-            default_acodec = HB_ACODEC_LAME;
-#endif
         }
         else
         {
@@ -3898,18 +4176,43 @@
     return 0;
 }
 
-static int get_acodec_for_string( char *codec )
+static int get_dither_for_string(const char *dither)
 {
-    int i, acodec;
-    for( i = 0, acodec = 0; i < hb_audio_encoders_count; i++ )
+    int i;
+    for (i = 0; i < hb_audio_dithers_count; i++)
     {
-        if( !strcasecmp( hb_audio_encoders[i].short_name, codec ) )
+        if (!strcasecmp(hb_audio_dithers[i].short_name, dither))
         {
-            acodec = hb_audio_encoders[i].encoder;
-            break;
+            return hb_audio_dithers[i].method;
+        }
+    }
+    return hb_audio_dither_get_default();
+}
+
+static int get_acodec_for_string(const char *codec)
+{
+    int i;
+    for (i = 0; i < hb_audio_encoders_count; i++)
+    {
+        if (!strcasecmp(hb_audio_encoders[i].short_name, codec))
+        {
+            return hb_audio_encoders[i].encoder;
+        }
+    }
+    return -1;
+}
+
+static const char* get_string_for_acodec(int acodec)
+{
+    int i;
+    for (i = 0; i < hb_audio_encoders_count; i++)
+    {
+        if (hb_audio_encoders[i].encoder == acodec)
+        {
+            return hb_audio_encoders[i].short_name;
         }
     }
-    return acodec ? acodec : -1;
+    return NULL;
 }
 
 static int is_sample_rate_valid(int rate)

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs Changed

@@ -1,7 +1,11 @@
-/*  UserSettingConstants.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ASUserSettingConstants.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The User Setting Constants
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices
 {
@@ -16,26 +20,11 @@
         public const string Verbosity = "Verbosity";
 
         /// <summary>
-        /// The X264 Stepper 
-        /// </summary>
-        public const string X264Step = "X264Step";
-
-        /// <summary>
         /// When Complete Action
         /// </summary>
         public const string WhenCompleteAction = "WhenCompleteAction";
 
         /// <summary>
-        /// Growl Encodes
-        /// </summary>
-        public const string GrowlEncode = "GrowlEncode";
-
-        /// <summary>
-        /// Growl Queues
-        /// </summary>
-        public const string GrowlQueue = "GrowlQueue";
-
-        /// <summary>
         /// Process Priority
         /// </summary>
         public const string ProcessPriority = "ProcessPriority";
@@ -46,11 +35,6 @@
         public const string PreventSleep = "PreventSleep";
 
         /// <summary>
-        /// Show the CLI window
-        /// </summary>
-        public const string ShowCLI = "ShowCLI";
-
-        /// <summary>
         /// Save Log Directory
         /// </summary>
         public const string SaveLogToCopyDirectory = "SaveLogToCopyDirectory";
@@ -66,31 +50,11 @@
         public const string SaveLogCopyDirectory = "SaveLogCopyDirectory";
 
         /// <summary>
-        /// HandBrakes version
-        /// </summary>
-        public const string HandBrakeVersion = "HandBrakeVersion";
-
-        /// <summary>
         /// HandBrakes build
         /// </summary>
         public const string HandBrakeBuild = "HandBrakeBuild";
 
         /// <summary>
-        /// HandBrakes build
-        /// </summary>
-        public const string HandBrakePlatform = "HandBrakePlatform";
-
-        /// <summary>
-        /// HandBrakes CLI Exe SHA1 Hash
-        /// </summary>
-        public const string HandBrakeExeHash = "HandBrakeExeHash";
-
-        /// <summary>
-        /// The Instance Id
-        /// </summary>
-        public const string InstanceId = "InstanceId";
-
-        /// <summary>
         /// Disable Libdvdnav
         /// </summary>
         public const string DisableLibDvdNav = "DisableLibDvdNav";
@@ -119,5 +83,10 @@
         /// Preview Scan Count
         /// </summary>
         public const string PreviewScanCount = "previewScanCount";
+
+        /// <summary>
+        /// Clear completed items from the queue automatically.
+        /// </summary>
+        public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Collections/SerializableDictionary.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Converters/EnumToDescConverter.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Converters/EnumToDescConverter.cs Changed

@@ -1,28 +1,31 @@
-/*  EnumToDescConveter.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EnumToDescConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Enum to Description Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Converters
 {
     using System;
     using System.ComponentModel;
 
-    using HandBrake.ApplicationServices.Functions;
+    using HandBrake.ApplicationServices.Utilities;
 
     /// <summary>
     /// Enum to Description Converter
     /// </summary>
-    public class EnumToDescConveter : EnumConverter
+    public class EnumToDescConverter : EnumConverter
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="EnumToDescConveter"/> class.
+        /// Initializes a new instance of the <see cref="EnumToDescConverter"/> class.
         /// </summary>
         /// <param name="type">
         /// The type.
         /// </param>
-        public EnumToDescConveter(Type type)
+        public EnumToDescConverter(Type type)
             : base(type)
         {
         }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/EncodeCompletedEventArgs.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/EncodeCompletedEventArgs.cs Changed

@@ -1,15 +1,21 @@
-/*  EncodeCompletedEventArgs.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Encode Progress Event Args
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.EventArgs
 {
     using System;
+    using System.Runtime.Serialization;
 
     /// <summary>
     /// Encode Progress Event Args
     /// </summary>
+    [DataContractAttribute]
     public class EncodeCompletedEventArgs : EventArgs
     {
         /// <summary>
@@ -34,16 +40,19 @@
         /// <summary>
         /// Gets or sets a value indicating whether Successful.
         /// </summary>
+        [DataMember]
         public bool Successful { get; set; }
 
         /// <summary>
         /// Gets or sets Exception.
         /// </summary>
+        [DataMember]
         public Exception Exception { get; set; }
 
         /// <summary>
         /// Gets or sets ErrorInformation.
         /// </summary>
+        [DataMember]
         public string ErrorInformation { get; set; }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/EncodeProgressEventArgs.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/EncodeProgressEventArgs.cs Changed

@@ -1,50 +1,63 @@
-/*  EncodeProgressEventArgs.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Encode Progress Event Args
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.EventArgs
 {
     using System;
+    using System.Runtime.Serialization;
 
     /// <summary>
     /// Encode Progress Event Args
     /// </summary>
+    [DataContractAttribute]
     public class EncodeProgressEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets PercentComplete.
         /// </summary>
+        [DataMember]
         public float PercentComplete { get; set; }
 
         /// <summary>
         /// Gets or sets CurrentFrameRate.
         /// </summary>
+        [DataMember]
         public float CurrentFrameRate { get; set; }
 
         /// <summary>
         /// Gets or sets AverageFrameRate.
         /// </summary>
+        [DataMember]
         public float AverageFrameRate { get; set; }
 
         /// <summary>
         /// Gets or sets EstimatedTimeLeft.
         /// </summary>
+        [DataMember]
         public TimeSpan EstimatedTimeLeft { get; set; }
 
         /// <summary>
         /// Gets or sets Task.
         /// </summary>
+        [DataMember]
         public int Task { get; set; }
 
         /// <summary>
         /// Gets or sets TaskCount.
         /// </summary>
+        [DataMember]
         public int TaskCount { get; set; }
 
         /// <summary>
         /// Gets or sets ElapsedTime.
         /// </summary>
+        [DataMember]
         public TimeSpan ElapsedTime { get; set; }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/QueueProgressEventArgs.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/QueueProgressEventArgs.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/ScanCompletedEventArgs.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/ScanCompletedEventArgs.cs Changed

@@ -1,22 +1,28 @@
-/*  ScanCompletedEventArgs.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Scan Progress Event Args
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.EventArgs
 {
     using System;
+    using System.Runtime.Serialization;
 
     /// <summary>
     /// Scan Progress Event Args
     /// </summary>
+    [DataContractAttribute]
     public class ScanCompletedEventArgs : EventArgs
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ScanCompletedEventArgs"/> class.
         /// </summary>
-        /// <param name="sucessful">
-        /// The sucessful.
+        /// <param name="cancelled">
+        /// Whether the scan was cancelled.
         /// </param>
         /// <param name="exception">
         /// The exception.
@@ -24,9 +30,10 @@
         /// <param name="errorInformation">
         /// The error information.
         /// </param>
-        public ScanCompletedEventArgs(bool sucessful, Exception exception, string errorInformation)
+        public ScanCompletedEventArgs(bool cancelled, Exception exception, string errorInformation)
         {
-            this.Successful = sucessful;
+            this.Successful = !cancelled && exception == null && string.IsNullOrEmpty(errorInformation);
+            this.Cancelled = cancelled;
             this.Exception = exception;
             this.ErrorInformation = errorInformation;
         }
@@ -34,16 +41,25 @@
         /// <summary>
         /// Gets or sets a value indicating whether Successful.
         /// </summary>
+        [DataMember]
         public bool Successful { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether Cancelled.
+        /// </summary>
+        [DataMember]
+        public bool Cancelled { get; set; }
+
+        /// <summary>
         /// Gets or sets Exception.
         /// </summary>
+        [DataMember]
         public Exception Exception { get; set; }
 
         /// <summary>
         /// Gets or sets ErrorInformation.
         /// </summary>
+        [DataMember]
         public string ErrorInformation { get; set; }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/ScanProgressEventArgs.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/ScanProgressEventArgs.cs Changed

@@ -1,25 +1,39 @@
-/*  ScanProgressEventArgs.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Scan Progress Event Args
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.EventArgs
 {
     using System;
+    using System.Runtime.Serialization;
 
     /// <summary>
     /// Scan Progress Event Args
     /// </summary>
+    [DataContractAttribute]
     public class ScanProgressEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the title currently being scanned.
         /// </summary>
+        [DataMember]
         public int CurrentTitle { get; set; }
 
         /// <summary>
         /// Gets or sets the total number of Titles.
         /// </summary>
+        [DataMember]
         public int Titles { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percentage.
+        /// </summary>
+        [DataMember]
+        public decimal Percentage { get; set; }
     }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/SettingChangedEventArgs.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SettingChangedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The setting changed event args.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.EventArgs
+{
+    /// <summary>
+    /// The setting changed event args.
+    /// </summary>
+    public class SettingChangedEventArgs
+    {
+        /// <summary>
+        /// Gets or sets the key.
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value.
+        /// </summary>
+        public object Value { get; set; }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Exceptions/GeneralApplicationException.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Exceptions/GeneralApplicationException.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Factories Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs Added

@@ -0,0 +1,364 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PlistPresetFactory.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Factory to translate a Plist object into a Preset.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Factories
+{
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Globalization;
+    using System.Linq;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Services;
+    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding.x264;
+
+    /// <summary>
+    /// A Factory to translate a Plist object into a Preset.
+    /// </summary>
+    public class PlistPresetFactory
+    {
+        /// <summary>
+        /// The create preset.
+        /// </summary>
+        /// <param name="plist">
+        /// The plist.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Preset"/>.
+        /// </returns>
+        public static Preset CreatePreset(PList plist)
+        {
+            Preset preset = new Preset { Task = new EncodeTask(), Category = PresetService.UserPresetCatgoryName };
+
+            // Parse the settings out.
+            foreach (var item in plist)
+            {
+                if (item.Key == "AudioList")
+                {
+                    List<AudioTrack> tracks = ParseAudioTracks(item.Value);
+                    preset.Task.AudioTracks = new ObservableCollection<AudioTrack>(tracks);
+                }
+                else
+                {
+                    ParseSetting(item, preset);
+                }
+            }
+
+            // Handle the PictureDecombDeinterlace key
+            if (preset.UseDeinterlace)
+            {
+                preset.Task.Decomb = Decomb.Off;
+                preset.Task.CustomDecomb = string.Empty;
+            }
+
+            // Depending on the selected preset options, we may need to change some settings around.
+            // If the user chose not to use fitlers, remove them.
+            if (!preset.UsePictureFilters)
+            {
+                preset.Task.Detelecine = Detelecine.Off;
+                preset.Task.Denoise = Denoise.Off;
+                preset.Task.Deinterlace = Deinterlace.Off;
+                preset.Task.Decomb = Decomb.Off;
+                preset.Task.Deblock = 0;
+                preset.Task.Grayscale = false;
+            }
+
+            // IF we are using Source Max, Set the Max Width / Height values.
+            if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
+            {
+                preset.Task.MaxWidth = preset.Task.Height;
+                preset.Task.MaxHeight = preset.Task.Width;
+            }
+
+
+            return preset;
+        }
+
+        /// <summary>
+        /// Parse a setting and set it in the given preset.
+        /// </summary>
+        /// <param name="kvp">
+        /// The kvp setting pair.
+        /// </param>
+        /// <param name="preset">
+        /// The preset object.
+        /// </param>
+        private static void ParseSetting(KeyValuePair<string, dynamic> kvp, Preset preset)
+        {
+            switch (kvp.Key)
+            {
+                // Output Settings
+                case "FileFormat":
+                    preset.Task.OutputFormat = Converters.GetFileFormat(kvp.Value.Replace("file", string.Empty).Trim());
+                    break;
+                case "Mp4HttpOptimize":
+                    preset.Task.OptimizeMP4 = kvp.Value == 1;
+                    break;
+                case "Mp4LargeFile":
+                    preset.Task.LargeFile = kvp.Value == 1;
+                    break;
+                case "Mp4iPodCompatible":
+                    preset.Task.IPod5GSupport = kvp.Value == 1;
+                    break;
+
+                // Picture Settings
+                case "PictureAutoCrop":
+                    preset.Task.HasCropping = kvp.Value != 1;
+                    break;
+                case "PictureTopCrop":
+                    preset.Task.Cropping.Top = kvp.Value;
+                    break;
+                case "PictureBottomCrop":
+                    preset.Task.Cropping.Bottom = kvp.Value;
+                    break;
+                case "PictureLeftCrop":
+                    preset.Task.Cropping.Left = kvp.Value;
+                    break;
+                case "PictureRightCrop":
+                    preset.Task.Cropping.Right = kvp.Value;
+                    break;
+                case "PictureHeight":
+                    preset.Task.Height = kvp.Value == null || kvp.Value == 0 ? null : kvp.Value;
+                    break;
+                case "PictureWidth":
+                    preset.Task.Width = kvp.Value == null || kvp.Value == 0 ? null : kvp.Value;
+                    break;
+                case "PictureKeepRatio":
+                    preset.Task.KeepDisplayAspect = kvp.Value == 1;
+                    break;
+                case "PicturePAR":
+                    preset.Task.Anamorphic = (Anamorphic)kvp.Value;
+                    break;
+                case "PictureModulus":
+                    preset.Task.Modulus = kvp.Value;
+                    break;
+
+                // Filters
+                case "PictureDeblock":
+                    preset.Task.Deblock = kvp.Value;
+                    break;
+                case "PictureDecomb":
+                    preset.Task.Decomb = (Decomb)kvp.Value;
+                    break;
+                case "PictureDecombCustom":
+                    preset.Task.CustomDecomb = kvp.Value;
+                    break;
+                case "PictureDecombDeinterlace":
+                    preset.UseDeinterlace = kvp.Value == 1;
+                    break;
+                case "PictureDeinterlace":
+                    preset.Task.Deinterlace = (Deinterlace)kvp.Value;
+                    break;
+                case "PictureDeinterlaceCustom":
+                    preset.Task.CustomDeinterlace = kvp.Value;
+                    break;
+                case "PictureDenoise":
+                    preset.Task.Denoise = (Denoise)kvp.Value;
+                    break;
+                case "PictureDenoiseCustom":
+                    preset.Task.CustomDenoise = kvp.Value;
+                    break;
+                case "PictureDetelecine":
+                    preset.Task.Detelecine = (Detelecine)kvp.Value;
+                    break;
+                case "PictureDetelecineCustom":
+                    preset.Task.CustomDetelecine = kvp.Value;
+                    break;
+
+                // Video Tab
+                case "VideoAvgBitrate":
+                    if (!string.IsNullOrEmpty(kvp.Value))
+                    {
+                        preset.Task.VideoBitrate = int.Parse(kvp.Value);
+                    }
+                    break;
+                case "VideoEncoder":
+                    preset.Task.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(kvp.Value);
+                    break;
+                case "VideoFramerate":
+                    preset.Task.Framerate = kvp.Value == "Same as source" || string.IsNullOrEmpty(kvp.Value) ? null : double.Parse(kvp.Value, CultureInfo.InvariantCulture);
+                    break;
+                case "VideoFramerateMode":
+                    string parsedValue = kvp.Value;
+                    switch (parsedValue)
+                    {
+                        case "vfr":
+                            preset.Task.FramerateMode = FramerateMode.VFR;
+                            break;
+                        case "cfr":
+                            preset.Task.FramerateMode = FramerateMode.CFR;
+                            break;
+                        default:
+                            preset.Task.FramerateMode = FramerateMode.PFR;
+                            break;
+                    }
+                    break;
+                case "VideoGrayScale":
+                    preset.Task.Grayscale = kvp.Value == 1;
+                    break;
+                case "VideoQualitySlider":
+                    preset.Task.Quality = double.Parse(kvp.Value.ToString(), CultureInfo.InvariantCulture);
+                    break;
+                case "VideoQualityType": // The Type of Quality Mode used
+                    preset.Task.VideoEncodeRateType = (VideoEncodeRateType)kvp.Value;
+                    break;
+                case "VideoTurboTwoPass":
+                    preset.Task.TurboFirstPass = kvp.Value == 1;
+                    break;
+                case "VideoTwoPass":
+                    preset.Task.TwoPass = kvp.Value == 1;
+                    break;
+                case "x264OptionExtra":
+                    preset.Task.AdvancedEncoderOptions = kvp.Value;
+                    break;
+                case "x264Preset":
+                    preset.Task.X264Preset = EnumHelper<x264Preset>.GetValue(kvp.Value, true);
+                    break;
+                case "h264Profile":
+                    preset.Task.H264Profile = EnumHelper<x264Profile>.GetValue(kvp.Value, true);
+                    break;
+                case "x264Tune":
+                    string value = kvp.Value;
+                    if (value.Contains("fastdecode"))
+                    {
+                        preset.Task.FastDecode = true;
+                        value = value.Replace("fastdecode", string.Empty).Replace(",", string.Empty);
+                    }
+                    preset.Task.X264Tune = EnumHelper<x264Tune>.GetValue(value, true);
+                    break;
+                case "h264Level":
+                    preset.Task.H264Level = kvp.Value;
+                    break;
+
+                // Chapter Markers Tab
+                case "ChapterMarkers":
+                    preset.Task.IncludeChapterMarkers = kvp.Value == 1;
+                    break;
+
+                // Advanced x264 tab
+                case "x264Option":
+                    if (preset.Task.VideoEncoder == VideoEncoder.X264) // TODO Temp fix until a better solution is found.
+                    {
+                        preset.Task.AdvancedEncoderOptions = kvp.Value;
+                    }
+                    break;
+
+                case "lavcOption":
+                    if (preset.Task.VideoEncoder != VideoEncoder.X264) // TODO Temp fix until a better solution is found.
+                    {
+                        preset.Task.AdvancedEncoderOptions = kvp.Value;
+                    }
+                    break;
+
+                // Preset Information
+                case "PresetBuildNumber":
+                    preset.Version = kvp.Value;
+                    break;
+                case "PresetDescription":
+                    preset.Description = kvp.Value;
+                    break;
+                case "PresetName":
+                    preset.Name = kvp.Value;
+                    break;
+                case "Type":
+                    //preset.Task.Type = kvp.Value; // TODO find out what this is
+                    break;
+                case "UsesMaxPictureSettings":
+                    // TODO Not sure if this is used now!?
+                    break;
+                case "UsesPictureFilters":
+                    preset.UsePictureFilters = kvp.Value == 1;
+                    break;
+                case "UsesPictureSettings":
+                    preset.PictureSettingsMode = (PresetPictureSettingsMode)kvp.Value;
+                    break;
+
+                // Allowed Passthru
+                case "AudioAllowAACPass":
+                    preset.Task.AllowedPassthruOptions.AudioAllowAACPass = kvp.Value == 1;
+                    break;
+                case "AudioAllowAC3Pass":
+                    preset.Task.AllowedPassthruOptions.AudioAllowAC3Pass = kvp.Value == 1;
+                    break;
+                case "AudioAllowDTSHDPass":
+                    preset.Task.AllowedPassthruOptions.AudioAllowDTSHDPass = kvp.Value == 1;
+                    break;
+                case "AudioAllowDTSPass":
+                    preset.Task.AllowedPassthruOptions.AudioAllowDTSPass = kvp.Value == 1;
+                    break;
+                case "AudioAllowMP3Pass":
+                    preset.Task.AllowedPassthruOptions.AudioAllowMP3Pass = kvp.Value == 1;
+                    break;
+                case "AudioEncoderFallback":
+                    preset.Task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(kvp.Value);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Parse a number of audio tracks
+        /// </summary>
+        /// <param name="audioList">
+        /// The audio list.
+        /// </param>
+        /// <returns>
+        /// The <see cref="List"/> of audio tracks
+        /// </returns>
+        private static List<AudioTrack> ParseAudioTracks(IEnumerable<dynamic> audioList)
+        {
+            return audioList.Select(item => ParseAudioTrackParameters(item)).Cast<AudioTrack>().ToList();
+        }
+
+        /// <summary>
+        /// Parse an audio track's parameters.
+        /// </summary>
+        /// <param name="audioTrack">
+        /// The audio track params
+        /// </param>
+        /// <returns>
+        /// An <see cref="AudioTrack"/> Object
+        /// </returns>
+        private static AudioTrack ParseAudioTrackParameters(Dictionary<string, dynamic> audioTrack)
+        {
+            AudioTrack track = new AudioTrack();
+            foreach (var item in audioTrack)
+            {
+                switch (item.Key)
+                {
+                    case "AudioBitrate":
+                        track.Bitrate = int.Parse(item.Value);
+                        break;
+                    case "AudioEncoder":
+                        track.Encoder = Converters.GetAudioEncoder(item.Value.Trim());
+                        break;
+                    case "AudioMixdown":
+                        track.MixDown = Converters.GetAudioMixDown(item.Value.Trim());
+                        break;
+                    case "AudioSamplerate":
+                        track.SampleRate = item.Value == "Auto" ? 0 : double.Parse(item.Value, CultureInfo.InvariantCulture);
+                        break;
+                    case "AudioTrack":
+                        //track.SourceTrack = value; We don't do anything with this one.
+                        break;
+                    case "AudioTrackDRCSlider":
+                        track.DRC = double.Parse(item.Value.ToString(), CultureInfo.InvariantCulture);
+                        break;
+                    case "AudioTrackGainSlider":
+                        track.Gain = int.Parse(item.Value.ToString(), CultureInfo.InvariantCulture);
+                        break;
+                }
+            }
+
+            return track;
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj Changed

@@ -20,54 +20,44 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <Optimize>true</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
+    <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>full</DebugType>
+    <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core">
-      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libraries\Growl.Connector.dll</HintPath>
-    </Reference>
-    <Reference Include="Growl.CoreLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=13e59d82e007b064, processorArchitecture=MSIL">
+    <Reference Include="Caliburn.Micro, Version=1.3.1.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libraries\Growl.CoreLibrary.dll</HintPath>
+      <HintPath>..\libraries\caliburn\Caliburn.Micro.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Castle.Core, Version=2.5.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libraries\Microsoft.WindowsAPICodePack.dll</HintPath>
+      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Castle.Windsor, Version=2.5.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libraries\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -76,7 +66,10 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -90,6 +83,7 @@
   <ItemGroup>
     <Compile Include="Collections\SerializableDictionary.cs" />
     <Compile Include="Converters\EnumToDescConverter.cs" />
+    <Compile Include="EventArgs\SettingChangedEventArgs.cs" />
     <Compile Include="Exceptions\GeneralApplicationException.cs" />
     <Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />
     <Compile Include="EventArgs\EncodeProgressEventArgs.cs" />
@@ -97,14 +91,24 @@
     <Compile Include="EventArgs\ScanCompletedEventArgs.cs" />
     <Compile Include="EventArgs\ScanProgressEventArgs.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Functions\Converters.cs" />
-    <Compile Include="Functions\EnumHelper.cs" />
-    <Compile Include="Functions\GrowlCommunicator.cs" />
-    <Compile Include="Functions\InteropModelCreator.cs" />
-    <Compile Include="Functions\PlistHelper.cs" />
-    <Compile Include="Functions\System.cs" />
-    <Compile Include="Functions\Win32.cs" />
-    <Compile Include="Functions\Win7.cs" />
+    <Compile Include="Factories\PlistPresetFactory.cs" />
+    <Compile Include="Isolation\BackgroundServiceConnector.cs" />
+    <Compile Include="Isolation\IsolatedEncodeService.cs" />
+    <Compile Include="Isolation\IsolatedScanService.cs" />
+    <Compile Include="Services\Interfaces\IEncodeServiceWrapper.cs" />
+    <Compile Include="Services\Interfaces\IHbServiceCallback.cs" />
+    <Compile Include="Services\Interfaces\IScanServiceWrapper.cs" />
+    <Compile Include="Services\Interfaces\IServerService.cs" />
+    <Compile Include="Services\ServerService.cs" />
+    <Compile Include="Utilities\Converters.cs" />
+    <Compile Include="Utilities\EnumHelper.cs" />
+    <Compile Include="Utilities\InteropModelCreator.cs" />
+    <Compile Include="Utilities\PList.cs" />
+    <Compile Include="Utilities\PlistUtility.cs" />
+    <Compile Include="Utilities\SystemInfo.cs" />
+    <Compile Include="Utilities\VersionHelper.cs" />
+    <Compile Include="Utilities\Win32.cs" />
+    <Compile Include="Utilities\Win7.cs" />
     <Compile Include="Model\DriveInformation.cs" />
     <Compile Include="Model\Encoding\AllowedPassthru.cs" />
     <Compile Include="Model\Encoding\AudioTrack.cs" />
@@ -114,10 +118,8 @@
     <Compile Include="Model\EncodeTask.cs" />
     <Compile Include="Model\Encoding\OutputFormat.cs" />
     <Compile Include="Model\Encoding\SubtitleTrack.cs" />
-    <Compile Include="Model\General\UpdateCheckInformation.cs" />
-    <Compile Include="Model\General\UpdateCheckResult.cs" />
-    <Compile Include="Model\ModelBase.cs" />
     <Compile Include="Model\Preset.cs" />
+    <Compile Include="Model\PresetPictureSettingsMode.cs" />
     <Compile Include="Model\QueueItemStatus.cs" />
     <Compile Include="Model\QueueTask.cs" />
     <Compile Include="Model\Encoding\SubtitleType.cs" />
@@ -128,18 +130,15 @@
     <Compile Include="Parsing\Parser.cs" />
     <Compile Include="Parsing\Subtitle.cs" />
     <Compile Include="Parsing\Title.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="ServiceManager.cs" />
     <Compile Include="ServicesWindsorInstaller.cs" />
     <Compile Include="Services\Base\EncodeBase.cs" />
     <Compile Include="Services\Encode.cs" />
     <Compile Include="Services\Interfaces\IEncode.cs" />
-    <Compile Include="Services\Interfaces\IQueueManager.cs" />
     <Compile Include="Services\Interfaces\IQueueProcessor.cs" />
     <Compile Include="Services\Interfaces\IScan.cs" />
     <Compile Include="Services\Interfaces\IPresetService.cs" />
@@ -147,17 +146,14 @@
     <Compile Include="Services\LibEncode.cs" />
     <Compile Include="Services\LibScan.cs" />
     <Compile Include="Services\PresetService.cs" />
-    <Compile Include="Services\QueueManager.cs" />
     <Compile Include="Services\QueueProcessor.cs" />
     <Compile Include="Services\ScanService.cs" />
-    <Compile Include="Services\UpdateService.cs" />
     <Compile Include="Services\UserSettingService.cs" />
     <Compile Include="ASUserSettingConstants.cs" />
     <Compile Include="Utilities\AppcastReader.cs" />
     <Compile Include="Utilities\CharCodesUtilities.cs" />
     <Compile Include="Utilities\GeneralUtilities.cs" />
     <Compile Include="Utilities\LanguageUtilities.cs" />
-    <Compile Include="Utilities\PlistUtility.cs" />
     <Compile Include="Utilities\QueryGeneratorUtility.cs" />
     <Compile Include="Utilities\QueryParserUtility.cs" />
   </ItemGroup>
@@ -165,6 +161,7 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" />
     <None Include="Properties\AssemblyInfo.cs.tmpl" />
   </ItemGroup>
   <ItemGroup>
@@ -180,7 +177,6 @@
     <ProjectReference Include="..\HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj">
       <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>
       <Name>HandBrakeInterop</Name>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -194,8 +190,6 @@
   -->
   <PropertyGroup>
     <PreBuildEvent>
-      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
-      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
     </PreBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/BackgroundServiceConnector.cs Added

@@ -0,0 +1,214 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="BackgroundServiceConnector.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Background Service Connector.
+//   HandBrake has the ability to connect to a service app that will control HandBrakeCLI or Libhb.
+//   This acts as process isolation.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Isolation
+{
+    using System;
+    using System.Diagnostics;
+    using System.ServiceModel;
+    using System.Threading;
+
+    using HandBrake.ApplicationServices.EventArgs;
+    using HandBrake.ApplicationServices.Exceptions;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    /// <summary>
+    /// Background Service Connector.
+    /// HandBrake has the ability to connect to a service app that will control HandBrakeCLI or Libhb. 
+    /// This acts as process isolation.
+    /// </summary>
+    public class BackgroundServiceConnector : IHbServiceCallback, IDisposable
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// Gets or sets the pipe factory.
+        /// DuplexChannelFactory is necessary for Callbacks.
+        /// </summary>
+        private static DuplexChannelFactory<IServerService> pipeFactory;
+
+        /// <summary>
+        /// The background process.
+        /// </summary>
+        private static Process backgroundProcess;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether is connected.
+        /// </summary>
+        public bool IsConnected { get; set; }
+
+        /// <summary>
+        /// Gets or sets the service.
+        /// </summary>
+        public IServerService Service { get; set; }
+
+        #endregion
+
+        #region Public Server Management Methods
+
+        /// <summary>
+        /// The can connect.
+        /// </summary>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        public bool CanConnect()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// The connect.
+        /// </summary>
+        /// <param name="port">
+        /// The port.
+        /// </param>
+        public void Connect(string port)
+        {
+            if (backgroundProcess == null)
+            {
+                ProcessStartInfo processStartInfo = new ProcessStartInfo(
+                    "HandBrake.Server.exe", port)
+                {
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    RedirectStandardOutput = true,
+                };
+
+                backgroundProcess = new Process { StartInfo = processStartInfo };
+                backgroundProcess.Start();
+            }
+
+            // When the process writes out a line, it's pipe server is ready and can be contacted for
+            // work. Reading line blocks until this happens.
+            backgroundProcess.StandardOutput.ReadLine();
+
+            ThreadPool.QueueUserWorkItem(delegate
+                {
+                    try
+                    {
+                        pipeFactory = new DuplexChannelFactory<IServerService>(
+                            new InstanceContext(this),
+                            new NetTcpBinding(),
+                            new EndpointAddress(string.Format("net.tcp://127.0.0.1:{0}/IHbService", port)));
+
+                        // Connect and Subscribe to the Server
+                        this.Service = pipeFactory.CreateChannel();
+                        this.Service.Subscribe();
+                        this.IsConnected = true;
+                    }
+                    catch (Exception exc)
+                    {
+                        throw new GeneralApplicationException("Unable to connect to background worker process", "Please restart HandBrake", exc);
+                    }
+                });
+        }
+
+        /// <summary>
+        /// The disconnect.
+        /// </summary>
+        public void Shutdown()
+        {
+            try
+            {
+                if (backgroundProcess != null && !backgroundProcess.HasExited)
+                {
+                    this.Service.Unsubscribe();
+                }
+            }
+            catch (Exception exc)
+            {
+                throw new GeneralApplicationException("Unable to disconnect to background worker process", 
+                    "It may have already close. Check for any left over HandBrake.Server.exe processes", exc);
+            }
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IDisposable
+
+        /// <summary>
+        /// The dispose.
+        /// </summary>
+        public void Dispose()
+        {
+            this.Service.Unsubscribe();
+        }
+
+        #endregion
+
+        #region IHbServiceCallback
+
+        /// <summary>
+        /// The scan completed.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        public virtual void ScanCompletedCallback(ScanCompletedEventArgs eventArgs)
+        {
+        }
+
+        /// <summary>
+        /// The scan progress.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        public virtual void ScanProgressCallback(ScanProgressEventArgs eventArgs)
+        {
+        }
+
+        /// <summary>
+        /// The scan started callback.
+        /// </summary>
+        public virtual void ScanStartedCallback()
+        {
+        }
+
+        /// <summary>
+        /// The encode progress callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event Args.
+        /// </param>
+        public virtual void EncodeProgressCallback(EncodeProgressEventArgs eventArgs)
+        {
+        }
+
+        /// <summary>
+        /// The encode completed callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event Args.
+        /// </param>
+        public virtual void EncodeCompletedCallback(EncodeCompletedEventArgs eventArgs)
+        {
+        }
+
+        /// <summary>
+        /// The encode started callback.
+        /// </summary>
+        public virtual void EncodeStartedCallback()
+        {
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs Added

@@ -0,0 +1,186 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IsolatedEncodeService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Isolated Scan Service
+//   This is an implementation of the IEncode implementation that runs scans on a seperate process
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Isolation
+{
+    using System;
+    using System.Threading;
+
+    using HandBrake.ApplicationServices.EventArgs;
+    using HandBrake.ApplicationServices.Exceptions;
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    /// <summary>
+    /// Isolated Scan Service. 
+    /// This is an implementation of the IEncode implementation that runs scans on a seperate process
+    /// </summary>
+    public class IsolatedEncodeService : BackgroundServiceConnector, IEncode
+    {
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsolatedEncodeService"/> class. 
+        /// </summary>
+        /// <param name="port">
+        /// The port.
+        /// </param>
+        public IsolatedEncodeService(string port)
+        {
+            try
+            {
+                if (this.CanConnect())
+                {
+                    this.Connect(port);
+                }
+            }
+            catch (Exception exception)
+            {
+                throw new GeneralApplicationException("Unable to connect to scan worker process.", "Try restarting HandBrake", exception);
+            }
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// The encode completed.
+        /// </summary>
+        public event EncodeCompletedStatus EncodeCompleted;
+
+        /// <summary>
+        /// The encode started.
+        /// </summary>
+        public event EventHandler EncodeStarted;
+
+        /// <summary>
+        /// The encode status changed.
+        /// </summary>
+        public event EncodeProgessStatus EncodeStatusChanged;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets ActivityLog.
+        /// </summary>
+        public string ActivityLog
+        {
+            get
+            {
+                return this.IsConnected ? this.Service.EncodeActivityLog : "Unable to connect to background worker service ...";
+            }
+        }
+
+        /// <summary>
+        /// Gets the log index.
+        /// </summary>
+        public int LogIndex
+        {
+            get
+            {
+                return -1;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether IsEncoding.
+        /// </summary>
+        public bool IsEncoding
+        {
+            get
+            {
+                return this.IsConnected && this.Service.IsEncoding;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The encode completed callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        public override void EncodeCompletedCallback(EncodeCompletedEventArgs eventArgs)
+        {
+            if (this.EncodeCompleted != null)
+            {
+                ThreadPool.QueueUserWorkItem(delegate { this.EncodeCompleted(this, eventArgs); });
+            }
+
+            base.EncodeCompletedCallback(eventArgs);
+        }
+
+        /// <summary>
+        /// The encode progress callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        public override void EncodeProgressCallback(EncodeProgressEventArgs eventArgs)
+        {
+            if (this.EncodeStatusChanged != null)
+            {
+                ThreadPool.QueueUserWorkItem(delegate { this.EncodeStatusChanged(this, eventArgs); });
+            }
+
+            base.EncodeProgressCallback(eventArgs);
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IEncode
+
+        /// <summary>
+        /// Copy the log file to the desired destinations
+        /// </summary>
+        /// <param name="destination">
+        /// The destination.
+        /// </param>
+        public void ProcessLogs(string destination)
+        {
+            ThreadPool.QueueUserWorkItem(delegate { this.Service.ProcessEncodeLogs(destination); });
+        }
+
+        /// <summary>
+        /// Start with a LibHb EncodeJob Object
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        /// <param name="enableLogging">
+        /// The enable Logging.
+        /// </param>
+        public void Start(QueueTask job, bool enableLogging)
+        {
+            ThreadPool.QueueUserWorkItem(
+                delegate { this.Service.StartEncode(job, enableLogging); });
+        }
+
+        /// <summary>
+        /// Kill the CLI process
+        /// </summary>
+        public void Stop()
+        {
+            ThreadPool.QueueUserWorkItem(delegate { this.Service.StopEncode(); });
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedScanService.cs Added

@@ -0,0 +1,216 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IsolatedScanService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Isolated Scan Service
+//   This is an implementation of the IScan implementation that runs scans on a seperate process
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Isolation
+{
+    using System;
+    using System.Threading;
+
+    using HandBrake.ApplicationServices.EventArgs;
+    using HandBrake.ApplicationServices.Exceptions;
+    using HandBrake.ApplicationServices.Parsing;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    /// <summary>
+    /// Isolated Scan Service. 
+    /// This is an implementation of the IScan implementation that runs scans on a seperate process
+    /// </summary>
+    public class IsolatedScanService : BackgroundServiceConnector, IScan
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The post action.
+        /// </summary>
+        private Action<bool> postScanAction;
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// The scan completed.
+        /// </summary>
+        public event ScanCompletedStatus ScanCompleted;
+
+        /// <summary>
+        /// The scan stared.
+        /// </summary>
+        public event EventHandler ScanStared;
+
+        /// <summary>
+        /// The scan status changed.
+        /// </summary>
+        public event ScanProgessStatus ScanStatusChanged;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsolatedScanService"/> class.
+        /// </summary>
+        /// <param name="port">
+        /// The port.
+        /// </param>
+        public IsolatedScanService(string port)
+        {
+            try
+            {
+                if (this.CanConnect())
+                {
+                    this.Connect(port);
+                }
+            }
+            catch (Exception exception)
+            {
+                throw new GeneralApplicationException("Unable to connect to scan worker process.", "Try restarting HandBrake", exception);
+            }
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Gets ActivityLog.
+        /// </summary>
+        public string ActivityLog
+        {
+            get
+            {
+                return this.Service.ScanActivityLog;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether IsScanning.
+        /// </summary>
+        public bool IsScanning
+        {
+            get
+            {
+                return this.Service.IsScanning;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Souce Data.
+        /// </summary>
+        public Source SouceData
+        {
+            get
+            {
+                return this.Service.SouceData;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The scan completed callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        public override void ScanCompletedCallback(ScanCompletedEventArgs eventArgs)
+        {
+            if (this.postScanAction != null)
+            {
+                this.postScanAction(true);
+            }
+
+            if (this.ScanCompleted != null)
+            {
+                ThreadPool.QueueUserWorkItem(delegate { this.ScanCompleted(this, eventArgs); });  
+            }
+
+            base.ScanCompletedCallback(eventArgs);
+        }
+
+        /// <summary>
+        /// The scan progress callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        public override void ScanProgressCallback(ScanProgressEventArgs eventArgs)
+        {
+            if (this.ScanStatusChanged != null)
+            {
+                ThreadPool.QueueUserWorkItem(delegate { this.ScanStatusChanged(this, eventArgs); });  
+            }
+
+            base.ScanProgressCallback(eventArgs);
+        }
+
+        /// <summary>
+        /// The scan started callback.
+        /// </summary>
+        public override void ScanStartedCallback()
+        {
+            if (this.ScanStared != null)
+            {
+                ThreadPool.QueueUserWorkItem(delegate { this.ScanStared(this, EventArgs.Empty); });
+            }
+
+            base.ScanStartedCallback();
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IScan
+
+        /// <summary>
+        /// Take a Scan Log file, and process it as if it were from the CLI.
+        /// </summary>
+        /// <param name="path">
+        /// The path to the log file.
+        /// </param>
+        public void DebugScanLog(string path)
+        {
+            throw new NotImplementedException("Not available in process isolation mode!");
+        }
+
+        /// <summary>
+        /// Scan a Source Path.
+        /// Title 0: scan all
+        /// </summary>
+        /// <param name="sourcePath">
+        /// Path to the file to scan
+        /// </param>
+        /// <param name="title">
+        /// int title number. 0 for scan all
+        /// </param>
+        /// <param name="previewCount">
+        /// The preview Count.
+        /// </param>
+        /// <param name="postAction">
+        /// The post Action.
+        /// </param>
+        public void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction)
+        {
+            this.postScanAction = postAction;
+            this.Service.ScanSource(sourcePath, title, previewCount);
+        }
+
+        /// <summary>
+        /// Kill the scan
+        /// </summary>
+        public void Stop()
+        {
+            this.Service.StopScan();
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/DriveInformation.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/DriveInformation.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs Changed

@@ -1,13 +1,19 @@
-/*  EncodeTask.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeTask.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An Encode Task
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model
 {
     using System.Collections.ObjectModel;
     using System.Linq;
 
+    using Caliburn.Micro;
+
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.Interop.Model;
     using HandBrake.Interop.Model.Encoding;
@@ -18,8 +24,17 @@
     /// <summary>
     /// An Encode Task
     /// </summary>
-    public class EncodeTask
+    public class EncodeTask : PropertyChangedBase
     {
+        #region Private Fields
+
+        /// <summary>
+        /// The advanced panel enabled.
+        /// </summary>
+        private bool showAdvancedTab;
+
+        #endregion
+
         /// <summary>
         /// Initializes a new instance of the <see cref="EncodeTask"/> class.
         /// </summary>
@@ -30,10 +45,12 @@
             this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();
             this.ChapterNames = new ObservableCollection<ChapterMarker>();
             this.AllowedPassthruOptions = new AllowedPassthru();
+            this.X264Preset = x264Preset.Medium;
+            this.H264Profile = x264Profile.None;
+            this.X264Tune = x264Tune.None;
+            this.Modulus = 16;
         }
 
-        #region Source
-
         /// <summary>
         /// Initializes a new instance of the <see cref="EncodeTask"/> class. 
         /// Copy Constructor
@@ -54,7 +71,6 @@
                 this.AudioTracks.Add(new AudioTrack(track));
             }
 
-
             this.ChapterNames = new ObservableCollection<ChapterMarker>();
             foreach (ChapterMarker track in task.ChapterNames)
             {
@@ -73,7 +89,6 @@
             this.Denoise = task.Denoise;
             this.Destination = task.Destination;
             this.Detelecine = task.Detelecine;
-            this.DisableLibDvdNav = task.DisableLibDvdNav;
             this.DisplayWidth = task.DisplayWidth;
             this.EndPoint = task.EndPoint;
             this.Framerate = task.Framerate;
@@ -93,9 +108,6 @@
             this.PixelAspectX = task.PixelAspectX;
             this.PixelAspectY = task.PixelAspectY;
             this.PointToPointMode = task.PointToPointMode;
-            this.PresetBuildNumber = task.PresetBuildNumber;
-            this.PresetDescription = task.PresetDescription;
-            this.PresetName = task.PresetName;
             this.Quality = task.Quality;
             this.Source = task.Source;
             this.StartPoint = task.StartPoint;
@@ -109,20 +121,23 @@
             this.Title = task.Title;
             this.TurboFirstPass = task.TurboFirstPass;
             this.TwoPass = task.TwoPass;
-            this.Type = task.Type;
-            this.UsesMaxPictureSettings = task.UsesMaxPictureSettings;
-            this.UsesPictureFilters = task.UsesPictureFilters;
-            this.UsesPictureSettings = task.UsesPictureSettings;
-            this.Verbosity = task.Verbosity;
             this.VideoBitrate = task.VideoBitrate;
             this.VideoEncoder = task.VideoEncoder;
             this.VideoEncodeRateType = task.VideoEncodeRateType;
             this.Width = task.Width;
-            this.x264Preset = task.x264Preset;
-            this.x264Profile = task.x264Profile;
+            this.X264Preset = task.X264Preset;
+            this.H264Profile = task.H264Profile;
             this.X264Tune = task.X264Tune;
+            this.H264Level = task.H264Level;
+            this.FastDecode = task.FastDecode;
+            this.ExtraAdvancedArguments = task.ExtraAdvancedArguments;
+
+            this.PreviewStartAt = task.PreviewStartAt;
+            this.PreviewDuration = task.PreviewDuration;
         }
 
+        #region Source
+
         /// <summary>
         /// Gets or sets Source.
         /// </summary>
@@ -397,66 +412,47 @@
         /// <summary>
         /// Gets or sets x264Preset.
         /// </summary>
-        public x264Preset x264Preset { get; set; }
+        public x264Preset X264Preset { get; set; }
 
         /// <summary>
         /// Gets or sets x264Profile.
         /// </summary>
-        public x264Profile x264Profile { get; set; }
+        public x264Profile H264Profile { get; set; }
 
         /// <summary>
-        /// Gets or sets X264Tune.
+        /// Gets or sets the x 264 level.
         /// </summary>
-        public x264Tune X264Tune { get; set; }
+        public string H264Level { get; set; }
 
         /// <summary>
-        /// Gets or sets Verbosity.
+        /// Gets or sets X264Tune.
         /// </summary>
-        public int Verbosity { get; set; }
+        public x264Tune X264Tune { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether disableLibDvdNav.
+        /// Gets or sets a value indicating whether fast decode.
         /// </summary>
-        public bool DisableLibDvdNav { get; set; }
-
-        #endregion
-
-        #region Preset Information (TODO This should probably be dropped)
+        public bool FastDecode { get; set; }
 
         /// <summary>
-        /// Gets or sets PresetBuildNumber.
+        /// Gets or sets Extra Advanced Arguments for the Video Tab.
         /// </summary>
-        public int PresetBuildNumber { get; set; }
+        public string ExtraAdvancedArguments { get; set; }
 
-        /// <summary>
-        /// Gets or sets PresetDescription.
-        /// </summary>
-        public string PresetDescription { get; set; }
+        #endregion
 
-        /// <summary>
-        /// Gets or sets PresetName.
-        /// </summary>
-        public string PresetName { get; set; }
+        #region Preview
 
         /// <summary>
-        /// Gets or sets Type.
+        /// Gets or sets StartAt.
         /// </summary>
-        public string Type { get; set; }
+        public int? PreviewStartAt { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether UsesMaxPictureSettings.
+        /// Gets or sets Duration.
         /// </summary>
-        public bool UsesMaxPictureSettings { get; set; }
+        public int? PreviewDuration { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether UsesPictureFilters.
-        /// </summary>
-        public bool UsesPictureFilters { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether UsesPictureSettings.
-        /// </summary>
-        public bool UsesPictureSettings { get; set; }
         #endregion
 
         #region Helpers
@@ -481,6 +477,40 @@
                 return false;
             }
         }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether IsPreviewEncode.
+        /// </summary>
+        public bool IsPreviewEncode { get; set; }
+
+        /// <summary>
+        /// Gets or sets PreviewEncodeDuration.
+        /// </summary>
+        public int PreviewEncodeDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets PreviewEncodeStartAt.
+        /// </summary>
+        public string PreviewEncodeStartAt { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether advanced panel enabled.
+        /// </summary>
+        public bool ShowAdvancedTab
+        {
+            get
+            {
+                return this.showAdvancedTab;
+            }
+            set
+            {
+                if (!object.Equals(value, this.showAdvancedTab))
+                {
+                    this.showAdvancedTab = value;
+                    this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+                }
+            }
+        }
         #endregion
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs Changed

@@ -1,17 +1,52 @@
-/*  AllowedPassthru.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AllowedPassthru.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Allowed Passthru Options
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model.Encoding
 {
-    using Interop.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding;
 
     /// <summary>
     /// Allowed Passthru Options
     /// </summary>
     public class AllowedPassthru
     {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The audio allow aac pass.
+        /// </summary>
+        private bool? audioAllowAACPass;
+
+        /// <summary>
+        /// The audio allow a c 3 pass.
+        /// </summary>
+        private bool? audioAllowAC3Pass;
+
+        /// <summary>
+        /// The audio allow dtshd pass.
+        /// </summary>
+        private bool? audioAllowDTSHDPass;
+
+        /// <summary>
+        /// The audio allow dts pass.
+        /// </summary>
+        private bool? audioAllowDTSPass;
+
+        /// <summary>
+        /// The audio allow m p 3 pass.
+        /// </summary>
+        private bool? audioAllowMP3Pass;
+
+        #endregion
+
+        #region Constructors and Destructors
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AllowedPassthru"/> class. 
         /// </summary>
@@ -31,7 +66,7 @@
         /// <param name="initialValue">
         /// The initial Value.
         /// </param>
-        public AllowedPassthru(bool initialValue)
+        public AllowedPassthru(bool? initialValue)
         {
             this.AudioAllowAACPass = initialValue;
             this.AudioAllowAC3Pass = initialValue;
@@ -58,34 +93,90 @@
             this.AudioEncoderFallback = initialValue.AudioEncoderFallback;
         }
 
+        #endregion
+
+        #region Properties
+
         /// <summary>
         /// Gets or sets a value indicating whether AudioAllowAACPass.
         /// </summary>
-        public bool AudioAllowAACPass { get; set; }
+        public bool? AudioAllowAACPass
+        {
+            get
+            {
+                return this.audioAllowAACPass ?? true;
+            }
+            set
+            {
+                this.audioAllowAACPass = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether AudioAllowAC3Pass.
         /// </summary>
-        public bool AudioAllowAC3Pass { get; set; }
+        public bool? AudioAllowAC3Pass
+        {
+            get
+            {
+                return this.audioAllowAC3Pass ?? true;
+            }
+            set
+            {
+                this.audioAllowAC3Pass = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether AudioAllowDTSHDPass.
         /// </summary>
-        public bool AudioAllowDTSHDPass { get; set; }
+        public bool? AudioAllowDTSHDPass
+        {
+            get
+            {
+                return this.audioAllowDTSHDPass ?? true;
+            }
+            set
+            {
+                this.audioAllowDTSHDPass = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether AudioAllowDTSPass.
         /// </summary>
-        public bool AudioAllowDTSPass { get; set; }
+        public bool? AudioAllowDTSPass
+        {
+            get
+            {
+                return this.audioAllowDTSPass ?? true;
+            }
+            set
+            {
+                this.audioAllowDTSPass = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether AudioAllowMP3Pass.
         /// </summary>
-        public bool AudioAllowMP3Pass { get; set; }
+        public bool? AudioAllowMP3Pass
+        {
+            get
+            {
+                return this.audioAllowMP3Pass ?? true;
+            }
+            set
+            {
+                this.audioAllowMP3Pass = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets AudioEncoderFallback.
         /// </summary>
         public AudioEncoder AudioEncoderFallback { get; set; }
+
+        #endregion
     }
-}
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs Changed

@@ -13,14 +13,16 @@
     using System.ComponentModel;
     using System.Globalization;
 
-    using HandBrake.ApplicationServices.Functions;
+    using Caliburn.Micro;
+
     using HandBrake.ApplicationServices.Parsing;
+    using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop.Model.Encoding;
 
     /// <summary>
     /// An Audio Track for the Audio Panel
     /// </summary>
-    public class AudioTrack : ModelBase
+    public class AudioTrack : PropertyChangedBase
     {
         #region Constants and Fields
 
@@ -61,9 +63,6 @@
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         private Audio scannedTrack;
 
-        /// <summary>
-        /// The track name.
-        /// </summary>
         private string trackName;
 
         #endregion
@@ -82,6 +81,7 @@
             this.Bitrate = 160;
             this.DRC = 0;
             this.ScannedTrack = new Audio();
+            this.TrackName = string.Empty;
         }
 
         /// <summary>
@@ -99,8 +99,8 @@
             this.gain = track.Gain;
             this.mixDown = track.MixDown;
             this.sampleRate = track.SampleRate;
-            this.scannedTrack = new Audio();
-            this.trackName = track.TrackName;
+            this.scannedTrack = track.ScannedTrack ?? new Audio();
+            this.TrackName = track.TrackName;
         }
 
         #endregion
@@ -159,7 +159,7 @@
             set
             {
                 this.bitrate = value;
-                this.OnPropertyChanged("Bitrate");
+                this.NotifyOfPropertyChange(() => this.Bitrate);
             }
         }
 
@@ -178,7 +178,7 @@
                 if (!object.Equals(value, this.drc))
                 {
                     this.drc = value;
-                    this.OnPropertyChanged("DRC");
+                    this.NotifyOfPropertyChange(() => this.DRC);
                 }
             }
         }
@@ -196,7 +196,10 @@
             set
             {
                 this.encoder = value;
-                this.OnPropertyChanged("Encoder");
+                this.NotifyOfPropertyChange(() => this.Encoder);
+                this.NotifyOfPropertyChange(() => this.IsPassthru);
+                this.NotifyOfPropertyChange(() => this.CannotSetBitrate);
+                this.NotifyOfPropertyChange(() => this.TrackReference);
             }
         }
 
@@ -215,7 +218,7 @@
                 if (!object.Equals(value, this.gain))
                 {
                     this.gain = value;
-                    this.OnPropertyChanged("Gain");
+                    this.NotifyOfPropertyChange(() => this.Gain);
                 }
             }
         }
@@ -233,7 +236,8 @@
             set
             {
                 this.mixDown = value;
-                this.OnPropertyChanged("MixDown");
+                this.NotifyOfPropertyChange(() => this.MixDown);
+                this.NotifyOfPropertyChange(() => this.TrackReference);
             }
         }
 
@@ -250,12 +254,13 @@
             set
             {
                 this.sampleRate = value;
-                this.OnPropertyChanged("SampleRate");
+                this.NotifyOfPropertyChange(() => this.SampleRate);
+                this.NotifyOfPropertyChange(() => this.TrackReference);
             }
         }
 
         /// <summary>
-        ///   Gets the The UI display value for sample rate
+        ///  Gets or sets the The UI display value for sample rate
         /// </summary>
         public string SampleRateDisplayValue
         {
@@ -263,6 +268,19 @@
             {
                 return this.SampleRate == 0 ? "Auto" : this.SampleRate.ToString(CultureInfo.InvariantCulture);
             }
+            set
+            {
+                // TODO change this to be a converted field
+                if (string.IsNullOrEmpty(value))
+                {
+                    return;
+                }
+
+                double samplerate;
+                double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
+
+                this.SampleRate = samplerate;
+            }
         }
 
         /// <summary>
@@ -279,8 +297,7 @@
             set
             {
                 this.scannedTrack = value;
-                this.OnPropertyChanged("ScannedTrack");
-                this.OnPropertyChanged("TrackDisplay");
+                this.NotifyOfPropertyChange(() => this.ScannedTrack);
             }
         }
 
@@ -301,18 +318,54 @@
         }
 
         /// <summary>
-        ///   Gets the Display Value for this model.
+        /// Gets a value indicating whether IsPassthru.
         /// </summary>
-        public string TrackDisplay
+        public bool IsPassthru
         {
             get
             {
-                return this.ScannedTrack == null ? string.Empty : this.ScannedTrack.ToString();
+                if (this.Encoder == AudioEncoder.Ac3Passthrough || this.Encoder == AudioEncoder.DtsPassthrough
+                    || this.Encoder == AudioEncoder.DtsHDPassthrough || this.Encoder == AudioEncoder.AacPassthru
+                    || this.Encoder == AudioEncoder.Mp3Passthru || this.Encoder == AudioEncoder.Passthrough)
+                {
+                    return true;
+                }
+                return false;
             }
         }
 
         /// <summary>
-        ///   Gets or sets TrackName.
+        /// Gets a value indicating whether can set bitrate.
+        /// </summary>
+        public bool CannotSetBitrate
+        {
+            get
+            {
+                return this.IsPassthru || this.Encoder == AudioEncoder.ffflac;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether IsLossless.
+        /// </summary>
+        public bool IsLossless
+        {
+            get
+            {
+                return this.IsPassthru || this.Encoder == AudioEncoder.ffflac;
+            }
+        }
+
+        /// <summary>
+        /// Gets TrackReference.
+        /// </summary>
+        public AudioTrack TrackReference
+        {
+            get { return this; }
+        }
+
+        /// <summary>
+        /// Gets or sets the track name.
         /// </summary>
         public string TrackName
         {
@@ -320,11 +373,9 @@
             {
                 return this.trackName;
             }
-
             set
             {
                 this.trackName = value;
-                this.OnPropertyChanged("TrackName");
             }
         }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs Changed

@@ -1,16 +1,29 @@
-/*  ChapterMarker.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ChapterMarker.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Movie Chapter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model.Encoding
 {
+    using System;
+
+    using Caliburn.Micro;
+
     /// <summary>
     /// A Movie Chapter
     /// </summary>
-    public class ChapterMarker
+    public class ChapterMarker : PropertyChangedBase
     {
         /// <summary>
+        /// Backing field for chapter name
+        /// </summary>
+        private string chapterName;
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ChapterMarker"/> class.
         /// </summary>
         public ChapterMarker()
@@ -23,13 +36,17 @@
         /// <param name="number">
         /// The number.
         /// </param>
-        /// <param name="Name">
+        /// <param name="name">
         /// The name.
         /// </param>
-        public ChapterMarker(int number, string Name)
+        /// <param name="duration">
+        /// The duration.
+        /// </param>
+        public ChapterMarker(int number, string name, TimeSpan duration)
         {
-            this.ChapterName = Name;
+            this.ChapterName = name;
             this.ChapterNumber = number;
+            this.Duration = duration;
         }
 
         /// <summary>
@@ -43,6 +60,7 @@
         {
             this.ChapterName = chapter.ChapterName;
             this.ChapterNumber = chapter.ChapterNumber;
+            this.Duration = chapter.Duration;
         }
 
         /// <summary>
@@ -51,8 +69,24 @@
         public int ChapterNumber { get; set; }
 
         /// <summary>
+        /// Gets or sets the duration.
+        /// </summary>
+        public TimeSpan Duration { get; set; }
+
+        /// <summary>
         /// Gets or sets ChapterName.
         /// </summary>
-        public string ChapterName { get; set; }
+        public string ChapterName
+        {
+            get
+            {
+                return this.chapterName;
+            }
+            set
+            {
+                this.chapterName = value;
+                this.NotifyOfPropertyChange(() => this.ChapterName);
+            }
+        }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs Changed

@@ -10,24 +10,47 @@
 namespace HandBrake.ApplicationServices.Model.Encoding
 {
     using System;
-    using System.Windows.Forms;
+
+    using Caliburn.Micro;
 
     using HandBrake.ApplicationServices.Parsing;
 
     /// <summary>
     /// Subtitle Information
     /// </summary>
-    public class SubtitleTrack : ModelBase
+    public class SubtitleTrack : PropertyChangedBase
     {
         #region Constants and Fields
 
         /// <summary>
+        /// The burned in backing field.
+        /// </summary>
+        private bool burned;
+
+        /// <summary>
+        /// The is default backing field.
+        /// </summary>
+        private bool isDefault;
+
+        /// <summary>
         /// The source track.
         /// </summary>
         private Subtitle sourceTrack;
 
+        /// <summary>
+        /// Backing field for the srt file name.
+        /// </summary>
+        private string srtFileName;
+
+        /// <summary>
+        /// Backing field for Forced Subs
+        /// </summary>
+        private bool forced;
+
         #endregion
 
+        #region Constructors and Destructors
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SubtitleTrack"/> class.
         /// </summary>
@@ -57,41 +80,75 @@
             this.SourceTrack = subtitle.SourceTrack;
         }
 
-        #region Public Properties
+        #endregion
 
+        #region Properties
 
         /// <summary>
         ///   Gets or sets a value indicating whether Burned.
         /// </summary>
-        public bool Burned { get; set; }
+        public bool Burned
+        {
+            get
+            {
+                return this.burned;
+            }
 
-        /// <summary>
-        ///   Gets or sets a value indicating whether Default.
-        /// </summary>
-        public bool Default { get; set; }
+            set
+            {
+                if (!object.Equals(this.burned, value))
+                {
+                    this.burned = value;
+                    this.NotifyOfPropertyChange(() => this.Burned);
 
-        /// <summary>
-        ///   Gets or sets a value indicating whether Forced.
-        /// </summary>
-        public bool Forced { get; set; }
+                    if (value)
+                    {
+                        this.Default = false;
+                    }
+                }
+            }
+        }
 
         /// <summary>
-        ///   Gets a value indicating whether this is an SRT subtitle.
+        ///   Gets or sets a value indicating whether Default.
         /// </summary>
-        public bool IsSrtSubtitle
+        public bool Default
         {
             get
             {
-                return this.SrtFileName != "-";
+                return this.isDefault;
+            }
+
+            set
+            {
+                if (!object.Equals(this.isDefault, value))
+                {
+                    this.isDefault = value;
+                    this.NotifyOfPropertyChange(() => this.Default);
+
+                    if (value)
+                    {
+                        this.Burned = false;
+                    }
+                }
             }
         }
 
         /// <summary>
-        ///   Gets or sets Track.
+        ///   Gets or sets a value indicating whether Forced.
         /// </summary>
-        [Obsolete("Use SourceTrack Instead")]
-        public string Track { get; set; }
-
+        public bool Forced
+        {
+            get
+            {
+                return this.forced;
+            }
+            set
+            {
+                this.forced = value;
+                this.NotifyOfPropertyChange(() => this.Forced);
+            }
+        }
 
         /// <summary>
         ///   Gets or sets SourceTrack.
@@ -106,11 +163,14 @@
             set
             {
                 this.sourceTrack = value;
-                this.OnPropertyChanged("SourceTrack");
+                this.NotifyOfPropertyChange(() => this.SourceTrack);
                 if (this.sourceTrack != null)
                 {
                     this.Track = this.sourceTrack.ToString();
                 }
+
+                this.NotifyOfPropertyChange(() => this.CanBeBurned);
+                this.NotifyOfPropertyChange(() => this.CanBeForced);
             }
         }
 
@@ -122,7 +182,19 @@
         /// <summary>
         ///   Gets or sets the SRT Filename
         /// </summary>
-        public string SrtFileName { get; set; }
+        public string SrtFileName
+        {
+            get
+            {
+                return srtFileName;
+            }
+
+            set
+            {
+                srtFileName = value;
+                this.NotifyOfPropertyChange(() => this.IsSrtSubtitle);
+            }
+        }
 
         /// <summary>
         ///   Gets or sets the SRT Language
@@ -145,24 +217,56 @@
         public SubtitleType SubtitleType { get; set; }
 
         /// <summary>
-        ///   Gets A ListViewItem Containing information about this subitlte
+        ///   Gets or sets Track.
+        /// </summary>
+        [Obsolete("Use SourceTrack Instead")]
+        public string Track { get; set; }
+
+        #endregion
+
+        /// <summary>
+        /// Gets a value indicating whether CanForced.
         /// </summary>
-        [Obsolete("Used only for the old forms gui. Will be removed.")]
-        public ListViewItem ListView
+        public bool CanBeForced
         {
             get
             {
-                var listTrack = new ListViewItem(this.Track);
-                listTrack.SubItems.Add(this.Forced ? "Yes" : "No");
-                listTrack.SubItems.Add(this.Burned ? "Yes" : "No");
-                listTrack.SubItems.Add(this.Default ? "Yes" : "No");
-                listTrack.SubItems.Add(this.SrtLang);
-                listTrack.SubItems.Add(this.SrtCharCode);
-                listTrack.SubItems.Add(this.SrtOffset.ToString());
-                return listTrack;
+                if (this.SourceTrack != null)
+                {
+                    return this.SourceTrack.SubtitleType == SubtitleType.VobSub || this.SourceTrack.SubtitleType == SubtitleType.PGS
+                        || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch;
+                }
+
+                return false;
             }
         }
 
-        #endregion
+        /// <summary>
+        /// Gets a value indicating whether CanBeBurned.
+        /// </summary>
+        public bool CanBeBurned
+        {
+            get
+            {
+                if (this.SourceTrack != null)
+                {
+                    return this.SourceTrack.SubtitleType == SubtitleType.VobSub || this.SourceTrack.SubtitleType == SubtitleType.PGS
+                        || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch || this.SourceTrack.SubtitleType == SubtitleType.SSA;
+                }
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        ///   Gets a value indicating whether this is an SRT subtitle.
+        /// </summary>
+        public bool IsSrtSubtitle
+        {
+            get
+            {
+                return this.SrtFileName != "-" && this.SrtFileName != null;
+            }
+        }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs Changed

@@ -1,7 +1,11 @@
-/*  SubtitleType.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleType.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Subtitle Type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model.Encoding
 {
@@ -24,7 +28,11 @@
         UTF8Sub,
         [Description("TX3G")]
         TX3G,
+        [Description("PGS")]
+        PGS,
         [Description("Unknown")]
-        Unknown
+        Unknown,
+        [Description("Foreign Audio Search")]
+        ForeignAudioSearch, // Special Type for Foreign Audio Search
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Preset.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Preset.cs Changed

@@ -1,61 +1,78 @@
-/*  Preset.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Preset.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Preset for encoding with.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model
 {
-    using Encoding;
+    using Caliburn.Micro;
 
     /// <summary>
     /// A Preset for encoding with.
     /// </summary>
-    public class Preset
+    public class Preset : PropertyChangedBase
     {
-        /// <summary>
-        /// Gets or sets the category which the preset resides under
-        /// </summary>
-        public string Category { get; set; }
+        #region Constants and Fields
 
         /// <summary>
-        /// Gets or sets the preset name
+        /// The is default.
         /// </summary>
-        public string Name { get; set; }
+        private bool isDefault;
+
+        #endregion
+
+        #region Properties
 
         /// <summary>
-        /// Gets or sets the preset query
+        /// Gets or sets the category which the preset resides under
         /// </summary>
-        public string Query { get; set; }
+        public string Category { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether to use picture Settings in presets.
+        /// Gets or sets the Description for the preset
         /// </summary>
-        public bool CropSettings { get; set; }
+        public string Description { get; set; }
 
         /// <summary>
-        /// Gets or sets The version number which associates this preset with a HB build
+        /// Gets or sets a value indicating whether this is a built in preset
         /// </summary>
-        public string Version { get; set; }
+        public bool IsBuildIn { get; set; }
 
         /// <summary>
-        /// Gets or sets the Description for the preset
+        /// Gets or sets a value indicating whether IsDefault.
         /// </summary>
-        public string Description { get; set; }
+        public bool IsDefault
+        {
+            get
+            {
+                return this.isDefault;
+            }
+            set
+            {
+                this.isDefault = value;
+                this.NotifyOfPropertyChange(() => this.IsDefault);
+            }
+        }
 
         /// <summary>
-        /// Gets or sets a value indicating whether Picture Filters are used with this preset.
+        /// Gets or sets the preset name
         /// </summary>
-        public bool UsePictureFilters { get; set; }
+        public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this is a built in preset
+        /// Gets or sets PictureSettingsMode.
+        /// Source Maximum, Custom or None
         /// </summary>
-        public bool IsBuildIn { get; set; }
+        public PresetPictureSettingsMode PictureSettingsMode { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether IsDefault.
+        /// Gets or sets a value indicating whether use deinterlace.
         /// </summary>
-        public bool IsDefault { get; set; }
+        public bool UseDeinterlace { get; set; }
 
         /// <summary>
         /// Gets or sets task.
@@ -63,9 +80,18 @@
         public EncodeTask Task { get; set; }
 
         /// <summary>
-        /// Gets or sets AudioPassthruSettings.
+        /// Gets or sets a value indicating whether Picture Filters are used with this preset.
         /// </summary>
-        public AllowedPassthru AudioPassthruSettings { get; set; }
+        public bool UsePictureFilters { get; set; }
+
+        /// <summary>
+        /// Gets or sets The version number which associates this preset with a HB build
+        /// </summary>
+        public string Version { get; set; }
+
+        #endregion
+
+        #region Public Methods
 
         /// <summary>
         ///  Override the ToString Method
@@ -77,5 +103,7 @@
         {
             return this.Name;
         }
+
+        #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs Added

@@ -0,0 +1,26 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetPictureSettingsMode.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Picture Settings Mode when adding presets
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model
+{
+    using System.ComponentModel.DataAnnotations;
+
+    /// <summary>
+    /// Picture Settings Mode when adding presets
+    /// </summary>
+    public enum PresetPictureSettingsMode
+    {
+        [Display(Name = "None")]
+        None = 0,
+        [Display(Name = "Custom")]
+        Custom = 1,
+        [Display(Name = "Source Maximum")]
+        SourceMaximum = 2,
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/QueueItemStatus.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/QueueItemStatus.cs Changed

@@ -1,30 +1,39 @@
-/*  QueueItemStatus.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueItemStatus.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Queue Item Status
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model
 {
     using System.ComponentModel;
+    using System.ComponentModel.DataAnnotations;
 
     using HandBrake.ApplicationServices.Converters;
 
     /// <summary>
     /// Queue Item Status
     /// </summary>
-    [TypeConverter(typeof(EnumToDescConveter))]
+    [TypeConverter(typeof(EnumToDescConverter))]
     public enum QueueItemStatus
     {
         [Description("Waiting")]
+        [Display(Name = "Waiting")]
         Waiting = 0,
 
         [Description("In Progress")]
+        [Display(Name = "In Progress")]
         InProgress,
 
         [Description("Completed")]
+        [Display(Name = "Completed")]
         Completed,
 
         [Description("Error")]
+        [Display(Name = "Error")]
         Error,
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs Changed

@@ -1,82 +1,134 @@
-/*  QueueTask.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueTask.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The QueueTask.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Model
 {
+    using Caliburn.Micro;
+
+    using HandBrake.ApplicationServices.Parsing;
+
     /// <summary>
     /// The QueueTask.
     /// </summary>
-    public class QueueTask
+    public class QueueTask : PropertyChangedBase
     {
+        #region Constants and Fields
+
         /// <summary>
-        /// Initializes a new instance of the <see cref="QueueTask"/> class.
+        /// The status.
         /// </summary>
-        public QueueTask()
-        {         
-        }
+        private QueueItemStatus status;
+
+        #endregion
+
+        #region Properties
 
         /// <summary>
         /// Initializes a new instance of the <see cref="QueueTask"/> class.
         /// </summary>
-        /// <param name="query">
-        /// The query.
-        /// </param>
-        public QueueTask(string query)
+        public QueueTask()
         {
-            this.Query = query;
+            this.Status = QueueItemStatus.Waiting;
         }
 
         /// <summary>
-        /// Gets or sets the job ID.
+        /// Gets or sets ScannedSource.
         /// </summary>
-        public int Id { get; set; }
+        public Source ScannedSource { get; set; } 
 
         /// <summary>
-        /// Gets or sets Title.
+        /// Gets or sets a value indicating whether if this is a user or GUI generated query
         /// </summary>
-        public int Title { get; set; }
+        public bool CustomQuery { get; set; }
 
         /// <summary>
-        /// Gets or sets Source.
+        /// Gets or sets Status.
         /// </summary>
-        public string Source { get; set; }
+        public QueueItemStatus Status
+        {
+            get
+            {
+                return this.status;
+            }
 
-        /// <summary>
-        /// Gets or sets Destination.
-        /// </summary>
-        public string Destination { get; set; }
+            set
+            {
+                this.status = value;
+                this.NotifyOfPropertyChange(() => this.Status);
+            }
+        }
 
         /// <summary>
-        /// Gets or sets the query string.
+        /// Gets or sets the Encode Task.
         /// </summary>
-        public string Query { get; set; }
+        public EncodeTask Task { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether if this is a user or GUI generated query
-        /// </summary>
-        public bool CustomQuery { get; set; }
+        #endregion
 
         /// <summary>
-        /// Gets or sets Status.
+        /// The equals.
         /// </summary>
-        public QueueItemStatus Status { get; set; }
+        /// <param name="other">
+        /// The other.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        protected bool Equals(QueueTask other)
+        {
+            return Equals(this.ScannedSource, other.ScannedSource) && this.CustomQuery.Equals(other.CustomQuery) && Equals(this.Task, other.Task) && this.status == other.status;
+        }
 
         /// <summary>
-        /// Gets or sets the Encode Task.
+        /// The equals.
         /// </summary>
-        public EncodeTask Task { get; set; }
+        /// <param name="obj">
+        /// The obj.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            return Equals((QueueTask)obj);
+        }
 
         /// <summary>
-        /// Gets a value indicating whether or not this instance is empty.
+        /// The get hash code.
         /// </summary>
-        public bool IsEmpty
+        /// <returns>
+        /// The <see cref="int"/>.
+        /// </returns>
+        public override int GetHashCode()
         {
-            get
+            unchecked
             {
-                return this.Id == 0 && string.IsNullOrEmpty(this.Query) && string.IsNullOrEmpty(this.Task.Source) &&
-                       string.IsNullOrEmpty(this.Task.Destination);
+                int hashCode = (this.ScannedSource != null ? this.ScannedSource.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ this.CustomQuery.GetHashCode();
+                hashCode = (hashCode * 397) ^ (this.Task != null ? this.Task.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (int)this.status;
+                return hashCode;
             }
         }
     }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs Changed

@@ -1,7 +1,11 @@
-/*  AudioTrack.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Audio.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An object represending an AudioTrack associated with a Title, in a DVD
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Parsing
 {
@@ -108,5 +112,70 @@
 
             return string.Format("{0} {1} ({2}) ({3})", this.TrackNumber, this.Language, this.Format, this.Description);
         }
+
+        /// <summary>
+        /// The equals.
+        /// </summary>
+        /// <param name="other">
+        /// The other.
+        /// </param>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        public bool Equals(Audio other)
+        {
+            if (ReferenceEquals(null, other))
+            {
+                return false;
+            }
+            if (ReferenceEquals(this, other))
+            {
+                return true;
+            }
+            return other.TrackNumber == this.TrackNumber && object.Equals(other.Language, this.Language) && object.Equals(other.LanguageCode, this.LanguageCode) && object.Equals(other.Format, this.Format);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
+        /// </returns>
+        /// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>. </param><filterpriority>2</filterpriority>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+            {
+                return false;
+            }
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+            if (obj.GetType() != typeof(Audio))
+            {
+                return false;
+            }
+            return Equals((Audio)obj);
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type. 
+        /// </summary>
+        /// <returns>
+        /// A hash code for the current <see cref="T:System.Object"/>.
+        /// </returns>
+        /// <filterpriority>2</filterpriority>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int result = this.TrackNumber;
+                result = (result * 397) ^ (this.Language != null ? this.Language.GetHashCode() : 0);
+                result = (result * 397) ^ (this.LanguageCode != null ? this.LanguageCode.GetHashCode() : 0);
+                result = (result * 397) ^ (this.Format != null ? this.Format.GetHashCode() : 0);
+                return result;
+            }
+        }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/AudioHelper.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/AudioHelper.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Chapter.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Chapter.cs Changed

@@ -1,7 +1,11 @@
-/*  Chapter.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Chapter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An object representing a Chapter aosciated with a Title, in a DVD
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Parsing
 {
@@ -28,15 +32,15 @@
         /// <param name="number">
         /// The number.
         /// </param>
-        /// <param name="Name">
+        /// <param name="name">
         /// The name.
         /// </param>
         /// <param name="duration">
         /// The duration.
         /// </param>
-        public Chapter(int number, string Name, TimeSpan duration)
+        public Chapter(int number, string name, TimeSpan duration)
         {
-            this.ChapterName = Name;
+            this.ChapterName = name;
             this.ChapterNumber = number;
             this.Duration = duration;
         }
@@ -68,9 +72,8 @@
         public static Chapter Parse(StringReader output)
         {
             // TODO add support for reading chapter names to the regex.
-            Match m = Regex.Match(
-                                  output.ReadLine(),
-                                  @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");
+            string line = output.ReadLine();
+            Match m = Regex.Match(line, @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");
             if (m.Success)
             {
                 var thisChapter = new Chapter

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs Changed

@@ -1,7 +1,11 @@
-/*  Parser.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Parser.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A delegate to handle custom events regarding data being parsed from the buffer
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Parsing
 {
@@ -24,7 +28,8 @@
     /// <param name="sender">The object who's raising the event</param>
     /// <param name="currentTitle">The title number currently being processed</param>
     /// <param name="titleCount">The total number of titiles to be processed</param>
-    public delegate void ScanProgressEventHandler(object sender, int currentTitle, int titleCount);
+    /// <param name="percentage">Percentage complete.</param>
+    public delegate void ScanProgressEventHandler(object sender, int currentTitle, int titleCount, decimal percentage);
 
     /// <summary>
     /// A delegate to handle encode progress updates // EXPERIMENTAL
@@ -74,10 +79,6 @@
         /// </summary>
         public event ScanProgressEventHandler OnScanProgress;
 
-        /// <summary>
-        /// Raised upon the catching of a "Scanning title # of #..." in the stream
-        /// </summary>
-        public event EncodeProgressEventHandler OnEncodeProgress;
 
         /// <summary>
         /// Gets the buffer of data that came from the CLI standard input/error
@@ -97,18 +98,18 @@
         {
             string tmp = base.ReadLine();
 
-            buffer.Append(tmp + Environment.NewLine);
-
             Match m = null;
-            if (tmp.Contains("Scanning title"))
-                m = Regex.Match(tmp, "^Scanning title ([0-9]*) of ([0-9]*)");
+            if (tmp != null && tmp.Contains("Scanning title"))
+                m = Regex.Match(tmp, "^Scanning title ([0-9]*) of ([0-9]*)([a-z0-9 ,]*), ([0-9.]*)");
+            else if (!string.IsNullOrEmpty(tmp))
+                buffer.Append(tmp + Environment.NewLine);
 
             if (OnReadLine != null)
                 OnReadLine(this, tmp);
 
             if (m != null)
                 if (m.Success && OnScanProgress != null)
-                    OnScanProgress(this, int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));
+                    OnScanProgress(this, int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value), decimal.Parse(m.Groups[4].Value, CultureInfo.InvariantCulture));
 
             return tmp;
         }
@@ -129,34 +130,5 @@
 
             return tmp;
         }
-
-        /// <summary>
-        /// Pase the CLI status output (from standard output)
-        /// </summary>
-        public void ReadEncodeStatus()
-        {
-            string tmp = base.ReadLine();
-
-            Match m = Regex.Match(tmp, @"^Encoding: task ([0-9]*) of ([0-9]*), ([0-9]*\.[0-9]*) %( $([0-9]*\.[0-9]*) fps, avg ([0-9]*\.[0-9]*) fps, ETA ([0-9]{2})h([0-9]{2})m([0-9]{2})s$)?");
-            if (m.Success && OnEncodeProgress != null)
-            {
-                int currentTask = int.Parse(m.Groups[1].Value);
-                int totalTasks = int.Parse(m.Groups[2].Value);
-                float percent = float.Parse(m.Groups[3].Value, CultureInfo.InvariantCulture);
-                float currentFps = m.Groups[5].Value == string.Empty ? 0.0F : float.Parse(m.Groups[5].Value, CultureInfo.InvariantCulture);
-                float avgFps = m.Groups[6].Value == string.Empty ? 0.0F : float.Parse(m.Groups[6].Value, CultureInfo.InvariantCulture);
-                string remaining = string.Empty;
-                if (m.Groups[7].Value != string.Empty)
-                {
-                    remaining = m.Groups[7].Value + ":" + m.Groups[8].Value + ":" + m.Groups[9].Value;
-                }
-                if (string.IsNullOrEmpty(remaining))
-                {
-                    remaining = "Calculating ...";
-                }
-
-                OnEncodeProgress(this, currentTask, totalTasks, percent, currentFps, avgFps, remaining);
-            }
-        }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs Changed

@@ -1,15 +1,24 @@
-/*  Source.cs $    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Source.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An object representing a scanned DVD
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Parsing
 {
     using System.Collections.Generic;
     using System.IO;
+    using System.Runtime.Serialization;
+
+    using HandBrake.ApplicationServices.Services.Interfaces;
 
     /// <summary>
     /// An object representing a scanned DVD
     /// </summary>
+    [DataContract]
     public class Source
     {
         /// <summary>
@@ -25,11 +34,13 @@
         /// Gets or sets ScanPath.
         /// The Path used by the Scan Service.
         /// </summary>
+        [DataMember]
         public string ScanPath { get; set; }
 
         /// <summary>
         /// Gets or sets Titles. A list of titles from the source
         /// </summary>
+        [DataMember]
         public List<Title> Titles { get; set; }
 
         /// <summary>
@@ -38,17 +49,20 @@
         /// <param name="output">
         /// The output.
         /// </param>
+        /// <param name="isDvdNavDisabled">
+        /// The is Dvd Nav Disabled.
+        /// </param>
         /// <returns>
         /// A DVD object which contains a list of title inforamtion
         /// </returns>
-        public static Source Parse(StreamReader output)
+        public static Source Parse(StreamReader output, bool isDvdNavDisabled)
         {
             var thisDVD = new Source();
 
             while (!output.EndOfStream)
             {
                 if ((char) output.Peek() == '+')
-                    thisDVD.Titles.AddRange(Title.ParseList(output.ReadToEnd()));
+                    thisDVD.Titles.AddRange(Title.ParseList(output.ReadToEnd(), isDvdNavDisabled));
                 else
                     output.ReadLine();
             }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs Changed

@@ -1,7 +1,11 @@
-/*  Subtitle.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Subtitle.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An object that represents a subtitle associated with a Title, in a DVD
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Parsing
 {
@@ -10,8 +14,8 @@
     using System.IO;
     using System.Text.RegularExpressions;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Utilities;
 
     /// <summary>
     /// An object that represents a subtitle associated with a Title, in a DVD
@@ -126,6 +130,9 @@
                     case "SSA":
                         thisSubtitle.SubtitleType = SubtitleType.SSA;
                         break;
+                    case "PGS":
+                        thisSubtitle.SubtitleType = SubtitleType.PGS;
+                        break;
                     default:
                         thisSubtitle.SubtitleType = SubtitleType.Unknown;
                         break;
@@ -166,7 +173,72 @@
         /// <returns>A string formatted as: {track #} {language}</returns>
         public override string ToString()
         {
-            return string.Format("{0} {1} ({2})", TrackNumber, Language, TypeString);
+            return this.SubtitleType == SubtitleType.ForeignAudioSearch ? "Foreign Audio Scan" : string.Format("{0} {1} ({2})", this.TrackNumber, this.Language, this.TypeString);
+        }
+
+        /// <summary>
+        /// The equals.
+        /// </summary>
+        /// <param name="other">
+        /// The other.
+        /// </param>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        public bool Equals(Subtitle other)
+        {
+            if (ReferenceEquals(null, other))
+            {
+                return false;
+            }
+            if (ReferenceEquals(this, other))
+            {
+                return true;
+            }
+            return other.TrackNumber == this.TrackNumber && object.Equals(other.Language, this.Language) && object.Equals(other.LanguageCode, this.LanguageCode) && object.Equals(other.SubtitleType, this.SubtitleType);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
+        /// </returns>
+        /// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>. </param><filterpriority>2</filterpriority>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+            {
+                return false;
+            }
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+            if (obj.GetType() != typeof(Subtitle))
+            {
+                return false;
+            }
+            return Equals((Subtitle)obj);
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type. 
+        /// </summary>
+        /// <returns>
+        /// A hash code for the current <see cref="T:System.Object"/>.
+        /// </returns>
+        /// <filterpriority>2</filterpriority>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int result = this.TrackNumber;
+                result = (result * 397) ^ (this.Language != null ? this.Language.GetHashCode() : 0);
+                result = (result * 397) ^ (this.LanguageCode != null ? this.LanguageCode.GetHashCode() : 0);
+                result = (result * 397) ^ this.SubtitleType.GetHashCode();
+                return result;
+            }
         }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs Changed

@@ -1,7 +1,11 @@
-/*  Title.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Title.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An object that represents a single Title of a DVD
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Parsing
 {
@@ -9,9 +13,9 @@
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
+    using System.Linq;
     using System.Text.RegularExpressions;
 
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.Interop.Model;
 
     using Size = System.Drawing.Size;
@@ -22,11 +26,6 @@
     public class Title
     {
         /// <summary>
-        /// The User Setting Service
-        /// </summary>
-        private static IUserSettingService userSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
         /// Initializes a new instance of the <see cref="Title"/> class. 
         /// </summary>
         public Title()
@@ -118,9 +117,16 @@
         /// <summary>
         /// Parse the Title Information
         /// </summary>
-        /// <param name="output">A StringReader of output data</param>
-        /// <returns>A Title Object</returns>
-        public static Title Parse(StringReader output)
+        /// <param name="output">
+        /// A StringReader of output data
+        /// </param>
+        /// <param name="isDvdNavDisabled">
+        /// The is Dvd Nav Disabled.
+        /// </param>
+        /// <returns>
+        /// A Title Object
+        /// </returns>
+        public static Title Parse(StringReader output, bool isDvdNavDisabled)
         {
             var thisTitle = new Title();
             string nextLine = output.ReadLine();
@@ -161,20 +167,17 @@
             {
                 nextLine = output.ReadLine();
             }
-       
+
             // Multi-Angle Support if LibDvdNav is enabled
-            if (!userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
+            m = Regex.Match(nextLine, @"  \+ angle$s$ ([0-9]*)");
+            if (m.Success)
             {
-                m = Regex.Match(nextLine, @"  \+ angle$s$ ([0-9])");
-                if (m.Success)
-                {
-                    string angleList = m.Value.Replace("+ angle(s) ", string.Empty).Trim();
-                    int angleCount;
-                    int.TryParse(angleList, out angleCount);
-
-                    thisTitle.AngleCount = angleCount;
-                    nextLine = output.ReadLine();
-                }
+                string angleList = m.Value.Replace("+ angle(s) ", string.Empty).Trim();
+                int angleCount;
+                int.TryParse(angleList, out angleCount);
+
+                thisTitle.AngleCount = angleCount;
+                nextLine = output.ReadLine();
             }
 
             // Get duration for this title
@@ -217,9 +220,16 @@
         /// <summary>
         /// Return a list of parsed titles
         /// </summary>
-        /// <param name="output">The Output</param>
-        /// <returns>A List of titles</returns>
-        public static Title[] ParseList(string output)
+        /// <param name="output">
+        /// The Output
+        /// </param>
+        /// <param name="isDvdNavDisabled">
+        /// The is Dvd Nav Disabled.
+        /// </param>
+        /// <returns>
+        /// A List of titles
+        /// </returns>
+        public static Title[] ParseList(string output, bool isDvdNavDisabled)
         {
             var titles = new List<Title>();
             var sr = new StringReader(output);
@@ -230,7 +240,7 @@
                 if (sr.Peek() == ' ') // If the character is a space, then chances are it's the combing detected line.
                     sr.ReadLine(); // Skip over it
                 else
-                    titles.Add(Parse(sr));
+                    titles.Add(Parse(sr, isDvdNavDisabled));
             }
 
             return titles.ToArray();
@@ -244,12 +254,11 @@
         /// <returns>A Timespan</returns>
         public TimeSpan CalculateDuration(int startPoint, int endPoint)
         {
+            IEnumerable<Chapter> chapers =
+                this.Chapters.Where(c => c.ChapterNumber >= startPoint && c.ChapterNumber <= endPoint);
+
             TimeSpan duration = TimeSpan.FromSeconds(0.0);
-            if (startPoint != 0 && endPoint != 0 && endPoint <= this.Chapters.Count)
-            {
-                for (int i = startPoint; i <= endPoint; i++)
-                    duration += this.Chapters[i - 1].Duration;
-            }
+            duration = chapers.Aggregate(duration, (current, chapter) => current + chapter.Duration);
 
             return duration;
         }
@@ -260,7 +269,7 @@
         /// <returns>A string representing this track in the format: {title #} (00:00:00)</returns>
         public override string ToString()
         {
-            if (!string.IsNullOrEmpty(this.Playlist))
+            if (!string.IsNullOrEmpty(this.Playlist) && !this.Playlist.StartsWith(" "))
             {
                 this.Playlist = string.Format(" {0}", this.Playlist);
             }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl Added

@@ -0,0 +1,42 @@
+/*  AssemblyInfo.cs $
+    This file is part of the HandBrake source code.
+    Homepage: <http://handbrake.fr>.
+    It may be used under the terms of the GNU General Public License. */
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("HandBrake")]
+[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HandBrake Team")]
+[assembly: AssemblyProduct("HandBrake")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
+
+// 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 Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.0.0.$WCREV$")]
+[assembly: NeutralResourcesLanguage("")]

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/Resources.resx -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/Resources.resx Changed

@@ -112,13 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs Changed

@@ -1,17 +1,22 @@
-/*  EncodeBase.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeBase.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Base Class for the Encode Services.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services.Base
 {
     using System;
+    using System.Globalization;
     using System.IO;
     using System.Text;
+    using System.Text.RegularExpressions;
 
     using HandBrake.ApplicationServices.EventArgs;
     using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
@@ -26,17 +31,17 @@
         /// <summary>
         /// A Lock for the filewriter
         /// </summary>
-        private static readonly object fileWriterLock = new object();
+        private static readonly object FileWriterLock = new object();
 
         /// <summary>
         /// The User Setting Service
         /// </summary>
-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;
+        private readonly IUserSettingService userSettingService;
 
         /// <summary>
-        /// Windows 7 API Pack wrapper
+        /// The Log File Header
         /// </summary>
-        private Win7 windowsSeven = new Win7();
+        private readonly StringBuilder header;
 
         /// <summary>
         /// The Log Buffer
@@ -48,19 +53,22 @@
         /// </summary>
         private StreamWriter fileWriter;
 
-        /// <summary>
-        /// The Log File Header
-        /// </summary>
-        private StringBuilder header = GeneralUtilities.CreateCliLogHeader();
-
         #endregion
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EncodeBase"/> class.
         /// </summary>
-        public EncodeBase()
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        public EncodeBase(IUserSettingService userSettingService)
         {
+            this.userSettingService = userSettingService;
             this.logBuffer = new StringBuilder();
+            header =
+                GeneralUtilities.CreateCliLogHeader();
+
+            this.LogIndex = 0;
         }
 
         #region Events
@@ -104,24 +112,18 @@
         }
 
         /// <summary>
-        /// Gets LogBuffer.
+        /// Gets the log index.
         /// </summary>
-        public StringBuilder LogBuffer
-        {
-            get
-            {
-                return this.logBuffer;
-            }
-        }
+        public int LogIndex { get; private set; }
 
         /// <summary>
-        /// Gets WindowsSeven.
+        /// Gets LogBuffer.
         /// </summary>
-        public Win7 WindowsSeven
+        public StringBuilder LogBuffer
         {
             get
             {
-                return this.windowsSeven;
+                return this.logBuffer;
             }
         }
 
@@ -135,7 +137,7 @@
         /// <param name="e">
         /// The EncodeProgressEventArgs.
         /// </param>
-        public void Invoke_encodeStatusChanged(EncodeProgressEventArgs e)
+        public void InvokeEncodeStatusChanged(EncodeProgressEventArgs e)
         {
             EncodeProgessStatus handler = this.EncodeStatusChanged;
             if (handler != null)
@@ -150,13 +152,15 @@
         /// <param name="e">
         /// The EncodeCompletedEventArgs.
         /// </param>
-        public void Invoke_encodeCompleted(EncodeCompletedEventArgs e)
+        public void InvokeEncodeCompleted(EncodeCompletedEventArgs e)
         {
             EncodeCompletedStatus handler = this.EncodeCompleted;
             if (handler != null)
             {
                 handler(this, e);
             }
+
+            this.LogIndex = 0; // Reset
         }
 
         /// <summary>
@@ -165,7 +169,7 @@
         /// <param name="e">
         /// The EventArgs.
         /// </param>
-        public void Invoke_encodeStarted(EventArgs e)
+        public void InvokeEncodeStarted(EventArgs e)
         {
             EventHandler handler = this.EncodeStarted;
             if (handler != null)
@@ -181,10 +185,7 @@
         /// <summary>
         /// A Stop Method to be implemeneted.
         /// </summary>
-        /// <param name="exc">
-        /// The Exception that occured that required a STOP action.
-        /// </param>
-        public virtual void Stop(Exception exc)
+        public virtual void Stop()
         {
             // Do Nothing
         }
@@ -202,7 +203,7 @@
             {
                 string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +
                                 "\\HandBrake\\logs";
-                string tempLogFile = Path.Combine(logDir, string.Format("last_encode_log{0}.txt", GeneralUtilities.GetInstanceCount));
+                string tempLogFile = Path.Combine(logDir, string.Format("last_encode_log{0}.txt", GeneralUtilities.ProcessId));
 
                 string encodeDestinationPath = Path.GetDirectoryName(destination);
                 string destinationFile = Path.GetFileName(destination);
@@ -239,6 +240,72 @@
         }
 
         /// <summary>
+        /// Pase the CLI status output (from standard output)
+        /// </summary>
+        /// <param name="encodeStatus">
+        /// The encode Status.
+        /// </param>
+        /// <param name="startTime">
+        /// The start Time.
+        /// </param>
+        /// <returns>
+        /// The <see cref="EncodeProgressEventArgs"/>.
+        /// </returns>
+        public EncodeProgressEventArgs ReadEncodeStatus(string encodeStatus, DateTime startTime)
+        {
+            try
+            {
+                Match m = Regex.Match(
+                    encodeStatus,
+                    @"^Encoding: task ([0-9]*) of ([0-9]*), ([0-9]*\.[0-9]*) %( $([0-9]*\.[0-9]*) fps, avg ([0-9]*\.[0-9]*) fps, ETA ([0-9]{2})h([0-9]{2})m([0-9]{2})s$)?");
+
+                if (m.Success)
+                {
+                    int currentTask = int.Parse(m.Groups[1].Value);
+                    int totalTasks = int.Parse(m.Groups[2].Value);
+                    float percent = float.Parse(m.Groups[3].Value, CultureInfo.InvariantCulture);
+                    float currentFps = m.Groups[5].Value == string.Empty
+                                           ? 0.0F
+                                           : float.Parse(m.Groups[5].Value, CultureInfo.InvariantCulture);
+                    float avgFps = m.Groups[6].Value == string.Empty
+                                       ? 0.0F
+                                       : float.Parse(m.Groups[6].Value, CultureInfo.InvariantCulture);
+                    string remaining = string.Empty;
+                    if (m.Groups[7].Value != string.Empty)
+                    {
+                        remaining = m.Groups[7].Value + ":" + m.Groups[8].Value + ":" + m.Groups[9].Value;
+                    }
+                    if (string.IsNullOrEmpty(remaining))
+                    {
+                        remaining = "Calculating ...";
+                    }
+
+                    EncodeProgressEventArgs eventArgs = new EncodeProgressEventArgs
+                                                            {
+                                                                AverageFrameRate = avgFps,
+                                                                CurrentFrameRate = currentFps,
+                                                                EstimatedTimeLeft =
+                                                                    Converters.EncodeToTimespan(
+                                                                        remaining),
+                                                                PercentComplete = percent,
+                                                                Task = currentTask,
+                                                                TaskCount = totalTasks,
+                                                                ElapsedTime =
+                                                                    DateTime.Now - startTime,
+                                                            };
+
+                    return eventArgs;
+                }
+
+                return null;
+            }
+            catch (Exception exc)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
         /// Setup the logging.
         /// </summary>
         /// <param name="encodeQueueTask">
@@ -248,13 +315,17 @@
         {
             ShutdownFileWriter();
             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
-            string logFile = Path.Combine(logDir, string.Format("last_encode_log{0}.txt", GeneralUtilities.GetInstanceCount));
-            string logFile2 = Path.Combine(logDir, string.Format("tmp_appReadable_log{0}.txt", GeneralUtilities.GetInstanceCount));
+            string logFile = Path.Combine(logDir, string.Format("last_encode_log{0}.txt", GeneralUtilities.ProcessId));
+            string logFile2 = Path.Combine(logDir, string.Format("tmp_appReadable_log{0}.txt", GeneralUtilities.ProcessId));
 
             try
             {
+                string query = QueryGeneratorUtility.GenerateQuery(new EncodeTask(encodeQueueTask.Task),
+                    userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
+                    userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
+                    userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
                 this.logBuffer = new StringBuilder();
-                this.logBuffer.AppendLine(String.Format("CLI Query: {0}", encodeQueueTask.Query));
+                this.logBuffer.AppendLine(String.Format("CLI Query: {0}", query));
                 this.logBuffer.AppendLine(String.Format("User Query: {0}", encodeQueueTask.CustomQuery));
                 this.logBuffer.AppendLine();
 
@@ -270,9 +341,9 @@
                 }
 
                 this.fileWriter = new StreamWriter(logFile) { AutoFlush = true };
-                this.fileWriter.WriteLine(GeneralUtilities.CreateCliLogHeader());
-                this.fileWriter.WriteLine(String.Format("CLI Query: {0}", encodeQueueTask.Query));
-                this.fileWriter.WriteLine(String.Format("User Query: {0}", encodeQueueTask.CustomQuery));
+                this.fileWriter.WriteLine(header);
+                this.fileWriter.WriteLine(string.Format("CLI Query: {0}", query));
+                this.fileWriter.WriteLine(string.Format("User Query: {0}", encodeQueueTask.CustomQuery));
                 this.fileWriter.WriteLine();
             }
             catch (Exception)
@@ -299,25 +370,18 @@
             {
                 try
                 {
+                    this.LogIndex = this.LogIndex + 1;
+
                     lock (this.LogBuffer)
                     {
                         this.LogBuffer.AppendLine(message);
                     }
 
-                    lock (fileWriterLock)
+                    lock (FileWriterLock)
                     {
                         if (this.fileWriter != null && this.fileWriter.BaseStream.CanWrite)
                         {
                             this.fileWriter.WriteLine(message);
-
-                            // If the logging grows past 100MB, kill the encode and stop.
-                            if (this.fileWriter.BaseStream.Length > 100000000)
-                            {
-                                this.Stop(
-                                    new Exception(
-                                        "The encode has been stopped. The log file has grown to over 100MB which indicates a serious problem has occured with the encode." +
-                                        "Please check the encode log for an indication of what the problem is."));
-                            }
                         }
                     }
                 }
@@ -335,7 +399,7 @@
         {
             try
             {
-                lock (fileWriterLock)
+                lock (FileWriterLock)
                 {
                     if (this.fileWriter != null)
                     {
@@ -366,7 +430,7 @@
             // Make sure the path exists, attempt to create it if it doesn't
             try
             {
-                string path = Directory.GetParent(task.Destination).ToString();
+                string path = Directory.GetParent(task.Task.Destination).ToString();
                 if (!Directory.Exists(path))
                 {
                     Directory.CreateDirectory(path);

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Encode.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Encode.cs Changed

@@ -1,22 +1,26 @@
-/*  Encode.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Encode.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Class which handles the CLI
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
     using System;
     using System.Diagnostics;
     using System.IO;
-    using System.Threading;
     using System.Windows.Forms;
 
+    using Caliburn.Micro;
+
     using HandBrake.ApplicationServices.EventArgs;
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Base;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
 
     /// <summary>
     /// Class which handles the CLI
@@ -28,12 +32,7 @@
         /// <summary>
         /// The User Setting Service
         /// </summary>
-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
-        /// Gets The Process Handle
-        /// </summary>
-        private IntPtr processHandle;
+        private readonly IUserSettingService userSettingService;
 
         /// <summary>
         /// Gets the Process ID
@@ -50,15 +49,23 @@
         /// </summary>
         private QueueTask currentTask;
 
+        /// <summary>
+        /// The init shutdown.
+        /// </summary>
+        private bool initShutdown;
+
         #endregion
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Encode"/> class.
         /// </summary>
-        public Encode()
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        public Encode(IUserSettingService userSettingService)
+            : base(userSettingService)
         {
-            this.EncodeStarted += this.EncodeEncodeStarted;
-            GrowlCommunicator.Register();
+            this.userSettingService = userSettingService;
         }
 
         #region Properties
@@ -74,6 +81,7 @@
 
         /// <summary>
         /// Execute a HandBrakeCLI process.
+        /// This should only be called from the UI thread.
         /// </summary>
         /// <param name="encodeQueueTask">
         /// The encodeQueueTask.
@@ -85,8 +93,6 @@
         {
             try
             {
-                this.currentTask = encodeQueueTask;
-
                 if (this.IsEncoding)
                 {
                     throw new Exception("HandBrake is already encodeing.");
@@ -94,6 +100,8 @@
 
                 this.IsEncoding = true;
 
+                this.currentTask = encodeQueueTask;
+
                 if (enableLogging)
                 {
                     try
@@ -116,12 +124,27 @@
                 this.VerifyEncodeDestinationPath(currentTask);
 
                 string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");
-                ProcessStartInfo cliStart = new ProcessStartInfo(handbrakeCLIPath, currentTask.Query)
+
+                // TODO tidy this code up, it's kinda messy.
+                string query = this.currentTask.Task.IsPreviewEncode
+                                   ? QueryGeneratorUtility.GeneratePreviewQuery(
+                                       new EncodeTask(this.currentTask.Task),
+                                       this.currentTask.Task.PreviewEncodeDuration,
+                                       this.currentTask.Task.PreviewEncodeStartAt,
+                                       userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
+                                       userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
+                                       userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
+                                   : QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.currentTask.Task),
+                                   userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
+                                   userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
+                                   userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
+
+                ProcessStartInfo cliStart = new ProcessStartInfo(handbrakeCLIPath, query)
                 {
                     RedirectStandardOutput = true,
-                    RedirectStandardError = enableLogging ? true : false,
+                    RedirectStandardError = enableLogging,
                     UseShellExecute = false,
-                    CreateNoWindow = !this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI) ? true : false
+                    CreateNoWindow = true
                 };
 
                 this.HbProcess = new Process { StartInfo = cliStart };
@@ -136,8 +159,10 @@
                     this.HbProcess.BeginErrorReadLine();
                 }
 
+                this.HbProcess.OutputDataReceived += HbProcess_OutputDataReceived;
+                this.HbProcess.BeginOutputReadLine();
+
                 this.processId = this.HbProcess.Id;
-                this.processHandle = this.HbProcess.Handle;
 
                 // Set the process Priority
                 if (this.processId != -1)
@@ -170,32 +195,22 @@
                 }
 
                 // Fire the Encode Started Event
-                this.Invoke_encodeStarted(EventArgs.Empty);
+                this.InvokeEncodeStarted(EventArgs.Empty);
             }
             catch (Exception exc)
             {
-                this.Invoke_encodeCompleted(
+                encodeQueueTask.Status = QueueItemStatus.Error;
+                this.InvokeEncodeCompleted(
                     new EncodeCompletedEventArgs(
-                        false, exc, "An Error occured when trying to encode this source. "));
+                        false, null, "An Error occured when trying to encode this source. "));
+                throw;
             }
         }
 
         /// <summary>
-        /// Stop the Encode
-        /// </summary>
-        public void Stop()
-        {
-            this.Stop(null);
-        }
-
-        /// <summary>
         /// Kill the CLI process
         /// </summary>
-        /// <param name="exc">
-        /// The Exception that has occured.
-        /// This will get bubbled up through the EncodeCompletedEventArgs
-        /// </param>
-        public override void Stop(Exception exc)
+        public override void Stop()
         {
             try
             {
@@ -208,33 +223,14 @@
             {
                 // No need to report anything to the user. If it fails, it's probably already stopped.
             }
-
-            this.Invoke_encodeCompleted(
-                exc == null
-                    ? new EncodeCompletedEventArgs(true, null, string.Empty)
-                    : new EncodeCompletedEventArgs(false, exc, "An Unknown Error has occured when trying to Stop this encode."));
         }
 
         /// <summary>
-        /// Attempt to Safely kill a DirectRun() CLI
-        /// NOTE: This will not work with a MinGW CLI
-        /// Note: http://www.cygwin.com/ml/cygwin/2006-03/msg00330.html
+        /// Shutdown the service.
         /// </summary>
-        public void SafelyStop()
+        public void Shutdown()
         {
-            if ((int)this.processHandle == 0)
-                return;
-
-            // Allow the CLI to exit cleanly
-            Win32.SetForegroundWindow((int)this.processHandle);
-            SendKeys.Send("^C");
-            SendKeys.Flush();
-
-            /*/if (HbProcess != null)
-            //{
-            //    HbProcess.StandardInput.AutoFlush = true;
-            //    HbProcess.StandardInput.WriteLine("^c^z");
-            //}*/
+            // Nothing to do.
         }
 
         #endregion
@@ -252,25 +248,12 @@
         /// </param>
         private void HbProcessExited(object sender, EventArgs e)
         {
-            this.IsEncoding = false;
-            if (this.WindowsSeven.IsWindowsSeven)
-            {
-                this.WindowsSeven.SetTaskBarProgressToNoProgress();
-            }
-
-            if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))
-            {
-                Win32.AllowSleep();
-            }
+            HbProcess.WaitForExit();
 
             try
             {
-                // This is just a quick hack to ensure that we are done processing the logging data.
-                // Logging data comes in after the exit event has processed sometimes. We should really impliment ISyncronizingInvoke
-                // and set the SyncObject on the process. I think this may resolve this properly.
-                // For now, just wait 2.5 seconds to let any trailing log messages come in and be processed.
-                Thread.Sleep(2500);
                 this.HbProcess.CancelErrorRead();
+                this.HbProcess.CancelOutputRead();
                 this.ShutdownFileWriter();
             }
             catch (Exception exc)
@@ -278,8 +261,17 @@
                 // This exception doesn't warrent user interaction, but it should be logged (TODO)
             }
 
+            Execute.OnUIThread(() =>
+            {
+                if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))
+                {
+                    Win32.AllowSleep();
+                }
+            });
+
             this.currentTask.Status = QueueItemStatus.Completed;
-            this.Invoke_encodeCompleted(new EncodeCompletedEventArgs(true, null, string.Empty));
+            this.IsEncoding = false;
+            this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(true, null, string.Empty));
         }
 
         /// <summary>
@@ -291,80 +283,54 @@
         /// <param name="e">
         /// DataReceived EventArgs
         /// </param>
+        /// <remarks>
+        /// Worker Thread.
+        /// </remarks>
         private void HbProcErrorDataReceived(object sender, DataReceivedEventArgs e)
         {
             if (!String.IsNullOrEmpty(e.Data))
             {
+                if (initShutdown && this.LogBuffer.Length < 25000000)
+                {
+                    initShutdown = false; // Reset this flag.
+                }
+
+                if (this.LogBuffer.Length > 25000000 && !initShutdown) // Approx 23.8MB and make sure it's only printed once
+                {
+                    this.ProcessLogMessage("ERROR: Initiating automatic shutdown of encode process. The size of the log file indicates that there is an error! ");
+                    initShutdown = true;
+                    this.Stop();
+                }
+
                 this.ProcessLogMessage(e.Data);
             }
         }
 
         /// <summary>
-        /// Encode Started
+        /// The hb process output data received.
         /// </summary>
         /// <param name="sender">
         /// The sender.
         /// </param>
         /// <param name="e">
-        /// The EventArgs.
+        /// The e.
         /// </param>
-        private void EncodeEncodeStarted(object sender, EventArgs e)
+        private void HbProcess_OutputDataReceived(object sender, DataReceivedEventArgs e)
         {
-            Thread monitor = new Thread(this.EncodeMonitor);
-            monitor.Start();
-        }
-
-        /// <summary>
-        /// Monitor the QueueTask
-        /// </summary>
-        private void EncodeMonitor()
-        {
-            try
+            if (!String.IsNullOrEmpty(e.Data) && this.IsEncoding)
             {
-                Parser encode = new Parser(this.HbProcess.StandardOutput.BaseStream);
-                encode.OnEncodeProgress += this.EncodeOnEncodeProgress;
-                while (!encode.EndOfStream)
+                EncodeProgressEventArgs eventArgs = this.ReadEncodeStatus(e.Data, this.startTime);
+                if (eventArgs != null)
                 {
-                    encode.ReadEncodeStatus();
-                }
-            }
-            catch (Exception)
-            {
-                this.EncodeOnEncodeProgress(null, 0, 0, 0, 0, 0, "Unknown, status not available..");
-            }
-        }
-
-        /// <summary>
-        /// Displays the Encode status in the GUI
-        /// </summary>
-        /// <param name="sender">The sender</param>
-        /// <param name="currentTask">The current task</param>
-        /// <param name="taskCount">Number of tasks</param>
-        /// <param name="percentComplete">Percent complete</param>
-        /// <param name="currentFps">Current encode speed in fps</param>
-        /// <param name="avg">Avg encode speed</param>
-        /// <param name="timeRemaining">Time Left</param>
-        private void EncodeOnEncodeProgress(object sender, int currentTask, int taskCount, float percentComplete, float currentFps, float avg, string timeRemaining)
-        {
-            EncodeProgressEventArgs eventArgs = new EncodeProgressEventArgs
-            {
-                AverageFrameRate = avg,
-                CurrentFrameRate = currentFps,
-                EstimatedTimeLeft = Converters.EncodeToTimespan(timeRemaining),
-                PercentComplete = percentComplete,
-                Task = currentTask,
-                TaskCount = taskCount,
-                ElapsedTime = DateTime.Now - this.startTime,
-            };
-
-            this.Invoke_encodeStatusChanged(eventArgs);
-
-            if (this.WindowsSeven.IsWindowsSeven)
-            {
-                int percent;
-                int.TryParse(Math.Round(percentComplete).ToString(), out percent);
+                    if (!this.IsEncoding)
+                    {
+                        // We can get events out of order since the CLI progress is monitored on a background thread.
+                        // So make sure we don't send a status update after an encode complete event.
+                        return;
+                    }
 
-                this.WindowsSeven.SetTaskBarProgress(percent);
+                    this.InvokeEncodeStatusChanged(eventArgs);
+                }
             }
         }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs Changed

@@ -1,7 +1,11 @@
-/*  IEncode.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IEncode.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Encode Progess Status
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services.Interfaces
 {
@@ -63,6 +67,11 @@
         string ActivityLog { get; }
 
         /// <summary>
+        /// Gets the log index. The current log row counter.
+        /// </summary>
+        int LogIndex { get; }
+
+        /// <summary>
         /// Start with a LibHb EncodeJob Object
         /// </summary>
         /// <param name="job">
@@ -79,18 +88,16 @@
         void Stop();
 
         /// <summary>
-        /// Attempt to Safely kill a DirectRun() CLI
-        /// NOTE: This will not work with a MinGW CLI
-        /// Note: http://www.cygwin.com/ml/cygwin/2006-03/msg00330.html
-        /// </summary>
-        void SafelyStop();
-
-        /// <summary>
         /// Copy the log file to the desired destinations
         /// </summary>
         /// <param name="destination">
         /// The destination.
         /// </param>
         void ProcessLogs(string destination);
+
+        /// <summary>
+        /// Shutdown the service.
+        /// </summary>
+        void Shutdown();
     }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncodeServiceWrapper.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IHbServiceCallback.cs Added

@@ -0,0 +1,70 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IHbServiceCallback.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   HandBrake WCF Service Callbacks
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Services.Interfaces
+{
+    using System.ServiceModel;
+
+    using HandBrake.ApplicationServices.EventArgs;
+
+    /// <summary>
+    /// HandBrake WCF Service Callbacks
+    /// </summary>
+    [ServiceContract]
+    public interface IHbServiceCallback
+    {
+        /// <summary>
+        /// The scan progress.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        [OperationContract(IsOneWay = true)]
+        void ScanProgressCallback(ScanProgressEventArgs eventArgs);
+
+        /// <summary>
+        /// The scan completed.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        [OperationContract(IsOneWay = true)]
+        void ScanCompletedCallback(ScanCompletedEventArgs eventArgs);
+
+        /// <summary>
+        /// The scan started callback.
+        /// </summary>
+        [OperationContract(IsOneWay = true)]
+        void ScanStartedCallback();
+
+        /// <summary>
+        /// The encode progress callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event Args.
+        /// </param>
+        [OperationContract(IsOneWay = true)]
+        void EncodeProgressCallback(EncodeProgressEventArgs eventArgs);
+
+        /// <summary>
+        /// The encode completed callback.
+        /// </summary>
+        /// <param name="eventArgs">
+        /// The event Args.
+        /// </param>
+        [OperationContract(IsOneWay = true)]
+        void EncodeCompletedCallback(EncodeCompletedEventArgs eventArgs);
+
+        /// <summary>
+        /// The encode started callback.
+        /// </summary>
+        [OperationContract(IsOneWay = true)]
+        void EncodeStartedCallback();
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs Changed

@@ -1,26 +1,36 @@
-/*  IQueueProcessor.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IQueueProcessor.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Queue Processor
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services.Interfaces
 {
     using System;
+    using System.ComponentModel;
+
+    using HandBrake.ApplicationServices.Model;
 
     /// <summary>
     /// The Queue Processor
     /// </summary>
     public interface IQueueProcessor
     {
+        #region Events
+
         /// <summary>
         /// Fires when the Queue has started
         /// </summary>
         event QueueProcessor.QueueProgressStatus JobProcessingStarted;
 
         /// <summary>
-        /// Fires when a pause to the encode queue has been requested.
+        /// Fires when a job is Added, Removed or Re-Ordered.
+        /// Should be used for triggering an update of the Queue Window.
         /// </summary>
-        event EventHandler QueuePaused;
+        event EventHandler QueueChanged;
 
         /// <summary>
         /// Fires when the entire encode queue has completed.
@@ -28,14 +38,23 @@
         event EventHandler QueueCompleted;
 
         /// <summary>
-        /// Gets the IEncodeService instance.
+        /// Fires when a pause to the encode queue has been requested.
+        /// </summary>
+        event EventHandler QueuePaused;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the number of jobs in the queue
         /// </summary>
-        IEncode EncodeService { get; }
+        int Count { get; }
 
         /// <summary>
-        /// Gets the IQueueManager instance.
+        /// Gets the IEncodeService instance.
         /// </summary>
-        IQueueManager QueueManager { get; }
+        IEncodeServiceWrapper EncodeService { get; }
 
         /// <summary>
         /// Gets a value indicating whether IsProcessing.
@@ -43,14 +62,119 @@
         bool IsProcessing { get; }
 
         /// <summary>
-        /// Starts encoding the first job in the queue and continues encoding until all jobs
-        /// have been encoded.
+        /// Gets or sets Last Processed Job.
+        /// This is set when the job is poped of the queue by GetNextJobForProcessing();
         /// </summary>
-        void Start();
+        QueueTask LastProcessedJob { get; set; }
+
+        /// <summary>
+        /// Gets The current queue.
+        /// </summary>
+        BindingList<QueueTask> Queue { get; }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Add a job to the Queue. 
+        /// This method is Thread Safe.
+        /// </summary>
+        /// <param name="job">
+        /// The encode Job object.
+        /// </param>
+        void Add(QueueTask job);
+
+        /// <summary>
+        /// Backup any changes to the queue file
+        /// </summary>
+        /// <param name="exportPath">
+        /// If this is not null or empty, this will be used instead of the standard backup location.
+        /// </param>
+        void BackupQueue(string exportPath);
+
+        /// <summary>
+        /// Checks the current queue for an existing instance of the specified destination.
+        /// </summary>
+        /// <param name="destination">
+        /// The destination of the encode.
+        /// </param>
+        /// <returns>
+        /// Whether or not the supplied destination is already in the queue.
+        /// </returns>
+        bool CheckForDestinationPathDuplicates(string destination);
+
+        /// <summary>
+        /// Clear down all Queue Items
+        /// </summary>
+        void Clear();
+
+        /// <summary>
+        /// Clear down the Queue´s completed items
+        /// </summary>
+        void ClearCompleted();
+
+        /// <summary>
+        /// Get the first job on the queue for processing.
+        /// This also removes the job from the Queue and sets the LastProcessedJob
+        /// </summary>
+        /// <returns>
+        /// An encode Job object.
+        /// </returns>
+        QueueTask GetNextJobForProcessing();
+
+        /// <summary>
+        /// Moves an item down one position in the queue.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based location of the job in the queue.
+        /// </param>
+        void MoveDown(int index);
+
+        /// <summary>
+        /// Moves an item up one position in the queue.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based location of the job in the queue.
+        /// </param>
+        void MoveUp(int index);
 
         /// <summary>
         /// Requests a pause of the encode queue.
         /// </summary>
         void Pause();
+
+        /// <summary>
+        /// Remove a job from the Queue.
+        /// This method is Thread Safe
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        void Remove(QueueTask job);
+
+        /// <summary>
+        /// Reset a Queued Item from Error or Completed to Waiting
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        void ResetJobStatusToWaiting(QueueTask job);
+
+        /// <summary>
+        /// Restore a Queue from file or from the queue backup file.
+        /// </summary>
+        /// <param name="importPath">
+        /// The import path. String.Empty or null will result in the default file being loaded.
+        /// </param>
+        void RestoreQueue(string importPath);
+
+        /// <summary>
+        /// Starts encoding the first job in the queue and continues encoding until all jobs
+        /// have been encoded.
+        /// </summary>
+        void Start();
+
+        #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs Changed

@@ -1,7 +1,11 @@
-/*  IScan.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IScan.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Encode Progess Status
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services.Interfaces
 {
@@ -80,7 +84,10 @@
         /// <param name="previewCount">
         /// The preview Count.
         /// </param>
-        void Scan(string sourcePath, int title, int previewCount);
+        /// <param name="postAction">
+        /// The post Action.
+        /// </param>
+        void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction);
 
         /// <summary>
         /// Kill the scan
@@ -94,5 +101,10 @@
         /// The path to the log file.
         /// </param>
         void DebugScanLog(string path);
+
+        /// <summary>
+        /// Shutdown the service.
+        /// </summary>
+        void Shutdown();
     }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScanServiceWrapper.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IServerService.cs Added

@@ -0,0 +1,142 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IServerService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the IServerService type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Services.Interfaces
+{
+    using System.Runtime.Serialization;
+    using System.ServiceModel;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Parsing;
+
+    /// <summary>
+    /// The HandBrakeService interface.
+    /// </summary>
+    [ServiceContract(CallbackContract = typeof(IHbServiceCallback), SessionMode = SessionMode.Required)]
+    public interface IServerService
+    {
+        /// <summary>
+        /// Gets the activity log.
+        /// </summary>
+        [DataMember]
+        string ScanActivityLog { get; }
+
+        /// <summary>
+        /// Gets the activity log.
+        /// </summary>
+        [DataMember]
+        string EncodeActivityLog { get; }
+
+        /// <summary>
+        /// Gets the souce data.
+        /// </summary>
+        Source SouceData
+        {
+            [OperationContract]
+            get;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether is scanning.
+        /// </summary>
+        bool IsScanning
+        {
+            [OperationContract]
+            get;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether is encoding.
+        /// </summary>
+        bool IsEncoding
+        {
+            [OperationContract]
+            get;
+        }
+
+        /// <summary>
+        /// Start the WCF Service
+        /// </summary>
+        /// <param name="port">
+        /// The port.
+        /// </param>
+        void Start(string port);
+
+        /// <summary>
+        /// Stop the WCF Service
+        /// </summary>
+        void Stop();
+
+        /// <summary>
+        /// The scan source.
+        /// </summary>
+        /// <param name="path">
+        /// The path.
+        /// </param>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <param name="previewCount">
+        /// The preview Count.
+        /// </param>
+        [OperationContract]
+        void ScanSource(string path, int title, int previewCount);
+
+        /// <summary>
+        /// Start and Encode
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        /// <param name="enableLogging">
+        /// The enable logging.
+        /// </param>
+        [OperationContract]
+        void StartEncode(QueueTask job, bool enableLogging);
+
+        /// <summary>
+        /// The process encode logs.
+        /// </summary>
+        /// <param name="destination">
+        /// The destination.
+        /// </param>
+        [OperationContract]
+        void ProcessEncodeLogs(string destination);
+
+        /// <summary>
+        /// Stop and Encode
+        /// </summary>
+        [OperationContract]
+        void StopEncode();
+
+        /// <summary>
+        /// Stop the scan.
+        /// </summary>
+        [OperationContract]
+        void StopScan();
+
+        /// <summary>
+        /// Subscribe for callbacks from the called functions
+        /// </summary>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        [OperationContract]
+        bool Subscribe();
+
+        /// <summary>
+        /// Unsubscribe from callbacks.
+        /// </summary>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        [OperationContract]
+        bool Unsubscribe();
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs Changed

@@ -1,17 +1,38 @@
-/*  IUserSettingService.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
-
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IUserSettingService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The User Setting Service Interace.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services.Interfaces
 {
+    using HandBrake.ApplicationServices.EventArgs;
+
+    /// <summary>
+    /// The setting event handler.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The e.
+    /// </param>
+    public delegate void SettingEventHandler(object sender, SettingChangedEventArgs e);
+
     /// <summary>
     /// The User Setting Service Interace.
     /// </summary>
     public interface IUserSettingService
     {
         /// <summary>
+        /// The setting changed.
+        /// </summary>
+        event SettingEventHandler SettingChanged;
+
+        /// <summary>
         /// Set the specified user setting.
         /// </summary>
         /// <param name="name">

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs Changed

@@ -1,25 +1,32 @@
-/*  LibEncode.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LibEncode.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   LibHB Implementation of IEncode
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
     using System;
     using System.Diagnostics;
+    using System.Globalization;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services.Base;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop;
+    using HandBrake.Interop.EventArgs;
+    using HandBrake.Interop.Interfaces;
     using HandBrake.Interop.Model;
 
     using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
     using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
 
     /// <summary>
-    /// TODO: Update summary.
+    /// LibHB Implementation of IEncode
     /// </summary>
     public class LibEncode : EncodeBase, IEncode
     {
@@ -33,7 +40,7 @@
         /// <summary>
         /// The User Setting Service
         /// </summary>
-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;
+        private readonly IUserSettingService userSettingService;
 
         /// <summary>
         /// The Start time of the current Encode;
@@ -43,7 +50,7 @@
         /// <summary>
         /// An Instance of the HandBrake Interop Library
         /// </summary>
-        private HandBrakeInstance instance;
+        private IHandBrakeInstance instance;
 
         /// <summary>
         /// A flag to indicate if logging is enabled or not.
@@ -55,17 +62,24 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="LibEncode"/> class.
         /// </summary>
-        public LibEncode()
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        /// <param name="handBrakeInstance">
+        /// The hand Brake Instance.
+        /// </param>
+        public LibEncode(IUserSettingService userSettingService, IHandBrakeInstance handBrakeInstance)
+            : base(userSettingService)
         {
+            this.userSettingService = userSettingService;
+
             // Setup the HandBrake Instance
-            this.instance = ServiceManager.HandBrakeInstance;
+            this.instance = handBrakeInstance;
             this.instance.EncodeCompleted += this.InstanceEncodeCompleted;
             this.instance.EncodeProgress += this.InstanceEncodeProgress;
 
             HandBrakeUtils.MessageLogged += this.HandBrakeInstanceMessageLogged;
             HandBrakeUtils.ErrorLogged += this.HandBrakeInstanceErrorLogged;
-
-            GrowlCommunicator.Register();
         }
 
         /// <summary>
@@ -145,47 +159,36 @@
                 }
 
                 // Fire the Encode Started Event
-                this.Invoke_encodeStarted(EventArgs.Empty);
+                this.InvokeEncodeStarted(EventArgs.Empty);
             }
             catch (Exception exc)
             {
-                this.Invoke_encodeCompleted(new EncodeCompletedEventArgs(false, exc, "An Error has occured in EncodeService.Run()"));
+                this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(false, exc, "An Error has occured."));
             }
         }
 
         /// <summary>
         /// Kill the CLI process
         /// </summary>
-        public void Stop()
-        {
-            this.Stop(null);
-        }
-
-        /// <summary>
-        /// Kill the CLI process
-        /// </summary>
-        /// <param name="exc">
-        /// The Exception that has occured.
-        /// This will get bubbled up through the EncodeCompletedEventArgs
-        /// </param>
-        public override void Stop(Exception exc)
+        public override void Stop()
         {
-            this.instance.StopEncode();
-
-            this.Invoke_encodeCompleted(
-                exc == null
-                    ? new EncodeCompletedEventArgs(true, null, string.Empty)
-                    : new EncodeCompletedEventArgs(false, exc, "An Error has occured."));
+            try
+            {
+                this.IsEncoding = false;
+                this.instance.StopEncode();
+            }
+            catch (Exception)
+            {
+                // Do Nothing.
+            }
         }
 
         /// <summary>
-        /// Attempt to Safely kill a DirectRun() CLI
-        /// NOTE: This will not work with a MinGW CLI
-        /// Note: http://www.cygwin.com/ml/cygwin/2006-03/msg00330.html
+        /// Shutdown the service.
         /// </summary>
-        public void SafelyStop()
+        public void Shutdown()
         {
-            throw new NotImplementedException("This Method is not used in the LibEncode service. You should use the Stop() method instead! ");
+            // Nothing to do for this implementation.
         }
 
         #region HandBrakeInstance Event Handlers.
@@ -238,7 +241,7 @@
         /// <param name="e">
         /// The Interop.EncodeProgressEventArgs.
         /// </param>
-        private void InstanceEncodeProgress(object sender, Interop.EncodeProgressEventArgs e)
+        private void InstanceEncodeProgress(object sender, Interop.EventArgs.EncodeProgressEventArgs e)
         {
            EncodeProgressEventArgs args = new EncodeProgressEventArgs
             {
@@ -250,15 +253,7 @@
                 ElapsedTime = DateTime.Now - this.startTime,
             };
 
-            this.Invoke_encodeStatusChanged(args);
-
-            if (this.WindowsSeven.IsWindowsSeven)
-            {
-                int percent;
-                int.TryParse(Math.Round(e.FractionComplete).ToString(), out percent);
-
-                this.WindowsSeven.SetTaskBarProgress(percent);
-            }
+            this.InvokeEncodeStatusChanged(args);
         }
 
         /// <summary>
@@ -270,20 +265,15 @@
         /// <param name="e">
         /// The e.
         /// </param>
-        private void InstanceEncodeCompleted(object sender, Interop.EncodeCompletedEventArgs e)
+        private void InstanceEncodeCompleted(object sender, Interop.EventArgs.EncodeCompletedEventArgs e)
         {
             this.IsEncoding = false;
 
-            this.Invoke_encodeCompleted(
+            this.InvokeEncodeCompleted(
                 e.Error
                     ? new EncodeCompletedEventArgs(false, null, string.Empty)
                     : new EncodeCompletedEventArgs(true, null, string.Empty));
 
-            if (this.WindowsSeven.IsWindowsSeven)
-            {
-                this.WindowsSeven.SetTaskBarProgressToNoProgress();
-            }
-
             if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))
             {
                 Win32.AllowSleep();

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs Changed

@@ -1,7 +1,11 @@
-/*  LibScan.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LibScan.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Scan a Source
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
@@ -16,9 +20,11 @@
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop;
+    using HandBrake.Interop.EventArgs;
+    using HandBrake.Interop.Interfaces;
 
     using AudioTrack = HandBrake.ApplicationServices.Parsing.Audio;
-    using ScanProgressEventArgs = HandBrake.Interop.ScanProgressEventArgs;
+    using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs;
     using Size = System.Drawing.Size;
 
     /// <summary>
@@ -43,7 +49,7 @@
         /// <summary>
         /// LibHB Instance
         /// </summary>
-        private readonly HandBrakeInstance instance;
+        private readonly IHandBrakeInstance instance;
 
         /// <summary>
         /// Log data from HandBrakeInstance
@@ -51,6 +57,11 @@
         private readonly StringBuilder logging;
 
         /// <summary>
+        /// The Log File Header
+        /// </summary>
+        private readonly StringBuilder header;
+
+        /// <summary>
         /// The Current source scan path.
         /// </summary>
         private string currentSourceScanPath;
@@ -60,11 +71,16 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="LibScan"/> class. 
         /// </summary>
-        public LibScan()
+        /// <param name="handBrakeInstance">
+        /// The hand Brake Instance.
+        /// </param>
+        public LibScan(IHandBrakeInstance handBrakeInstance)
         {
             logging = new StringBuilder();
 
-            instance = ServiceManager.HandBrakeInstance;
+            header = GeneralUtilities.CreateCliLogHeader();
+
+            instance = handBrakeInstance;
             instance.Initialize(1);
             instance.ScanProgress += this.InstanceScanProgress;
             instance.ScanCompleted += this.InstanceScanCompleted;
@@ -90,11 +106,6 @@
         /// </summary>
         public event ScanProgessStatus ScanStatusChanged;
 
-        /// <summary>
-        /// The Log File Header
-        /// </summary>
-        StringBuilder header = GeneralUtilities.CreateCliLogHeader();
-
         #endregion
 
         #region Properties
@@ -137,7 +148,10 @@
         /// <param name="previewCount">
         /// The preview Count.
         /// </param>
-        public void Scan(string sourcePath, int title, int previewCount)
+        /// <param name="postAction">
+        /// The post Action.
+        /// </param>
+        public void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction)
         {
             Thread t = new Thread(unused => this.ScanSource(sourcePath, title, previewCount));
             t.Start();
@@ -165,6 +179,14 @@
             throw new NotImplementedException("Only Available when using the CLI mode. Not LibHB");
         }
 
+        /// <summary>
+        /// Shutdown the service.
+        /// </summary>
+        public void Shutdown()
+        {
+            // Nothing to do for this implementation.
+        }
+
         #endregion
 
         #region Private Methods
@@ -187,7 +209,8 @@
             {
                 this.logging.Clear();
 
-                string source = sourcePath.ToString().EndsWith("\\") ? sourcePath.ToString() : "\"" + sourcePath + "\"";
+                string source = sourcePath.ToString().EndsWith("\\") ? string.Format("\"{0}\\\\\"", sourcePath.ToString().TrimEnd('\\'))
+                              : "\"" + sourcePath + "\"";
                 currentSourceScanPath = source;
 
                 IsScanning = true;
@@ -195,9 +218,9 @@
                     this.ScanStared(this, new EventArgs());
 
                 if (title != 0)
-                    instance.StartScan(source, previewCount, title);
+                    instance.StartScan(sourcePath.ToString(), previewCount, title);
                 else
-                    instance.StartScan(source, previewCount);
+                    instance.StartScan(sourcePath.ToString(), previewCount);
             }
             catch (Exception exc)
             {
@@ -222,12 +245,19 @@
         /// </param>
         private void InstanceScanCompleted(object sender, EventArgs e)
         {
-            this.SouceData = new Source { Titles = ConvertTitles(this.instance.Titles), ScanPath = currentSourceScanPath};
+            // TODO -> Might be a better place to fix this.
+            string path = currentSourceScanPath;
+            if (currentSourceScanPath.Contains("\""))
+            {
+                path = currentSourceScanPath.Trim('\"');
+            }
+
+            this.SouceData = new Source { Titles = ConvertTitles(this.instance.Titles), ScanPath = path };
 
             IsScanning = false;
 
             if (this.ScanCompleted != null)
-                this.ScanCompleted(this, new ScanCompletedEventArgs(true, null, string.Empty));
+                this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, string.Empty));
         }
 
         /// <summary>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs Changed

@@ -1,10 +1,11 @@
-/*  PresetService.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-using HandBrake.ApplicationServices.Model.Encoding;
-using HandBrake.ApplicationServices.Utilities;
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The preset service manages HandBrake's presets
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
@@ -21,19 +22,14 @@
     using HandBrake.ApplicationServices.Exceptions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Utilities;
 
     /// <summary>
     /// The preset service manages HandBrake's presets
     /// </summary>
     public class PresetService : IPresetService
     {
-        /**
-         * TODO:
-         * - Wire this into the Forms and WPF UI's
-         * - Note: This is untested so far. It'll likely need fixes before it can be used.
-         * - Maybe change the collection to a dictionary to allow easier lookups?
-         **/
-
         #region Private Variables
 
         /// <summary>
@@ -44,7 +40,12 @@
         /// <summary>
         /// The User Setting Service
         /// </summary>
-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;
+        private readonly IUserSettingService userSettingService;
+
+        /// <summary>
+        /// User Preset Default Catgory Name
+        /// </summary>
+        public static string UserPresetCatgoryName = "User Presets";
 
         /// <summary>
         /// The User Preset file
@@ -63,11 +64,17 @@
 
         #endregion
 
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PresetService"/> class.
         /// </summary>
-        public PresetService()
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        public PresetService(IUserSettingService userSettingService)
         {
+            this.userSettingService = userSettingService;
+
             // If the preset file doesn't exist. Create it.
             if (!File.Exists(this.builtInPresetFile))
             {
@@ -107,7 +114,8 @@
         #region Public Methods
 
         /// <summary>
-        /// Add a new preset to the system
+        /// Add a new preset to the system.
+        /// Performs an Update if it already exists
         /// </summary>
         /// <param name="preset">
         /// A Preset to add
@@ -127,8 +135,9 @@
                 this.UpdatePresetFiles();
                 return true;
             }
-
-            return false;
+            
+            this.Update(preset);
+            return true;
         }
 
         /// <summary>
@@ -144,11 +153,11 @@
             {
                 if (preset.Name == update.Name)
                 {
-                    preset.Query = update.Query;
                     preset.Task = update.Task;
-                    preset.AudioPassthruSettings = update.AudioPassthruSettings;
-                    preset.CropSettings = update.CropSettings;
                     preset.UsePictureFilters = update.UsePictureFilters;
+                    preset.PictureSettingsMode = update.PictureSettingsMode;
+                    preset.Category = update.Category;
+                    preset.Description = update.Description;
 
                     // Update the presets file
                     this.UpdatePresetFiles();
@@ -214,7 +223,6 @@
             this.UpdatePresetFiles();
         }
 
-
         /// <summary>
         /// Get a Preset
         /// </summary>
@@ -252,9 +260,6 @@
         /// <summary>
         /// Reads the CLI's CLI output format and load's them into the preset List Preset
         /// </summary>
-        /// <param name="cliPath">
-        /// The Path to the CLI, leave blank for current folder.
-        /// </param>
         public void UpdateBuiltInPresets()
         {
             // Create a new tempory file and execute the CLI to get the built in Presets.
@@ -297,21 +302,18 @@
                             Regex r = new Regex("(:  )"); // Split on hyphens. 
                             string[] presetName = r.Split(line);
 
-                            bool pic = presetName[2].Contains("crop");
-
                             Preset newPreset = new Preset
                                 {
                                     Category = category,
                                     Name = presetName[0].Replace("+", string.Empty).Trim(),
-                                    Query = presetName[2],
-                                    Version = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),
-                                    CropSettings = pic,
+                                    Version = VersionHelper.GetVersion(),
                                     Description = string.Empty, // Maybe one day we will populate this.
                                     IsBuildIn = true,
+                                    UsePictureFilters = true,
                                     Task = QueryParserUtility.Parse(presetName[2])
                                 };
 
-                            newPreset.AudioPassthruSettings = new AllowedPassthru(false); // We don't want to override the built-in preset
+                            newPreset.Task.AllowedPassthruOptions = new AllowedPassthru(true); // We don't want to override the built-in preset
                             
                             if (newPreset.Name == "Normal")
                             {
@@ -352,7 +354,7 @@
                 List<Preset> preset = this.presets.Where(p => p.IsBuildIn).ToList();
                 if (preset.Count > 0)
                 {
-                    if (preset[0].Version != this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion))
+                    if (preset[0].Version != VersionHelper.GetVersion())
                     {
                         this.UpdateBuiltInPresets();
                         return true;
@@ -432,15 +434,16 @@
             {
                 if (File.Exists(this.builtInPresetFile))
                 {
-                    StreamReader reader = new StreamReader(this.builtInPresetFile);
-                    List<Preset> list = (List<Preset>)Ser.Deserialize(reader);
-                    foreach (Preset preset in list)
+                    using (StreamReader reader = new StreamReader(this.builtInPresetFile))
                     {
-                        preset.IsBuildIn = true; // Older versions did not have this flag so explicitly make sure it is set.
-                        this.presets.Add(preset);
+                        List<Preset> list = (List<Preset>)Ser.Deserialize(reader);
+                        foreach (Preset preset in list)
+                        {
+                            preset.IsBuildIn = true;
+                                // Older versions did not have this flag so explicitly make sure it is set.
+                            this.presets.Add(preset);
+                        }
                     }
-
-                    reader.Close();
                 } 
             }
             catch (Exception exc)
@@ -455,14 +458,14 @@
             {
                 if (File.Exists(this.userPresetFile))
                 {
-                    StreamReader reader = new StreamReader(this.userPresetFile);
-                    List<Preset> list = (List<Preset>)Ser.Deserialize(reader);
-                    foreach (Preset preset in list)
+                    using (StreamReader reader = new StreamReader(this.userPresetFile))
                     {
-                        this.presets.Add(preset);
+                        List<Preset> list = (List<Preset>)Ser.Deserialize(reader);
+                        foreach (Preset preset in list)
+                        {
+                            this.presets.Add(preset);
+                        }
                     }
-
-                    reader.Close();
                 }
             }
             catch (Exception exc)
@@ -479,18 +482,20 @@
         {
             try
             {
+                string directory = Path.GetDirectoryName(this.userPresetFile);
+                if (!Directory.Exists(directory))
+                {
+                    Directory.CreateDirectory(directory);
+                }
+
                 using (FileStream strm = new FileStream(this.builtInPresetFile, FileMode.Create, FileAccess.Write))
                 {
                     Ser.Serialize(strm, this.presets.Where(p => p.IsBuildIn).ToList());
-                    strm.Close();
-                    strm.Dispose();
                 }
 
                 using (FileStream strm = new FileStream(this.userPresetFile, FileMode.Create, FileAccess.Write))
                 {
                     Ser.Serialize(strm, this.presets.Where(p => p.IsBuildIn == false).ToList());
-                    strm.Close();
-                    strm.Dispose();
                 }
             }
             catch (Exception exc)

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs Changed

@@ -1,73 +1,86 @@
-/*  Queue.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueProcessor.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The HandBrake Queue
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
     using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
     using System.Diagnostics;
     using System.IO;
+    using System.Linq;
     using System.Windows.Forms;
+    using System.Xml.Serialization;
+
+    using Caliburn.Micro;
 
     using HandBrake.ApplicationServices.EventArgs;
     using HandBrake.ApplicationServices.Exceptions;
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
 
     /// <summary>
     /// The HandBrake Queue
     /// </summary>
     public class QueueProcessor : IQueueProcessor
     {
+        #region Constants and Fields
+
+        /// <summary>
+        /// A Lock object to maintain thread safety
+        /// </summary>
+        private static readonly object QueueLock = new object();
+
+        /// <summary>
+        /// The Queue of Job objects
+        /// </summary>
+        private readonly BindingList<QueueTask> queue = new BindingList<QueueTask>();
+
         /// <summary>
         /// The User Setting Service
         /// </summary>
-        private static IUserSettingService userSettingService = ServiceManager.UserSettingService;
+        private readonly IUserSettingService userSettingService;
+
+        /// <summary>
+        /// HandBrakes Queue file with a place holder for an extra string.
+        /// </summary>
+        private string queueFile;
+
+        #endregion
+
+        #region Constructors and Destructors
 
         /// <summary>
         /// Initializes a new instance of the <see cref="QueueProcessor"/> class.
         /// </summary>
-        /// <param name="queueManager">
-        /// The queue manager.
-        /// </param>
         /// <param name="encodeService">
         /// The encode Service.
         /// </param>
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
         /// <exception cref="ArgumentNullException">
         /// Services are not setup
         /// </exception>
-        public QueueProcessor(IQueueManager queueManager, IEncode encodeService)
+        public QueueProcessor(IEncodeServiceWrapper encodeService, IUserSettingService userSettingService)
         {
-            this.QueueManager = queueManager;
+            this.userSettingService = userSettingService;
             this.EncodeService = encodeService;
 
-            if (this.QueueManager == null)
-            {
-                throw new ArgumentNullException("queueManager");
-            }
-
-            if (this.QueueManager == null)
-            {
-                throw new ArgumentNullException("queueManager");
-            }
+            // If this is the first instance, just use the main queue file, otherwise add the instance id to the filename.
+            this.queueFile = string.Format("hb_queue_recovery{0}.xml", GeneralUtilities.ProcessId);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueueProcessor"/> class.
-        /// This call also initializes the Encode and QueueManager services
-        /// </summary>
-        /// <param name="instanceId">
-        /// The instance id.
-        /// </param>
-        public QueueProcessor(int instanceId)
-        {
-            this.EncodeService = File.Exists("hb.dll") ? (IEncode)new LibEncode() : new Encode();
-            this.QueueManager = new QueueManager(instanceId);
-        }
+        #endregion
 
-        #region Events
+        #region Delegates
 
         /// <summary>
         /// Queue Progess Status
@@ -80,15 +93,20 @@
         /// </param>
         public delegate void QueueProgressStatus(object sender, QueueProgressEventArgs e);
 
+        #endregion
+
+        #region Events
+
         /// <summary>
         /// Fires when the Queue has started
         /// </summary>
         public event QueueProgressStatus JobProcessingStarted;
 
         /// <summary>
-        /// Fires when a pause to the encode queue has been requested.
+        /// Fires when a job is Added, Removed or Re-Ordered.
+        /// Should be used for triggering an update of the Queue Window.
         /// </summary>
-        public event EventHandler QueuePaused;
+        public event EventHandler QueueChanged;
 
         /// <summary>
         /// Fires when the entire encode queue has completed.
@@ -96,87 +114,304 @@
         public event EventHandler QueueCompleted;
 
         /// <summary>
-        /// Invoke the JobProcessingStarted event
+        /// Fires when a pause to the encode queue has been requested.
         /// </summary>
-        /// <param name="e">
-        /// The QueueProgressEventArgs.
-        /// </param>
-        private void InvokeJobProcessingStarted(QueueProgressEventArgs e)
+        public event EventHandler QueuePaused;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the number of jobs in the queue;
+        /// </summary>
+        public int Count
         {
-            QueueProgressStatus handler = this.JobProcessingStarted;
-            if (handler != null)
+            get
             {
-                handler(this, e);
+                return this.queue.Count(item => item.Status == QueueItemStatus.Waiting);
             }
         }
 
         /// <summary>
-        /// Invoke the QueuePaused event
+        /// Gets the IEncodeService instance.
         /// </summary>
-        /// <param name="e">
-        /// The EventArgs.
+        public IEncodeServiceWrapper EncodeService { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether IsProcessing.
+        /// </summary>
+        public bool IsProcessing { get; private set; }
+
+        /// <summary>
+        /// Gets or sets Last Processed Job.
+        /// This is set when the job is poped of the queue by GetNextJobForProcessing();
+        /// </summary>
+        public QueueTask LastProcessedJob { get; set; }
+
+        /// <summary>
+        /// Gets The current queue.
+        /// </summary>
+        public BindingList<QueueTask> Queue
+        {
+            get
+            {
+                return this.queue;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Add a job to the Queue. 
+        /// This method is Thread Safe.
+        /// </summary>
+        /// <param name="job">
+        /// The encode Job object.
         /// </param>
-        private void InvokeQueuePaused(EventArgs e)
+        public void Add(QueueTask job)
         {
-            EventHandler handler = this.QueuePaused;
-            if (handler != null)
+            lock (QueueLock)
             {
-                handler(this, e);
+                this.queue.Add(job);
+                this.InvokeQueueChanged(EventArgs.Empty);
             }
         }
 
         /// <summary>
-        /// Invoke the QueueCompleted event.
+        /// Backup any changes to the queue file
         /// </summary>
-        /// <param name="e">
-        /// The EventArgs.
+        /// <param name="exportPath">
+        /// If this is not null or empty, this will be used instead of the standard backup location.
         /// </param>
-        private void InvokeQueueCompleted(EventArgs e)
+        public void BackupQueue(string exportPath)
         {
-            this.IsProcessing = false;
+            string appDataPath = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
+            string tempPath = !string.IsNullOrEmpty(exportPath)
+                                  ? exportPath
+                                  : appDataPath + string.Format(this.queueFile, string.Empty);
 
-            EventHandler handler = this.QueueCompleted;
-            if (handler != null)
+            using (var strm = new FileStream(tempPath, FileMode.Create, FileAccess.Write))
             {
-                handler(this, e);
+                List<QueueTask> tasks = this.queue.Where(item => item.Status != QueueItemStatus.Completed).ToList();
+                var serializer = new XmlSerializer(typeof(List<QueueTask>));
+                serializer.Serialize(strm, tasks);
+                strm.Close();
+                strm.Dispose();
             }
         }
 
-        #endregion
+        /// <summary>
+        /// Checks the current queue for an existing instance of the specified destination.
+        /// </summary>
+        /// <param name="destination">
+        /// The destination of the encode.
+        /// </param>
+        /// <returns>
+        /// Whether or not the supplied destination is already in the queue.
+        /// </returns>
+        public bool CheckForDestinationPathDuplicates(string destination)
+        {
+            return this.queue.Any(job => job.Task != null && job.Task.Destination.Contains(destination.Replace("\\\\", "\\")));
+        }
 
-        #region Properties
+        /// <summary>
+        /// Clear down all Queue Items
+        /// </summary>
+        public void Clear()
+        {
+            List<QueueTask> deleteList = this.queue.ToList();
+            foreach (QueueTask item in deleteList)
+            {
+                this.queue.Remove(item);
+            }
+            this.InvokeQueueChanged(EventArgs.Empty);
+        }
 
         /// <summary>
-        /// Gets a value indicating whether IsProcessing.
+        /// Clear down the Queue´s completed items
         /// </summary>
-        public bool IsProcessing { get; private set; }
+        public void ClearCompleted()
+        {
+            Execute.OnUIThread(
+                () =>
+                    {
+                        List<QueueTask> deleteList =
+                            this.queue.Where(task => task.Status == QueueItemStatus.Completed).ToList();
+                        foreach (QueueTask item in deleteList)
+                        {
+                            this.queue.Remove(item);
+                        }
+                        this.InvokeQueueChanged(EventArgs.Empty);
+                    });
+        }
 
         /// <summary>
-        /// Gets the IEncodeService instance.
+        /// Get the first job on the queue for processing.
+        /// This also removes the job from the Queue and sets the LastProcessedJob
         /// </summary>
-        public IEncode EncodeService { get; private set; }
+        /// <returns>
+        /// An encode Job object.
+        /// </returns>
+        public QueueTask GetNextJobForProcessing()
+        {
+            if (this.queue.Count > 0)
+            {
+                QueueTask job = this.queue.FirstOrDefault(q => q.Status == QueueItemStatus.Waiting);
+                if (job != null)
+                {
+                    job.Status = QueueItemStatus.InProgress;
+                    this.LastProcessedJob = job;
+                    this.InvokeQueueChanged(EventArgs.Empty);
+                }
+
+                this.BackupQueue(string.Empty);
+                return job;
+            }
+
+            this.BackupQueue(string.Empty);
+            return null;
+        }
 
         /// <summary>
-        /// Gets the IQueueManager instance.
+        /// Moves an item down one position in the queue.
         /// </summary>
-        public IQueueManager QueueManager { get; private set; }
+        /// <param name="index">
+        /// The zero-based location of the job in the queue.
+        /// </param>
+        public void MoveDown(int index)
+        {
+            if (index < this.queue.Count - 1)
+            {
+                QueueTask item = this.queue[index];
 
-        #endregion
+                this.queue.RemoveAt(index);
+                this.queue.Insert((index + 1), item);
+            }
+
+            this.InvokeQueueChanged(EventArgs.Empty);
+        }
 
         /// <summary>
-        /// Starts encoding the first job in the queue and continues encoding until all jobs
-        /// have been encoded.
+        /// Moves an item up one position in the queue.
         /// </summary>
-        public void Start()
+        /// <param name="index">
+        /// The zero-based location of the job in the queue.
+        /// </param>
+        public void MoveUp(int index)
         {
-            if (IsProcessing)
+            if (index > 0)
             {
-                throw new Exception("Already Processing the Queue");
+                QueueTask item = this.queue[index];
+
+                this.queue.RemoveAt(index);
+                this.queue.Insert((index - 1), item);
             }
 
-            IsProcessing = true;
-            this.EncodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
-            this.ProcessNextJob();
+            this.InvokeQueueChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Remove a job from the Queue.
+        /// This method is Thread Safe
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        public void Remove(QueueTask job)
+        {
+            lock (QueueLock)
+            {
+                this.queue.Remove(job);
+                this.InvokeQueueChanged(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Reset a Queued Item from Error or Completed to Waiting
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        public void ResetJobStatusToWaiting(QueueTask job)
+        {
+            if (job.Status != QueueItemStatus.Error && job.Status != QueueItemStatus.Completed)
+            {
+                throw new GeneralApplicationException(
+                    "Job Error", "Unable to reset job status as it is not in an Error or Completed state", null);
+            }
+
+            job.Status = QueueItemStatus.Waiting;
+        }
+
+        /// <summary>
+        /// Restore a Queue from file or from the queue backup file.
+        /// </summary>
+        /// <param name="importPath">
+        /// The import path. String.Empty or null will result in the default file being loaded.
+        /// </param>
+        public void RestoreQueue(string importPath)
+        {
+            string appDataPath = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
+            string tempPath = !string.IsNullOrEmpty(importPath)
+                                  ? importPath
+                                  : (appDataPath + string.Format(this.queueFile, string.Empty));
+
+            if (File.Exists(tempPath))
+            {
+                bool invokeUpdate = false;
+                using (
+                    var strm = new FileStream(
+                        (!string.IsNullOrEmpty(importPath) ? importPath : tempPath), FileMode.Open, FileAccess.Read))
+                {
+                    if (strm.Length != 0)
+                    {
+                        var serializer = new XmlSerializer(typeof(List<QueueTask>));
+
+                        List<QueueTask> list;
+
+                        try
+                        {
+                            list = serializer.Deserialize(strm) as List<QueueTask>;
+                        }
+                        catch (Exception exc)
+                        {
+                            throw new GeneralApplicationException(
+                                "Unable to restore queue file.", 
+                                "The file may be corrupted or from an older incompatible version of HandBrake", 
+                                exc);
+                        }
+
+                        if (list != null)
+                        {
+                            foreach (QueueTask item in list)
+                            {
+                                if (item.Status != QueueItemStatus.Completed)
+                                {
+                                    // Reset InProgress/Error to Waiting so it can be processed
+                                    if (item.Status == QueueItemStatus.InProgress)
+                                    {
+                                        item.Status = QueueItemStatus.Waiting;
+                                    }
+
+                                    this.queue.Add(item);
+                                }
+                            }
+                        }
+
+                        invokeUpdate = true;
+                    }
+                }
+
+                if (invokeUpdate)
+                {
+                    this.InvokeQueueChanged(EventArgs.Empty);
+                }
+            }
         }
 
         /// <summary>
@@ -189,6 +424,26 @@
         }
 
         /// <summary>
+        /// Starts encoding the first job in the queue and continues encoding until all jobs
+        /// have been encoded.
+        /// </summary>
+        public void Start()
+        {
+            if (this.IsProcessing)
+            {
+                throw new Exception("Already Processing the Queue");
+            }
+
+            this.IsProcessing = true;
+            this.EncodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+            this.ProcessNextJob();
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
         /// After an encode is complete, move onto the next job.
         /// </summary>
         /// <param name="sender">
@@ -199,63 +454,152 @@
         /// </param>
         private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
         {
-            this.QueueManager.LastProcessedJob.Status = QueueItemStatus.Completed;
+            this.LastProcessedJob.Status = QueueItemStatus.Completed;
 
-            // Growl
-            if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.GrowlEncode))
-                GrowlCommunicator.Notify("Encode Completed",
-                                         "Put down that cocktail...\nyour Handbrake encode is done.");
+            // Clear the completed item of the queue if the setting is set.
+            if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ClearCompletedFromQueue))
+            {
+                this.ClearCompleted();
+            }
 
             if (!e.Successful)
             {
-                this.QueueManager.LastProcessedJob.Status = QueueItemStatus.Error;
+                this.LastProcessedJob.Status = QueueItemStatus.Error;
                 this.Pause();
-                if (e.Exception.GetType() == typeof(GeneralApplicationException))
-                {
-                    throw e.Exception;
-                }
-                throw new GeneralApplicationException(e.ErrorInformation, e.Exception.Message, e.Exception);
             }
 
             // Handling Log Data 
-            this.EncodeService.ProcessLogs(this.QueueManager.LastProcessedJob.Destination);
+            this.EncodeService.ProcessLogs(this.LastProcessedJob.Task.Destination);
 
             // Post-Processing
             if (e.Successful)
             {
-                SendToApplication(this.QueueManager.LastProcessedJob.Destination);
+                this.SendToApplication(this.LastProcessedJob.Task.Destination);
             }
 
             // Move onto the next job.
             if (this.IsProcessing)
             {
                 this.ProcessNextJob();
-            } 
-            else 
+            }
+            else
             {
                 this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
                 this.InvokeQueueCompleted(EventArgs.Empty);
-                this.QueueManager.BackupQueue(string.Empty);
+                this.BackupQueue(string.Empty);
             }
         }
 
         /// <summary>
-        /// Run through all the jobs on the queue.
+        /// Perform an action after an encode. e.g a shutdown, standby, restart etc.
         /// </summary>
-        private void ProcessNextJob()
+        private void Finish()
+        {
+            // Do something whent he encode ends.
+            switch (this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction))
+            {
+                case "Shutdown":
+                    Process.Start("Shutdown", "-s -t 60");
+                    break;
+                case "Log off":
+                    Win32.ExitWindowsEx(0, 0);
+                    break;
+                case "Suspend":
+                    Application.SetSuspendState(PowerState.Suspend, true, true);
+                    break;
+                case "Hibernate":
+                    Application.SetSuspendState(PowerState.Hibernate, true, true);
+                    break;
+                case "Lock System":
+                    Win32.LockWorkStation();
+                    break;
+                case "Quit HandBrake":
+                    Execute.OnUIThread(Application.Exit);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Invoke the JobProcessingStarted event
+        /// </summary>
+        /// <param name="e">
+        /// The QueueProgressEventArgs.
+        /// </param>
+        private void InvokeJobProcessingStarted(QueueProgressEventArgs e)
+        {
+            QueueProgressStatus handler = this.JobProcessingStarted;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Invoke the Queue Changed Event
+        /// </summary>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void InvokeQueueChanged(EventArgs e)
+        {
+            try
+            {
+                this.BackupQueue(string.Empty);
+            }
+            catch (Exception)
+            {
+                // Do Nothing.
+            }
+
+            EventHandler handler = this.QueueChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Invoke the QueueCompleted event.
+        /// </summary>
+        /// <param name="e">
+        /// The EventArgs.
+        /// </param>
+        private void InvokeQueueCompleted(EventArgs e)
         {
-            if (this.EncodeService.IsEncoding || !this.IsProcessing)
+            this.IsProcessing = false;
+
+            EventHandler handler = this.QueueCompleted;
+            if (handler != null)
             {
-                // We don't want to try start a second encode, so just return out. The event will trigger the next encode automatically.
-                // Also, we don't want to start a new encode if we are paused.
-                return;
+                handler(this, e);
             }
+        }
+
+        /// <summary>
+        /// Invoke the QueuePaused event
+        /// </summary>
+        /// <param name="e">
+        /// The EventArgs.
+        /// </param>
+        private void InvokeQueuePaused(EventArgs e)
+        {
+            EventHandler handler = this.QueuePaused;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
 
-            QueueTask job = this.QueueManager.GetNextJobForProcessing();
+        /// <summary>
+        /// Run through all the jobs on the queue.
+        /// </summary>
+        private void ProcessNextJob()
+        {
+            QueueTask job = this.GetNextJobForProcessing();
             if (job != null)
             {
-                this.EncodeService.Start(job, true);
                 this.InvokeJobProcessingStarted(new QueueProgressEventArgs(job));
+                this.EncodeService.Start(job, true);
             }
             else
             {
@@ -266,59 +610,32 @@
                 this.InvokeQueueCompleted(EventArgs.Empty);
 
                 // Run the After encode completeion work
-                Finish();
+                this.Finish();
             }
         }
 
         /// <summary>
         /// Send a file to a 3rd party application after encoding has completed.
         /// </summary>
-        /// <param name="file"> The file path</param>
-        private static void SendToApplication(string file)
+        /// <param name="file">
+        /// The file path
+        /// </param>
+        private void SendToApplication(string file)
         {
-            if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SendFile) && !string.IsNullOrEmpty(userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo)))
+            if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SendFile) &&
+                !string.IsNullOrEmpty(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo)))
             {
-                string args = string.Format("{0} \"{1}\"", userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileToArgs), file);
-                ProcessStartInfo vlc = new ProcessStartInfo(userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo), args);
+                string args = string.Format(
+                    "{0} \"{1}\"", 
+                    this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileToArgs), 
+                    file);
+                var vlc =
+                    new ProcessStartInfo(
+                        this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo), args);
                 Process.Start(vlc);
             }
         }
 
-        /// <summary>
-        /// Perform an action after an encode. e.g a shutdown, standby, restart etc.
-        /// </summary>
-        private static void Finish()
-        {
-            // Growl
-            if (userSettingService.GetUserSetting<bool>(ASUserSettingConstants.GrowlQueue))
-            {
-                GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
-            }
-
-            // Do something whent he encode ends.
-            switch (userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction))
-            {
-                case "Shutdown":
-                    Process.Start("Shutdown", "-s -t 60");
-                    break;
-                case "Log off":
-                    Win32.ExitWindowsEx(0, 0);
-                    break;
-                case "Suspend":
-                    Application.SetSuspendState(PowerState.Suspend, true, true);
-                    break;
-                case "Hibernate":
-                    Application.SetSuspendState(PowerState.Hibernate, true, true);
-                    break;
-                case "Lock System":
-                    Win32.LockWorkStation();
-                    break;
-                case "Quit HandBrake":
-                    Application.Exit();
-                    break;
-                default:
-                    break;
-            }
-        }
+        #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs Changed

@@ -1,7 +1,11 @@
-/*  Scan.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Scan a Source
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
@@ -18,6 +22,8 @@
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
 
+    using Parser = HandBrake.ApplicationServices.Parsing.Parser;
+
     /// <summary>
     /// Scan a Source
     /// </summary>
@@ -26,6 +32,16 @@
         #region Private Variables
 
         /// <summary>
+        /// The User Setting Service
+        /// </summary>
+        private readonly IUserSettingService userSettingService;
+
+        /// <summary>
+        /// The Log File Header
+        /// </summary>
+        private readonly StringBuilder header;
+
+        /// <summary>
         /// The CLI data parser
         /// </summary>
         private Parser readData;
@@ -41,23 +57,24 @@
         private Process hbProc;
 
         /// <summary>
-        /// The Log File Header
+        /// The stop scan.
         /// </summary>
-        StringBuilder header = GeneralUtilities.CreateCliLogHeader();
-
-        /// <summary>
-        /// The User Setting Service
-        /// </summary>
-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;
+        private bool cancelScan;
 
         #endregion
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ScanService"/> class.
         /// </summary>
-        public ScanService()
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        public ScanService(IUserSettingService userSettingService)
         {
+            this.userSettingService = userSettingService;
             this.logBuffer = new StringBuilder();
+
+            header = GeneralUtilities.CreateCliLogHeader();
         }
 
         #region Events
@@ -120,9 +137,12 @@
         /// <param name="previewCount">
         /// The preview Count.
         /// </param>
-        public void Scan(string sourcePath, int title, int previewCount)
+        /// <param name="postScanAction">
+        /// The post Scan Action.
+        /// </param>
+        public void Scan(string sourcePath, int title, int previewCount, Action<bool> postScanAction)
         {
-            Thread t = new Thread(unused => this.ScanSource(sourcePath, title, previewCount));
+            Thread t = new Thread(unused => this.ScanSource(sourcePath, title, previewCount, postScanAction));
             t.Start();
         }
 
@@ -139,6 +159,8 @@
                     this.readData.OnScanProgress -= this.OnScanProgress;
                 }
 
+                cancelScan = true;
+
                 if (this.hbProc != null && !this.hbProc.HasExited)
                 {
                     this.hbProc.Kill();
@@ -162,12 +184,12 @@
             {
                 StreamReader parseLog = new StreamReader(path);
                 this.readData = new Parser(parseLog.BaseStream);
-                this.SouceData = Source.Parse(this.readData);
+                this.SouceData = Source.Parse(this.readData, this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
                 this.SouceData.ScanPath = path;
 
                 if (this.ScanCompleted != null)
                 {
-                    this.ScanCompleted(this, new ScanCompletedEventArgs(true, null, string.Empty));
+                    this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, string.Empty));
                 }
             }
             catch (Exception e)
@@ -175,6 +197,15 @@
                 throw new GeneralApplicationException("Debug Run Failed", string.Empty, e);
             }
         }
+
+        /// <summary>
+        /// Shutdown the service.
+        /// </summary>
+        public void Shutdown()
+        {
+            // Nothing to do for this implementation.
+        }
+
         #endregion
 
         #region Private Methods
@@ -191,11 +222,16 @@
         /// <param name="previewCount">
         /// The preview Count.
         /// </param>
-        private void ScanSource(object sourcePath, int title, int previewCount)
+        /// <param name="postScanAction">
+        /// The post Scan Action. Disables the Scan Completed Event
+        /// </param>
+        private void ScanSource(object sourcePath, int title, int previewCount, Action<bool> postScanAction)
         {
             try
             {
                 this.IsScanning = true;
+                this.cancelScan = false;
+
                 if (this.ScanStared != null)
                 {
                     this.ScanStared(this, new EventArgs());
@@ -208,7 +244,12 @@
                                 "\\HandBrake\\logs";
                 string dvdInfoPath = Path.Combine(
                     logDir,
-                    string.Format("last_scan_log{0}.txt", GeneralUtilities.GetInstanceCount));
+                    string.Format("last_scan_log{0}.txt", GeneralUtilities.ProcessId));
+
+                if (!Directory.Exists(logDir))
+                {
+                    Directory.CreateDirectory(logDir);
+                }
 
                 // Make we don't pick up a stale last_encode_log.txt (and that we have rights to the file)
                 if (File.Exists(dvdInfoPath))
@@ -235,9 +276,9 @@
                     extraArguments += " --scan ";
                 }
 
-                // Quick fix for "F:\\" style paths. Just get rid of the \\ so the CLI doesn't fall over.
-                // Sould probably clean up the escaping of the strings later.
-                string source = sourcePath.ToString().EndsWith("\\") ? sourcePath.ToString() : "\"" + sourcePath + "\"";
+                // Quick fix for "F:\\" style paths. We need \\\\ (Escaped \ twice)
+                string source = sourcePath.ToString().EndsWith("\\") ? string.Format("\"{0}\\\\\"", sourcePath.ToString().TrimEnd('\\'))
+                                : "\"" + sourcePath + "\"";
                 string query = string.Format(@" -i {0} -t{1} {2} -v ", source, title, extraArguments);
 
                 this.hbProc = new Process
@@ -258,7 +299,7 @@
 
                 this.readData = new Parser(this.hbProc.StandardError.BaseStream);
                 this.readData.OnScanProgress += this.OnScanProgress;
-                this.SouceData = Source.Parse(this.readData);
+                this.SouceData = Source.Parse(this.readData, this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
                 this.SouceData.ScanPath = (string)sourcePath;
 
                 // Write the Buffer out to file.
@@ -267,7 +308,7 @@
                     // Only write the log file to disk if it's less than 50MB.
                     if (this.readData.Buffer.Length < 50000000)
                     {
-                        scanLog.WriteLine(GeneralUtilities.CreateCliLogHeader());
+                        scanLog.WriteLine(header);
                         scanLog.WriteLine(query);
                         scanLog.Write(this.readData.Buffer);
 
@@ -276,39 +317,65 @@
                     }
                     else
                     {
-                        throw new Exception(
-                            "The Log file has not been written to disk as it has grown above the 100MB limit. This indicates there was a problem during the scan process.");
+                        throw new GeneralApplicationException(
+                            "The Log file has not been written to disk as it has grown above the 50MB limit", " This indicates there was a problem during the scan process.", null);
                     }
                 }
 
                 this.IsScanning = false;
 
-                if (this.ScanCompleted != null)
+
+                if (postScanAction != null)
                 {
-                    this.ScanCompleted(this, new ScanCompletedEventArgs(true, null, string.Empty));
+                    postScanAction(true);
+                }
+                else
+                {
+                    if (this.ScanCompleted != null)
+                    {
+                        if (logBuffer.ToString().Contains("scan: unrecognized file type"))
+                            this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, "Unrecognized file type."));
+                        else
+                            this.ScanCompleted(this, new ScanCompletedEventArgs(this.cancelScan, null, string.Empty));
+                    }
                 }
             }
+            catch (GeneralApplicationException)
+            {
+                throw;
+            }
             catch (Exception exc)
             {
                 this.Stop();
 
-                if (this.ScanCompleted != null)
-                    this.ScanCompleted(this, new ScanCompletedEventArgs(false, exc, "An Error has occured in ScanService.ScanSource()"));
+                if (postScanAction != null)
+                {
+                    postScanAction(false);
+                }
+                else
+                {
+                    if (this.ScanCompleted != null)
+                    {
+                        this.ScanCompleted(this, new ScanCompletedEventArgs(false, exc, "An Error has occured in ScanService.ScanSource()"));
+                    }
+                }
             }
         }
-        
+
         /// <summary>
         /// Fire an event when the scan process progresses
         /// </summary>
         /// <param name="sender">the sender</param>
         /// <param name="currentTitle">the current title being scanned</param>
         /// <param name="titleCount">the total number of titles</param>
-        private void OnScanProgress(object sender, int currentTitle, int titleCount)
+        /// <param name="percentage">The Percentage</param>
+        private void OnScanProgress(object sender, int currentTitle, int titleCount, decimal percentage)
         {
             ScanProgressEventArgs eventArgs = new ScanProgressEventArgs
             {
                 CurrentTitle = currentTitle,
-                Titles = titleCount
+                Titles = titleCount,
+                Percentage = percentage
             };
 
             if (this.ScanStatusChanged != null)

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ServerService.cs Added

@@ -0,0 +1,460 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ServerService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   HandBrake WCF Service
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Services
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
+    using System.ServiceModel;
+    using System.Threading;
+    using System.Windows;
+
+    using HandBrake.ApplicationServices.EventArgs;
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Parsing;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.Interop;
+    using HandBrake.Interop.Interfaces;
+
+    using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
+    using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
+    using ScanProgressEventArgs = HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs;
+
+    /// <summary>
+    /// HandBrake WCF Service
+    /// </summary>
+    [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, IncludeExceptionDetailInFaults = true, 
+        ConcurrencyMode = ConcurrencyMode.Single)]
+    public class ServerService : IServerService
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// List of connected Clients. For now, this should only be one.
+        /// </summary>
+        private static readonly List<IHbServiceCallback> Subscribers = new List<IHbServiceCallback>();
+
+        /// <summary>
+        /// The encode service.
+        /// </summary>
+        private static IEncode encodeService;
+
+        /// <summary>
+        /// The scan service.
+        /// </summary>
+        private static IScan scanService;
+
+        /// <summary>
+        /// The host.
+        /// </summary>
+        private static ServiceHost host;
+
+        /// <summary>
+        /// The shutdown flag.
+        /// </summary>
+        private static ManualResetEvent shutdownFlag;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the activity log.
+        /// </summary>
+        [DataMember]
+        public string ActivityLog
+        {
+            get
+            {
+                return scanService.ActivityLog;
+            }
+        }
+
+        /// <summary>
+        /// Gets the activity log.
+        /// </summary>
+        public string EncodeActivityLog { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether is encoding.
+        /// </summary>
+        public bool IsEncoding { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether is scanning.
+        /// </summary>
+        [DataMember]
+        public bool IsScanning
+        {
+            get
+            {
+                return scanService.IsScanning;
+            }
+        }
+
+        /// <summary>
+        /// Gets the activity log.
+        /// </summary>
+        public string ScanActivityLog { get; private set; }
+
+        /// <summary>
+        /// Gets the souce data.
+        /// </summary>
+        [DataMember]
+        public Source SouceData
+        {
+            get
+            {
+                return scanService.SouceData;
+            }
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IServerService
+
+        /// <summary>
+        /// The process encode logs.
+        /// </summary>
+        /// <param name="destination">
+        /// The destination.
+        /// </param>
+        public void ProcessEncodeLogs(string destination)
+        {
+            encodeService.ProcessLogs(destination);
+        }
+
+        /// <summary>
+        /// The scan source.
+        /// </summary>
+        /// <param name="path">
+        /// The path.
+        /// </param>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <param name="previewCount">
+        /// The preview Count.
+        /// </param>
+        public void ScanSource(string path, int title, int previewCount)
+        {
+            Console.WriteLine("Starting Source Scan for: " + path);
+            scanService.ScanStared += this.ScanStaredHandler;
+            scanService.ScanStatusChanged += this.ScanStatusChangedHandler;
+            scanService.ScanCompleted += this.ScanCompletedHandler;
+
+            scanService.Scan(path, title, previewCount, null);
+        }
+
+        /// <summary>
+        /// Start the service
+        /// </summary>
+        /// <param name="port">
+        /// The port.
+        /// </param>
+        public void Start(string port)
+        {
+            using (host = new ServiceHost(typeof(ServerService), new Uri(string.Format("net.tcp://127.0.0.1:{0}", port))))
+            {
+                // Setup a listener
+                host.AddServiceEndpoint(typeof(IServerService), new NetTcpBinding(), "IHbService");
+                host.Open();
+                Console.WriteLine("::: HandBrake Isolation Server - Debug Console:::");
+                Console.WriteLine("Service Started. Waiting for Clients...");
+
+                // Setup the services we are going to use.
+                IHandBrakeInstance instance = new HandBrakeInstance();
+                scanService = new LibScan(instance);
+                encodeService = new LibEncode(new UserSettingService(), instance); // TODO this needs wired up with castle
+
+                shutdownFlag = new ManualResetEvent(false);
+                shutdownFlag.WaitOne();
+            }
+        }
+
+        /// <summary>
+        /// Start and Encode
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        /// <param name="enableLogging">
+        /// The enable logging.
+        /// </param>
+        public void StartEncode(QueueTask job, bool enableLogging)
+        {
+            Console.WriteLine("Starting Source Encode for: " + job.Task.Source);
+            encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+            encodeService.EncodeStarted += this.encodeService_EncodeStarted;
+            encodeService.EncodeStatusChanged += this.encodeService_EncodeStatusChanged;
+            encodeService.Start(job, enableLogging);
+        }
+
+        /// <summary>
+        /// Stop this service
+        /// </summary>
+        public void Stop()
+        {
+            if (host != null)
+            {
+                host.BeginClose(null, null);
+                //host.Abort();            
+                shutdownFlag.Set();
+            }
+        }
+
+        /// <summary>
+        /// Stop and Encode
+        /// </summary>
+        public void StopEncode()
+        {
+            encodeService.Stop();
+        }
+
+        /// <summary>
+        /// Stop the scan.
+        /// </summary>
+        public void StopScan()
+        {
+            scanService.Stop();
+        }
+
+        /// <summary>
+        /// The subscribe.
+        /// </summary>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        public bool Subscribe()
+        {
+            try
+            {
+                // Get the hashCode of the connecting app and store it as a connection
+                var callback = OperationContext.Current.GetCallbackChannel<IHbServiceCallback>();
+                if (!Subscribers.Contains(callback))
+                {
+                    Console.WriteLine("Client Connected");
+                    Subscribers.Add(callback);
+                }
+                return true;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// The unsubscribe.
+        /// </summary>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        public bool Unsubscribe()
+        {
+            try
+            {
+                var callback = OperationContext.Current.GetCallbackChannel<IHbServiceCallback>();
+                if (Subscribers.Contains(callback))
+                {
+                    Subscribers.Remove(callback);
+                    if (Subscribers.Count == 0)
+                    {
+                        Console.WriteLine("Client Disconnected, Shutting down...");
+
+                        // Shutdown the service. We no longer have any clients to serve.
+                        // It is the responsibility of the UI to maintain a subscription while this service is in use.
+                        this.Stop();
+                    }
+                }
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The scan service scan completed event handler
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ScanCompletedHandler(object sender, ScanCompletedEventArgs e)
+        {
+            Subscribers.ForEach(
+                delegate(IHbServiceCallback callback)
+                    {
+                        if (((ICommunicationObject)callback).State == CommunicationState.Opened)
+                        {
+                            Console.WriteLine("Scan Completed Callback");
+                            callback.ScanCompletedCallback(e);
+                        }
+                        else
+                        {
+                            Subscribers.Remove(callback);
+                        }
+                    });
+
+            scanService.ScanStared -= this.ScanStaredHandler;
+            scanService.ScanStatusChanged -= this.ScanStatusChangedHandler;
+            scanService.ScanCompleted -= this.ScanCompletedHandler;
+        }
+
+        /// <summary>
+        /// The scan service scan stared.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ScanStaredHandler(object sender, EventArgs e)
+        {
+            Subscribers.ForEach(
+                delegate(IHbServiceCallback callback)
+                    {
+                        if (((ICommunicationObject)callback).State == CommunicationState.Opened)
+                        {
+                            Console.WriteLine("Scan Started Callback");
+                            callback.ScanStartedCallback();
+                        }
+                        else
+                        {
+                            Subscribers.Remove(callback);
+                        }
+                    });
+        }
+
+        /// <summary>
+        /// The scan service scan status changed event handler
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ScanStatusChangedHandler(object sender, ScanProgressEventArgs e)
+        {
+            Subscribers.ForEach(
+                delegate(IHbServiceCallback callback)
+                    {
+                        if (((ICommunicationObject)callback).State == CommunicationState.Opened)
+                        {
+                            Console.WriteLine("Scan Changed Callback");
+                            callback.ScanProgressCallback(e);
+                        }
+                        else
+                        {
+                            Subscribers.Remove(callback);
+                        }
+                    });
+        }
+
+        /// <summary>
+        /// The encode service_ encode completed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
+        {
+            encodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
+            encodeService.EncodeStarted -= this.encodeService_EncodeStarted;
+            encodeService.EncodeStatusChanged -= this.encodeService_EncodeStatusChanged;
+
+            Subscribers.ForEach(
+                delegate(IHbServiceCallback callback)
+                    {
+                        if (((ICommunicationObject)callback).State == CommunicationState.Opened)
+                        {
+                            Console.WriteLine("Encode Completed Callback");
+                            callback.EncodeCompletedCallback(e);
+                        }
+                        else
+                        {
+                            Subscribers.Remove(callback);
+                        }
+                    });
+        }
+
+        /// <summary>
+        /// The encode service_ encode started.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void encodeService_EncodeStarted(object sender, EventArgs e)
+        {
+            Subscribers.ForEach(
+                delegate(IHbServiceCallback callback)
+                    {
+                        if (((ICommunicationObject)callback).State == CommunicationState.Opened)
+                        {
+                            Console.WriteLine("Encode Started Callback");
+                            callback.EncodeStartedCallback();
+                        }
+                        else
+                        {
+                            Subscribers.Remove(callback);
+                        }
+                    });
+        }
+
+        /// <summary>
+        /// The encode service_ encode status changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void encodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
+        {
+            Subscribers.ForEach(
+                delegate(IHbServiceCallback callback)
+                    {
+                        if (((ICommunicationObject)callback).State == CommunicationState.Opened)
+                        {
+                            Console.WriteLine("Encode Status Callback");
+                            callback.EncodeProgressCallback(e);
+                        }
+                        else
+                        {
+                            Subscribers.Remove(callback);
+                        }
+                    });
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs Changed

@@ -1,20 +1,22 @@
-/*  UserSettingService.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
-
-using System.Linq;
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="UserSettingService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The User Setting Serivce
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Services
 {
     using System;
-    using System.Collections.Generic;
     using System.Collections.Specialized;
     using System.IO;
-    using System.Windows.Forms;
+    using System.Linq;
     using System.Xml.Serialization;
 
     using HandBrake.ApplicationServices.Collections;
+    using HandBrake.ApplicationServices.EventArgs;
     using HandBrake.ApplicationServices.Exceptions;
     using HandBrake.ApplicationServices.Services.Interfaces;
 
@@ -44,13 +46,14 @@
         public UserSettingService()
         {
             this.Load();
-            if (userSettings == null || userSettings.Count == 0)
-            {
-                this.LoadDefaults();
-            }
         }
 
         /// <summary>
+        /// The setting changed.
+        /// </summary>
+        public event SettingEventHandler SettingChanged;
+
+        /// <summary>
         /// Set the specified user setting.
         /// </summary>
         /// <param name="name">
@@ -63,6 +66,8 @@
         {
             this.userSettings[name] = value;
             this.Save();
+
+            this.OnSettingChanged(new SettingChangedEventArgs {Key = name, Value = value});
         }
 
         /// <summary>
@@ -102,19 +107,44 @@
         }
 
         /// <summary>
+        /// The on setting changed.
+        /// </summary>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        protected virtual void OnSettingChanged(SettingChangedEventArgs e)
+        {
+            SettingEventHandler handler = this.SettingChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
         /// Save the User Settings
         /// </summary>
         private void Save()
         {
-            string directory = Path.GetDirectoryName(this.settingsFile);
-            if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+            try
             {
-                Directory.CreateDirectory(directory);
-            }
+                string directory = Path.GetDirectoryName(this.settingsFile);
+                if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+                {
+                    Directory.CreateDirectory(directory);
+                }
 
-            using (FileStream strm = new FileStream(this.settingsFile, FileMode.Create, FileAccess.Write))
+                using (FileStream strm = new FileStream(this.settingsFile, FileMode.Create, FileAccess.Write))
+                {
+                    serializer.Serialize(strm, this.userSettings);
+                }
+            }
+            catch (Exception exc)
             {
-                serializer.Serialize(strm, this.userSettings);
+                throw new GeneralApplicationException(
+                    "A problem occured when trying to save your preferences.",
+                    "Any settings you changed may need to be reset the next time HandBrake launches.",
+                    exc);
             }
         }
 
@@ -133,7 +163,7 @@
                         SerializableDictionary<string, object> data = (SerializableDictionary<string, object>)serializer.Deserialize(reader);
                         this.userSettings = data;
                     }
-                }
+                } 
                 else
                 {
                     this.userSettings = new SerializableDictionary<string, object>();
@@ -157,27 +187,12 @@
                         File.Delete(this.settingsFile);
                     }
                     this.Save();
+
+                    throw new GeneralApplicationException("Warning, your settings have been reset!", "Your user settings file was corrupted or inaccessible. Settings have been reset to defaults.", exc);
                 }
                 catch (Exception)
                 {
-                }
-
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Load Default Settings
-        /// </summary>
-        private void LoadDefaults()
-        {
-            string defaults = Path.Combine(Application.StartupPath, "defaultsettings.xml");
-            if (File.Exists(defaults))
-            {
-                using (StreamReader reader = new StreamReader(defaults))
-                {
-                    SerializableDictionary<string, object> data = (SerializableDictionary<string, object>)serializer.Deserialize(reader);
-                    this.userSettings = data;
+                    throw new GeneralApplicationException("Unable to load user settings.", "Your user settings file appears to be inaccessible or corrupted. You may have to delete the file and let HandBrake generate a new one.", exc);
                 }
             }
         }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs Changed

@@ -1,4 +1,13 @@
-namespace HandBrake.ApplicationServices
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ServicesWindsorInstaller.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Windsor Installer Interface Implementation
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices
 {
     using Castle.MicroKernel.Registration;
     using Castle.MicroKernel.SubSystems.Configuration;
@@ -21,11 +30,8 @@
         public void Install(IWindsorContainer container, IConfigurationStore store)
         {
             container.Register(Component.For<IPresetService>().ImplementedBy<PresetService>());
-            container.Register(Component.For<IQueueManager>().ImplementedBy<QueueManager>());
             container.Register(Component.For<IQueueProcessor>().ImplementedBy<QueueProcessor>());
             container.Register(Component.For<IUserSettingService>().ImplementedBy<UserSettingService>());
-            container.Register(Component.For<IScan>().ImplementedBy<ScanService>());
-            container.Register(Component.For<IEncode>().ImplementedBy<Encode>());
         }
 
         #endregion

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Settings.StyleCop -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Settings.StyleCop Changed

@@ -2,9 +2,39 @@
   <Analyzers>
     <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
       <Rules>
-        <Rule Name="FileHeaderFileNameDocumentationMustMatchTypeName">
+        <Rule Name="FileMustHaveHeader">
           <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustShowCopyright">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveCopyrightText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustContainFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveSummary">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveValidCompanyText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
           </RuleSettings>
         </Rule>
       </Rules>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/AppcastReader.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs Added

@@ -0,0 +1,528 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Converters.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A class to convert various things to native C# objects
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System;
+    using System.Text.RegularExpressions;
+
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding.x264;
+
+    /// <summary>
+    /// A class to convert various things to native C# objects
+    /// </summary>
+    public class Converters
+    {
+        /**
+         * TODO:
+         * - Many of these converters can be ditched at a later point. Should be able to model all this within the enums themsevles.
+         * 
+         **/ 
+
+        /// <summary>
+        /// Convert HandBrakes time remaining into a TimeSpan
+        /// </summary>
+        /// <param name="time">
+        /// The time remaining for the encode.
+        /// </param>
+        /// <returns>
+        /// A TimepSpan object
+        /// </returns>
+        public static TimeSpan EncodeToTimespan(string time)
+        {
+            TimeSpan converted = new TimeSpan(0, 0, 0, 0);
+
+            Match m = Regex.Match(time.Trim(), @"^([0-9]{2}:[0-9]{2}:[0-9]{2})");
+            if (m.Success)
+            {
+                TimeSpan.TryParse(m.Groups[0].Value, out converted);
+            }
+
+            return converted;
+        }
+
+        #region Audio
+
+        /// <summary>
+        /// Get the GUI equiv to a CLI mixdown
+        /// </summary>
+        /// <param name="mixdown">The Audio Mixdown</param>
+        /// <returns>The GUI representation of the mixdown</returns>
+        public static string GetMixDown(string mixdown)
+        {
+            switch (mixdown.Trim())
+            {
+                case "mono":
+                    return "Mono";
+                case "left_only":
+                    return "Mono (Left Only)";
+                case "right_only":
+                    return "Mono (Right Only)";
+                case "stereo":
+                    return "Stereo";
+                case "dpl1":
+                    return "Dolby Surround";
+                case "dpl2":
+                    return "Dolby Pro Logic II";
+                case "5point1":
+                    return "5.1 Channels";
+                case "6point1":
+                    return "6.1 Channels";
+                case "7point1":
+                    return "7.1 Channels";
+                case "5_2_lfe":
+                    return "7.1 (5F/2R/LFE)";
+                default:
+                    return "Automatic";
+            }
+        }
+
+        /// <summary>
+        /// Get the GUI equiv to a CLI mixdown
+        /// </summary>
+        /// <param name="mixdown">The Audio Mixdown</param>
+        /// <returns>The GUI representation of the mixdown</returns>
+        public static Mixdown GetAudioMixDown(string mixdown)
+        {
+            switch (mixdown.Trim())
+            {
+                case "Mono":
+                    return Mixdown.Mono;
+                case "Stereo":
+                    return Mixdown.Stereo;
+                case "Dolby Surround":
+                    return Mixdown.DolbySurround;
+                case "Dolby Pro Logic II":
+                    return Mixdown.DolbyProLogicII;
+                case "5.1 Channels":
+                    return Mixdown.FivePoint1Channels;
+                case "6.1 Channels":
+                    return Mixdown.SixPoint1Channels;
+                case "7.1 Channels":
+                    return Mixdown.SevenPoint1Channels;
+                case "7.1 (5F/2R/LFE)":
+                    return Mixdown.Five_2_LFE;
+                case "None":
+                case "Passthru":
+                    return Mixdown.None;
+                default:
+                    return Mixdown.Auto;
+            }
+        }
+
+        /// <summary>
+        /// Return the CLI Mixdown name
+        /// </summary>
+        /// <param name="selectedAudio">GUI mixdown name</param>
+        /// <returns>CLI mixdown name</returns>
+        public static string GetCliMixDown(Mixdown selectedAudio)
+        {
+            switch (selectedAudio)
+            {
+                case Mixdown.Auto:
+                case Mixdown.None:
+                    return "auto";
+                case Mixdown.Mono:
+                    return "mono";
+                case Mixdown.LeftOnly:
+                    return "left_only";
+                case Mixdown.RightOnly:
+                    return "right_only";
+                case Mixdown.Stereo:
+                    return "stereo";
+                case Mixdown.DolbySurround:
+                    return "dpl1";
+                case Mixdown.DolbyProLogicII:
+                    return "dpl2";
+                case Mixdown.FivePoint1Channels:
+                    return "5point1";
+                case Mixdown.SixPoint1Channels:
+                    return "6point1";
+                case Mixdown.SevenPoint1Channels:
+                    return "7point1";
+                case Mixdown.Five_2_LFE:
+                    return "5_2_lfe";
+                default:
+                    return "auto";
+            }
+        }
+
+        /// <summary>
+        /// Get the GUI equiv to a CLI audio encoder
+        /// </summary>
+        /// <param name="audioEnc">The Audio Encoder</param>
+        /// <returns>The GUI representation of that audio encoder</returns>
+        public static string GetGUIAudioEncoder(string audioEnc)
+        {
+            switch (audioEnc)
+            {
+                case "faac":
+                    return "AAC (faac)";
+                case "lame":
+                    return "MP3 (lame)";
+                case "vorbis":
+                    return "Vorbis (vorbis)";
+                case "ffac3":
+                    return "AC3 (ffmpeg)";
+                case "copy:ac3":
+                    return "AC3 Passthru";
+                case "copy:dts":
+                    return "DTS Passthru";
+                case "copy:dtshd":
+                    return "MP3 Passthru";
+                case "copy:mp3":
+                    return "AAC Passthru";
+                case "copy:aac":
+                    return "DTS-HD Passthru";
+                case "ffaac":
+                    return "AAC (ffmpeg)";
+                case "ffflac":
+                    return "Flac (ffmpeg)";
+                case "copy":
+                    return "Auto Passthru";
+                default:
+                    return "AAC (faac)";
+            }
+        }
+
+        /// <summary>
+        /// Get the GUI equiv to a CLI audio encoder
+        /// </summary>
+        /// <param name="audioEnc">The Audio Encoder</param>
+        /// <returns>The GUI representation of that audio encoder</returns>
+        public static AudioEncoder GetAudioEncoderFromCliString(string audioEnc)
+        {
+            switch (audioEnc)
+            {
+                case "faac":
+                    return AudioEncoder.Faac;
+                case "ffaac":
+                    return AudioEncoder.ffaac;
+                case "lame":
+                    return AudioEncoder.Lame;
+                case "vorbis":
+                    return AudioEncoder.Vorbis;
+                case "ffac3":
+                    return AudioEncoder.Ac3;
+                case "ffflac":
+                    return AudioEncoder.ffflac;
+                case "copy:ac3":
+                    return AudioEncoder.Ac3Passthrough;
+                case "copy:dts":
+                    return AudioEncoder.DtsPassthrough;
+                case "copy:dtshd":
+                    return AudioEncoder.DtsHDPassthrough;
+                case "copy:mp3":
+                    return AudioEncoder.Mp3Passthru;
+                case "copy:aac":
+                    return AudioEncoder.AacPassthru;
+                case "copy":
+                    return AudioEncoder.Passthrough;
+                default:
+                    return AudioEncoder.Faac;
+            }
+        }
+
+        /// <summary>
+        /// Get the GUI equiv to a GUI audio encoder string
+        /// </summary>
+        /// <param name="audioEnc">The Audio Encoder</param>
+        /// <returns>The GUI representation of that audio encoder</returns>
+        public static AudioEncoder GetAudioEncoder(string audioEnc)
+        {
+            switch (audioEnc)
+            {
+                case "AAC (faac)":
+                    return AudioEncoder.Faac;
+                case "AAC (ffmpeg)":
+                    return AudioEncoder.ffaac;
+                case "AAC (CoreAudio)":
+                    return AudioEncoder.Faac;
+                case "MP3 (lame)":
+                    return AudioEncoder.Lame;
+                case "Vorbis (vorbis)":
+                    return AudioEncoder.Vorbis;
+                case "AC3 (ffmpeg)":
+                    return AudioEncoder.Ac3;
+                case "AC3 Passthru":
+                    return AudioEncoder.Ac3Passthrough;
+                case "DTS Passthru":
+                    return AudioEncoder.DtsPassthrough;
+                case "DTS-HD Passthru":
+                    return AudioEncoder.DtsHDPassthrough;
+                case "AAC Passthru":
+                    return AudioEncoder.AacPassthru;
+                case "MP3 Passthru":
+                    return AudioEncoder.Mp3Passthru;
+                case "Flac (ffmpeg)":
+                    return AudioEncoder.ffflac;
+                case "Auto Passthru":
+                    return AudioEncoder.Passthrough;
+                default:
+                    return AudioEncoder.Faac;
+            }
+        }
+
+        /// <summary>
+        /// Get the CLI Audio Encoder name
+        /// </summary>
+        /// <param name="selectedEncoder">
+        /// String The GUI Encode name
+        /// </param>
+        /// <returns>
+        /// String CLI encoder name
+        /// </returns>
+        public static string GetCliAudioEncoder(AudioEncoder selectedEncoder)
+        {
+            switch (selectedEncoder)
+            {
+                case AudioEncoder.Faac:
+                    return "faac";
+                case AudioEncoder.ffaac:
+                    return "ffaac";
+                case AudioEncoder.Lame:
+                    return "lame";
+                case AudioEncoder.Vorbis:
+                    return "vorbis";
+                case AudioEncoder.Ac3Passthrough:
+                    return "copy:ac3";
+                case AudioEncoder.DtsPassthrough:
+                    return "copy:dts";
+                case AudioEncoder.DtsHDPassthrough:
+                    return "copy:dtshd";
+                case AudioEncoder.Ac3:
+                    return "ffac3";
+                case AudioEncoder.AacPassthru:
+                    return "copy:aac";
+                case AudioEncoder.Mp3Passthru:
+                    return "copy:mp3";
+                case AudioEncoder.Passthrough:
+                    return "copy";
+                case AudioEncoder.ffflac:
+                    return "ffflac";
+                default:
+                    return "faac";
+            }
+        }
+
+        #endregion
+
+        #region Video 
+
+        /// <summary>
+        /// Get the Video Encoder for a given string
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder name
+        /// </param>
+        /// <returns>
+        /// VideoEncoder enum object
+        /// </returns>
+        public static VideoEncoder GetVideoEncoder(string encoder)
+        {
+            switch (encoder)
+            {
+                case "":
+                case "ffmpeg":
+                case "ffmpeg4":
+                    return VideoEncoder.FFMpeg;
+                case "ffmpeg2":
+                    return VideoEncoder.FFMpeg2;
+                case "x264":
+                    return VideoEncoder.X264;
+                case "theora":
+                    return VideoEncoder.Theora;
+                default:
+                    return VideoEncoder.X264;
+            }
+        }
+
+        /// <summary>
+        /// Get the Video Encoder for a given string
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder name
+        /// </param>
+        /// <returns>
+        /// VideoEncoder enum object
+        /// </returns>
+        public static string GetVideoEncoder(VideoEncoder encoder)
+        {
+            switch (encoder)
+            {
+                case VideoEncoder.FFMpeg:
+                    return "ffmpeg4";
+                case VideoEncoder.FFMpeg2:
+                    return "ffmpeg2";
+                case VideoEncoder.X264:
+                    return "x264";
+                case VideoEncoder.Theora:
+                    return "theora";
+                default:
+                    return "x264";
+            }
+        }
+
+        #endregion
+
+        #region x264
+
+        /// <summary>
+        /// Get the x264Preset from a cli parameter
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <returns>
+        /// The x264Preset enum value
+        /// </returns>
+        public static x264Preset Getx264PresetFromCli(string preset)
+        {
+            switch (preset)
+            {
+                case "ultrafast":
+                    return x264Preset.Ultrafast;
+                case "superfast":
+                    return x264Preset.Superfast;
+                case "veryfast":
+                    return x264Preset.VeryFast;
+                case "faster":
+                    return x264Preset.Faster;
+                case "fast":
+                    return x264Preset.Fast;
+                case "medium":
+                    return x264Preset.Medium;
+                case "slow":
+                    return x264Preset.Slow;
+                case "slower":
+                    return x264Preset.Slower;
+                case "veryslow":
+                    return x264Preset.VerySlow;
+                case "placebo":
+                    return x264Preset.Placebo;
+                default:
+                    return x264Preset.Faster;
+            }
+        }
+
+        /// <summary>
+        /// Get the x264 Profile from the cli
+        /// </summary>
+        /// <param name="profile">
+        /// The preset.
+        /// </param>
+        /// <returns>
+        /// The x264Profile enum value
+        /// </returns>
+        public static x264Profile Getx264ProfileFromCli(string profile)
+        {
+            switch (profile)
+            {
+                case "baseline":
+                    return x264Profile.Baseline;
+                case "main":
+                    return x264Profile.Main;
+                case "high":
+                    return x264Profile.High;
+                //case "high10":
+                //    return x264Profile.High10;
+                //case "high422":
+                //    return x264Profile.High422;
+                //case "high444":
+                //    return x264Profile.High444;
+                default:
+                    return x264Profile.Main;
+            }
+        }
+
+        /// <summary>
+        /// Get x264Tune enum from a cli string
+        /// </summary>
+        /// <param name="tune">
+        /// The tune.
+        /// </param>
+        /// <returns>
+        /// The x264Tune enum value
+        /// </returns>
+        public static x264Tune Getx264TuneFromCli(string tune)
+        {
+            switch (tune)
+            {
+                case "film":
+                    return x264Tune.Film;
+                case "animation":
+                    return x264Tune.Animation;
+                case "grain":
+                    return x264Tune.Grain;
+                case "stillimage":
+                    return x264Tune.Stillimage;
+                case "psnr":
+                    return x264Tune.Psnr;
+                case "ssim":
+                    return x264Tune.Ssim;
+                case "fastdecode":
+                    return x264Tune.Fastdecode;
+                default:
+                    return x264Tune.Film;
+            }
+        }
+
+        #endregion
+
+        #region File Format
+
+        /// <summary>
+        /// Get the OutputFormat Enum for a given string
+        /// </summary>
+        /// <param name="format">
+        /// OutputFormat as a string
+        /// </param>
+        /// <returns>
+        /// An OutputFormat Enum
+        /// </returns>
+        public static OutputFormat GetFileFormat(string format)
+        {
+            switch (format.ToLower())
+            {
+                default:
+                    return OutputFormat.Mp4;
+                case "m4v":
+                    return OutputFormat.M4V;
+                case "mkv":
+                    return OutputFormat.Mkv;
+            }
+        }
+
+        /// <summary>
+        /// Get the OutputFormat Enum for a given string
+        /// </summary>
+        /// <param name="format">
+        /// OutputFormat as a string
+        /// </param>
+        /// <returns>
+        /// An OutputFormat Enum
+        /// </returns>
+        public static string GetFileFormat(OutputFormat format)
+        {
+            switch (format)
+            {
+                default:
+                    return "mp4";
+                case OutputFormat.M4V:
+                    return "m4v";
+                case OutputFormat.Mkv:
+                    return "mkv";
+            }
+        }
+
+        #endregion
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs Added

@@ -0,0 +1,144 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EnumHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Enum Helpers
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.ComponentModel;
+    using System.ComponentModel.DataAnnotations;
+    using System.Linq;
+    using System.Reflection;
+
+    /// <summary>
+    /// Enum Helpers
+    /// </summary>
+    /// <typeparam name="T">
+    /// The Type Parameter
+    /// </typeparam>
+    public class EnumHelper<T>
+    {
+        /// <summary>
+        /// Get the description of an Enum
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <returns>
+        /// The Description string
+        /// </returns>
+        public static string GetDescription(T value)
+        {
+            FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
+            DescriptionAttribute[] attributes =
+                  (DescriptionAttribute[])fieldInfo.GetCustomAttributes(
+                  typeof(DescriptionAttribute), false);
+            return (attributes.Length > 0) ? attributes[0].Description : value.ToString();
+        }
+
+        /// <summary>
+        /// Get the Display Value of the Enum Model
+        /// </summary>
+        /// <param name="value">An Enum with Display Attributes</param>
+        /// <returns>A string name</returns>
+        public static string GetDisplay(T value)
+        {
+            FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
+            DisplayAttribute[] attributes = (DisplayAttribute[])fieldInfo.GetCustomAttributes(typeof(DisplayAttribute), false);
+
+            return (attributes.Length > 0) ? attributes[0].Name : value.ToString();
+        }
+
+        /// <summary>
+        /// Get the Enumeration for a given Enum Description
+        /// </summary>
+        /// <param name="description">The String description</param>
+        /// <returns>The Enum Value</returns>
+        public static T GetValue(string description)
+        {
+            return GetValue(description, false);
+        }
+
+        /// <summary>
+        /// Get the Enumeration for a given Enum Description
+        /// </summary>
+        /// <param name="description">The String description</param>
+        /// <param name="insensitiveCase">Turn of sensitivity to cases.</param>
+        /// <returns>The Enum Value</returns>
+        public static T GetValue(string description, bool insensitiveCase)
+        {
+            foreach (T val in Enum.GetValues(typeof(T)))
+            {
+                string currDescription = GetDescription(val);
+                string currDisplay = GetDisplay(val);
+                if (currDescription == description || currDisplay == description)
+                {
+                    return val;
+                }
+
+                if (insensitiveCase && currDescription.ToLower() == description.ToLower() ||
+                    currDisplay.ToLower() == description.ToLower())
+                {
+                    return val;
+                }
+            }
+
+            throw new ArgumentOutOfRangeException("The Description for the enum was not recognized.");
+        }
+
+        /// <summary>
+        /// Return a list of all the enum values.
+        /// </summary>
+        /// <returns>
+        /// An Enum Oject List
+        /// </returns>
+        public static IEnumerable<T> GetEnumList()
+        {
+            return Enum.GetValues(typeof(T)).Cast<T>().ToList();
+        }
+
+        /// <summary>
+        /// Get a list of string names for each enum value.
+        /// </summary>
+        /// <param name="enumType">
+        /// The enum type.
+        /// </param>
+        /// <typeparam name="T">
+        /// The type of the enum
+        /// </typeparam>
+        /// <returns>
+        /// A collection of strings that represent all the enum values
+        /// </returns>
+        public static IEnumerable<string> GetEnumDisplayValues(Type enumType)
+        {
+            var strings = new Collection<string>();
+            foreach (T e in Enum.GetValues(enumType))
+                strings.Add(GetDisplay(e));
+            return strings;
+        }
+
+        /// <summary>
+        /// Get a list of string names for each enum value passed in.
+        /// </summary>
+        /// <param name="items">
+        /// The items.
+        /// </param>
+        /// <typeparam name="T">
+        /// The type of the enum
+        /// </typeparam>
+        /// <returns>
+        /// A collection of strings that represent all the enum values
+        /// </returns>
+        public static IEnumerable<string> GetEnumDisplayValuesSubset(IEnumerable<T> items)
+        {
+            return items.Select(GetDisplay).ToList();
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs Changed

@@ -1,37 +1,57 @@
-/*  UtilityService.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="GeneralUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Set of Static Utilites
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Utilities
 {
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Globalization;
     using System.IO;
+    using System.Linq;
     using System.Text;
+    using System.Text.RegularExpressions;
     using System.Windows.Forms;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Services;
-    using HandBrake.ApplicationServices.Services.Interfaces;
 
     /// <summary>
     /// A Set of Static Utilites
     /// </summary>
     public class GeneralUtilities
     {
-        /// <summary>
-        /// The User Setting Service
-        /// </summary>
-        private static IUserSettingService userSettingService = ServiceManager.UserSettingService;
+        #region Constants and Fields
 
         /// <summary>
         /// The Default Log Directory
         /// </summary>
         private static readonly string LogDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
 
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the number of HandBrake instances running.
+        /// </summary>
+        public static int ProcessId
+        {
+            get
+            {
+                return Process.GetCurrentProcess().Id;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
         /// <summary>
         /// Clear all the log files older than 30 Days
         /// </summary>
@@ -43,41 +63,72 @@
             if (Directory.Exists(LogDir))
             {
                 // Get all the log files
-                DirectoryInfo info = new DirectoryInfo(LogDir);
+                var info = new DirectoryInfo(LogDir);
                 FileInfo[] logFiles = info.GetFiles("*.txt");
 
-                // Delete Them
+                // Delete old and excessivly large files (> ~50MB).
                 foreach (FileInfo file in logFiles)
                 {
                     if (file.LastWriteTime < DateTime.Now.AddDays(-daysToKeep))
                     {
-                        if (!file.Name.Contains("last_scan_log.txt") && !file.Name.Contains("last_encode_log.txt"))
-                        {
-                            File.Delete(file.FullName);
-                        }
-                        else if (file.Length > 104857600)
-                        {
-                            File.Delete(file.FullName);
-                        }
+                        File.Delete(file.FullName);
+                    }
+                    else if (file.Length > 50000000)
+                    {
+                        File.Delete(file.FullName);
                     }
                 }
             }
         }
 
         /// <summary>
+        /// Add the CLI Query to the Log File.
+        /// </summary>
+        /// <returns>
+        /// The create cli log header.
+        /// </returns>
+        public static StringBuilder CreateCliLogHeader()
+        {
+            var logHeader = new StringBuilder();
+
+            logHeader.AppendLine(String.Format("HandBrake {0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion()));
+            logHeader.AppendLine(String.Format("OS: {0}", Environment.OSVersion));
+            logHeader.AppendLine(String.Format("CPU: {0}", SystemInfo.GetCpuCount));
+            logHeader.Append(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));
+            logHeader.AppendLine(String.Format("Screen: {0}x{1}", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));
+            logHeader.AppendLine(String.Format("Temp Dir: {0}", Path.GetTempPath()));
+            logHeader.AppendLine(String.Format("Install Dir: {0}", Application.StartupPath));
+            logHeader.AppendLine(String.Format("Data Dir: {0}\n", Application.UserAppDataPath));
+
+            logHeader.AppendLine("-------------------------------------------");
+
+            return logHeader;
+        }
+
+        /// <summary>
+        /// Get the Process ID of HandBrakeCLI for the current instance.
+        /// </summary>
+        /// <returns>A list of processes</returns>
+        public static Process[] GetCliProcess()
+        {
+            return Process.GetProcessesByName("HandBrakeCLI");
+        }
+
+        /// <summary>
         /// Get a list of available DVD drives which are ready and contain DVD content.
         /// </summary>
         /// <returns>A List of Drives with their details</returns>
         public static List<DriveInformation> GetDrives()
         {
-            List<DriveInformation> drives = new List<DriveInformation>();
+            var drives = new List<DriveInformation>();
             DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives();
             int id = 0;
             foreach (DriveInfo curDrive in theCollectionOfDrives)
             {
                 if (curDrive.DriveType == DriveType.CDRom && curDrive.IsReady)
                 {
-                    if (Directory.Exists(curDrive.RootDirectory + "VIDEO_TS") || Directory.Exists(curDrive.RootDirectory + "BDMV"))
+                    if (Directory.Exists(curDrive.RootDirectory + "VIDEO_TS") ||
+                        Directory.Exists(curDrive.RootDirectory + "BDMV"))
                     {
                         drives.Add(
                             new DriveInformation
@@ -95,42 +146,11 @@
         }
 
         /// <summary>
-        /// Get the Process ID of HandBrakeCLI for the current instance.
-        /// </summary>
-        /// <returns>A list of processes</returns>
-        public static Process[] GetCliProcess()
-        {
-            return Process.GetProcessesByName("HandBrakeCLI");
-        }
-
-        /// <summary>
-        /// Add the CLI Query to the Log File.
-        /// </summary>
-        /// <returns>
-        /// The create cli log header.
-        /// </returns>
-        public static StringBuilder CreateCliLogHeader()
-        {
-            StringBuilder logHeader = new StringBuilder();
-
-            logHeader.AppendLine(String.Format("HandBrake {0} {1}", userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild)));
-            logHeader.AppendLine(String.Format("OS: {0}", Environment.OSVersion));
-            logHeader.AppendLine(String.Format("CPU: {0}", SystemInfo.GetCpuCount));
-            logHeader.Append(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));
-            logHeader.AppendLine(String.Format("Screen: {0}x{1}", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));
-            logHeader.AppendLine(String.Format("Temp Dir: {0}", Path.GetTempPath()));
-            logHeader.AppendLine(String.Format("Install Dir: {0}", Application.StartupPath));
-            logHeader.AppendLine(String.Format("Data Dir: {0}\n", Application.UserAppDataPath));
-
-            logHeader.AppendLine("-------------------------------------------");
-
-            return logHeader;
-        }
-
-        /// <summary>
         /// Return the standard log format line of text for a given log message
         /// </summary>
-        /// <param name="message">The Log Message</param>
+        /// <param name="message">
+        /// The Log Message
+        /// </param>
         /// <returns>
         /// A Log Message in the format: "[hh:mm:ss] message"
         /// </returns>
@@ -140,26 +160,20 @@
         }
 
         /// <summary>
-        /// Gets a value indicating whether HandBrake is running in multi instance mode
+        /// The find hand brake instance ids.
         /// </summary>
-        /// <returns>True if the UI has another instance running</returns>
-        public static bool IsMultiInstance
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>. True if it's a running HandBrake instance.
+        /// </returns>
+        public static bool IsPidACurrentHandBrakeInstance(int id)
         {
-            get
-            {
-                return Process.GetProcessesByName("HandBrake").Length > 1 ? true : false;
-            }
+            List<int> ids = Process.GetProcessesByName("HandBrake").Select(process => process.Id).ToList();
+            return ids.Contains(id);
         }
 
-        /// <summary>
-        /// Gets the number of HandBrake instances running.
-        /// </summary>
-        public static string GetInstanceCount
-        {
-            get
-            {
-                return Process.GetProcessesByName("HandBrake").Length == 0 ? string.Empty : Process.GetProcessesByName("HandBrake").Length.ToString();
-            }
-        }
+        #endregion
     }
-}
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs Added

@@ -0,0 +1,236 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InteropModelCreator.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Utility Class to Convert a
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// A Utility Class to Convert a 
+    /// </summary>
+    public class InteropModelCreator
+    {
+        /// <summary>
+        /// Get an EncodeJob model for a LibHB Encode.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        /// <returns>
+        /// An Interop.EncodeJob model.
+        /// </returns>
+        public static EncodeJob GetEncodeJob(QueueTask task)
+        {
+            // Sanity Checking
+            if (task == null || task.Task == null)
+            {
+                return null;
+            }
+
+            // The current Job Configuration
+            EncodeTask work = task.Task;
+
+            // Which will be converted to this EncodeJob Model.
+            EncodeJob job = new EncodeJob();
+
+            EncodingProfile profile = new EncodingProfile();
+            job.EncodingProfile = profile;
+
+            profile.Anamorphic = work.Anamorphic;
+
+            profile.AudioEncodings = new List<AudioEncoding>();
+            job.ChosenAudioTracks = new List<int>();
+            foreach (AudioTrack track in work.AudioTracks)
+            {
+                AudioEncoding newTrack = new AudioEncoding
+                    {
+                        Bitrate = track.Bitrate,
+                        Drc = track.DRC,
+                        Gain = track.Gain,
+                        Encoder = Converters.GetCliAudioEncoder(track.Encoder),
+                        InputNumber = track.Track.HasValue ? track.Track.Value : 0,
+                        Mixdown = Converters.GetCliMixDown(track.MixDown),
+                        SampleRateRaw = GetSampleRateRaw(track.SampleRate),         
+                    };
+
+                profile.AudioEncodings.Add(newTrack);
+                if (track.Track != null)
+                {
+                    job.ChosenAudioTracks.Add(track.Track.Value);
+                }
+            }
+            profile.Cropping = new Cropping
+                {
+                    Top = work.Cropping.Top,
+                    Bottom = work.Cropping.Bottom,
+                    Left = work.Cropping.Left,
+                    Right = work.Cropping.Right
+                };
+
+            profile.CroppingType = CroppingType.Custom; // TODO deal with this better
+            profile.CustomDecomb = work.CustomDecomb;
+            profile.CustomDeinterlace = work.CustomDeinterlace;
+            profile.CustomDenoise = work.CustomDenoise;
+            profile.CustomDetelecine = work.CustomDetelecine;
+            profile.Deblock = work.Deblock;
+            profile.Decomb = work.Decomb;
+            profile.Deinterlace = work.Deinterlace;
+            profile.Denoise = work.Denoise;
+            profile.Detelecine = work.Detelecine;
+            profile.DisplayWidth = work.DisplayWidth.HasValue
+                                       ? int.Parse(Math.Round(work.DisplayWidth.Value, 0).ToString())
+                                       : 0;
+            profile.Framerate = work.Framerate.HasValue ? work.Framerate.Value : 0;
+            profile.Grayscale = work.Grayscale;
+            profile.Height = work.Height.HasValue ? work.Height.Value : 0;
+            profile.IPod5GSupport = work.IPod5GSupport;
+            profile.IncludeChapterMarkers = work.IncludeChapterMarkers;
+            profile.KeepDisplayAspect = work.KeepDisplayAspect;
+            profile.LargeFile = work.LargeFile;
+            profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;
+            profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;
+            profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;
+            profile.Optimize = work.OptimizeMP4;
+            switch (work.OutputFormat)
+            {
+                case OutputFormat.Mp4:
+                case OutputFormat.M4V:
+                    profile.OutputFormat = Container.Mp4;
+                    break;
+                case OutputFormat.Mkv:
+                    profile.OutputFormat = Container.Mkv;
+                    break;
+            }
+            profile.ConstantFramerate = work.FramerateMode == FramerateMode.CFR;
+            profile.PixelAspectX = work.PixelAspectX;
+            profile.PixelAspectY = work.PixelAspectY;
+
+            switch (work.OutputFormat)
+            {
+                case OutputFormat.Mp4:
+                    profile.PreferredExtension = OutputExtension.Mp4;
+                    break;
+                case OutputFormat.M4V:
+                    profile.PreferredExtension = OutputExtension.M4v;
+                    break;
+            }
+            profile.Quality = work.Quality.HasValue ? work.Quality.Value : 0;
+            profile.UseDisplayWidth = true;
+            profile.VideoBitrate = work.VideoBitrate.HasValue ? work.VideoBitrate.Value : 0;
+            profile.VideoEncodeRateType = work.VideoEncodeRateType;
+            profile.VideoEncoder = Converters.GetVideoEncoder(work.VideoEncoder);
+            profile.Width = work.Width.HasValue ? work.Width.Value : 0;
+            profile.X264Options = work.AdvancedEncoderOptions;
+
+            if (work.PointToPointMode == PointToPointMode.Chapters)
+            {
+                job.ChapterStart = work.StartPoint;
+                job.ChapterEnd = work.EndPoint;
+            }
+
+            job.Angle = work.Angle;
+            job.EncodingProfile = profile;
+            if (work.PointToPointMode == PointToPointMode.Frames)
+            {
+                job.FramesEnd = work.EndPoint;
+                job.FramesStart = work.StartPoint;
+            }
+
+            job.CustomChapterNames = work.ChapterNames.Select(item => item.ChapterName).ToList();
+            job.UseDefaultChapterNames = work.IncludeChapterMarkers;
+
+            job.OutputPath = work.Destination;
+            switch (work.PointToPointMode)
+            {
+                case PointToPointMode.Chapters:
+                    job.RangeType = VideoRangeType.Chapters;
+                    break;
+                case PointToPointMode.Seconds:
+                    job.RangeType = VideoRangeType.Seconds;
+                    break;
+                case PointToPointMode.Frames:
+                    job.RangeType = VideoRangeType.Frames;
+                    break;
+            }
+
+            if (work.PointToPointMode == PointToPointMode.Seconds)
+            {
+                job.SecondsEnd = work.EndPoint;
+                job.SecondsStart = work.StartPoint;
+            }
+
+            job.SourcePath = work.Source;
+            // job.SourceType = work.Type;
+            job.Title = work.Title;
+
+            // Subtitles
+            job.Subtitles = new Subtitles { SourceSubtitles = new List<SourceSubtitle>(), SrtSubtitles = new List<SrtSubtitle>() };
+            foreach (SubtitleTrack track in work.SubtitleTracks)
+            {
+                if (track.IsSrtSubtitle)
+                {
+                    job.Subtitles.SrtSubtitles.Add(
+                        new SrtSubtitle
+                            {
+                                CharacterCode = track.SrtCharCode,
+                                Default = track.Default,
+                                FileName = track.SrtFileName,
+                                LanguageCode = track.SrtLang,
+                                Offset = track.SrtOffset
+                            });
+                }
+                else
+                {
+                    if (track.SourceTrack != null)
+                    {
+                        job.Subtitles.SourceSubtitles.Add(
+                            new SourceSubtitle
+                                {
+                                    BurnedIn = track.Burned,
+                                    Default = track.Default,
+                                    Forced = track.Forced,
+                                    TrackNumber = track.SourceTrack.TrackNumber
+                                });
+                    }
+                }
+            }
+
+            return job;
+        }
+
+        /// <summary>
+        /// Get the Raw Sample Rate
+        /// </summary>
+        /// <param name="rate">
+        /// The rate.
+        /// </param>
+        /// <returns>
+        /// The Raw sample rate as an int
+        /// </returns>
+        private static int GetSampleRateRaw(double rate)
+        {
+            if (rate == 22.05)
+                return 22050;
+            else if (rate == 24)
+                return 24000;
+            else if (rate == 44.1)
+                return 32000;
+            else if (rate == 48)
+                return 48000;
+            else return 48000;
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs Changed

@@ -1,7 +1,11 @@
-/*  LanguageUtilities.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LanguageUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Language Utilities
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Utilities
 {
@@ -20,7 +24,7 @@
         {
             IDictionary<string, string> languageMap = new Dictionary<string, string>
                                                           {
-                                                              {"Any", "und"}, 
+                                                              {"(Any)", "und"}, 
                                                               {"Afar", "aar"}, 
                                                               {"Abkhazian", "abk"}, 
                                                               {"Afrikaans", "afr"}, 
@@ -76,7 +80,7 @@
                                                               {"Irish", "gle"}, 
                                                               {"Galician", "glg"}, 
                                                               {"Manx", "glv"}, 
-                                                              {"Greek Modern", "ell"}, 
+                                                              {"Greek, Modern", "ell"}, 
                                                               {"Guarani", "grn"}, 
                                                               {"Gujarati", "guj"}, 
                                                               {"Haitian", "hat"}, 
@@ -150,7 +154,7 @@
                                                               {"Persian", "fas"}, 
                                                               {"Pali", "pli"}, 
                                                               {"Polish", "pol"}, 
-                                                              {"Portugues", "por"}, 
+                                                              {"Portuguese", "por"}, 
                                                               {"Pushto", "pus"}, 
                                                               {"Quechua", "que"}, 
                                                               {"Romansh", "roh"},

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs Added

@@ -0,0 +1,156 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PList.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Helper class to parse plist files.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Xml.Linq;
+
+    /// <summary>
+    /// A Helper class to parse plist files.
+    /// </summary>
+    public class PList : Dictionary<string, dynamic>
+    {
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PList"/> class.
+        /// </summary>
+        public PList()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PList"/> class.
+        /// </summary>
+        /// <param name="file">
+        /// The file.
+        /// </param>
+        public PList(string file)
+        {
+            this.Load(file);
+        }
+
+        #endregion
+
+        #region Public Methods
+
+
+        /// <summary>
+        /// Load a plist file.
+        /// </summary>
+        /// <param name="file">
+        /// The file name / path
+        /// </param>
+        /// <returns>
+        /// True if successful, false otherwise.
+        /// </returns>
+        public bool Load(string file)
+        {
+            this.Clear();
+
+            XDocument doc = XDocument.Load(file);
+            XElement plist = doc.Element("plist");
+            if (plist != null)
+            {
+                XElement array = plist.Element("array");
+                if (array != null)
+                {
+                    XElement dict = array.Element("dict");
+
+                    if (dict != null)
+                    {
+                        IEnumerable<XElement> dictElements = dict.Elements();
+                        this.Parse(this, dictElements);
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Parse a list of elements
+        /// </summary>
+        /// <param name="dict">
+        /// The dict.
+        /// </param>
+        /// <param name="elements">
+        /// The elements.
+        /// </param>
+        private void Parse(PList dict, IEnumerable<XElement> elements)
+        {
+            for (int i = 0; i < elements.Count(); i += 2)
+            {
+                XElement key = elements.ElementAt(i);
+                XElement val = elements.ElementAt(i + 1);
+
+                dict[key.Value] = this.ParseValue(val);
+            }
+        }
+
+        /// <summary>
+        /// The parse array.
+        /// </summary>
+        /// <param name="elements">
+        /// The elements.
+        /// </param>
+        /// <returns>
+        /// The <see cref="List"/>.
+        /// </returns>
+        private List<dynamic> ParseArray(IEnumerable<XElement> elements)
+        {
+            return elements.Select(e => this.ParseValue(e)).ToList();
+        }
+
+        /// <summary>
+        /// The parse value.
+        /// </summary>
+        /// <param name="val">
+        /// The XElement.
+        /// </param>
+        /// <returns>
+        /// The parsed value object.
+        /// </returns>
+        private dynamic ParseValue(XElement val)
+        {
+            switch (val.Name.ToString())
+            {
+                case "string":
+                    return val.Value;
+                case "integer":
+                    return int.Parse(val.Value);
+                case "real":
+                    return float.Parse(val.Value);
+                case "true":
+                    return true;
+                case "false":
+                    return false;
+                case "dict":
+                    var plist = new PList();
+                    this.Parse(plist, val.Elements());
+                    return plist;
+                case "array":
+                    List<dynamic> list = this.ParseArray(val.Elements());
+                    return list;
+                default:
+                    throw new ArgumentException("This plist file is not supported.");
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs Changed

@@ -1,424 +1,26 @@
-/*  PlistUtility.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PlistUtility.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Plist Preset Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Utilities
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
     using System.Text;
-    using System.Windows.Forms;
     using System.Xml;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.Interop.Model.Encoding;
 
     /// <summary>
     /// Plist Preset Converter
     /// </summary>
-    public class PlistPresetHandler
+    public class PlistUtility
     {
-        /// <summary>
-        /// The User Setting Service
-        /// </summary>
-        private static IUserSettingService userSettingService = ServiceManager.UserSettingService;
-
-        #region Import
-
-        public static EncodeTask Import(string filename)
-        {
-            XmlNode root = loadFile(filename);
-            if (root == null) return null;
-
-            // We'll query a query parser object and use it's public var structures to store all the data.
-            // This will allow the preset loader logic to be used instead of writing custom logic just for this file.
-            EncodeTask parsed = new EncodeTask();
-            string qualityMode = string.Empty;
-
-            #region Get a List of Audio Track Objects
-            XmlNode audioListDict = root.ChildNodes[2].ChildNodes[0].FirstChild.ChildNodes[13];
-            ObservableCollection<AudioTrack> audioTracks = new ObservableCollection<AudioTrack>();
-
-            for (int i = 0; i < audioListDict.ChildNodes.Count; i++)
-            {
-                XmlNode audioChannel = audioListDict.ChildNodes[i];
-                AudioTrack track = new AudioTrack();
-
-                for (int subi = 0; subi < audioChannel.ChildNodes.Count; subi += 2)
-                {
-                    // Audio Channel Information is here.
-                    string key = audioChannel.ChildNodes[subi].InnerText;
-                    string value = audioChannel.ChildNodes[subi + 1].InnerText;
-                    switch (key)
-                    {
-                        case "AudioBitrate":
-                            track.Bitrate = int.Parse(value);
-                            break;
-                        case "AudioEncoder":
-                            track.Encoder = Converters.GetAudioEncoder(value.Trim());
-                            break;
-                        case "AudioMixdown":
-                            track.MixDown = Converters.GetAudioMixDown(value.Trim());
-                            break;
-                        case "AudioSamplerate":
-                            track.SampleRate = value == "Auto" ? 0 : double.Parse(value);
-                            break;
-                        case "AudioTrack":
-                            //track.SourceTrack = value;
-                            break;
-                        case "AudioTrackDRCSlider":
-                            track.DRC = double.Parse(value);
-                            break;
-                        case "AudioTrackGainSlider":
-                            track.Gain = int.Parse(value.Replace("0.0", "0"));
-                            break;
-                    }
-                }
-                audioTracks.Add(track);
-                parsed.AudioTracks = audioTracks;
-            }
-            #endregion
-
-            #region Parse the reset of the plist keys into local variables
-
-            XmlNode presetSettings = root.ChildNodes[2].ChildNodes[0].FirstChild;
-
-            // Start from 2 to avoid the audio settings which we don't need.
-            for (int i = 0; i < presetSettings.ChildNodes.Count; i += 2)
-            {
-                string key = presetSettings.ChildNodes[i].InnerText;
-                string value = presetSettings.ChildNodes[i + 1].InnerText;
-
-                switch (key)
-                {
-                    // Output Settings
-                    case "FileFormat":
-                        parsed.OutputFormat = Converters.GetFileFormat(value.Replace("file", string.Empty).Trim());
-                        break;
-                    case "Mp4HttpOptimize":
-                        parsed.OptimizeMP4 = value == "1";
-                        break;
-                    case "Mp4LargeFile":
-                        parsed.LargeFile = value == "1";
-                        break;
-                    case "Mp4iPodCompatible":
-                        parsed.IPod5GSupport = value == "1";
-                        break;
-
-                    // Picture Settings
-                    case "PictureAutoCrop":
-                        parsed.HasCropping = value != "1";
-                        break;
-                    case "PictureTopCrop":
-                        parsed.Cropping.Top = int.Parse(value);
-                        break;
-                    case "PictureBottomCrop":
-                        parsed.Cropping.Bottom = int.Parse(value);
-                        break;
-                    case "PictureLeftCrop":
-                        parsed.Cropping.Left = int.Parse(value);
-                        break;
-                    case "PictureRightCrop":
-                        parsed.Cropping.Right = int.Parse(value);
-                        break;
-                    case "PictureHeight":
-                        parsed.Height = int.Parse(value);
-                        break;
-                    case "PictureWidth":
-                        parsed.Width = int.Parse(value);
-                        break;
-                    case "PictureKeepRatio":
-                        parsed.KeepDisplayAspect = value == "1";
-                        break;
-                    case "PicturePAR":
-                        switch (value)
-                        {
-                            case "0":
-                                parsed.Anamorphic = Anamorphic.None;
-                                break;
-                            default:
-                                parsed.Anamorphic = Anamorphic.Strict;
-                                break;
-                            case "2":
-                                parsed.Anamorphic = Anamorphic.Loose;
-                                break;
-                            case "3":
-                                parsed.Anamorphic = Anamorphic.Custom;
-                                break;
-                        }
-                        break;
-
-                    // Filters
-                    case "PictureDeblock":
-                        parsed.Deblock = int.Parse(value);
-                        break;
-                    case "PictureDecomb":
-                        parsed.Decomb = Decomb.Off;
-                        switch (value)
-                        {
-                            case "1":
-                                parsed.Decomb = Decomb.Custom;
-                                break;
-                            case "2":
-                                parsed.Decomb = Decomb.Default;
-                                break;
-                            case "3":
-                                parsed.Decomb = Decomb.Fast;
-                                break;
-                        }
-                        break;
-                    case "PictureDecombCustom":
-                        if (value != string.Empty)
-                        {
-                            parsed.CustomDecomb = value;
-                        }
-                        break;
-                    case "PictureDecombDeinterlace":
-                        // Not Used
-                        break;
-                    case "PictureDeinterlace":
-                        switch (value)
-                        {
-                            case "0":
-                                parsed.Deinterlace = Deinterlace.Off;
-                                break;
-                            case "1":
-                                parsed.Deinterlace = Deinterlace.Custom;
-                                break;
-                            case "2":
-                                parsed.Deinterlace = Deinterlace.Fast;
-                                break;
-                            case "3":
-                                parsed.Deinterlace = Deinterlace.Slow;
-                                break;
-                            case "4":
-                                parsed.Deinterlace = Deinterlace.Slower;
-                                break;
-                        }
-                        break;
-                    case "PictureDeinterlaceCustom":
-                        if (value != string.Empty)
-                        {
-                            parsed.CustomDeinterlace = value;
-                        }
-                        break;
-                    case "PictureDenoise":
-                        switch (value)
-                        {
-                            case "0":
-                                parsed.Denoise = Denoise.Off;
-                                break;
-                            case "1":
-                                parsed.Denoise = Denoise.Custom;
-                                break;
-                            case "2":
-                                parsed.Denoise = Denoise.Weak;
-                                break;
-                            case "3":
-                                parsed.Denoise = Denoise.Medium;
-                                break;
-                            case "4":
-                                parsed.Denoise = Denoise.Strong;
-                                break;
-                        }
-
-                        break;
-                    case "PictureDenoiseCustom":
-                        if (value != string.Empty)
-                        {
-                            parsed.CustomDenoise = value;
-                        }
-                        break;
-                    case "PictureDetelecine":
-                        parsed.Detelecine = Detelecine.Off;
-                        if (value == "1")
-                        {
-                            parsed.Detelecine = Detelecine.Custom;
-                        }
-                        if (value == "2")
-                        {
-                            parsed.Detelecine = Detelecine.Default;
-                        }
-                        break;
-                    case "PictureDetelecineCustom":
-                        if (value != string.Empty)
-                        {
-                            parsed.CustomDetelecine = value;
-                        }
-                        break;
-
-                    // Video Tab
-                    case "VideoAvgBitrate":
-                        if (!string.IsNullOrEmpty(value))
-                        {
-                            parsed.VideoBitrate = int.Parse(value);
-                        }
-                        break;
-                    case "VideoEncoder":
-                        parsed.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(value);
-                        break;
-                    case "VideoFramerate":
-
-                        if (value == "Same as source")
-                        {
-                            parsed.Framerate = null;
-                        }
-                        else if (!string.IsNullOrEmpty(value))
-                        {
-                            parsed.Framerate = double.Parse(value);
-                        }
-                        break;
-                    case "VideoFramerateMode":
-                        switch (value)
-                        {
-                            case "vfr":
-                                parsed.FramerateMode = FramerateMode.VFR;
-                                break;
-                            case "cfr":
-                                parsed.FramerateMode = FramerateMode.CFR;
-                                break;
-                            default:
-                                parsed.FramerateMode = FramerateMode.PFR;
-                                break;
-                        }
-                        break;
-                    case "VideoGrayScale":
-                        parsed.Grayscale = value == "1";
-                        break;
-                    case "VideoQualitySlider":
-                        if (!string.IsNullOrEmpty(value))
-                        {
-                            parsed.Quality = double.Parse(value);
-                        }
-                        break;
-                    case "VideoQualityType": // The Type of Quality Mode used
-                        qualityMode = value;
-                        break;
-                    case "VideoTurboTwoPass":
-                        parsed.TurboFirstPass = value == "1";
-                        break;
-                    case "VideoTwoPass":
-                        parsed.TwoPass = value == "1";
-                        break;
-
-                    // Chapter Markers Tab
-                    case "ChapterMarkers":
-                        parsed.IncludeChapterMarkers = value == "1";
-                        break;
-
-                    // Advanced x264 tab
-                    case "x264Option":
-                        parsed.AdvancedEncoderOptions = value;
-                        break;
-
-                    // Preset Information
-                    case "PresetBuildNumber":
-                        parsed.PresetBuildNumber = int.Parse(value);
-                        break;
-                    case "PresetDescription":
-                        parsed.PresetDescription = value;
-                        break;
-                    case "PresetName":
-                        parsed.PresetName = value;
-                        break;
-                    case "Type":
-                        parsed.Type = value;
-                        break;
-                    case "UsesMaxPictureSettings":
-                        parsed.UsesMaxPictureSettings = value == "1";
-                        break;
-                    case "UsesPictureFilters":
-                        parsed.UsesPictureFilters = value == "1";
-                        break;
-                    case "UsesPictureSettings":
-                        parsed.UsesPictureSettings = value == "1";
-                        break;
-
-                    // Allowed Passthru
-                    case "AudioAllowAACPass":
-                        parsed.AllowedPassthruOptions.AudioAllowAACPass = value == "1";
-                        break;
-                    case "AudioAllowAC3Pass":
-                        parsed.AllowedPassthruOptions.AudioAllowAC3Pass = value == "1";
-                        break;
-                    case "AudioAllowDTSHDPass":
-                        parsed.AllowedPassthruOptions.AudioAllowDTSHDPass = value == "1";
-                        break;
-                    case "AudioAllowDTSPass":
-                        parsed.AllowedPassthruOptions.AudioAllowDTSPass = value == "1";
-                        break;
-                    case "AudioAllowMP3Pass":
-                        parsed.AllowedPassthruOptions.AudioAllowMP3Pass = value == "1";
-                        break;
-                    case "AudioEncoderFallback":
-                        parsed.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(value);
-                        break;
-                }
-            }
-
-            // Kill any Quality values we don't need.
-            switch (qualityMode)
-            {
-                case "1": // Avg Bitrate
-                    parsed.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;
-                    break;
-                case "2": // CQ
-                    parsed.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;
-                    break;
-            }
-            #endregion
-
-            return parsed;
-        }
-
-        private static XmlNode loadFile(string filename)
-        {
-            try
-            {
-                XmlNode root;
-
-                if (!File.Exists(filename))
-                    return null;
-
-                string fromfile = string.Empty;
-                using (StreamReader sr = File.OpenText(filename))
-                {
-                    int fileChar;
-                    while ((fileChar = sr.Read()) != -1) fromfile += Convert.ToChar(fileChar);
-                }
-
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(fromfile);
-
-                root = doc;
-                if (!root.HasChildNodes)
-                {
-                    MessageBox.Show(
-                        "The Preset file you selected appears to be invlaid or from an older version of HandBrake",
-                        "Error",
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return null;
-                }
-
-                return root;
-            }
-            catch (Exception)
-            {
-                MessageBox.Show(
-                    "The Preset file you selected appears to be invlaid or from an older version of HandBrake.\n\n Please note, if you are exporting from the MacGui you may need to rebuild your preset so that it uses the current preset plist format.\n The MacGui does not currently update user presets automatically.",
-                    "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return null;
-            }
-        }
-        #endregion
-
         #region Export
 
         /// <summary>
@@ -430,9 +32,17 @@
         /// <param name="preset">
         /// The preset.
         /// </param>
-        public static void Export(string path, Preset preset)
+        /// <param name="build">
+        /// The build.PictureModulusPictureModulus
+        /// </param>
+        public static void Export(string path, Preset preset, string build)
         {
-            EncodeTask parsed = QueryParserUtility.Parse(preset.Query);
+            if (string.IsNullOrEmpty(path))
+            {
+                return;
+            }
+
+            EncodeTask parsed = new EncodeTask(preset.Task);
             using (XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented })
             {
                 // Header
@@ -444,7 +54,7 @@
                 xmlWriter.WriteStartElement("array");
 
                 // Add New Preset Here. Can write multiple presets here if required in future.
-                WritePreset(xmlWriter, parsed, preset);
+                WritePreset(xmlWriter, parsed, preset, build);
 
                 // Footer
                 xmlWriter.WriteEndElement();
@@ -469,16 +79,38 @@
         /// <param name="preset">
         /// The preset.
         /// </param>
-        private static void WritePreset(XmlTextWriter xmlWriter, EncodeTask parsed, Preset preset)
+        /// <param name="build">
+        /// The build.
+        /// </param>
+        private static void WritePreset(XmlTextWriter xmlWriter, EncodeTask parsed, Preset preset, string build)
         {
             xmlWriter.WriteStartElement("dict");
             AudioListArrayDict(xmlWriter, parsed);
-            AddEncodeSettings(xmlWriter, parsed, preset);
+            AddEncodeSettings(xmlWriter, parsed, preset, build);
 
             xmlWriter.WriteEndElement();
         }
 
         /// <summary>
+        /// The get null bool value.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <returns>
+        /// The System.String.
+        /// </returns>
+        private static string getNullBoolValue(bool? value)
+        {
+            if (!value.HasValue)
+            {
+                return "1";
+            }
+
+            return value.Value ? "1" : "0";
+        }
+
+        /// <summary>
         /// Add the encode settings to the preset
         /// </summary>
         /// <param name="xmlWriter">
@@ -490,13 +122,16 @@
         /// <param name="preset">
         /// The preset.
         /// </param>
-        private static void AddEncodeSettings(XmlTextWriter xmlWriter, EncodeTask parsed, Preset preset)
+        /// <param name="build">
+        /// The build.
+        /// </param>
+        private static void AddEncodeSettings(XmlTextWriter xmlWriter, EncodeTask parsed, Preset preset, string build)
         {
-            AddEncodeElement(xmlWriter, "AudioAllowAACPass", "integer", parsed.AllowedPassthruOptions.AudioAllowAACPass ? "1" : "0");
-            AddEncodeElement(xmlWriter, "AudioAllowAC3Pass", "integer", parsed.AllowedPassthruOptions.AudioAllowAC3Pass ? "1" : "0");
-            AddEncodeElement(xmlWriter, "AudioAllowDTSHDPass", "integer", parsed.AllowedPassthruOptions.AudioAllowDTSHDPass ? "1" : "0");
-            AddEncodeElement(xmlWriter, "AudioAllowDTSPass", "integer", parsed.AllowedPassthruOptions.AudioAllowDTSPass ? "1" : "0");
-            AddEncodeElement(xmlWriter, "AudioAllowMP3Pass", "integer", parsed.AllowedPassthruOptions.AudioAllowMP3Pass ? "1" : "0");
+            AddEncodeElement(xmlWriter, "AudioAllowAACPass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowAACPass));
+            AddEncodeElement(xmlWriter, "AudioAllowAC3Pass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowAC3Pass));
+            AddEncodeElement(xmlWriter, "AudioAllowDTSHDPass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowDTSHDPass));
+            AddEncodeElement(xmlWriter, "AudioAllowDTSPass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowDTSPass));
+            AddEncodeElement(xmlWriter, "AudioAllowMP3Pass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowMP3Pass));
             AddEncodeElement(xmlWriter, "AudioEncoderFallback", "string", EnumHelper<AudioEncoder>.GetDisplay(parsed.AllowedPassthruOptions.AudioEncoderFallback));
 
             AddEncodeElement(xmlWriter, "ChapterMarkers", "integer", parsed.IncludeChapterMarkers ? "1" : "0");
@@ -526,6 +161,10 @@
                     AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "3");
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
                     break;
+                case Decomb.Bob:
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "4");
+                    AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
+                    break;
                 case Decomb.Custom:
                     AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "1");
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", parsed.CustomDecomb);
@@ -551,6 +190,10 @@
                     AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "4");
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
                     break;
+                case Deinterlace.Bob:
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "5");
+                    AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
+                    break;
                 case Deinterlace.Custom:
                     AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "1");
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", parsed.CustomDeinterlace);
@@ -609,7 +252,7 @@
             AddEncodeElement(xmlWriter, "PictureWidth", "integer", parsed.Width.ToString());
 
             // Preset Information
-            AddEncodeElement(xmlWriter, "PresetBuildNumber", "string", userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild).ToString());
+            AddEncodeElement(xmlWriter, "PresetBuildNumber", "string", build);
             AddEncodeElement(xmlWriter, "PresetDescription", "string", "No Description");
             AddEncodeElement(xmlWriter, "PresetName", "string", preset.Name);
             AddEncodeElement(xmlWriter, "Type", "integer", "1"); // 1 is user preset, 0 is built in
@@ -622,10 +265,20 @@
             // Video Settings
             AddEncodeElement(xmlWriter, "VideoAvgBitrate", "string", parsed.VideoBitrate.ToString());
             AddEncodeElement(xmlWriter, "VideoEncoder", "string", EnumHelper<VideoEncoder>.GetDisplay(parsed.VideoEncoder));
-            AddEncodeElement(xmlWriter, "VideoFramerate", "string", parsed.Framerate.ToString());
-            AddEncodeElement(xmlWriter, "VideFrameratePFR", "integer", parsed.FramerateMode == FramerateMode.PFR ? "1" : "0");
+            AddEncodeElement(xmlWriter, "VideoFramerate", "string", parsed.Framerate == null ? "Same as source" : parsed.Framerate.ToString());
+            AddEncodeElement(xmlWriter, "VideoFramerateMode", "string", parsed.FramerateMode.ToString().ToLower());
             AddEncodeElement(xmlWriter, "VideoGrayScale", "integer", parsed.Grayscale ? "1" : "0");
             AddEncodeElement(xmlWriter, "VideoQualitySlider", "real", parsed.Quality.ToString());
+            AddEncodeElement(xmlWriter, "h264Level", "string", parsed.H264Level);
+            AddEncodeElement(xmlWriter, "x264OptionExtra", "string", parsed.AdvancedEncoderOptions);
+            AddEncodeElement(xmlWriter, "x264Preset", "string", parsed.X264Preset.ToString().ToLower());
+            AddEncodeElement(xmlWriter, "h264Profile", "string", parsed.H264Profile.ToString().ToLower());
+            string tune = parsed.X264Tune.ToString().ToLower();
+            if (parsed.FastDecode)
+            {
+                tune = tune == "none" ? "fastdecode" : tune + ",fastdecode";
+            }
+            AddEncodeElement(xmlWriter, "x264Tune", "string", tune);
 
             int videoQualityType = 0;
             if (parsed.VideoBitrate != null) videoQualityType = 1;

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs Changed

@@ -1,7 +1,11 @@
-/*  QueryGeneratorUtility.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr/>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueryGeneratorUtility.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Generate a CLI Query for HandBrakeCLI
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Utilities
 {
@@ -11,10 +15,8 @@
     using System.Globalization;
     using System.IO;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.Interop.Model.Encoding;
     using HandBrake.Interop.Model.Encoding.x264;
 
@@ -24,25 +26,34 @@
     public class QueryGeneratorUtility
     {
         /// <summary>
-        /// Backing field for the user settings service.
-        /// </summary>
-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;
-
-        /// <summary>
         /// Generate a CLI Query for an EncodeTask Model object
         /// </summary>
         /// <param name="task">
         /// The task.
         /// </param>
+        /// <param name="previewScanCount">
+        /// The preview Scan Count.
+        /// </param>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <param name="disableLibDvdNav">
+        /// The disable Lib Dvd Nav.
+        /// </param>
         /// <returns>
         /// A Cli Query
         /// </returns>
-        public static string GenerateQuery(EncodeTask task)
+        public static string GenerateQuery(EncodeTask task, int previewScanCount, int verbosity, bool disableLibDvdNav)
         {
+            if (string.IsNullOrEmpty(task.Source))
+            {
+                return "No source selected";
+            }
+
             string query = string.Empty;
-            query += SourceQuery(task, null, null);
+            query += SourceQuery(task, null, null, previewScanCount);
             query += DestinationQuery(task);
-            query += GenerateTabbedComponentsQuery(task, true);
+            query += GenerateTabbedComponentsQuery(task, true, verbosity, disableLibDvdNav);
 
             return query;
         }
@@ -59,15 +70,24 @@
         /// <param name="startAtPreview">
         /// The start At Preview.
         /// </param>
+        /// <param name="previewScanCount">
+        /// The preview Scan Count.
+        /// </param>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <param name="disableLibDvdNav">
+        /// The disable Lib Dvd Nav.
+        /// </param>
         /// <returns>
         /// A Cli query suitable for generating a preview video.
         /// </returns>
-        public static string GeneratePreviewQuery(EncodeTask task, int duration, string startAtPreview)
+        public static string GeneratePreviewQuery(EncodeTask task, int duration, string startAtPreview, int previewScanCount, int verbosity, bool disableLibDvdNav)
         {
             string query = string.Empty;
-            query += SourceQuery(task, duration, startAtPreview);
+            query += SourceQuery(task, duration, startAtPreview, previewScanCount);
             query += DestinationQuery(task);
-            query += GenerateTabbedComponentsQuery(task, true);
+            query += GenerateTabbedComponentsQuery(task, true, verbosity, disableLibDvdNav);
 
             return query;
         }
@@ -83,10 +103,16 @@
         /// <param name="enableFilters">
         /// The enableFilters.
         /// </param>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <param name="disableLibDvdNav">
+        /// The disable Lib Dvd Nav.
+        /// </param>
         /// <returns>
         /// The CLI query for the Tabbed section of the main window UI
         /// </returns>
-        private static string GenerateTabbedComponentsQuery(EncodeTask task, bool enableFilters)
+        private static string GenerateTabbedComponentsQuery(EncodeTask task, bool enableFilters, int verbosity, bool disableLibDvdNav)
         {
             string query = string.Empty;
 
@@ -116,7 +142,7 @@
             query += AdvancedQuery(task);
 
             // Extra Settings
-            query += ExtraSettings();
+            query += ExtraSettings(verbosity, disableLibDvdNav);
 
             return query;
         }
@@ -133,14 +159,20 @@
         /// <param name="preview">
         /// The preview.
         /// </param>
+        /// <param name="previewScanCount">
+        /// The preview Scan Count.
+        /// </param>
         /// <returns>
         /// A Cli Query as a string
         /// </returns>
-        private static string SourceQuery(EncodeTask task, int? duration, string preview)
+        private static string SourceQuery(EncodeTask task, int? duration, string preview, int previewScanCount)
         {
             string query = string.Empty;
 
-            query += string.Format(" -i \"{0}\"", task.Source);
+            query += task.Source.EndsWith("\\")
+                         ? string.Format(" -i \"{0}\\\\\"", task.Source.TrimEnd('\\'))
+                         : string.Format(" -i \"{0}\"", task.Source);
+
             query += string.Format(" -t {0}", task.Title);
             query += string.Format(" --angle {0}", task.Angle);
 
@@ -163,7 +195,7 @@
                     query += string.Format(" --start-at frame:{0} --stop-at frame:{1}", task.StartPoint, calculatedDuration);
                     break;
                 case PointToPointMode.Preview: // Preview
-                    query += " --previews " + UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount) + " ";
+                    query += " --previews " + previewScanCount + " ";
                     query += " --start-at-preview " + preview;
                     query += " --stop-at duration:" + duration + " ";
                     break;
@@ -183,14 +215,7 @@
         /// </returns>
         private static string DestinationQuery(EncodeTask task)
         {
-            string query = string.Empty;
-
-            if (task.PointToPointMode == PointToPointMode.Preview)
-                query += string.Format(" -o \"{0}\" ", task.Destination.Replace(".m", "_sample.m"));
-            else
-                query += string.Format(" -o \"{0}\" ", task.Destination);
-
-            return query;
+            return string.Format(" -o \"{0}\" ", task.Destination);
         }
 
         /// <summary>
@@ -236,11 +261,11 @@
 
             if (task.Anamorphic != Anamorphic.Strict)
             {
-                if (task.MaxWidth.HasValue) query += string.Format(" -X {0}", task.MaxWidth);
-                else if (task.Width.HasValue) query += string.Format(" -w {0}", task.Width);
+                //if (task.MaxWidth.HasValue) query += string.Format(" -X {0}", task.MaxWidth);
+                if (task.Width.HasValue && task.Width != 0) query += string.Format(" -w {0}", task.Width);
 
-                if (task.MaxWidth.HasValue) query += string.Format(" -Y {0}", task.MaxHeight);
-                else if (task.Height.HasValue) query += string.Format(" -h {0}", task.Height);
+                //if (task.MaxHeight.HasValue) query += string.Format(" -Y {0}", task.MaxHeight);
+                if (task.Height.HasValue && task.Height != 0) query += string.Format(" -l {0}", task.Height);
             }
 
             if (task.HasCropping)
@@ -318,6 +343,12 @@
                 case Decomb.Custom:
                     query += string.Format(" --decomb=\"{0}\"", task.CustomDecomb);
                     break;
+                case Decomb.Fast:
+                    query += " --decomb=\"fast\"";
+                    break;
+                case Decomb.Bob:
+                    query += " --decomb=\"bob\"";
+                    break;
                 default:
                     query += string.Empty;
                     break;
@@ -337,6 +368,10 @@
                 case Deinterlace.Custom:
                     query += string.Format(" --deinterlace=\"{0}\"", task.CustomDeinterlace);
                     break;
+
+                case Deinterlace.Bob:
+                    query += " --deinterlace=\"bob\"";
+                    break;
                 default:
                     query += string.Empty;
                     break;
@@ -361,7 +396,7 @@
                     break;
             }
 
-            if (task.Deblock != 4)
+            if (task.Deblock > 4)
                 query += string.Format(" --deblock={0}", task.Deblock);
 
             if (task.Grayscale)
@@ -386,7 +421,10 @@
             switch (task.VideoEncoder)
             {
                 case VideoEncoder.FFMpeg:
-                    query += " -e ffmpeg";
+                    query += " -e ffmpeg4";
+                    break;
+                case VideoEncoder.FFMpeg2:
+                    query += " -e ffmpeg2";
                     break;
                 case VideoEncoder.X264:
                     query += " -e x264";
@@ -399,8 +437,6 @@
                     break;
             }
 
-            double x264CqStep = UserSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
-
             switch (task.VideoEncodeRateType)
             {
                 case VideoEncodeRateType.AverageBitrate:
@@ -412,17 +448,14 @@
                     switch (task.VideoEncoder)
                     {
                         case VideoEncoder.FFMpeg:
-                            value = 31 - (task.Quality.Value - 1);
-                            query += string.Format(" -q {0}", value.ToString(CultureInfo.InvariantCulture));
+                        case VideoEncoder.FFMpeg2:
+                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
                             break;
                         case VideoEncoder.X264:
-                            value = 51 - (task.Quality.Value * x264CqStep);
-                            value = Math.Round(value, 2);
-                            query += string.Format(" -q {0}", value.ToString(CultureInfo.InvariantCulture));
+                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
                             break;
                         case VideoEncoder.Theora:
-                            value = task.Quality.Value;
-                            query += string.Format(" -q {0}", value.ToString(CultureInfo.InvariantCulture));
+                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
                             break;
                     }
                     break;
@@ -435,7 +468,7 @@
                 query += " -T ";
 
             if (task.Framerate.HasValue)
-                query += string.Format(" -r {0}", task.Framerate);
+                query += string.Format(" -r {0}", task.Framerate.Value.ToString(CultureInfo.InvariantCulture));
 
             switch (task.FramerateMode)
             {
@@ -477,6 +510,8 @@
             List<double> samplerates = new List<double>();
             List<int> bitrates = new List<int>();
             List<double> drcs = new List<double>();
+            List<double> gains = new List<double>();
+            List<string> trackNames = new List<string>();
 
             // No Audio
             if (audioTracks.Count == 0)
@@ -496,16 +531,22 @@
                 codecs.Add(track.Encoder);
 
                 // Audio Mixdown (-6)
-                mixdowns.Add(track.MixDown);
+                mixdowns.Add(track.IsPassthru ? Mixdown.None : track.MixDown);
 
                 // Sample Rate (-R)
-                samplerates.Add(track.SampleRate);
+                samplerates.Add(track.IsPassthru ? 0 : track.SampleRate);
 
                 // Audio Bitrate (-B)
-                bitrates.Add(track.Bitrate);
+                bitrates.Add(track.IsPassthru ? 0 : track.Bitrate);
 
                 // DRC (-D)
-                drcs.Add(track.DRC);
+                drcs.Add(track.IsPassthru ? 0 : track.DRC);
+
+                // Gain (--gain)
+                gains.Add(track.IsPassthru ? 0 : track.Gain);
+
+                // Audio Track Name (--aname)
+                trackNames.Add(track.TrackName);
             }
 
             // Audio Track (-a)
@@ -536,7 +577,7 @@
                     firstLoop = false;
                 }
                 else
-                    audioItems += "," + item;
+                    audioItems += "," +  Converters.GetCliAudioEncoder(item);
             }
             if (audioItems.Trim() != String.Empty)
                 query += " -E " + audioItems;
@@ -552,7 +593,7 @@
                     firstLoop = false;
                 }
                 else
-                    audioItems += "," + item;
+                    audioItems += "," + Converters.GetCliMixDown(item);
             }
             if (audioItems.Trim() != String.Empty)
                 query += " -6 " + audioItems;
@@ -562,13 +603,14 @@
             // Sample Rate (-R)
             foreach (double item in samplerates)
             {
+                string add = (item == 0.0) ? "Auto" : item.ToString();
                 if (firstLoop)
                 {
-                    audioItems = item.ToString();
+                    audioItems = add;
                     firstLoop = false;
                 }
                 else
-                    audioItems += "," + item;
+                    audioItems += "," + add;
             }
             if (audioItems.Trim() != String.Empty)
                 query += " -R " + audioItems;
@@ -606,39 +648,88 @@
             if (audioItems.Trim() != String.Empty)
                 query += " -D " + audioItems;
 
+            audioItems = string.Empty; // Reset for another pass.
+            firstLoop = true;
+
+            // Gain (--gain)
+            foreach (var itm in gains)
+            {
+                string item = itm.ToString(new CultureInfo("en-US"));
+                if (firstLoop)
+                {
+                    audioItems = item;
+                    firstLoop = false;
+                }
+                else
+                    audioItems += "," + item;
+            }
+            if (audioItems.Trim() != String.Empty)
+                query += " --gain " + audioItems;
+
+            audioItems = string.Empty; // Reset for another pass.
+            firstLoop = true;
+
+            // Audio Track Names (--aname)
+            bool foundTrackName = false;
+            foreach (string trackName in trackNames)
+            {
+                if (!string.IsNullOrEmpty(trackName))
+                {
+                    foundTrackName = true;
+                }
+
+                if (firstLoop)
+                {
+                    audioItems = string.IsNullOrEmpty(trackName) ? "\"\"" : string.Format("\"{0}\"", trackName.Trim());
+                    firstLoop = false;
+                }
+                else
+                    audioItems += "," + (string.IsNullOrEmpty(trackName) ? "\"\"" : string.Format("\"{0}\"", trackName.Trim()));
+            }
+            if (foundTrackName)
+                query += string.Format(" --aname={0}", audioItems);
+
             // Passthru Settings
             if (task.AllowedPassthruOptions != null)
             {
                 string fallbackEncoders = string.Empty;
 
-                if (task.AllowedPassthruOptions.AudioAllowAACPass)
+                if (task.AllowedPassthruOptions.AudioAllowAACPass != null && task.AllowedPassthruOptions.AudioAllowAACPass.Value)
                 {
                     fallbackEncoders += "aac";
                 }
 
-                if (task.AllowedPassthruOptions.AudioAllowAC3Pass)
+                if (task.AllowedPassthruOptions.AudioAllowAC3Pass != null && task.AllowedPassthruOptions.AudioAllowAC3Pass.Value)
                 {
                     fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "ac3" : ",ac3";
                 }
 
-                if (task.AllowedPassthruOptions.AudioAllowDTSHDPass)
+                if (task.AllowedPassthruOptions.AudioAllowDTSHDPass != null && task.AllowedPassthruOptions.AudioAllowDTSHDPass.Value)
                 {
                     fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "dtshd" : ",dtshd";
                 }
 
-                if (task.AllowedPassthruOptions.AudioAllowDTSPass)
+                if (task.AllowedPassthruOptions.AudioAllowDTSPass != null && task.AllowedPassthruOptions.AudioAllowDTSPass.Value)
                 {
                     fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "dts" : ",dts";
                 }
 
-                if (task.AllowedPassthruOptions.AudioAllowMP3Pass)
+                if (task.AllowedPassthruOptions.AudioAllowMP3Pass != null && task.AllowedPassthruOptions.AudioAllowMP3Pass.Value)
                 {
                     fallbackEncoders += string.IsNullOrEmpty(fallbackEncoders) ? "mp3" : ",mp3";
                 }
 
                 if (!string.IsNullOrEmpty(fallbackEncoders))
                 {
-                    query += string.Format(" --audio-copy-mask {0}", fallbackEncoders);
+                    // Special Case, The CLI alredy defaults to ALL, so if all area selected, then don't need to set copy mask
+                    if (fallbackEncoders != "aac,ac3,dtshd,dts,mp3")
+                    {
+                        query += string.Format(" --audio-copy-mask {0}", fallbackEncoders);
+                    }
+                } 
+                else
+                {
+                    query += string.Format(" --audio-copy-mask none");  
                 }
 
                 query += string.Format(" --audio-fallback {0}", Converters.GetCliAudioEncoder(task.AllowedPassthruOptions.AudioEncoderFallback));
@@ -704,7 +795,7 @@
                         subCount++;
 
                         // Find --subtitle <string>
-                        if (item.Track.Contains("Foreign Audio Search"))
+                        if (item.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch)
                             itemToAdd = "scan";
                         else
                         {
@@ -736,7 +827,7 @@
                     if (subtitleForced != string.Empty)
                         query += " --subtitle-forced=" + subtitleForced;
                     if (subtitleBurn != string.Empty)
-                        query += " --subtitle-burn=" + subtitleBurn;
+                        query += " --subtitle-burned=" + subtitleBurn;
                     if (subtitleDefault != string.Empty)
                         query += " --subtitle-default=" + subtitleDefault;
                 }
@@ -812,19 +903,37 @@
             {
                 string query = string.Empty; 
 
-                if (task.x264Preset != x264Preset.None)
+                if (task.X264Preset != x264Preset.Medium)
                 {
-                    query += string.Format("--x264-preset={0} ", task.x264Preset.ToString().ToLower().Replace(" ", string.Empty));
+                    query += string.Format(" --x264-preset={0} ", task.X264Preset.ToString().ToLower().Replace(" ", string.Empty));
                 }
 
-                if (task.x264Profile != x264Profile.None)
+                if (task.H264Profile != x264Profile.None)
                 {
-                    query += string.Format("--x264-profile={0} ", task.x264Profile.ToString().ToLower().Replace(" ", string.Empty));
+                    query += string.Format(" --x264-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty));
                 }
 
                 if (task.X264Tune != x264Tune.None)
                 {
-                    query += string.Format("--x264-tune={0} ", task.X264Tune.ToString().ToLower().Replace(" ", string.Empty));
+                    string tune = string.Empty;
+
+                    if (task.FastDecode)
+                    {
+                        tune = "fastdecode";
+                    }
+
+                    string tuneDropdown = task.X264Tune.ToString().ToLower().Replace(" ", string.Empty);
+                    if (task.X264Tune != x264Tune.None && !string.IsNullOrEmpty(tuneDropdown))
+                    {
+                        tune = string.IsNullOrEmpty(tune) ? tuneDropdown : string.Format(",{0}", tuneDropdown);  
+                    }
+
+                    query += string.Format(" --x264-tune=\"{0}\" ", tune);
+                }
+
+                if (task.H264Level != "Auto")
+                {
+                    query += string.Format(" --h264-level=\"{0}\" ", task.H264Level);
                 }
 
                 if (!string.IsNullOrEmpty(task.AdvancedEncoderOptions))
@@ -832,6 +941,11 @@
                     query += string.Format(" -x {0}", task.AdvancedEncoderOptions);
                 }
 
+                if (!string.IsNullOrEmpty(task.ExtraAdvancedArguments))
+                {
+                    query += string.Format(" -x {0}", task.ExtraAdvancedArguments);
+                }
+
                 return query;
             }
 
@@ -841,19 +955,24 @@
         /// <summary>
         /// Generate the Command Line Arguments for any additional advanced options.
         /// </summary>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <param name="disableLibdvdNav">
+        /// The disable Libdvd Nav.
+        /// </param>
         /// <returns>
         /// A Cli Query as a string
         /// </returns>
-        private static string ExtraSettings()
+        private static string ExtraSettings(int verbosity, bool disableLibdvdNav)
         {
             string query = string.Empty;
 
             // Verbosity Level
-            int verbosity = UserSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
-            query += string.Format(" --verbose= {0}", verbosity);
+            query += string.Format(" --verbose={0}", verbosity);
 
             // LibDVDNav
-            if (UserSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
+            if (disableLibdvdNav)
                 query += " --no-dvdnav";
 
             return query;
@@ -872,7 +991,7 @@
         private static bool ChapterCsvSave(IEnumerable<ChapterMarker> chapters, string filePathName)
         {
             string csv = string.Empty;
-            int counter = 0;
+            int counter = 1;
 
             foreach (ChapterMarker name in chapters)
             {

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs Changed

@@ -1,18 +1,20 @@
-/*  QueryParser.cs $
-    This file is part of the HandBrake source code.
-    Homepage: <http://handbrake.fr>.
-    It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueryParserUtility.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Parse a CLI Query
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.ApplicationServices.Utilities
 {
     using System;
-    using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.Interop.Model;
@@ -46,20 +48,20 @@
             #region Regular Expressions
 
             // Source
-            Match title = Regex.Match(input, @"-t ([0-9]*)");
-            Match chapters = Regex.Match(input, @"-c ([0-9-]*)");
+            Match title = Regex.Match(input, @"-t ([0-9]+)");
+            Match chapters = Regex.Match(input, @"-c ([0-9-]+)");
 
             // Output Settings
-            Match format = Regex.Match(input, @"-f ([a-zA-Z0-9]*)");
+            Match format = Regex.Match(input, @"-f ([a-zA-Z0-9]+)");
             Match grayscale = Regex.Match(input, @" -g");
             Match largerMp4 = Regex.Match(input, @" -4");
             Match ipodAtom = Regex.Match(input, @" -I");
 
             // Picture Settings Tab
-            Match width = Regex.Match(input, @"-w ([0-9]*)");
-            Match height = Regex.Match(input, @"-l ([0-9]*)");
-            Match maxWidth = Regex.Match(input, @"-X ([0-9]*)");
-            Match maxHeight = Regex.Match(input, @"-Y ([0-9]*)");
+            Match width = Regex.Match(input, @"-w ([0-9]+)");
+            Match height = Regex.Match(input, @"-l ([0-9]+)");
+            Match maxWidth = Regex.Match(input, @"-X ([0-9]+)");
+            Match maxHeight = Regex.Match(input, @"-Y ([0-9]+)");
             Match crop = Regex.Match(input, @"--crop ([0-9]*):([0-9]*):([0-9]*):([0-9]*)");
 
             Match looseAnamorphic = Regex.Match(input, @"--loose-anamorphic");
@@ -81,26 +83,23 @@
             Match detelecineValue = Regex.Match(input, @" --detelecine=\""([a-zA-Z0-9.:]*)\""");
 
             // Video Settings Tab
-            Match videoEncoder = Regex.Match(input, @"-e ([a-zA-Z0-9]*)");
-            Match videoFramerate = Regex.Match(input, @"-r ([0-9.]*)");
-            Match videoBitrate = Regex.Match(input, @"-b ([0-9]*)");
-            Match videoQuality = Regex.Match(input, @"-q ([0-9.]*)");
+            Match videoEncoder = Regex.Match(input, @"-e ([a-zA-Z0-9]+)");
+            Match videoFramerate = Regex.Match(input, @"-r ([0-9.]+)");
+            Match videoBitrate = Regex.Match(input, @"-b ([0-9]+)");
+            Match videoQuality = Regex.Match(input, @"-q ([0-9.]+)");
             Match twoPass = Regex.Match(input, @" -2");
             Match turboFirstPass = Regex.Match(input, @" -T");
             Match optimizeMP4 = Regex.Match(input, @" -O");
             Match pfr = Regex.Match(input, @" --pfr");
-            Match vfr = Regex.Match(input, @" --vfr");
             Match cfr = Regex.Match(input, @" --cfr");
 
             // Audio Settings Tab
-            Match noAudio = Regex.Match(input, @"-a none");
-            Match audioTracks = Regex.Match(input, @"-a ([0-9,]*)");
-            Match audioTrackMixes = Regex.Match(input, @"-6 ([0-9a-zA-Z,]*)");
-            Match audioEncoders = Regex.Match(input, @"-E ([a-zA-Z0-9+,:\*]*)");
-            Match audioBitrates = Regex.Match(input, @"-B ([0-9a-zA-Z,]*)"); // Auto = a-z
-            Match audioSampleRates = Regex.Match(input, @"-R ([0-9a-zA-Z.,]*)"); // Auto = a-z
-            Match drcValues = Regex.Match(input, @"-D ([0-9.,]*)");
-            Match gainValues = Regex.Match(input, @"--gain=([0-9.,-]*)");
+            Match audioTrackMixes = Regex.Match(input, @"-6 ([0-9a-zA-Z,]+)");
+            Match audioEncoders = Regex.Match(input, @"-E ([a-zA-Z0-9+,:\*]+)");
+            Match audioBitrates = Regex.Match(input, @"-B ([0-9a-zA-Z,]+)"); // Auto = a-z
+            Match audioSampleRates = Regex.Match(input, @"-R ([0-9a-zA-Z.,]+)"); // Auto = a-z
+            Match drcValues = Regex.Match(input, @"-D ([0-9.,]+)");
+            Match gainValues = Regex.Match(input, @"--gain=([0-9.,-]+)");
             Match fallbackEncoder = Regex.Match(input, @"--audio-fallback([a-zA-Z0-9:=\s ]*)");
             Match allowedPassthru = Regex.Match(input, @"--audio-copy-mask([a-zA-Z0-9:,=\s ]*)");
 
@@ -110,9 +109,11 @@
 
             // Advanced Tab
             Match advanced = Regex.Match(input, @"-x ([.,/a-zA-Z0-9=:-]*)");
-            Match x264Preset = Regex.Match(input, @"--x264-preset([=a-zA-Z0-9\s]*)");
-            Match x264Tune = Regex.Match(input, @"--x264-tune([=a-zA-Z0-9\s]*)");
-            Match x264Profile = Regex.Match(input, @"--x264-profile([=a-zA-Z0-9\s]*)");
+            Match x264Preset = Regex.Match(input, @"--x264-preset([=a-zA-Z0-9\s ]*)");
+            Match x264Tune = Regex.Match(input, @"--x264-tune([=,a-zA-Z0-9\s ]*)");
+            Match h264Profile = Regex.Match(input, @"--h264-profile([=a-zA-Z0-9\s ]*)");
+            Match x264Profile = Regex.Match(input, @"--x264-profile([=a-zA-Z0-9\s ]*)");
+            Match h264Level = Regex.Match(input, @"--h264-level([=a-zA-Z0-9.\s ]*)");
 
             #endregion
 
@@ -226,8 +227,21 @@
                     parsed.Decomb = Decomb.Default;
                     if (decombValue.Success)
                     {
-                        parsed.CustomDecomb = decombValue.ToString().Replace("--decomb=", string.Empty).Replace("\"", string.Empty).Trim();
-                        parsed.Decomb = parsed.CustomDecomb == "7:2:6:9:1:80" ? Decomb.Fast : Decomb.Custom;
+                        string value = decombValue.ToString().Replace("--decomb=", string.Empty).Replace("\"", string.Empty).Trim();
+
+                        if (value == "bob")
+                        {
+                            parsed.Decomb = Decomb.Bob;
+                        }
+                        else if (value == "fast")
+                        {
+                            parsed.Decomb = Decomb.Fast;
+                        }
+                        else
+                        {
+                            parsed.CustomDecomb = value;
+                            parsed.Decomb = parsed.CustomDecomb == "7:2:6:9:1:80" ? Decomb.Fast : Decomb.Custom;
+                        }
                     }
                 }
 
@@ -245,6 +259,9 @@
                         case "slower":
                             parsed.Deinterlace = Deinterlace.Slower;
                             break;
+                        case "bob":
+                            parsed.Deinterlace = Deinterlace.Bob;
+                            break;
                         default:
                             parsed.Deinterlace = Deinterlace.Custom;
                             parsed.CustomDeinterlace = deinterlace.ToString().Replace("--deinterlace=", string.Empty).Replace("\"", string.Empty).ToLower();
@@ -303,7 +320,7 @@
                 if (videoFramerate.Success)
                 {
                     double fps;
-                    double.TryParse(videoFramerate.Groups[1].ToString(), out fps);
+                    double.TryParse(videoFramerate.Groups[1].ToString(), NumberStyles.Any, CultureInfo.InvariantCulture, out fps);
                     parsed.Framerate = fps;
                 }
 
@@ -345,7 +362,6 @@
                 }
 
                 // Get the data from the regular expression results
-                string[] trackData = null;
                 string[] trackMixes = null;
                 string[] trackEncoders = null;
                 string[] trackBitrates = null;
@@ -353,8 +369,6 @@
                 string[] trackDRCvalues = null;
                 string[] trackGainValues = null;
 
-                if (audioTracks.Success)
-                    trackData = audioTracks.ToString().Replace("-a ", string.Empty).Split(',');
                 if (audioTrackMixes.Success)
                     trackMixes = audioTrackMixes.ToString().Replace("-6 ", string.Empty).Split(',');
                 if (audioEncoders.Success)
@@ -373,9 +387,6 @@
                 for (int x = 0; x < encoderCount; x++)
                 {
                     AudioTrack track = new AudioTrack();
-                    //if (trackData != null)
-                    //    if (trackData.Length >= (x + 1)) // Audio Track
-                    //        track.ScannedTrack = trackData[x].Trim();
 
                     if (trackMixes != null)
                         if (trackMixes.Length >= (x + 1)) // Audio Mix
@@ -438,17 +449,35 @@
                     parsed.AdvancedEncoderOptions = advanced.ToString().Replace("-x ", string.Empty);
 
                 if (x264Preset.Success)
-                    parsed.x264Preset =
+                    parsed.X264Preset =
                         Converters.Getx264PresetFromCli(x264Preset.ToString().Replace("--x264-preset", string.Empty).Replace("=", string.Empty).Trim());
 
+                if (h264Profile.Success)
+                    parsed.H264Profile =
+                        Converters.Getx264ProfileFromCli(h264Profile.ToString().Replace("--h264-profile", string.Empty).Replace("=", string.Empty).Trim());
+
                 if (x264Profile.Success)
-                    parsed.x264Profile =
-                        Converters.Getx264ProfileFromCli(x264Profile.ToString().Replace("--x264-profile", string.Empty).Replace("=", string.Empty).Trim());
+                    parsed.H264Profile =
+                       Converters.Getx264ProfileFromCli(x264Profile.ToString().Replace("--x264-profile", string.Empty).Replace("=", string.Empty).Trim());
+
+                if (h264Level.Success)
+                    parsed.H264Level =
+                        h264Level.ToString().Replace("--h264-level", string.Empty).Replace("=", string.Empty).Trim();
 
                 if (x264Tune.Success)
-                    parsed.X264Tune =
-                        Converters.Getx264TuneFromCli(x264Tune.ToString().Replace("--x264-tune", string.Empty).Replace("=", string.Empty).Trim());
+                {
+                    string tuneOptions =
+                        x264Tune.ToString().Replace("--x264-tune", string.Empty).Replace("=", string.Empty).Trim();
 
+                    parsed.FastDecode = tuneOptions.Contains("fastdecode");
+
+                    // Remove these options. They are not in the dropdown.
+                    tuneOptions = tuneOptions.Replace("fastdecode", string.Empty).Replace(
+                        ",", string.Empty);
+
+                    parsed.X264Tune = Converters.Getx264TuneFromCli(tuneOptions);
+                }
+                  
                 #endregion
             }
             catch (Exception exc)

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs Added

@@ -0,0 +1,60 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SystemInfo.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The System Information.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System.Windows.Forms;
+
+    using Microsoft.Win32;
+
+    /// <summary>
+    /// The System Information.
+    /// </summary>
+    public class SystemInfo
+    {
+        /// <summary>
+        /// Gets the total physical ram in a system
+        /// </summary>
+        /// <returns>The total memory in the system</returns>
+        public static ulong TotalPhysicalMemory
+        {
+            get
+            {
+                Win32.MEMORYSTATUSEX memStat = new Win32.MEMORYSTATUSEX { dwLength = 64 };
+                Win32.GlobalMemoryStatusEx(ref memStat);
+
+                ulong value = memStat.ullTotalPhys / 1024 / 1024;
+                return value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of CPU Cores
+        /// </summary>
+        /// <returns>Object</returns>
+        public static object GetCpuCount
+        {
+            get
+            {
+                RegistryKey regKey = Registry.LocalMachine;
+                regKey = regKey.OpenSubKey("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");
+                return regKey == null ? 0 : regKey.GetValue("ProcessorNameString");
+            }
+        }
+
+        /// <summary>
+        /// Gets the System screen size information.
+        /// </summary>
+        /// <returns>System.Windows.Forms.Scree</returns>
+        public static Screen ScreenBounds
+        {
+            get { return Screen.PrimaryScreen; }
+        }
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs Added

@@ -0,0 +1,68 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VersionHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Version Utility
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System;
+    using System.Reflection;
+
+    /// <summary>
+    /// Version Utility
+    /// </summary>
+    public class VersionHelper
+    {
+        /// <summary>
+        /// The get build.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="int"/>.
+        /// </returns>
+        public static string GetVersion()
+        {
+            Version version = Assembly.GetEntryAssembly().GetName().Version;
+            return IsNightly() ? string.Format("svn{0} (Nightly Build)", version.Revision) : string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
+        }
+
+        /// <summary>
+        /// The is nightly.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        public static bool IsNightly()
+        {
+            Version version = Assembly.GetEntryAssembly().GetName().Version;
+
+            // The MSBuild.xml script sets 0.0.0 for nightly builds.
+            return version.Major == 0 && version.Minor == 0 && version.Build == 0;
+        }
+
+        /// <summary>
+        /// The get platform bitness.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        public static string GetPlatformBitnessVersion()
+        {
+            return System.Environment.Is64BitProcess ? "64bit Version" : "32bit Version";
+        }
+
+        /// <summary>
+        /// Is a 64 bit app.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        public static bool Is64Bit()
+        {
+            return System.Environment.Is64BitProcess;
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs Added

@@ -0,0 +1,198 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Win32.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Win32 API calls
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Windows.Threading;
+
+    /// <summary>
+    /// Win32 API calls
+    /// </summary>
+    public class Win32
+    {
+        /// <summary>
+        /// Used to force UI Thread.
+        /// </summary>
+        private static Action<Action> executor = action => action();
+
+        /// <summary>
+        /// Set the Forground Window
+        /// </summary>
+        /// <param name="hWnd">
+        /// The h wnd.
+        /// </param>
+        /// <returns>
+        /// A Boolean true when complete.
+        /// </returns>
+        [DllImport("user32.dll")]
+        public static extern bool SetForegroundWindow(int hWnd);
+
+        /// <summary>
+        /// Lock the workstation
+        /// </summary>
+        [DllImport("user32.dll")]
+        public static extern void LockWorkStation();
+
+        /// <summary>
+        /// Exit Windows
+        /// </summary>
+        /// <param name="uFlags">
+        /// The u flags.
+        /// </param>
+        /// <param name="dwReason">
+        /// The dw reason.
+        /// </param>
+        /// <returns>
+        /// an integer
+        /// </returns>
+        [DllImport("user32.dll")]
+        public static extern int ExitWindowsEx(int uFlags, int dwReason);
+
+        /// <summary>
+        /// Memory Status EX Struct
+        /// </summary>
+        public struct MEMORYSTATUSEX
+        {
+            public int dwLength;
+
+            public int dwMemoryLoad;
+
+            public ulong ullTotalPhys;
+
+            public ulong ullAvailPhys;
+
+            public ulong ullTotalPageFile;
+
+            public ulong ullAvailPageFile;
+
+            public ulong ullTotalVirtual;
+
+            public ulong ullAvailVirtual;
+
+            public ulong ullAvailExtendedVirtual;
+        }
+
+        /// <summary>
+        /// Get the System Memory information
+        /// </summary>
+        /// <param name="lpBuffer">
+        /// The lp buffer.
+        /// </param>
+        /// <returns>
+        /// A boolean.
+        /// </returns>
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);
+
+        /// <summary>
+        /// Generate a Console Ctrl Event
+        /// </summary>
+        /// <param name="sigevent">
+        /// The sigevent.
+        /// </param>
+        /// <param name="dwProcessGroupId">
+        /// The dw process group id.
+        /// </param>
+        /// <returns>
+        /// Bool true is sucess
+        /// </returns>
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool GenerateConsoleCtrlEvent(ConsoleCtrlEvent sigevent, int dwProcessGroupId);
+
+        /// <summary>
+        /// Console Ctrl Event
+        /// </summary>
+        public enum ConsoleCtrlEvent
+        {
+            /// <summary>
+            /// Ctrl - C
+            /// </summary>
+            CTRL_C = 0,
+
+            /// <summary>
+            /// Ctrl - Break
+            /// </summary>
+            CTRL_BREAK = 1,
+
+            /// <summary>
+            /// Ctrl - Close
+            /// </summary>
+            CTRL_CLOSE = 2,
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+
+        /// <summary>
+        /// Execution State
+        /// </summary>
+        [Flags]
+        public enum EXECUTION_STATE : uint
+        {
+            ES_SYSTEM_REQUIRED = 0x00000001,
+
+            ES_CONTINUOUS = 0x80000000,
+
+            ES_AWAYMODE_REQUIRED = 0x00000040
+        }
+
+        /// <summary>
+        /// Initializes static members of the <see cref="Win32"/> class.
+        /// </summary>
+        static Win32()
+        {
+            InitializeWithDispatcher();
+        }
+
+        /// <summary>
+        /// Prevent the system from sleeping
+        /// </summary>
+        public static void PreventSleep()
+        {
+            executor(
+                () => SetThreadExecutionState(
+                    EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED
+                    | EXECUTION_STATE.ES_AWAYMODE_REQUIRED));
+        }
+
+        /// <summary>
+        ///  Allow the system to sleep.
+        /// </summary>
+        public static void AllowSleep()
+        {
+            executor(() => SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS));
+        }
+
+        /// <summary>
+        ///   Initializes the framework using the current dispatcher.
+        /// </summary>
+        public static void InitializeWithDispatcher()
+        {
+            var dispatcher = Dispatcher.CurrentDispatcher;
+
+            SetUIThreadMarshaller(action =>
+            {
+                if (dispatcher.CheckAccess())
+                    action();
+                else dispatcher.Invoke(action);
+            });
+        }
+
+        /// <summary>
+        /// Sets a custom UI thread marshaller.
+        /// </summary>
+        /// <param name="marshaller">The marshaller.</param>
+        public static void SetUIThreadMarshaller(Action<Action> marshaller)
+        {
+            executor = marshaller;
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs Added

@@ -0,0 +1,81 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Win7.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A class implimenting Windows 7 Specific features
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Utilities
+{
+    using System.Windows.Shell;
+
+
+    /// <summary>
+    /// A class implementing Windows 7 Specific features
+    /// </summary>
+    public class Win7
+    {
+        /// <summary>
+        /// The Windows Taskbar
+        /// </summary>
+        public static TaskbarItemInfo WindowsTaskbar;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Win7"/> class.
+        /// </summary>
+        public Win7()
+        {
+            if (WindowsTaskbar == null)
+                WindowsTaskbar = new TaskbarItemInfo();
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether is windows seven.
+        /// </summary>
+        public bool IsWindowsSeven
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// The get task bar.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="TaskbarItemInfo"/>.
+        /// </returns>
+        public TaskbarItemInfo GetTaskBar()
+        {
+            return WindowsTaskbar;
+        }
+
+        /// <summary>
+        /// Set the Task Bar Percentage.
+        /// </summary>
+        /// <param name="percentage">
+        /// The percentage.
+        /// </param>
+        public void SetTaskBarProgress(int percentage)
+        {
+            // Update the taskbar progress indicator.  The normal state shows a green progress bar.
+            Caliburn.Micro.Execute.OnUIThread(
+                () =>
+                {
+                    WindowsTaskbar.ProgressState = TaskbarItemProgressState.Normal;
+                    WindowsTaskbar.ProgressValue = (double)percentage / 100;
+                });
+        }
+
+        /// <summary>
+        /// Disable Task Bar Progress
+        /// </summary>
+        public void SetTaskBarProgressToNoProgress()
+        {
+            Caliburn.Micro.Execute.OnUIThread(() => WindowsTaskbar.ProgressState = TaskbarItemProgressState.None);
+        }
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs Changed

@@ -4,26 +4,28 @@
 // </copyright>
 // <summary>
 //   Defines the Converters type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-using HandBrake.Interop.Model;
-
-namespace HandBrake.Interop
-{
-	using System;
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop
+{
+	using System;
 	using System.Collections.Generic;
 
 	using HandBrake.Interop.HbLib;
 	using HandBrake.Interop.Model.Encoding;
 	using HandBrake.Interop.SourceData;
+	using HandBrake.Interop.Model;
 
+	/// <summary>
+	/// Converters for various encoding values.
+	/// </summary>
 	public static class Converters
 	{
 		/// <summary>
 		/// Video Frame Rates
 		/// </summary>
-		private static Dictionary<double, int> vrates = new Dictionary<double, int>
+		private static readonly Dictionary<double, int> VideoRates = new Dictionary<double, int>
 		{
 			{5, 5400000},
 			{10, 2700000},
@@ -32,7 +34,11 @@
 			{23.976, 1126125},
 			{24, 1125000},
 			{25, 1080000},
-			{29.97, 900900}
+			{29.97, 900900},
+			{30, 900000},
+			{50, 540000},
+			{59.94, 450450},
+			{60, 450000}
 		};
 
 		/// <summary>
@@ -49,83 +55,12 @@
 		/// </exception>
 		public static int FramerateToVrate(double framerate)
 		{
-			if (!vrates.ContainsKey(framerate))
+			if (!VideoRates.ContainsKey(framerate))
 			{
 				throw new ArgumentException("Framerate not recognized.", "framerate");
 			}
 
-			return vrates[framerate];
-		}
-
-		/// <summary>
-		/// Convert a Mixdown object to HandBrakes native mixdown constant.
-		/// </summary>
-		/// <param name="mixdown">
-		/// The mixdown.
-		/// </param>
-		/// <returns>
-		/// NativeContstant that represents the mixdown.
-		/// </returns>
-		/// <exception cref="ArgumentException">
-		/// Thrown for an invalid mixodown.
-		/// </exception>
-		public static int MixdownToNative(Mixdown mixdown)
-		{
-			if (mixdown == Mixdown.Auto)
-			{
-				throw new ArgumentException("Cannot convert Auto to native.");
-			}
-
-			switch (mixdown)
-			{
-				case Mixdown.None:
-					return NativeConstants.HB_AMIXDOWN_NONE;
-				case Mixdown.DolbyProLogicII:
-					return NativeConstants.HB_AMIXDOWN_DOLBYPLII;
-				case Mixdown.DolbySurround:
-					return NativeConstants.HB_AMIXDOWN_DOLBY;
-				case Mixdown.Mono:
-					return NativeConstants.HB_AMIXDOWN_MONO;
-				case Mixdown.SixChannelDiscrete:
-					return NativeConstants.HB_AMIXDOWN_6CH;
-				case Mixdown.Stereo:
-					return NativeConstants.HB_AMIXDOWN_STEREO;
-			}
-
-			return 0;
-		}
-
-		/// <summary>
-		/// Convert an native internal handbrake mixdown to a local mixdown enum.
-		/// </summary>
-		/// <param name="mixdown">
-		/// The mixdown.
-		/// </param>
-		/// <returns>
-		/// A mixdown object.
-		/// </returns>
-		/// <exception cref="ArgumentException">
-		/// thrown when mixdown is invalid.
-		/// </exception>
-		public static Mixdown NativeToMixdown(int mixdown)
-		{
-			switch (mixdown)
-			{
-				case NativeConstants.HB_AMIXDOWN_NONE:
-					return Mixdown.None;
-				case NativeConstants.HB_AMIXDOWN_MONO:
-					return Mixdown.Mono;
-				case NativeConstants.HB_AMIXDOWN_STEREO:
-					return Mixdown.Stereo;
-				case NativeConstants.HB_AMIXDOWN_DOLBY:
-					return Mixdown.DolbySurround;
-				case NativeConstants.HB_AMIXDOWN_DOLBYPLII:
-					return Mixdown.DolbyProLogicII;
-				case NativeConstants.HB_AMIXDOWN_6CH:
-					return Mixdown.SixChannelDiscrete;
-			}
-
-			throw new ArgumentException("Unrecognized mixdown: " + mixdown, "mixdown");
+			return VideoRates[framerate];
 		}
 
 		/// <summary>
@@ -159,6 +94,8 @@
 					return NativeConstants.HB_ACODEC_DCA_HD_PASS;
 				case AudioEncoder.Vorbis:
 					return NativeConstants.HB_ACODEC_VORBIS;
+				case AudioEncoder.ffflac:
+					return NativeConstants.HB_ACODEC_FFFLAC;
 			}
 
 			return 0;
@@ -191,85 +128,107 @@
 				case NativeConstants.HB_ACODEC_CA_AAC:
 				case NativeConstants.HB_ACODEC_CA_HAAC:
 					return AudioCodec.Aac;
+				case NativeConstants.HB_ACODEC_FFFLAC:
+					return AudioCodec.Flac;
 				default:
-					return AudioCodec.Other;
-			}
-		}
-
-		/// <summary>
-		/// Converts a native HB encoder structure to an Encoder model.
-		/// </summary>
-		/// <param name="encoder">The structure to convert.</param>
-		/// <returns>The converted model.</returns>
-		public static HBVideoEncoder NativeToVideoEncoder(hb_encoder_s encoder)
-		{
-			var result = new HBVideoEncoder
-			{
-				Id = encoder.encoder,
-				ShortName = encoder.short_name,
-				DisplayName = encoder.human_readable_name,
-				CompatibleContainers = Container.None
-			};
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MKV) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mkv;
-			}
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MP4) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mp4;
-			}
-
-			return result;
-		}
-
-		/// <summary>
-		/// Converts a native HB encoder structure to an Encoder model.
-		/// </summary>
-		/// <param name="encoder">The structure to convert.</param>
-		/// <returns>The converted model.</returns>
-		public static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
-		{
-			var result = new HBAudioEncoder
-				{
-					Id = encoder.encoder,
-					ShortName = encoder.short_name,
-					DisplayName = encoder.human_readable_name,
-					CompatibleContainers = Container.None
-				};
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MKV) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mkv;
-			}
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MP4) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mp4;
-			}
-
-			result.QualityLimits = Encoders.GetAudioQualityLimits(encoder.encoder);
-			result.DefaultQuality = HBFunctions.hb_get_default_audio_quality((uint)encoder.encoder);
-			result.CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.encoder);
-			result.DefaultCompression = HBFunctions.hb_get_default_audio_compression((uint) encoder.encoder);
-
-			return result;
-		}
-
-		/// <summary>
-		/// Converts a native HB mixdown structure to a Mixdown model.
-		/// </summary>
-		/// <param name="mixdown">The structure to convert.</param>
-		/// <returns>The converted model.</returns>
-		public static HBMixdown NativeToMixdown(hb_mixdown_s mixdown)
-		{
-			return new HBMixdown
-			    {
-					Id = mixdown.amixdown,
-					ShortName = mixdown.short_name,
-					DisplayName = mixdown.human_readable_name
-			    };
-		}
-	}
-}
+					return AudioCodec.Other;
+			}
+		}
+
+		/// <summary>
+		/// Converts a native HB encoder structure to an Encoder model.
+		/// </summary>
+		/// <param name="encoder">The structure to convert.</param>
+		/// <returns>The converted model.</returns>
+		public static HBVideoEncoder NativeToVideoEncoder(hb_encoder_s encoder)
+		{
+			var result = new HBVideoEncoder
+			{
+				Id = encoder.encoder,
+				ShortName = encoder.short_name,
+				DisplayName = encoder.human_readable_name,
+				CompatibleContainers = Container.None
+			};
+
+			if ((encoder.muxers & NativeConstants.HB_MUX_MKV) > 0)
+			{
+				result.CompatibleContainers = result.CompatibleContainers | Container.Mkv;
+			}
+
+			if ((encoder.muxers & NativeConstants.HB_MUX_MP4) > 0)
+			{
+				result.CompatibleContainers = result.CompatibleContainers | Container.Mp4;
+			}
+
+			return result;
+		}
+
+		/// <summary>
+		/// Converts a native HB encoder structure to an Encoder model.
+		/// </summary>
+		/// <param name="encoder">The structure to convert.</param>
+		/// <returns>The converted model.</returns>
+		public static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
+		{
+			var result = new HBAudioEncoder
+				{
+					Id = encoder.encoder,
+					ShortName = encoder.short_name,
+					DisplayName = encoder.human_readable_name,
+					CompatibleContainers = Container.None
+				};
+
+			if ((encoder.muxers & NativeConstants.HB_MUX_MKV) > 0)
+			{
+				result.CompatibleContainers = result.CompatibleContainers | Container.Mkv;
+			}
+
+			if ((encoder.muxers & NativeConstants.HB_MUX_MP4) > 0)
+			{
+				result.CompatibleContainers = result.CompatibleContainers | Container.Mp4;
+			}
+
+			result.QualityLimits = Encoders.GetAudioQualityLimits(encoder.encoder);
+			result.DefaultQuality = HBFunctions.hb_get_default_audio_quality((uint)encoder.encoder);
+			result.CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.encoder);
+			result.DefaultCompression = HBFunctions.hb_get_default_audio_compression((uint) encoder.encoder);
+
+			return result;
+		}
+
+		/// <summary>
+		/// Converts a native HB mixdown structure to a Mixdown model.
+		/// </summary>
+		/// <param name="mixdown">The structure to convert.</param>
+		/// <returns>The converted model.</returns>
+		public static HBMixdown NativeToMixdown(hb_mixdown_s mixdown)
+		{
+			return new HBMixdown
+				{
+					Id = mixdown.amixdown,
+					ShortName = mixdown.short_name,
+					DisplayName = mixdown.human_readable_name
+				};
+		}
+
+		/// <summary>
+		/// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
+		/// </summary>
+		/// <param name="pts">The PTS to convert.</param>
+		/// <returns>The timespan for it.</returns>
+		public static TimeSpan PtsToTimeSpan(ulong pts)
+		{
+			return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
+		}
+
+		/// <summary>
+		/// Converts the PTS amount to seconds.
+		/// </summary>
+		/// <param name="pts">The PTS to convert.</param>
+		/// <returns>The corresponding number of seconds.</returns>
+		public static double PtsToSeconds(ulong pts)
+		{
+			return (double)pts / 90000;
+		}
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeCompletedEventArgs.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeProgressEventArgs.cs Added

@@ -0,0 +1,44 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the EncodeProgressEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.EventArgs
+{
+    using System;
+
+    /// <summary>s
+    /// Encode Progress Event Args
+    /// </summary>
+    public class EncodeProgressEventArgs : EventArgs
+	{
+	    /// <summary>
+	    /// Gets or sets FractionComplete.
+	    /// </summary>
+	    public float FractionComplete { get; set; }
+
+	    /// <summary>
+	    /// Gets or sets CurrentFrameRate.
+	    /// </summary>
+	    public float CurrentFrameRate { get; set; }
+
+	    /// <summary>
+	    /// Gets or sets AverageFrameRate.
+	    /// </summary>
+	    public float AverageFrameRate { get; set; }
+
+	    /// <summary>
+	    /// Gets or sets EstimatedTimeLeft.
+	    /// </summary>
+	    public TimeSpan EstimatedTimeLeft { get; set; }
+
+		/// <summary>
+		/// Gets or sets the current encoding pass. (-1: subtitle scan, 1: first pass, 2: second pass)
+		/// </summary>
+		public int Pass { get; set; }
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/MessageLoggedEventArgs.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/ScanProgressEventArgs.cs Added

@@ -0,0 +1,44 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the ScanProgressEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.EventArgs
+{
+	using System;
+
+	/// <summary>
+	/// The Scan Progress Event Args
+	/// </summary>
+	public class ScanProgressEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets or sets the total progress fraction for the scan.
+		/// </summary>
+		public float Progress { get; set; }
+
+		/// <summary>
+		/// Gets or sets the current preview being processed on the scan.
+		/// </summary>
+		public int CurrentPreview { get; set; }
+
+		/// <summary>
+		/// Gets or sets the total number of previews to process.
+		/// </summary>
+		public int Previews { get; set; }
+
+		/// <summary>
+		/// Gets or sets the current title being processed on the scan.
+		/// </summary>
+		public int CurrentTitle { get; set; }
+
+		/// <summary>
+		/// Gets or sets the total number of titles to process.
+		/// </summary>
+		public int Titles { get; set; }
+	}
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs Changed

@@ -11,12 +11,15 @@
 {
 	using System;
 	using System.Collections.Generic;
+	using System.Globalization;
 	using System.IO;
 	using System.Linq;
 	using System.Runtime.InteropServices;
 	using System.Windows.Media.Imaging;
 
+	using HandBrake.Interop.EventArgs;
 	using HandBrake.Interop.HbLib;
+	using HandBrake.Interop.Interfaces;
 	using HandBrake.Interop.Model;
 	using HandBrake.Interop.Model.Encoding;
 	using HandBrake.Interop.SourceData;
@@ -24,7 +27,7 @@
 	/// <summary>
 	/// A wrapper for a HandBrake instance.
 	/// </summary>
-	public class HandBrakeInstance : IDisposable
+	public class HandBrakeInstance : IHandBrakeInstance, IDisposable
 	{
 		/// <summary>
 		/// The modulus for picture size when auto-sizing dimensions.
@@ -47,9 +50,14 @@
 		private const string TurboX264Opts = "ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
 
 		/// <summary>
-		/// Default value to give as a minimum duration when scanning.
+		/// Lock for creation of handbrake instances;
 		/// </summary>
-		private const ulong DefaultMinDuration = 900000;
+		private static object instanceCreationLock = new object();
+
+		/// <summary>
+		/// True if a handbrake instance has been created.
+		/// </summary>
+		private static bool globalInitialized;
 
 		/// <summary>
 		/// The native handle to the HandBrake instance.
@@ -102,6 +110,11 @@
 		private List<IntPtr> encodeAllocatedMemory;
 
 		/// <summary>
+		/// A value indicating whether this object has been disposed or not.
+		/// </summary>
+		private bool disposed;
+
+		/// <summary>
 		/// Finalizes an instance of the HandBrakeInstance class.
 		/// </summary>
 		~HandBrakeInstance()
@@ -117,7 +130,7 @@
 		/// <summary>
 		/// Fires when a scan has completed.
 		/// </summary>
-		public event EventHandler<EventArgs> ScanCompleted;
+		public event EventHandler<System.EventArgs> ScanCompleted;
 
 		/// <summary>
 		/// Fires for progress updates when encoding.
@@ -163,19 +176,19 @@
 		}
 
 		/// <summary>
-		/// Call before app shutdown. Performs global cleanup.
-		/// </summary>
-		public static void DisposeGlobal()
-		{
-			HBFunctions.hb_global_close();
-		}
-
-		/// <summary>
 		/// Initializes this instance.
 		/// </summary>
 		/// <param name="verbosity">The code for the logging verbosity to use.</param>
 		public void Initialize(int verbosity)
 		{
+			lock (instanceCreationLock)
+			{
+				if (!globalInitialized)
+				{
+					globalInitialized = true;
+				}
+			}
+
 			HandBrakeUtils.RegisterLogger();
 			this.hbHandle = HBFunctions.hb_init(verbosity, update_check: 0);
 		}
@@ -185,9 +198,15 @@
 		/// </summary>
 		/// <param name="path">The path to the video to scan.</param>
 		/// <param name="previewCount">The number of preview images to make.</param>
+		/// <param name="minDuration">The minimum duration of a title to show up on the scan.</param>
+		public void StartScan(string path, int previewCount, TimeSpan minDuration)
+		{
+			this.StartScan(path, previewCount, minDuration, 0);
+		}
+
 		public void StartScan(string path, int previewCount)
 		{
-			this.StartScan(path, previewCount, 0);
+			this.StartScan(path, previewCount, TimeSpan.FromSeconds(10), 0);
 		}
 
 		/// <summary>
@@ -198,17 +217,7 @@
 		/// <param name="titleIndex">The title index to scan (1-based, 0 for all titles).</param>
 		public void StartScan(string path, int previewCount, int titleIndex)
 		{
-			this.previewCount = previewCount;
-			HBFunctions.hb_scan(this.hbHandle, path, titleIndex, previewCount, 1, DefaultMinDuration);
-			this.scanPollTimer = new System.Timers.Timer();
-			this.scanPollTimer.Interval = ScanPollIntervalMs;
-
-			// Lambda notation used to make sure we can view any JIT exceptions the method throws
-			this.scanPollTimer.Elapsed += (o, e) =>
-			{
-				this.PollScanProgress();
-			};
-			this.scanPollTimer.Start();
+			this.StartScan(path, previewCount, TimeSpan.Zero, titleIndex);
 		}
 
 		/// <summary>
@@ -230,31 +239,29 @@
 		/// <returns>An image with the requested preview.</returns>
 		public BitmapImage GetPreview(EncodeJob job, int previewNumber)
 		{
-			hb_title_s title = this.GetOriginalTitle(job.Title);
+			IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(job.Title));
+			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(nativeJobPtr);
 
-			hb_job_s nativeJob = InteropUtilities.ReadStructure<hb_job_s>(title.job);
 			List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
 			
 			// There are some problems with getting previews with deinterlacing. Disabling for now.
 			nativeJob.deinterlace = 0;
 
-			// Create a new job pointer from our modified job object
-			IntPtr newJob = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_job_s)));
-			Marshal.StructureToPtr(nativeJob, newJob, false);
-			allocatedMemory.Add(newJob);
-
 			int outputWidth = nativeJob.width;
 			int outputHeight = nativeJob.height;
 			int imageBufferSize = outputWidth * outputHeight * 4;
 			IntPtr nativeBuffer = Marshal.AllocHGlobal(imageBufferSize);
 			allocatedMemory.Add(nativeBuffer);
-			HBFunctions.hb_set_job(this.hbHandle, job.Title, ref nativeJob);
-			HBFunctions.hb_get_preview_by_index(this.hbHandle, job.Title, previewNumber, nativeBuffer);
+			HBFunctions.hb_get_preview(this.hbHandle, ref nativeJob, previewNumber, nativeBuffer);
+
+			// We've used the job to get the preview. Clean up the job.
+			InteropUtilities.CloseJob(nativeJobPtr);
 
 			// Copy the filled image buffer to a managed array.
 			byte[] managedBuffer = new byte[imageBufferSize];
 			Marshal.Copy(nativeBuffer, managedBuffer, 0, imageBufferSize);
 
+			// We've copied the data out of unmanaged memory. Clean up that memory now.
 			InteropUtilities.FreeMemory(allocatedMemory);
 
 			var bitmap = new System.Drawing.Bitmap(outputWidth, outputHeight);
@@ -398,30 +405,13 @@
 		/// for calculating bitrate when the target size would be wrong.</param>
 		public void StartEncode(EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds)
 		{
+			EncodingProfile profile = job.EncodingProfile;
 			this.currentJob = job;
-			hb_job_s nativeJob = InteropUtilities.ReadStructure<hb_job_s>(this.GetOriginalTitle(job.Title).job);
-			this.encodeAllocatedMemory = this.ApplyJob(ref nativeJob, job, preview, previewNumber, previewSeconds, overallSelectedLengthSeconds);
 
-			if (!preview && job.EncodingProfile.IncludeChapterMarkers)
-			{
-				Title title = this.GetTitle(job.Title);
-				int numChapters = title.Chapters.Count;
+			IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(job.Title));
+			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(nativeJobPtr);
 
-				if (job.UseDefaultChapterNames)
-				{
-					for (int i = 0; i < numChapters; i++)
-					{
-						HBFunctions.hb_set_chapter_name(this.hbHandle, job.Title, i + 1, "Chapter " + (i + 1));
-					}
-				}
-				else
-				{
-					for (int i = 0; i < numChapters; i++)
-					{
-						HBFunctions.hb_set_chapter_name(this.hbHandle, job.Title, i + 1, job.CustomChapterNames[i]);
-					}
-				}
-			}
+			this.encodeAllocatedMemory = this.ApplyJob(ref nativeJob, job, preview, previewNumber, previewSeconds, overallSelectedLengthSeconds);
 
 			this.subtitleScan = false;
 			if (job.Subtitles.SourceSubtitles != null)
@@ -436,28 +426,34 @@
 				}
 			}
 
-			string x264Options = job.EncodingProfile.X264Options ?? string.Empty;
+			string x264Options = profile.X264Options ?? string.Empty;
 			IntPtr originalX264Options = Marshal.StringToHGlobalAnsi(x264Options);
 			this.encodeAllocatedMemory.Add(originalX264Options);
 
-			if (!string.IsNullOrEmpty(job.EncodingProfile.X264Profile))
+			if (!string.IsNullOrEmpty(profile.X264Profile))
 			{
-				nativeJob.x264_profile = Marshal.StringToHGlobalAnsi(job.EncodingProfile.X264Profile);
-				this.encodeAllocatedMemory.Add(nativeJob.x264_profile);
+				nativeJob.h264_profile = Marshal.StringToHGlobalAnsi(profile.X264Profile);
+				this.encodeAllocatedMemory.Add(nativeJob.h264_profile);
 			}
 
-			if (!string.IsNullOrEmpty(job.EncodingProfile.X264Preset))
+			if (!string.IsNullOrEmpty(profile.X264Preset))
 			{
-				nativeJob.x264_preset = Marshal.StringToHGlobalAnsi(job.EncodingProfile.X264Preset);
+				nativeJob.x264_preset = Marshal.StringToHGlobalAnsi(profile.X264Preset);
 				this.encodeAllocatedMemory.Add(nativeJob.x264_preset);
 			}
 
-			if (!string.IsNullOrEmpty(job.EncodingProfile.X264Tune))
+			if (profile.X264Tunes != null && profile.X264Tunes.Count > 0)
 			{
-				nativeJob.x264_tune = Marshal.StringToHGlobalAnsi(job.EncodingProfile.X264Tune);
+				nativeJob.x264_tune = Marshal.StringToHGlobalAnsi(string.Join(",", profile.X264Tunes));
 				this.encodeAllocatedMemory.Add(nativeJob.x264_tune);
 			}
 
+			if (!string.IsNullOrEmpty(job.EncodingProfile.H264Level))
+			{
+				nativeJob.h264_level = Marshal.StringToHGlobalAnsi(job.EncodingProfile.H264Level);
+				this.encodeAllocatedMemory.Add(nativeJob.h264_level);
+			}
+
 			if (this.subtitleScan)
 			{
 				// If we need to scan subtitles, enqueue a pre-processing job to do that.
@@ -510,6 +506,9 @@
 
 			HBFunctions.hb_start(this.hbHandle);
 
+			// Should be safe to clean up the job we started with; a copy is in the queue now.
+			InteropUtilities.CloseJob(nativeJobPtr);
+
 			this.encodePollTimer = new System.Timers.Timer();
 			this.encodePollTimer.Interval = EncodePollIntervalMs;
 
@@ -568,9 +567,10 @@
 		/// <param name="parHeight">The pixel aspect Y number.</param>
 		public void GetSize(EncodeJob job, out int width, out int height, out int parWidth, out int parHeight)
 		{
+			Title title = this.GetTitle(job.Title);
+
 			if (job.EncodingProfile.Anamorphic == Anamorphic.None)
 			{
-				Title title = this.GetTitle(job.Title);
 				Size storageDimensions = CalculateNonAnamorphicOutput(job.EncodingProfile, title);
 
 				width = storageDimensions.Width;
@@ -582,28 +582,34 @@
 				return;
 			}
 
-			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(this.GetOriginalTitle(job.Title).job);
-			List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
+			IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(title));
+			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(nativeJobPtr);
 
-			int refWidth = 0;
-			int refHeight = 0;
-			int refParWidth = 0;
-			int refParHeight = 0;
-			HBFunctions.hb_set_job(this.hbHandle, job.Title, ref nativeJob);
-			HBFunctions.hb_set_anamorphic_size_by_index(this.hbHandle, job.Title, ref refWidth, ref refHeight, ref refParWidth, ref refParHeight);
+			List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
 			InteropUtilities.FreeMemory(allocatedMemory);
 
-			width = refWidth;
-			height = refHeight;
-			parWidth = refParWidth;
-			parHeight = refParHeight;
+			InteropUtilities.CloseJob(nativeJobPtr);
+
+			// During the ApplyJob call, it modified nativeJob to have the correct width, height and PAR.
+			// We use those for the size.
+			width = nativeJob.width;
+			height = nativeJob.height;
+			parWidth = nativeJob.anamorphic.par_width;
+			parHeight = nativeJob.anamorphic.par_height;
 		}
 
+
+
 		/// <summary>
 		/// Frees any resources associated with this object.
 		/// </summary>
 		public void Dispose()
 		{
+			if (this.disposed)
+			{
+				return;
+			}
+
 			this.Dispose(true);
 			GC.SuppressFinalize(this);
 		}
@@ -624,6 +630,8 @@
 			Marshal.WriteIntPtr(handlePtr, this.hbHandle);
 			HBFunctions.hb_close(handlePtr);
 			Marshal.FreeHGlobal(handlePtr);
+
+			this.disposed = true;
 		}
 
 		/// <summary>
@@ -641,13 +649,17 @@
 			int height = profile.Height;
 
 			Cropping crop;
-			if (profile.CustomCropping)
+			switch (profile.CroppingType)
 			{
-				crop = profile.Cropping;
-			}
-			else
-			{
-				crop = title.AutoCropDimensions;
+				case CroppingType.Automatic:
+					crop = title.AutoCropDimensions;
+					break;
+				case CroppingType.Custom:
+					crop = profile.Cropping;
+					break;
+				default:
+					crop = new Cropping();
+					break;
 			}
 
 			sourceWidth -= crop.Left;
@@ -721,6 +733,28 @@
 		}
 
 		/// <summary>
+		/// Starts a scan of the given path.
+		/// </summary>
+		/// <param name="path">The path of the video to scan.</param>
+		/// <param name="previewCount">The number of previews to make on each title.</param>
+		/// <param name="minDuration">The minimum duration of a title to show up on the scan.</param>
+		/// <param name="titleIndex">The title index to scan (1-based, 0 for all titles).</param>
+		private void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)
+		{
+			this.previewCount = previewCount;
+			HBFunctions.hb_scan(this.hbHandle, path, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
+			this.scanPollTimer = new System.Timers.Timer();
+			this.scanPollTimer.Interval = ScanPollIntervalMs;
+
+			// Lambda notation used to make sure we can view any JIT exceptions the method throws
+			this.scanPollTimer.Elapsed += (o, e) =>
+			{
+				this.PollScanProgress();
+			};
+			this.scanPollTimer.Start();
+		}
+
+		/// <summary>
 		/// Checks the status of the ongoing scan.
 		/// </summary>
 		private void PollScanProgress()
@@ -732,17 +766,25 @@
 			{
 				if (this.ScanProgress != null)
 				{
-					int currentTitle = state.param.scanning.title_cur;
-					int totalTitles = state.param.scanning.title_count;
-					this.ScanProgress(this, new ScanProgressEventArgs { CurrentTitle = currentTitle, Titles = totalTitles });
+					hb_state_scanning_anon scanningState = state.param.scanning;
+
+					this.ScanProgress(this, new ScanProgressEventArgs
+						{
+							Progress = scanningState.progress,
+							CurrentPreview = scanningState.preview_cur,
+							Previews = scanningState.preview_count,
+							CurrentTitle = scanningState.title_cur,
+							Titles = scanningState.title_count
+						});
 				}
 			}
 			else if (state.state == NativeConstants.HB_STATE_SCANDONE)
 			{
 				this.titles = new List<Title>();
 
-				IntPtr listPtr = HBFunctions.hb_get_titles(this.hbHandle);
-				this.originalTitles = InteropUtilities.ConvertList<hb_title_s>(listPtr);
+				IntPtr titleSetPtr = HBFunctions.hb_get_title_set(this.hbHandle);
+				hb_title_set_s titleSet = InteropUtilities.ReadStructure<hb_title_set_s>(titleSetPtr);
+				this.originalTitles = titleSet.list_title.ToList<hb_title_s>();
 
 				foreach (hb_title_s title in this.originalTitles)
 				{
@@ -752,8 +794,7 @@
 
 				if (this.originalTitles.Count > 0)
 				{
-					var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(this.originalTitles[0].job);
-					this.featureTitle = nativeJob.feature;
+					this.featureTitle = titleSet.feature;
 				}
 				else
 				{
@@ -764,7 +805,7 @@
 
 				if (this.ScanCompleted != null)
 				{
-					this.ScanCompleted(this, new EventArgs());
+					this.ScanCompleted(this, new System.EventArgs());
 				}
 			}
 		}
@@ -908,8 +949,9 @@
 			{
 				switch (job.RangeType)
 				{
+					case VideoRangeType.All:
+						break;
 					case VideoRangeType.Chapters:
-
 						if (job.ChapterStart > 0 && job.ChapterEnd > 0)
 						{
 							nativeJob.chapter_start = job.ChapterStart;
@@ -928,9 +970,13 @@
 							throw new ArgumentException("Seconds range " + job.SecondsStart + "-" + job.SecondsEnd + " is invalid.", "job");
 						}
 
-						// For some reason "pts_to_stop" actually means the number of pts to stop AFTER the start point.
-						nativeJob.pts_to_start = (int)(job.SecondsStart * 90000);
-						nativeJob.pts_to_stop = (int)((job.SecondsEnd - job.SecondsStart) * 90000);
+						// If they've selected the "full" title duration, leave off the arguments to make it clean
+						if (job.SecondsStart > 0 || job.SecondsEnd < title.Duration.TotalSeconds)
+						{
+							// For some reason "pts_to_stop" actually means the number of pts to stop AFTER the start point.
+							nativeJob.pts_to_start = (int) (job.SecondsStart * 90000);
+							nativeJob.pts_to_stop = (int) ((job.SecondsEnd - job.SecondsStart) * 90000);
+						}
 						break;
 					case VideoRangeType.Frames:
 						if (job.FramesStart < 0 || job.FramesEnd < 0 || job.FramesStart >= job.FramesEnd)
@@ -945,25 +991,86 @@
 				}
 			}
 
+			// Chapter markers
 			nativeJob.chapter_markers = profile.IncludeChapterMarkers ? 1 : 0;
 
-			Cropping crop;
+			List<IntPtr> nativeChapters = nativeJob.list_chapter.ToIntPtrList();
 
-			if (profile.CustomCropping)
+			if (!preview && profile.IncludeChapterMarkers)
 			{
-				crop = profile.Cropping;
-			}
-			else
-			{
-				crop = title.AutoCropDimensions;
+				int numChapters = title.Chapters.Count;
+
+				if (job.UseDefaultChapterNames)
+				{
+					for (int i = 0; i < numChapters; i++)
+					{
+						if (i < nativeChapters.Count)
+						{
+							HBFunctions.hb_chapter_set_title(nativeChapters[i], "Chapter " + (i + 1));
+						}
+					}
+				}
+				else
+				{
+					for (int i = 0; i < numChapters; i++)
+					{
+						if (i < nativeChapters.Count && i < job.CustomChapterNames.Count)
+						{
+							HBFunctions.hb_chapter_set_title(nativeChapters[i], job.CustomChapterNames[i]);
+						}
+					}
+				}
 			}
 
+			Cropping crop = GetCropping(profile, title);
+
 			nativeJob.crop[0] = crop.Top;
 			nativeJob.crop[1] = crop.Bottom;
 			nativeJob.crop[2] = crop.Left;
 			nativeJob.crop[3] = crop.Right;
 
-			var filterList = new List<IntPtr>();
+			var filterList = new List<hb_filter_object_s>();
+
+			// FILTERS: These must be added in the correct order since we cannot depend on the automatic ordering in hb_add_filter . Ordering is determined
+			// by the order they show up in the filters enum.
+
+			// Detelecine
+			if (profile.Detelecine != Detelecine.Off)
+			{
+				string settings = null;
+				if (profile.Detelecine == Detelecine.Custom)
+				{
+					settings = profile.CustomDetelecine;
+				}
+
+				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DETELECINE, settings, allocatedMemory);
+			}
+
+			// Decomb
+			if (profile.Decomb != Decomb.Off)
+			{
+				string settings = null;
+				switch (profile.Decomb)
+				{
+					case Decomb.Default:
+						break;
+					case Decomb.Fast:
+						settings = "7:2:6:9:1:80";
+						break;
+					case Decomb.Bob:
+						settings = "455";
+						break;
+					case Decomb.Custom:
+						settings = profile.CustomDecomb;
+						break;
+					default:
+						break;
+				}
+
+				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DECOMB, settings, allocatedMemory);
+			}
+
+			// Deinterlace
 			if (profile.Deinterlace != Deinterlace.Off)
 			{
 				nativeJob.deinterlace = 1;
@@ -972,13 +1079,16 @@
 				switch (profile.Deinterlace)
 				{
 					case Deinterlace.Fast:
-						settings = "-1";
+						settings = "0";
 						break;
 					case Deinterlace.Slow:
-						settings = "2";
+						settings = "1";
 						break;
 					case Deinterlace.Slower:
-						settings = "0";
+						settings = "3";
+						break;
+					case Deinterlace.Bob:
+						settings = "15";
 						break;
 					case Deinterlace.Custom:
 						settings = profile.CustomDeinterlace;
@@ -987,40 +1097,57 @@
 						break;
 				}
 
-				this.AddFilter(filterList, NativeConstants.HB_FILTER_DEINTERLACE, settings, allocatedMemory);
+				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DEINTERLACE, settings, allocatedMemory);
 			}
 			else
 			{
 				nativeJob.deinterlace = 0;
 			}
 
-			if (profile.Detelecine != Detelecine.Off)
+			// VFR
+			if (profile.Framerate == 0)
 			{
-				string settings = null;
-				if (profile.Detelecine == Detelecine.Custom)
+				if (profile.ConstantFramerate)
 				{
-					settings = profile.CustomDetelecine;
+					// CFR with "Same as Source". Use the title rate
+					nativeJob.cfr = 1;
+					nativeJob.vrate = originalTitle.rate;
+					nativeJob.vrate_base = originalTitle.rate_base;
+				}
+				else
+				{
+					// Pure VFR "Same as Source"
+					nativeJob.cfr = 0;
 				}
-
-				this.AddFilter(filterList, NativeConstants.HB_FILTER_DETELECINE, settings, allocatedMemory);
 			}
-
-			if (profile.Decomb != Decomb.Off)
+			else
 			{
-				string settings = null;
-				if (profile.Decomb == Decomb.Custom)
+				// Specified framerate
+				if (profile.ConstantFramerate)
 				{
-					settings = profile.CustomDecomb;
+					// Mark as pure CFR
+					nativeJob.cfr = 1;
+				}
+				else
+				{
+					// Mark as peak framerate
+					nativeJob.cfr = 2;
 				}
 
-				this.AddFilter(filterList, NativeConstants.HB_FILTER_DECOMB, settings, allocatedMemory);
+				nativeJob.vrate = 27000000;
+				nativeJob.vrate_base = Converters.FramerateToVrate(profile.Framerate);
 			}
 
+			string vfrSettings = string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}", nativeJob.cfr, nativeJob.vrate, nativeJob.vrate_base);
+			this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_VFR, vfrSettings, allocatedMemory);
+
+			// Deblock
 			if (profile.Deblock > 0)
 			{
-				this.AddFilter(filterList, NativeConstants.HB_FILTER_DEBLOCK, profile.Deblock.ToString(), allocatedMemory);
+				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DEBLOCK, profile.Deblock.ToString(CultureInfo.InvariantCulture), allocatedMemory);
 			}
 
+			// Denoise
 			if (profile.Denoise != Denoise.Off)
 			{
 				string settings = null;
@@ -1042,13 +1169,10 @@
 						break;
 				}
 
-				this.AddFilter(filterList, NativeConstants.HB_FILTER_DENOISE, settings, allocatedMemory);
+				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DENOISE, settings, allocatedMemory);
 			}
 
-			NativeList filterListNative = InteropUtilities.CreateIntPtrList(filterList);
-			nativeJob.filters = filterListNative.ListPtr;
-			allocatedMemory.AddRange(filterListNative.AllocatedMemory);
-
+			// Crop/scale
 			int width = profile.Width;
 			int height = profile.Height;
 
@@ -1075,6 +1199,11 @@
 				height = profile.MaxHeight;
 			}
 
+			// The job width can sometimes start not clean, due to interference from
+			// preview generation. We reset it here to allow good calculations.
+			nativeJob.width = width;
+			nativeJob.height = height;
+
 			nativeJob.grayscale = profile.Grayscale ? 1 : 0;
 
 			switch (profile.Anamorphic)
@@ -1087,12 +1216,31 @@
 					height = outputSize.Height;
 
 					nativeJob.anamorphic.keep_display_aspect = profile.KeepDisplayAspect ? 1 : 0;
+
+					nativeJob.width = width;
+					nativeJob.height = height;
+
+					nativeJob.maxWidth = profile.MaxWidth;
+					nativeJob.maxHeight = profile.MaxHeight;
+
 					break;
 				case Anamorphic.Strict:
 					nativeJob.anamorphic.mode = 1;
+
+					nativeJob.anamorphic.par_width = title.ParVal.Width;
+					nativeJob.anamorphic.par_height = title.ParVal.Height;
 					break;
 				case Anamorphic.Loose:
 					nativeJob.anamorphic.mode = 2;
+
+					nativeJob.modulus = profile.Modulus;
+
+					nativeJob.width = width;
+
+					nativeJob.maxWidth = profile.MaxWidth;
+
+					nativeJob.anamorphic.par_width = title.ParVal.Width;
+					nativeJob.anamorphic.par_height = title.ParVal.Height;
 					break;
 				case Anamorphic.Custom:
 					nativeJob.anamorphic.mode = 3;
@@ -1126,10 +1274,12 @@
 							nativeJob.anamorphic.dar_height = height;
 							nativeJob.anamorphic.keep_display_aspect = 1;
 						}
-
-						nativeJob.anamorphic.dar_width = profile.DisplayWidth;
-						nativeJob.anamorphic.dar_height = height;
-						nativeJob.anamorphic.keep_display_aspect = profile.KeepDisplayAspect ? 1 : 0;
+						else
+						{
+							nativeJob.anamorphic.dar_width = profile.DisplayWidth;
+							nativeJob.anamorphic.dar_height = height;
+							nativeJob.anamorphic.keep_display_aspect = profile.KeepDisplayAspect ? 1 : 0;
+						}
 					}
 					else
 					{
@@ -1138,16 +1288,43 @@
 						nativeJob.anamorphic.keep_display_aspect = 0;
 					}
 
+					nativeJob.width = width;
+					nativeJob.height = height;
+
+					nativeJob.maxWidth = profile.MaxWidth;
+					nativeJob.maxHeight = profile.MaxHeight;
+
 					break;
 				default:
 					break;
 			}
 
-			nativeJob.width = width;
-			nativeJob.height = height;
+			// Need to fix up values before adding crop/scale filter
+			if (profile.Anamorphic != Anamorphic.None)
+			{
+				int anamorphicWidth = 0, anamorphicHeight = 0, anamorphicParWidth = 0, anamorphicParHeight = 0;
+
+				HBFunctions.hb_set_anamorphic_size(ref nativeJob, ref anamorphicWidth, ref anamorphicHeight, ref anamorphicParWidth, ref anamorphicParHeight);
+				nativeJob.width = anamorphicWidth;
+				nativeJob.height = anamorphicHeight;
+				nativeJob.anamorphic.par_width = anamorphicParWidth;
+				nativeJob.anamorphic.par_height = anamorphicParHeight;
+			}
+
+			string cropScaleSettings = string.Format(
+				CultureInfo.InvariantCulture,
+				"{0}:{1}:{2}:{3}:{4}:{5}",
+				nativeJob.width,
+				nativeJob.height,
+				nativeJob.crop[0],
+				nativeJob.crop[1],
+				nativeJob.crop[2],
+				nativeJob.crop[3]);
+			this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_CROP_SCALE, cropScaleSettings, allocatedMemory);
+
+
+
 
-			nativeJob.maxWidth = profile.MaxWidth;
-			nativeJob.maxHeight = profile.MaxHeight;
 
 			HBVideoEncoder videoEncoder = Encoders.VideoEncoders.FirstOrDefault(e => e.ShortName == profile.VideoEncoder);
 			if (videoEncoder == null)
@@ -1157,37 +1334,25 @@
 
 			nativeJob.vcodec = videoEncoder.Id;
 
-			if (profile.Framerate == 0)
-			{
-				nativeJob.cfr = 0;
-			}
-			else
-			{
-				if (profile.PeakFramerate)
-				{
-					nativeJob.cfr = 2;
-				}
-				else
-				{
-					nativeJob.cfr = 1;
-				}
 
-				nativeJob.vrate = 27000000;
-				nativeJob.vrate_base = Converters.FramerateToVrate(profile.Framerate);
-			}
 
-			// vfr
 			// areBframes
 			// color_matrix
-			List<hb_audio_s> titleAudio = InteropUtilities.ConvertList<hb_audio_s>(originalTitle.list_audio);
+			List<hb_audio_s> titleAudio = originalTitle.list_audio.ToList<hb_audio_s>();
 			
 			var audioList = new List<hb_audio_s>();
 			int numTracks = 0;
 
 			List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
 
-			if (profile.AudioEncoderFallback != null)
+			if (!string.IsNullOrEmpty(profile.AudioEncoderFallback))
 			{
+				HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(profile.AudioEncoderFallback);
+				if (audioEncoder == null)
+				{
+					throw new ArgumentException("Unrecognized fallback audio encoder: " + profile.AudioEncoderFallback);
+				}
+
 				nativeJob.acodec_fallback = Encoders.GetAudioEncoder(profile.AudioEncoderFallback).Id;
 			}
 
@@ -1225,7 +1390,7 @@
 			{
 				if (job.Subtitles.SourceSubtitles != null && job.Subtitles.SourceSubtitles.Count > 0)
 				{
-					List<hb_subtitle_s> titleSubtitles = InteropUtilities.ConvertList<hb_subtitle_s>(originalTitle.list_subtitle);
+					List<hb_subtitle_s> titleSubtitles = originalTitle.list_subtitle.ToList<hb_subtitle_s>();
 
 					foreach (SourceSubtitle sourceSubtitle in job.Subtitles.SourceSubtitles)
 					{
@@ -1251,7 +1416,7 @@
 							subtitleConfig.force = sourceSubtitle.Forced ? 1 : 0;
 							subtitleConfig.default_track = sourceSubtitle.Default ? 1 : 0;
 
-							bool supportsBurn = nativeSubtitle.source == hb_subtitle_s_subsource.VOBSUB || nativeSubtitle.source == hb_subtitle_s_subsource.SSASUB;
+							bool supportsBurn = nativeSubtitle.source == hb_subtitle_s_subsource.VOBSUB || nativeSubtitle.source == hb_subtitle_s_subsource.SSASUB || nativeSubtitle.source == hb_subtitle_s_subsource.PGSSUB;
 							if (supportsBurn && sourceSubtitle.BurnedIn)
 							{
 								subtitleConfig.dest = hb_subtitle_config_s_subdest.RENDERSUB;
@@ -1288,8 +1453,17 @@
 						}
 					}
 				}
+
+				bool hasBurnedSubtitle = job.Subtitles.SourceSubtitles.Any(s => s.BurnedIn);
+				if (hasBurnedSubtitle)
+				{
+					this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_RENDER_SUB, string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}:{3}", crop.Top, crop.Bottom, crop.Left, crop.Right), allocatedMemory);
+				}
 			}
 
+			// Construct final filter list
+			nativeJob.list_filter = this.ConvertFilterListToNative(filterList, allocatedMemory).ListPtr;
+
 			if (profile.OutputFormat == Container.Mp4)
 			{
 				nativeJob.mux = NativeConstants.HB_MUX_MP4;
@@ -1378,26 +1552,77 @@
 		/// <summary>
 		/// Adds a filter to the given filter list.
 		/// </summary>
-		/// <param name="filterList">The filter list to add to.</param>
+		/// <param name="filterList">The list to add the filter to.</param>
 		/// <param name="filterType">The type of filter.</param>
 		/// <param name="settings">Settings for the filter.</param>
 		/// <param name="allocatedMemory">The list of allocated memory.</param>
-		private void AddFilter(List<IntPtr> filterList, int filterType, string settings, List<IntPtr> allocatedMemory)
+		private void AddFilter(List<hb_filter_object_s> filterList, int filterType, string settings, List<IntPtr> allocatedMemory)
 		{
 			IntPtr settingsNativeString = Marshal.StringToHGlobalAnsi(settings);
-			filterList.Add(HBFunctions.hb_get_filter_object(filterType, settingsNativeString));
+			hb_filter_object_s filter = InteropUtilities.ReadStructure<hb_filter_object_s>(HBFunctions.hb_filter_init(filterType));
+			filter.settings = settingsNativeString;
 
 			allocatedMemory.Add(settingsNativeString);
+			filterList.Add(filter);
 		}
 
 		/// <summary>
-		/// Gets the title, given the 1-based index.
+		/// Converts the given filter list to a native list.
 		/// </summary>
-		/// <param name="titleIndex">The index of the title (1-based).</param>
+		/// <remarks>Sorts the list by filter ID before converting to a native list, as HB expects it that way.
+		/// The list memory itself will be added to the allocatedMemory list.</remarks>
+		/// <param name="filterList">The filter list to convert.</param>
+		/// <param name="allocatedMemory">The list of allocated memory to add to.</param>
+		/// <returns>The converted list.</returns>
+		private NativeList ConvertFilterListToNative(List<hb_filter_object_s> filterList, List<IntPtr> allocatedMemory)
+		{
+			var filterPtrList = new List<IntPtr>();
+
+			var sortedList = filterList.OrderBy(f => f.id);
+			foreach (var filter in sortedList)
+			{
+				IntPtr filterPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_filter_object_s)));
+				Marshal.StructureToPtr(filter, filterPtr, false);
+
+				allocatedMemory.Add(filterPtr);
+				filterPtrList.Add(filterPtr);
+			}
+
+			NativeList filterListNative = InteropUtilities.CreateIntPtrList(filterPtrList);
+			allocatedMemory.AddRange(filterListNative.AllocatedMemory);
+
+			return filterListNative;
+		}
+
+		/// <summary>
+		/// Gets the title, given the 1-based title number.
+		/// </summary>
+		/// <param name="titleNumber">The number of the title (1-based).</param>
 		/// <returns>The requested Title.</returns>
-		private Title GetTitle(int titleIndex)
+		private Title GetTitle(int titleNumber)
+		{
+			return this.Titles.SingleOrDefault(title => title.TitleNumber == titleNumber);
+		}
+
+		/// <summary>
+		/// Gets the 1-based title index of the given title.
+		/// </summary>
+		/// <param name="titleNumber">The 1-based title title number.</param>
+		/// <returns>The 1-based title index.</returns>
+		private int GetTitleIndex(int titleNumber)
+		{
+			Title title = this.GetTitle(titleNumber);
+			return this.GetTitleIndex(title);
+		}
+
+		/// <summary>
+		/// Gets the 1-based title index of the given title.
+		/// </summary>
+		/// <param name="title">The title to look up</param>
+		/// <returns>The 1-based title index of the given title.</returns>
+		private int GetTitleIndex(Title title)
 		{
-			return this.Titles.SingleOrDefault(title => title.TitleNumber == titleIndex);
+			return this.Titles.IndexOf(title) + 1;
 		}
 
 		/// <summary>
@@ -1508,9 +1733,11 @@
 			var newTitle = new Title
 			{
 				TitleNumber = title.index,
+				Playlist = title.playlist,
 				Resolution = new Size(title.width, title.height),
 				ParVal = new Size(title.pixel_aspect_width, title.pixel_aspect_height),
-				Duration = TimeSpan.FromSeconds(title.duration / 90000),
+				Duration = Converters.PtsToTimeSpan(title.duration),
+				DurationPts = title.duration,
 				AutoCropDimensions = new Cropping
 				{
 					Top = title.crop[0],
@@ -1521,7 +1748,9 @@
 				AspectRatio = title.aspect,
 				AngleCount = title.angle_count,
 				VideoCodecName = title.video_codec_name,
-				Framerate = ((double)title.rate) / title.rate_base
+				Framerate = ((double)title.rate) / title.rate_base,
+				FramerateNumerator = title.rate,
+				FramerateDenominator = title.rate_base
 			};
 
 			switch (title.type)
@@ -1538,7 +1767,7 @@
 			}
 
 			int currentSubtitleTrack = 1;
-			List<hb_subtitle_s> subtitleList = InteropUtilities.ConvertList<hb_subtitle_s>(title.list_subtitle);
+			List<hb_subtitle_s> subtitleList = title.list_subtitle.ToList<hb_subtitle_s>();
 			foreach (hb_subtitle_s subtitle in subtitleList)
 			{
 				var newSubtitle = new Subtitle
@@ -1580,6 +1809,9 @@
 					case hb_subtitle_s_subsource.VOBSUB:
 						newSubtitle.SubtitleSource = SubtitleSource.VobSub;
 						break;
+					case hb_subtitle_s_subsource.PGSSUB:
+						newSubtitle.SubtitleSource = SubtitleSource.PGS;
+						break;
 					default:
 						break;
 				}
@@ -1590,7 +1822,7 @@
 			}
 
 			int currentAudioTrack = 1;
-			List<hb_audio_s> audioList = InteropUtilities.ConvertList<hb_audio_s>(title.list_audio);
+			List<hb_audio_s> audioList = title.list_audio.ToList<hb_audio_s>();
 			foreach (hb_audio_s audio in audioList)
 			{
 				var newAudio = new AudioTrack
@@ -1611,13 +1843,14 @@
 				currentAudioTrack++;
 			}
 
-			List<hb_chapter_s> chapterList = InteropUtilities.ConvertList<hb_chapter_s>(title.list_chapter);
+			List<hb_chapter_s> chapterList = title.list_chapter.ToList<hb_chapter_s>();
 			foreach (hb_chapter_s chapter in chapterList)
 			{
 				var newChapter = new Chapter
 				{
 					ChapterNumber = chapter.index,
-					Duration = TimeSpan.FromSeconds(((double)chapter.duration) / 90000)
+					Duration = Converters.PtsToTimeSpan(chapter.duration),
+					DurationPts = chapter.duration
 				};
 
 				newTitle.Chapters.Add(newChapter);
@@ -1625,5 +1858,29 @@
 
 			return newTitle;
 		}
+
+		/// <summary>
+		/// Gets the cropping to use for the given encoding profile and title.
+		/// </summary>
+		/// <param name="profile">The encoding profile to use.</param>
+		/// <param name="title">The title being encoded.</param>
+		/// <returns>The cropping to use for the encode.</returns>
+		private static Cropping GetCropping(EncodingProfile profile, Title title)
+		{
+			Cropping crop;
+			switch (profile.CroppingType)
+			{
+				case CroppingType.Automatic:
+					crop = title.AutoCropDimensions;
+					break;
+				case CroppingType.Custom:
+					crop = profile.Cropping;
+					break;
+				default:
+					crop = new Cropping();
+					break;
+			}
+			return crop;
+		}
 	}
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj Changed

@@ -125,58 +125,61 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters.cs" />
-    <Compile Include="EncodeCompletedEventArgs.cs" />
-    <Compile Include="EncodeProgressEventArgs.cs" />
+    <Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />
+    <Compile Include="EventArgs\EncodeProgressEventArgs.cs" />
     <Compile Include="HandBrakeUtils.cs" />
     <Compile Include="HandBrakeInstance.cs" />
     <Compile Include="HbLib\HBFunctions.cs" />
     <Compile Include="HbLib\hb_audio.cs" />
     <Compile Include="HbLib\hb_chapter_s.cs" />
+    <Compile Include="HbLib\hb_filter.cs" />
     <Compile Include="HbLib\hb_handle_s.cs" />
     <Compile Include="HbLib\hb_subtitle.cs" />
     <Compile Include="HbLib\Misc.cs" />
     <Compile Include="HbLib\hb_job_s.cs" />
     <Compile Include="HbLib\hb_title_s.cs" />
     <Compile Include="HbLib\NativeConstants.cs" />
+    <Compile Include="Interfaces\IHandBrakeInstance.cs" />
     <Compile Include="InteropUtilities.cs" />
     <Compile Include="Language.cs" />
     <Compile Include="LanguageCodes.cs" />
     <Compile Include="MarshalingConstants.cs" />
-    <Compile Include="MessageLoggedEventArgs.cs" />
-    <Compile Include="Model\Cropping.cs" />
-    <Compile Include="Model\EncodeJob.cs" />
-    <Compile Include="Model\Encoders.cs" />
-    <Compile Include="Model\Encoding\Anamorphic.cs" />
-    <Compile Include="Model\Encoding\AudioEncodeRateType.cs" />
-    <Compile Include="Model\Encoding\HBAudioEncoder.cs" />
-    <Compile Include="Model\Encoding\AudioEncoder.cs" />
-    <Compile Include="Model\Encoding\AudioEncoding.cs" />
-    <Compile Include="Model\Encoding\Decomb.cs" />
+    <Compile Include="EventArgs\MessageLoggedEventArgs.cs" />
+    <Compile Include="Model\Cropping.cs" />
+    <Compile Include="Model\EncodeJob.cs" />
+    <Compile Include="Model\Encoders.cs" />
+    <Compile Include="Model\Encoding\Anamorphic.cs" />
+    <Compile Include="Model\Encoding\AudioEncodeRateType.cs" />
+    <Compile Include="Model\Encoding\CroppingType.cs" />
+    <Compile Include="Model\Encoding\HBAudioEncoder.cs" />
+    <Compile Include="Model\Encoding\AudioEncoder.cs" />
+    <Compile Include="Model\Encoding\AudioEncoding.cs" />
+    <Compile Include="Model\Encoding\Decomb.cs" />
     <Compile Include="Model\Encoding\Deinterlace.cs" />
-    <Compile Include="Model\Encoding\Denoise.cs" />
-    <Compile Include="Model\Encoding\Detelecine.cs" />
-    <Compile Include="Model\Encoding\EncodingProfile.cs" />
-    <Compile Include="Model\Encoding\HBMixdown.cs" />
-    <Compile Include="Model\Encoding\HBVideoEncoder.cs" />
-    <Compile Include="Model\Encoding\Mixdown.cs" />
-    <Compile Include="Model\Encoding\OutputExtension.cs" />
-    <Compile Include="Model\Encoding\Container.cs" />
-    <Compile Include="Model\Encoding\VideoEncoder.cs" />
-    <Compile Include="Model\Encoding\VideoEncodeRateType.cs" />
-    <Compile Include="Model\Encoding\x264\x264Preset.cs" />
-    <Compile Include="Model\Encoding\x264\x264Profile.cs" />
-    <Compile Include="Model\Encoding\x264\x264Tune.cs" />
-    <Compile Include="Model\BitrateLimits.cs" />
-    <Compile Include="Model\RangeLimits.cs" />
-    <Compile Include="Model\Size.cs" />
-    <Compile Include="Model\SourceSubtitle.cs" />
-    <Compile Include="Model\SourceType.cs" />
+    <Compile Include="Model\Encoding\Denoise.cs" />
+    <Compile Include="Model\Encoding\Detelecine.cs" />
+    <Compile Include="Model\Encoding\EncodingProfile.cs" />
+    <Compile Include="Model\Encoding\HBMixdown.cs" />
+    <Compile Include="Model\Encoding\HBVideoEncoder.cs" />
+    <Compile Include="Model\Encoding\Mixdown.cs" />
+    <Compile Include="Model\Encoding\OutputExtension.cs" />
+    <Compile Include="Model\Encoding\Container.cs" />
+    <Compile Include="Model\Encoding\VideoEncoder.cs" />
+    <Compile Include="Model\Encoding\VideoEncodeRateType.cs" />
+    <Compile Include="Model\Encoding\x264\x264Preset.cs" />
+    <Compile Include="Model\Encoding\x264\x264Profile.cs" />
+    <Compile Include="Model\Encoding\x264\x264Tune.cs" />
+    <Compile Include="Model\BitrateLimits.cs" />
+    <Compile Include="Model\RangeLimits.cs" />
+    <Compile Include="Model\Size.cs" />
+    <Compile Include="Model\SourceSubtitle.cs" />
+    <Compile Include="Model\SourceType.cs" />
     <Compile Include="Model\SrtSubtitle.cs" />
     <Compile Include="Model\Subtitles.cs" />
     <Compile Include="Model\VideoRangeType.cs" />
     <Compile Include="NativeList.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ScanProgressEventArgs.cs" />
+    <Compile Include="EventArgs\ScanProgressEventArgs.cs" />
     <Compile Include="SourceData\AudioCodec.cs" />
     <Compile Include="SourceData\AudioTrack.cs" />
     <Compile Include="SourceData\Chapter.cs" />

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs Changed

@@ -4,16 +4,16 @@
 // </copyright>
 // <summary>
 //   Defines the HandBrakeUtils type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Runtime.InteropServices;
-
-namespace HandBrake.Interop
-{
-	using System;
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop
+{
+	using System;
 	using System.Collections.Generic;
+	using System.Runtime.InteropServices;
 
+	using HandBrake.Interop.EventArgs;
 	using HandBrake.Interop.HbLib;
 	using HandBrake.Interop.Model;
 	using HandBrake.Interop.Model.Encoding;
@@ -50,6 +50,23 @@
 		public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
 
 		/// <summary>
+		/// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
+		/// </summary>
+		/// <param name="enableDvdNav">True to enable LibDVDNav.</param>
+		public static void SetDvdNav(bool enableDvdNav)
+		{
+			HBFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
+		}
+
+		/// <summary>
+		/// Call before app shutdown. Performs global cleanup.
+		/// </summary>
+		public static void DisposeGlobal()
+		{
+			HBFunctions.hb_global_close();
+		}
+
+		/// <summary>
 		/// Register the logger.
 		/// </summary>
 		public static void RegisterLogger()
@@ -113,18 +130,101 @@
 
 				System.Diagnostics.Debug.WriteLine("ERROR: " + message);
 			}
-		}
-
-		/// <summary>
-		/// Gets the total number of seconds on the given encode job.
-		/// </summary>
-		/// <param name="job">The encode job to query.</param>
+		}
+
+		/// <summary>
+		/// Gets the standard x264 option name given the starting point.
+		/// </summary>
+		/// <returns>The standard x264 option name.</returns>
+		public static string SanitizeX264OptName(string name)
+		{
+			IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
+			string sanitizedName = Marshal.PtrToStringAnsi(HBFunctions.hb_x264_encopt_name(namePtr));
+			Marshal.FreeHGlobal(namePtr);
+			return sanitizedName;
+		}
+
+		/// <summary>
+		/// Checks to see if the given H.264 level is valid given the inputs.
+		/// </summary>
+		/// <param name="level">The level to check.</param>
+		/// <param name="width">The output picture width.</param>
+		/// <param name="height">The output picture height.</param>
+		/// <param name="fpsNumerator">The rate numerator.</param>
+		/// <param name="fpsDenominator">The rate denominator.</param>
+		/// <param name="interlaced">True if x264 interlaced output is enabled.</param>
+		/// <param name="fakeInterlaced">True if x264 fake interlacing is enabled.</param>
+		/// <returns>True if the level is valid.</returns>
+		public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
+		{
+			return HBFunctions.hb_check_h264_level(
+				level, 
+				width, 
+				height, 
+				fpsNumerator, 
+				fpsDenominator, 
+				interlaced ? 1 : 0,
+				fakeInterlaced ? 1 : 0) == 0;
+		}
+
+		/// <summary>
+		/// Creates an X264 options string from the given settings.
+		/// </summary>
+		/// <param name="preset">The x264 preset.</param>
+		/// <param name="tunes">The x264 tunes being used.</param>
+		/// <param name="extraOptions">The extra options string.</param>
+		/// <param name="profile">The H.264 profile.</param>
+		/// <param name="level">The H.264 level.</param>
+		/// <param name="width">The width of the final picture.</param>
+		/// <param name="height">The height of the final picture.</param>
+		/// <returns>The full x264 options string from the given inputs.</returns>
+		public static string CreateX264OptionsString(
+			string preset, 
+			IList<string> tunes, 
+			string extraOptions, 
+			string profile,
+			string level, 
+			int width, 
+			int height)
+		{
+			if (width <= 0)
+			{
+				throw new ArgumentException("width must be positive.");
+			}
+
+			if (height <= 0)
+			{
+				throw new ArgumentException("height must be positive.");
+			}
+
+		    HBFunctions.hb_init(0, 0);
+            IntPtr ptr = HBFunctions.hb_x264_param_unparse(
+				preset,
+				string.Join(",", tunes),
+				extraOptions,
+				profile,
+				level,
+				width,
+				height);
+
+		    string x264Settings = Marshal.PtrToStringAnsi(ptr);
+
+
+            return x264Settings;
+		}
+
+		/// <summary>
+		/// Gets the total number of seconds on the given encode job.
+		/// </summary>
+		/// <param name="job">The encode job to query.</param>
 		/// <param name="title">The title being encoded.</param>
 		/// <returns>The total number of seconds of video to encode.</returns>
 		internal static double GetJobLengthSeconds(EncodeJob job, Title title)
 		{
 			switch (job.RangeType)
 			{
+				case VideoRangeType.All:
+					return title.Duration.TotalSeconds;
 				case VideoRangeType.Chapters:
 					TimeSpan duration = TimeSpan.Zero;
 					for (int i = job.ChapterStart; i <= job.ChapterEnd; i++)
@@ -142,37 +242,37 @@
 			return 0;
 		}
 
-		/// <summary>
-		/// Gets the number of audio samples used per frame for the given audio encoder.
-		/// </summary>
-		/// <param name="encoderName">The encoder to query.</param>
-		/// <returns>The number of audio samples used per frame for the given
-		/// audio encoder.</returns>
-		internal static int GetAudioSamplesPerFrame(string encoderName)
-		{
-			switch (encoderName)
-			{
-				case "faac":
-				case "ffaac":
-				case "copy:aac":
-				case "vorbis":
-					return 1024;
-				case "lame":
-				case "copy:mp3":
-					return 1152;
-				case "ffac3":
-				case "copy":
-				case "copy:ac3":
-				case "copy:dts":
-				case "copy:dtshd":
-					return 1536;
-			}
-
-			// Unknown encoder; make a guess.
-			return 1536;
-		}
-
-		/// <summary>
+		/// <summary>
+		/// Gets the number of audio samples used per frame for the given audio encoder.
+		/// </summary>
+		/// <param name="encoderName">The encoder to query.</param>
+		/// <returns>The number of audio samples used per frame for the given
+		/// audio encoder.</returns>
+		internal static int GetAudioSamplesPerFrame(string encoderName)
+		{
+			switch (encoderName)
+			{
+				case "faac":
+				case "ffaac":
+				case "copy:aac":
+				case "vorbis":
+					return 1024;
+				case "lame":
+				case "copy:mp3":
+					return 1152;
+				case "ffac3":
+				case "copy":
+				case "copy:ac3":
+				case "copy:dts":
+				case "copy:dtshd":
+					return 1536;
+			}
+
+			// Unknown encoder; make a guess.
+			return 1536;
+		}
+
+		/// <summary>
 		/// Gets the size in bytes for the audio with the given parameters.
 		/// </summary>
 		/// <param name="job">The encode job.</param>
@@ -189,41 +289,41 @@
 				AudioEncoding encoding = outputTrack.Item1;
 				AudioTrack track = title.AudioTracks[outputTrack.Item2 - 1];
 
-				int samplesPerFrame = HandBrakeUtils.GetAudioSamplesPerFrame(encoding.Encoder);
-				int audioBitrate;
-
-				HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(encoding.Encoder);
-
-				if (audioEncoder.IsPassthrough)
-				{
-					// Input bitrate is in bits/second.
-					audioBitrate = track.Bitrate / 8;
-				}
-				else if (encoding.EncodeRateType == AudioEncodeRateType.Quality)
-				{
-					// Can't predict size of quality targeted audio encoding.
-					audioBitrate = 0;
-				}
-				else
-				{
-					int outputBitrate;
-					if (encoding.Bitrate > 0)
-					{
-						outputBitrate = encoding.Bitrate;
-					}
-					else
-					{
-						outputBitrate = Encoders.GetDefaultBitrate(
-							audioEncoder,
-							encoding.SampleRateRaw == 0 ? track.SampleRate : encoding.SampleRateRaw,
-							Encoders.SanitizeMixdown(Encoders.GetMixdown(encoding.Mixdown), audioEncoder, track.ChannelLayout));
-					}
-
-					// Output bitrate is in kbps.
-					audioBitrate = outputBitrate * 1000 / 8;
-				}
-
-				audioBytes += (long)(lengthSeconds * audioBitrate);
+				int samplesPerFrame = HandBrakeUtils.GetAudioSamplesPerFrame(encoding.Encoder);
+				int audioBitrate;
+
+				HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(encoding.Encoder);
+
+				if (audioEncoder.IsPassthrough)
+				{
+					// Input bitrate is in bits/second.
+					audioBitrate = track.Bitrate / 8;
+				}
+				else if (encoding.EncodeRateType == AudioEncodeRateType.Quality)
+				{
+					// Can't predict size of quality targeted audio encoding.
+					audioBitrate = 0;
+				}
+				else
+				{
+					int outputBitrate;
+					if (encoding.Bitrate > 0)
+					{
+						outputBitrate = encoding.Bitrate;
+					}
+					else
+					{
+						outputBitrate = Encoders.GetDefaultBitrate(
+							audioEncoder,
+							encoding.SampleRateRaw == 0 ? track.SampleRate : encoding.SampleRateRaw,
+							Encoders.SanitizeMixdown(Encoders.GetMixdown(encoding.Mixdown), audioEncoder, track.ChannelLayout));
+					}
+
+					// Output bitrate is in kbps.
+					audioBitrate = outputBitrate * 1000 / 8;
+				}
+
+				audioBytes += (long)(lengthSeconds * audioBitrate);
 
 				// Audio overhead
 				audioBytes += encoding.SampleRateRaw * ContainerOverheadPerFrame / samplesPerFrame;

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs Changed

@@ -54,13 +54,6 @@
 		public static extern int hb_check_update(ref hb_handle_s h, ref IntPtr version);
 
 
-		/// Return Type: void
-		///param0: hb_handle_t*
-		///param1: int
-		[DllImport("hb.dll", EntryPoint = "hb_set_cpu_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_set_cpu_count(ref hb_handle_s param0, int param1);
-
-
 		/// Return Type: char*
 		///path: char*
 		[DllImport("hb.dll", EntryPoint = "hb_dvd_name", CallingConvention = CallingConvention.Cdecl)]
@@ -104,16 +97,13 @@
 		[DllImport("hb.dll", EntryPoint = "hb_detect_comb", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_detect_comb(ref hb_buffer_s buf, int width, int height, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_preview_by_index", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_get_preview_by_index(IntPtr hbHandle, int title_index, int picture, IntPtr buffer);
-
 		/// Return Type: void
 		///param0: hb_handle_t*
 		///param1: hb_title_t*
 		///param2: int
 		///param3: uint8_t*
 		[DllImport("hb.dll", EntryPoint = "hb_get_preview", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_get_preview(IntPtr hbHandle, ref hb_title_s title, int preview, IntPtr buffer);
+		public static extern void hb_get_preview(IntPtr hbHandle, ref hb_job_s title, int preview, IntPtr buffer);
 
 
 		/// Return Type: void
@@ -123,9 +113,6 @@
 		[DllImport("hb.dll", EntryPoint = "hb_set_size", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_set_size(ref hb_job_s param0, double ratio, int pixels);
 
-		[DllImport("hb.dll", EntryPoint = "hb_set_anamorphic_size_by_index", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_set_anamorphic_size_by_index(IntPtr hbHandle, int title_index, ref int output_width, ref int output_height, ref int output_par_width, ref int output_par_height);
-
 		/// Return Type: void
 		///param0: hb_job_t*
 		///output_width: int*
@@ -148,9 +135,6 @@
 		[DllImport("hb.dll", EntryPoint = "hb_job", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr hb_job(IntPtr hbHandle, int jobIndex);
 
-		[DllImport("hb.dll", EntryPoint = "hb_set_chapter_name", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_set_chapter_name(IntPtr hbHandle, int title_index, int chapter_index, [In] [MarshalAs(UnmanagedType.LPStr)] string chapter_name);
-
 		[DllImport("hb.dll", EntryPoint = "hb_set_job", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_set_job(IntPtr hbHandle, int title_index, ref hb_job_s job);
 
@@ -191,10 +175,6 @@
 		[DllImport("hb.dll", EntryPoint = "hb_stop", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_stop(IntPtr hbHandle);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_filter_object", CallingConvention = CallingConvention.Cdecl)]
-		//public static extern IntPtr hb_get_filter_object(int filter_id, [In] [MarshalAs(UnmanagedType.LPStr)] string settings);
-		public static extern IntPtr hb_get_filter_object(int filter_id, IntPtr settings);
-
 		/// Return Type: void
 		///param0: hb_handle_t*
 		///param1: hb_state_t*
@@ -230,11 +210,20 @@
 		public static extern int hb_srt_add(ref hb_job_s job, ref hb_subtitle_config_s subtitleConfig, string lang);
 
 
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_is_supported", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout);
+
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_mixdown_has_remix_support(int mixdown, ulong layout);
+
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_has_codec_support", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_mixdown_has_codec_support(int mixdown, uint codec);
+
 		[DllImport("hb.dll", EntryPoint = "hb_get_default_mixdown", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_default_mixdown(uint codec, int layout);
+		public static extern int hb_get_default_mixdown(uint codec, ulong layout);
 
 		[DllImport("hb.dll", EntryPoint = "hb_get_best_mixdown", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_best_mixdown(uint codec, int layout, int mixdown);
+		public static extern int hb_get_best_mixdown(uint codec, ulong layout, int mixdown);
 
 		[DllImport("hb.dll", EntryPoint = "hb_get_best_audio_bitrate", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_get_best_audio_bitrate(uint codec, int bitrate, int samplerate, int mixdown);
@@ -296,5 +285,66 @@
 
 		[DllImport("hb.dll", EntryPoint = "hb_get_audio_encoders_count", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_get_audio_encoders_count();
+
+
+		/// void hb_autopassthru_apply_settings( hb_job_t * job )
+		[DllImport("hb.dll", EntryPoint = "hb_autopassthru_apply_settings", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_autopassthru_apply_settings(ref hb_job_s job);
+
+		///hb_title_set_t  * hb_get_title_set( hb_handle_t * );
+		[DllImport("hb.dll", EntryPoint = "hb_get_title_set", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_get_title_set(IntPtr hbHandle);
+
+		///hb_job_t * hb_job_init_by_index( hb_handle_t *h, int title_index );
+		[DllImport("hb.dll", EntryPoint = "hb_job_init_by_index", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_job_init_by_index(IntPtr hbHandle, int title_index);
+
+		///hb_job_t * hb_job_init( hb_title_t * title );
+		[DllImport("hb.dll", EntryPoint = "hb_job_init", CallingConvention = CallingConvention.Cdecl)]
+		public static extern hb_job_s hb_job_init(ref hb_title_s title);
+
+		///void hb_job_reset( hb_job_t * job );
+		[DllImport("hb.dll", EntryPoint = "hb_job_reset", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_job_reset(ref hb_job_s job);
+
+		///void hb_job_close( hb_job_t ** job );
+		[DllImport("hb.dll", EntryPoint = "hb_job_close", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_job_close(IntPtr job);
+
+		///void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts );
+		[DllImport("hb.dll", EntryPoint = "hb_job_set_advanced_opts", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_job_set_advanced_opts(ref hb_job_s job, IntPtr advanced_opts);
+
+		///void hb_job_set_file( hb_job_t *job, const char *file );
+		[DllImport("hb.dll", EntryPoint = "hb_job_set_file", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_job_set_file(ref hb_job_s job, IntPtr file);
+
+		///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
+		[DllImport("hb.dll", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_chapter_set_title(IntPtr chapter, [In] [MarshalAs(UnmanagedType.LPStr)] string title);
+
+		/// void hb_add_filter( hb_job_t * job, hb_filter_object_t * filter, const char * settings ); 
+		[DllImport("hb.dll", EntryPoint = "hb_add_filter", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_add_filter(ref hb_job_s job, ref hb_filter_object_s filter, IntPtr settings);
+
+		/// hb_filter_object_t * hb_filter_init( int filter_id );
+		[DllImport("hb.dll", EntryPoint = "hb_filter_init", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_filter_init(int filter_id);
+
+		[DllImport("hb.dll", EntryPoint = "hb_x264_encopt_name", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_x264_encopt_name(IntPtr name);
+
+		[DllImport("hb.dll", EntryPoint = "hb_check_h264_level", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_check_h264_level([In] [MarshalAs(UnmanagedType.LPStr)] string level, int width, int height, int fps_num, int fps_den, int interlaced, int fake_interlaced);
+
+		[DllImport("hb.dll", EntryPoint = "hb_x264_param_unparse", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_x264_param_unparse(
+			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_preset,
+			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_tune,
+			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_encopts,
+			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_profile,
+			[In] [MarshalAs(UnmanagedType.LPStr)] string h264_level,
+			int width,
+			int height);
 	}
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs Changed

@@ -98,44 +98,59 @@
 	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
 	public struct hb_metadata_s
 	{
-		/// char[255]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 255)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string name;
 
-		/// char[255]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 255)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string artist;
 
-		/// char[255]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 255)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string composer;
 
-		/// char[255]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 255)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string release_date;
 
-		/// char[1024]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string comment;
 
-		/// char[255]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 255)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string album;
 
-		/// char[255]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 255)]
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string album_artist;
+
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
 		public string genre;
 
-		/// uint32_t->unsigned int
-		public uint coverart_size;
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string description;
+
+		/// char *
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string long_description;
 
 		/// uint8_t*
-		public IntPtr coverart;
+		public IntPtr list_coverart;
 	}
 
 	[StructLayout(LayoutKind.Sequential)]
 	public struct hb_state_scanning_anon
 	{
+		public float progress;
+
+		public int preview_cur;
+
+		public int preview_count;
+
 		/// int
 		public int title_cur;
 
@@ -212,18 +227,6 @@
 		public hb_state_param_u param;
 	}
 
-	[StructLayout(LayoutKind.Explicit)]
-	public struct Anonymous_a0a59d69_d9a4_4003_a198_f7c51511e31d
-	{
-		/// int
-		[FieldOffset(0)]
-		public int ac3;
-
-		/// int
-		[FieldOffset(0)]
-		public int dca;
-	}
-
 	[StructLayout(LayoutKind.Sequential)]
 	public struct hb_fifo_s
 	{

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs Changed

@@ -12,7 +12,7 @@
 {
 	public partial class NativeConstants
 	{
-		public const uint HB_ACODEC_MASK = 0x001FFF00;
+		public const uint HB_ACODEC_MASK = 0x00FFFF00;
 		public const uint HB_ACODEC_FAAC = 0x00000100;
 		public const uint HB_ACODEC_LAME = 0x00000200;
 		public const uint HB_ACODEC_VORBIS = 0x00000400;
@@ -26,7 +26,9 @@
 		public const uint HB_ACODEC_DCA_HD = 0x00040000;
 		public const uint HB_ACODEC_MP3 = 0x00080000;
 		public const uint HB_ACODEC_FFFLAC = 0x00100000;
-		public const uint HB_ACODEC_FF_MASK = 0x001f0000;
+		public const uint HB_ACODEC_FDK_AAC = 0x00400000;
+		public const uint HB_ACODEC_FDK_HAAC = 0x00800000;
+		public const uint HB_ACODEC_FF_MASK = 0x00FF2000;
 		public const uint HB_ACODEC_PASS_FLAG = 0x40000000;
 		public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA);
 		public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG);
@@ -42,34 +44,6 @@
 		public const int HB_SUBSTREAM_BD_DTSHD = 0x72;
 		public const int HB_SUBSTREAM_BD_DTS = 0x71;
 
-		public const int HB_AMIXDOWN_DCA_FORMAT_MASK = 0x00FFF000;
-		public const int HB_AMIXDOWN_A52_FORMAT_MASK = 0x00000FF0;
-		public const int HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK = 0x0000000F;
-		public const int HB_AMIXDOWN_NONE = 0x00000000;
-		public const int HB_AMIXDOWN_MONO = 0x01000001;
-		public const int HB_AMIXDOWN_STEREO = 0x02002022;
-		public const int HB_AMIXDOWN_DOLBY = 0x042070A2;
-		public const int HB_AMIXDOWN_DOLBYPLII = 0x084094A2;
-		public const int HB_AMIXDOWN_6CH = 0x10089176;
-
-		public const int HB_INPUT_CH_LAYOUT_MONO = 0x0110010;
-		public const int HB_INPUT_CH_LAYOUT_STEREO = 0x0220020;
-		public const int HB_INPUT_CH_LAYOUT_DOLBY = 0x0320031;
-		public const int HB_INPUT_CH_LAYOUT_3F = 0x0430030;
-		public const int HB_INPUT_CH_LAYOUT_2F1R = 0x0521021;
-		public const int HB_INPUT_CH_LAYOUT_3F1R = 0x0631031;
-		public const int HB_INPUT_CH_LAYOUT_2F2R = 0x0722022;
-		public const int HB_INPUT_CH_LAYOUT_3F2R = 0x0832032;
-		public const int HB_INPUT_CH_LAYOUT_4F2R = 0x0942042;
-		public const int HB_INPUT_CH_LAYOUT_3F4R = 0x0a34034;
-		public const int HB_INPUT_CH_LAYOUT_HAS_LFE = 0x0000100;
-		public const int HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK = 0x00F0000;
-		public const int HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK = 0x000F000;
-		public const int HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK = 0x0000F00;
-		public const int HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK = 0xFFFF0FF;
-		public const int HB_INPUT_CH_LAYOUT_ENCODED_FRONT_MASK = 0x00000F0;
-		public const int HB_INPUT_CH_LAYOUT_ENCODED_REAR_MASK = 0x000000F;
-
 		public const int HB_VCODEC_MASK = 0x0000FF;
 		public const int HB_VCODEC_X264 = 0x000001;
 		public const int HB_VCODEC_THEORA = 0x000002;
@@ -109,11 +83,20 @@
 
 		public const int HB_CONFIG_MAX_SIZE = 8192;
 
-		public const int HB_FILTER_DETELECINE = 1;
-		public const int HB_FILTER_DEINTERLACE = 2;
-		public const int HB_FILTER_DEBLOCK = 3;
-		public const int HB_FILTER_DENOISE = 4;
-		public const int HB_FILTER_DECOMB = 5;
-		public const int HB_FILTER_ROTATE = 6;
+		// see https://developer.apple.com/quicktime/icefloe/dispatch019.html#colr
+		public const int HB_COLR_PRI_BT709 = 1;
+		public const int HB_COLR_PRI_UNDEF = 2;
+		public const int HB_COLR_PRI_EBUTECH = 5; // use for bt470bg
+		public const int HB_COLR_PRI_SMPTEC = 6; // smpte170m; also use for bt470m and smpte240m
+		// 0, 3-4, 7-65535: reserved
+		public const int HB_COLR_TRA_BT709 = 1; // also use for bt470m, bt470bg and smpte170m
+		public const int HB_COLR_TRA_UNDEF = 2;
+		public const int HB_COLR_TRA_SMPTE240M = 7;
+		// 0, 3-6, 8-65535: reserved
+		public const int HB_COLR_MAT_BT709 = 1;
+		public const int HB_COLR_MAT_UNDEF = 2;
+		public const int HB_COLR_MAT_SMPTE170M = 6; // also use for fcc and bt470bg
+		public const int HB_COLR_MAT_SMPTE240M = 7;
+		// 0, 3-5, 8-65535: reserved
 	}
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs Changed

@@ -36,15 +36,14 @@
 		public hb_audio_config_output_s output;
 		public hb_audio_config_input_s input;
 
-		/// Anonymous_a0a59d69_d9a4_4003_a198_f7c51511e31d
-		public Anonymous_a0a59d69_d9a4_4003_a198_f7c51511e31d flags;
-
 		public hb_audio_config_lang_s lang;
 	}
 
 	[StructLayout(LayoutKind.Sequential)]
 	public struct hb_audio_config_output_s
 	{
+		public int mixdown;
+
 		/// int
 		public int track;
 
@@ -63,57 +62,78 @@
 
 		public float compression_level;
 
-		/// int
-		public int mixdown;
-
 		/// double
 		public double dynamic_range_compression;
 
 		public double gain;
 
-		/// char*
-		//[MarshalAs(UnmanagedType.LPStr)]
-		//public string name;
+		public int normalize_mix_level;
+
+		public int dither_method;
 
 		public IntPtr name;
 	}
 
+	public enum hb_mixdown
+	{
+		HB_INVALID_AMIXDOWN = -1,
+		HB_AMIXDOWN_NONE = 0,
+		HB_AMIXDOWN_MONO,
+		HB_AMIXDOWN_LEFT,
+		HB_AMIXDOWN_RIGHT,
+		HB_AMIXDOWN_STEREO,
+		HB_AMIXDOWN_DOLBY,
+		HB_AMIXDOWN_DOLBYPLII,
+		HB_AMIXDOWN_5POINT1,
+		HB_AMIXDOWN_6POINT1,
+		HB_AMIXDOWN_7POINT1,
+		HB_AMIXDOWN_5_2_LFE,
+	}
+
 	[StructLayout(LayoutKind.Sequential)]
 	public struct hb_audio_config_input_s
 	{
 		/// int
 		public int track;
 
-		/// uint32_t->unsigned int
+		/* Input audio codec */
 		public uint codec;
 
+		/* Per-codec config info */
+		public uint codec_param;
+
+		/* Registration descriptor of source */
 		public uint reg_desc;
 
+		/* Stream type from source stream */
 		public uint stream_type;
 
+		/* Substream type for multiplexed streams */
 		public uint substream_type;
 
-		/// uint32_t->unsigned int
-		public uint codec_param;
-
-		/// uint32_t->unsigned int
+		/* Bitsream version */
 		public uint version;
 
-		/// uint32_t->unsigned int
+		/* Bitstream flags, codec-specific */
+		public uint flags;
+
+		/* Bitstream mode, codec-specific */
 		public uint mode;
 
-		/// int
+		/* Input sample rate (Hz) */
 		public int samplerate;
 
+		/* Number of samples per frame */
 		public int samples_per_frame;
 
-		/// int
+		/* Input bitrate (bps) */
 		public int bitrate;
 
-		/// int
-		public int channel_layout;
+		/* Source channel layout, set by the audio decoder */
+		public ulong channel_layout;
 
-		// hb_chan_map_t *
+		/* Source channel map, set by the audio decoder */
+		// hb_chan_map_t
 		public IntPtr channel_map;
 	}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter.cs Added

@@ -0,0 +1,53 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_filter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+	using System;
+	using System.Runtime.InteropServices;
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_filter_object_s
+	{
+		public int id;
+		public int enforce_order;
+		public IntPtr name;
+		public IntPtr settings;
+
+		// Internal stuff we need to marshal
+		public IntPtr init;
+		public IntPtr work;
+		public IntPtr close;
+		public IntPtr info;
+		public IntPtr fifo_in;
+		public IntPtr fifo_out;
+		public IntPtr subtitle;
+		public IntPtr private_data;
+		public IntPtr thread;
+		public IntPtr done;
+		public int status;
+		public int chapter_val;
+		public long chapter_time;
+	}
+
+	public enum hb_filter_ids
+	{
+		// First, filters that may change the framerate (drop or dup frames)
+		HB_FILTER_DETELECINE = 1,
+		HB_FILTER_DECOMB,
+		HB_FILTER_DEINTERLACE,
+		HB_FILTER_VFR,
+		// Filters that must operate on the original source image are next
+		HB_FILTER_DEBLOCK,
+		HB_FILTER_DENOISE,
+		HB_FILTER_RENDER_SUB,
+		HB_FILTER_CROP_SCALE,
+		// Finally filters that don't care what order they are in,
+		// except that they must be after the above filters
+		HB_FILTER_ROTATE,
+	}
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs Changed

@@ -10,10 +10,10 @@
 
 namespace HandBrake.Interop.HbLib
 {
-    using System;
-    using System.Runtime.InteropServices;
+	using System;
+	using System.Runtime.InteropServices;
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
 	public struct hb_subtitle_s
 	{
 		/// int
@@ -22,6 +22,8 @@
 		/// int
 		public int track;
 
+		public int out_track;
+
 		/// hb_subtitle_config_t->hb_subtitle_config_s
 		public hb_subtitle_config_s config;
 
@@ -45,6 +47,8 @@
 		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16, ArraySubType = UnmanagedType.U4)]
 		public uint[] palette;
 
+		public byte palette_set;
+
 		public int width;
 
 		public int height;
@@ -59,6 +63,14 @@
 		/// int
 		public int forced_hits;
 
+		public uint codec;
+
+		public uint reg_desc;
+
+		public uint stream_type;
+
+		public uint substream_type;
+
 		/// hb_fifo_t*
 		public IntPtr fifo_in;
 
@@ -127,6 +139,8 @@
 
 		TX3GSUB,
 
-		SSASUB
+		SSASUB,
+
+		PGSSUB
 	}
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs Added

@@ -0,0 +1,227 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IHandBrakeInstance.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Interface for HandBrakeInstance
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interfaces
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Windows.Media.Imaging;
+
+    using HandBrake.Interop.EventArgs;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.SourceData;
+
+    /// <summary>
+    /// The Interface for HandBrakeInstance
+    /// </summary>
+    public interface IHandBrakeInstance
+    {
+        #region Events
+
+        /// <summary>
+        /// Fires when an encode has completed.
+        /// </summary>
+        event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
+
+        /// <summary>
+        /// Fires for progress updates when encoding.
+        /// </summary>
+        event EventHandler<EncodeProgressEventArgs> EncodeProgress;
+
+        /// <summary>
+        /// Fires when a scan has completed.
+        /// </summary>
+        event EventHandler<EventArgs> ScanCompleted;
+
+        /// <summary>
+        /// Fires for progress updates when scanning.
+        /// </summary>
+        event EventHandler<ScanProgressEventArgs> ScanProgress;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the index of the default title.
+        /// </summary>
+        int FeatureTitle { get; }
+
+        /// <summary>
+        /// Gets the number of previews created during scan.
+        /// </summary>
+        int PreviewCount { get; }
+
+        /// <summary>
+        /// Gets the list of titles on this instance.
+        /// </summary>
+        List<Title> Titles { get; }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Initializes this instance.
+        /// </summary>
+        /// <param name="verbosity">The code for the logging verbosity to use.</param>
+        void Initialize(int verbosity);
+
+        /// <summary>
+        /// Calculates the video bitrate for the given job and target size.
+        /// </summary>
+        /// <param name="job">
+        /// The encode job.
+        /// </param>
+        /// <param name="sizeMB">
+        /// The target size in MB.
+        /// </param>
+        /// <param name="overallSelectedLengthSeconds">
+        /// The currently selected encode length. Used in preview
+        /// for calculating bitrate when the target size would be wrong.
+        /// </param>
+        /// <returns>
+        /// The video bitrate in kbps.
+        /// </returns>
+        int CalculateBitrate(EncodeJob job, int sizeMB, double overallSelectedLengthSeconds = 0);
+
+        /// <summary>
+        /// Gives estimated file size (in MB) of the given job and video bitrate.
+        /// </summary>
+        /// <param name="job">
+        /// The encode job.
+        /// </param>
+        /// <param name="videoBitrate">
+        /// The video bitrate to be used (kbps).
+        /// </param>
+        /// <returns>
+        /// The estimated file size (in MB) of the given job and video bitrate.
+        /// </returns>
+        double CalculateFileSize(EncodeJob job, int videoBitrate);
+
+        /// <summary>
+        /// Frees any resources associated with this object.
+        /// </summary>
+        void Dispose();
+
+        /// <summary>
+        /// Gets an image for the given job and preview
+        /// </summary>
+        /// <remarks>
+        /// Only incorporates sizing and aspect ratio into preview image.
+        /// </remarks>
+        /// <param name="job">
+        /// The encode job to preview.
+        /// </param>
+        /// <param name="previewNumber">
+        /// The index of the preview to get (0-based).
+        /// </param>
+        /// <returns>
+        /// An image with the requested preview.
+        /// </returns>
+        BitmapImage GetPreview(EncodeJob job, int previewNumber);
+
+        /// <summary>
+        /// Gets the final size for a given encode job.
+        /// </summary>
+        /// <param name="job">
+        /// The encode job to use.
+        /// </param>
+        /// <param name="width">
+        /// The storage width.
+        /// </param>
+        /// <param name="height">
+        /// The storage height.
+        /// </param>
+        /// <param name="parWidth">
+        /// The pixel aspect X number.
+        /// </param>
+        /// <param name="parHeight">
+        /// The pixel aspect Y number.
+        /// </param>
+        void GetSize(EncodeJob job, out int width, out int height, out int parWidth, out int parHeight);
+
+        /// <summary>
+        /// Pauses the current encode.
+        /// </summary>
+        void PauseEncode();
+
+        /// <summary>
+        /// Resumes a paused encode.
+        /// </summary>
+        void ResumeEncode();
+
+        /// <summary>
+        /// Starts an encode with the given job.
+        /// </summary>
+        /// <param name="jobToStart">
+        /// The job to start.
+        /// </param>
+        void StartEncode(EncodeJob jobToStart);
+
+        /// <summary>
+        /// Starts an encode with the given job.
+        /// </summary>
+        /// <param name="job">
+        /// The job to start.
+        /// </param>
+        /// <param name="preview">
+        /// True if this is a preview encode.
+        /// </param>
+        /// <param name="previewNumber">
+        /// The preview number to start the encode at (0-based).
+        /// </param>
+        /// <param name="previewSeconds">
+        /// The number of seconds in the preview.
+        /// </param>
+        /// <param name="overallSelectedLengthSeconds">
+        /// The currently selected encode length. Used in preview
+        /// for calculating bitrate when the target size would be wrong.
+        /// </param>
+        void StartEncode(
+            EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds);
+
+        /// <summary>
+        /// Starts scanning the given path.
+        /// </summary>
+        /// <param name="path">
+        /// The path to the video to scan.
+        /// </param>
+        /// <param name="previewCount">
+        /// The number of preview images to make.
+        /// </param>
+        void StartScan(string path, int previewCount);
+
+        /// <summary>
+        /// Starts a scan of the given path.
+        /// </summary>
+        /// <param name="path">
+        /// The path of the video to scan.
+        /// </param>
+        /// <param name="previewCount">
+        /// The number of previews to make on each title.
+        /// </param>
+        /// <param name="titleIndex">
+        /// The title index to scan (1-based, 0 for all titles).
+        /// </param>
+        void StartScan(string path, int previewCount, int titleIndex);
+
+        /// <summary>
+        /// Stops the current encode.
+        /// </summary>
+        void StopEncode();
+
+        /// <summary>
+        /// Stop any running scans
+        /// </summary>
+        void StopScan();
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs Changed

@@ -12,13 +12,13 @@
 	using System;
 	using System.Collections.Generic;
 	using System.Runtime.InteropServices;
-
-	using HandBrake.Interop.HbLib;
-
-	/// <summary>
-	/// Helper utilities for native interop.
-	/// </summary>
-	public static class InteropUtilities
+
+	using HandBrake.Interop.HbLib;
+
+	/// <summary>
+	/// Helper utilities for native interop.
+	/// </summary>
+	public static class InteropUtilities
 	{
 		/// <summary>
 		/// Reads the given native structure pointer.
@@ -37,7 +37,7 @@
 		/// <typeparam name="T">The type of structure in the list.</typeparam>
 		/// <param name="listPtr">The pointer to the native list.</param>
 		/// <returns>The converted managed list.</returns>
-		public static List<T> ConvertList<T>(IntPtr listPtr)
+		public static List<T> ToList<T>(this IntPtr listPtr)
 		{
 			List<T> returnList = new List<T>();
 			hb_list_s itemList = ReadStructure<hb_list_s>(listPtr);
@@ -49,35 +49,54 @@
 			}
 
 			return returnList;
-		}
-
-		/// <summary>
-		/// Converts the given native array to a managed collection.
-		/// </summary>
-		/// <typeparam name="T">The type of item in the list.</typeparam>
-		/// <param name="arrayPtr">The pointer to the array.</param>
-		/// <param name="count">The number of items in the array.</param>
-		/// <returns>The converted collection.</returns>
-		public static IEnumerable<T> ConvertArray<T>(IntPtr arrayPtr, int count)
-		{
-			IntPtr currentItem = arrayPtr;
-
-			var result = new List<T>();
-			for (int i = 0; i < count; i++)
-			{
-				T nativeEncoder = ReadStructure<T>(currentItem);
-				result.Add(nativeEncoder);
-
-				currentItem = IntPtr.Add(currentItem, Marshal.SizeOf(typeof(T)));
-			}
-
-			return result;
-		} 
-
-		/// <summary>
-		/// Creats a new, empty native HandBrake list.
-		/// </summary>
-		/// <param name="capacity">The capacity of the new list.</param>
+		}
+
+		/// <summary>
+		/// Converts the HB list to a managed list of pointers.
+		/// </summary>
+		/// <param name="listPtr">The list to convert.</param>
+		/// <returns>The managed list of pointers.</returns>
+		public static List<IntPtr> ToIntPtrList(this IntPtr listPtr)
+		{
+			var returnList = new List<IntPtr>();
+			hb_list_s itemList = ReadStructure<hb_list_s>(listPtr);
+
+			for (int i = 0; i < itemList.items_count; i++)
+			{
+				IntPtr itemPtr = Marshal.ReadIntPtr(itemList.items, i * Marshal.SizeOf(typeof(IntPtr)));
+				returnList.Add(itemPtr);
+			}
+
+			return returnList;
+		}
+
+		/// <summary>
+		/// Converts the given native array to a managed collection.
+		/// </summary>
+		/// <typeparam name="T">The type of item in the list.</typeparam>
+		/// <param name="arrayPtr">The pointer to the array.</param>
+		/// <param name="count">The number of items in the array.</param>
+		/// <returns>The converted collection.</returns>
+		public static IEnumerable<T> ConvertArray<T>(IntPtr arrayPtr, int count)
+		{
+			IntPtr currentItem = arrayPtr;
+
+			var result = new List<T>();
+			for (int i = 0; i < count; i++)
+			{
+				T nativeEncoder = ReadStructure<T>(currentItem);
+				result.Add(nativeEncoder);
+
+				currentItem = IntPtr.Add(currentItem, Marshal.SizeOf(typeof(T)));
+			}
+
+			return result;
+		} 
+
+		/// <summary>
+		/// Creats a new, empty native HandBrake list.
+		/// </summary>
+		/// <param name="capacity">The capacity of the new list.</param>
 		/// <returns>The new native list.</returns>
 		public static NativeList CreateNativeList(int capacity)
 		{
@@ -87,12 +106,9 @@
 			IntPtr nativeListInternal = Marshal.AllocHGlobal(capacity * intSize);
 			returnList.AllocatedMemory.Add(nativeListInternal);
 
-			hb_list_s nativeListStruct = new hb_list_s();
-			nativeListStruct.items = nativeListInternal;
-			nativeListStruct.items_alloc = capacity;
-			nativeListStruct.items_count = 0;
+			hb_list_s nativeListStruct = new hb_list_s { items = nativeListInternal, items_alloc = capacity, items_count = 0 };
 
-			IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
+		    IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
 			Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);
 
 			returnList.ListPtr = nativeListStructPtr;
@@ -116,12 +132,14 @@
 				Marshal.WriteIntPtr(nativeListInternal, i * intSize, list[i]);
 			}
 
-			hb_list_s nativeListStruct = new hb_list_s();
-			nativeListStruct.items = nativeListInternal;
-			nativeListStruct.items_alloc = list.Count;
-			nativeListStruct.items_count = list.Count;
+			hb_list_s nativeListStruct = new hb_list_s
+			                                 {
+			                                     items = nativeListInternal,
+			                                     items_alloc = list.Count,
+			                                     items_count = list.Count
+			                                 };
 
-			IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
+		    IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
 			Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);
 
 			returnList.ListPtr = nativeListStructPtr;
@@ -150,12 +168,14 @@
 				Marshal.WriteIntPtr(nativeListInternal, i * intSize, itemPtr);
 			}
 
-			hb_list_s nativeListStruct = new hb_list_s();
-			nativeListStruct.items = nativeListInternal;
-			nativeListStruct.items_alloc = list.Count;
-			nativeListStruct.items_count = list.Count;
+			hb_list_s nativeListStruct = new hb_list_s
+			                                 {
+			                                     items = nativeListInternal,
+			                                     items_alloc = list.Count,
+			                                     items_count = list.Count
+			                                 };
 
-			IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
+		    IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
 			Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);
 
 			returnList.ListPtr = nativeListStructPtr;
@@ -163,6 +183,23 @@
 		}
 
 		/// <summary>
+		/// Closes the given job.
+		/// </summary>
+		/// <param name="nativeJobPtr">The pointer to the job.</param>
+		public static void CloseJob(IntPtr nativeJobPtr)
+		{
+			// Create a point to the job pointer first.
+			IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+
+			// Assign the new pointer to the job pointer and tell HB to clean the job up.
+			Marshal.WriteIntPtr(nativeJobPtrPtr, nativeJobPtr);
+			HBFunctions.hb_job_close(nativeJobPtrPtr);
+
+			// Free the pointer we used.
+			Marshal.FreeHGlobal(nativeJobPtrPtr);
+		}
+
+		/// <summary>
 		/// Frees all the memory locations in the given list.
 		/// </summary>
 		/// <param name="memoryList">The list of memory locations to free.</param>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/LanguageCodes.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/LanguageCodes.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/BitrateLimits.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/BitrateLimits.cs Changed

@@ -1,15 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the BitrateLimits type.
+// </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.Interop.Model
-{
-	public class BitrateLimits
-	{
-		public int Low { get; set; }
-
-		public int High { get; set; }
+{
+    /// <summary>
+    /// The bitrate limits.
+    /// </summary>
+    public class BitrateLimits
+	{
+        /// <summary>
+        /// Gets or sets the low.
+        /// </summary>
+        public int Low { get; set; }
+
+        /// <summary>
+        /// Gets or sets the high.
+        /// </summary>
+        public int High { get; set; }
 	}
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs Changed

@@ -9,84 +9,162 @@
 
 namespace HandBrake.Interop.Model
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Xml.Serialization;
-
-	using HandBrake.Interop.Model.Encoding;
-
-	public class EncodeJob
-	{
-		public SourceType SourceType { get; set; }
-		public string SourcePath { get; set; }
-
-		/// <summary>
-		/// Gets or sets the 1-based index of the title to encode.
-		/// </summary>
-		public int Title { get; set; }
-
-		/// <summary>
-		/// Gets or sets the angle to encode. 0 for default, 1+ for specified angle.
-		/// </summary>
-		public int Angle { get; set; }
-
-		public VideoRangeType RangeType { get; set; }
-		public int ChapterStart { get; set; }
-		public int ChapterEnd { get; set; }
-
-		public double SecondsStart { get; set; }
-		public double SecondsEnd { get; set; }
-
-		public int FramesStart { get; set; }
-		public int FramesEnd { get; set; }
-
-		/// <summary>
-		/// Gets or sets the list of chosen audio tracks (1-based)
-		/// </summary>
-		public List<int> ChosenAudioTracks { get; set; }
-		public Subtitles Subtitles { get; set; }
-		public bool UseDefaultChapterNames { get; set; }
-		public List<string> CustomChapterNames { get; set; }
-
-		public string OutputPath { get; set; }
-
-		public EncodingProfile EncodingProfile { get; set; }
-
-		// The length of video to encode.
-		[XmlIgnore]
-		public TimeSpan Length { get; set; }
-
-		[XmlElement("Length")]
-		public string XmlLength
-		{
-			get { return this.Length.ToString(); }
-			set { this.Length = TimeSpan.Parse(value); }
-		}
-
-		public EncodeJob Clone()
-		{
-			EncodeJob clone = new EncodeJob
-			{
-				SourceType = this.SourceType,
-				SourcePath = this.SourcePath,
-				Title = this.Title,
-				Angle = this.Angle,
-				RangeType = this.RangeType,
-				ChapterStart = this.ChapterStart,
-				ChapterEnd = this.ChapterEnd,
-				SecondsStart = this.SecondsStart,
-				SecondsEnd = this.SecondsEnd,
-				FramesStart = this.FramesStart,
-				FramesEnd = this.FramesEnd,
-				ChosenAudioTracks = new List<int>(this.ChosenAudioTracks),
-				Subtitles = this.Subtitles,
-				UseDefaultChapterNames = this.UseDefaultChapterNames,
-				OutputPath = this.OutputPath,
-				EncodingProfile = this.EncodingProfile,
-				Length = this.Length
-			};
-
-			return clone;
-		}
-	}
-}
+    using System;
+    using System.Collections.Generic;
+    using System.Xml.Serialization;
+
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// The encode job.
+    /// </summary>
+    public class EncodeJob
+    {
+        #region Properties
+
+        /// <summary>
+        ///     Gets or sets the angle to encode. 0 for default, 1+ for specified angle.
+        /// </summary>
+        public int Angle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the chapter end.
+        /// </summary>
+        public int ChapterEnd { get; set; }
+
+        /// <summary>
+        /// Gets or sets the chapter start.
+        /// </summary>
+        public int ChapterStart { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the list of chosen audio tracks (1-based)
+        /// </summary>
+        public List<int> ChosenAudioTracks { get; set; }
+
+        /// <summary>
+        /// Gets or sets the custom chapter names.
+        /// </summary>
+        public List<string> CustomChapterNames { get; set; }
+
+        /// <summary>
+        /// Gets or sets the encoding profile.
+        /// </summary>
+        public EncodingProfile EncodingProfile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the frames end.
+        /// </summary>
+        public int FramesEnd { get; set; }
+
+        /// <summary>
+        /// Gets or sets the frames start.
+        /// </summary>
+        public int FramesStart { get; set; }
+
+        /// <summary>
+        /// Gets or sets the length. The length of video to encode.
+        /// </summary>
+        [XmlIgnore]
+        public TimeSpan Length { get; set; }
+
+        /// <summary>
+        /// Gets or sets the output path.
+        /// </summary>
+        public string OutputPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the range type.
+        /// </summary>
+        public VideoRangeType RangeType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the seconds end.
+        /// </summary>
+        public double SecondsEnd { get; set; }
+
+        /// <summary>
+        /// Gets or sets the seconds start.
+        /// </summary>
+        public double SecondsStart { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source path.
+        /// </summary>
+        public string SourcePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source type.
+        /// </summary>
+        public SourceType SourceType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitles.
+        /// </summary>
+        public Subtitles Subtitles { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the 1-based index of the title to encode.
+        /// </summary>
+        public int Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether use default chapter names.
+        /// </summary>
+        public bool UseDefaultChapterNames { get; set; }
+
+        /// <summary>
+        /// Gets or sets the xml length.
+        /// </summary>
+        [XmlElement("Length")]
+        public string XmlLength
+        {
+            get
+            {
+                return this.Length.ToString();
+            }
+            set
+            {
+                this.Length = TimeSpan.Parse(value);
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The clone.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="EncodeJob"/>.
+        /// </returns>
+        public EncodeJob Clone()
+        {
+            var clone = new EncodeJob
+                            {
+                                SourceType = this.SourceType, 
+                                SourcePath = this.SourcePath, 
+                                Title = this.Title, 
+                                Angle = this.Angle, 
+                                RangeType = this.RangeType, 
+                                ChapterStart = this.ChapterStart, 
+                                ChapterEnd = this.ChapterEnd, 
+                                SecondsStart = this.SecondsStart, 
+                                SecondsEnd = this.SecondsEnd, 
+                                FramesStart = this.FramesStart, 
+                                FramesEnd = this.FramesEnd, 
+                                ChosenAudioTracks = new List<int>(this.ChosenAudioTracks), 
+                                Subtitles = this.Subtitles, 
+                                UseDefaultChapterNames = this.UseDefaultChapterNames, 
+                                OutputPath = this.OutputPath, 
+                                EncodingProfile = this.EncodingProfile, 
+                                Length = this.Length
+                            };
+
+            return clone;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs Changed

@@ -1,268 +1,300 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Encoders.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Runtime.InteropServices;
-	using HandBrake.Interop.HbLib;
-	using HandBrake.Interop.Model.Encoding;
-	using HandBrake.Interop.SourceData;
-
-	public static class Encoders
-	{
-		private static List<HBAudioEncoder> audioEncoders;
-		private static List<HBVideoEncoder> videoEncoders;
-		private static List<HBMixdown> mixdowns;
-		private static List<int> audioBitrates; 
-
-		/// <summary>
-		/// Gets a list of supported audio encoders.
-		/// </summary>
-		public static List<HBAudioEncoder> AudioEncoders
-		{
-			get
-			{
-				if (audioEncoders == null)
-				{
-					IntPtr encodersPtr = HBFunctions.hb_get_audio_encoders();
-					int encoderCount = HBFunctions.hb_get_audio_encoders_count();
-
-					audioEncoders = InteropUtilities.ConvertArray<hb_encoder_s>(encodersPtr, encoderCount)
-						.Select(Converters.NativeToAudioEncoder)
-						.ToList();
-				}
-
-				return audioEncoders;
-			}
-		}
-
-		/// <summary>
-		/// Gets a list of supported video encoders.
-		/// </summary>
-		public static List<HBVideoEncoder> VideoEncoders
-		{
-			get
-			{
-				if (videoEncoders == null)
-				{
-					IntPtr encodersPtr = HBFunctions.hb_get_video_encoders();
-					int encoderCount = HBFunctions.hb_get_video_encoders_count();
-
-					videoEncoders = InteropUtilities.ConvertArray<hb_encoder_s>(encodersPtr, encoderCount)
-						.Select(Converters.NativeToVideoEncoder)
-						.ToList();
-				}
-
-				return videoEncoders;
-			}
-		}
-
-		/// <summary>
-		/// Gets a list of supported mixdowns.
-		/// </summary>
-		public static List<HBMixdown> Mixdowns
-		{
-			get
-			{
-				if (mixdowns == null)
-				{
-					IntPtr mixdownsPtr = HBFunctions.hb_get_audio_mixdowns();
-					int mixdownsCount = HBFunctions.hb_get_audio_mixdowns_count();
-
-					mixdowns = InteropUtilities.ConvertArray<hb_mixdown_s>(mixdownsPtr, mixdownsCount)
-						.Select(Converters.NativeToMixdown)
-						.ToList();
-				}
-
-				return mixdowns;
-			}
-		}
-
-		/// <summary>
-		/// Gets a list of supported audio bitrates.
-		/// </summary>
-		public static List<int> AudioBitrates
-		{
-			get
-			{
-				if (audioBitrates == null)
-				{
-					IntPtr audioBitratesPtr = HBFunctions.hb_get_audio_bitrates();
-					int audioBitratesCount = HBFunctions.hb_get_audio_bitrates_count();
-
-					audioBitrates = InteropUtilities.ConvertArray<hb_rate_s>(audioBitratesPtr, audioBitratesCount)
-						.Select(b => b.rate)
-						.ToList();
-				}
-
-				return audioBitrates;
-			}
-		}
-
-		/// <summary>
-		/// Gets the audio encoder with the specified short name.
-		/// </summary>
-		/// <param name="shortName">The name of the audio encoder.</param>
-		/// <returns>The requested audio encoder.</returns>
-		public static HBAudioEncoder GetAudioEncoder(string shortName)
-		{
-			return AudioEncoders.SingleOrDefault(e => e.ShortName == shortName);
-		}
-
-		/// <summary>
-		/// Gets the mixdown with the specified short name.
-		/// </summary>
-		/// <param name="shortName">The name of the mixdown.</param>
-		/// <returns>The requested mixdown.</returns>
-		public static HBMixdown GetMixdown(string shortName)
-		{
-			return Mixdowns.SingleOrDefault(m => m.ShortName == shortName);
-		}
-
-		/// <summary>
-		/// Determines if the given encoder is compatible with the given track.
-		/// </summary>
-		/// <param name="track">The audio track to examine.</param>
-		/// <param name="encoder">The encoder to examine.</param>
-		/// <returns>True if the given encoder is comatible with the given audio track.</returns>
-		/// <remarks>Only works with passthrough encoders.</remarks>
-		public static bool AudioEncoderIsCompatible(AudioTrack track, HBAudioEncoder encoder)
-		{
-			return (track.CodecId & encoder.Id) > 0;
-		}
-
-		/// <summary>
-		/// Finds the highest possible mixdown for a given audio encoder.
-		/// </summary>
-		/// <param name="audioEncoder">The audio encoder in question.</param>
-		/// <returns>The highest possible mixdown for that audio encoder.</returns>
-		public static int GetMaxMixdownIndex(HBAudioEncoder audioEncoder)
-		{
-			// To find best case scenario, pass in highest number of channels and 6-channel discrete mixdown.
-			int maxMixdownId = HBFunctions.hb_get_best_mixdown((uint)audioEncoder.Id, NativeConstants.HB_INPUT_CH_LAYOUT_3F4R, NativeConstants.HB_AMIXDOWN_6CH);
-
-			for (int i = 0; i < Mixdowns.Count; i++)
-			{
-				if (Mixdowns[i].Id == maxMixdownId)
-				{
-					return i;
-				}
-			}
-
-			return -1;
-		} 
-
-		/// <summary>
-		/// Sanitizes a mixdown given the output codec and input channel layout.
-		/// </summary>
-		/// <param name="mixdown">The desired mixdown.</param>
-		/// <param name="encoder">The output encoder to be used.</param>
-		/// <param name="layout">The input channel layout.</param>
-		/// <returns>A sanitized mixdown value.</returns>
-		public static HBMixdown SanitizeMixdown(HBMixdown mixdown, HBAudioEncoder encoder, int layout)
-		{
-			int sanitizedMixdown = HBFunctions.hb_get_best_mixdown((uint)encoder.Id, layout, mixdown.Id);
-			return Mixdowns.Single(m => m.Id == sanitizedMixdown);
-		}
-
-		/// <summary>
-		/// Gets the default mixdown for the given audio encoder and channel layout.
-		/// </summary>
-		/// <param name="encoder">The output codec to be used.</param>
-		/// <param name="layout">The input channel layout.</param>
-		/// <returns>The default mixdown for the given codec and channel layout.</returns>
-		public static HBMixdown GetDefaultMixdown(HBAudioEncoder encoder, int layout)
-		{
-			int defaultMixdown = HBFunctions.hb_get_default_mixdown((uint)encoder.Id, layout);
-			return Mixdowns.Single(m => m.Id == defaultMixdown);
-		}
-
-		/// <summary>
-		/// Gets the bitrate limits for the given audio codec, sample rate and mixdown.
-		/// </summary>
-		/// <param name="encoder">The audio encoder used.</param>
-		/// <param name="sampleRate">The sample rate used (Hz).</param>
-		/// <param name="mixdown">The mixdown used.</param>
-		/// <returns>Limits on the audio bitrate for the given settings.</returns>
-		public static BitrateLimits GetBitrateLimits(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
-		{
-			int low = 0;
-			int high = 0;
-
-			HBFunctions.hb_get_audio_bitrate_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
-
-			return new BitrateLimits { Low = low, High = high };
-		}
-
-		/// <summary>
-		/// Sanitizes an audio bitrate given the output codec, sample rate and mixdown.
-		/// </summary>
-		/// <param name="audioBitrate">The desired audio bitrate.</param>
-		/// <param name="encoder">The output encoder to be used.</param>
-		/// <param name="sampleRate">The output sample rate to be used.</param>
-		/// <param name="mixdown">The mixdown to be used.</param>
-		/// <returns>A sanitized audio bitrate.</returns>
-		public static int SanitizeAudioBitrate(int audioBitrate, HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
-		{
-			return HBFunctions.hb_get_best_audio_bitrate((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
-		}
-
-		/// <summary>
-		/// Gets the default audio bitrate for the given parameters.
-		/// </summary>
-		/// <param name="encoder">The encoder to use.</param>
-		/// <param name="sampleRate">The sample rate to use.</param>
-		/// <param name="mixdown">The mixdown to use.</param>
-		/// <returns>The default bitrate for these parameters.</returns>
-		public static int GetDefaultBitrate(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
-		{
-			return HBFunctions.hb_get_default_audio_bitrate((uint) encoder.Id, sampleRate, mixdown.Id);
-		}
-
-		/// <summary>
-		/// Gets limits on audio quality for a given encoder.
-		/// </summary>
-		/// <param name="encoderId">The audio encoder ID.</param>
-		/// <returns>Limits on the audio quality for the given encoder.</returns>
-		internal static RangeLimits GetAudioQualityLimits(int encoderId)
-		{
-			float low = 0, high = 0, granularity = 0;
-			int direction = 0;
-			HBFunctions.hb_get_audio_quality_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
-
-			return new RangeLimits
-			{
-				Low = low,
-				High = high,
-				Granularity = granularity,
-				Ascending = direction == 0
-			};
-		}
-
-		/// <summary>
-		/// Gets limits on audio compression for a given encoder.
-		/// </summary>
-		/// <param name="encoderId">The audio encoder ID.</param>
-		/// <returns>Limits on the audio compression for the given encoder.</returns>
-		internal static RangeLimits GetAudioCompressionLimits(int encoderId)
-		{
-			float low = 0, high = 0, granularity = 0;
-			int direction = 0;
-			HBFunctions.hb_get_audio_compression_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
-
-			return new RangeLimits
-			{
-				Low = low,
-				High = high,
-				Granularity = granularity,
-				Ascending = direction == 0
-			};
-		}
-	}
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Encoders.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The encoders.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
+{
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+
+	using HandBrake.Interop.HbLib;
+	using HandBrake.Interop.Model.Encoding;
+	using HandBrake.Interop.SourceData;
+
+    /// <summary>
+    /// The encoders.
+    /// </summary>
+    public static class Encoders
+	{
+	    /// <summary>
+	    /// The audio encoders.
+	    /// </summary>
+	    private static List<HBAudioEncoder> audioEncoders;
+
+	    /// <summary>
+	    /// The video encoders.
+	    /// </summary>
+	    private static List<HBVideoEncoder> videoEncoders;
+
+	    /// <summary>
+	    /// The mixdowns.
+	    /// </summary>
+	    private static List<HBMixdown> mixdowns;
+
+	    /// <summary>
+	    /// The audio bitrates.
+	    /// </summary>
+	    private static List<int> audioBitrates; 
+
+		/// <summary>
+		/// Gets a list of supported audio encoders.
+		/// </summary>
+		public static List<HBAudioEncoder> AudioEncoders
+		{
+			get
+			{
+				if (audioEncoders == null)
+				{
+					IntPtr encodersPtr = HBFunctions.hb_get_audio_encoders();
+					int encoderCount = HBFunctions.hb_get_audio_encoders_count();
+
+					audioEncoders = InteropUtilities.ConvertArray<hb_encoder_s>(encodersPtr, encoderCount)
+						.Select(Converters.NativeToAudioEncoder)
+						.ToList();
+				}
+
+				return audioEncoders;
+			}
+		}
+
+		/// <summary>
+		/// Gets a list of supported video encoders.
+		/// </summary>
+		public static List<HBVideoEncoder> VideoEncoders
+		{
+			get
+			{
+				if (videoEncoders == null)
+				{
+					IntPtr encodersPtr = HBFunctions.hb_get_video_encoders();
+					int encoderCount = HBFunctions.hb_get_video_encoders_count();
+
+					videoEncoders = InteropUtilities.ConvertArray<hb_encoder_s>(encodersPtr, encoderCount)
+						.Select(Converters.NativeToVideoEncoder)
+						.ToList();
+				}
+
+				return videoEncoders;
+			}
+		}
+
+		/// <summary>
+		/// Gets a list of supported mixdowns.
+		/// </summary>
+		public static List<HBMixdown> Mixdowns
+		{
+			get
+			{
+				if (mixdowns == null)
+				{
+					IntPtr mixdownsPtr = HBFunctions.hb_get_audio_mixdowns();
+					int mixdownsCount = HBFunctions.hb_get_audio_mixdowns_count();
+
+					mixdowns = InteropUtilities.ConvertArray<hb_mixdown_s>(mixdownsPtr, mixdownsCount)
+						.Select(Converters.NativeToMixdown)
+						.ToList();
+				}
+
+				return mixdowns;
+			}
+		}
+
+		/// <summary>
+		/// Gets a list of supported audio bitrates.
+		/// </summary>
+		public static List<int> AudioBitrates
+		{
+			get
+			{
+				if (audioBitrates == null)
+				{
+					IntPtr audioBitratesPtr = HBFunctions.hb_get_audio_bitrates();
+					int audioBitratesCount = HBFunctions.hb_get_audio_bitrates_count();
+
+					audioBitrates = InteropUtilities.ConvertArray<hb_rate_s>(audioBitratesPtr, audioBitratesCount)
+						.Select(b => b.rate)
+						.ToList();
+				}
+
+				return audioBitrates;
+			}
+		}
+
+		/// <summary>
+		/// Gets the audio encoder with the specified short name.
+		/// </summary>
+		/// <param name="shortName">The name of the audio encoder.</param>
+		/// <returns>The requested audio encoder.</returns>
+		public static HBAudioEncoder GetAudioEncoder(string shortName)
+		{
+			return AudioEncoders.SingleOrDefault(e => e.ShortName == shortName);
+		}
+
+		/// <summary>
+		/// Gets the video encoder with the specified short name.
+		/// </summary>
+		/// <param name="shortName">The name of the video encoder.</param>
+		/// <returns>The requested video encoder.</returns>
+		public static HBVideoEncoder GetVideoEncoder(string shortName)
+		{
+			return VideoEncoders.SingleOrDefault(e => e.ShortName == shortName);
+		}
+
+		/// <summary>
+		/// Gets the mixdown with the specified short name.
+		/// </summary>
+		/// <param name="shortName">The name of the mixdown.</param>
+		/// <returns>The requested mixdown.</returns>
+		public static HBMixdown GetMixdown(string shortName)
+		{
+			return Mixdowns.SingleOrDefault(m => m.ShortName == shortName);
+		}
+
+		/// <summary>
+		/// Determines if the given encoder is compatible with the given track.
+		/// </summary>
+		/// <param name="track">The audio track to examine.</param>
+		/// <param name="encoder">The encoder to examine.</param>
+		/// <returns>True if the given encoder is comatible with the given audio track.</returns>
+		/// <remarks>Only works with passthrough encoders.</remarks>
+		public static bool AudioEncoderIsCompatible(AudioTrack track, HBAudioEncoder encoder)
+		{
+			return (track.CodecId & encoder.Id) > 0;
+		}
+
+		/// <summary>
+		/// Determines if the given mixdown supports the given channel layout.
+		/// </summary>
+		/// <param name="mixdown">The mixdown to evaluate.</param>
+		/// <param name="layout">The channel layout to evaluate.</param>
+		/// <returns>True if the mixdown supports the given channel layout.</returns>
+		public static bool MixdownHasRemixSupport(HBMixdown mixdown, ulong layout)
+		{
+			return HBFunctions.hb_mixdown_has_remix_support(mixdown.Id, layout) > 0;
+		}
+
+		/// <summary>
+		/// Determines if the given encoder supports the given mixdown.
+		/// </summary>
+		/// <param name="mixdown">The mixdown to evaluate.</param>
+		/// <param name="encoder">The encoder to evaluate.</param>
+		/// <returns>True if the encoder supports the mixdown.</returns>
+		public static bool MixdownHasCodecSupport(HBMixdown mixdown, HBAudioEncoder encoder)
+		{
+			return HBFunctions.hb_mixdown_has_codec_support(mixdown.Id, (uint) encoder.Id) > 0;
+		}
+
+		/// <summary>
+		/// Sanitizes a mixdown given the output codec and input channel layout.
+		/// </summary>
+		/// <param name="mixdown">The desired mixdown.</param>
+		/// <param name="encoder">The output encoder to be used.</param>
+		/// <param name="layout">The input channel layout.</param>
+		/// <returns>A sanitized mixdown value.</returns>
+		public static HBMixdown SanitizeMixdown(HBMixdown mixdown, HBAudioEncoder encoder, ulong layout)
+		{
+			int sanitizedMixdown = HBFunctions.hb_get_best_mixdown((uint)encoder.Id, layout, mixdown.Id);
+			return Mixdowns.Single(m => m.Id == sanitizedMixdown);
+		}
+
+		/// <summary>
+		/// Gets the default mixdown for the given audio encoder and channel layout.
+		/// </summary>
+		/// <param name="encoder">The output codec to be used.</param>
+		/// <param name="layout">The input channel layout.</param>
+		/// <returns>The default mixdown for the given codec and channel layout.</returns>
+		public static HBMixdown GetDefaultMixdown(HBAudioEncoder encoder, ulong layout)
+		{
+			int defaultMixdown = HBFunctions.hb_get_default_mixdown((uint)encoder.Id, layout);
+			return Mixdowns.Single(m => m.Id == defaultMixdown);
+		}
+
+		/// <summary>
+		/// Gets the bitrate limits for the given audio codec, sample rate and mixdown.
+		/// </summary>
+		/// <param name="encoder">The audio encoder used.</param>
+		/// <param name="sampleRate">The sample rate used (Hz).</param>
+		/// <param name="mixdown">The mixdown used.</param>
+		/// <returns>Limits on the audio bitrate for the given settings.</returns>
+		public static BitrateLimits GetBitrateLimits(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
+		{
+			int low = 0;
+			int high = 0;
+
+			HBFunctions.hb_get_audio_bitrate_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
+
+			return new BitrateLimits { Low = low, High = high };
+		}
+
+		/// <summary>
+		/// Sanitizes an audio bitrate given the output codec, sample rate and mixdown.
+		/// </summary>
+		/// <param name="audioBitrate">The desired audio bitrate.</param>
+		/// <param name="encoder">The output encoder to be used.</param>
+		/// <param name="sampleRate">The output sample rate to be used.</param>
+		/// <param name="mixdown">The mixdown to be used.</param>
+		/// <returns>A sanitized audio bitrate.</returns>
+		public static int SanitizeAudioBitrate(int audioBitrate, HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
+		{
+			return HBFunctions.hb_get_best_audio_bitrate((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
+		}
+
+		/// <summary>
+		/// Gets the default audio bitrate for the given parameters.
+		/// </summary>
+		/// <param name="encoder">The encoder to use.</param>
+		/// <param name="sampleRate">The sample rate to use.</param>
+		/// <param name="mixdown">The mixdown to use.</param>
+		/// <returns>The default bitrate for these parameters.</returns>
+		public static int GetDefaultBitrate(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
+		{
+			return HBFunctions.hb_get_default_audio_bitrate((uint) encoder.Id, sampleRate, mixdown.Id);
+		}
+
+		/// <summary>
+		/// Gets limits on audio quality for a given encoder.
+		/// </summary>
+		/// <param name="encoderId">The audio encoder ID.</param>
+		/// <returns>Limits on the audio quality for the given encoder.</returns>
+		internal static RangeLimits GetAudioQualityLimits(int encoderId)
+		{
+			float low = 0, high = 0, granularity = 0;
+			int direction = 0;
+			HBFunctions.hb_get_audio_quality_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+
+			return new RangeLimits
+			{
+				Low = low,
+				High = high,
+				Granularity = granularity,
+				Ascending = direction == 0
+			};
+		}
+
+		/// <summary>
+		/// Gets limits on audio compression for a given encoder.
+		/// </summary>
+		/// <param name="encoderId">The audio encoder ID.</param>
+		/// <returns>Limits on the audio compression for the given encoder.</returns>
+		internal static RangeLimits GetAudioCompressionLimits(int encoderId)
+		{
+			float low = 0, high = 0, granularity = 0;
+			int direction = 0;
+			HBFunctions.hb_get_audio_compression_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+
+			return new RangeLimits
+			{
+				Low = low,
+				High = high,
+				Granularity = granularity,
+				Ascending = direction == 0
+			};
+		}
+	}
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs Changed

@@ -9,6 +9,7 @@
 
 namespace HandBrake.Interop.Model.Encoding
 {
+	using System;
 	using System.Collections.Generic;
 
 	using HandBrake.Interop.Model;
@@ -31,7 +32,7 @@
 		public int Height { get; set; }
 		public int MaxWidth { get; set; }
 		public int MaxHeight { get; set; }
-		public bool CustomCropping { get; set; }
+		public CroppingType CroppingType { get; set; }
 		public Cropping Cropping { get; set; }
 		public Anamorphic Anamorphic { get; set; }
 		public bool UseDisplayWidth { get; set; }
@@ -56,7 +57,9 @@
 		public string X264Options { get; set; }
 		public string X264Profile { get; set; }
 		public string X264Preset { get; set; }
-		public string X264Tune { get; set; }
+
+		public List<string> X264Tunes { get; set; }
+		public string H264Level { get; set; }
 		public VideoEncodeRateType VideoEncodeRateType { get; set; }
 		public double Quality { get; set; }
 		public int TargetSize { get; set; }
@@ -64,14 +67,14 @@
 		public bool TwoPass { get; set; }
 		public bool TurboFirstPass { get; set; }
 		public double Framerate { get; set; }
-		public bool PeakFramerate { get; set; }
+		public bool ConstantFramerate { get; set; }
 
 		public List<AudioEncoding> AudioEncodings { get; set; }
 		public string AudioEncoderFallback { get; set; }
 
 		public EncodingProfile Clone()
 		{
-			EncodingProfile profile = new EncodingProfile
+			var profile = new EncodingProfile
 			{
 				OutputFormat = this.OutputFormat,
 				PreferredExtension = this.PreferredExtension,
@@ -84,7 +87,7 @@
 				Height = this.Height,
 				MaxWidth = this.MaxWidth,
 				MaxHeight = this.MaxHeight,
-				CustomCropping = this.CustomCropping,
+				CroppingType = this.CroppingType,
 				Cropping = this.Cropping.Clone(),
 				Anamorphic = this.Anamorphic,
 				UseDisplayWidth = this.UseDisplayWidth,
@@ -109,7 +112,8 @@
 				X264Options = this.X264Options,
 				X264Profile = this.X264Profile,
 				X264Preset = this.X264Preset,
-				X264Tune = this.X264Tune,
+				X264Tunes = this.X264Tunes,
+				H264Level = this.H264Level,
 				VideoEncodeRateType = this.VideoEncodeRateType,
 				Quality = this.Quality,
 				TargetSize = this.TargetSize,
@@ -117,7 +121,7 @@
 				TwoPass = this.TwoPass,
 				TurboFirstPass = this.TurboFirstPass,
 				Framerate = this.Framerate,
-				PeakFramerate = this.PeakFramerate,
+				ConstantFramerate = this.ConstantFramerate,
 
 				AudioEncodings = new List<AudioEncoding>(this.AudioEncodings)
 			};

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/RangeLimits.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/RangeLimits.cs Changed

@@ -1,16 +1,41 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model
-{
-	public class RangeLimits
-	{
-		public float Low { get; set; }
-		public float High { get; set; }
-		public float Granularity { get; set; }
-		public bool Ascending { get; set; }
-	}
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The range limits.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
+{
+    /// <summary>
+    /// The range limits.
+    /// </summary>
+    public class RangeLimits
+    {
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ascending.
+        /// </summary>
+        public bool Ascending { get; set; }
+
+        /// <summary>
+        /// Gets or sets the granularity.
+        /// </summary>
+        public float Granularity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the high.
+        /// </summary>
+        public float High { get; set; }
+
+        /// <summary>
+        /// Gets or sets the low.
+        /// </summary>
+        public float Low { get; set; }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs Changed

@@ -9,15 +9,42 @@
 
 namespace HandBrake.Interop.Model
 {
-	public class Size
-	{
-		public Size(int width, int height)
-		{
-			this.Width = width;
-			this.Height = height;
-		}
+    /// <summary>
+    /// The size.
+    /// </summary>
+    public class Size
+    {
+        #region Constructors and Destructors
 
-		public int Width { get; set; }
-		public int Height { get; set; }
-	}
-}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Size"/> class.
+        /// </summary>
+        /// <param name="width">
+        /// The width.
+        /// </param>
+        /// <param name="height">
+        /// The height.
+        /// </param>
+        public Size(int width, int height)
+        {
+            this.Width = width;
+            this.Height = height;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        public int Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width.
+        /// </summary>
+        public int Width { get; set; }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs Changed

@@ -9,25 +9,54 @@
 
 namespace HandBrake.Interop.Model
 {
-	public class SourceSubtitle
-	{
-		/// <summary>
-		/// Gets or sets the 1-based subtitle track number. 0 means foreign audio search.
-		/// </summary>
-		public int TrackNumber { get; set; }
-		public bool Default { get; set; }
-		public bool Forced { get; set; }
-		public bool BurnedIn { get; set; }
-
-		public SourceSubtitle Clone()
-		{
-			return new SourceSubtitle
-			{
-				TrackNumber = this.TrackNumber,
-				Default = this.Default,
-				Forced = this.Forced,
-				BurnedIn = this.BurnedIn
-			};
-		}
-	}
-}
+    /// <summary>
+    /// The source subtitle.
+    /// </summary>
+    public class SourceSubtitle
+    {
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether burned in.
+        /// </summary>
+        public bool BurnedIn { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether default.
+        /// </summary>
+        public bool Default { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether forced.
+        /// </summary>
+        public bool Forced { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the 1-based subtitle track number. 0 means foreign audio search.
+        /// </summary>
+        public int TrackNumber { get; set; }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The clone.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="SourceSubtitle"/>.
+        /// </returns>
+        public SourceSubtitle Clone()
+        {
+            return new SourceSubtitle
+                       {
+                           TrackNumber = this.TrackNumber, 
+                           Default = this.Default, 
+                           Forced = this.Forced, 
+                           BurnedIn = this.BurnedIn
+                       };
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceType.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceType.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs Changed

@@ -9,24 +9,60 @@
 
 namespace HandBrake.Interop.Model
 {
-	public class SrtSubtitle
-	{
-		public bool Default { get; set; }
-		public string FileName { get; set; }
-		public string LanguageCode { get; set; }
-		public string CharacterCode { get; set; }
-		public int Offset { get; set; }
-
-		public SrtSubtitle Clone()
-		{
-			return new SrtSubtitle
-			{
-				Default = this.Default,
-				FileName = this.FileName,
-				LanguageCode = this.LanguageCode,
-				CharacterCode = this.CharacterCode,
-				Offset = this.Offset
-			};
-		}
-	}
-}
+    /// <summary>
+    /// The srt subtitle.
+    /// </summary>
+    public class SrtSubtitle
+    {
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the character code.
+        /// </summary>
+        public string CharacterCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether default.
+        /// </summary>
+        public bool Default { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file name.
+        /// </summary>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the language code.
+        /// </summary>
+        public string LanguageCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset.
+        /// </summary>
+        public int Offset { get; set; }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The clone.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="SrtSubtitle"/>.
+        /// </returns>
+        public SrtSubtitle Clone()
+        {
+            return new SrtSubtitle
+                       {
+                           Default = this.Default, 
+                           FileName = this.FileName, 
+                           LanguageCode = this.LanguageCode, 
+                           CharacterCode = this.CharacterCode, 
+                           Offset = this.Offset
+                       };
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Properties/AssemblyInfo.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Properties/AssemblyInfo.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Settings.StyleCop -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Settings.StyleCop Changed

@@ -1,14 +1,54 @@
-<StyleCopSettings Version="4.3">
-  <Analyzers>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.SpacingRules">
-      <Rules>
-        <Rule Name="TabsMustNotBeUsed">
-          <RuleSettings>
+<StyleCopSettings Version="105">
+  <Analyzers>
+    <Analyzer AnalyzerId="StyleCop.CSharp.SpacingRules">
+      <Rules>
+        <Rule Name="TabsMustNotBeUsed">
+          <RuleSettings>
             <BooleanProperty Name="Enabled">False</BooleanProperty>
           </RuleSettings>
         </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-  </Analyzers>
-</StyleCopSettings>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
+      <Rules>
+        <Rule Name="FileMustHaveHeader">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustShowCopyright">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveCopyrightText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustContainFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveSummary">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveValidCompanyText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+  </Analyzers>
+</StyleCopSettings>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs Changed

@@ -9,19 +9,45 @@
 
 namespace HandBrake.Interop.SourceData
 {
-	// Only contains 2 real codecs at the moment as those are what we care about. More will be added later.
-	public enum AudioCodec
-	{
-		Ac3,
+    /// <summary>
+    /// The audio codec.
+    /// Only contains 2 real codecs at the moment as those are what we care about. More will be added later.
+    /// </summary>
+    public enum AudioCodec
+    {
+        /// <summary>
+        /// The ac 3.
+        /// </summary>
+        Ac3, 
 
-		Dts,
+        /// <summary>
+        /// The dts.
+        /// </summary>
+        Dts, 
 
-		DtsHD,
+        /// <summary>
+        /// The dts hd.
+        /// </summary>
+        DtsHD, 
 
-		Mp3,
+        /// <summary>
+        /// The mp 3.
+        /// </summary>
+        Mp3, 
 
-		Aac,
+        /// <summary>
+        /// The aac.
+        /// </summary>
+        Aac, 
 
-		Other
-	}
-}
+        /// <summary>
+        /// The other.
+        /// </summary>
+        Other, 
+
+        /// <summary>
+        /// The flac.
+        /// </summary>
+        Flac
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs Changed

@@ -47,7 +47,7 @@
 		/// <summary>
 		/// Gets or sets the channel layout of this Audio Track.
 		/// </summary>
-		public int ChannelLayout { get; set; }
+		public ulong ChannelLayout { get; set; }
 
 		/// <summary>
 		/// Gets or sets the frequency (in Hz) of this Audio Track
@@ -90,16 +90,23 @@
 			return this.GetDisplayString(true);
 		}
 
-		private string GetDisplayString(bool includeTrackNumber)
-		{
-			if (includeTrackNumber)
+	    /// <summary>
+	    /// The get display string.
+	    /// </summary>
+	    /// <param name="includeTrackNumber">
+	    /// The include track number.
+	    /// </param>
+	    /// <returns>
+	    /// The <see cref="string"/>.
+	    /// </returns>
+	    private string GetDisplayString(bool includeTrackNumber)
+	    {
+	        if (includeTrackNumber)
 			{
 				return this.TrackNumber + " " + this.Description;
 			}
-			else
-			{
-				return this.Description;
-			}
-		}
+	        
+            return this.Description;
+	    }
 	}
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs Changed

@@ -9,19 +9,30 @@
 
 namespace HandBrake.Interop.SourceData
 {
-    using System;
-    using System.Collections.Generic;
+	using System;
+	using System.Collections.Generic;
 
-    using HandBrake.Interop.Model;
+	using HandBrake.Interop.Model;
 
-    /// <summary>
+	/// <summary>
 	/// An object that represents a single Title of a DVD
 	/// </summary>
 	public class Title
 	{
-		private readonly List<AudioTrack> audioTracks;
-		private readonly List<Chapter> chapters;
-		private readonly List<Subtitle> subtitles;
+	    /// <summary>
+	    /// The audio tracks.
+	    /// </summary>
+	    private readonly List<AudioTrack> audioTracks;
+
+	    /// <summary>
+	    /// The chapters.
+	    /// </summary>
+	    private readonly List<Chapter> chapters;
+
+	    /// <summary>
+	    /// The subtitles.
+	    /// </summary>
+	    private readonly List<Subtitle> subtitles;
 		
 		/// <summary>
 		/// Initializes a new instance of the Title class.
@@ -68,11 +79,21 @@
 		public int TitleNumber { get; set; }
 
 		/// <summary>
-		/// Gets or sets the length in time of this Title
+		/// Gets or sets the playlist number this title came from.
+		/// </summary>
+		public int Playlist { get; set; }
+
+		/// <summary>
+		/// Gets or sets the duration of this title.
 		/// </summary>
 		public TimeSpan Duration { get; set; }
 
 		/// <summary>
+		/// Gets or sets the duration of the title in PTS.
+		/// </summary>
+		public ulong DurationPts { get; set; }
+
+		/// <summary>
 		/// Gets or sets the resolution (width/height) of this Title
 		/// </summary>
 		public Size Resolution { get; set; }
@@ -108,24 +129,45 @@
 		public double Framerate { get; set; }
 
 		/// <summary>
+		/// Gets or sets the video frame rate numerator.
+		/// </summary>
+		public int FramerateNumerator { get; set; }
+
+		/// <summary>
+		/// Gets or sets the video frame rate denominator.
+		/// </summary>
+		public int FramerateDenominator { get; set; }
+
+		/// <summary>
 		/// Gets the total number of frames in this title.
 		/// </summary>
 		public int Frames
 		{
 			get
 			{
-				return (int)Math.Ceiling(((double)this.Duration.TotalSeconds) * this.Framerate);
+				return (int)Math.Ceiling(this.Duration.TotalSeconds * this.Framerate);
 			}
 		}
 
 		/// <summary>
 		/// Override of the ToString method to provide an easy way to use this object in the UI
 		/// </summary>
-		/// <returns>A string representing this track in the format: {title #} (00:00:00)</returns>
+		/// <returns>A string representing this track in the format: {title #}[ {playlist source}] (00:00:00)</returns>
 		public override string ToString()
 		{
-			return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.TitleNumber, this.Duration.Hours,
-								 this.Duration.Minutes, this.Duration.Seconds);
+			string playlistPortion = string.Empty;
+			if (this.InputType == InputType.Bluray)
+			{
+				playlistPortion = string.Format(" {0:d5}.MPLS", this.Playlist);
+			}
+
+			return string.Format(
+				"{0}{1} ({2:00}:{3:00}:{4:00})", 
+				this.TitleNumber, 
+				playlistPortion,
+				this.Duration.Hours,
+				this.Duration.Minutes, 
+				this.Duration.Seconds);
 		}
 
 		/// <summary>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/HandBrake.Server.csproj Added

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36847BA0-6814-41E1-B1C3-1D9D874418E9}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>HandBrake.Server</RootNamespace>
+    <AssemblyName>HandBrake.Server</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
+      <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
+      <Name>HandBrake.ApplicationServices</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.*\StyleCop.targets" />
+  
+</Project>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/Program.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/Properties Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/Properties/AssemblyInfo.cs Added

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("HandBrake.Server")]
+[assembly: AssemblyDescription("An application that decouples libhb from the UI.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HandBrake Team")]
+[assembly: AssemblyProduct("HandBrake.Server")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5d5f700c-a9fb-42d3-ac29-06edf1aecf12")]
+
+// 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 Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.9.9.0")]
+[assembly: AssemblyFileVersion("0.9.9.0")]

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/Settings.StyleCop Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrake10.sln -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrake10.sln Changed

@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"
@@ -14,6 +12,8 @@
 		build.xml = build.xml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Server", "HandBrake.Server\HandBrake.Server.csproj", "{36847BA0-6814-41E1-B1C3-1D9D874418E9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,20 +26,6 @@
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x64.ActiveCfg = Debug|x64
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x64.Build.0 = Debug|x64
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Debug|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.Build.0 = Debug|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.ActiveCfg = Release|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Mixed Platforms.Build.0 = Release|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x64.ActiveCfg = Release|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86
-		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -57,13 +43,15 @@
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.ActiveCfg = Debug|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.ActiveCfg = Debug|x64
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.ActiveCfg = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.Build.0 = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Any CPU.ActiveCfg = Release|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.Build.0 = Release|x86
-		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x64
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.Build.0 = Release|x64
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x86.ActiveCfg = Release|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x86.Build.0 = Release|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -80,6 +68,20 @@
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.Build.0 = Release|x64
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.ActiveCfg = Release|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.Build.0 = Release|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x64.ActiveCfg = Debug|x64
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x64.Build.0 = Debug|x64
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x86.ActiveCfg = Debug|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x86.Build.0 = Debug|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Any CPU.ActiveCfg = Release|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Mixed Platforms.Build.0 = Release|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x64.ActiveCfg = Release|x64
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x64.Build.0 = Release|x64
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x86.ActiveCfg = Release|x86
+		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake10.sln.DotSettings Added

@@ -0,0 +1,1016 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/AutoCompleteBasicCompletion/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/IntelliSenseCompletingCharactersSettingCSharp/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeEditing/Localization/CSharpLocalizationOptions/DontAnalyseVerbatimStrings/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantNameQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringFormatCall/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StyleCop_002ESA1126/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StyleCop_002ESA1650/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuspiciousTypeConversion_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=StyleCop/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="StyleCop"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;True&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;True&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;True&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;True&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;True&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;True&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;True&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;True&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;True&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;True&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;ReplaceCopyrightElement&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;True&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;True&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;True&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;True&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;True&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;True&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;True&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;True&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Maintainability&gt;&lt;SA1119StatementMustNotUseUnnecessaryParenthesis&gt;True&lt;/SA1119StatementMustNotUseUnnecessaryParenthesis&gt;&lt;/StyleCop.Maintainability&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Alphabetical&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectives&gt;FullyQualify&lt;/ExpandUsingDirectives&gt;&lt;SA1212PropertyAccessorsMustFollowOrder&gt;True&lt;/SA1212PropertyAccessorsMustFollowOrder&gt;&lt;SA1213EventAccessorsMustFollowOrder&gt;True&lt;/SA1213EventAccessorsMustFollowOrder&gt;&lt;/StyleCop.Ordering&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;True&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;True&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;True&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;True&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;True&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;True&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Default: Full Cleanup</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">StyleCop</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_FIELD/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BETWEEN_USING_GROUPS/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_ATTRIBUTE_STYLE/@EntryValue">SEPARATE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOR_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOREACH_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_IFELSE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_WHILE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_ANONYMOUS_METHOD_BLOCK/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_EMBRACED_INITIALIZER_BLOCK/@EntryValue">False</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MODIFIERS_ORDER/@EntryValue">public protected internal private static new abstract virtual override sealed readonly extern unsafe volatile async</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/REDUNDANT_THIS_QUALIFIER_STYLE/@EntryValue">ALWAYS_USE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">ON_SINGLE_LINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_EXTENDS_LIST_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-8"?&gt;&#xD;
+&lt;!-- Last updated 15.05.2012 --&gt;&#xD;
+&lt;Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+&#xD;
+  &lt;!-- Do not reorder COM interfaces --&gt;&#xD;
+  &lt;Pattern&gt;&#xD;
+    &lt;Match&gt;&#xD;
+      &lt;And Weight="2000"&gt;&#xD;
+        &lt;Kind Is="interface"/&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"/&gt;&#xD;
+          &lt;HasAttribute CLRName="System.Runtime.InteropServices.ComImport"/&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/Match&gt;&#xD;
+  &lt;/Pattern&gt;&#xD;
+&#xD;
+  &lt;!-- Do not reorder P/Invoke structs --&gt;&#xD;
+  &lt;Pattern&gt;&#xD;
+    &lt;Match&gt;&#xD;
+      &lt;And Weight="2000"&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;Kind Is="struct"/&gt;&#xD;
+          &lt;Kind Is="class"/&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+        &lt;HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"/&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/Match&gt;&#xD;
+  &lt;/Pattern&gt;&#xD;
+&#xD;
+  &lt;!-- Do not reorder P/Invoke classes (called xxxNativeMethods) --&gt;&#xD;
+  &lt;Pattern&gt;&#xD;
+    &lt;Match&gt;&#xD;
+      &lt;And Weight="2000"&gt;&#xD;
+        &lt;Kind Is="class"/&gt;&#xD;
+        &lt;Name Is=".*NativeMethods" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/Match&gt;&#xD;
+  &lt;/Pattern&gt;&#xD;
+&#xD;
+  &lt;!-- StyleCop pattern --&gt;&#xD;
+  &lt;Pattern RemoveAllRegions="true"&gt;&#xD;
+    &lt;Match&gt;&#xD;
+      &lt;Or Weight="1000" &gt;&#xD;
+        &lt;Kind Is="class" /&gt;&#xD;
+        &lt;Kind Is="struct" /&gt;&#xD;
+        &lt;Kind Is="interface"/&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/Match&gt;&#xD;
+&#xD;
+    &lt;!-- Constants --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="constant"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private"/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Constants"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- Static fields --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="field"/&gt;&#xD;
+          &lt;Static /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private"/&gt;&#xD;
+        &lt;Readonly/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Static Fields"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- Fields --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="field"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private"/&gt;&#xD;
+        &lt;Readonly/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Fields"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- constructors and destructors --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Or Weight="200"&gt;&#xD;
+          &lt;Kind Is="constructor"/&gt;&#xD;
+          &lt;Kind Is="destructor"/&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Kind Order="constructor destructor"/&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private"/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Constructors and Destructors"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- delegates --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="delegate"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Static /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Delegates"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- public events --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="event"/&gt;&#xD;
+          &lt;Access Is="public"/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public" /&gt;&#xD;
+        &lt;Static /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Public Events"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- interface events --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="event"/&gt;&#xD;
+          &lt;ImplementsInterface/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;ImplementsInterface Immediate="true"/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Explicit Interface Events" /&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- other events --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="event"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Static /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Events"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- enum --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="enum"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Enums"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- interfaces --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="interface" /&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Interfaces"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- public properties --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="property"/&gt;&#xD;
+          &lt;Access Is="public"/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public"/&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Public Properties"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- interface properties --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="property"/&gt;&#xD;
+          &lt;ImplementsInterface/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;ImplementsInterface Immediate="true"/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Explicit Interface Properties" /&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- other properties --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="property"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private"/&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Properties"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- public indexers --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="indexer" Weight="1000" /&gt;&#xD;
+          &lt;Access Is="public"/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public" /&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Public Indexers"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- interface indexers --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="indexer" Weight="1000"/&gt;&#xD;
+          &lt;ImplementsInterface/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;ImplementsInterface Immediate="true"/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Explicit Interface Indexers" /&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- other indexers --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="indexer" Weight="1000" /&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Indexers"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- public methods (includes operators) --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;Kind Is="method"/&gt;&#xD;
+            &lt;Kind Is="operator"/&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+          &lt;Access Is="public"/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public"/&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Public Methods and Operators"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- interface methods --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="method"/&gt;&#xD;
+          &lt;ImplementsInterface/&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;ImplementsInterface Immediate="true"/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Explicit Interface Methods" /&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- other methods --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="method"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private"/&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Methods"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- operators --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="operator"/&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+      &lt;Group Region="Operators"/&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- Nested structs --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="struct"&#xD;
+              Weight="600" /&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Static /&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- Nested classes --&gt;&#xD;
+    &lt;Entry&gt;&#xD;
+      &lt;Match&gt;&#xD;
+        &lt;Kind Is="class"&#xD;
+              Weight="700" /&gt;&#xD;
+      &lt;/Match&gt;&#xD;
+      &lt;Sort&gt;&#xD;
+        &lt;Static /&gt;&#xD;
+        &lt;Access Order="public internal protected-internal protected private" /&gt;&#xD;
+        &lt;Name/&gt;&#xD;
+      &lt;/Sort&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;!-- all other members --&gt;&#xD;
+    &lt;Entry/&gt;&#xD;
+&#xD;
+  &lt;/Pattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/QualifiedUsingAtNestedScope/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Constructor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Constructor/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Equality/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Equality/Options/=EqualityOperators/@EntryIndexedValue">True</s:String>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Equality/Options/=ImplementIEquatable/@EntryIndexedValue">False</s:String>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Equality/Options/=XmlDocumentation/@EntryIndexedValue">True</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Generate/=EqualityMembers/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Generate/=EqualityMembers/Options/=EqualityOperators/@EntryIndexedValue">False</s:String>
+	<s:String x:Key="/Default/CodeStyle/Generate/=EqualityMembers/Options/=ImplementIEquatable/@EntryIndexedValue">False</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Global/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Global/Options/=PropertyBody/@EntryIndexedValue">Automatic property</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Implementations/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=WrapInRegion/@EntryIndexedValue">True</s:String>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=XmlDocumentation/@EntryIndexedValue">True</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Overrides/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=WrapInRegion/@EntryIndexedValue">False</s:String>
+	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AAC/@EntryIndexedValue">AAC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AC/@EntryIndexedValue">AC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DTS/@EntryIndexedValue">DTS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DTSHD/@EntryIndexedValue">DTSHD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HD/@EntryIndexedValue">HD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MP/@EntryIndexedValue">MP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RF/@EntryIndexedValue">RF</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Interfaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Other/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
+	<s:Boolean x:Key="/Default/Environment/Editor/UseCamelHumps/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/ExternalSources/FirstTimeFormShown/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/ExternalSources/NavigationMode/@EntryValue">ObjectBrowser</s:String>
+	<s:Boolean x:Key="/Default/Environment/Feedback/ShouldPrompt/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/GroupByType/=Constructor/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/GroupByType/=Equality/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/GroupByType/=EqualityMembers/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/GroupByType/=Implementations/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/GroupByType/=Overrides/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=Constructor/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=Equality/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=EqualityMembers/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=Implementations/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=Overrides/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/MemoryUsageIndicator/IsVisible/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">VS</s:String>
+	<s:String x:Key="/Default/Environment/UserInterface/ThemedIcon/PsiSymbolIcon/PsiSymbolIconThemeSelection/@EntryValue">SymbolsVs08</s:String>
+	<s:Boolean x:Key="/Default/Environment/UserInterface/TipsManager/ShowTipsOnStartup/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/IntellisenseHousekeeping/HintUsed/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/Housekeeping/Layout/DialogWindows/OptionsDialog/SelectedPageId/@EntryValue">Updates</s:String>
+	<s:String x:Key="/Default/Housekeeping/Layout/DialogWindows/RefactoringWizardWindow/Location/@EntryValue">-13,-311</s:String>
+	<s:Boolean x:Key="/Default/Housekeeping/LiveTemplatesHousekeeping/HotspotSessionHintIsShown/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/Housekeeping/TreeModelBrowserPanelPersistance/PreviewSplitterHorizontalPosition/=AnalyzeReferencesDescriptor/@EntryIndexedValue">271</s:Int64>
+	<s:Int64 x:Key="/Default/Housekeeping/TreeModelBrowserPanelPersistance/PreviewSplitterHorizontalPosition/=SearchUsagesDescriptor/@EntryIndexedValue">269</s:Int64>
+	<s:Int64 x:Key="/Default/Housekeeping/TreeModelBrowserPanelPersistance/PreviewSplitterHorizontalPosition/=TextualChangeDescriptor/@EntryIndexedValue">91</s:Int64>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=AnalyzeReferences/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=BlockComment/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EBookmarksMenu/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark0/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark1/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark2/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark4/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark5/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark6/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark7/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark8/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EGoToBookmark9/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark0/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark1/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark2/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark4/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark5/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark6/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark7/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark8/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Bookmarks_002EToggleBookmark9/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ChangeSignature/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=CleanupCode/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=CompleteCodeSmart/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=CompleteCodeTypeName/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=DuplicateText/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=EnableDaemon/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=EncapsulateField/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ExploreStackTrace/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ExtendSelection/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ExtractMethod/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=FindUsagesAdvanced/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ForceCompleteItem/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Generate/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GenerateFileBesides/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoBase/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoContainingDeclaration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoFile/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoFileMember/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoInheritors/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoLastEditLocation/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoNextErrorInSolution/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoNextHighlight/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoNextMethod/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoNextOccurence/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoPrevErrorInSolution/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoPrevHighlight/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoPreviousOccurence/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoPrevMethod/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoRecentEdits/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoRecentFiles/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoRelatedFiles/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoSymbol/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoType/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoTypeDeclaration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=GotoUsage/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=HighlightUsages/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=InlineVariable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=InspectThis/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=IntroduceField/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=IntroduceVariable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=IntroParameter/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=LineComment/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=LiveTemplates_002EInsert/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=LocateInSolutionExplorerAction/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Move/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=MoveDown/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=MoveLeft/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=MoveRight/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=MoveUp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=NavigateTo/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ParameterInfo_002EGoToPreviousSignature/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=QuickDoc/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=QuickFix/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=RefactorThis/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=Rename/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ReSharper_005FUnitTest_005FDebugContext/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ReSharper_005FUnitTest_005FRunContext/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=SafeDelete/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=SelectContainingDeclaration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowAnalyzeReferences/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowCodeStructure/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowFindResults/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowHierarchyWindow/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowInspectionWindow/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowTodoExplorer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowUnitTestExplorer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShowUnitTestSessions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=ShrinkSelection/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=SilentCleanupCode/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=SurroundWith/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=TypeHierarchy_002EBrowse/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=UnitTest_002ERunCurrentSession/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=UnitTest_002ERunSolution/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=UnitTestSession_002ERepeatPreviousRun/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=WindowManager_002EActivateRecentTool/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ActionsWithShortcuts/=WindowManager_002ECloseRecentTool/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark1/Shortcuts/=Control_002BD1/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark2/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark2/Shortcuts/=Control_002BD2/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark3/Shortcuts/=Control_002BD3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark4/Shortcuts/=Control_002BD4/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark5/Shortcuts/=Control_002BD5/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark6/Shortcuts/=Control_002BD6/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark7/Shortcuts/=Control_002BD7/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark8/Shortcuts/=Control_002BD8/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EGoToBookmark9/Shortcuts/=Control_002BD9/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark1/Shortcuts/=Shift_002BControl_002BD1/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark2/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark2/Shortcuts/=Shift_002BControl_002BD2/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark7/Shortcuts/=Shift_002BControl_002BD7/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Bookmarks_002EToggleBookmark8/Shortcuts/=Shift_002BControl_002BD8/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ChangeSignature/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ChangeSignature/Shortcuts/=Control_002BR_0020Control_002BS/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ChangeSignature/Shortcuts/=Control_002BR_0020S/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=CompleteCodeSmart/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=CompleteCodeSmart/Shortcuts/=Control_002BAlt_002BSpace/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=DuplicateText/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=DuplicateText/Shortcuts/=Control_002BD/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=EncapsulateField/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=EncapsulateField/Shortcuts/=Control_002BR_0020Control_002BE/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=EncapsulateField/Shortcuts/=Control_002BR_0020E/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExploreStackTrace/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExploreStackTrace/Shortcuts/=Control_002BE_0020Control_002BT/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExploreStackTrace/Shortcuts/=Control_002BE_0020T/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExtendSelection/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExtendSelection/Shortcuts/=Control_002BAlt_002BRight/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExtractMethod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExtractMethod/Shortcuts/=Control_002BR_0020Control_002BM/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ExtractMethod/Shortcuts/=Control_002BR_0020M/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=FindUsagesAdvanced/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=FindUsagesAdvanced/Shortcuts/=Shift_002BControl_002BAlt_002BF12/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GenerateFileBesides/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GenerateFileBesides/Shortcuts/=Control_002BAlt_002BInsert/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoContainingDeclaration/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoContainingDeclaration/Shortcuts/=Control_002BOemOpenBrackets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoFile/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoFile/Shortcuts/=Shift_002BControl_002BT/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoNextHighlight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoNextHighlight/Shortcuts/=Alt_002BNext/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoNextMethod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoNextMethod/Shortcuts/=Alt_002BDown/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoPrevHighlight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoPrevHighlight/Shortcuts/=Alt_002BPageUp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoPrevMethod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoPrevMethod/Shortcuts/=Alt_002BUp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoRecentEdits/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoRecentEdits/Shortcuts/=Shift_002BControl_002BOemcomma/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoRecentFiles/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoRecentFiles/Shortcuts/=Control_002BOemcomma/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoSymbol/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoSymbol/Shortcuts/=Shift_002BAlt_002BT/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoUsage/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=GotoUsage/Shortcuts/=Shift_002BAlt_002BF12/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=HighlightUsages/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=HighlightUsages/Shortcuts/=Shift_002BAlt_002BF11/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=InlineVariable/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=InlineVariable/Shortcuts/=Control_002BR_0020Control_002BI/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=InlineVariable/Shortcuts/=Control_002BR_0020I/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroduceField/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroduceField/Shortcuts/=Control_002BR_0020Control_002BF/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroduceField/Shortcuts/=Control_002BR_0020F/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroduceVariable/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroduceVariable/Shortcuts/=Control_002BR_0020Control_002BV/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroduceVariable/Shortcuts/=Control_002BR_0020V/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroParameter/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroParameter/Shortcuts/=Control_002BR_0020Control_002BP/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=IntroParameter/Shortcuts/=Control_002BR_0020P/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=LocateInSolutionExplorerAction/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=LocateInSolutionExplorerAction/Shortcuts/=Shift_002BAlt_002BL/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Move/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Move/Shortcuts/=Control_002BR_0020Control_002BO/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=Move/Shortcuts/=Control_002BR_0020O/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=MoveLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=MoveLeft/Shortcuts/=Shift_002BControl_002BAlt_002BLeft/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=MoveRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=MoveRight/Shortcuts/=Shift_002BControl_002BAlt_002BRight/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=RefactorThis/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=RefactorThis/Shortcuts/=Shift_002BControl_002BR/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ReSharper_005FUnitTest_005FDebugContext/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ReSharper_005FUnitTest_005FDebugContext/Shortcuts/=Control_002BU_0020Control_002BD/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ReSharper_005FUnitTest_005FDebugContext/Shortcuts/=Control_002BU_0020D/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ReSharper_005FUnitTest_005FRunContext/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ReSharper_005FUnitTest_005FRunContext/Shortcuts/=Control_002BU_0020Control_002BR/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ReSharper_005FUnitTest_005FRunContext/Shortcuts/=Control_002BU_0020R/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SafeDelete/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SafeDelete/Shortcuts/=Control_002BR_0020Control_002BD/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SafeDelete/Shortcuts/=Control_002BR_0020D/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SelectContainingDeclaration/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SelectContainingDeclaration/Shortcuts/=Shift_002BControl_002BOemOpenBrackets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowFindResults/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowFindResults/Shortcuts/=Control_002BAlt_002BF12/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowHierarchyWindow/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowHierarchyWindow/Shortcuts/=Control_002BAlt_002BH/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowInspectionWindow/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowInspectionWindow/Shortcuts/=Control_002BAlt_002BV/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowTodoExplorer/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowTodoExplorer/Shortcuts/=Control_002BAlt_002BD/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowUnitTestExplorer/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowUnitTestExplorer/Shortcuts/=Control_002BAlt_002BU/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowUnitTestSessions/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShowUnitTestSessions/Shortcuts/=Control_002BAlt_002BT/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShrinkSelection/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=ShrinkSelection/Shortcuts/=Control_002BAlt_002BLeft/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SilentCleanupCode/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SilentCleanupCode/Shortcuts/=Control_002BE_0020Control_002BF/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SilentCleanupCode/Shortcuts/=Control_002BE_0020F/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SurroundWith/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SurroundWith/Shortcuts/=Control_002BE_0020Control_002BU/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=SurroundWith/Shortcuts/=Control_002BE_0020U/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTest_002ERunCurrentSession/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTest_002ERunCurrentSession/Shortcuts/=Control_002BU_0020Control_002BY/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTest_002ERunCurrentSession/Shortcuts/=Control_002BU_0020Y/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTest_002ERunSolution/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTest_002ERunSolution/Shortcuts/=Control_002BU_0020Control_002BL/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTest_002ERunSolution/Shortcuts/=Control_002BU_0020L/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTestSession_002ERepeatPreviousRun/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTestSession_002ERepeatPreviousRun/Shortcuts/=Control_002BU_0020Control_002BU/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=UnitTestSession_002ERepeatPreviousRun/Shortcuts/=Control_002BU_0020U/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=WindowManager_002EActivateRecentTool/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/ConflictingActions/=WindowManager_002EActivateRecentTool/Shortcuts/=Control_002BAlt_002BBack/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Add/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BBack/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BDown/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF10/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BF9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BMultiply/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BNext/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BOem6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BOemcomma/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BOemOpenBrackets/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BOemPeriod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BP/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BPageUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BPause/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BR/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BReturn/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BSubtract/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Alt_002BW/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Back/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BA/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAdd/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BA/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BB/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BBack/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BD/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BDown/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BF1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BF10/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BF11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BF5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BF6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BG/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BH/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BI/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BInsert/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BJ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BL/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BM/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BO/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BOemPeriod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BP/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BPause/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BQ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BR/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BS/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BSpace/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BT/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BU/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BV/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BW/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BX/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BAlt_002BZ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BB/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BBack/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD2/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BD9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BDelete/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BDivide/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BDown/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BEnd/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF10/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF2/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BF9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BG/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BH/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BHome/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BI/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BInsert/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BJ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BK/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BL/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BM/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BN/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BNext/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BO/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOem1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOem6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOemBackslash/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOemcomma/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOemOpenBrackets/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOemPeriod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BOemplus/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BP/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BPageUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BPause/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BQ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BR/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BReturn/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BS/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BSpace/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BSubtract/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BT/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BTab/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BU/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BV/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BW/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BX/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BY/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Control_002BZ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Delete/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Down/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=End/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Escape/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F10/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F2/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=F9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Home/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Insert/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Left/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Next/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=PageUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Return/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Right/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BA/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BB/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BBack/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BD/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BDown/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BEnd/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BF10/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BF11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BF6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BF7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BH/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BHome/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BL/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BN/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BP/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BR/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BReturn/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BS/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BT/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BV/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BAlt_002BW/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BBack/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BA/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BF11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BP/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BR/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BS/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BAlt_002BW/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BB/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BD/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BD1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BD2/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BD7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BD8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BDown/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BEnd/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF10/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BF9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BG/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BH/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BHome/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BI/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BInsert/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BJ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BL/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BM/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BN/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BNext/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BO/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BOem6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BOemcomma/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BOemOpenBrackets/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BOemPeriod/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BP/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BPageUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BR/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BReturn/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BS/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BSpace/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BSubtract/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BT/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BTab/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BU/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BV/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BW/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BX/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BY/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BControl_002BZ/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BDelete/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BDown/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BEnd/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BEscape/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF11/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF12/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF5/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF6/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF7/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF8/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BF9/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BHome/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BInsert/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BLeft/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BNext/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BPageUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BReturn/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BRight/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BSpace/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BTab/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Shift_002BUp/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Subtract/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Tab/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Housekeeping/VsActionManager/KeyboardShortcutToVsCommand/=Up/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideIntellisense/=CSharp/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideIntellisense/=Xaml/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=CSharp/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=Css/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=Html/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=JavaScript/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=MsBuild/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=VB/@EntryIndexedValue">NotOverridden</s:String>
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=Xaml/@EntryIndexedValue">NotOverridden</s:String></wpf:ResourceDictionary>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeCS.csproj -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeCS.csproj Changed

@@ -9,8 +9,9 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Handbrake</RootNamespace>
-    <AssemblyName>Handbrake</AssemblyName>
-    <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
+    <AssemblyName>Handbrake_old</AssemblyName>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <StartupObject>Handbrake.Program</StartupObject>
     <TargetZone>LocalIntranet</TargetZone>
     <GenerateManifests>false</GenerateManifests>
@@ -43,6 +44,7 @@
     <OutputPath>bin\x86\Debug\</OutputPath>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>1</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -51,7 +53,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <Optimize>true</Optimize>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DebugType>full</DebugType>
+    <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -63,11 +65,12 @@
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
     <Optimize>true</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>libraries\caliburn\Caliburn.Micro.dll</HintPath>
+    </Reference>
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libraries\Growl.Connector.dll</HintPath>
@@ -91,6 +94,7 @@
       <HintPath>libraries\SplitButton\SplitButton.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -103,183 +107,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controls\AudioPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\AudioPanel.Designer.cs">
-      <DependentUpon>AudioPanel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\AdvancedEncoderOpts.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\AdvancedEncoderOpts.Designer.cs">
-      <DependentUpon>AdvancedEncoderOpts.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\Filters.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\Filters.Designer.cs">
-      <DependentUpon>Filters.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\PictureSettings.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\PictureSettings.designer.cs">
-      <DependentUpon>PictureSettings.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\Subtitles.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\Subtitles.Designer.cs">
-      <DependentUpon>Subtitles.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\x264Panel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\x264Panel.Designer.cs">
-      <DependentUpon>x264Panel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmPreview.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmPreview.Designer.cs">
-      <DependentUpon>frmPreview.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Functions\ToolStripRenderOverride.cs" />
-    <Compile Include="Model\ActivityLogMode.cs" />
-    <Compile Include="Model\QueryPictureSettingsMode.cs" />
-    <Compile Include="Model\QueryEncodeMode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="frmAbout.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmAbout.Designer.cs">
-      <DependentUpon>frmAbout.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmAddPreset.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmAddPreset.Designer.cs">
-      <DependentUpon>frmAddPreset.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmMain.Designer.cs">
-      <DependentUpon>frmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmOptions.Designer.cs">
-      <DependentUpon>frmOptions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmQueue.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmQueue.Designer.cs">
-      <DependentUpon>frmQueue.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Functions\PresetLoader.cs" />
-    <Compile Include="Functions\QueryGenerator.cs" />
-    <Compile Include="Functions\Main.cs" />
-    <Compile Include="frmActivityWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmActivityWindow.Designer.cs">
-      <DependentUpon>frmActivityWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Model\SourceType.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="ToolWindows\AdvancedAudio.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolWindows\AdvancedAudio.Designer.cs">
-      <DependentUpon>AdvancedAudio.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ToolWindows\BatchAdd.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolWindows\BatchAdd.Designer.cs">
-      <DependentUpon>BatchAdd.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ToolWindows\DownloadUpdate.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolWindows\DownloadUpdate.Designer.cs">
-      <DependentUpon>DownloadUpdate.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ToolWindows\ExceptionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolWindows\ExceptionWindow.designer.cs">
-      <DependentUpon>ExceptionWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ToolWindows\TitleSpecificScan.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolWindows\TitleSpecificScan.Designer.cs">
-      <DependentUpon>TitleSpecificScan.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ToolWindows\UpdateInfo.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolWindows\UpdateInfo.Designer.cs">
-      <DependentUpon>UpdateInfo.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UserSettingConstants.cs" />
-    <EmbeddedResource Include="Controls\AudioPanel.resx">
-      <DependentUpon>AudioPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\AdvancedEncoderOpts.resx">
-      <DependentUpon>AdvancedEncoderOpts.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\Filters.resx">
-      <DependentUpon>Filters.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\PictureSettings.resx">
-      <DependentUpon>PictureSettings.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\Subtitles.resx">
-      <DependentUpon>Subtitles.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\x264Panel.resx">
-      <DependentUpon>x264Panel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmPreview.resx">
-      <DependentUpon>frmPreview.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmAbout.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmAbout.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmAddPreset.resx">
-      <DependentUpon>frmAddPreset.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmMain.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmOptions.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmOptions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmQueue.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmQueue.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmActivityWindow.resx">
-      <DependentUpon>frmActivityWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -290,71 +118,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="ToolWindows\AdvancedAudio.resx">
-      <DependentUpon>AdvancedAudio.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolWindows\BatchAdd.resx">
-      <DependentUpon>BatchAdd.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolWindows\DownloadUpdate.resx">
-      <DependentUpon>DownloadUpdate.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolWindows\ExceptionWindow.resx">
-      <DependentUpon>ExceptionWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolWindows\TitleSpecificScan.resx">
-      <DependentUpon>TitleSpecificScan.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolWindows\UpdateInfo.resx">
-      <DependentUpon>UpdateInfo.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="Installer\Installer64.nsi" />
-    <None Include="Installer\MakeNightly64.nsi.tmpl" />
-    <None Include="Installer\MakeNightly.nsi.tmpl" />
-    <None Include="Installer\MakeNightly.nsi" />
-    <None Include="Installer\Installer.nsi" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="handbrakepineapple.ico" />
-    <Content Include="defaultsettings.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="Properties\AssemblyInfo.cs.tmpl" />
-    <None Include="Resources\logo64.png" />
-    <None Include="Resources\logo128.png" />
-    <None Include="Resources\ActivityWindow.png" />
-    <None Include="Resources\AddToQueue.png" />
-    <Content Include="Resources\ActivityWindow_small.png" />
-    <None Include="Resources\AddToQueue_small.png" />
-    <None Include="Resources\Add16.png" />
-    <Content Include="Resources\copy.png" />
-    <Content Include="Resources\disc_small.png" />
-    <None Include="Resources\hb32.png" />
-    <None Include="Resources\hb16.png" />
-    <None Include="Resources\Help16.png" />
-    <None Include="Resources\info16.png" />
-    <None Include="Resources\folder.png" />
-    <None Include="Resources\download.png" />
-    <None Include="Resources\ErrorX.png" />
-    <None Include="Resources\Help32.png" />
-    <None Include="Resources\Help24.png" />
-    <None Include="Resources\Options24.png" />
-    <Content Include="Resources\Output_Small.png" />
-    <None Include="Resources\Pause.png" />
-    <None Include="Resources\Play.png" />
-    <None Include="Resources\picture.png" />
-    <None Include="Resources\Play_small.png" />
-    <Content Include="Resources\Pref_Small.png" />
-    <Content Include="Resources\Queue.png" />
-    <Content Include="Resources\Queue_Small.png" />
-    <Content Include="Resources\window.png" />
-    <None Include="Resources\save.png" />
-    <None Include="Resources\stop.png" />
-    <None Include="Resources\Movies.png" />
-    <None Include="Resources\General Preferences.png" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/App.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/App.xaml Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/App.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/App.xaml.cs Changed

@@ -10,6 +10,8 @@
 namespace HandBrakeWPF
 {
     using System;
+    using System.IO;
+    using System.Linq;
     using System.Windows;
 
     using Caliburn.Micro;
@@ -17,6 +19,7 @@
     using HandBrake.ApplicationServices.Exceptions;
 
     using HandBrakeWPF.ViewModels;
+    using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
     /// Interaction logic for App.xaml
@@ -30,7 +33,26 @@
         {
             Application.Current.Dispatcher.UnhandledException += this.Dispatcher_UnhandledException;
             AppDomain.CurrentDomain.UnhandledException +=
-                new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+                this.CurrentDomain_UnhandledException;
+        }
+
+        /// <summary>
+        /// Override the startup behavior to handle files dropped on the app icon.
+        /// </summary>
+        /// <param name="e">
+        /// The StartupEventArgs.
+        /// </param>
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+
+            // If we have a file dropped on the icon, try scanning it.
+            string[] fileNames = e.Args;
+            if (fileNames.Any() && (File.Exists(fileNames[0]) || Directory.Exists(fileNames[0])))
+            {
+                IMainViewModel mvm = IoC.Get<IMainViewModel>();
+                mvm.StartScan(fileNames[0], 0);
+            }
         }
 
         /// <summary>
@@ -44,7 +66,15 @@
         /// </param>
         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            this.ShowError(e.ExceptionObject);
+            if (e.ExceptionObject.GetType() == typeof(FileNotFoundException))
+            {
+                GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.0", (Exception)e.ExceptionObject);
+                this.ShowError(exception);
+            }
+            else
+            {
+                this.ShowError(e.ExceptionObject);
+            }
         }
 
         /// <summary>
@@ -59,7 +89,24 @@
         private void Dispatcher_UnhandledException(
             object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
-            this.ShowError(e.Exception);
+            if (e.Exception.GetType() == typeof(FileNotFoundException))
+            {
+                GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.0", e.Exception);
+                this.ShowError(exception);
+            }
+            else if (e.Exception.GetType() == typeof(GeneralApplicationException))
+            {
+                this.ShowError(e.Exception);
+            }
+            else if (e.Exception.InnerException != null && e.Exception.InnerException.GetType() == typeof(GeneralApplicationException))
+            {
+                this.ShowError(e.Exception.InnerException);
+            }
+            else
+            {
+                this.ShowError(e.Exception);
+            }
+
             e.Handled = true;
         }
 
@@ -83,9 +130,19 @@
                         GeneralApplicationException applicationException = exception as GeneralApplicationException;
                         if (applicationException != null)
                         {
+                            string details = string.Format(
+                                "{0}{1}{2}{3}{4}",
+                                applicationException.Error,
+                                Environment.NewLine,
+                                applicationException.Solution,
+                                Environment.NewLine,
+                                applicationException.ActualException != null
+                                    ? applicationException.ActualException.ToString()
+                                    : "No additional exception information available.");
+
                             errorView.ErrorMessage = applicationException.Error;
                             errorView.Solution = applicationException.Solution;
-                            errorView.Details = applicationException.ActualException.ToString();
+                            errorView.Details = details;
                         }
                     }
                     else

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/AttachedProperties Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/AttachedProperties/MenuItemExtensions.cs Added

@@ -0,0 +1,145 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MenuItemExtensions.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the MenuItemExtensions type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.AttachedProperties
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Windows;
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// The menu item extensions.
+    /// </summary>
+    public class MenuItemExtensions : DependencyObject
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The group name property.
+        /// </summary>
+        public static readonly DependencyProperty GroupNameProperty = DependencyProperty.RegisterAttached(
+            "GroupName", 
+            typeof(string), 
+            typeof(MenuItemExtensions), 
+            new PropertyMetadata(String.Empty, OnGroupNameChanged));
+
+        /// <summary>
+        /// The element to group names.
+        /// </summary>
+        public static Dictionary<MenuItem, String> ElementToGroupNames = new Dictionary<MenuItem, String>();
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The get group name.
+        /// </summary>
+        /// <param name="element">
+        /// The element.
+        /// </param>
+        /// <returns>
+        /// The group name as a string.
+        /// </returns>
+        public static string GetGroupName(MenuItem element)
+        {
+            return element.GetValue(GroupNameProperty).ToString();
+        }
+
+        /// <summary>
+        /// The set group name.
+        /// </summary>
+        /// <param name="element">
+        /// The element.
+        /// </param>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        public static void SetGroupName(MenuItem element, string value)
+        {
+            element.SetValue(GroupNameProperty, value);
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The menu item checked.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private static void MenuItemChecked(object sender, RoutedEventArgs e)
+        {
+            var menuItem = e.OriginalSource as MenuItem;
+            foreach (var item in ElementToGroupNames)
+            {
+                if (item.Key != menuItem && item.Value == GetGroupName(menuItem))
+                {
+                    item.Key.IsChecked = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// The on group name changed.
+        /// </summary>
+        /// <param name="d">
+        /// The d.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private static void OnGroupNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            MenuItem menuItem = d as MenuItem;
+
+            if (menuItem != null)
+            {
+                string newGroupName = e.NewValue.ToString();
+                string oldGroupName = e.OldValue.ToString();
+                if (string.IsNullOrEmpty(newGroupName))
+                {
+                    RemoveCheckboxFromGrouping(menuItem);
+                }
+                else
+                {
+                    if (newGroupName != oldGroupName)
+                    {
+                        if (!string.IsNullOrEmpty(oldGroupName))
+                        {
+                            RemoveCheckboxFromGrouping(menuItem);
+                        }
+                        ElementToGroupNames.Add(menuItem, e.NewValue.ToString());
+                        menuItem.Checked += MenuItemChecked;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// The remove checkbox from grouping.
+        /// </summary>
+        /// <param name="checkBox">
+        /// The check box.
+        /// </param>
+        private static void RemoveCheckboxFromGrouping(MenuItem checkBox)
+        {
+            ElementToGroupNames.Remove(checkBox);
+            checkBox.Checked -= MenuItemChecked;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/AdvancedEncoderOptionsCommand.cs Added

@@ -0,0 +1,40 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedEncoderOptionsCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Command for resetting the video / advnaced tabs encoder options.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+    using Caliburn.Micro;
+
+    using HandBrakeWPF.Commands.Interfaces;
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// A Command for resetting the video / advnaced tabs encoder options.
+    /// </summary>
+    public class AdvancedEncoderOptionsCommand : IAdvancedEncoderOptionsCommand
+    {
+        /// <summary>
+        /// Clear out the advanced options
+        /// </summary>
+        public void ExecuteClearAdvanced()
+        {
+            IAdvancedViewModel advancedViewModel = IoC.Get<IAdvancedViewModel>();
+            advancedViewModel.Clear();
+        }
+
+        /// <summary>
+        /// Clear the advanced encoder options out on the video tab.
+        /// </summary>
+        public void ExecuteClearVideo()
+        {
+            IVideoViewModel videoViewModel = IoC.Get<IVideoViewModel>();
+            videoViewModel.ClearAdvancedSettings();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs Added

@@ -0,0 +1,105 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CancelScanCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Command to cancel a scan that is in progress
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+    using System;
+    using System.Windows.Input;
+
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    /// <summary>
+    /// Command to cancel a scan that is in progress
+    /// </summary>
+    public class CancelScanCommand : ICommand
+    {
+        /// <summary>
+        /// The scan service wrapper.
+        /// </summary>
+        private readonly IScanServiceWrapper scanServiceWrapper;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CancelScanCommand"/> class.
+        /// </summary>
+        /// <param name="ssw">
+        /// The scan service wrapper.
+        /// </param>
+        public CancelScanCommand(IScanServiceWrapper ssw)
+        {
+            this.scanServiceWrapper = ssw;
+            this.scanServiceWrapper.ScanStared += this.ScanServiceWrapperScanStared;
+            this.scanServiceWrapper.ScanCompleted += this.ScanServiceWrapperScanCompleted;
+        }
+
+        /// <summary>
+        /// The scan service Scan Completed Event Handler.
+        /// Fires CanExecuteChanged
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The ScanCompletedEventArgs.
+        /// </param>
+        private void ScanServiceWrapperScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)
+        {
+            Caliburn.Micro.Execute.OnUIThread(() => this.CanExecuteChanged(sender, EventArgs.Empty));    
+        }
+
+        /// <summary>
+        /// The scan service scan started event handler.
+        /// Fires CanExecuteChanged
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EventArgs.
+        /// </param>
+        private void ScanServiceWrapperScanStared(object sender, EventArgs e)
+        {
+            Caliburn.Micro.Execute.OnUIThread(() => this.CanExecuteChanged(sender, EventArgs.Empty));    
+        }
+
+        #region Implementation of ICommand
+
+        /// <summary>
+        /// Defines the method to be called when the command is invoked.
+        /// </summary>
+        /// <param name="parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
+        public void Execute(object parameter)
+        {
+            this.scanServiceWrapper.Stop();
+        }
+
+        /// <summary>
+        /// Defines the method that determines whether the command can execute in its current state.
+        /// </summary>
+        /// <returns>
+        /// true if this command can be executed; otherwise, false.
+        /// </returns>
+        /// <param name="parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
+        public bool CanExecute(object parameter)
+        {
+            if (this.scanServiceWrapper != null)
+            {
+                return this.scanServiceWrapper.IsScanning;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// The can execute changed.
+        /// </summary>
+        public event EventHandler CanExecuteChanged;
+
+        #endregion
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/Interfaces Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/Interfaces/IAdvancedEncoderOptionsCommand.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IAdvancedEncoderOptionsCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The AdvancedEncoderOptionsCommand interface.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands.Interfaces
+{
+    /// <summary>
+    /// The AdvancedEncoderOptionsCommand interface.
+    /// </summary>
+    public interface IAdvancedEncoderOptionsCommand
+    {
+        /// <summary>
+        /// Clear out the advanced options
+        /// </summary>
+        void ExecuteClearAdvanced();
+
+        /// <summary>
+        /// Clear the advanced encoder options out on the video tab.
+        /// </summary>
+        void ExecuteClearVideo();
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs Added

@@ -0,0 +1,62 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OpenOptionsScreen.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Command to display the options window.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+    using System;
+    using System.Windows.Input;
+
+    using Caliburn.Micro;
+
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    ///     A Command to display the options window.
+    /// </summary>
+    public class OpenOptionsScreenCommand : ICommand
+    {
+        /// <summary>
+        /// The can execute changed.
+        /// </summary>
+        public event EventHandler CanExecuteChanged;
+
+        /// <summary>
+        /// The can execute.
+        /// </summary>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        public bool CanExecute(object parameter)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// The execute.
+        /// </summary>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        public void Execute(object parameter)
+        {
+            var shellViewModel = IoC.Get<IShellViewModel>();
+            shellViewModel.DisplayWindow(ShellWindow.OptionsWindow);
+
+            if (parameter != null && parameter.GetType() == typeof(OptionsTab))
+            {
+                var optionsViewModel = IoC.Get<IOptionsViewModel>();
+                optionsViewModel.GotoTab((OptionsTab)parameter);
+            }
+        }
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs Added

@@ -0,0 +1,111 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ProcessShortcutCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Keyboard Shortcut Processor
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+    using System;
+    using System.Windows.Input;
+
+    using Caliburn.Micro;
+
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// Keyboard Shortcut Processor
+    /// </summary>
+    public class ProcessShortcutCommand : ICommand
+    {
+        /// <summary>
+        /// The Gesture
+        /// </summary>
+        private readonly KeyGesture gesture;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ProcessShortcutCommand"/> class.
+        /// </summary>
+        /// <param name="gesture">
+        /// The gesture.
+        /// </param>
+        public ProcessShortcutCommand(KeyGesture gesture)
+        {
+            this.gesture = gesture;
+        }
+
+        /// <summary>
+        /// Defines the method to be called when the command is invoked.
+        /// </summary>
+        /// <param name="parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
+        public void Execute(object parameter)
+        {
+            if (gesture != null)
+            {
+                IMainViewModel mainViewModel = IoC.Get<IMainViewModel>();
+                
+                // Start Encode (Ctrl+S)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.S)
+                {
+                    mainViewModel.StartEncode();
+                }
+
+                // Stop Encode (Ctrl+K)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.K)
+                {
+                    mainViewModel.StopEncode();
+                }
+
+                // Open Log Window (Ctrl+L)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.L)
+                {
+                    mainViewModel.OpenLogWindow();
+                }
+
+                // Open Queue Window (Ctrl+Q)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.Q)
+                {
+                    mainViewModel.OpenQueueWindow();
+                }
+
+                // Add to Queue (Ctrl+A)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.A)
+                {
+                    mainViewModel.AddToQueue();
+                }
+
+                // Scan a File (Ctrl+F)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.F)
+                {
+                    mainViewModel.FileScan();
+                }
+
+                // Scan a Folder (Ctrl+R)
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.R)
+                {
+                    mainViewModel.FolderScan();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Defines the method that determines whether the command can execute in its current state.
+        /// </summary>
+        /// <returns>
+        /// true if this command can be executed; otherwise, false.
+        /// </returns>
+        /// <param name="parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
+        public bool CanExecute(object parameter)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Can Execute Changed
+        /// </summary>
+        public event EventHandler CanExecuteChanged;
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs Added

@@ -0,0 +1,86 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceMenuCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the SourceMenuCommand type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+    using System;
+    using System.Windows.Input;
+
+    /// <summary>
+    /// The source menu command.
+    /// </summary>
+    public class SourceMenuCommand : ICommand
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The execute action.
+        /// </summary>
+        private readonly Action executeAction;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SourceMenuCommand"/> class.
+        /// </summary>
+        /// <param name="executeAction">
+        /// The execute action.
+        /// </param>
+        public SourceMenuCommand(Action executeAction)
+        {
+            this.executeAction = executeAction;
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// The can execute changed.
+        /// </summary>
+        public event EventHandler CanExecuteChanged;
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region ICommand
+
+        /// <summary>
+        /// The can execute.
+        /// </summary>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <returns>
+        /// The System.Boolean.
+        /// </returns>
+        public bool CanExecute(object parameter)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// The execute.
+        /// </summary>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        public void Execute(object parameter)
+        {
+            this.executeAction();
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Constants.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Constants.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Application Constants
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF
+{
+    /// <summary>
+    /// Application Constants
+    /// </summary>
+    public class Constants
+    {
+        /// <summary>
+        /// The appcast 64.
+        /// </summary>
+        public const string Appcast64 = "http://handbrake.fr/appcast.x86_64.xml";
+
+        /// <summary>
+        /// The appcast 32.
+        /// </summary>
+        public const string Appcast32 = "http://handbrake.fr/appcast.i386.xml";
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/Loading.xaml Added

@@ -0,0 +1,106 @@
+<UserControl x:Class="HandBrakeWPF.Controls.Loading"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Background="Transparent"
+             Height="45"
+             Width="45">
+
+    <Viewbox Width="40" Height="40" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Canvas RenderTransformOrigin="0.5,0.5"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Width="120"
+              Height="120"
+              Loaded="CanvasLoaded"
+              Unloaded="CanvasUnloaded">
+
+                <Ellipse x:Name="circle0"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="1.0" />
+
+                <Ellipse x:Name="circle1"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.9" />
+
+                <Ellipse x:Name="circle2"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.8" />
+
+                <Ellipse x:Name="circle3"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.7" />
+
+                <Ellipse x:Name="circle4"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.6" />
+
+                <Ellipse x:Name="circle5"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.5" />
+
+                <Ellipse x:Name="circle6"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.4" />
+
+                <Ellipse x:Name="circle7"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.3" />
+
+                <Ellipse x:Name="circle8"
+                 Width="20"
+                 Height="20"
+                 Canvas.Left="0"
+                 Canvas.Top="0"
+                 Stretch="Fill"
+                 Fill="DarkOrange"
+                 Opacity="0.2" />
+
+                <Canvas.RenderTransform>
+                    <RotateTransform x:Name="rotate" Angle="0" />
+                </Canvas.RenderTransform>
+            </Canvas>
+        </Grid>
+    </Viewbox>
+</UserControl>
+

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/Loading.xaml.cs Added

@@ -0,0 +1,157 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Loading.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for Loading.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+    using System.Windows.Threading;
+    using System;
+    using System.Windows;
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// Interaction logic for Loading.xaml
+    /// </summary>
+    public partial class Loading : UserControl
+    {
+        #region Fields
+
+        /// <summary>
+        /// Step
+        /// </summary>
+        private const double Step = Math.PI * 2 / 10.0;
+
+        /// <summary>
+        /// Timer for the spinning effect.
+        /// </summary>
+        private readonly DispatcherTimer timer;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Loading"/> class.
+        /// </summary>
+        public Loading()
+        {
+            InitializeComponent();
+
+            IsVisibleChanged += OnVisibleChanged;
+
+            this.timer = new DispatcherTimer(DispatcherPriority.ContextIdle, Dispatcher)
+            {
+                Interval = new TimeSpan(0, 0, 0, 0, 75)
+            };
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Sets the position.
+        /// </summary>
+        /// <param name="ellipse">The ellipse.</param>
+        /// <param name="offset">The offset.</param>
+        /// <param name="posOffSet">The pos off set.</param>
+        /// <param name="step">The step to change.</param>
+        private static void SetPosition(DependencyObject ellipse, double offset, double posOffSet, double step)
+        {
+            ellipse.SetValue(Canvas.LeftProperty, 50 + (Math.Sin(offset + (posOffSet * step)) * 50));
+            ellipse.SetValue(Canvas.TopProperty, 50 + (Math.Cos(offset + (posOffSet * step)) * 50));
+        }
+
+        /// <summary>
+        /// Starts this instance.
+        /// </summary>
+        private void Start()
+        {
+            this.timer.Tick += this.OnTick;
+            this.timer.Start();
+        }
+
+        /// <summary>
+        /// Stops this instance.
+        /// </summary>
+        private void Stop()
+        {
+            this.timer.Stop();
+            this.timer.Tick -= this.OnTick;
+        }
+
+        /// <summary>
+        /// Run the Animation
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void OnTick(object sender, EventArgs e)
+        {
+            this.rotate.Angle = (this.rotate.Angle + 36) % 360;
+        }
+
+        /// <summary>
+        /// Start and Stop the effect when the visibility changes
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void OnVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((bool)e.NewValue)
+            {
+                Start();
+            }
+            else
+            {
+                Stop();
+            }
+        }
+
+        /// <summary>
+        /// Setup the Canvas
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void CanvasLoaded(object sender, RoutedEventArgs e)
+        {
+            SetPosition(this.circle0, Math.PI, 0.0, Step);
+            SetPosition(this.circle1, Math.PI, 1.0, Step);
+            SetPosition(this.circle2, Math.PI, 2.0, Step);
+            SetPosition(this.circle3, Math.PI, 3.0, Step);
+            SetPosition(this.circle4, Math.PI, 4.0, Step);
+            SetPosition(this.circle5, Math.PI, 5.0, Step);
+            SetPosition(this.circle6, Math.PI, 6.0, Step);
+            SetPosition(this.circle7, Math.PI, 7.0, Step);
+            SetPosition(this.circle8, Math.PI, 8.0, Step);
+        }
+
+        /// <summary>
+        /// Stop when we unload this canvas
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void CanvasUnloaded(object sender, RoutedEventArgs e)
+        {
+            Stop();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/NumberBox.xaml Added

@@ -0,0 +1,175 @@
+<UserControl x:Class="HandBrakeWPF.Controls.NumberBox"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	Loaded="UserControl_Loaded">
+    <UserControl.Resources>
+        <Style x:Key="Arrow" TargetType="Polygon">
+            <Setter Property="Fill" Value="#333" />
+        </Style>
+        
+        <Style x:Key="UpButton" TargetType="Button">
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="Background" >
+                <Setter.Value>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                        <GradientStop Color="#EEE" Offset="0.4"/>
+                        <GradientStop Color="#BBB" Offset="1"/>
+                    </LinearGradientBrush>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+							Name="border"
+							BorderThickness="1"
+							BorderBrush="#888"
+							CornerRadius="0,2,0,0"
+							Background="{TemplateBinding Background}">
+                            <ContentPresenter
+								Name="content"
+								HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF4788c8" />
+                                <Setter Property="Foreground" Value="#FF4788c8" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" >
+                                    <Setter.Value>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                                            <GradientStop Color="#CCC" Offset="0.4"/>
+                                            <GradientStop Color="#999" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="content" Property="RenderTransform" >
+                                    <Setter.Value>
+                                        <TranslateTransform Y="1.0" />
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                            <Trigger Property="IsDefaulted" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsFocused" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="border" Property="Opacity" Value="0.7" />
+                                <Setter Property="Foreground" Value="Gray" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="DownButton" TargetType="Button">
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="Background" >
+                <Setter.Value>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                        <GradientStop Color="#EEE" Offset="0.4"/>
+                        <GradientStop Color="#BBB" Offset="1"/>
+                    </LinearGradientBrush>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+							Name="border"
+							BorderThickness="1"
+							BorderBrush="#888"
+							CornerRadius="0,0,2,0"
+							Background="{TemplateBinding Background}">
+                            <ContentPresenter
+								Name="content"
+								HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF4788c8" />
+                                <Setter Property="Foreground" Value="#FF4788c8" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" >
+                                    <Setter.Value>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                                            <GradientStop Color="#CCC" Offset="0.4"/>
+                                            <GradientStop Color="#999" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="content" Property="RenderTransform" >
+                                    <Setter.Value>
+                                        <TranslateTransform Y="1.0" />
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                            <Trigger Property="IsDefaulted" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsFocused" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="border" Property="Opacity" Value="0.7" />
+                                <Setter Property="Foreground" Value="Gray" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <TextBox
+			Name="numberBox"
+			Grid.Column="0"
+			GotFocus="NumberBoxGotFocus"
+			LostFocus="NumberBoxLostFocus"
+			PreviewTextInput="NumberBoxPreviewTextInput"
+			PreviewKeyDown="NumberBoxPreviewKeyDown"
+			PreviewMouseDown="NumberBoxPreviewMouseDown"
+			PreviewMouseUp="NumberBoxPreviewMouseUp"
+			TextChanged="NumberBoxTextChanged"
+			VerticalContentAlignment="Center"/>
+        <Grid
+			Name="incrementButtonsGrid"
+			Grid.Column="1"
+			Width="16">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Button
+				Style="{StaticResource UpButton}"
+				Grid.Row="0"
+				FontSize="4"
+				PreviewMouseLeftButtonDown="UpButtonMouseLeftButtonDown"
+				PreviewMouseLeftButtonUp="UpButtonMouseLeftButtonUp">
+                <Polygon
+					Style="{StaticResource Arrow}"
+					Points="4,0 0,4 8,4" />
+            </Button>
+            <Button
+				Style="{StaticResource DownButton}"
+				Grid.Row="1"
+				FontSize="4"
+				PreviewMouseLeftButtonDown="DownButtonMouseLeftButtonDown"
+				PreviewMouseLeftButtonUp="DownButtonMouseLeftButtonUp">
+                <Polygon
+					Style="{StaticResource Arrow}"
+					Points="0,0 8,0 4,4" />
+            </Button>
+        </Grid>
+    </Grid>
+</UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs Added

@@ -0,0 +1,655 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NumberBox.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for NumberBox.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+    using System;
+    using System.Globalization;
+    using System.Linq;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Input;
+    using System.Windows.Media;
+
+    /// <summary>
+    ///     Interaction logic for NumberBox.xaml
+    /// </summary>
+    public partial class NumberBox
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The maximum property name.
+        /// </summary>
+        public const string MaximumPropertyName = "Maximum";
+
+        /// <summary>
+        /// The minimum property name.
+        /// </summary>
+        public const string MinimumPropertyName = "Minimum";
+
+        /// <summary>
+        /// The modulus property name.
+        /// </summary>
+        public const string ModulusPropertyName = "Modulus";
+
+        /// <summary>
+        /// The allow empty property.
+        /// </summary>
+        public static readonly DependencyProperty AllowEmptyProperty = DependencyProperty.Register(
+            "AllowEmpty", typeof(bool), typeof(NumberBox), new PropertyMetadata(true, OnAllowEmptyChanged));
+
+        /// <summary>
+        /// The maximum property.
+        /// </summary>
+        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+            MaximumPropertyName, typeof(double), typeof(NumberBox), new UIPropertyMetadata(double.MaxValue));
+
+        /// <summary>
+        /// The minimum property.
+        /// </summary>
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+            MinimumPropertyName, typeof(double), typeof(NumberBox), new UIPropertyMetadata(double.MinValue));
+
+        /// <summary>
+        /// The modulus property.
+        /// </summary>
+        public static readonly DependencyProperty ModulusProperty = DependencyProperty.Register(
+            ModulusPropertyName, typeof(double), typeof(NumberBox), new UIPropertyMetadata(0.0));
+
+        /// <summary>
+        /// The number property.
+        /// </summary>
+        public static readonly DependencyProperty NumberProperty = DependencyProperty.Register(
+            "Number", typeof(double), typeof(NumberBox), new PropertyMetadata(OnNumberChanged));
+
+        /// <summary>
+        /// The select all threshold.
+        /// </summary>
+        private static readonly TimeSpan SelectAllThreshold = TimeSpan.FromMilliseconds(500);
+
+        /// <summary>
+        /// The has focus.
+        /// </summary>
+        private bool hasFocus;
+
+        /// <summary>
+        /// The last focus mouse down.
+        /// </summary>
+        private DateTime lastFocusMouseDown;
+
+        /// <summary>
+        /// The none caption.
+        /// </summary>
+        private string noneCaption;
+
+        /// <summary>
+        /// The refire control.
+        /// </summary>
+        private RefireControl refireControl;
+
+        /// <summary>
+        /// The suppress refresh.
+        /// </summary>
+        private bool suppressRefresh;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NumberBox"/> class.
+        /// </summary>
+        public NumberBox()
+        {
+            this.noneCaption = "(none)";
+            this.UpdateBindingOnTextChange = true;
+            this.ShowIncrementButtons = true;
+            this.SelectAllOnClick = true;
+
+            this.InitializeComponent();
+
+            this.RefreshNumberBox();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether allow empty.
+        /// </summary>
+        public bool AllowEmpty
+        {
+            get
+            {
+                return (bool)this.GetValue(AllowEmptyProperty);
+            }
+
+            set
+            {
+                this.SetValue(AllowEmptyProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum.
+        /// </summary>
+        public double Maximum
+        {
+            get
+            {
+                return (double)this.GetValue(MaximumProperty);
+            }
+            set
+            {
+                this.SetValue(MaximumProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum.
+        /// </summary>
+        public double Minimum
+        {
+            get
+            {
+                return (double)this.GetValue(MinimumProperty);
+            }
+            set
+            {
+                this.SetValue(MinimumProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modulus.
+        /// </summary>
+        public double Modulus
+        {
+            get
+            {
+                return (double)this.GetValue(ModulusProperty);
+            }
+            set
+            {
+                this.SetValue(ModulusProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the none caption.
+        /// </summary>
+        public string NoneCaption
+        {
+            get
+            {
+                return this.noneCaption;
+            }
+
+            set
+            {
+                this.noneCaption = value;
+                this.RefreshNumberBox();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number.
+        /// </summary>
+        public double Number
+        {
+            get
+            {
+                return (double)this.GetValue(NumberProperty);
+            }
+
+            set
+            {
+                this.SetValue(NumberProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether select all on click.
+        /// </summary>
+        public bool SelectAllOnClick { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether show increment buttons.
+        /// </summary>
+        public bool ShowIncrementButtons { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether update binding on text change.
+        /// </summary>
+        public bool UpdateBindingOnTextChange { get; set; }
+
+        /// <summary>
+        /// Gets the increment.
+        /// </summary>
+        private double Increment
+        {
+            get
+            {
+                return this.Modulus > 0 ? this.Modulus : 1;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The on allow empty changed.
+        /// </summary>
+        /// <param name="dependencyObject">
+        /// The dependency object.
+        /// </param>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        private static void OnAllowEmptyChanged(
+            DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        {
+            var numBox = dependencyObject as NumberBox;
+            if (numBox != null)
+            {
+                numBox.RefreshNumberBox();
+            }
+        }
+
+        /// <summary>
+        /// The on number changed.
+        /// </summary>
+        /// <param name="dependencyObject">
+        /// The dependency object.
+        /// </param>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        private static void OnNumberChanged(
+            DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        {
+            if (eventArgs.NewValue != eventArgs.OldValue)
+            {
+                var numBox = dependencyObject as NumberBox;
+
+                if (!numBox.suppressRefresh)
+                {
+                    numBox.RefreshNumberBox();
+                }
+            }
+        }
+
+        /// <summary>
+        /// The decrement number.
+        /// </summary>
+        private void DecrementNumber()
+        {
+            double newNumber;
+            if (this.AllowEmpty && this.Number == 0)
+            {
+                newNumber = Math.Min(this.Maximum, -this.Increment);
+            }
+            else
+            {
+                newNumber = this.Number - this.Increment;
+            }
+
+            if (newNumber < this.Minimum)
+            {
+                newNumber = this.Minimum;
+            }
+
+            if (newNumber != this.Number)
+            {
+                this.Number = newNumber;
+            }
+        }
+
+        /// <summary>
+        /// The down button mouse left button down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void DownButtonMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl = new RefireControl(this.DecrementNumber);
+            this.refireControl.Begin();
+        }
+
+        /// <summary>
+        /// The down button mouse left button up.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void DownButtonMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl.Stop();
+        }
+
+        /// <summary>
+        /// The get nearest value.
+        /// </summary>
+        /// <param name="number">
+        /// The number.
+        /// </param>
+        /// <param name="modulus">
+        /// The modulus.
+        /// </param>
+        /// <returns>
+        /// The <see cref="double"/>.
+        /// </returns>
+        private double GetNearestValue(double number, double modulus)
+        {
+            double remainder = number % modulus;
+
+            if (remainder == 0)
+            {
+                return number;
+            }
+
+            return remainder >= (modulus / 2) ? number + (modulus - remainder) : number - remainder;
+        }
+
+        /// <summary>
+        /// The increment number.
+        /// </summary>
+        private void IncrementNumber()
+        {
+            double newNumber;
+            if (this.AllowEmpty && this.Number == 0)
+            {
+                newNumber = Math.Max(this.Minimum, this.Increment);
+            }
+            else
+            {
+                newNumber = this.Number + this.Increment;
+            }
+
+            if (newNumber > this.Maximum)
+            {
+                newNumber = this.Maximum;
+            }
+
+            if (newNumber != this.Number)
+            {
+                this.Number = newNumber;
+            }
+        }
+
+        /// <summary>
+        /// The number box got focus.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxGotFocus(object sender, RoutedEventArgs e)
+        {
+            this.hasFocus = true;
+
+            if (this.AllowEmpty)
+            {
+                if (this.Number == 0)
+                {
+                    this.numberBox.Text = string.Empty;
+                }
+
+                this.numberBox.Foreground = new SolidColorBrush(Colors.Black);
+            }
+        }
+
+        /// <summary>
+        /// The number box lost focus.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxLostFocus(object sender, RoutedEventArgs e)
+        {
+            this.hasFocus = false;
+
+            if (this.AllowEmpty && this.numberBox.Text == string.Empty)
+            {
+                this.Number = 0;
+                this.RefreshNumberBox();
+                return;
+            }
+
+            this.UpdateNumberBindingFromBox();
+            this.RefreshNumberBox();
+        }
+
+        /// <summary>
+        /// The number box preview key down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Space)
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// The number box preview mouse down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (!this.hasFocus)
+            {
+                this.lastFocusMouseDown = DateTime.Now;
+            }
+        }
+
+        /// <summary>
+        /// The number box preview mouse up.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            // If this mouse up is soon enough after an initial click on the box, select all.
+            if (this.SelectAllOnClick && DateTime.Now - this.lastFocusMouseDown < SelectAllThreshold)
+            {
+                this.Dispatcher.BeginInvoke(new Action(() => this.numberBox.SelectAll()));
+            }
+        }
+
+        /// <summary>
+        /// The number box preview text input.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewTextInput(object sender, TextCompositionEventArgs e)
+        {
+            if (e.Text.Any(c => !char.IsNumber(c) && c != '.' && (this.Minimum >= 0 || c != '-')))
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// The number box text changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (this.UpdateBindingOnTextChange)
+            {
+                if (this.AllowEmpty && this.numberBox.Text == string.Empty)
+                {
+                    this.Number = 0;
+                    return;
+                }
+
+                this.UpdateNumberBindingFromBox();
+            }
+
+            this.RefreshNumberBoxColor();
+        }
+
+        /// <summary>
+        /// The number is valid.
+        /// </summary>
+        /// <param name="number">
+        /// The number.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        private bool NumberIsValid(double number)
+        {
+            return number >= this.Minimum && number <= this.Maximum;
+        }
+
+        /// <summary>
+        /// The refresh number box.
+        /// </summary>
+        private void RefreshNumberBox()
+        {
+            if (this.AllowEmpty && this.Number == 0)
+            {
+                this.numberBox.Text = this.hasFocus ? string.Empty : this.NoneCaption;
+
+                // this.numberBox.Foreground = new SolidColorBrush(Colors.Gray);
+            }
+            else
+            {
+                this.numberBox.Text = this.Number.ToString(CultureInfo.InvariantCulture);
+
+                // this.numberBox.Foreground = new SolidColorBrush(Colors.Black);
+            }
+
+            this.RefreshNumberBoxColor();
+        }
+
+        /// <summary>
+        /// The refresh number box color.
+        /// </summary>
+        private void RefreshNumberBoxColor()
+        {
+            this.numberBox.Foreground = this.numberBox.Text == this.NoneCaption ? new SolidColorBrush(Colors.Gray) : new SolidColorBrush(Colors.Black);
+        }
+
+        /// <summary>
+        /// The up button mouse left button down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UpButtonMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl = new RefireControl(this.IncrementNumber);
+            this.refireControl.Begin();
+        }
+
+        /// <summary>
+        /// The up button mouse left button up.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UpButtonMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl.Stop();
+        }
+
+        /// <summary>
+        /// The update number binding from box.
+        /// </summary>
+        private void UpdateNumberBindingFromBox()
+        {
+            double newNumber;
+            if (double.TryParse(this.numberBox.Text, out newNumber))
+            {
+                if (this.NumberIsValid(newNumber))
+                {
+                    if (this.Modulus != 0)
+                    {
+                        newNumber = this.GetNearestValue(newNumber, this.Modulus);
+                    }
+
+                    if (newNumber != this.Number)
+                    {
+                        // While updating the binding we don't need to react to the change.
+                        this.suppressRefresh = true;
+                        this.Number = newNumber;
+                        this.suppressRefresh = false;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// The user control_ loaded.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (!this.ShowIncrementButtons)
+            {
+                this.incrementButtonsGrid.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/RefireControl.cs Added

@@ -0,0 +1,134 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="RefireControl.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The refire control.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Threading;
+    using System.Windows;
+
+    /// <summary>
+    /// The refire control.
+    /// </summary>
+    public class RefireControl
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        ///     How long stages last.
+        /// </summary>
+        private const int StageDurationMsec = 900;
+
+        /// <summary>
+        /// The delays. At each stage the refire rate increases.
+        /// </summary>
+        private static readonly List<int> Delays = new List<int> { 500, 200, 100, 50, 20 };
+
+        /// <summary>
+        /// The refire action.
+        /// </summary>
+        private readonly Action refireAction;
+
+        /// <summary>
+        /// The refire sync.
+        /// </summary>
+        private readonly object refireSync = new object();
+
+        /// <summary>
+        /// The refire timer.
+        /// </summary>
+        private Timer refireTimer;
+
+        /// <summary>
+        /// The running.
+        /// </summary>
+        private bool running;
+
+        /// <summary>
+        /// The stopwatch.
+        /// </summary>
+        private Stopwatch stopwatch;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RefireControl"/> class.
+        /// </summary>
+        /// <param name="refireAction">
+        /// The refire action.
+        /// </param>
+        public RefireControl(Action refireAction)
+        {
+            this.refireAction = refireAction;
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The begin.
+        /// </summary>
+        public void Begin()
+        {
+            lock (this.refireSync)
+            {
+                this.stopwatch = Stopwatch.StartNew();
+                this.running = true;
+
+                // Fire once immediately.
+                this.refireAction();
+
+                this.refireTimer = new Timer(
+                    obj =>
+                        {
+                            lock (this.refireSync)
+                            {
+                                if (this.running)
+                                {
+                                    var stage = (int)(this.stopwatch.ElapsedMilliseconds / StageDurationMsec);
+
+                                    int newDelay = stage >= Delays.Count ? Delays[Delays.Count - 1] : Delays[stage];
+
+                                    Application.Current.Dispatcher.BeginInvoke(this.refireAction);
+
+                                    this.refireTimer.Change(newDelay, newDelay);
+                                }
+                            }
+                        }, 
+                    null, 
+                    Delays[0], 
+                    Delays[0]);
+            }
+        }
+
+        /// <summary>
+        /// The stop.
+        /// </summary>
+        public void Stop()
+        {
+            lock (this.refireSync)
+            {
+                this.stopwatch.Stop();
+                this.running = false;
+
+                if (this.refireTimer != null)
+                {
+                    this.refireTimer.Dispose();
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml Added

@@ -0,0 +1,28 @@
+<UserControl x:Class="HandBrakeWPF.Controls.StatusPanel"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ctr="clr-namespace:HandBrakeWPF.Controls">
+
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="boolTovisibility" />
+    </UserControl.Resources>
+
+    <DockPanel Background="Black" Opacity="0.85"
+               Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, 
+                            Path=IsLoading, Mode=OneWay, Converter={StaticResource boolTovisibility}}">
+
+        <ctr:Loading DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Top"
+                     Height="45" Margin="18,10" />
+
+        <StackPanel VerticalAlignment="Top">
+            <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" Margin="0,11,0,0" HorizontalAlignment="Left"
+                       FontWeight="Bold"
+                       Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=Message}" 
+                       Foreground="LightBlue" />
+
+            <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="12" Margin="0,5" HorizontalAlignment="Left"
+                       Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=SubMessage}" 
+                       Foreground="LightBlue" />
+        </StackPanel>
+    </DockPanel>
+</UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs Added

@@ -0,0 +1,73 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="StatusPanel.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for StatusPanel.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+    using System.Windows;
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// Interaction logic for StatusPanel.xaml
+    /// </summary>
+    public partial class StatusPanel : UserControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StatusPanel"/> class.
+        /// </summary>
+        public StatusPanel()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Dependancy Property for the IsLoading Property
+        /// </summary>
+        public static readonly DependencyProperty IsLoadingProperty =
+          DependencyProperty.Register("IsLoading", typeof(bool), typeof(StatusPanel), new UIPropertyMetadata(false));
+
+        /// <summary>
+        /// Dependancy Property for the Message Property
+        /// </summary>
+        public static readonly DependencyProperty MessageProperty =
+            DependencyProperty.Register("Message", typeof(string), typeof(StatusPanel), new UIPropertyMetadata(string.Empty));
+
+        /// <summary>
+        /// Dependancy Property for the submessage propery
+        /// </summary>
+        public static readonly DependencyProperty SubMessageProperty =
+            DependencyProperty.Register("SubMessage", typeof(string), typeof(StatusPanel), new UIPropertyMetadata(string.Empty));
+
+        /// <summary>
+        /// Gets or sets a value indicating whether IsLoading.
+        /// </summary>
+        public bool IsLoading
+        {
+            get { return (bool)GetValue(IsLoadingProperty); }
+            set { SetValue(IsLoadingProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets Message.
+        /// </summary>
+        public string Message
+        {
+            get { return (string)GetValue(MessageProperty); }
+            set { SetValue(MessageProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets SubMessage.
+        /// </summary>
+        public string SubMessage
+        {
+            get { return (string)GetValue(SubMessageProperty); }
+            set { SetValue(SubMessageProperty, value); }
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/TimeSpanBox.xaml Added

@@ -0,0 +1,175 @@
+<UserControl x:Class="HandBrakeWPF.Controls.TimeSpanBox"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	Loaded="UserControl_Loaded">
+    <UserControl.Resources>
+        <Style x:Key="Arrow" TargetType="Polygon">
+            <Setter Property="Fill" Value="#333" />
+        </Style>
+        
+        <Style x:Key="UpButton" TargetType="Button">
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="Background" >
+                <Setter.Value>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                        <GradientStop Color="#EEE" Offset="0.4"/>
+                        <GradientStop Color="#BBB" Offset="1"/>
+                    </LinearGradientBrush>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+							Name="border"
+							BorderThickness="1"
+							BorderBrush="#888"
+							CornerRadius="0,2,0,0"
+							Background="{TemplateBinding Background}">
+                            <ContentPresenter
+								Name="content"
+								HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF4788c8" />
+                                <Setter Property="Foreground" Value="#FF4788c8" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" >
+                                    <Setter.Value>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                                            <GradientStop Color="#CCC" Offset="0.4"/>
+                                            <GradientStop Color="#999" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="content" Property="RenderTransform" >
+                                    <Setter.Value>
+                                        <TranslateTransform Y="1.0" />
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                            <Trigger Property="IsDefaulted" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsFocused" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="border" Property="Opacity" Value="0.7" />
+                                <Setter Property="Foreground" Value="Gray" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="DownButton" TargetType="Button">
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="Background" >
+                <Setter.Value>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                        <GradientStop Color="#EEE" Offset="0.4"/>
+                        <GradientStop Color="#BBB" Offset="1"/>
+                    </LinearGradientBrush>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+							Name="border"
+							BorderThickness="1"
+							BorderBrush="#888"
+							CornerRadius="0,0,2,0"
+							Background="{TemplateBinding Background}">
+                            <ContentPresenter
+								Name="content"
+								HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF4788c8" />
+                                <Setter Property="Foreground" Value="#FF4788c8" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" >
+                                    <Setter.Value>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" >
+                                            <GradientStop Color="#CCC" Offset="0.4"/>
+                                            <GradientStop Color="#999" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="content" Property="RenderTransform" >
+                                    <Setter.Value>
+                                        <TranslateTransform Y="1.0" />
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                            <Trigger Property="IsDefaulted" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsFocused" Value="True">
+                                <Setter TargetName="border" Property="BorderBrush" Value="#FF282828" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="border" Property="Opacity" Value="0.7" />
+                                <Setter Property="Foreground" Value="Gray" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <TextBox
+			Name="numberBox"
+			Grid.Column="0"
+			GotFocus="NumberBoxGotFocus"
+			LostFocus="NumberBoxLostFocus"
+			PreviewTextInput="NumberBoxPreviewTextInput"
+			PreviewKeyDown="NumberBoxPreviewKeyDown"
+			PreviewMouseDown="NumberBoxPreviewMouseDown"
+			PreviewMouseUp="NumberBoxPreviewMouseUp"
+			TextChanged="NumberBoxTextChanged"
+			VerticalContentAlignment="Center"/>
+        <Grid
+			Name="incrementButtonsGrid"
+			Grid.Column="1"
+			Width="16">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Button
+				Style="{StaticResource UpButton}"
+				Grid.Row="0"
+				FontSize="4"
+				PreviewMouseLeftButtonDown="UpButtonMouseLeftButtonDown"
+				PreviewMouseLeftButtonUp="UpButtonMouseLeftButtonUp">
+                <Polygon
+					Style="{StaticResource Arrow}"
+					Points="4,0 0,4 8,4" />
+            </Button>
+            <Button
+				Style="{StaticResource DownButton}"
+				Grid.Row="1"
+				FontSize="4"
+				PreviewMouseLeftButtonDown="DownButtonMouseLeftButtonDown"
+				PreviewMouseLeftButtonUp="DownButtonMouseLeftButtonUp">
+                <Polygon
+					Style="{StaticResource Arrow}"
+					Points="0,0 8,0 4,4" />
+            </Button>
+        </Grid>
+    </Grid>
+</UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/TimeSpanBox.xaml.cs Added

@@ -0,0 +1,721 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="TimeSpanBox.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for TimeSpanBox.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+    using System;
+    using System.Globalization;
+    using System.Linq;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Input;
+    using System.Windows.Media;
+
+    /// <summary>
+    ///     Interaction logic for TimeSpanBox.xaml
+    /// </summary>
+    public partial class TimeSpanBox
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The maximum property name.
+        /// </summary>
+        public const string MaximumPropertyName = "Maximum";
+
+        /// <summary>
+        /// The minimum property name.
+        /// </summary>
+        public const string MinimumPropertyName = "Minimum";
+
+        /// <summary>
+        /// The modulus property name.
+        /// </summary>
+        public const string ModulusPropertyName = "Modulus";
+
+        /// <summary>
+        /// The allow empty property.
+        /// </summary>
+        public static readonly DependencyProperty AllowEmptyProperty = DependencyProperty.Register(
+            "AllowEmpty", typeof(bool), typeof(TimeSpanBox), new PropertyMetadata(true, OnAllowEmptyChanged));
+
+        /// <summary>
+        /// The maximum property.
+        /// </summary>
+        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+            MaximumPropertyName, typeof(int), typeof(TimeSpanBox), new UIPropertyMetadata(int.MaxValue));
+
+        /// <summary>
+        /// The minimum property.
+        /// </summary>
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+            MinimumPropertyName, typeof(int), typeof(TimeSpanBox), new UIPropertyMetadata(int.MinValue));
+
+        /// <summary>
+        /// The modulus property.
+        /// </summary>
+        public static readonly DependencyProperty ModulusProperty = DependencyProperty.Register(
+            ModulusPropertyName, typeof(int), typeof(TimeSpanBox), new UIPropertyMetadata(0));
+
+        /// <summary>
+        /// The number property.
+        /// </summary>
+        public static readonly DependencyProperty NumberProperty = DependencyProperty.Register(
+            "Number", typeof(int), typeof(TimeSpanBox), new PropertyMetadata(OnNumberChanged));
+
+        /// <summary>
+        /// The show time span property.
+        /// </summary>
+        public static readonly DependencyProperty ShowTimeSpanProperty = DependencyProperty.Register(
+            "ShowTimeSpan", typeof(bool), typeof(TimeSpanBox), new PropertyMetadata(OnShowTimeSpanChanged));
+
+        /// <summary>
+        /// The select all threshold.
+        /// </summary>
+        private static readonly TimeSpan SelectAllThreshold = TimeSpan.FromMilliseconds(500);
+
+        /// <summary>
+        /// The has focus.
+        /// </summary>
+        private bool hasFocus;
+
+        /// <summary>
+        /// The last focus mouse down.
+        /// </summary>
+        private DateTime lastFocusMouseDown;
+
+        /// <summary>
+        /// The none caption.
+        /// </summary>
+        private string noneCaption;
+
+        /// <summary>
+        /// The refire control.
+        /// </summary>
+        private RefireControl refireControl;
+
+        /// <summary>
+        /// The suppress refresh.
+        /// </summary>
+        private bool suppressRefresh;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TimeSpanBox"/> class. 
+        /// </summary>
+        public TimeSpanBox()
+        {
+            this.noneCaption = "(none)";
+            this.UpdateBindingOnTextChange = true;
+            this.ShowIncrementButtons = true;
+            this.SelectAllOnClick = true;
+
+            this.InitializeComponent();
+
+            this.RefreshNumberBox();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether show time span.
+        /// </summary>
+        public bool ShowTimeSpan
+        {
+            get
+            {
+                return (bool)this.GetValue(ShowTimeSpanProperty);
+            }
+
+            set
+            {
+                this.SetValue(ShowTimeSpanProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether allow empty.
+        /// </summary>
+        public bool AllowEmpty
+        {
+            get
+            {
+                return (bool)this.GetValue(AllowEmptyProperty);
+            }
+
+            set
+            {
+                this.SetValue(AllowEmptyProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum.
+        /// </summary>
+        public int Maximum
+        {
+            get
+            {
+                return (int)this.GetValue(MaximumProperty);
+            }
+            set
+            {
+                this.SetValue(MaximumProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum.
+        /// </summary>
+        public int Minimum
+        {
+            get
+            {
+                return (int)this.GetValue(MinimumProperty);
+            }
+            set
+            {
+                this.SetValue(MinimumProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modulus.
+        /// </summary>
+        public int Modulus
+        {
+            get
+            {
+                return (int)this.GetValue(ModulusProperty);
+            }
+            set
+            {
+                this.SetValue(ModulusProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the none caption.
+        /// </summary>
+        public string NoneCaption
+        {
+            get
+            {
+                return this.noneCaption;
+            }
+
+            set
+            {
+                this.noneCaption = value;
+                this.RefreshNumberBox();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number.
+        /// </summary>
+        public int Number
+        {
+            get
+            {
+                return (int)this.GetValue(NumberProperty);
+            }
+
+            set
+            {
+                this.SetValue(NumberProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether select all on click.
+        /// </summary>
+        public bool SelectAllOnClick { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether show increment buttons.
+        /// </summary>
+        public bool ShowIncrementButtons { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether update binding on text change.
+        /// </summary>
+        public bool UpdateBindingOnTextChange { get; set; }
+
+        /// <summary>
+        /// Gets the increment.
+        /// </summary>
+        private int Increment
+        {
+            get
+            {
+                return this.Modulus > 0 ? this.Modulus : 1;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The on allow empty changed.
+        /// </summary>
+        /// <param name="dependencyObject">
+        /// The dependency object.
+        /// </param>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        private static void OnAllowEmptyChanged(
+            DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        {
+            var numBox = dependencyObject as TimeSpanBox;
+            if (numBox != null)
+            {
+                numBox.RefreshNumberBox();
+            }
+        }
+
+        /// <summary>
+        /// The on number changed.
+        /// </summary>
+        /// <param name="dependencyObject">
+        /// The dependency object.
+        /// </param>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        private static void OnNumberChanged(
+            DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        {
+            if (eventArgs.NewValue != eventArgs.OldValue)
+            {
+                var numBox = dependencyObject as TimeSpanBox;
+
+                if (!numBox.suppressRefresh)
+                {
+                    numBox.RefreshNumberBox();
+                }
+            }
+        }
+
+        /// <summary>
+        /// The on show timespan number changed.
+        /// </summary>
+        /// <param name="dependencyObject">
+        /// The dependency object.
+        /// </param>
+        /// <param name="eventArgs">
+        /// The event args.
+        /// </param>
+        private static void OnShowTimeSpanChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        {
+            if (eventArgs.NewValue != eventArgs.OldValue)
+            {
+                var numBox = dependencyObject as TimeSpanBox;
+
+                if (!numBox.suppressRefresh)
+                {
+                    numBox.RefreshNumberBox();
+                }
+            }
+        }     
+
+        /// <summary>
+        /// The decrement number.
+        /// </summary>
+        private void DecrementNumber()
+        {
+            int newNumber;
+            if (this.AllowEmpty && this.Number == 0)
+            {
+                newNumber = Math.Min(this.Maximum, -this.Increment);
+            }
+            else
+            {
+                newNumber = this.Number - this.Increment;
+            }
+
+            if (newNumber < this.Minimum)
+            {
+                newNumber = this.Minimum;
+            }
+
+            if (newNumber != this.Number)
+            {
+                this.Number = newNumber;
+            }
+        }
+
+        /// <summary>
+        /// The down button mouse left button down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void DownButtonMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl = new RefireControl(this.DecrementNumber);
+            this.refireControl.Begin();
+        }
+
+        /// <summary>
+        /// The down button mouse left button up.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void DownButtonMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl.Stop();
+        }
+
+        /// <summary>
+        /// The get nearest value.
+        /// </summary>
+        /// <param name="number">
+        /// The number.
+        /// </param>
+        /// <param name="modulus">
+        /// The modulus.
+        /// </param>
+        /// <returns>
+        /// The <see cref="double"/>.
+        /// </returns>
+        private int GetNearestValue(int number, int modulus)
+        {
+            int remainder = number % modulus;
+
+            if (remainder == 0)
+            {
+                return number;
+            }
+
+            return remainder >= (modulus / 2) ? number + (modulus - remainder) : number - remainder;
+        }
+
+        /// <summary>
+        /// The increment number.
+        /// </summary>
+        private void IncrementNumber()
+        {
+            int newNumber;
+            if (this.AllowEmpty && this.Number == 0)
+            {
+                newNumber = Math.Max(this.Minimum, this.Increment);
+            }
+            else
+            {
+                newNumber = this.Number + this.Increment;
+            }
+
+            if (newNumber > this.Maximum)
+            {
+                newNumber = this.Maximum;
+            }
+
+            if (newNumber != this.Number)
+            {
+                this.Number = newNumber;
+            }
+        }
+
+        /// <summary>
+        /// The number box got focus.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxGotFocus(object sender, RoutedEventArgs e)
+        {
+            this.hasFocus = true;
+
+            if (this.AllowEmpty)
+            {
+                if (this.Number == 0)
+                {
+                    this.numberBox.Text = string.Empty;
+                }
+
+                this.numberBox.Foreground = new SolidColorBrush(Colors.Black);
+            }
+        }
+
+        /// <summary>
+        /// The number box lost focus.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxLostFocus(object sender, RoutedEventArgs e)
+        {
+            this.hasFocus = false;
+
+            if (this.AllowEmpty && this.numberBox.Text == string.Empty)
+            {
+                this.Number = 0;
+                this.RefreshNumberBox();
+                return;
+            }
+
+            this.UpdateNumberBindingFromBox();
+            this.RefreshNumberBox();
+        }
+
+        /// <summary>
+        /// The number box preview key down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Space)
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// The number box preview mouse down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (!this.hasFocus)
+            {
+                this.lastFocusMouseDown = DateTime.Now;
+            }
+        }
+
+        /// <summary>
+        /// The number box preview mouse up.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            // If this mouse up is soon enough after an initial click on the box, select all.
+            if (this.SelectAllOnClick && DateTime.Now - this.lastFocusMouseDown < SelectAllThreshold)
+            {
+                this.Dispatcher.BeginInvoke(new Action(() => this.numberBox.SelectAll()));
+            }
+        }
+
+        /// <summary>
+        /// The number box preview text input.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxPreviewTextInput(object sender, TextCompositionEventArgs e)
+        {
+            if (e.Text.Any(c => !char.IsNumber(c) && c != '.' && c != ':' && (this.Minimum >= 0 || c != '-')))
+            {
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// The number box text changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NumberBoxTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (this.UpdateBindingOnTextChange)
+            {
+                if (this.AllowEmpty && this.numberBox.Text == string.Empty)
+                {
+                    this.Number = 0;
+                    return;
+                }
+
+                this.UpdateNumberBindingFromBox();
+            }
+
+            this.RefreshNumberBoxColor();
+        }
+
+        /// <summary>
+        /// The number is valid.
+        /// </summary>
+        /// <param name="number">
+        /// The number.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        private bool NumberIsValid(double number)
+        {
+            return number >= this.Minimum && number <= this.Maximum;
+        }
+
+        /// <summary>
+        /// The refresh number box.
+        /// </summary>
+        private void RefreshNumberBox()
+        {
+            if (this.AllowEmpty && this.Number == 0)
+            {
+                this.numberBox.Text = this.hasFocus ? string.Empty : this.NoneCaption;
+
+                // this.numberBox.Foreground = new SolidColorBrush(Colors.Gray);
+            }
+            else
+            {
+                if (this.ShowTimeSpan)
+                {
+                    this.numberBox.Text = TimeSpan.FromSeconds(this.Number).ToString();
+                }
+                else
+                {
+                    this.numberBox.Text = this.Number.ToString(CultureInfo.InvariantCulture);
+                }
+
+                // this.numberBox.Foreground = new SolidColorBrush(Colors.Black);
+            }
+
+            this.RefreshNumberBoxColor();
+        }
+
+        /// <summary>
+        /// The refresh number box color.
+        /// </summary>
+        private void RefreshNumberBoxColor()
+        {
+            this.numberBox.Foreground = this.numberBox.Text == this.NoneCaption ? new SolidColorBrush(Colors.Gray) : new SolidColorBrush(Colors.Black);
+        }
+
+        /// <summary>
+        /// The up button mouse left button down.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UpButtonMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl = new RefireControl(this.IncrementNumber);
+            this.refireControl.Begin();
+        }
+
+        /// <summary>
+        /// The up button mouse left button up.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UpButtonMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.refireControl.Stop();
+        }
+
+        /// <summary>
+        /// The update number binding from box.
+        /// </summary>
+        private void UpdateNumberBindingFromBox()
+        {
+            int newNumber;
+            TimeSpan newTimespanNumber;
+            if (int.TryParse(this.numberBox.Text, out newNumber))
+            {
+                if (this.NumberIsValid(newNumber))
+                {
+                    if (this.Modulus != 0)
+                    {
+                        newNumber = this.GetNearestValue(newNumber, this.Modulus);
+                    }
+
+                    if (newNumber != this.Number)
+                    {
+                        // While updating the binding we don't need to react to the change.
+                        this.suppressRefresh = true;
+                        this.Number = newNumber;
+                        this.suppressRefresh = false;
+                    }
+                }
+            } 
+            else if (TimeSpan.TryParse(this.numberBox.Text, out newTimespanNumber))
+            {
+                if (newTimespanNumber != TimeSpan.Zero)
+                {
+                    int seconds = (int)Math.Round(newTimespanNumber.TotalSeconds, 0);
+                    if (seconds != this.Number)
+                    {
+                        // While updating the binding we don't need to react to the change.
+                        this.suppressRefresh = true;
+                        this.Number = seconds;
+                        this.suppressRefresh = false;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// The user control_ loaded.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (!this.ShowIncrementButtons)
+            {
+                this.incrementButtonsGrid.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/AdvancedVisibilityConverter.cs Added

@@ -0,0 +1,94 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedVisibilityConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the AdvancedVisibilityConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters
+{
+    using System;
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+
+    /// <summary>
+    /// The advanced visibility converter.
+    /// </summary>
+    [Obsolete("This will be refactored out soon! Don't use.")]
+    public class AdvancedVisibilityConverter : IValueConverter
+    {
+        #region Implemented Interfaces
+
+        #region IValueConverter
+
+        /// <summary>
+        /// The convert.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The convert.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool visibility = (bool)value;
+
+            // If we are given a parameter, reverse it
+            if (parameter != null)
+            {
+                visibility = !visibility;
+            }
+
+            return visibility ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// The convert back.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The convert back.
+        /// </returns>
+        public object ConvertBack(
+            object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            Visibility visibility = (Visibility)value;
+            bool result = visibility == Visibility.Visible;
+
+            if (parameter != null)
+            {
+                result = !result;
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs Added

@@ -0,0 +1,280 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioBitrateConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Converter to provide the available audio bitrate options.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Audio
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+    using System.Collections.Generic;
+    using System.Linq;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// A Converter to provide the available audio bitrate options.
+    /// </summary>
+    public class AudioBitrateConverter : IValueConverter
+    {
+        /// <summary>
+        /// The samplerates.
+        /// </summary>
+        readonly Dictionary<double, int> samplerates = new Dictionary<double, int>
+               {
+                   { 8, 8000 },
+                   { 11.025, 11025 },
+                   { 12, 12000 },
+                   { 16, 16000 },
+                   { 22.05, 22050 },
+                   { 24, 24000 },
+                   { 32, 32000 },
+                   { 44.1, 44100 },
+                   { 48, 48000 }
+               };
+
+        /// <summary>
+        /// Converts source values to a value for the binding target. The data binding engine calls this method when it propagates the values from source bindings to the binding target.
+        /// </summary>
+        /// <returns>
+        /// A converted value.If the method returns null, the valid null value is used.A return value of <see cref="T:System.Windows.DependencyProperty"/>.<see cref="F:System.Windows.DependencyProperty.UnsetValue"/> indicates that the converter did not produce a value, and that the binding will use the <see cref="P:System.Windows.Data.BindingBase.FallbackValue"/> if it is available, or else will use the default value.A return value of <see cref="T:System.Windows.Data.Binding"/>.<see cref="F:System.Windows.Data.Binding.DoNothing"/> indicates that the binding does not transfer the value or use the <see cref="P:System.Windows.Data.BindingBase.FallbackValue"/> or the default value.
+        /// </returns>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The type of the binding target property.
+        /// </param>
+        /// <param name="parameter">
+        /// The converter parameter to use.
+        /// </param>
+        /// <param name="culture">
+        /// The culture to use in the converter.
+        /// </param>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // Base set of bitrates available.
+            List<int> bitrates = new List<int> { 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 640, 768, 960, 1152, 1344, 1536 };
+
+            int max = 160;
+            int low = 32;
+
+            AudioTrack track = value as AudioTrack;
+            if (track != null)
+            {
+                int samplerate = this.GetBestSampleRate(track);
+                int srShift = this.GetSamplerateShift(samplerate);
+                int lfeCount = this.GetLowFreqChannelCount(track.MixDown);
+                int channels = this.GetChannelCount(track.MixDown) - lfeCount;
+
+                switch (track.Encoder)
+                {
+                    case AudioEncoder.Faac:
+                        low = (channels + lfeCount) * 32;
+                        max = (channels + lfeCount) * (192 >> srShift);
+                        break;
+                    case AudioEncoder.ffaac:
+                        low = ((channels + lfeCount) * 32);
+                        max = ((channels + lfeCount) * ((192 + (64 * ((samplerate << srShift) >= 44100 ? 1 : 0))) >> srShift));
+                        break;
+                    case AudioEncoder.Lame:
+                        low = 8 + (24 * (srShift < 1 ? 1 : 0) );
+                        max = 64 + (96 * (srShift < 2 ? 1 : 0)) + (160 * (srShift < 1 ? 1 : 0));
+                        break;
+                    case AudioEncoder.Vorbis:
+                        low = (channels + lfeCount) * (14 + (8 * (srShift < 2 ? 1 : 0)) + (6 * (srShift < 1 ? 1 : 0)));
+                        max = (channels + lfeCount) * (32 + (54 * (srShift < 2 ? 1 : 0)) + (104 * (srShift < 1 ? 1 : 0)) + (50 * (samplerate >= 44100 ? 1 : 0)));
+                        break;
+                    case AudioEncoder.Ac3:
+                        low = 224 * channels / 5;
+                        max = 640;
+                        break;
+                    case AudioEncoder.Ac3Passthrough:
+                    case AudioEncoder.DtsPassthrough:
+                    case AudioEncoder.DtsHDPassthrough:
+                    case AudioEncoder.AacPassthru:
+                    case AudioEncoder.Mp3Passthru:
+                    case AudioEncoder.Passthrough:
+                    case AudioEncoder.ffflac:
+                        max = 1536; // Since we don't care, just set it to the max.
+                        break;
+                    default:
+                        max = 768;
+                        break;
+                }
+
+                // Bring the bitrate down in-line with the max.
+                if (track.Bitrate < low)
+                {
+                    track.Bitrate = low;
+                }
+
+                if (track.Bitrate > max)
+                {
+                    track.Bitrate = max;
+                }
+            }
+
+            return bitrates.Where(bitrate => bitrate <= max && bitrate >= low);
+        }
+
+        /// <summary>
+        /// The get channel count.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The mixdown.
+        /// </param>
+        /// <returns>
+        /// The System.Int32.
+        /// </returns>
+        private int GetChannelCount(Mixdown mixdown)
+        {
+            switch (mixdown)
+            {
+                case Mixdown.Five_2_LFE:
+                case Mixdown.SevenPoint1Channels:
+                    return 8;
+                case Mixdown.SixPoint1Channels:
+                    return 7;
+                case Mixdown.FivePoint1Channels:
+                    return 6;
+                case Mixdown.Mono:
+                case Mixdown.LeftOnly:
+                case Mixdown.RightOnly:
+                    return 1;
+                case Mixdown.None:
+                    return 0;
+                default:
+                    return 2;
+            }
+        }
+
+        /// <summary>
+        /// The get low freq channel count.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The mixdown.
+        /// </param>
+        /// <returns>
+        /// The System.Int32.
+        /// </returns>
+        private int GetLowFreqChannelCount(Mixdown mixdown)
+        {
+            switch (mixdown)
+            {
+                case Mixdown.FivePoint1Channels:
+                case Mixdown.SixPoint1Channels:
+                case Mixdown.SevenPoint1Channels:
+                case Mixdown.Five_2_LFE:
+                    return 1;
+                default:
+                    return 0;
+            }
+        }
+
+        /// <summary>
+        /// The get samplerate shift.
+        /// </summary>
+        /// <param name="samplerate">
+        /// The samplerate.
+        /// </param>
+        /// <returns>
+        /// The System.Int32.
+        /// </returns>
+        private int GetSamplerateShift(int samplerate)
+        {
+            /* sr_shift: 0 -> 48000, 44100, 32000 Hz
+             *           1 -> 24000, 22050, 16000 Hz
+             *           2 -> 12000, 11025,  8000 Hz
+             *
+             * also, since samplerates are sanitized downwards:
+             *
+             * (samplerate < 32000) implies (samplerate <= 24000)
+             */
+            return ((samplerate < 16000) ? 2 : (samplerate < 32000) ? 1 : 0);
+        }
+
+        /// <summary>
+        /// The get best sample rate.
+        /// </summary>
+        /// <param name="track">
+        /// The track.
+        /// </param>
+        /// <returns>
+        /// The System.Double.
+        /// </returns>
+        private int GetBestSampleRate(AudioTrack track)
+        {
+            int samplerate = 48000; // Default to 48
+
+            // Try get the users selected sample rate
+            if (!track.SampleRate.Equals(0.0d))
+            {
+                samplerate = this.samplerates[track.SampleRate];
+            }
+            else if (track.ScannedTrack != null && track.ScannedTrack.SampleRate != 0) // If it's auto, try get the source
+            {
+                samplerate = track.ScannedTrack.SampleRate;
+            }
+
+            // THen Sanitize to make sure it's valid
+            int bestSamplerate;
+            if ((samplerate < 32000) && (track.Encoder == AudioEncoder.Ac3))
+            {
+                // AC-3 < 32 kHz suffers from poor hardware compatibility
+                bestSamplerate = 32000;
+            }
+            else
+            {
+                bestSamplerate = samplerate;
+                foreach (KeyValuePair<double, int> item in this.samplerates)
+                {
+                    // valid samplerate
+                    if (bestSamplerate.Equals(item.Value))
+                        break;
+
+                    // samplerate is higher than the next valid samplerate,
+                    // or lower than the lowest valid samplerate
+                    if (bestSamplerate > item.Value && bestSamplerate < this.samplerates.First().Value)
+                    {
+                        bestSamplerate = item.Value;
+                        break;
+                    }
+                }
+            }
+
+            return bestSamplerate;
+        }
+
+        /// <summary>
+        /// The convert back.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The System.Object.
+        /// </returns>
+        /// <exception cref="NotImplementedException">
+        /// We don't use this.
+        /// </exception>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs Added

@@ -0,0 +1,105 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioEncoderConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Audio Encoder Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Audio
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+    using System.Windows.Data;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// Audio Encoder Converter
+    /// </summary>
+    public class AudioEncoderConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// Gets a list of audio encoders OR returns the string name of an encoder depending on the input.
+        /// </summary>
+        /// <param name="values">
+        /// The values.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// IEnumberable AudioEncoder or String encoder name.
+        /// </returns>
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            // TODO -> Be smarter and only show the available Passthru options.
+            if (values.Count() == 2)
+            {
+                List<AudioEncoder> encoders = EnumHelper<AudioEncoder>.GetEnumList().ToList();
+                EncodeTask task = values[1] as EncodeTask;
+
+                if (task != null && task.OutputFormat != OutputFormat.Mkv)
+                {
+                    encoders.Remove(AudioEncoder.Vorbis);
+                    encoders.Remove(AudioEncoder.ffflac);
+                }
+
+                if (parameter != null && parameter.ToString() == "True")
+                {
+                    encoders.Remove(AudioEncoder.DtsHDPassthrough);
+                    encoders.Remove(AudioEncoder.DtsPassthrough);
+                    encoders.Remove(AudioEncoder.AacPassthru);
+                    encoders.Remove(AudioEncoder.Ac3Passthrough);
+                    encoders.Remove(AudioEncoder.Mp3Passthru);
+                    encoders.Remove(AudioEncoder.Passthrough);
+                }
+
+                return EnumHelper<AudioEncoder>.GetEnumDisplayValuesSubset(encoders);
+            }
+
+            return EnumHelper<AudioEncoder>.GetDisplay((AudioEncoder)values[0]);
+        }
+
+        /// <summary>
+        /// Convert from a string name, to enum value.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetTypes">
+        /// The target types.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Returns the audio encoder enum item.
+        /// </returns>
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            string name = value as string;
+            if (!string.IsNullOrEmpty(name))
+            {
+                return new object[] { EnumHelper<AudioEncoder>.GetValue(name)};
+            }
+
+            return null;
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs Added

@@ -0,0 +1,68 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioQueueDisplayConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Audio Queue Display Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Audio
+{
+    using System;
+    using System.Collections.ObjectModel;
+    using System.Globalization;
+    using System.Text;
+    using System.Windows.Data;
+
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// Audio Queue Display Converter
+    /// </summary>
+    public class AudioQueueDisplayConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value produced by the binding source.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            ObservableCollection<AudioTrack> tracks = value as ObservableCollection<AudioTrack>;
+            StringBuilder audioTracks = new StringBuilder();
+            if (tracks != null)
+            {
+                foreach (AudioTrack track in tracks)
+                {
+                    if (string.IsNullOrEmpty(audioTracks.ToString()))
+                    {
+                        audioTracks.Append(EnumHelper<AudioEncoder>.GetDisplay(track.Encoder));
+                    }
+                    else
+                    {
+                        audioTracks.Append(", " + EnumHelper<AudioEncoder>.GetDisplay(track.Encoder));
+                    }
+                }
+            }
+
+            return audioTracks.ToString();
+        }
+
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value that is produced by the binding target.</param><param name="targetType">The type to convert to.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/BooleanToHiddenVisibilityConverter.cs Added

@@ -0,0 +1,91 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="BooleanToHiddenVisibilityConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the BooleanToHiddenVisibilityConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters
+{
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+    using System;
+
+    /// <summary>
+    /// Boolean to Visibility Converter (Hidden, not Collasped)
+    /// </summary>
+    public sealed class BooleanToHiddenVisibilityConverter : IValueConverter
+    {
+        /// <summary>
+        /// Convert a boolean to visibility property.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter. (A boolean which inverts the output)
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Visibility property
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // Paramater is a boolean which inverts the output.
+            var param = System.Convert.ToBoolean(parameter, CultureInfo.InvariantCulture);
+
+            if (value == null)
+            {
+                return Visibility.Hidden;
+            }
+
+            if (value is Boolean)
+            {
+                if (param)
+                {
+                    return (bool)value ? Visibility.Hidden : Visibility.Visible;
+                }
+                else
+                {
+                    return (bool)value ? Visibility.Visible : Visibility.Hidden;
+                }
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Convert Back for the IValueConverter Interface. Not used!
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Nothing
+        /// </returns>
+        /// <exception cref="NotImplementedException">
+        /// This method is not used!
+        /// </exception>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Converters/BooleanToVisibilityConverter.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/BooleanToVisibilityConverter.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs Changed

@@ -14,7 +14,8 @@
     using System.Windows.Data;
     using System;
 
-    using HandBrake.ApplicationServices.Functions;
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop.Model.Encoding;
     using HandBrake.Interop.Model.Encoding.x264;
 
@@ -64,10 +65,26 @@
             {
                 return EnumHelper<Mixdown>.GetEnumDisplayValues(typeof(Mixdown));
             }
-
-            if (value is IEnumerable<AudioEncoder>)
+ 
+            if (value is IEnumerable<PresetPictureSettingsMode>)
+            {
+                return EnumHelper<PresetPictureSettingsMode>.GetEnumDisplayValues(typeof(PresetPictureSettingsMode));
+            }
+            if (value is IEnumerable<Decomb>)
+            {
+                return EnumHelper<Decomb>.GetEnumDisplayValues(typeof(Decomb));
+            }
+            if (value is IEnumerable<Deinterlace>)
+            {
+                return EnumHelper<Deinterlace>.GetEnumDisplayValues(typeof(Deinterlace));
+            }
+            if (value is IEnumerable<Detelecine>)
             {
-                return EnumHelper<AudioEncoder>.GetEnumDisplayValues(typeof(AudioEncoder));
+                return EnumHelper<Detelecine>.GetEnumDisplayValues(typeof(Detelecine));
+            }
+            if (value is IEnumerable<Denoise>)
+            {
+                return EnumHelper<Denoise>.GetEnumDisplayValues(typeof(Denoise));
             }
 
 
@@ -93,9 +110,30 @@
             {
                 return EnumHelper<Mixdown>.GetDisplay((Mixdown)value);
             }
-            if (targetType == typeof(AudioEncoder) || value.GetType() == typeof(AudioEncoder))
+  
+            if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))
+            {
+                return EnumHelper<PresetPictureSettingsMode>.GetDisplay((PresetPictureSettingsMode)value);
+            }
+            if (targetType == typeof(Deinterlace) || value.GetType() == typeof(Deinterlace))
+            {
+                return EnumHelper<Deinterlace>.GetDisplay((Deinterlace)value);
+            }
+            if (targetType == typeof(Detelecine) || value.GetType() == typeof(Detelecine))
+            {
+                return EnumHelper<Detelecine>.GetDisplay((Detelecine)value);
+            }
+            if (targetType == typeof(Decomb) || value.GetType() == typeof(Decomb))
+            {
+                return EnumHelper<Decomb>.GetDisplay((Decomb)value);
+            }
+            if (targetType == typeof(Denoise) || value.GetType() == typeof(Denoise))
             {
-                return EnumHelper<AudioEncoder>.GetDisplay((AudioEncoder)value);
+                return EnumHelper<Denoise>.GetDisplay((Denoise)value);
+            }
+            if (targetType == typeof(QueueItemStatus) || value.GetType() == typeof(QueueItemStatus))
+            {
+                return EnumHelper<QueueItemStatus>.GetDisplay((QueueItemStatus)value);
             }
 
             return null;
@@ -144,9 +182,26 @@
             {
                 return EnumHelper<Mixdown>.GetValue(value.ToString());
             }
-            if (targetType == typeof(AudioEncoder) || value.GetType() == typeof(AudioEncoder))
+
+            if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))
+            {
+                return EnumHelper<PresetPictureSettingsMode>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(Denoise) || value.GetType() == typeof(Denoise))
+            {
+                return EnumHelper<Denoise>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(Decomb) || value.GetType() == typeof(Decomb))
+            {
+                return EnumHelper<Decomb>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(Deinterlace) || value.GetType() == typeof(Deinterlace))
+            {
+                return EnumHelper<Deinterlace>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(Detelecine) || value.GetType() == typeof(Detelecine))
             {
-                return EnumHelper<AudioEncoder>.GetValue(value.ToString());
+                return EnumHelper<Detelecine>.GetValue(value.ToString());
             }
 
             return null;

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs Added

@@ -0,0 +1,81 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InverseBooleanConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The inverse boolean converter.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    /// <summary>
+    /// The inverse boolean converter.
+    /// </summary>
+    [ValueConversion(typeof(bool), typeof(bool))]
+    public class InverseBooleanConverter : IValueConverter
+    {
+        #region Implemented Interfaces
+
+        #region IValueConverter
+
+        /// <summary>
+        /// The convert.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The <see cref="object"/>.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType != typeof(bool))
+            {
+                throw new InvalidOperationException("The target must be a boolean");
+            }
+
+            return !(bool)value;
+        }
+
+        /// <summary>
+        /// The convert back.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The <see cref="object"/>.
+        /// </returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Options Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs Added

@@ -0,0 +1,74 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTabConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Options Tab Converter. Controls which tab is dispalyed.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+
+namespace HandBrakeWPF.Converters.Options
+{
+    using System;
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+
+    using HandBrakeWPF.Model;
+
+    /// <summary>
+    /// The Options Tab Converter. Controls which tab is dispalyed.
+    /// </summary>
+    class OptionsTabConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value produced by the binding source.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && parameter != null)
+            {
+                switch ((OptionsTab)value)
+                {
+                    case OptionsTab.General:
+                        if ((OptionsTab)parameter == OptionsTab.General) return Visibility.Visible;
+                        break;
+                    case OptionsTab.OutputFiles:
+                        if ((OptionsTab)parameter == OptionsTab.OutputFiles) return Visibility.Visible;
+                        break;
+                    case OptionsTab.AudioAndSubtitles:
+                        if ((OptionsTab)parameter == OptionsTab.AudioAndSubtitles) return Visibility.Visible;
+                        break;
+                    case OptionsTab.Advanced:
+                        if ((OptionsTab)parameter == OptionsTab.Advanced) return Visibility.Visible;
+                        break;
+                    case OptionsTab.Updates:
+                        if ((OptionsTab)parameter == OptionsTab.Updates) return Visibility.Visible;
+                        break;
+                    case OptionsTab.About:
+                        if ((OptionsTab)parameter == OptionsTab.About) return Visibility.Visible;
+                        break;
+                }
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value that is produced by the binding target.</param><param name="targetType">The type to convert to.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Options/OptionsTabNameConverter.cs Added

@@ -0,0 +1,71 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTabNameConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Converter to get the Display Name of each options tab.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Options
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    using HandBrake.ApplicationServices.Utilities;
+
+    using HandBrakeWPF.Model;
+
+    /// <summary>
+    /// A Converter to get the Display Name of each options tab.
+    /// </summary>
+    public class OptionsTabNameConverter : IValueConverter
+    {
+        /// <summary>
+        /// The convert.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The <see cref="object"/>.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return EnumHelper<OptionsTab>.GetDisplay((OptionsTab)value);
+        }
+
+        /// <summary>
+        /// The convert back.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The <see cref="object"/>.
+        /// </returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return EnumHelper<OptionsTab>.GetValue(value.ToString());
+        }
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/QueueStatusToVisibilityConverter.cs Added

@@ -0,0 +1,86 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueStatusToVisibilityConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the QueueStatusToVisibilityConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters
+{
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+    using System;
+
+    using HandBrake.ApplicationServices.Model;
+
+    /// <summary>
+    /// Boolean to Visibility Converter
+    /// </summary>
+    public sealed class QueueStatusToVisibilityConverter : IValueConverter
+    {
+        /// <summary>
+        /// Convert a boolean to visibility property.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter. (A boolean which inverts the output)
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Visibility property
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null)
+            {
+                QueueItemStatus status = (QueueItemStatus)value;
+                switch (status)
+                {
+                    case QueueItemStatus.Waiting:
+                    case QueueItemStatus.InProgress:
+                        return Visibility.Collapsed;
+                    default:
+                        return Visibility.Visible;
+                }
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// Convert Back for the IValueConverter Interface. Not used!
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Nothing
+        /// </returns>
+        /// <exception cref="NotImplementedException">
+        /// This method is not used!
+        /// </exception>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Subtitles Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs Added

@@ -0,0 +1,67 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitlesQueueDisplayConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Subtitle Queue Display Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Subtitles
+{
+    using System;
+    using System.Collections.ObjectModel;
+    using System.Globalization;
+    using System.Text;
+    using System.Windows.Data;
+
+    using HandBrake.ApplicationServices.Model.Encoding;
+
+    /// <summary>
+    /// Subtitle Queue Display Converter
+    /// </summary>
+    public class SubtitlesQueueDisplayConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value produced by the binding source.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            ObservableCollection<SubtitleTrack> tracks = value as ObservableCollection<SubtitleTrack>;
+            StringBuilder audioTracks = new StringBuilder();
+            if (tracks != null)
+            {
+                foreach (SubtitleTrack track in tracks)
+                {
+                    string text = track.SourceTrack != null ? track.SourceTrack.ToString() : (track.SrtFileName + ".srt");
+                    if (string.IsNullOrEmpty(audioTracks.ToString()))
+                    {
+                        audioTracks.Append(text);
+                    }
+                    else
+                    {
+                        audioTracks.Append(", " + text);
+                    }
+                }
+            }
+
+            return string.IsNullOrEmpty(audioTracks.ToString()) ? "None" : audioTracks.ToString();
+        }
+
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value that is produced by the binding target.</param><param name="targetType">The type to convert to.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Video Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs Added

@@ -0,0 +1,98 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoEncoderConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Video Encoder Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Video
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+    using System.Windows.Data;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// Video Encoder Converter
+    /// </summary>
+    public class VideoEncoderConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// Gets a list of Video encoders OR returns the string name of an encoder depending on the input.
+        /// </summary>
+        /// <param name="values">
+        /// The values.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// IEnumberable VideoEncoder or String encoder name.
+        /// </returns>
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Count() == 2)
+            {
+                List<VideoEncoder> encoders = EnumHelper<VideoEncoder>.GetEnumList().ToList();
+                EncodeTask task = values[1] as EncodeTask;
+
+                if (task != null && task.OutputFormat != OutputFormat.Mkv)
+                {
+                    encoders.Remove(VideoEncoder.Theora);
+                }
+
+                return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);
+            }
+
+            if (values[0].GetType() == typeof(VideoEncoder))
+            {
+                return EnumHelper<VideoEncoder>.GetDisplay((VideoEncoder)values[0]);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Convert from a string name, to enum value.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetTypes">
+        /// The target types.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Returns the video encoder enum item.
+        /// </returns>
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            string name = value as string;
+            if (!string.IsNullOrEmpty(name))
+            {
+                return new object[] { EnumHelper<VideoEncoder>.GetValue(name)};
+            }
+
+            return null;
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj Changed

@@ -9,12 +9,27 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HandBrakeWPF</RootNamespace>
-    <AssemblyName>HandBrakeWPF</AssemblyName>
+    <AssemblyName>Handbrake</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -38,6 +53,24 @@
   <PropertyGroup>
     <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Caliburn.Micro">
       <HintPath>..\libraries\caliburn\Caliburn.Micro.dll</HintPath>
@@ -48,19 +81,32 @@
     <Reference Include="Castle.Windsor">
       <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="EagleBoost.Wpf.Presentation">
+    <Reference Include="EagleBoost.Wpf.Presentation, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\libraries\EagleBoost.Wpf.Presentation.dll</HintPath>
     </Reference>
     <Reference Include="GongSolutions.Wpf.DragDrop">
       <HintPath>..\libraries\WPFDragDrop\GongSolutions.Wpf.DragDrop.dll</HintPath>
     </Reference>
+    <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\libraries\Growl.Connector.dll</HintPath>
+    </Reference>
+    <Reference Include="Growl.CoreLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=13e59d82e007b064, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\libraries\Growl.CoreLibrary.dll</HintPath>
+    </Reference>
     <Reference Include="Ookii.Dialogs.Wpf">
       <HintPath>..\libraries\OokiiDialogs\Ookii.Dialogs.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\libraries\caliburn\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -77,27 +123,97 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AttachedProperties\MenuItemExtensions.cs" />
+    <Compile Include="Commands\CancelScanCommand.cs" />
+    <Compile Include="Commands\Interfaces\IAdvancedEncoderOptionsCommand.cs" />
+    <Compile Include="Commands\OpenOptionsScreenCommand.cs" />
+    <Compile Include="Commands\ProcessShortcutCommand.cs" />
+    <Compile Include="Commands\SourceMenuCommand.cs" />
+    <Compile Include="Commands\AdvancedEncoderOptionsCommand.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="Controls\TimeSpanBox.xaml.cs">
+      <DependentUpon>TimeSpanBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\Loading.xaml.cs">
+      <DependentUpon>Loading.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\NumberBox.xaml.cs">
+      <DependentUpon>NumberBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\RefireControl.cs" />
+    <Compile Include="Controls\StatusPanel.xaml.cs">
+      <DependentUpon>StatusPanel.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Converters\Audio\AudioBitrateConverter.cs" />
+    <Compile Include="Converters\Audio\AudioEncoderConverter.cs" />
+    <Compile Include="Converters\Audio\AudioQueueDisplayConverter.cs" />
+    <Compile Include="Converters\BooleanToHiddenVisibilityConverter.cs" />
+    <Compile Include="Converters\InverseBooleanConverter.cs" />
+    <Compile Include="Converters\Options\OptionsTabConverter.cs" />
+    <Compile Include="Converters\Options\OptionsTabNameConverter.cs" />
+    <Compile Include="Converters\Subtitles\SubtitlesQueueDisplayConverter.cs" />
+    <Compile Include="Converters\Video\VideoEncoderConverter.cs" />
+    <Compile Include="Helpers\GrayscaleImage.cs" />
+    <Compile Include="Helpers\GrowlCommunicator.cs" />
+    <Compile Include="Model\OptionsTab.cs" />
+    <Compile Include="Model\SelectionTitle.cs" />
+    <Compile Include="Services\DriveDetectService.cs" />
+    <Compile Include="Services\EncodeServiceWrapper.cs" />
+    <Compile Include="Services\Interfaces\IDriveDetectService.cs" />
+    <Compile Include="Model\ShellWindow.cs" />
+    <Compile Include="Model\SourceMenuItem.cs" />
+    <Compile Include="Model\UpdateCheckInformation.cs" />
+    <Compile Include="Model\DownloadStatus.cs" />
+    <Compile Include="Services\Interfaces\INotificationService.cs" />
+    <Compile Include="Services\Interfaces\IUpdateService.cs" />
+    <Compile Include="Services\NotificationService.cs" />
+    <Compile Include="Services\ScanServiceWrapper.cs" />
+    <Compile Include="Services\UpdateService.cs" />
+    <Compile Include="ViewModels\AdvancedViewModel.cs" />
+    <Compile Include="ViewModels\EncoderOptionsViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\IEncoderOptionsViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\IX264ViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\IQueueSelectionViewModel.cs" />
+    <Compile Include="ViewModels\QueueSelectionViewModel.cs" />
+    <Compile Include="Views\AdvancedView.xaml.cs">
+      <DependentUpon>AdvancedView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EncoderOptionsView.xaml.cs">
+      <DependentUpon>EncoderOptionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\QueueSelectionView.xaml.cs">
+      <DependentUpon>QueueSelectionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ShellView.xaml.cs">
+      <DependentUpon>ShellView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ViewModels\Interfaces\IShellViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\ITitleSpecificViewModel.cs" />
+    <Compile Include="ViewModels\ShellViewModel.cs" />
+    <Compile Include="ViewModels\TitleSpecificViewModel.cs" />
+    <Compile Include="Views\TitleSpecificView.xaml.cs">
+      <DependentUpon>TitleSpecificView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Converters\AdvancedVisibilityConverter.cs" />
     <Compile Include="Converters\BooleanConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
+    <Compile Include="Converters\QueueStatusToVisibilityConverter.cs" />
     <Compile Include="Converters\EnumComboConverter.cs" />
     <Compile Include="Converters\FullPathToFileNameConverter.cs" />
+    <Compile Include="Helpers\AdvancedChoicesHelper.cs" />
     <Compile Include="Helpers\AutoNameHelper.cs" />
+    <Compile Include="Helpers\CliCheckHelper.cs" />
     <Compile Include="Helpers\ListBoxHelper.cs" />
     <Compile Include="Helpers\QueueRecoveryHelper.cs" />
-    <Compile Include="Helpers\UpdateCheckHelper.cs" />
+    <Compile Include="Model\AdvancedChoice.cs" />
     <Compile Include="Services\ErrorService.cs" />
-    <Compile Include="Services\Interfaces\IJobContextService.cs" />
     <Compile Include="Services\Interfaces\IErrorService.cs" />
-    <Compile Include="Services\Interfaces\IUpdateVersionService.cs" />
-    <Compile Include="Services\JobContextService.cs" />
-    <Compile Include="Services\UpdateVersionService.cs" />
     <Compile Include="Startup\CastleBootstrapper.cs" />
-    <Compile Include="Startup\MefBootstrapper.cs" />
     <Compile Include="UserSettingConstants.cs" />
     <Compile Include="ViewModels\AboutViewModel.cs" />
     <Compile Include="ViewModels\AddPresetViewModel.cs" />
     <Compile Include="ViewModels\AudioViewModel.cs" />
-    <Compile Include="ViewModels\AdvancedViewModel.cs" />
+    <Compile Include="ViewModels\X264ViewModel.cs" />
     <Compile Include="ViewModels\Interfaces\ITabInterface.cs" />
     <Compile Include="ViewModels\VideoViewModel.cs" />
     <Compile Include="ViewModels\FiltersViewModel.cs" />
@@ -134,8 +250,8 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="Views\AdvancedView.xaml.cs">
-      <DependentUpon>AdvancedView.xaml</DependentUpon>
+    <Compile Include="Views\X264View.xaml.cs">
+      <DependentUpon>X264View.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\AudioView.xaml.cs">
       <DependentUpon>AudioView.xaml</DependentUpon>
@@ -192,10 +308,16 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="Installer\Installer.nsi" />
+    <None Include="Installer\Installer64.nsi" />
+    <None Include="Installer\MakeNightly.nsi.tmpl" />
+    <None Include="Installer\MakeNightly64.nsi.tmpl" />
+    <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" />
+    <None Include="Properties\AssemblyInfo.cs.tmpl" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -203,14 +325,54 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Views\AboutView.xaml">
+    <Page Include="Controls\TimeSpanBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Controls\Loading.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\NumberBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\StatusPanel.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\AdvancedView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\EncoderOptionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\QueueSelectionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\TitleSpecificView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\AboutView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\X264View.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Resource Include="Views\Styles\Styles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Resource>
     <Page Include="Views\AudioView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -268,17 +430,20 @@
     <Content Include="defaultsettings.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Views\Images\add40.png" />
+    <Resource Include="Views\Images\add.png" />
+    <Resource Include="Views\Images\remove.png" />
+    <Resource Include="Views\Images\information.png" />
+    <Resource Include="Views\Images\picture_small.png" />
+    <None Include="Resources\logo64.png" />
+    <Resource Include="Views\Images\warningsmall.png" />
+    <Resource Include="Views\Images\Refresh.ico" />
+    <Resource Include="Views\Images\Complete.png" />
+    <Resource Include="Views\Images\Working0.png" />
     <Resource Include="handbrakepineapple.ico" />
     <Resource Include="Views\Images\delete.png" />
     <Resource Include="Views\Images\Close.png" />
-    <Resource Include="Views\Images\Help24.png" />
-    <Resource Include="Views\Images\Help32.png" />
-    <Resource Include="Views\Images\Add16.png" />
     <Resource Include="Views\Images\Options24.png" />
-    <Resource Include="Views\Images\arrow_down.png" />
-    <Resource Include="Views\Images\arrow_left.png" />
-    <Resource Include="Views\Images\arrow_right.png" />
-    <Resource Include="Views\Images\arrow_up.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Views\Images\ActivityWindow.png" />
@@ -292,7 +457,6 @@
     <Resource Include="Views\Images\Queue.png" />
     <Resource Include="Views\Images\Queue_Small.png" />
     <Resource Include="Views\Images\stop.png" />
-    <Resource Include="Views\Images\save.png" />
     <Resource Include="Views\Images\Play_small.png" />
     <Resource Include="Views\Images\Play.png" />
     <Resource Include="Views\Images\picture.png" />
@@ -300,14 +464,9 @@
     <Resource Include="Views\Images\Movies.png" />
     <Resource Include="Views\Images\logo64.png" />
     <Resource Include="Views\Images\logo128.png" />
-    <Resource Include="Views\Images\info16.png" />
-    <Resource Include="Views\Images\Help16.png" />
-    <Resource Include="Views\Images\hb32.png" />
-    <Resource Include="Views\Images\hb16.png" />
     <Resource Include="Views\Images\Preferences.png" />
     <Resource Include="Views\Images\folder.png" />
     <Resource Include="Views\Images\ErrorX.png" />
-    <Resource Include="Views\Images\download.png" />
     <Resource Include="Views\Images\AddToQueue_small.png" />
     <Resource Include="Views\Images\AddToQueue.png" />
     <Resource Include="Views\Images\window.png" />
@@ -321,6 +480,10 @@
       <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>
       <Name>HandBrakeInterop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HandBrake.Server\HandBrake.Server.csproj">
+      <Project>{36847BA0-6814-41E1-B1C3-1D9D874418E9}</Project>
+      <Name>HandBrake.Server</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/AdvancedChoicesHelper.cs Added

@@ -0,0 +1,367 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedChoicesHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The advanced choices.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    using HandBrakeWPF.Model;
+
+    /// <summary>
+    /// The advanced choices.
+    /// </summary>
+    public static class AdvancedChoicesHelper
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The adaptive b frames.
+        /// </summary>
+        private static List<AdvancedChoice> adaptiveBFrames;
+
+        /// <summary>
+        /// The analysis.
+        /// </summary>
+        private static List<AdvancedChoice> analysis;
+
+        /// <summary>
+        /// The b frames.
+        /// </summary>
+        private static List<AdvancedChoice> bFrames;
+
+        /// <summary>
+        /// The deblocking strength.
+        /// </summary>
+        private static List<AdvancedChoice> deblockingStrength;
+
+        /// <summary>
+        /// The deblocking threshold.
+        /// </summary>
+        private static List<AdvancedChoice> deblockingThreshold;
+
+        /// <summary>
+        /// The direct prediction.
+        /// </summary>
+        private static List<AdvancedChoice> directPrediction;
+
+        /// <summary>
+        /// The motion estimation method.
+        /// </summary>
+        private static List<AdvancedChoice> motionEstimationMethod;
+
+        /// <summary>
+        /// The motion estimation range.
+        /// </summary>
+        private static List<AdvancedChoice> motionEstimationRange;
+
+        /// <summary>
+        /// The pyramidal b frames.
+        /// </summary>
+        private static List<AdvancedChoice> pyramidalBFrames;
+
+        /// <summary>
+        /// The reference frames.
+        /// </summary>
+        private static List<AdvancedChoice> referenceFrames;
+
+        /// <summary>
+        /// The subpixel motion estimation.
+        /// </summary>
+        private static List<AdvancedChoice> subpixelMotionEstimation;
+
+        /// <summary>
+        /// The trellis.
+        /// </summary>
+        private static List<AdvancedChoice> trellis;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes static members of the <see cref="AdvancedChoicesHelper"/> class.
+        /// </summary>
+        static AdvancedChoicesHelper()
+        {
+            referenceFrames = CreateNumberList(1, 16, defaultNumber: 3);
+            bFrames = CreateNumberList(0, 16, defaultNumber: 3);
+
+            pyramidalBFrames = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "Off", Value = "none" },
+                    new AdvancedChoice { Label = "Normal (Default)", IsDefault = true },
+                    new AdvancedChoice { Label = "Strict", Value = "strict" }
+                };
+
+            adaptiveBFrames = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "Off", Value = "0" },
+                    new AdvancedChoice { Label = "Fast (Default)", Value = "1", IsDefault = true },
+                    new AdvancedChoice { Label = "Optimal", Value = "2" }
+                };
+
+            directPrediction = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "None", Value = "none" },
+                    new AdvancedChoice { Label = "Spatial (Default)", Value = "spatial", IsDefault = true },
+                    new AdvancedChoice { Label = "Temporal", Value = "temporal" },
+                    new AdvancedChoice { Label = "Automatic", Value = "auto" }
+                };
+
+            motionEstimationMethod = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "Diamond", Value = "dia" },
+                    new AdvancedChoice { Label = "Hexagon (Default)", Value = "hex", IsDefault = true },
+                    new AdvancedChoice { Label = "Uneven Multi-Hexagon", Value = "umh" },
+                    new AdvancedChoice { Label = "Exhaustive", Value = "esa" },
+                    new AdvancedChoice { Label = "Transformed Exhaustive", Value = "tesa" },
+                };
+
+            subpixelMotionEstimation = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "0: SAD, no subpel (super fast!)", Value = "0" },
+                    new AdvancedChoice { Label = "1: SAD, qpel", Value = "1" },
+                    new AdvancedChoice { Label = "2: SATD, qpel", Value = "2" },
+                    new AdvancedChoice { Label = "3: SATD, multi-qpel", Value = "3" },
+                    new AdvancedChoice { Label = "4: SATD, qpel on all", Value = "4" },
+                    new AdvancedChoice { Label = "5: SATD, multi-qpel on all", Value = "5" },
+                    new AdvancedChoice { Label = "6: RD in I/P-frames", Value = "6" },
+                    new AdvancedChoice { Label = "7: RD in all frames (Default)", Value = "7", IsDefault = true },
+                    new AdvancedChoice { Label = "8: RD refine in I/P-frames", Value = "8" },
+                    new AdvancedChoice { Label = "9: RD refine in all frames", Value = "9" },
+                    new AdvancedChoice { Label = "10: QPRD in all frames", Value = "10" },
+                    new AdvancedChoice { Label = "11: No early terminations in analysis", Value = "11" },
+                };
+
+            // subpixelMotionEstimation = CreateNumberList(0, 9, defaultNumber: 7);
+            motionEstimationRange = CreateNumberList(4, 64, defaultNumber: 16);
+
+            analysis = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "Most (Default)", IsDefault = true },
+                    new AdvancedChoice { Label = "None", Value = "none" },
+                    new AdvancedChoice { Label = "Some", Value = "i4x4,i8x8", },
+                    new AdvancedChoice { Label = "All", Value = "all" }
+                };
+
+            trellis = new List<AdvancedChoice>
+                {
+                    new AdvancedChoice { Label = "Off", Value = "0" },
+                    new AdvancedChoice { Label = "Encode Only (Default)", Value = "1", IsDefault = true },
+                    new AdvancedChoice { Label = "Always", Value = "2" }
+                };
+
+            deblockingStrength = CreateNumberList(-6, 6, defaultNumber: 0);
+            deblockingThreshold = CreateNumberList(-6, 6, defaultNumber: 0);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets AdaptiveBFrames.
+        /// </summary>
+        public static List<AdvancedChoice> AdaptiveBFrames
+        {
+            get
+            {
+                return adaptiveBFrames;
+            }
+        }
+
+        /// <summary>
+        /// Gets Analysis.
+        /// </summary>
+        public static List<AdvancedChoice> Analysis
+        {
+            get
+            {
+                return analysis;
+            }
+        }
+
+        /// <summary>
+        /// Gets BFrames.
+        /// </summary>
+        public static List<AdvancedChoice> BFrames
+        {
+            get
+            {
+                return bFrames;
+            }
+        }
+
+        /// <summary>
+        /// Gets DeblockingStrength.
+        /// </summary>
+        public static List<AdvancedChoice> DeblockingStrength
+        {
+            get
+            {
+                return deblockingStrength;
+            }
+        }
+
+        /// <summary>
+        /// Gets DeblockingThreshold.
+        /// </summary>
+        public static List<AdvancedChoice> DeblockingThreshold
+        {
+            get
+            {
+                return deblockingThreshold;
+            }
+        }
+
+        /// <summary>
+        /// Gets DirectPrediction.
+        /// </summary>
+        public static List<AdvancedChoice> DirectPrediction
+        {
+            get
+            {
+                return directPrediction;
+            }
+        }
+
+        /// <summary>
+        /// Gets MotionEstimationMethod.
+        /// </summary>
+        public static List<AdvancedChoice> MotionEstimationMethod
+        {
+            get
+            {
+                return motionEstimationMethod;
+            }
+        }
+
+        /// <summary>
+        /// Gets MotionEstimationRange.
+        /// </summary>
+        public static List<AdvancedChoice> MotionEstimationRange
+        {
+            get
+            {
+                return motionEstimationRange;
+            }
+        }
+
+        /// <summary>
+        /// Gets PyramidalBFrames.
+        /// </summary>
+        public static List<AdvancedChoice> PyramidalBFrames
+        {
+            get
+            {
+                return pyramidalBFrames;
+            }
+        }
+
+        /// <summary>
+        /// Gets ReferenceFrames.
+        /// </summary>
+        public static List<AdvancedChoice> ReferenceFrames
+        {
+            get
+            {
+                return referenceFrames;
+            }
+        }
+
+        /// <summary>
+        /// Gets SubpixelMotionEstimation.
+        /// </summary>
+        public static List<AdvancedChoice> SubpixelMotionEstimation
+        {
+            get
+            {
+                return subpixelMotionEstimation;
+            }
+        }
+
+        /// <summary>
+        /// Gets Trellis.
+        /// </summary>
+        public static List<AdvancedChoice> Trellis
+        {
+            get
+            {
+                return trellis;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The add range.
+        /// </summary>
+        /// <param name="list">
+        /// The list.
+        /// </param>
+        /// <param name="lower">
+        /// The lower.
+        /// </param>
+        /// <param name="upper">
+        /// The upper.
+        /// </param>
+        /// <param name="defaultNumber">
+        /// The default number.
+        /// </param>
+        private static void AddRange(List<AdvancedChoice> list, int lower, int upper, int defaultNumber)
+        {
+            for (int i = lower; i <= upper; i++)
+            {
+                if (i == defaultNumber)
+                {
+                    list.Add(
+                        new AdvancedChoice
+                            {
+                                IsDefault = true, 
+                                Label = i.ToString() + " (Default)", 
+                                Value = i.ToString(CultureInfo.InvariantCulture)
+                            });
+                }
+                else
+                {
+                    list.Add(
+                        new AdvancedChoice { Label = i.ToString(), Value = i.ToString(CultureInfo.InvariantCulture) });
+                }
+            }
+        }
+
+        /// <summary>
+        /// The create number list.
+        /// </summary>
+        /// <param name="lower">
+        /// The lower.
+        /// </param>
+        /// <param name="upper">
+        /// The upper.
+        /// </param>
+        /// <param name="defaultNumber">
+        /// The default number.
+        /// </param>
+        /// <returns>
+        /// List of Advanced Choices Options.
+        /// </returns>
+        private static List<AdvancedChoice> CreateNumberList(int lower, int upper, int defaultNumber)
+        {
+            var list = new List<AdvancedChoice>();
+            AddRange(list, lower, upper, defaultNumber);
+
+            return list;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs Changed

@@ -40,7 +40,6 @@
         /// </returns>
         public static string AutoName(EncodeTask task, string sourceOrLabelName)
         {
-
             IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
             if (task.Destination == null)
             {
@@ -52,7 +51,6 @@
             {
                 // Get the Source Name and remove any invalid characters
                 string sourceName = Path.GetInvalidFileNameChars().Aggregate(sourceOrLabelName, (current, character) => current.Replace(character.ToString(), string.Empty));
-                sourceName = Path.GetFileNameWithoutExtension(sourceName);
 
                 // Remove Underscores
                 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore))
@@ -162,5 +160,31 @@
 
             return autoNamePath;
         }
+
+        /// <summary>
+        /// Check if there is a valid autoname path.
+        /// </summary>
+        /// <returns>
+        /// True if there is a valid path
+        /// </returns>
+        public static bool IsAutonamingEnabled()
+        {
+            IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
+            // If there is an auto name path, use it...
+            if (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim().StartsWith("{source_path}"))
+            {
+                return true;
+            }
+            else if (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Contains("{source_folder_name}"))
+            {
+                return true;
+            }
+            else
+            {
+                return
+                    Directory.Exists(
+                        userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim());
+            }
+        }
     }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs Added

@@ -0,0 +1,119 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CliCheckHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the CliCheckHelper type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+    using System;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Security.Cryptography;
+    using System.Text.RegularExpressions;
+
+    using Caliburn.Micro;
+
+    using HandBrake.ApplicationServices;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    using HandBrakeWPF.Services.Interfaces;
+
+    /// <summary>
+    /// The cli check helper.
+    /// </summary>
+    public class CliCheckHelper
+    {
+        /// <summary>
+        /// The check cli version.
+        /// </summary>
+        public static void CheckCLIVersion()
+        {
+            IErrorService errorService = IoC.Get<IErrorService>();
+
+            IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
+
+            string line;
+
+            // 0 = SVN Build / Version
+            // 1 = Build Date
+
+            // Get the SHA1 Hash of HandBrakeCLI
+            byte[] hash;
+            using (Stream stream = File.OpenRead("HandBrakeCLI.exe"))
+            {
+                hash = SHA1.Create().ComputeHash(stream);
+            }
+
+            string base64Hash = Convert.ToBase64String(hash);
+
+            // Compare the hash with the last known hash. If it's the same, return.
+            if (userSettingService.GetUserSetting<string>(UserSettingConstants.HandBrakeExeHash) == base64Hash)
+            {
+                return;
+            }
+
+            // It's not the same, so start the CLI to get it's version data.
+            Process cliProcess = new Process();
+            ProcessStartInfo handBrakeCli = new ProcessStartInfo("HandBrakeCLI.exe", " -u -v0")
+                {
+                    UseShellExecute = false,
+                    RedirectStandardError = true,
+                    RedirectStandardOutput = true,
+                    CreateNoWindow = true
+                };
+            cliProcess.StartInfo = handBrakeCli;
+
+            try
+            {
+                cliProcess.Start();
+
+                // Retrieve standard output and report back to parent thread until the process is complete
+                bool success = false;
+                TextReader stdOutput = cliProcess.StandardError;
+                while ((line = stdOutput.ReadLine()) != null)
+                {
+                    Match m = Regex.Match(line, @"HandBrake ([svnM0-9.]*) $([0-9]*)$");
+                    if (m.Success)
+                    {
+                        string build = m.Groups[2].Success ? m.Groups[2].Value : string.Empty;
+
+                        int buildValue;
+                        int.TryParse(build, out buildValue);
+
+                        userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, buildValue);
+                        success = true;
+                    }
+                }
+
+                while (!cliProcess.HasExited)
+                {
+                    if (cliProcess.TotalProcessorTime.Seconds > 10) // Don't wait longer than 10 seconds.
+                    {
+                        Process cli = Process.GetProcessById(cliProcess.Id);
+                        if (!cli.HasExited)
+                        {
+                            cli.Kill();
+                        }
+                    }
+                }
+
+                if (success)
+                {
+                    userSettingService.SetUserSetting(UserSettingConstants.HandBrakeExeHash, base64Hash);
+                }
+            }
+            catch (Exception e)
+            {
+                userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, 0);
+                userSettingService.SetUserSetting(UserSettingConstants.HandBrakeExeHash, string.Empty);
+
+                errorService.ShowError(
+                    "Unable to Initialise HandBrake. This error is unrecoverable.", " Try restarting.", e);
+            }
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/GrayscaleImage.cs Added

@@ -0,0 +1,63 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="GrayscaleImage.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Extend the Image Class to support a grayscale mode.
+//   Usage: local:AutoGreyableImage Source="Image.png"
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+    using System;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
+    using System.Windows.Media.Imaging;
+
+    /// <summary>
+    /// Extend the Image Class to support a grayscale mode.
+    /// </summary>
+    public class GrayscaleImage : Image
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="GrayscaleImage"/> class. 
+        /// Usage: local:AutoGreyableImage Source="Image.png"
+        /// </summary>
+        static GrayscaleImage()
+        {
+            // Override the metadata of the IsEnabled property.
+            IsEnabledProperty.OverrideMetadata(typeof(GrayscaleImage), new FrameworkPropertyMetadata(true, IsEnabledPropertyChanged));
+        }
+
+        /// <summary>
+        /// The is enabled property changed.
+        /// When this changes, grayscale the image when false, leave with colour when true.
+        /// </summary>
+        /// <param name="source">
+        /// The source.
+        /// </param>
+        /// <param name="args">
+        /// The args.
+        /// </param>
+        private static void IsEnabledPropertyChanged(DependencyObject source, DependencyPropertyChangedEventArgs args)
+        {
+            var sourceImage = source as GrayscaleImage;
+            if (sourceImage != null)
+            {
+                if (!Convert.ToBoolean(args.NewValue))
+                {
+                    var bitmapImage = new BitmapImage(new Uri(sourceImage.Source.ToString()));
+                    sourceImage.Source = new FormatConvertedBitmap(bitmapImage, PixelFormats.Gray32Float, null, 0);
+                    sourceImage.OpacityMask = new ImageBrush(bitmapImage);
+                }
+                else
+                {
+                    sourceImage.Source = ((FormatConvertedBitmap)sourceImage.Source).Source;
+                    sourceImage.OpacityMask = null;
+                }
+            }
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/GrowlCommunicator.cs Added

@@ -0,0 +1,124 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="GrowlCommunicator.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Provides all functionality for communicating with Growl for Windows.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+    using System;
+
+    using Growl.Connector;
+
+    /// <summary>
+    /// Provides all functionality for communicating with Growl for Windows.
+    /// </summary>
+    /// <remarks>
+    /// This class is implemented as a static class because:
+    ///     1. It allows nearly all of the Growl-related code to be in one place
+    ///     2. It prevents the main form, queue handler, and any other part of Handbrake from having to declare
+    ///        or track any new instance variables
+    /// </remarks>
+    public static class GrowlCommunicator
+    {
+        /// <summary>
+        /// The <see cref="GrowlConnector"/> that actually talks to Growl
+        /// </summary>
+        private static GrowlConnector growl;
+
+        /// <summary>
+        /// The Handbrake application instance that is registered with Growl
+        /// </summary>
+        private static Application application;
+
+        /// <summary>
+        /// Notification shown upon completion of encoding
+        /// </summary>
+        private static NotificationType encodeOrQueueCompleted = new NotificationType("EncodeOrQueue", "HandBrake Status");
+
+        /// <summary>
+        /// Checks to see if Growl is currently running on the local machine.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if Growl is running;
+        /// <c>false</c> otherwise
+        /// </returns>
+        public static bool IsRunning()
+        {
+            Initialize();
+
+            return GrowlConnector.IsGrowlRunningLocally();
+        }
+
+        /// <summary>
+        /// Registers Handbrake with the local Growl instance
+        /// </summary>
+        /// <remarks>
+        /// This should usually be called at application start-up
+        /// </remarks>
+        public static void Register()
+        {
+            Initialize();
+            growl.Register(application, new[] {encodeOrQueueCompleted});
+        }
+
+        /// <summary>
+        /// Sends a notification to Growl. (Since Handbrake currently only supports one type of notification with
+        /// static text, this is a shortcut method).
+        /// </summary>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <param name="text">
+        /// The text to display.
+        /// </param>
+        public static void Notify(string title, string text)
+        {
+            Notification notification = new Notification(application.Name, encodeOrQueueCompleted.Name, String.Empty, 
+                                                         title, text);
+            growl.Notify(notification);
+        }
+
+        /// <summary>
+        /// Sends a notification to Growl. (This is the more generic version that could be used in the future if 
+        /// more notification types are implemented)
+        /// </summary>
+        /// <param name="notificationType">The <see cref="NotificationType">type</see> of notification to send</param>
+        /// <param name="title">The notification title</param>
+        /// <param name="text">The notification text</param>
+        /// <param name="imageUrl">The notification image as a url</param>
+        public static void Notify(NotificationType notificationType, string title, string text, string imageUrl)
+        {
+            Notification notification = new Notification(application.Name, notificationType.Name, String.Empty, title, 
+                                                         text)
+                                            {
+                                                Icon = imageUrl
+                                            };
+
+            growl.Notify(notification);
+        }
+
+        /// <summary>
+        /// Initializes the GrowlCommunicator
+        /// </summary>
+        private static void Initialize()
+        {
+            if (growl == null)
+            {
+                growl = new GrowlConnector
+                    {
+                        EncryptionAlgorithm = Cryptography.SymmetricAlgorithmType.PlainText,
+                        KeyHashAlgorithm = Cryptography.HashAlgorithmType.SHA1
+                    };
+
+                application = new Application("Handbrake")
+                                  {
+                                      Icon = Properties.Resources.logo64
+                                  };
+            }
+        }
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs Changed

@@ -11,8 +11,10 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using System.IO;
     using System.Linq;
+    using System.Text.RegularExpressions;
     using System.Windows;
     using System.Xml.Serialization;
 
@@ -68,12 +70,19 @@
                 }
 
                 // Cleanup old/unused queue files for now.
-                if (!GeneralUtilities.IsMultiInstance)
+                foreach (string file in removeFiles)
                 {
-                    foreach (string file in removeFiles)
+                    Match m = Regex.Match(file, @"([0-9]+).xml");
+                    if (m.Success)
                     {
-                        File.Delete(file);
+                        int processId = int.Parse(m.Groups[1].ToString());
+                        if (GeneralUtilities.IsPidACurrentHandBrakeInstance(processId))
+                        {
+                            continue;
+                        }
                     }
+
+                    File.Delete(file);
                 }
 
                 return queueFiles;
@@ -115,17 +124,42 @@
             {
                 foreach (string file in queueFiles)
                 {
-                    encodeQueue.QueueManager.RestoreQueue(appDataPath + file); // Start Recovery
+                    encodeQueue.RestoreQueue(appDataPath + file); // Start Recovery
+                    if (!file.Contains(GeneralUtilities.ProcessId.ToString(CultureInfo.InvariantCulture)))
+                    {
+                        try
+                        {
+                            // Once we load it in, remove it as we no longer need it.
+                            File.Delete(Path.Combine(appDataPath, file));
+                        }
+                        catch (Exception exc)
+                        {
+                            // Keep quite, nothing much we can do if there are problems.
+                            // We will continue processing files.
+                        }
+                    }
                 }
             }
             else
             {
-                if (GeneralUtilities.IsMultiInstance) return; // Don't tamper with the files if we are multi instance
-
                 foreach (string file in queueFiles)
                 {
                     if (File.Exists(Path.Combine(appDataPath, file)))
+                    {
+                        // Check that the file doesn't belong to another running instance.
+                        Match m = Regex.Match(file, @"([0-9]+).xml");
+                        if (m.Success)
+                        {
+                            int processId = int.Parse(m.Groups[1].ToString());
+                            if (GeneralUtilities.IsPidACurrentHandBrakeInstance(processId))
+                            {
+                                continue;
+                            }
+                        }
+
+                        // Delete it if it doesn't
                         File.Delete(Path.Combine(appDataPath, file));
+                    }
                 }
             }
         }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer.nsi Added

@@ -0,0 +1,326 @@
+/*  Resources.Designer.cs $
+
+ 	   This file is part of the HandBrake source code.
+ 	   Homepage: <http://handbrake.fr/>.
+ 	   It may be used under the terms of the GNU General Public License. */
+
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "HandBrake"
+!define PRODUCT_VERSION "0.9.9"
+!define PRODUCT_VERSION_NUMBER "0.9.9"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+;Required .NET framework
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
+!define MIN_FRA_BUILD "*"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "handbrakepineapple.ico"
+!define MUI_UNICON "handbrakepineapple.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
+
+!include WordFunc.nsh
+!insertmacro VersionCompare
+!include LogicLib.nsh
+
+InstallDir "$PROGRAMFILES\Handbrake"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Var InstallDotNET
+
+Function .onInit
+
+  ; Begin Only allow one version
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
+  Pop $R0
+
+  StrCmp $R0 0 +3
+  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
+  Abort
+
+  ;Remove previous version
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to continue." /SD IDOK \
+  IDOK uninst
+  goto done
+
+ ;Run the uninstaller
+  uninst:
+   IfSilent +3
+   Exec $INSTDIR\uninst.exe
+   goto done
+   Exec '"$INSTDIR\uninst.exe" /S'
+  done:
+FunctionEnd
+
+Section "Handbrake" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+
+  ; Begin Check .NET version
+  StrCpy $InstallDotNET "No"
+  Call CheckFramework
+     StrCmp $0 "1" +3
+        StrCpy $InstallDotNET "Yes"
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+     Pop $0
+
+  ; Get .NET if required
+  ${If} $InstallDotNET == "Yes"
+     SetDetailsView hide
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
+     Pop $1
+
+     ${If} $1 != "OK"
+           Delete "$INSTDIR\dotnetfx.exe"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
+     ${EndIf}
+
+     ExecWait "$INSTDIR\dotnetfx.exe"
+     Delete "$INSTDIR\dotnetfx.exe"
+
+     SetDetailsView show
+  ${EndIf}
+  
+  ; Install Files
+  File "*.exe"
+  CreateDirectory "$SMPROGRAMS\Handbrake"
+  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  File "*.dll"
+  File "*.config"
+  File "*.xml"
+  File "*.pdb"
+
+  ; Copy the standard doc set into the doc folder
+  SetOutPath "$INSTDIR\doc"
+  SetOverwrite ifnewer
+  File "doc\*.*"
+
+  ; Copy the standard fonts config set into the fonts folder
+  SetOutPath "$INSTDIR\fonts"
+  SetOverwrite ifnewer
+  File /r "fonts\*.*"
+SectionEnd
+
+Section -AdditionalIcons
+  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  Delete "$INSTDIR\uninst.exe"
+  
+  Delete "$INSTDIR\*.*"
+  Delete "$INSTDIR\doc\*.*"
+  Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
+  RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
+  RMDIR  "$INSTDIR\fonts"
+  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
+  Delete "$DESKTOP\Handbrake.lnk"
+  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
+  RMDir  "$SMPROGRAMS\Handbrake"
+  RMDir  "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+;Check for .NET framework
+Function CheckFrameWork
+
+   ;Save the variables in case something else is using them
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+  Push $R6
+  Push $R7
+  Push $R8
+
+  StrCpy $R5 "0"
+  StrCpy $R6 "0"
+  StrCpy $R7 "0"
+  StrCpy $R8 "0.0.0"
+  StrCpy $0 0
+
+  loop:
+
+  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
+  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+  StrCmp $1 "" done ;jump to end if no more registry keys
+  IntOp $0 $0 + 1
+  StrCpy $2 $1 1 ;Cut off the first character
+  StrCpy $3 $1 "" 1 ;Remainder of string
+
+  ;Loop if first character is not a 'v'
+  StrCmpS $2 "v" start_parse loop
+
+  ;Parse the string
+  start_parse:
+  StrCpy $R1 ""
+  StrCpy $R2 ""
+  StrCpy $R3 ""
+  StrCpy $R4 $3
+
+  StrCpy $4 1
+
+  parse:
+  StrCmp $3 "" parse_done ;If string is empty, we are finished
+  StrCpy $2 $3 1 ;Cut off the first character
+  StrCpy $3 $3 "" 1 ;Remainder of string
+  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
+
+  is_dot:
+  IntOp $4 $4 + 1 ; Move to the next section
+  goto parse ;Carry on parsing
+
+  not_dot:
+  IntCmp $4 1 major_ver
+  IntCmp $4 2 minor_ver
+  IntCmp $4 3 build_ver
+  IntCmp $4 4 parse_done
+
+  major_ver:
+  StrCpy $R1 $R1$2
+  goto parse ;Carry on parsing
+
+  minor_ver:
+  StrCpy $R2 $R2$2
+  goto parse ;Carry on parsing
+
+  build_ver:
+  StrCpy $R3 $R3$2
+  goto parse ;Carry on parsing
+
+  parse_done:
+
+  IntCmp $R1 $R5 this_major_same loop this_major_more
+  this_major_more:
+  StrCpy $R5 $R1
+  StrCpy $R6 $R2
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+
+  goto loop
+
+  this_major_same:
+  IntCmp $R2 $R6 this_minor_same loop this_minor_more
+  this_minor_more:
+  StrCpy $R6 $R2
+  StrCpy $R7 R3
+  StrCpy $R8 $R4
+  goto loop
+
+  this_minor_same:
+  IntCmp $R3 $R7 loop loop this_build_more
+  this_build_more:
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+  goto loop
+
+  done:
+
+  ;Have we got the framework we need?
+  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
+  max_major_same:
+  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
+  max_minor_same:
+  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
+
+  ;Version on machine is greater than what we need
+  OK:
+  StrCpy $0 "1"
+  goto end
+
+  fail:
+  StrCmp $R8 "0.0.0" end
+
+
+  end:
+
+  ;Pop the variables we pushed earlier
+  Pop $R8
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+FunctionEnd
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer64.nsi Added

@@ -0,0 +1,329 @@
+/*  Resources.Designer.cs $
+
+ 	   This file is part of the HandBrake source code.
+ 	   Homepage: <http://handbrake.fr/>.
+ 	   It may be used under the terms of the GNU General Public License. */
+
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "HandBrake"
+!define PRODUCT_VERSION "0.9.9"
+!define PRODUCT_VERSION_NUMBER "0.9.9"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+;Required .NET framework
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
+!define MIN_FRA_BUILD "*"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "handbrakepineapple.ico"
+!define MUI_UNICON "handbrakepineapple.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
+
+!include WordFunc.nsh
+!insertmacro VersionCompare
+!include LogicLib.nsh
+
+InstallDir "$PROGRAMFILES64\Handbrake"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Var InstallDotNET
+
+Function .onInit
+
+  ; Begin Only allow one version
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
+  Pop $R0
+
+  StrCmp $R0 0 +3
+  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
+  Abort
+
+  ;Remove previous version
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to continue." /SD IDOK \
+  IDOK uninst
+  goto done
+
+ ;Run the uninstaller
+  uninst:
+   IfSilent +3
+   Exec $INSTDIR\uninst.exe
+   goto done
+   Exec '"$INSTDIR\uninst.exe" /S'
+  done:
+FunctionEnd
+
+Section "Handbrake" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+
+  ; Begin Check .NET version
+  StrCpy $InstallDotNET "No"
+  Call CheckFramework
+     StrCmp $0 "1" +3
+        StrCpy $InstallDotNET "Yes"
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+     Pop $0
+
+  ; Get .NET if required
+  ${If} $InstallDotNET == "Yes"
+     SetDetailsView hide
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
+     Pop $1
+
+     ${If} $1 != "OK"
+           Delete "$INSTDIR\dotnetfx.exe"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
+     ${EndIf}
+
+     ExecWait "$INSTDIR\dotnetfx.exe"
+     Delete "$INSTDIR\dotnetfx.exe"
+
+     SetDetailsView show
+  ${EndIf}
+  
+  ; Install Files
+  File "Handbrake.exe"
+  File "HandBrakeCLI.exe"
+  CreateDirectory "$SMPROGRAMS\Handbrake"
+  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  File "*.dll"
+  File "*.config"
+  File "*.xml"
+  File "*.pdb"
+
+  ; Copy the standard doc set into the doc folder
+  SetOutPath "$INSTDIR\doc"
+  SetOverwrite ifnewer
+  File "doc\*.*"
+
+  ; Copy the standard fonts config set into the fonts folder
+  SetOutPath "$INSTDIR\fonts"
+  SetOverwrite ifnewer
+  File /r "fonts\*.*"
+
+  
+SectionEnd
+
+Section -AdditionalIcons
+  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  Delete "$INSTDIR\uninst.exe"
+  
+  Delete "$INSTDIR\*.*"
+  Delete "$INSTDIR\doc\*.*"
+  Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
+  RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
+  RMDIR  "$INSTDIR\fonts"
+  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
+  Delete "$DESKTOP\Handbrake.lnk"
+  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
+  RMDir  "$SMPROGRAMS\Handbrake"
+  RMDir  "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+;Check for .NET framework
+Function CheckFrameWork
+
+   ;Save the variables in case something else is using them
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+  Push $R6
+  Push $R7
+  Push $R8
+
+  StrCpy $R5 "0"
+  StrCpy $R6 "0"
+  StrCpy $R7 "0"
+  StrCpy $R8 "0.0.0"
+  StrCpy $0 0
+
+  loop:
+
+  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
+  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+  StrCmp $1 "" done ;jump to end if no more registry keys
+  IntOp $0 $0 + 1
+  StrCpy $2 $1 1 ;Cut off the first character
+  StrCpy $3 $1 "" 1 ;Remainder of string
+
+  ;Loop if first character is not a 'v'
+  StrCmpS $2 "v" start_parse loop
+
+  ;Parse the string
+  start_parse:
+  StrCpy $R1 ""
+  StrCpy $R2 ""
+  StrCpy $R3 ""
+  StrCpy $R4 $3
+
+  StrCpy $4 1
+
+  parse:
+  StrCmp $3 "" parse_done ;If string is empty, we are finished
+  StrCpy $2 $3 1 ;Cut off the first character
+  StrCpy $3 $3 "" 1 ;Remainder of string
+  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
+
+  is_dot:
+  IntOp $4 $4 + 1 ; Move to the next section
+  goto parse ;Carry on parsing
+
+  not_dot:
+  IntCmp $4 1 major_ver
+  IntCmp $4 2 minor_ver
+  IntCmp $4 3 build_ver
+  IntCmp $4 4 parse_done
+
+  major_ver:
+  StrCpy $R1 $R1$2
+  goto parse ;Carry on parsing
+
+  minor_ver:
+  StrCpy $R2 $R2$2
+  goto parse ;Carry on parsing
+
+  build_ver:
+  StrCpy $R3 $R3$2
+  goto parse ;Carry on parsing
+
+  parse_done:
+
+  IntCmp $R1 $R5 this_major_same loop this_major_more
+  this_major_more:
+  StrCpy $R5 $R1
+  StrCpy $R6 $R2
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+
+  goto loop
+
+  this_major_same:
+  IntCmp $R2 $R6 this_minor_same loop this_minor_more
+  this_minor_more:
+  StrCpy $R6 $R2
+  StrCpy $R7 R3
+  StrCpy $R8 $R4
+  goto loop
+
+  this_minor_same:
+  IntCmp $R3 $R7 loop loop this_build_more
+  this_build_more:
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+  goto loop
+
+  done:
+
+  ;Have we got the framework we need?
+  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
+  max_major_same:
+  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
+  max_minor_same:
+  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
+
+  ;Version on machine is greater than what we need
+  OK:
+  StrCpy $0 "1"
+  goto end
+
+  fail:
+  StrCmp $R8 "0.0.0" end
+
+
+  end:
+
+  ;Pop the variables we pushed earlier
+  Pop $R8
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+FunctionEnd
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl Added

@@ -0,0 +1,326 @@
+/*  Resources.Designer.cs $
+
+ 	   This file is part of the HandBrake source code.
+ 	   Homepage: <http://handbrake.fr/>.
+ 	   It may be used under the terms of the GNU General Public License. */
+
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "Handbrake"
+!define PRODUCT_VERSION "$WCREV$ Nightly"
+!define PRODUCT_VERSION_NUMBER "svn$WCREV$"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+;Required .NET framework
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
+!define MIN_FRA_BUILD "*"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "handbrakepineapple.ico"
+!define MUI_UNICON "handbrakepineapple.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe"
+
+!include WordFunc.nsh
+!insertmacro VersionCompare
+!include LogicLib.nsh
+
+InstallDir "$PROGRAMFILES\Handbrake"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Var InstallDotNET
+
+Function .onInit
+
+  ; Begin Only allow one version
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
+  Pop $R0
+
+  StrCmp $R0 0 +3
+  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
+  Abort
+
+  ;Remove previous version
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to continue." /SD IDOK \
+  IDOK uninst
+  goto done
+
+ ;Run the uninstaller
+  uninst:
+   IfSilent +3
+   Exec $INSTDIR\uninst.exe
+   goto done
+   Exec '"$INSTDIR\uninst.exe" /S'
+  done:
+FunctionEnd
+
+Section "Handbrake" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+
+  ; Begin Check .NET version
+  StrCpy $InstallDotNET "No"
+  Call CheckFramework
+     StrCmp $0 "1" +3
+        StrCpy $InstallDotNET "Yes"
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+     Pop $0
+
+  ; Get .NET if required
+  ${If} $InstallDotNET == "Yes"
+     SetDetailsView hide
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
+     Pop $1
+
+     ${If} $1 != "OK"
+           Delete "$INSTDIR\dotnetfx.exe"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
+     ${EndIf}
+
+     ExecWait "$INSTDIR\dotnetfx.exe"
+     Delete "$INSTDIR\dotnetfx.exe"
+
+     SetDetailsView show
+  ${EndIf}
+  
+  ; Install Files
+  File "*.exe"
+  CreateDirectory "$SMPROGRAMS\Handbrake"
+  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  File "*.dll"
+  File "*.config"
+  File "*.xml"
+  File "*.pdb"
+
+  ; Copy the standard doc set into the doc folder
+  SetOutPath "$INSTDIR\doc"
+  SetOverwrite ifnewer
+  File "doc\*.*"
+
+  ; Copy the standard fonts config set into the fonts folder
+  SetOutPath "$INSTDIR\fonts"
+  SetOverwrite ifnewer
+  File /r "fonts\*.*"
+SectionEnd
+
+Section -AdditionalIcons
+  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  Delete "$INSTDIR\uninst.exe"
+  
+  Delete "$INSTDIR\*.*"
+  Delete "$INSTDIR\doc\*.*"
+  Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
+  RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
+  RMDIR  "$INSTDIR\fonts"
+  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
+  Delete "$DESKTOP\Handbrake.lnk"
+  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
+  RMDir  "$SMPROGRAMS\Handbrake"
+  RMDir  "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+;Check for .NET framework
+Function CheckFrameWork
+
+   ;Save the variables in case something else is using them
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+  Push $R6
+  Push $R7
+  Push $R8
+
+  StrCpy $R5 "0"
+  StrCpy $R6 "0"
+  StrCpy $R7 "0"
+  StrCpy $R8 "0.0.0"
+  StrCpy $0 0
+
+  loop:
+
+  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
+  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+  StrCmp $1 "" done ;jump to end if no more registry keys
+  IntOp $0 $0 + 1
+  StrCpy $2 $1 1 ;Cut off the first character
+  StrCpy $3 $1 "" 1 ;Remainder of string
+
+  ;Loop if first character is not a 'v'
+  StrCmpS $2 "v" start_parse loop
+
+  ;Parse the string
+  start_parse:
+  StrCpy $R1 ""
+  StrCpy $R2 ""
+  StrCpy $R3 ""
+  StrCpy $R4 $3
+
+  StrCpy $4 1
+
+  parse:
+  StrCmp $3 "" parse_done ;If string is empty, we are finished
+  StrCpy $2 $3 1 ;Cut off the first character
+  StrCpy $3 $3 "" 1 ;Remainder of string
+  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
+
+  is_dot:
+  IntOp $4 $4 + 1 ; Move to the next section
+  goto parse ;Carry on parsing
+
+  not_dot:
+  IntCmp $4 1 major_ver
+  IntCmp $4 2 minor_ver
+  IntCmp $4 3 build_ver
+  IntCmp $4 4 parse_done
+
+  major_ver:
+  StrCpy $R1 $R1$2
+  goto parse ;Carry on parsing
+
+  minor_ver:
+  StrCpy $R2 $R2$2
+  goto parse ;Carry on parsing
+
+  build_ver:
+  StrCpy $R3 $R3$2
+  goto parse ;Carry on parsing
+
+  parse_done:
+
+  IntCmp $R1 $R5 this_major_same loop this_major_more
+  this_major_more:
+  StrCpy $R5 $R1
+  StrCpy $R6 $R2
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+
+  goto loop
+
+  this_major_same:
+  IntCmp $R2 $R6 this_minor_same loop this_minor_more
+  this_minor_more:
+  StrCpy $R6 $R2
+  StrCpy $R7 R3
+  StrCpy $R8 $R4
+  goto loop
+
+  this_minor_same:
+  IntCmp $R3 $R7 loop loop this_build_more
+  this_build_more:
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+  goto loop
+
+  done:
+
+  ;Have we got the framework we need?
+  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
+  max_major_same:
+  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
+  max_minor_same:
+  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
+
+  ;Version on machine is greater than what we need
+  OK:
+  StrCpy $0 "1"
+  goto end
+
+  fail:
+  StrCmp $R8 "0.0.0" end
+
+
+  end:
+
+  ;Pop the variables we pushed earlier
+  Pop $R8
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+FunctionEnd
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/AdvancedChoice.cs Added

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedChoice.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the AdvancedChoice type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model
+{
+    /// <summary>
+    /// Advanced Choce model for the Advanced Panel
+    /// </summary>
+    public class AdvancedChoice
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the given choice is default.
+        /// </summary>
+        public bool IsDefault { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UI label for the choice.
+        /// </summary>
+        public string Label { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value on the options string for the choice.
+        /// </summary>
+        public string Value { get; set; }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/DownloadStatus.cs Added

@@ -0,0 +1,49 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DownloadStatus.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Progress of a File Download
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model
+{
+    using System;
+
+    /// <summary>
+    /// The Progress of a File Download
+    /// </summary>
+    public class DownloadStatus
+    {
+        /// <summary>
+        /// Gets or sets BytesRead.
+        /// </summary>
+        public long BytesRead { get; set; }
+
+        /// <summary>
+        /// Gets or sets TotalBytes.
+        /// </summary>
+        public long TotalBytes { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether WasSuccessful.
+        /// </summary>
+        public bool WasSuccessful { get; set; }
+
+        /// <summary>
+        /// Gets or sets Exception.
+        /// </summary>
+        public Exception Exception { get; set; }
+
+        /// <summary>
+        /// Gets or sets Message.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Gets or sets FilePath.
+        /// </summary>
+        public string FilePath { get; set; }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/OptionsTab.cs Added

@@ -0,0 +1,37 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTab.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A enum representing each tab on the options screen.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model
+{
+    using System.ComponentModel.DataAnnotations;
+
+    /// <summary>
+    /// A enum representing each tab on the options screen.
+    /// </summary>
+    public enum OptionsTab
+    {
+        [Display(Name = "General")]
+        General = 0,
+
+        [Display(Name = "Output Files")]
+        OutputFiles,
+
+        [Display(Name = "Audio and Subtitles")]
+        AudioAndSubtitles,
+
+        [Display(Name = "Advanced")]
+        Advanced,
+
+        [Display(Name = "Updates")]
+        Updates,
+
+        [Display(Name = "About HandBrake")]
+        About,
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/SelectionTitle.cs Added

@@ -0,0 +1,88 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SelectionTitle.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   TODO: Update summary.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model
+{
+    using Caliburn.Micro;
+
+    using HandBrake.ApplicationServices.Parsing;
+
+    /// <summary>
+    /// A model for the multiple selection window for adding to the queue.
+    /// </summary>
+    public class SelectionTitle : PropertyChangedBase
+    {
+        /// <summary>
+        /// The source name.
+        /// </summary>
+        private readonly string sourceName;
+
+        /// <summary>
+        /// The is selected.
+        /// </summary>
+        private bool isSelected;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SelectionTitle"/> class.
+        /// </summary>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <param name="sourceName">
+        /// The source Name.
+        /// </param>
+        public SelectionTitle(Title title, string sourceName)
+        {
+            this.sourceName = sourceName;
+            this.Title = title;
+        }
+
+        /// <summary>
+        /// Gets the source name.
+        /// </summary>
+        public string SourceName
+        {
+            get
+            {
+                return !string.IsNullOrEmpty(Title.SourceName) ? Title.SourceName : sourceName;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the end point.
+        /// </summary>
+        public int EndPoint { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether is selected.
+        /// </summary>
+        public bool IsSelected
+        {
+            get
+            {
+                return this.isSelected;
+            }
+            set
+            {
+                this.isSelected = value;
+                this.NotifyOfPropertyChange(() => this.IsSelected);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the start point.
+        /// </summary>
+        public int StartPoint { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title.
+        /// </summary>
+        public Title Title { get; set; }
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/ShellWindow.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/SourceMenuItem.cs Added

@@ -0,0 +1,54 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceMenuItem.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the SourceMenuItem type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model
+{
+    using System.Collections.ObjectModel;
+    using System.Windows.Controls;
+    using System.Windows.Input;
+
+    /// <summary>
+    /// The source menu item.
+    /// </summary>
+    public class SourceMenuItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SourceMenuItem"/> class.
+        /// </summary>
+        public SourceMenuItem()
+        {
+            this.Children = new ObservableCollection<SourceMenuItem>();
+        }
+
+        /// <summary>
+        /// Gets or sets the text.
+        /// </summary>
+        public string Text { get; set; }
+
+        /// <summary>
+        /// Gets or sets the command.
+        /// </summary>
+        public ICommand Command { get; set; }
+
+        /// <summary>
+        /// Gets or sets the image.
+        /// </summary>
+        public Image Image { get; set; }
+
+        /// <summary>
+        /// Gets or sets the children.
+        /// </summary>
+        public ObservableCollection<SourceMenuItem> Children { get; set; }
+
+        /// <summary>
+        /// Gets or sets the tag.
+        /// </summary>
+        public object Tag { get; set; }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/UpdateCheckInformation.cs Added

@@ -0,0 +1,57 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="UpdateCheckInformation.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Provides information about an update check.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model
+{
+    using System;
+
+    /// <summary>
+    /// Provides information about an update check.
+    /// </summary>
+    public struct UpdateCheckInformation
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether a New Version is Available.
+        /// </summary>
+        public bool NewVersionAvailable { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether an Error Occured.
+        /// </summary>
+        public bool ErrorOccured
+        {
+            get { return this.Error != null; }
+        }
+
+        /// <summary>
+        /// Gets or sets Information about an update to HandBrake
+        /// </summary>
+        public Uri DescriptionUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets HandBrake's version from the appcast.xml file.
+        /// </summary>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets HandBrake's Build from the appcast.xml file.
+        /// </summary>
+        public string Build { get; set; }
+
+        /// <summary>
+        /// Gets or sets the URL for update file.
+        /// </summary>
+        public string DownloadFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the error that occurred, if any. This will be null if no error occured.
+        /// </summary>
+        public Exception Error { get; set; }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs Changed

@@ -1,4 +1,9 @@
-using System.Reflection;
+/*  AssemblyInfo.cs $
+    This file is part of the HandBrake source code.
+    Homepage: <http://handbrake.fr>.
+    It may be used under the terms of the GNU General Public License. */
+
+using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -8,11 +13,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("HandBrake")]
-[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]
+[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HandBrake Team")]
 [assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © HandBrake Team 2011-2012")]
+[assembly: AssemblyCopyright("Copyright © HandBrake Team 2003-2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +56,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.5.0")]
-[assembly: AssemblyFileVersion("0.9.5.0")]
+[assembly: AssemblyVersion("0.0.0.5311")]
+[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl Added

@@ -0,0 +1,60 @@
+/*  AssemblyInfo.cs $
+    This file is part of the HandBrake source code.
+    Homepage: <http://handbrake.fr>.
+    It may be used under the terms of the GNU General Public License. */
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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("HandBrake")]
+[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HandBrake")]
+[assembly: AssemblyProduct("HandBrake")]
+[assembly: AssemblyCopyright("Copyright © HandBrake Team 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// 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 Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.0.0.$WCREV$")]
+[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl Added

@@ -0,0 +1,60 @@
+/*  AssemblyInfo.cs $
+    This file is part of the HandBrake source code.
+    Homepage: <http://handbrake.fr>.
+    It may be used under the terms of the GNU General Public License. */
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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("HandBrake")]
+[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HandBrake")]
+[assembly: AssemblyProduct("HandBrake")]
+[assembly: AssemblyCopyright("Copyright © HandBrake Team 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// 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 Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.9.9.$WCREV$")]
+[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs Changed

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.468
+//     Runtime Version:4.0.30319.296
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -22,7 +22,7 @@
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HandBrakeWPF.Properties.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -59,5 +59,395 @@
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Copyright (C) 2003-2013 The HandBrake Team
+        ///
+        ///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 f [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string About_GPL {
+            get {
+                return ResourceManager.GetString("About_GPL", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:
+        ///
+        ///None:  There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.
+        ///
+        ///Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.
+        ///
+        ///Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values in [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string AddPreset_PictureSizeMode {
+            get {
+                return ResourceManager.GetString("AddPreset_PictureSizeMode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to x264 has a variety of algorithms to decide when to use B-frames and how many to use.
+        ///
+        ///Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.
+        ///
+        ///Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid..
+        /// </summary>
+        public static string Advanced_AdaptiveBFramesToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_AdaptiveBFramesToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
+        ///
+        ///Spatial, the default, is almost always better, but temporal is sometimes useful too.
+        ///
+        ///x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame..
+        /// </summary>
+        public static string Advanced_AdaptiveDirectModeToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_AdaptiveDirectModeToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Adaptive quantization controls how the encoder distributes bits across the frame.
+        ///Higher values take more bits away from edges and complex areas to improve areas with finer detail..
+        /// </summary>
+        public static string Advanced_AdaptiveQuantizationStrengthToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_AdaptiveQuantizationStrengthToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mode decision picks from a variety of options to make its decision: this option chooses what options those are.  
+        ///Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off..
+        /// </summary>
+        public static string Advanced_AnalysisToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_AnalysisToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sane values are ~2-5.  
+        ///This specifies the maximum number of sequential B-frames that the encoder can use. 
+        /// Large numbers generally won&apos;t help significantly unless Adaptive B-frames is set to Optimal.  
+        ///Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. 
+        ///Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)..
+        /// </summary>
+        public static string Advanced_BFramesToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_BFramesToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides two options for this: CAVLC and CABAC.  CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates. If you&apos;re looking to minimize CPU requirements for video playback, disable this option. Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled..
+        /// </summary>
+        public static string Advanced_CabacToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_CabacToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. 
+        ///The deblocking filter takes a lot of CPU power, so if you&apos;re looking to minimize CPU requirements for video playback, disable it.
+        ///
+        ///The deblocking filter has two adjustable parameters, &quot;strength&quot; and &quot;threshold&quot;. 
+        ///The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few)  edges  [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string Advanced_DeblockingToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_DeblockingToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.  
+        ///It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain.  
+        ///However, it requires High Profile, which many devices may not support..
+        /// </summary>
+        public static string Advanced_EightByEightDctToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_EightByEightDctToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The options passed to the x264 encoder. 
+        ///The above controls are only a subset of useful x264 parameters. 
+        ///This box allows you to add or modify additional or current parameters as desired. .
+        /// </summary>
+        public static string Advanced_EncoderOptions {
+            get {
+                return ResourceManager.GetString("Advanced_EncoderOptions", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  
+        ///A better motion search method improves compression at the cost of speed.
+        ///
+        ///Diamond: performs an extremely fast and simple search using a diamond pattern.
+        ///
+        ///Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
+        ///
+        ///Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
+        ///
        /// [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string Advanced_MotionEstimationMethodToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_MotionEstimationMethodToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  
+        ///
+        ///The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost..
+        /// </summary>
+        public static string Advanced_MotionEstimationRangeToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_MotionEstimationRangeToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video.  
+        ///However, this can sometimes have slight negative effects on retention of subtle grain and dither.  
+        ///Don&apos;t touch this unless you&apos;re having banding issues or other such cases where you are having trouble keeping fine noise..
+        /// </summary>
+        public static string Advanced_NoDctDecimateToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_NoDctDecimateToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The x264 Preset / Tune / Profile and Level options are currently in use on the Video Tab. 
+        ///
+        ///To enable this tab, check the &quot;Use Advanced Tab instead&quot; option on the Video Tab.
+        ///
+        ///If you do not use this tab, it can be hidden from: Tools Menu &gt; Options &gt; Advanced..
+        /// </summary>
+        public static string Advanced_NotInUse {
+            get {
+                return ResourceManager.GetString("Advanced_NotInUse", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Psychovisual Rate Distortion means x264 tries to retain detail, for better quality to the human eye, 
+        ///as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise..
+        /// </summary>
+        public static string Advanced_PsychovisualRateDistortionToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_PsychovisualRateDistortionToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Psychovisual Trellis tries to retain more sharpness and detail, but can cause artifacting.
+        ///It is considered experimental, which is why it&apos;s off by default. Good values are 0.1 to 0.2..
+        /// </summary>
+        public static string Advanced_PsychovisualTrellisToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_PsychovisualTrellisToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to 
+        ///reference each other to improve compression.  
+        ///
+        ///Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit..
+        /// </summary>
+        public static string Advanced_PyramidalBFramesToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_PyramidalBFramesToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sane values are ~1-6.
+        ///
+        ///The more you add, the better the compression, but the slower the encode.
+        ///
+        ///Cel animation tends to benefit from more reference frames a lot more than film content.
+        ///
+        ///Note that many hardware devices have limitations on the number of supported reference frames, so if you&apos;re encoding for a handheld or standalone player, don&apos;t touch this unless you&apos;re absolutely sure you know what you&apos;re doing!.
+        /// </summary>
+        public static string Advanced_ReferenceFramesToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_ReferenceFramesToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This setting controls both subpixel-precision motion estimation and mode decision methods.
+        ///
+        ///Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
+        ///
+        ///Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
+        ///
+        ///SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
+        ///6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain det [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string Advanced_SubpixelMotionEstimationToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_SubpixelMotionEstimationToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. 
+        ///&quot;Always&quot; uses trellis not only during the main encoding process, but also during analysis, which improves compression even more, albeit at great speed cost. 
+        ///
+        ///Trellis costs more speed at higher bitrates..
+        /// </summary>
+        public static string Advanced_TrellisToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_TrellisToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Performs extra analysis to decide upon weighting parameters for each frame.  
+        ///This improves overall compression slightly and improves the quality of fades greatly. 
+        ///Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled.  
+        ///Note that some devices and players, even those that support Main Profile, 
+        ///may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example..
+        /// </summary>
+        public static string Advanced_WeightPToolTip {
+            get {
+                return ResourceManager.GetString("Advanced_WeightPToolTip", resourceCulture);
+            }
+        }
+        
+        public static System.Drawing.Bitmap logo64 {
+            get {
+                object obj = ResourceManager.GetObject("logo64", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Warning: RF 0 is Lossless!.
+        /// </summary>
+        public static string Video_LosslessWarning {
+            get {
+                return ResourceManager.GetString("Video_LosslessWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A value of 0 means lossless and will result in a file size that is larger than the original source, 
+        ///unless the source was also lossless. 
+        ///
+        ///x264&apos;s scale is logarithmic and lower values correspond to higher quality. 
+        ///
+        ///So small increases in value will result in progressively larger increases in the resulting file size. 
+        ///
+        ///Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition..
+        /// </summary>
+        public static string Video_LosslessWarningTooltip {
+            get {
+                return ResourceManager.GetString("Video_LosslessWarningTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Set the desired quality factor. The encoder targets a certain quality. 
+        ///The scale used by each video encoder is different.
+        ///
+        ///x264&apos;s scale is logarithmic and lower values correspond to higher quality. 
+        ///So small increases in value will result in progressively larger increases in the resulting file size. 
+        ///A value of 0 means lossless and will result in a file size that is larger than the original source, 
+        ///unless the source was also lossless. 
+        ///Suggested values are: 18 to 20 for Standard Definition and 20 t [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string Video_QualitySlider {
+            get {
+                return ResourceManager.GetString("Video_QualitySlider", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The full x264 list of parameters: 
+        ///{0}.
+        /// </summary>
+        public static string Video_x264ExtraArgs {
+            get {
+                return ResourceManager.GetString("Video_x264ExtraArgs", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reduce decoder CPU usage.
+        ///
+        ///Set this if your device is struggling to play the output. (i.e. dropped frames).
+        /// </summary>
+        public static string Video_x264FastDecode {
+            get {
+                return ResourceManager.GetString("Video_x264FastDecode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sets and ensures compliance with the specified H.264 Levels. This will override all other settings..
+        /// </summary>
+        public static string Video_x264Level {
+            get {
+                return ResourceManager.GetString("Video_x264Level", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Adjusts x264 settings to trade off compression efficiency against encoding speed.
+        ///
+        ///This establishes your default x264 settings. Tunes, profiles, levels and advanced options string will be applied to this.
+        ///
+        ///You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files..
+        /// </summary>
+        public static string Video_x264Preset {
+            get {
+                return ResourceManager.GetString("Video_x264Preset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Limit the H.264 profile of the output stream. This will override all other settings..
+        /// </summary>
+        public static string Video_x264Profile {
+            get {
+                return ResourceManager.GetString("Video_x264Profile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Tune settings to optimise for common scenarios
+        ///
+        ///This can improve efficiency for particular source characteristics or set of characteristics of the output file.
+        ///
+        ///Changes will be applied after the preset but before all other parameters..
+        /// </summary>
+        public static string Video_x264Tune {
+            get {
+                return ResourceManager.GetString("Video_x264Tune", resourceCulture);
+            }
+        }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.resx -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.resx Changed

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : 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:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <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="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,221 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Advanced_AdaptiveBFramesToolTip" xml:space="preserve">
+    <value>x264 has a variety of algorithms to decide when to use B-frames and how many to use.
+
+Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.
+
+Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.</value>
+  </data>
+  <data name="Advanced_AdaptiveDirectModeToolTip" xml:space="preserve">
+    <value>H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
+
+Spatial, the default, is almost always better, but temporal is sometimes useful too.
+
+x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.</value>
+  </data>
+  <data name="Advanced_AdaptiveQuantizationStrengthToolTip" xml:space="preserve">
+    <value>Adaptive quantization controls how the encoder distributes bits across the frame.
+Higher values take more bits away from edges and complex areas to improve areas with finer detail.</value>
+  </data>
+  <data name="Advanced_AnalysisToolTip" xml:space="preserve">
+    <value>Mode decision picks from a variety of options to make its decision: this option chooses what options those are.  
+Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.</value>
+  </data>
+  <data name="Advanced_BFramesToolTip" xml:space="preserve">
+    <value>Sane values are ~2-5.  
+This specifies the maximum number of sequential B-frames that the encoder can use. 
+ Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.  
+Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. 
+Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</value>
+  </data>
+  <data name="Advanced_CabacToolTip" xml:space="preserve">
+    <value>After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides two options for this: CAVLC and CABAC.  CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates. If you're looking to minimize CPU requirements for video playback, disable this option. Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</value>
+  </data>
+  <data name="Advanced_DeblockingToolTip" xml:space="preserve">
+    <value>H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. 
+The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
+
+The deblocking filter has two adjustable parameters, "strength" and "threshold". 
+The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few)  edges it applies to. 
+Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</value>
+  </data>
+  <data name="Advanced_EightByEightDctToolTip" xml:space="preserve">
+    <value>The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.  
+It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain.  
+However, it requires High Profile, which many devices may not support.</value>
+  </data>
+  <data name="Advanced_MotionEstimationMethodToolTip" xml:space="preserve">
+    <value>Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  
+A better motion search method improves compression at the cost of speed.
+
+Diamond: performs an extremely fast and simple search using a diamond pattern.
+
+Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
+
+Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
+
+Exhaustive: performs a "dumb" search of every pixel in a wide area.  Significantly slower for only a small compression gain.
+
+Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</value>
+  </data>
+  <data name="Advanced_MotionEstimationRangeToolTip" xml:space="preserve">
+    <value>This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  
+
+The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.</value>
+  </data>
+  <data name="Advanced_NoDctDecimateToolTip" xml:space="preserve">
+    <value>x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video.  
+However, this can sometimes have slight negative effects on retention of subtle grain and dither.  
+Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.</value>
+  </data>
+  <data name="Advanced_PsychovisualRateDistortionToolTip" xml:space="preserve">
+    <value>Psychovisual Rate Distortion means x264 tries to retain detail, for better quality to the human eye, 
+as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.</value>
+  </data>
+  <data name="Advanced_PsychovisualTrellisToolTip" xml:space="preserve">
+    <value>Psychovisual Trellis tries to retain more sharpness and detail, but can cause artifacting.
+It is considered experimental, which is why it's off by default. Good values are 0.1 to 0.2.</value>
+  </data>
+  <data name="Advanced_PyramidalBFramesToolTip" xml:space="preserve">
+    <value>B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to 
+reference each other to improve compression.  
+
+Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.</value>
+  </data>
+  <data name="Advanced_ReferenceFramesToolTip" xml:space="preserve">
+    <value>Sane values are ~1-6.
+
+The more you add, the better the compression, but the slower the encode.
+
+Cel animation tends to benefit from more reference frames a lot more than film content.
+
+Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, don't touch this unless you're absolutely sure you know what you're doing!</value>
+  </data>
+  <data name="Advanced_SubpixelMotionEstimationToolTip" xml:space="preserve">
+    <value>This setting controls both subpixel-precision motion estimation and mode decision methods.
+
+Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
+
+Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
+
+SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
+6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
+10, the most powerful and slowest option, requires trellis=2.</value>
+  </data>
+  <data name="Advanced_TrellisToolTip" xml:space="preserve">
+    <value>Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. 
+"Always" uses trellis not only during the main encoding process, but also during analysis, which improves compression even more, albeit at great speed cost. 
+
+Trellis costs more speed at higher bitrates.</value>
+  </data>
+  <data name="Advanced_WeightPToolTip" xml:space="preserve">
+    <value>Performs extra analysis to decide upon weighting parameters for each frame.  
+This improves overall compression slightly and improves the quality of fades greatly. 
+Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled.  
+Note that some devices and players, even those that support Main Profile, 
+may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Video_x264ExtraArgs" xml:space="preserve">
+    <value>The full x264 list of parameters: 
+{0}</value>
+  </data>
+  <data name="Video_x264FastDecode" xml:space="preserve">
+    <value>Reduce decoder CPU usage.
+
+Set this if your device is struggling to play the output. (i.e. dropped frames)</value>
+  </data>
+  <data name="Video_x264Level" xml:space="preserve">
+    <value>Sets and ensures compliance with the specified H.264 Levels. This will override all other settings.</value>
+  </data>
+  <data name="Video_x264Preset" xml:space="preserve">
+    <value>Adjusts x264 settings to trade off compression efficiency against encoding speed.
+
+This establishes your default x264 settings. Tunes, profiles, levels and advanced options string will be applied to this.
+
+You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.</value>
+  </data>
+  <data name="Video_x264Profile" xml:space="preserve">
+    <value>Limit the H.264 profile of the output stream. This will override all other settings.</value>
+  </data>
+  <data name="Video_x264Tune" xml:space="preserve">
+    <value>Tune settings to optimise for common scenarios
+
+This can improve efficiency for particular source characteristics or set of characteristics of the output file.
+
+Changes will be applied after the preset but before all other parameters.</value>
+  </data>
+  <data name="Video_QualitySlider" xml:space="preserve">
+    <value>Set the desired quality factor. The encoder targets a certain quality. 
+The scale used by each video encoder is different.
+
+x264's scale is logarithmic and lower values correspond to higher quality. 
+So small increases in value will result in progressively larger increases in the resulting file size. 
+A value of 0 means lossless and will result in a file size that is larger than the original source, 
+unless the source was also lossless. 
+Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition.
+
+FFMpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>
+  </data>
+  <data name="Video_LosslessWarning" xml:space="preserve">
+    <value>Warning: RF 0 is Lossless!</value>
+  </data>
+  <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+    <value>A value of 0 means lossless and will result in a file size that is larger than the original source, 
+unless the source was also lossless. 
+
+x264's scale is logarithmic and lower values correspond to higher quality. 
+
+So small increases in value will result in progressively larger increases in the resulting file size. 
+
+Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition.</value>
+  </data>
+  <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+    <value>You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:
+
+None:  There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.
+
+Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.
+
+Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values instead.</value>
+  </data>
+  <data name="Advanced_EncoderOptions" xml:space="preserve">
+    <value>The options passed to the x264 encoder. 
+The above controls are only a subset of useful x264 parameters. 
+This box allows you to add or modify additional or current parameters as desired. </value>
+  </data>
+  <data name="About_GPL" xml:space="preserve">
+    <value>Copyright (C) 2003-2013 The HandBrake Team
+
+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.</value>
+  </data>
+  <data name="Advanced_NotInUse" xml:space="preserve">
+    <value>The x264 Preset / Tune / Profile and Level options are currently in use on the Video Tab. 
+
+To enable this tab, check the "Use Advanced Tab instead" option on the Video Tab.
+
+If you do not use this tab, it can be hidden from: Tools Menu &gt; Options &gt; Advanced.</value>
+  </data>
 </root>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Resources Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Resources/logo64.png Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/DriveDetectService.cs Added

@@ -0,0 +1,97 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DriveDetectService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Drive Detection Helper.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+    using System;
+    using System.Management;
+    using System.Threading;
+
+    using HandBrakeWPF.Services.Interfaces;
+
+    /// <summary>
+    /// Drive Detection Helper.
+    /// </summary>
+    public class DriveDetectService : IDriveDetectService
+    {
+        /// <summary>
+        /// The watcher.
+        /// </summary>
+        private ManagementEventWatcher watcher;
+
+        /// <summary>
+        /// The detection action.
+        /// </summary>
+        private Action detectionAction;
+
+        /// <summary>
+        /// The start detection.
+        /// </summary>
+        /// <param name="action">
+        /// The detection Action.
+        /// </param>
+        public void StartDetection(Action action)
+        {
+            ThreadPool.QueueUserWorkItem(
+                delegate
+                {
+                    this.detectionAction = action;
+
+                    var options = new ConnectionOptions { EnablePrivileges = true };
+                    var scope = new ManagementScope(@"root\CIMV2", options);
+
+                    try
+                    {
+                        var query = new WqlEventQuery
+                        {
+                            EventClassName = "__InstanceModificationEvent",
+                            WithinInterval = TimeSpan.FromSeconds(1),
+                            Condition = @"TargetInstance ISA 'Win32_LogicalDisk' and TargetInstance.DriveType = 5" // DriveType - 5: CDROM
+                        };
+
+                        this.watcher = new ManagementEventWatcher(scope, query);
+                        this.watcher.EventArrived += this.WatcherEventArrived;
+                        this.watcher.Start();
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                });
+        }
+
+        /// <summary>
+        /// The close.
+        /// </summary>
+        public void Close()
+        {
+            if (watcher != null)
+            {
+                this.watcher.Stop();
+            }
+        }
+
+        /// <summary>
+        /// The watcher_ event arrived.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EventArrivedEventArgs.
+        /// </param>
+        private void WatcherEventArrived(object sender, EventArrivedEventArgs e)
+        {
+            if (this.detectionAction != null)
+            {
+                this.detectionAction();
+            }
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs Added

@@ -0,0 +1,260 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeServiceWrapper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   We have multiple implementations of IEncode. This is a wrapper class for the GUI so that the 
+//   implementation used is controllable via user settings.
+//   Over time, this class will go away when the LibHB and process isolation code matures.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+    using System;
+
+    using HandBrake.ApplicationServices.Exceptions;
+    using HandBrake.ApplicationServices.Isolation;
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Services;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.Interop;
+
+    using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
+    using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
+
+    /// <summary>
+    /// We have multiple implementations of Iencode. This is a wrapper class for the GUI so that the 
+    /// implementation used is controllable via user settings.
+    /// Over time, this class will go away when the LibHB and process isolation code matures.
+    /// </summary>
+    public class EncodeServiceWrapper : IEncodeServiceWrapper
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The encode service.
+        /// </summary>
+        private readonly IEncode encodeService;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncodeServiceWrapper"/> class.
+        /// </summary>
+        /// <param name="userSettingService">
+        /// The user setting service.
+        /// </param>
+        public EncodeServiceWrapper(IUserSettingService userSettingService)
+        {
+            var useLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
+            var useProcessIsolation =
+                userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
+            var port = userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort);
+
+            if (useLibHb)
+            {
+                try
+                {
+                    if (useProcessIsolation)
+                    {
+                        this.encodeService = new IsolatedEncodeService(port);
+                    }
+                    else
+                    {
+                        if (ScanServiceWrapper.HandbrakeInstance == null)
+                        {
+                            ScanServiceWrapper.HandbrakeInstance = new HandBrakeInstance();
+                        }
+
+                        this.encodeService = new LibEncode(userSettingService, ScanServiceWrapper.HandbrakeInstance);
+                    }
+                }
+                catch (Exception exc)
+                {
+                    // Try to recover from errors.
+                    userSettingService.SetUserSetting(UserSettingConstants.EnableLibHb, false);
+                    throw new GeneralApplicationException(
+                        "Unable to initialise LibHB or Background worker service",
+                        "Falling back to using HandBrakeCLI.exe. Setting has been reset",
+                        exc);
+                }
+            }
+            else
+            {
+                this.encodeService = new Encode(userSettingService);
+            }
+
+            this.encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+            this.encodeService.EncodeStarted += this.EncodeServiceEncodeStarted;
+            this.encodeService.EncodeStatusChanged += this.EncodeServiceEncodeStatusChanged;
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// The encode completed.
+        /// </summary>
+        public event EncodeCompletedStatus EncodeCompleted;
+
+        /// <summary>
+        /// The encode started.
+        /// </summary>
+        public event EventHandler EncodeStarted;
+
+        /// <summary>
+        /// The encode status changed.
+        /// </summary>
+        public event EncodeProgessStatus EncodeStatusChanged;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets ActivityLog.
+        /// </summary>
+        public string ActivityLog
+        {
+            get
+            {
+                return this.encodeService.ActivityLog;
+            }
+        }
+
+        /// <summary>
+        /// Gets the log index.
+        /// </summary>
+        public int LogIndex
+        {
+            get
+            {
+                return this.encodeService.LogIndex;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether IsEncoding.
+        /// </summary>
+        public bool IsEncoding
+        {
+            get
+            {
+                return this.encodeService.IsEncoding;
+            }
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IEncode
+
+        /// <summary>
+        /// Copy the log file to the desired destinations
+        /// </summary>
+        /// <param name="destination">
+        /// The destination.
+        /// </param>
+        public void ProcessLogs(string destination)
+        {
+            this.encodeService.ProcessLogs(destination);
+        }
+
+        /// <summary>
+        /// Shutdown the service.
+        /// </summary>
+        public void Shutdown()
+        {
+            this.encodeService.Shutdown();
+            this.encodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
+            this.encodeService.EncodeStarted -= this.EncodeServiceEncodeStarted;
+            this.encodeService.EncodeStatusChanged -= this.EncodeServiceEncodeStatusChanged;
+        }
+
+        /// <summary>
+        /// Start with a LibHb EncodeJob Object
+        /// </summary>
+        /// <param name="job">
+        /// The job.
+        /// </param>
+        /// <param name="enableLogging">
+        /// The enable Logging.
+        /// </param>
+        public void Start(QueueTask job, bool enableLogging)
+        {
+            this.encodeService.Start(job, enableLogging);
+        }
+
+        /// <summary>
+        /// Kill the CLI process
+        /// </summary>
+        public void Stop()
+        {
+            this.encodeService.Stop();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The encode service_ encode completed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EncodeCompletedEventArgs.
+        /// </param>
+        private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
+        {
+            if (EncodeCompleted != null)
+            {
+                this.EncodeCompleted(sender, e);
+            }
+        }
+
+        /// <summary>
+        /// The encode service_ encode started.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EventArgs
+        /// </param>
+        private void EncodeServiceEncodeStarted(object sender, EventArgs e)
+        {
+            if (EncodeStarted != null)
+            {
+                this.EncodeStarted(sender, e);
+            }
+        }
+
+        /// <summary>
+        /// The encode service_ encode status changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EncodeProgressEventArgs.
+        /// </param>
+        private void EncodeServiceEncodeStatusChanged(object sender, EncodeProgressEventArgs e)
+        {
+            if (EncodeStatusChanged != null)
+            {
+                this.EncodeStatusChanged(sender, e);
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IDriveDetectService.cs Added

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IDriveDetectService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the IDriveDetectService type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Interfaces
+{
+    using System;
+
+    /// <summary>
+    /// The DriveDetectService interface.
+    /// </summary>
+    public interface IDriveDetectService
+    {
+        /// <summary>
+        /// The start detection.
+        /// </summary>
+        /// <param name="action">
+        /// The detection Action.
+        /// </param>
+        void StartDetection(Action action);
+
+        /// <summary>
+        /// Stop the watcher. Must be done before the app shuts down.
+        /// </summary>
+        void Close();
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/INotificationService.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IUpdateService.cs Added

@@ -0,0 +1,51 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IUpdateService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An Interface for the Update Service
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Interfaces
+{
+    using System;
+
+    using HandBrakeWPF.Model;
+
+    /// <summary>
+    /// An Interface for the Update Service
+    /// </summary>
+    public interface IUpdateService
+    {
+        /// <summary>
+        /// Perform an update check at application start, but only daily, weekly or monthly depending on the users settings.
+        /// </summary>
+        /// <param name="callback">
+        /// The callback.
+        /// </param>
+        void PerformStartupUpdateCheck(Action<UpdateCheckInformation> callback);
+
+        /// <summary>
+        /// Perform an Update check and execute the Action when complete.
+        /// </summary>
+        /// <param name="callback">
+        /// The callback.
+        /// </param>
+        void CheckForUpdates(Action<UpdateCheckInformation> callback);
+
+        /// <summary>
+        /// Download the update file.
+        /// </summary>
+        /// <param name="url">
+        /// The url.
+        /// </param>
+        /// <param name="completed">
+        /// The complete.
+        /// </param>
+        /// <param name="progress">
+        /// The progress.
+        /// </param>
+        void DownloadFile(string url, Action<DownloadStatus> completed, Action<DownloadStatus> progress);
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/NotificationService.cs Added

@@ -0,0 +1,84 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NotificationService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Notification Service (Growl Connector)
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Services.Interfaces;
+
+    /// <summary>
+    /// The Notification Service (Growl Connector)
+    /// </summary>
+    public class NotificationService : INotificationService
+    {
+        /// <summary>
+        /// The user setting service.
+        /// </summary>
+        private readonly IUserSettingService userSettingService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NotificationService"/> class.
+        /// </summary>
+        /// <param name="encodeService">
+        /// The encode Service.
+        /// </param>
+        /// <param name="queueProcessor">
+        /// The queue Processor.
+        /// </param>
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        public NotificationService(IEncodeServiceWrapper encodeService, IQueueProcessor queueProcessor, IUserSettingService userSettingService)
+        {
+            this.userSettingService = userSettingService;
+            encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+            queueProcessor.QueueCompleted += this.QueueProcessorQueueCompleted;
+            GrowlCommunicator.Register();
+        }
+
+        /// <summary>
+        /// The queue processor_ queue completed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EventArgs.
+        /// </param>
+        private void QueueProcessorQueueCompleted(object sender, System.EventArgs e)
+        {
+            // Growl
+            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlQueue))
+            {
+                GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
+            }
+        }
+
+        /// <summary>
+        /// The encode service_ encode completed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EncodeCompletedEventArgs.
+        /// </param>
+        private void EncodeServiceEncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)
+        {
+            // Growl
+            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode))
+            {
+                GrowlCommunicator.Notify(
+                    "Encode Completed", "Put down that cocktail...\nyour Handbrake encode is done.");
+            }
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs Added

@@ -0,0 +1,247 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanServiceWrapper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   We have multiple implementations of IScan. This is a wrapper class for the GUI so that the 
+//   implementation used is controllable via user settings.
+//   Over time, this class will go away when the LibHB and process isolation code matures.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+    using System;
+
+    using HandBrake.ApplicationServices.Exceptions;
+    using HandBrake.ApplicationServices.Isolation;
+    using HandBrake.ApplicationServices.Parsing;
+    using HandBrake.ApplicationServices.Services;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.Interop;
+    using HandBrake.Interop.Interfaces;
+
+    /// <summary>
+    /// We have multiple implementations of IScan. This is a wrapper class for the GUI so that the 
+    /// implementation used is controllable via user settings.
+    /// Over time, this class will go away when the LibHB and process isolation code matures.
+    /// </summary>
+    public class ScanServiceWrapper : IScanServiceWrapper
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The handbrake instance.
+        /// </summary>
+        public static IHandBrakeInstance HandbrakeInstance;
+
+        /// <summary>
+        /// The scan service.
+        /// </summary>
+        private readonly IScan scanService;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ScanServiceWrapper"/> class.
+        /// </summary>
+        /// <param name="userSettingService">
+        /// The user setting service.
+        /// </param>
+        public ScanServiceWrapper(IUserSettingService userSettingService)
+        {
+            var useLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
+            var useProcessIsolation =
+                userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
+            string port = userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort);
+
+            if (useLibHb)
+            {
+                try
+                {
+                    if (useProcessIsolation)
+                    {
+                        this.scanService = new IsolatedScanService(port);
+                    }
+                    else
+                    {
+                        HandbrakeInstance = new HandBrakeInstance();
+                        this.scanService = new LibScan(HandbrakeInstance);
+                    }
+                } 
+                catch(Exception exc)
+                {
+                    // Try to recover from errors.
+                    userSettingService.SetUserSetting(UserSettingConstants.EnableLibHb, false);
+                    throw new GeneralApplicationException("Unable to initialise LibHB or Background worker service", "Falling back to using HandBrakeCLI.exe. Setting has been reset", exc);
+                }
+            }
+            else
+            {
+                this.scanService = new ScanService(userSettingService);
+            }
+
+            this.scanService.ScanCompleted += this.ScanServiceScanCompleted;
+            this.scanService.ScanStared += this.ScanServiceScanStared;
+            this.scanService.ScanStatusChanged += this.ScanServiceScanStatusChanged;
+        }
+
+        /// <summary>
+        /// The scan service scan status changed event
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The ScanProgressEventArgs.
+        /// </param>
+        private void ScanServiceScanStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs e)
+        {
+            this.ScanStatusChanged(sender, e);
+        }
+
+        /// <summary>
+        /// The scan service scan stared event
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EventArgs
+        /// </param>
+        private void ScanServiceScanStared(object sender, EventArgs e)
+        {
+            this.ScanStared(sender, e);
+        }
+
+        /// <summary>
+        /// The scan service scan completed event
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The ScanCompletedEventArgs
+        /// </param>
+        private void ScanServiceScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)
+        {
+            this.ScanCompleted(sender, e);
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// The scan completed.
+        /// </summary>
+        public event ScanCompletedStatus ScanCompleted;
+
+        /// <summary>
+        /// The scan stared.
+        /// </summary>
+        public event EventHandler ScanStared;
+
+        /// <summary>
+        /// The scan status changed.
+        /// </summary>
+        public event ScanProgessStatus ScanStatusChanged;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets ActivityLog.
+        /// </summary>
+        public string ActivityLog
+        {
+            get
+            {
+                return this.scanService.ActivityLog;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether IsScanning.
+        /// </summary>
+        public bool IsScanning
+        {
+            get
+            {
+                return this.scanService.IsScanning;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Souce Data.
+        /// </summary>
+        public Source SouceData
+        {
+            get
+            {
+                return this.scanService.SouceData;
+            }
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IScan
+
+        /// <summary>
+        /// Take a Scan Log file, and process it as if it were from the CLI.
+        /// </summary>
+        /// <param name="path">
+        /// The path to the log file.
+        /// </param>
+        public void DebugScanLog(string path)
+        {
+            this.scanService.DebugScanLog(path);
+        }
+
+        /// <summary>
+        /// Shutdown the service.
+        /// </summary>
+        public void Shutdown()
+        {
+            this.scanService.Shutdown();
+        }
+
+        /// <summary>
+        /// Scan a Source Path.
+        /// Title 0: scan all
+        /// </summary>
+        /// <param name="sourcePath">
+        /// Path to the file to scan
+        /// </param>
+        /// <param name="title">
+        /// int title number. 0 for scan all
+        /// </param>
+        /// <param name="previewCount">
+        /// The preview Count.
+        /// </param>
+        /// <param name="postAction">
+        /// The post Action.
+        /// </param>
+        public void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction)
+        {
+            this.scanService.Scan(sourcePath, title, previewCount, postAction);
+        }
+
+        /// <summary>
+        /// Kill the scan
+        /// </summary>
+        public void Stop()
+        {
+            this.scanService.Stop();
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/UpdateService.cs Added

@@ -0,0 +1,205 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="UpdateService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Update Service
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+    using System;
+    using System.IO;
+    using System.Net;
+    using System.Threading;
+
+    using HandBrake.ApplicationServices;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
+
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Services.Interfaces;
+
+    /// <summary>
+    /// The Update Service
+    /// </summary>
+    public class UpdateService : IUpdateService
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// Backing field for the update service
+        /// </summary>
+        private readonly IUserSettingService userSettingService;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateService"/> class.
+        /// </summary>
+        /// <param name="userSettingService">
+        /// The user setting service.
+        /// </param>
+        public UpdateService(IUserSettingService userSettingService)
+        {
+            this.userSettingService = userSettingService;
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Perform an update check at application start, but only daily, weekly or monthly depending on the users settings.
+        /// </summary>
+        /// <param name="callback">
+        /// The callback.
+        /// </param>
+        public void PerformStartupUpdateCheck(Action<UpdateCheckInformation> callback)
+        {
+            // Make sure it's running on the calling thread
+            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UpdateStatus))
+            {
+                if (DateTime.Now.Subtract(this.userSettingService.GetUserSetting<DateTime>(UserSettingConstants.LastUpdateCheckDate)).TotalDays
+                    > this.userSettingService.GetUserSetting<int>(UserSettingConstants.DaysBetweenUpdateCheck))
+                {
+                    this.userSettingService.SetUserSetting(UserSettingConstants.LastUpdateCheckDate, DateTime.Now);
+
+                    this.CheckForUpdates(callback);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check for Updates
+        /// </summary>
+        /// <param name="callback">
+        /// The callback.
+        /// </param>
+        public void CheckForUpdates(Action<UpdateCheckInformation> callback)
+        {
+            ThreadPool.QueueUserWorkItem(
+                delegate
+                {
+                    try
+                    {
+                        string url =
+                            VersionHelper.Is64Bit()
+                                ? Constants.Appcast64
+                                : Constants.Appcast32;
+
+                        var currentBuild =
+                            this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild);
+                        var skipBuild = this.userSettingService.GetUserSetting<int>(
+                            UserSettingConstants.Skipversion);
+
+                        // Initialize variables
+                        WebRequest request = WebRequest.Create(url);
+                        WebResponse response = request.GetResponse();
+                        var reader = new AppcastReader();
+
+                        // Get the data, convert it to a string, and parse it into the AppcastReader
+                        reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());
+
+                        // Further parse the information
+                        string build = reader.Build;
+
+                        int latest = int.Parse(build);
+                        int current = currentBuild;
+                        int skip = skipBuild;
+
+                        // If the user wanted to skip this version, don't report the update
+                        if (latest == skip)
+                        {
+                            var info = new UpdateCheckInformation { NewVersionAvailable = false };
+                            callback(info);
+                            return;
+                        }
+
+                        var info2 = new UpdateCheckInformation
+                            {
+                                NewVersionAvailable = latest > current,
+                                DescriptionUrl = reader.DescriptionUrl,
+                                DownloadFile = reader.DownloadFile,
+                                Build = reader.Build,
+                                Version = reader.Version,
+                            };
+
+                        callback(info2);
+                    }
+                    catch (Exception exc)
+                    {
+                        callback(new UpdateCheckInformation { NewVersionAvailable = false, Error = exc });
+                    }
+                });
+        }
+
+        /// <summary>
+        /// Download the update file.
+        /// </summary>
+        /// <param name="url">
+        /// The url.
+        /// </param>
+        /// <param name="completed">
+        /// The complete.
+        /// </param>
+        /// <param name="progress">
+        /// The progress.
+        /// </param>
+        public void DownloadFile(string url, Action<DownloadStatus> completed, Action<DownloadStatus> progress)
+        {
+            ThreadPool.QueueUserWorkItem(
+               delegate
+               {
+                   string tempPath = Path.Combine(Path.GetTempPath(), "handbrake-setup.exe");
+                   WebClient wcDownload = new WebClient();
+
+                   try
+                   {
+                       if (File.Exists(tempPath))
+                           File.Delete(tempPath);
+
+                       HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
+                       webRequest.Credentials = CredentialCache.DefaultCredentials;
+                       HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
+                       long fileSize = webResponse.ContentLength;
+
+                       Stream responceStream = wcDownload.OpenRead(url);
+                       Stream localStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);
+
+                       int bytesSize;
+                       byte[] downBuffer = new byte[2048];
+
+                       long flength = 0;
+                       while ((bytesSize = responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)
+                       {
+                           localStream.Write(downBuffer, 0, bytesSize);
+                           flength = localStream.Length;
+                           progress(new DownloadStatus { BytesRead = localStream.Length, TotalBytes = fileSize});
+                       }
+
+                       responceStream.Close();
+                       localStream.Close();
+
+                       completed(
+                           flength != fileSize
+                               ? new DownloadStatus
+                                   {
+                                       WasSuccessful = false,
+                                       Message = "Partial Download. File is Incomplete. Please Retry the download."
+                                   }
+                               : new DownloadStatus { WasSuccessful = true, Message = "Download Complete." });
+                   }
+                   catch (Exception exc)
+                   {
+                       progress(new DownloadStatus { WasSuccessful = false, Exception = exc, Message = "Download Failed." });
+                   }
+               });
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Settings.StyleCop -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Settings.StyleCop Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs Changed

@@ -21,6 +21,10 @@
     using Castle.Windsor;
 
     using HandBrake.ApplicationServices;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    using HandBrakeWPF.Commands;
+    using HandBrakeWPF.Commands.Interfaces;
 
     using ViewModels;
     using ViewModels.Interfaces;
@@ -31,7 +35,7 @@
     /// <summary>
     /// The Castle Bootstrapper
     /// </summary>
-    public class CastleBootstrapper : Bootstrapper<IMainViewModel>
+    public class CastleBootstrapper : Bootstrapper<IShellViewModel>
     {
         /// <summary>
         /// The Windsor Container
@@ -51,22 +55,36 @@
             this.windsorContainer.Register(Component.For<IWindsorInstaller>().ImplementedBy<ServicesWindsorInstaller>());
             this.windsorContainer.Install(windsorContainer.ResolveAll<IWindsorInstaller>());
 
+            // Services
+            this.windsorContainer.Register(Component.For<IUpdateService>().ImplementedBy<UpdateService>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IDriveDetectService>().ImplementedBy<DriveDetectService>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IScanServiceWrapper>().ImplementedBy<ScanServiceWrapper>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IEncodeServiceWrapper>().ImplementedBy<EncodeServiceWrapper>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<INotificationService>().ImplementedBy<NotificationService>().LifeStyle.Is(LifestyleType.Singleton));
+
+            // Commands
+            this.windsorContainer.Register(Component.For<IAdvancedEncoderOptionsCommand>().ImplementedBy<AdvancedEncoderOptionsCommand>().LifeStyle.Is(LifestyleType.Singleton));
+
             // Shell
             this.windsorContainer.Register(Component.For<IErrorService>().ImplementedBy<ErrorService>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IErrorViewModel>().ImplementedBy<ErrorViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IMainViewModel>().ImplementedBy<MainViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IShellViewModel>().ImplementedBy<ShellViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IQueueViewModel>().ImplementedBy<QueueViewModel>().LifeStyle.Is(LifestyleType.Singleton));
-            this.windsorContainer.Register(Component.For<IAddPresetViewModel>().ImplementedBy<AddPresetViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IAddPresetViewModel>().ImplementedBy<AddPresetViewModel>().LifeStyle.Is(LifestyleType.Transient));
             this.windsorContainer.Register(Component.For<IPreviewViewModel>().ImplementedBy<PreviewViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<ILogViewModel>().ImplementedBy<LogViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IAboutViewModel>().ImplementedBy<AboutViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IOptionsViewModel>().ImplementedBy<OptionsViewModel>().LifeStyle.Is(LifestyleType.Singleton));
-            this.windsorContainer.Register(Component.For<IUpdateVersionService>().ImplementedBy<UpdateVersionService>().LifeStyle.Is(LifestyleType.Singleton));
-            this.windsorContainer.Register(Component.For<IJobContextService>().ImplementedBy<JobContextService>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<ITitleSpecificViewModel>().ImplementedBy<TitleSpecificViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IQueueSelectionViewModel>().ImplementedBy<QueueSelectionViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+            
 
             // Tab Components
             this.windsorContainer.Register(Component.For<IAudioViewModel>().ImplementedBy<AudioViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IX264ViewModel>().ImplementedBy<X264ViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IAdvancedViewModel>().ImplementedBy<AdvancedViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+            this.windsorContainer.Register(Component.For<IEncoderOptionsViewModel>().ImplementedBy<EncoderOptionsViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IPictureSettingsViewModel>().ImplementedBy<PictureSettingsViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<IChaptersViewModel>().ImplementedBy<ChaptersViewModel>().LifeStyle.Is(LifestyleType.Singleton));
             this.windsorContainer.Register(Component.For<ISubtitlesViewModel>().ImplementedBy<SubtitlesViewModel>().LifeStyle.Is(LifestyleType.Singleton));

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/UserSettingConstants.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/UserSettingConstants.cs Changed

@@ -14,39 +14,193 @@
     /// </summary>
     public class UserSettingConstants
     {
-        public const string UpdateStatus = "updateStatus";
-        public const string TooltipEnable = "tooltipEnable";
-        public const string Skipversion = "skipversion";
-        public const string AutoNaming = "autoNaming";
-        public const string AutoNamePath = "autoNamePath";
-        public const string Appcast_i686 = "appcast_i686";
-        public const string Appcast_x64 = "appcast_x64";
+        #region Constants and Fields
+
+        /// <summary>
+        /// Add Only One Per Langage
+        /// </summary>
+        public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";
+
+        /// <summary>
+        /// Auto name format
+        /// </summary>
         public const string AutoNameFormat = "autoNameFormat";
-        public const string VLC_Path = "VLC_Path";
-        public const string MainWindowMinimize = "MainWindowMinimize";
-        public const string QueryEditorTab = "QueryEditorTab";
-        public const string PresetNotification = "presetNotification";
-        public const string TrayIconAlerts = "trayIconAlerts";
-        public const string LastUpdateCheckDate = "lastUpdateCheckDate";
-        public const string DaysBetweenUpdateCheck = "daysBetweenUpdateCheck";
-        public const string UseM4v = "useM4v";
-        public const string PromptOnUnmatchingQueries = "PromptOnUnmatchingQueries";
-        public const string NativeLanguage = "NativeLanguage";
-        public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
-        public const string DubMode = "DubMode";
-        public const string ClearOldLogs = "clearOldLogs";
-        public const string AutoNameTitleCase = "AutoNameTitleCase";
+
+        /// <summary>
+        /// Autoname path
+        /// </summary>
+        public const string AutoNamePath = "autoNamePath";
+
+        /// <summary>
+        /// Auto Name Remove underscore
+        /// </summary>
         public const string AutoNameRemoveUnderscore = "AutoNameRemoveUnderscore";
-        public const string ActivityWindowLastMode = "ActivityWindowLastMode";
-        public const string UseClosedCaption = "useClosedCaption";
-        public const string BatchMinDuration = "batchMinDuration";
-        public const string BatchMaxDuration = "batchMaxDuration";
+
+        /// <summary>
+        /// Auto Name Title Case
+        /// </summary>
+        public const string AutoNameTitleCase = "AutoNameTitleCase";
+
+        /// <summary>
+        /// Auto Naming
+        /// </summary>
+        public const string AutoNaming = "autoNaming";
+
+        /// <summary>
+        /// Clear old logs
+        /// </summary>
+        public const string ClearOldLogs = "clearOldLogs";
+
+        /// <summary>
+        /// Update check interval
+        /// </summary>
+        public const string DaysBetweenUpdateCheck = "daysBetweenUpdateCheck";
+
+        /// <summary>
+        /// Use Default Player
+        /// </summary>
         public const string DefaultPlayer = "defaultPlayer";
-        public const string SelectedLanguages = "SelectedLanguages";
+
+        /// <summary>
+        /// Dub mode
+        /// </summary>
+        public const string DubMode = "DubMode";
+
+        /// <summary>
+        /// Dub Mode Audio
+        /// </summary>
         public const string DubModeAudio = "DubModeAudio";
+
+        /// <summary>
+        /// Dub Mode Subs
+        /// </summary>
         public const string DubModeSubtitle = "DubModeSubtitle";
-        public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";
+
+        /// <summary>
+        /// Last Update Check
+        /// </summary>
+        public const string LastUpdateCheckDate = "lastUpdateCheckDate";
+
+        /// <summary>
+        /// Main Window Minimise
+        /// </summary>
+        public const string MainWindowMinimize = "MainWindowMinimize";
+
+        /// <summary>
+        /// Min Title Length
+        /// </summary>
         public const string MinTitleLength = "MinTitleLength";
+
+        /// <summary>
+        /// Native Language Audio
+        /// </summary>
+        public const string NativeLanguage = "NativeLanguage";
+
+        /// <summary>
+        /// Native Language Subs
+        /// </summary>
+        public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
+
+        /// <summary>
+        /// Preset Notification
+        /// </summary>
+        public const string PresetNotification = "presetNotification";
+
+        /// <summary>
+        /// Selected Languages
+        /// </summary>
+        public const string SelectedLanguages = "SelectedLanguages";
+
+        /// <summary>
+        /// AUudio Passthru
+        /// </summary>
         public const string ShowAdvancedAudioPassthruOpts = "ShowAdvancedAudioPassthruOpts";
+
+        /// <summary>
+        /// Skip Version
+        /// </summary>
+        public const string Skipversion = "skipversion";
+
+        /// <summary>
+        /// Update Status
+        /// </summary>
+        public const string UpdateStatus = "updateStatus";
+
+        /// <summary>
+        /// Closed Captions
+        /// </summary>
+        public const string UseClosedCaption = "useClosedCaption";
+
+        /// <summary>
+        /// Use m4v
+        /// </summary>
+        public const string UseM4v = "useM4v";
+
+        /// <summary>
+        /// Vlc Path
+        /// </summary>
+        public const string VLC_Path = "VLC_Path";
+
+        /// <summary>
+        /// The enable process isolation.
+        /// </summary>
+        public const string EnableProcessIsolation = "EnableProcessIsolation";
+
+        /// <summary>
+        /// The server port.
+        /// </summary>
+        public const string ServerPort = "ServerPort";
+
+        /// <summary>
+        /// Enable Debugging features within the GUI.
+        /// </summary>
+        public const string EnableDebugFeatures = "EnableDebugFeatures";
+
+        /// <summary>
+        /// Enable the use of LibHb instead of HandBrakeCLI
+        /// </summary>
+        public const string EnableLibHb = "EnableLibHb";
+
+        /// <summary>
+        /// Growl Encodes
+        /// </summary>
+        public const string GrowlEncode = "GrowlEncode";
+
+        /// <summary>
+        /// Growl Queues
+        /// </summary>
+        public const string GrowlQueue = "GrowlQueue";
+
+        /// <summary>
+        /// HandBrakes CLI Exe SHA1 Hash
+        /// </summary>
+        public const string HandBrakeExeHash = "HandBrakeExeHash";
+
+        /// <summary>
+        /// The Instance Id
+        /// </summary>
+        public const string InstanceId = "InstanceId";
+
+        /// <summary>
+        /// The X264 Stepper 
+        /// </summary>
+        public const string X264Step = "X264Step";
+
+        /// <summary>
+        /// The show advanced tab.
+        /// </summary>
+        public const string ShowAdvancedTab = "ShowAdvancedTab";
+
+        /// <summary>
+        /// The last preview duration
+        /// </summary>
+        public const string LastPreviewDuration = "LastPreviewDuration";
+
+        /// <summary>
+        /// Disable LibHb Features
+        /// </summary>
+        public const string DisableLibHbFeatures = "DisableLibHbFeatures";
+
+        #endregion
     }
-}
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs Changed

@@ -9,31 +9,19 @@
 
 namespace HandBrakeWPF.ViewModels
 {
-    using System.ComponentModel.Composition;
-
-    using Caliburn.Micro;
-
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
 
     using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
     /// The About View Model
     /// </summary>
-    [Export(typeof(IAboutViewModel))]
     public class AboutViewModel : ViewModelBase, IAboutViewModel
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AboutViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
-        /// <param name="userSettingService">
-        /// The user Setting Service.
-        /// </param>
-        public AboutViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        public AboutViewModel()
         {
             this.Title = "About HandBrake";
         }
@@ -45,12 +33,7 @@
         {
             get
             {
-                string nightly = UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion).Contains("svn") ? " (SVN / Nightly Build)" : string.Empty;
-                return string.Format(
-                    "{0} ({1}) {2}",
-                    UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),
-                    UserSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),
-                    nightly);
+                return string.Format("{0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion());
             }
         }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs Changed

@@ -9,12 +9,11 @@
 
 namespace HandBrakeWPF.ViewModels
 {
-    using System.ComponentModel.Composition;
+    using System.Collections.Generic;
     using System.Windows;
 
-    using Caliburn.Micro;
-
     using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Services;
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
 
@@ -24,9 +23,10 @@
     /// <summary>
     /// The Add Preset View Model
     /// </summary>
-    [Export(typeof(IAddPresetViewModel))]
     public class AddPresetViewModel : ViewModelBase, IAddPresetViewModel
     {
+        /* TODO this window is up for redesign. Quite a few nippy edge cases that can cause odd behaviour with importing presets. */
+
         /// <summary>
         /// Backing field for the Preset Service
         /// </summary>
@@ -38,31 +38,86 @@
         private readonly IErrorService errorService;
 
         /// <summary>
+        /// Backing fields for Selected Picture settings mode.
+        /// </summary>
+        private PresetPictureSettingsMode selectedPictureSettingMode;
+
+        /// <summary>
+        /// Backging field for show custom inputs
+        /// </summary>
+        private bool showCustomInputs;
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="AddPresetViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
         /// <param name="presetService">
         /// The Preset Service
         /// </param>
         /// <param name="errorService">
         /// The Error Service
         /// </param>
-        public AddPresetViewModel(IWindowManager windowManager, IPresetService presetService, IErrorService errorService)
+        public AddPresetViewModel(IPresetService presetService, IErrorService errorService)
         {
             this.presetService = presetService;
             this.errorService = errorService;
             this.Title = "Add Preset";
-            this.Preset = new Preset {IsBuildIn = false, IsDefault = false, Category = "User Presets"};
+            this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName, UsePictureFilters = true};
+            this.PictureSettingsModes = EnumHelper<PresetPictureSettingsMode>.GetEnumList();
         }
 
         /// <summary>
-        /// Gets or sets the Preset
+        /// Gets the Preset
         /// </summary>
         public Preset Preset { get; private set; }
 
         /// <summary>
+        /// Gets or sets PictureSettingsModes.
+        /// </summary>
+        public IEnumerable<PresetPictureSettingsMode> PictureSettingsModes { get; set; }
+
+        /// <summary>
+        /// Gets or sets CustomWidth.
+        /// </summary>
+        public int CustomWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets CustomHeight.
+        /// </summary>
+        public int CustomHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ShowCustomInputs.
+        /// </summary>
+        public bool ShowCustomInputs
+        {
+            get
+            {
+                return this.showCustomInputs;
+            }
+            set
+            {
+                this.showCustomInputs = value;
+                this.NotifyOfPropertyChange(() => this.ShowCustomInputs);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets SelectedPictureSettingMode.
+        /// </summary>
+        public PresetPictureSettingsMode SelectedPictureSettingMode
+        {
+            get
+            {
+                return this.selectedPictureSettingMode;
+            }
+            set
+            {
+                this.selectedPictureSettingMode = value;
+                this.ShowCustomInputs = value == PresetPictureSettingsMode.Custom;
+            }
+        }
+
+        /// <summary>
         /// Prepare the Preset window to create a Preset Object later.
         /// </summary>
         /// <param name="task">
@@ -70,11 +125,7 @@
         /// </param>
         public void Setup(EncodeTask task)
         {
-            task.UsesPictureFilters = this.Preset.UsePictureFilters;
-            task.UsesMaxPictureSettings = false; // TODO
-            task.UsesPictureSettings = false; // TODO
-            this.Preset.Task = task;
-            this.Preset.Query = QueryGeneratorUtility.GenerateQuery(task);
+            this.Preset.Task = new EncodeTask(task);
         }
 
         /// <summary>
@@ -90,10 +141,44 @@
 
             if (this.presetService.CheckIfPresetExists(this.Preset.Name))
             {
-                this.errorService.ShowMessageBox("A Preset with this name already exists. Please choose a new name", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+               MessageBoxResult result = this.errorService.ShowMessageBox("A Preset with this name already exists. Would you like to overwrite it?", "Error", MessageBoxButton.YesNo, MessageBoxImage.Error);
+               if (result == MessageBoxResult.No)
+               {
+                   return;
+               }
+            }
+
+            if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum && (this.Preset.Task.Width == null || this.Preset.Task.Width == 0))
+            {
+                this.errorService.ShowMessageBox("You must first scan a source to use the 'Source Maximum' Option.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
 
+            this.Preset.UsePictureFilters = this.Preset.UsePictureFilters;
+            this.Preset.PictureSettingsMode = this.SelectedPictureSettingMode;
+
+            // Setting W, H, MW and MH
+            if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.None)
+            {
+                this.Preset.Task.MaxHeight = null;
+                this.Preset.Task.MaxWidth = null;
+            }
+
+            if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.Custom)
+            {
+                this.Preset.Task.MaxWidth = this.CustomWidth;
+                this.Preset.Task.MaxHeight = this.CustomHeight;
+                this.Preset.Task.Width = null;
+                this.Preset.Task.Height = null;
+            }
+
+            if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum)
+            {
+                this.Preset.Task.MaxWidth = this.Preset.Task.Width;
+                this.Preset.Task.MaxHeight = this.Preset.Task.Height;
+            }
+
+            // Add the Preset
             bool added = this.presetService.Add(this.Preset);
             if (!added)
             {
@@ -106,6 +191,9 @@
             }
         }
 
+        /// <summary>
+        /// Cancel adding a preset
+        /// </summary>
         public void Cancel()
         {
             this.Close();

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs Changed

@@ -9,238 +9,156 @@
 
 namespace HandBrakeWPF.ViewModels
 {
-    using System.Collections.Generic;
-    using System.ComponentModel.Composition;
-
-    using Caliburn.Micro;
-
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.Interop.Model.Encoding;
-    using HandBrake.Interop.Model.Encoding.x264;
 
     using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
     /// The Advanced View Model
     /// </summary>
-    [Export(typeof(IAdvancedViewModel))]
     public class AdvancedViewModel : ViewModelBase, IAdvancedViewModel
     {
         #region Constants and Fields
 
         /// <summary>
-        /// The query.
-        /// </summary>
-        private string query;
-
-        /// <summary>
-        /// The x264 preset.
-        /// </summary>
-        private x264Preset x264Preset;
-
-        /// <summary>
-        /// The x264 profile.
-        /// </summary>
-        private x264Profile x264Profile;
-
-        /// <summary>
-        /// The x264 tune.
+        /// Backing field for displaying x264 options
         /// </summary>
-        private x264Tune x264Tune;
+        private bool? displayX264Options;
 
         /// <summary>
-        /// Backing field used to display / hide the x264 options
+        /// The show x 264 panel.
         /// </summary>
-        private bool displayX264Options;
+        private bool showX264Panel;
 
         #endregion
 
-        #region Constructors and Destructors
+        #region Properties
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AdvancedViewModel"/> class.
+        /// Gets or sets the x 264 view model.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
-        /// <param name="userSettingService">
-        /// The user Setting Service.
-        /// </param>
-        public AdvancedViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
-        {
-            X264Presets = EnumHelper<x264Preset>.GetEnumList();
-            X264Profiles = EnumHelper<x264Profile>.GetEnumList();
-            X264Tunes = EnumHelper<x264Tune>.GetEnumList();
-
-            this.x264Preset = x264Preset.None;
-            this.x264Profile = x264Profile.None;
-            this.x264Tune = x264Tune.None;
-        }
-
-        #endregion
-
-        #region Public Properties
+        public IX264ViewModel X264ViewModel { get; set; }
 
         /// <summary>
-        /// Gets or sets State.
+        /// Gets or sets the encoder options view model.
         /// </summary>
-        public string Query
-        {
-            get
-            {
-                return this.query;
-            }
-            set
-            {
-                this.query = value;
-                this.NotifyOfPropertyChange(() => this.Query);
-            }
-        }
+        public IEncoderOptionsViewModel EncoderOptionsViewModel { get; set; }
 
         /// <summary>
-        /// Gets or sets X264Preset.
+        /// Gets or sets a value indicating whether show x 264 panel.
         /// </summary>
-        public x264Preset X264Preset
+        public bool ShowX264Panel
         {
             get
             {
-                return this.x264Preset;
+                return this.showX264Panel;
             }
             set
             {
-                this.x264Preset = value;
-                this.NotifyOfPropertyChange(() => this.X264Preset);
+                this.showX264Panel = value;
+                this.NotifyOfPropertyChange(() => this.ShowX264Panel);
             }
         }
 
         /// <summary>
-        /// Gets or sets X264Profile.
+        /// Gets or sets a value indicating whether DisplayX264Options.
         /// </summary>
-        public x264Profile X264Profile
+        public bool? ShowSimplePanel
         {
             get
             {
-                return this.x264Profile;
+                return this.displayX264Options;
             }
             set
             {
-                this.x264Profile = value;
-                this.NotifyOfPropertyChange(() => this.X264Profile);
+                this.displayX264Options = value;
+                this.NotifyOfPropertyChange(() => this.ShowSimplePanel);
             }
         }
 
+        #endregion
+
+        #region Implemented Interfaces
+
         /// <summary>
-        /// Gets or sets X264Tune.
+        /// The set encoder.
         /// </summary>
-        public x264Tune X264Tune
+        /// <param name="encoder">
+        /// The encoder.
+        /// </param>
+        public void SetEncoder(VideoEncoder encoder)
         {
-            get
+            this.EncoderOptionsViewModel.SetEncoder(encoder);
+            this.X264ViewModel.SetEncoder(encoder);
+
+            if (encoder == VideoEncoder.X264)
             {
-                return this.x264Tune;
+                this.ShowX264Panel = true;
+                this.ShowSimplePanel = false;
             }
-            set
+            else
             {
-                this.x264Tune = value;
-                this.NotifyOfPropertyChange(() => this.X264Tune);
-            }
+                this.ShowX264Panel = false;
+                this.ShowSimplePanel = true;
+            }  
         }
 
         /// <summary>
-        /// Gets or sets X264Presets.
-        /// </summary>
-        public IEnumerable<x264Preset> X264Presets { get; set; }
-
-        /// <summary>
-        /// Gets or sets X264Profiles.
-        /// </summary>
-        public IEnumerable<x264Profile> X264Profiles { get; set; }
-
-        /// <summary>
-        /// Gets or sets X264Tunes.
-        /// </summary>
-        public IEnumerable<x264Tune> X264Tunes { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether DisplayX264Options.
+        /// The clear.
         /// </summary>
-        public bool DisplayX264Options
+        public void Clear()
         {
-            get
-            {
-                return this.displayX264Options;
-            }
-            set
-            {
-                this.displayX264Options = value;
-                this.NotifyOfPropertyChange(() => this.DisplayX264Options);
-            }
+            this.EncoderOptionsViewModel.Clear();
+            this.X264ViewModel.Clear();
         }
 
-        #endregion
-
-        #region Public Methods
-
         /// <summary>
-        /// Setup this window for a new source
+        /// Setup this tab for the specified preset.
         /// </summary>
-        /// <param name="title">
-        /// The title.
-        /// </param>
         /// <param name="preset">
         /// The preset.
         /// </param>
         /// <param name="task">
         /// The task.
         /// </param>
-        public void SetSource(Title title, Preset preset, EncodeTask task)
+        public void SetPreset(Preset preset, EncodeTask task)
         {
-            this.Query = preset.Task.AdvancedEncoderOptions;
-            this.X264Preset = preset.Task.x264Preset;
-            this.X264Profile = preset.Task.x264Profile;
-            this.X264Tune = preset.Task.X264Tune;
+            this.EncoderOptionsViewModel.SetPreset(preset, task);
+            this.X264ViewModel.SetPreset(preset, task);
         }
 
         /// <summary>
-        /// Setup this tab for the specified preset.
+        /// Update all the UI controls based on the encode task passed in.
         /// </summary>
-        /// <param name="preset">
-        /// The preset.
+        /// <param name="task">
+        /// The task.
         /// </param>
-        public void SetPreset(Preset preset)
+        public void UpdateTask(EncodeTask task)
         {
-            if (preset != null && preset.Task != null)
-            {
-                this.Query = preset.Task.AdvancedEncoderOptions;
-                this.SetEncoder(preset.Task.VideoEncoder);
+            this.EncoderOptionsViewModel.UpdateTask(task);
+            this.X264ViewModel.UpdateTask(task);
 
-                this.X264Preset = preset.Task.x264Preset;
-                this.X264Profile = preset.Task.x264Profile;
-                this.X264Tune = preset.Task.X264Tune;
-            }
+            this.SetEncoder(task.VideoEncoder);
         }
 
         /// <summary>
-        /// Set the currently selected encoder.
+        /// Setup this window for a new source
         /// </summary>
-        /// <param name="encoder">
-        /// The Video Encoder.
+        /// <param name="title">
+        /// The title.
         /// </param>
-        public void SetEncoder(VideoEncoder encoder)
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetSource(Title title, Preset preset, EncodeTask task)
         {
-            if (encoder == VideoEncoder.X264)
-            {
-                this.DisplayX264Options = true;
-            }
-            else
-            {
-                this.x264Preset = x264Preset.None;
-                this.x264Profile = x264Profile.None;
-                this.x264Tune = x264Tune.None;
-                this.DisplayX264Options = false;
-            }
+            this.EncoderOptionsViewModel.SetSource(title, preset, task);
+            this.X264ViewModel.SetSource(title, preset, task);
         }
 
         #endregion

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs Changed

@@ -9,29 +9,40 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
-    using System.ComponentModel.Composition;
+    using System.Collections.Specialized;
     using System.Linq;
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop.Model.Encoding;
 
+    using HandBrakeWPF.Commands;
+    using HandBrakeWPF.Model;
     using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
     /// The Audio View Model
     /// </summary>
-    [Export(typeof(IAudioViewModel))]
     public class AudioViewModel : ViewModelBase, IAudioViewModel
     {
         /// <summary>
+        /// Backing field for the source tracks list.
+        /// </summary>
+        private IEnumerable<Audio> sourceTracks;
+
+        private Preset currentPreset;
+
+        #region Constructors and Destructors
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="AudioViewModel"/> class.
         /// </summary>
         /// <param name="windowManager">
@@ -42,22 +53,21 @@
         /// </param>
         public AudioViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
         {
-            this.AudioTracks = new ObservableCollection<AudioTrack>();
-            this.SampleRates = new ObservableCollection<string> { "Auto", "48", "44.1", "32", "24", "22.05" };
-            this.AudioBitrates = this.GetAppropiateBitrates(AudioEncoder.ffaac, Mixdown.DolbyProLogicII);
+            this.Task = new EncodeTask();
+            this.SampleRates = new ObservableCollection<string> { "Auto", "48", "44.1", "32", "24", "22.05", "16", "12", "11.025", "8" };
             this.AudioEncoders = EnumHelper<AudioEncoder>.GetEnumList();
             this.AudioMixdowns = EnumHelper<Mixdown>.GetEnumList();
+            this.SourceTracks = new List<Audio>();
         }
 
-        /// <summary>
-        /// Gets or sets AudioTracks.
-        /// </summary>
-        public ObservableCollection<AudioTrack> AudioTracks { get; set; }
+        #endregion
+
+        #region Properties
 
         /// <summary>
-        /// Gets or sets SourceTracks.
+        /// Gets or sets AudioBitrates.
         /// </summary>
-        public IEnumerable<Audio> SourceTracks { get; set; }
+        public IEnumerable<int> AudioBitrates { get; set; }
 
         /// <summary>
         /// Gets or sets AudioEncoders.
@@ -75,25 +85,58 @@
         public IEnumerable<string> SampleRates { get; set; }
 
         /// <summary>
-        /// Gets or sets AudioBitrates.
+        /// Gets or sets SourceTracks.
         /// </summary>
-        public IEnumerable<int> AudioBitrates { get; set; }
+        public IEnumerable<Audio> SourceTracks
+        {
+            get
+            {
+                return this.sourceTracks;
+            }
+            set
+            {
+                this.sourceTracks = value;
+                this.NotifyOfPropertyChange(() => this.SourceTracks);
+            }
+        }
 
         /// <summary>
-        /// Add an Audio Track
+        /// Gets or sets the EncodeTask.
         /// </summary>
-        public void Add()
+        public EncodeTask Task { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether ShowPassthruOptions.
+        /// </summary>
+        public bool ShowPassthruOptions
         {
-            if (SourceTracks != null)
+            get
             {
-                Audio track = this.SourceTracks.FirstOrDefault();
-                if (track != null)
-                {
-                    this.AudioTracks.Add(new AudioTrack { ScannedTrack = track });
-                }
+                return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
             }
         }
 
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Add an Audio Track
+        /// </summary>
+        public void Add()
+        {
+            // Add the first track if available.
+            this.Add(null);
+        }
+
+        /// <summary>
+        /// The add all remaining.
+        /// </summary>
+        public void AddAllRemaining()
+        {
+            this.AddAllRemainingTracks();
+        }
+
         /// <summary>
         /// Remove the Selected Track
         /// </summary>
@@ -102,7 +145,81 @@
         /// </param>
         public void Remove(AudioTrack track)
         {
-            this.AudioTracks.Remove(track);
+            this.Task.AudioTracks.Remove(track);
+        }
+
+        /// <summary>
+        /// Clear out the Audio Tracks
+        /// </summary>
+        public void Clear()
+        {
+            this.Task.AudioTracks.Clear();
+        }
+
+        /// <summary>
+        /// Trigger a Notify Property Changed on the Task to force various UI elements to update.
+        /// </summary>
+        public void RefreshTask()
+        {
+            this.NotifyOfPropertyChange(() => this.Task);
+
+            if (Task.OutputFormat == OutputFormat.Mp4)
+            {
+                foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.Vorbis))
+                {
+                    track.Encoder = AudioEncoder.ffaac;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Open the options screen to the Audio and Subtitles tab.
+        /// </summary>
+        public void SetDefaultBehaviour()
+        {
+            OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
+            command.Execute(OptionsTab.AudioAndSubtitles);
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region ITabInterface
+
+        /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
+        {
+            this.Task = task;
+            this.currentPreset = preset;
+
+            if (preset != null && preset.Task != null)
+            {
+                this.AddTracksFromPreset(preset);
+                this.Task.AllowedPassthruOptions = new AllowedPassthru(preset.Task.AllowedPassthruOptions);
+            }
+            this.NotifyOfPropertyChange(() => this.Task);
+        }
+
+        /// <summary>
+        /// Update all the UI controls based on the encode task passed in.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
+        {
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => Task.AudioTracks);
+            this.NotifyOfPropertyChange(() => this.Task);
         }
 
         /// <summary>
@@ -120,63 +237,213 @@
         public void SetSource(Title title, Preset preset, EncodeTask task)
         {
             this.SourceTracks = title.AudioTracks;
+
+            // Only reset the audio tracks if we have none, or if the task is null.
+            if (this.Task == null || this.Task.AudioTracks.Count == 0)
+            {
+                this.SetPreset(preset, task);
+            }
+
+            // If there are no source tracks, clear the list, otherwise try to Auto-Select the correct tracks
+            if (this.SourceTracks == null || !this.SourceTracks.Any())
+            {
+                this.Task.AudioTracks.Clear();
+            }
+            else
+            {
+                this.AutomaticTrackSelection();
+            }
+
+            // Force UI Updates
+            this.NotifyOfPropertyChange(() => this.Task);
         }
 
+        #endregion
+
+        #endregion
+
+        #region Methods
+
         /// <summary>
-        /// Setup this tab for the specified preset.
+        /// Add the specified source track, or the first track in the SourceTracks collection if available.
         /// </summary>
-        /// <param name="preset">
-        /// The preset.
+        /// <param name="sourceTrack">
+        /// The source track.
         /// </param>
-        public void SetPreset(Preset preset)
+        private void Add(Audio sourceTrack)
         {
-            if (preset != null && preset.Task != null)
-            {   
-                // Store the previously selected tracks
-                List<Audio> selectedTracks = this.AudioTracks.Select(track => track.ScannedTrack).ToList();
-                this.AudioTracks.Clear();
-                
-                // Add the tracks from the preset
-                foreach (AudioTrack track in preset.Task.AudioTracks)
+            if (this.SourceTracks != null)
+            {
+                Audio track = sourceTrack ?? this.GetPreferredAudioTrack();
+                if (track != null)
+                {
+                    this.Task.AudioTracks.Add(new AudioTrack { ScannedTrack = track });
+                }
+            }
+        }
+
+        /// <summary>
+        /// Add all source tracks that don't currently exist on the list.
+        /// </summary>
+        private void AddAllRemainingTracks()
+        {
+            // For all the source audio tracks
+            foreach (Audio sourceTrack in this.SourceTracks)
+            {
+                // Step 1:  If "Add only One per language" is turned on, check to see if this language is already added.
+                if (this.CanSkipSourceTrack(sourceTrack))
+                {
+                    continue;
+                }
+
+                // Step 2: Check if the track list already contrains this track
+                bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
+                if (!found)
+                {
+                    // If it doesn't, add it.
+                    this.Add(sourceTrack);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Add all remaining for selected languages.
+        /// </summary>
+        public void AddAllRemainingForSelectedLanguages()
+        {
+            // Add them if they are not already added.
+            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
+            {
+                // Step 1:  If "Add only One per language" is turned on, check to see if this language is already added.
+                if (this.CanSkipSourceTrack(sourceTrack))
                 {
-                    this.AudioTracks.Add(new AudioTrack(track));
+                    continue;
                 }
 
-                // Attempt to restore the previously selected tracks.
-                // or fallback to the first source track.
-                foreach (AudioTrack track in this.AudioTracks)
+                // Step 2: Check if the track list already contrains this track
+                bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
+                if (!found)
                 {
-                    if (selectedTracks.Count != 0)
-                    {
-                        track.ScannedTrack = selectedTracks[0];
-                        selectedTracks.RemoveAt(0);
-                    } 
-                    else
-                    {
-                        if (this.SourceTracks != null)
-                        {
-                            track.ScannedTrack = this.SourceTracks.FirstOrDefault();
-                        }
-                    }
+                    // If it doesn't, add it.
+                    this.Add(sourceTrack);
                 }
             }
         }
 
         /// <summary>
-        /// Get Appropiate Bitrates for the selected encoder and mixdown.
+        /// Add the required tracks for the current preset
         /// </summary>
-        /// <param name="encoder">
-        /// The encoder.
+        /// <param name="preset">
+        /// The preset.
         /// </param>
-        /// <param name="mixdown">
-        /// The mixdown.
+        private void AddTracksFromPreset(Preset preset)
+        {
+            // Clear out the old tracks
+            this.Task.AudioTracks.Clear();
+
+            // Add the preset audio tracks with the preferred language
+            foreach (AudioTrack track in preset.Task.AudioTracks)
+            {
+                this.Task.AudioTracks.Add(new AudioTrack(track) { ScannedTrack = this.GetPreferredAudioTrack() });
+            }
+        }
+
+        /// <summary>
+        /// Attempt to automatically select the correct audio tracks based on the users settings.
+        /// </summary>
+        private void AutomaticTrackSelection()
+        {
+            if (!this.SourceTracks.Any())
+            {
+                // Clear out the old tracks
+                this.Task.AudioTracks.Clear();
+
+                return;
+            }
+
+            // We've changed source, so lets try reset the language, description and formats as close as possible to the previous track.
+            foreach (AudioTrack track in this.Task.AudioTracks)
+            {
+                track.ScannedTrack = this.GetPreferredAudioTrack();
+            }
+
+            // Handle the default selection behaviour.
+            int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
+            if (mode == 1 || mode == 2)
+            {
+                // First, we'll clear out all current tracks and go back to what the current preset has.
+                // This will alteast provide a consistent behavior when switching tracks.
+                this.Task.AudioTracks.Clear();
+                this.AddTracksFromPreset(this.currentPreset);
+            }
+
+            switch (mode)
+            {
+                case 1: // Adding all remaining audio tracks
+                    this.AddAllRemaining();
+                    break;
+                case 2: // Add Langauges tracks for the additional languages selected, in-order.
+                    this.AddAllRemainingForSelectedLanguages();
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// The get preferred audio track, or the first if none available.
+        /// </summary>
+        /// <returns>
+        /// The users preferred language, or the first if none available.
+        /// </returns>
+        private Audio GetPreferredAudioTrack()
+        {
+            // Get the preferred Language
+            IEnumerable<Audio> preferredAudioTracks =
+                this.SourceTracks.Where(
+                    item =>
+                    item.Language.Contains(
+                        this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage)));
+            return preferredAudioTracks.FirstOrDefault() ?? this.SourceTracks.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// Gets a list of source tracks for the users selected languages.
+        /// </summary>
+        /// <returns>
+        /// A list of source audio tracks.
+        /// </returns>
+        private IEnumerable<Audio> GetSelectedLanguagesTracks()
+        {
+            List<Audio> trackList = new List<Audio>();
+            foreach (string language in this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
+            {
+                trackList.AddRange(this.SourceTracks.Where(source => source.Language.Trim() == language));
+            }
+
+            return trackList;
+        }
+
+        /// <summary>
+        /// Checks to see if we can skip over the given source audio track.
+        /// True when the user has set "Add only one per language" feature AND the language is contained in the track list.
+        /// </summary>
+        /// <param name="sourceTrack">
+        /// The source track.
         /// </param>
         /// <returns>
-        /// A List of valid audio bitrates
+        /// True when the user has set "Add only one per language" feature AND the language is contained in the track list
         /// </returns>
-        private IEnumerable<int> GetAppropiateBitrates(AudioEncoder encoder, Mixdown mixdown)
+        private bool CanSkipSourceTrack(Audio sourceTrack)
         {
-            return new ObservableCollection<int> { 32, 40, 48, 56, 64, 80, 96, 112, 128, 160 };
+            bool addOnlyOnePerLanguage = this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);
+            bool sourceTrackLanguageFound = this.Task.AudioTracks.Any(audioTrack => audioTrack.ScannedTrack != null && sourceTrack.Language == audioTrack.ScannedTrack.Language);
+            if (addOnlyOnePerLanguage && sourceTrackLanguageFound)
+            {
+                return true; // This track can be skipped.
+            }
+
+            return false;
         }
+
+        #endregion
     }
-}
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs Changed

@@ -12,7 +12,6 @@
     using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
-    using System.ComponentModel.Composition;
     using System.IO;
 
     using Caliburn.Micro;
@@ -30,17 +29,12 @@
     /// <summary>
     /// The Chapters View Model
     /// </summary>
-    [Export(typeof(IChaptersViewModel))]
     public class ChaptersViewModel : ViewModelBase, IChaptersViewModel
     {
-        #region Constants and Fields
-
         /// <summary>
-        /// The include chapter markers.
+        /// The source chapters backing field
         /// </summary>
-        private bool includeChapterMarkers;
-
-        #endregion
+        private List<Chapter> sourceChaptersList; 
 
         #region Constructors and Destructors
 
@@ -55,17 +49,16 @@
         /// </param>
         public ChaptersViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
         {
-            this.Chapters = new ObservableCollection<ChapterMarker>();
+            this.Task = new EncodeTask();
         }
 
         #endregion
 
         #region Public Properties
-
         /// <summary>
-        /// Gets or sets State.
+        /// Gets or sets Task.
         /// </summary>
-        public ObservableCollection<ChapterMarker> Chapters { get; set; }
+        public EncodeTask Task { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether chapter markers are enabled.
@@ -74,11 +67,11 @@
         {
             get
             {
-                return this.includeChapterMarkers;
+                return this.Task.IncludeChapterMarkers;
             }
             set
             {
-                this.includeChapterMarkers = value;
+                this.Task.IncludeChapterMarkers = value;
                 this.NotifyOfPropertyChange(() => this.IncludeChapterMarkers);
             }
         }
@@ -129,7 +122,7 @@
             {
                 string csv = string.Empty;
 
-                foreach (ChapterMarker row in this.Chapters)
+                foreach (ChapterMarker row in this.Task.ChapterNames)
                 {
                     csv += row.ChapterNumber.ToString();
                     csv += ",";
@@ -188,13 +181,11 @@
             }
 
             // Now iterate over each chatper we have, and set it's name
-            foreach (ChapterMarker item in this.Chapters)
+            foreach (ChapterMarker item in this.Task.ChapterNames)
             {
                 string chapterName;
                 chapterMap.TryGetValue(item.ChapterNumber, out chapterName);
                 item.ChapterName = chapterName;
-
-                // TODO force a fresh of this property
             }
         }
 
@@ -212,7 +203,15 @@
         /// </param>
         public void SetSource(Title title, Preset preset, EncodeTask task)
         {
-            this.IncludeChapterMarkers = preset.Task.IncludeChapterMarkers;
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.Task);
+
+            if (preset != null)
+            {
+                this.IncludeChapterMarkers = preset.Task.IncludeChapterMarkers;
+            }
+
+            this.sourceChaptersList = title.Chapters;
             this.SetSourceChapters(title.Chapters);
         }
 
@@ -222,8 +221,39 @@
         /// <param name="preset">
         /// The preset.
         /// </param>
-        public void SetPreset(Preset preset)
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
+        {
+            this.Task = task;
+            this.Task.IncludeChapterMarkers = preset.Task.IncludeChapterMarkers;
+            this.NotifyOfPropertyChange(() => this.Task);
+        }
+
+        /// <summary>
+        /// Update all the UI controls based on the encode task passed in.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
+        {
+            this.Task = task;
+
+            this.NotifyOfPropertyChange(() => this.Task.IncludeChapterMarkers);
+            this.NotifyOfPropertyChange(() => this.Task.ChapterNames);
+        }
+
+        /// <summary>
+        /// Reset Chapter Names
+        /// </summary>
+        public void Reset()
         {
+            if (this.sourceChaptersList != null)
+            {
+                this.SetSourceChapters(this.sourceChaptersList);
+            }
         }
 
         /// <summary>
@@ -236,7 +266,7 @@
         {
             // Cache the chapters in this screen
             this.SourceChapterList = new ObservableCollection<Chapter>(sourceChapters);
-            this.Chapters.Clear();
+            this.Task.ChapterNames.Clear();
 
             // Then Add new Chapter Markers.
             int counter = 1;
@@ -244,8 +274,8 @@
             foreach (Chapter chapter in this.SourceChapterList)
             {
                 string chapterName = string.IsNullOrEmpty(chapter.ChapterName) ? string.Format("Chapter {0}", counter) : chapter.ChapterName;
-                var marker = new ChapterMarker(chapter.ChapterNumber, chapterName);
-                this.Chapters.Add(marker);
+                var marker = new ChapterMarker(chapter.ChapterNumber, chapterName, chapter.Duration);
+                this.Task.ChapterNames.Add(marker);
 
                 counter += 1;
             }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs Added

@@ -0,0 +1,155 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncoderOptionsViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Simple Encoder options screen
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+    using System.Collections.Generic;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Parsing;
+    using HandBrake.Interop.Model.Encoding;
+
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// The Simple Encoder options screen
+    /// </summary>
+    public class EncoderOptionsViewModel : ViewModelBase, IEncoderOptionsViewModel, ITabInterface
+    {
+        /// <summary>
+        /// The cached options.
+        /// </summary>
+        private readonly Dictionary<VideoEncoder, string> cachedOptions = new Dictionary<VideoEncoder, string>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncoderOptionsViewModel"/> class.
+        /// </summary>
+        public EncoderOptionsViewModel()
+        {
+            this.Task = new EncodeTask();
+        }
+
+        /// <summary>
+        /// Gets or sets the task.
+        /// </summary>
+        public EncodeTask Task { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preset.
+        /// </summary>
+        public Preset Preset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current video encoder.
+        /// </summary>
+        public VideoEncoder CurrentVideoEncoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the options string.
+        /// </summary>
+        public string AdvancedOptionsString
+        {
+            get
+            {
+                return this.Task.AdvancedEncoderOptions;
+            }
+            set
+            {
+                this.Task.AdvancedEncoderOptions = value;
+                this.NotifyOfPropertyChange(() => this.AdvancedOptionsString);
+            }
+        }
+
+        /// <summary>
+        /// The set source.
+        /// </summary>
+        /// <param name="selectedTitle">
+        /// The selected title.
+        /// </param>
+        /// <param name="currentPreset">
+        /// The current preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetSource(Title selectedTitle, Preset currentPreset, EncodeTask task)
+        {
+            this.Task = task;
+            this.Preset = currentPreset;
+            this.NotifyOfPropertyChange(() => this.AdvancedOptionsString);
+        }
+
+        /// <summary>
+        /// The set preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
+        {
+            this.Task = task;
+            this.Preset = preset;
+            this.AdvancedOptionsString = preset.Task.AdvancedEncoderOptions;
+        }
+
+        /// <summary>
+        /// The update task.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
+        {        
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.AdvancedOptionsString);
+        }
+
+        /// <summary>
+        /// The set encoder.
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder.
+        /// </param>
+        public void SetEncoder(VideoEncoder encoder)
+        {
+            // Cache the existing string so it can be reused if the user changes the encoder back.
+            if (!string.IsNullOrEmpty(this.AdvancedOptionsString))
+            {
+                this.cachedOptions[CurrentVideoEncoder] = this.AdvancedOptionsString;
+            }
+
+            this.CurrentVideoEncoder = encoder;
+
+            // Set the option from the cached version if we have one.
+            string advacnedOptionsString;
+            if (cachedOptions.TryGetValue(encoder, out advacnedOptionsString)
+                && !string.IsNullOrEmpty(advacnedOptionsString))
+            {
+                this.AdvancedOptionsString = advacnedOptionsString;
+            }
+            else
+            {
+                this.AdvancedOptionsString = this.Preset != null && this.Preset.Task != null
+                                             && !string.IsNullOrEmpty(this.Preset.Task.AdvancedEncoderOptions)
+                                                 ? this.Preset.Task.AdvancedEncoderOptions
+                                                 : string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// The clear.
+        /// </summary>
+        public void Clear()
+        {
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs Changed

@@ -10,14 +10,13 @@
 namespace HandBrakeWPF.ViewModels
 {
     using System.Collections.Generic;
-    using System.ComponentModel.Composition;
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop.Model.Encoding;
 
     using HandBrakeWPF.ViewModels.Interfaces;
@@ -25,91 +24,110 @@
     /// <summary>
     /// The Filters View Model
     /// </summary>
-    [Export(typeof(IFiltersViewModel))]
     public class FiltersViewModel : ViewModelBase, IFiltersViewModel
     {
-        #region Constants and Fields
+        #region Constructors and Destructors
 
         /// <summary>
-        /// Backing field for the deblock value
+        /// Initializes a new instance of the <see cref="FiltersViewModel"/> class.
         /// </summary>
-        private int deblockValue;
+        /// <param name="windowManager">
+        /// The window manager.
+        /// </param>
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        public FiltersViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        {
+            this.CurrentTask = new EncodeTask();
+            this.DeblockValue = 4; // OFF
+        }
 
-        /// <summary>
-        /// Backing field for the selected deinterlace value
-        /// </summary>
-        private Deinterlace selectedDeInterlace;
+        #endregion
 
-        /// <summary>
-        /// Backing field for the selected decomb value
-        /// </summary>
-        private Decomb selectedDecomb;
+        #region Properties
 
         /// <summary>
-        /// Backing field for the selected denoise value
+        /// Gets CurrentTask.
         /// </summary>
-        private Denoise selectedDenoise;
+        public EncodeTask CurrentTask { get; private set; }
 
         /// <summary>
-        /// Backing field for the selected detelecine value
+        /// Gets or sets CustomDecomb.
         /// </summary>
-        private Detelecine selectedDetelecine;
+        public string CustomDecomb
+        {
+            get
+            {
+                return this.CurrentTask.CustomDecomb;
+            }
 
-        /// <summary>
-        /// Backing field for the custom decomb value
-        /// </summary>
-        private string customDeinterlace;
+            set
+            {
+                this.CurrentTask.CustomDecomb = value;
+                this.NotifyOfPropertyChange(() => this.CustomDecomb);
+            }
+        }
 
         /// <summary>
-        /// Backing field for the custom debcomb value
+        /// Gets or sets CustomDeinterlace.
         /// </summary>
-        private string customDecomb;
+        public string CustomDeinterlace
+        {
+            get
+            {
+                return this.CurrentTask.CustomDeinterlace;
+            }
 
-        /// <summary>
-        /// Backing field for the custom detelecine value
-        /// </summary>
-        private string customDetelecine;
+            set
+            {
+                this.CurrentTask.CustomDeinterlace = value;
+                this.NotifyOfPropertyChange(() => this.CustomDeinterlace);
+            }
+        }
 
         /// <summary>
-        /// Backing field for the custom denoise value
+        /// Gets or sets CustomDenoise.
         /// </summary>
-        private string customDenoise;
-
-        #endregion
+        public string CustomDenoise
+        {
+            get
+            {
+                return this.CurrentTask.CustomDenoise;
+            }
 
-        #region Constructors and Destructors
+            set
+            {
+                this.CurrentTask.CustomDenoise = value;
+                this.NotifyOfPropertyChange(() => this.CustomDenoise);
+            }
+        }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="FiltersViewModel"/> class.
+        /// Gets or sets CustomDetelecine.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
-        /// <param name="userSettingService">
-        /// The user Setting Service.
-        /// </param>
-        public FiltersViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        public string CustomDetelecine
         {
-            this.CurrentTask = new EncodeTask();
-        }
-
-        #endregion
-
-        #region Properties
+            get
+            {
+                return this.CurrentTask.CustomDetelecine;
+            }
 
-        /// <summary>
-        /// Gets CurrentTask.
-        /// </summary>
-        public EncodeTask CurrentTask { get; private set; }
+            set
+            {
+                this.CurrentTask.CustomDetelecine = value;
+                this.NotifyOfPropertyChange(() => this.CustomDetelecine);
+            }
+        }
 
         /// <summary>
         /// Gets DeInterlaceOptions.
         /// </summary>
-        public IEnumerable<string> DeInterlaceOptions
+        public IEnumerable<Deinterlace> DeInterlaceOptions
         {
             get
             {
-                return EnumHelper<Deinterlace>.GetEnumDisplayValues(typeof(Deinterlace));
+                return EnumHelper<Deinterlace>.GetEnumList();
             }
         }
 
@@ -131,144 +149,158 @@
         {
             get
             {
-                return this.deblockValue;
+                return this.CurrentTask.Deblock;
             }
+
             set
             {
-                this.deblockValue = value;
-                this.NotifyOfPropertyChange("DeblockValue");
-                this.NotifyOfPropertyChange("DeblockText");
+                this.CurrentTask.Deblock = value;
+                this.NotifyOfPropertyChange(() => this.DeblockValue);
+                this.NotifyOfPropertyChange(() => this.DeblockText);
             }
         }
 
         /// <summary>
         /// Gets DecombOptions.
         /// </summary>
-        public IEnumerable<string> DecombOptions
+        public IEnumerable<Decomb> DecombOptions
         {
             get
             {
-                return EnumHelper<Decomb>.GetEnumDisplayValues(typeof(Decomb));
+                return EnumHelper<Decomb>.GetEnumList();
             }
         }
 
         /// <summary>
         /// Gets DenoiseOptions.
         /// </summary>
-        public IEnumerable<string> DenoiseOptions
+        public IEnumerable<Denoise> DenoiseOptions
         {
             get
             {
-                return EnumHelper<Denoise>.GetEnumDisplayValues(typeof(Denoise));
+                return EnumHelper<Denoise>.GetEnumList();
             }
         }
 
         /// <summary>
         /// Gets DetelecineOptions.
         /// </summary>
-        public IEnumerable<string> DetelecineOptions
+        public IEnumerable<Detelecine> DetelecineOptions
         {
             get
             {
-                return EnumHelper<Detelecine>.GetEnumDisplayValues(typeof(Detelecine));
+                return EnumHelper<Detelecine>.GetEnumList();
             }
         }
 
         /// <summary>
         /// Gets or sets a value indicating whether Grayscale.
         /// </summary>
-        public bool Grayscale { get; set; }
+        public bool Grayscale
+        {
+            get
+            {
+                return this.CurrentTask.Grayscale;
+            }
+
+            set
+            {
+                this.CurrentTask.Grayscale = value;
+                this.NotifyOfPropertyChange(() => this.Grayscale);
+            }
+        }
 
         /// <summary>
         /// Gets or sets SelectedDeInterlace.
         /// </summary>
-        public string SelectedDeInterlace
+        public Deinterlace SelectedDeInterlace
         {
             get
             {
-                return EnumHelper<Deinterlace>.GetDisplay(this.selectedDeInterlace);
+                return this.CurrentTask.Deinterlace;
             }
 
             set
             {
-                this.selectedDeInterlace = EnumHelper<Deinterlace>.GetValue(value);
-                if (this.selectedDeInterlace != Deinterlace.Off)
+                this.CurrentTask.Deinterlace = value;
+                if (this.CurrentTask.Deinterlace != Deinterlace.Off)
                 {
-                    this.SelectedDecomb = EnumHelper<Decomb>.GetDisplay(Decomb.Off);
+                    this.SelectedDecomb = Decomb.Off;
                 }
-                this.NotifyOfPropertyChange("SelectedDeInterlace");
+
+                this.NotifyOfPropertyChange(() => this.SelectedDeInterlace);
 
                 // Show / Hide the Custom Control
-                this.ShowDeinterlaceCustom = this.selectedDeInterlace == Deinterlace.Custom;
-                this.NotifyOfPropertyChange("ShowDeinterlaceCustom");
+                this.ShowDeinterlaceCustom = this.CurrentTask.Deinterlace == Deinterlace.Custom;
+                this.NotifyOfPropertyChange(() => this.ShowDeinterlaceCustom);
             }
         }
 
         /// <summary>
         /// Gets or sets SelectedDecomb.
         /// </summary>
-        public string SelectedDecomb
+        public Decomb SelectedDecomb
         {
             get
             {
-                return EnumHelper<Decomb>.GetDisplay(this.selectedDecomb);
+                return this.CurrentTask.Decomb;
             }
 
             set
             {
-                this.selectedDecomb = EnumHelper<Decomb>.GetValue(value);
-                if (this.selectedDecomb != Decomb.Off)
+                this.CurrentTask.Decomb = value;
+                if (this.CurrentTask.Decomb != Decomb.Off)
                 {
-                    this.SelectedDeInterlace = EnumHelper<Deinterlace>.GetDisplay(Deinterlace.Off);
+                    this.SelectedDeInterlace = Deinterlace.Off;
                 }
 
-                this.NotifyOfPropertyChange("SelectedDecomb");
+                this.NotifyOfPropertyChange(() => this.SelectedDecomb);
 
                 // Show / Hide the Custom Control
-                this.ShowDecombCustom = this.selectedDecomb == Decomb.Custom;
-                this.NotifyOfPropertyChange("ShowDecombCustom");
+                this.ShowDecombCustom = this.CurrentTask.Decomb == Decomb.Custom;
+                this.NotifyOfPropertyChange(() => this.ShowDecombCustom);
             }
         }
 
         /// <summary>
         /// Gets or sets SelectedDenoise.
         /// </summary>
-        public string SelectedDenoise
+        public Denoise SelectedDenoise
         {
             get
             {
-                return EnumHelper<Denoise>.GetDisplay(this.selectedDenoise);
+                return this.CurrentTask.Denoise;
             }
 
             set
             {
-                this.selectedDenoise = EnumHelper<Denoise>.GetValue(value);
-                this.NotifyOfPropertyChange("SelectedDenoise");
+                this.CurrentTask.Denoise = value;
+                this.NotifyOfPropertyChange(() => this.SelectedDenoise);
 
                 // Show / Hide the Custom Control
-                this.ShowDenoiseCustom = this.selectedDenoise == Denoise.Custom;
-                this.NotifyOfPropertyChange("ShowDenoiseCustom");
+                this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.Custom;
+                this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);
             }
         }
 
         /// <summary>
         /// Gets or sets SelectedDetelecine.
         /// </summary>
-        public string SelectedDetelecine
+        public Detelecine SelectedDetelecine
         {
             get
             {
-                return EnumHelper<Detelecine>.GetDisplay(this.selectedDetelecine);
+                return this.CurrentTask.Detelecine;
             }
 
             set
             {
-                this.selectedDetelecine = EnumHelper<Detelecine>.GetValue(value);
-                this.NotifyOfPropertyChange("SelectedDetelecine");
+                this.CurrentTask.Detelecine = value;
+                this.NotifyOfPropertyChange(() => this.SelectedDetelecine);
 
                 // Show / Hide the Custom Control
-                this.ShowDetelecineCustom = this.selectedDetelecine == Detelecine.Custom;
-                this.NotifyOfPropertyChange("ShowDetelecineCustom");
+                this.ShowDetelecineCustom = this.CurrentTask.Detelecine == Detelecine.Custom;
+                this.NotifyOfPropertyChange(() => this.ShowDetelecineCustom);
             }
         }
 
@@ -292,72 +324,76 @@
         /// </summary>
         public bool ShowDetelecineCustom { get; set; }
 
-        /// <summary>
-        /// Gets or sets CustomDeinterlace.
-        /// </summary>
-        public string CustomDeinterlace
-        {
-            get
-            {
-                return this.customDeinterlace;
-            }
-            set
-            {
-                this.customDeinterlace = value;
-                this.NotifyOfPropertyChange(() => this.CustomDeinterlace);
-            }
-        }
+        #endregion
 
-        /// <summary>
-        /// Gets or sets CustomDecomb.
-        /// </summary>
-        public string CustomDecomb
-        {
-            get
-            {
-                return this.customDecomb;
-            }
-            set
-            {
-                this.customDecomb = value;
-                this.NotifyOfPropertyChange(() => this.CustomDecomb);
-            }
-        }
+        #region Implemented Interfaces
+
+        #region ITabInterface
 
         /// <summary>
-        /// Gets or sets CustomDetelecine.
+        /// Setup this tab for the specified preset.
         /// </summary>
-        public string CustomDetelecine
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
         {
-            get
+            this.CurrentTask = task;
+
+            if (preset != null && preset.UsePictureFilters)
             {
-                return this.customDetelecine;
+                // Properties
+                this.SelectedDenoise = preset.Task.Denoise;
+                this.SelectedDecomb = preset.Task.Decomb;
+                this.SelectedDeInterlace = preset.Task.Deinterlace;
+                this.SelectedDetelecine = preset.Task.Detelecine;
+                this.Grayscale = preset.Task.Grayscale;
+                this.DeblockValue = preset.Task.Deblock == 0 ? 4 : preset.Task.Deblock;
+
+                // Custom Values
+                this.CustomDecomb = preset.Task.CustomDecomb;
+                this.CustomDeinterlace = preset.Task.CustomDeinterlace;
+                this.CustomDetelecine = preset.Task.CustomDetelecine;
+                this.CustomDenoise = preset.Task.CustomDenoise;
             }
-            set
+            else
             {
-                this.customDetelecine = value;
-                this.NotifyOfPropertyChange(() => this.CustomDetelecine);
+                // Default everything to off
+                this.SelectedDenoise = Denoise.Off;
+                this.SelectedDecomb = Decomb.Off;
+                this.SelectedDeInterlace = Deinterlace.Off;
+                this.SelectedDetelecine = Detelecine.Off;
+                this.Grayscale = false;
+                this.DeblockValue = 0;
             }
         }
 
         /// <summary>
-        /// Gets or sets CustomDenoise.
+        /// Update all the UI controls based on the encode task passed in.
         /// </summary>
-        public string CustomDenoise
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
         {
-            get
-            {
-                return this.customDenoise;
-            }
-            set
-            {
-                this.customDenoise = value;
-                this.NotifyOfPropertyChange(() => this.CustomDenoise);
-            }
+            this.CurrentTask = task;
+
+            this.NotifyOfPropertyChange(() => this.SelectedDenoise);
+            this.NotifyOfPropertyChange(() => this.SelectedDecomb);
+            this.NotifyOfPropertyChange(() => this.SelectedDeInterlace);
+            this.NotifyOfPropertyChange(() => this.SelectedDetelecine);
+            this.NotifyOfPropertyChange(() => this.Grayscale);
+            this.NotifyOfPropertyChange(() => this.DeblockValue);
+
+            this.NotifyOfPropertyChange(() => this.CustomDecomb);
+            this.NotifyOfPropertyChange(() => this.CustomDeinterlace);
+            this.NotifyOfPropertyChange(() => this.CustomDetelecine);
+            this.NotifyOfPropertyChange(() => this.CustomDenoise);
         }
 
-        #endregion
-
         /// <summary>
         /// Setup this window for a new source
         /// </summary>
@@ -372,32 +408,11 @@
         /// </param>
         public void SetSource(Title title, Preset preset, EncodeTask task)
         {
+            this.CurrentTask = task;
         }
 
-        /// <summary>
-        /// Setup this tab for the specified preset.
-        /// </summary>
-        /// <param name="preset">
-        /// The preset.
-        /// </param>
-        public void SetPreset(Preset preset)
-        {
-            if (preset != null)
-            {
-                // Properties
-                this.SelectedDenoise = EnumHelper<Denoise>.GetDisplay(preset.Task.Denoise);
-                this.SelectedDecomb = EnumHelper<Decomb>.GetDisplay(preset.Task.Decomb);
-                this.SelectedDeInterlace = EnumHelper<Deinterlace>.GetDisplay(preset.Task.Deinterlace);
-                this.SelectedDetelecine = EnumHelper<Detelecine>.GetDisplay(preset.Task.Detelecine);
-                this.Grayscale = preset.Task.Grayscale;
-                this.DeblockValue = preset.Task.Deblock;
+        #endregion
 
-                // Custom Values
-                this.CustomDecomb = preset.Task.CustomDecomb;
-                this.CustomDeinterlace = preset.Task.CustomDeinterlace;
-                this.CustomDetelecine = preset.Task.CustomDetelecine;
-                this.CustomDenoise = preset.Task.CustomDenoise;
-            }
-        }
+        #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAdvancedViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAdvancedViewModel.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IEncoderOptionsViewModel.cs Added

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IEncoderOptionsViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Simple Encoder Options Tab
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// The Simple Encoder Options Tab
+    /// </summary>
+    public interface IEncoderOptionsViewModel : ITabInterface    
+    {
+        /// <summary>
+        /// Set the currently selected encoder.
+        /// </summary>
+        /// <param name="encoder">
+        /// The Video Encoder.
+        /// </param>
+        void SetEncoder(VideoEncoder encoder);
+
+        /// <summary>
+        /// Clear out the settings.
+        /// </summary>
+        void Clear();
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs Changed

@@ -25,5 +25,64 @@
         /// Shutdown the Application
         /// </summary>
         void ExitApplication();
+
+        /// <summary>
+        /// Open the Log Window
+        /// </summary>
+        void OpenLogWindow();
+
+        /// <summary>
+        /// Open the Queue Window.
+        /// </summary>
+        void OpenQueueWindow();
+
+        /// <summary>
+        /// Add the current task to the queue.
+        /// </summary>
+        void AddToQueue();
+
+        /// <summary>
+        /// File Scan
+        /// </summary>
+        void FileScan();
+
+        /// <summary>
+        /// Folder Scan
+        /// </summary>
+        void FolderScan();
+
+        /// <summary>
+        /// Stop an Encode.
+        /// </summary>
+        void StopEncode();
+
+        /// <summary>
+        /// Start an Encode
+        /// </summary>
+        void StartEncode();
+
+        /// <summary>
+        /// The start scan.
+        /// </summary>
+        /// <param name="filename">
+        /// The filename.
+        /// </param>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        void StartScan(string filename, int title);
+
+        /// <summary>
+        /// Edit a Queue Task
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        void EditQueueJob(EncodeTask task);
+
+        /// <summary>
+        /// Shutdown this View
+        /// </summary>
+        void Shutdown();
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs Added

@@ -0,0 +1,40 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IQueueSelectionViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Queue Selection View Model Interface
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    using System.Collections.Generic;
+    using System.ComponentModel;
+
+    using HandBrake.ApplicationServices.Parsing;
+
+    using HandBrakeWPF.Model;
+
+    /// <summary>
+    /// The Add Preset View Model
+    /// </summary>
+    public interface IQueueSelectionViewModel
+    {
+        /// <summary>
+        /// Gets the selected titles.
+        /// </summary>
+        BindingList<SelectionTitle> TitleList { get; }
+
+        /// <summary>
+        /// The setup.
+        /// </summary>
+        /// <param name="scannedSource">
+        /// The scanned source.
+        /// </param>
+        /// <param name="sourceName">
+        /// The source Name.
+        /// </param>
+        void Setup(Source scannedSource, string sourceName);
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IShellViewModel.cs Added

@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IShellViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Interface for the Shell View Model
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    using HandBrakeWPF.Model;
+
+    /// <summary>
+    /// The Interface for the Shell View Model
+    /// </summary>
+    public interface IShellViewModel
+    {
+        /// <summary>
+        /// Change the page displayed on this window.
+        /// </summary>
+        /// <param name="window">
+        /// The window.
+        /// </param>
+        void DisplayWindow(ShellWindow window);
+
+        /// <summary>
+        /// Checks with the use if this window can be closed.
+        /// </summary>
+        /// <returns>
+        /// Returns true if the window can be closed.
+        /// </returns>
+        bool CanClose();
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITitleSpecificViewModel.cs Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IVideoViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IVideoViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IX264ViewModel.cs Added

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IX264ViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the IX264ViewModel type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    using HandBrake.Interop.Model.Encoding;
+
+    /// <summary>
+    /// The Advanced View Model Interface
+    /// </summary>
+    public interface IX264ViewModel : ITabInterface
+    {
+        /// <summary>
+        /// Set the currently selected encoder.
+        /// </summary>
+        /// <param name="encoder">
+        /// The Video Encoder.
+        /// </param>
+        void SetEncoder(VideoEncoder encoder);
+
+        /// <summary>
+        /// Clear out the settings.
+        /// </summary>
+        void Clear();
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs Changed

@@ -10,14 +10,10 @@
 namespace HandBrakeWPF.ViewModels
 {
     using System;
-    using System.Collections.Generic;
     using System.Diagnostics;
     using System.Windows;
 
     using HandBrake.ApplicationServices.Services.Interfaces;
-
-    using Caliburn.Micro;
-
     using Interfaces;
 
     using HandBrake.ApplicationServices.EventArgs;
@@ -27,96 +23,82 @@
     /// </summary>
     public class LogViewModel : ViewModelBase, ILogViewModel
     {
-        /**
-         * TODO
-         * - Live update the log file.
-         */
-
         #region Private Fields
 
         /// <summary>
         /// Backing field for the encodeService service
         /// </summary>
-        private readonly IEncode encodeService;
+        private readonly IEncodeServiceWrapper encodeService;
 
         /// <summary>
         /// Backing field for the Scan Service
         /// </summary>
-        private readonly IScan scanService;
+        private readonly IScanServiceWrapper scanService;
 
         /// <summary>
-        /// Backing field for the selected mode
+        /// The selected tab.
         /// </summary>
-        private int selectedMode;
+        private int selectedTab;
 
         /// <summary>
-        /// Backing field for the log info.
+        /// The encode log index.
         /// </summary>
-        private string log;
+        private int encodeLogIndex;
 
         #endregion
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LogViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
         /// <param name="encodeService">
         /// The encode service.
         /// </param>
         /// <param name="scanService">
         /// The scan service.
         /// </param>
-        public LogViewModel(IWindowManager windowManager, IEncode encodeService, IScan scanService)
+        public LogViewModel(IEncodeServiceWrapper encodeService, IScanServiceWrapper scanService)
         {
             this.encodeService = encodeService;
             this.scanService = scanService;
             this.Title = "Log Viewer";
-            this.SelectedMode = 0;
+            this.encodeLogIndex = 0;
         }
 
         /// <summary>
-        /// Gets or sets Log.
+        /// Gets or sets the selected tab.
         /// </summary>
-        public string Log
+        public int SelectedTab
         {
             get
             {
-                return log;
+                return this.selectedTab;
             }
             set
             {
-                log = value;
-                this.NotifyOfPropertyChange("Log");
+                this.selectedTab = value;
+                this.NotifyOfPropertyChange(() => this.SelectedTab);
             }
         }
 
         /// <summary>
-        /// Gets LogModes.
+        /// Gets Log.
         /// </summary>
-        public IEnumerable<string> LogModes
+        public string ScanLog
         {
             get
             {
-                return new List<string> { "Encode Log", "Scan Log" };
+                return this.scanService.ActivityLog;
             }
         }
 
         /// <summary>
-        /// Gets or sets SelectedMode.
+        /// Gets the encodelog.
         /// </summary>
-        public int SelectedMode
+        public string EncodeLog
         {
             get
             {
-                return selectedMode;
-            }
-            set
-            {
-                selectedMode = value;
-                this.NotifyOfPropertyChange("SelectedMode");
-                this.ChangeLogDisplay();
+                return this.encodeService.ActivityLog;
             }
         }
 
@@ -136,7 +118,7 @@
         /// </summary>
         public void CopyLog()
         {
-            Clipboard.SetDataObject(this.Log, true);
+            Clipboard.SetDataObject(this.SelectedTab == 1 ? this.ScanLog : this.EncodeLog, true);
         }
 
         /// <summary>
@@ -144,37 +126,71 @@
         /// </summary>
         protected override void OnActivate()
         {
-            this.scanService.ScanStared += scanService_ScanStared;
-            this.scanService.ScanCompleted += scanService_ScanCompleted;
-            this.encodeService.EncodeStarted += encodeService_EncodeStarted;
-            this.encodeService.EncodeCompleted += encodeService_EncodeCompleted;
+            this.scanService.ScanCompleted += ScanServiceScanCompleted;
+            this.encodeService.EncodeCompleted += EncodeServiceEncodeCompleted;
+            this.encodeService.EncodeStatusChanged += this.EncodeServiceEncodeStatusChanged;
+            this.scanService.ScanStatusChanged += this.ScanServiceScanStatusChanged;
+            this.scanService.ScanStared += this.scanService_ScanStared;
+            this.encodeService.EncodeStarted += this.encodeService_EncodeStarted;
             base.OnActivate();
+
+            this.NotifyOfPropertyChange(() => this.ScanLog);
+            this.NotifyOfPropertyChange(() => this.EncodeLog);
         }
 
         /// <summary>
-        /// Handle the OnDeactivate Caliburn Event
+        /// Scan Status has changed, update log window.
         /// </summary>
-        /// <param name="close">
-        /// The close.
+        /// <param name="sender">
+        /// The sender.
         /// </param>
-        protected override void OnDeactivate(bool close)
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ScanServiceScanStatusChanged(object sender, ScanProgressEventArgs e)
         {
-            this.scanService.ScanStared -= scanService_ScanStared;
-            this.encodeService.EncodeStarted -= encodeService_EncodeStarted;
-            this.Load();
-            base.OnDeactivate(close);
+            this.NotifyOfPropertyChange(() => this.ScanLog);
         }
 
         /// <summary>
-        /// Change the Log Display
+        /// Encode Status has changed, update log window
         /// </summary>
-        private void ChangeLogDisplay()
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void EncodeServiceEncodeStatusChanged(object sender, EncodeProgressEventArgs e)
         {
-            this.Log = this.SelectedMode == 0 ? this.encodeService.ActivityLog : this.scanService.ActivityLog;
+            if (encodeLogIndex != this.encodeService.LogIndex || this.encodeService.LogIndex == -1)
+            {
+                this.NotifyOfPropertyChange(() => this.EncodeLog);
+            }
+
+            encodeLogIndex = this.encodeService.LogIndex;
         }
 
         /// <summary>
-        /// Encode Started Event Handler
+        /// Handle the OnDeactivate Caliburn Event
+        /// </summary>
+        /// <param name="close">
+        /// The close.
+        /// </param>
+        protected override void OnDeactivate(bool close)
+        {
+            this.scanService.ScanCompleted -= ScanServiceScanCompleted;
+            this.encodeService.EncodeCompleted -= EncodeServiceEncodeCompleted;
+            this.encodeService.EncodeStatusChanged -= this.EncodeServiceEncodeStatusChanged;
+            this.scanService.ScanStatusChanged -= this.ScanServiceScanStatusChanged;
+            this.scanService.ScanStared -= this.scanService_ScanStared;
+            this.encodeService.EncodeStarted -= this.encodeService_EncodeStarted;
+
+            base.OnDeactivate(close);
+        }
+
+        /// <summary>
+        /// Scan Completed Event Handler.
         /// </summary>
         /// <param name="sender">
         /// The sender.
@@ -182,14 +198,13 @@
         /// <param name="e">
         /// The e.
         /// </param>
-        private void encodeService_EncodeStarted(object sender, EventArgs e)
+        private void ScanServiceScanCompleted(object sender, ScanCompletedEventArgs e)
         {
-            this.SelectedMode = 0;
-            this.Log = this.encodeService.ActivityLog;
+            this.NotifyOfPropertyChange(() => this.ScanLog);
         }
 
         /// <summary>
-        /// Scan Started Event Handler
+        /// Encode Completed Event Handler.
         /// </summary>
         /// <param name="sender">
         /// The sender.
@@ -197,14 +212,13 @@
         /// <param name="e">
         /// The e.
         /// </param>
-        private void scanService_ScanStared(object sender, EventArgs e)
+        private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
         {
-            this.SelectedMode = 1;
-            this.Log = this.scanService.ActivityLog;
+            this.NotifyOfPropertyChange(() => this.EncodeLog);
         }
 
         /// <summary>
-        /// Scan Completed Event Handler.
+        /// The encode service encode started.
         /// </summary>
         /// <param name="sender">
         /// The sender.
@@ -212,16 +226,14 @@
         /// <param name="e">
         /// The e.
         /// </param>
-        private void scanService_ScanCompleted(object sender, ScanCompletedEventArgs e)
+        private void encodeService_EncodeStarted(object sender, EventArgs e)
         {
-            if (this.SelectedMode == 1)
-            {
-                this.Log = this.scanService.ActivityLog;
-            }
+            this.encodeLogIndex = -1; // Reset the log index.
+            this.SelectedTab = 0;
         }
 
         /// <summary>
-        /// Encode Completed Event Handler.
+        /// The scan service scan stared.
         /// </summary>
         /// <param name="sender">
         /// The sender.
@@ -229,12 +241,9 @@
         /// <param name="e">
         /// The e.
         /// </param>
-        private void encodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)
+        private void scanService_ScanStared(object sender, EventArgs e)
         {
-            if (this.SelectedMode == 0)
-            {
-                this.Log = this.encodeService.ActivityLog;
-            }
+            this.SelectedTab = 1;
         }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs Changed

@@ -11,50 +11,45 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.ComponentModel.Composition;
     using System.Diagnostics;
+    using System.Globalization;
     using System.IO;
     using System.Linq;
+    using System.Threading;
     using System.Windows;
+    using System.Windows.Media.Imaging;
 
     using Caliburn.Micro;
 
     using HandBrake.ApplicationServices;
+    using HandBrake.ApplicationServices.Factories;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Model.General;
     using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services;
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
 
+    using HandBrakeWPF.Commands;
     using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.ViewModels.Interfaces;
+    using HandBrakeWPF.Views;
+
+    using Microsoft.Win32;
 
     using Ookii.Dialogs.Wpf;
 
-    using HandBrakeWPF.Services.Interfaces;
+    using Image = System.Windows.Controls.Image;
 
     /// <summary>
     /// HandBrakes Main Window
     /// </summary>
-    [Export(typeof(IMainViewModel))]
     public class MainViewModel : ViewModelBase, IMainViewModel
     {
         #region Private Variables and Services
 
         /// <summary>
-        /// The Source Scan Service.
-        /// </summary>
-        private readonly IScan scanService;
-
-        /// <summary>
-        /// The Encode Service
-        /// </summary>
-        private readonly IEncode encodeService;
-
-        /// <summary>
         /// The Encode Service
         /// </summary>
         private readonly IQueueProcessor queueProcessor;
@@ -70,11 +65,41 @@
         private readonly IErrorService errorService;
 
         /// <summary>
+        /// The Shell View Model
+        /// </summary>
+        private readonly IShellViewModel shellViewModel;
+
+        /// <summary>
+        /// Backing field for the update serivce.
+        /// </summary>
+        private readonly IUpdateService updateService;
+
+        /// <summary>
+        /// The drive detect service.
+        /// </summary>
+        private readonly IDriveDetectService driveDetectService;
+
+        /// <summary>
         /// Backing field for the user setting service.
         /// </summary>
         private readonly IUserSettingService userSettingService;
 
         /// <summary>
+        /// The Source Scan Service.
+        /// </summary>
+        private readonly IScanServiceWrapper scanService;
+
+        /// <summary>
+        /// The Encode Service
+        /// </summary>
+        private readonly IEncodeServiceWrapper encodeService;
+
+        /// <summary>
+        /// Windows 7 API Pack wrapper
+        /// </summary>
+        private readonly Win7 windowsSeven = new Win7();
+
+        /// <summary>
         /// HandBrakes Main Window Title
         /// </summary>
         private string windowName;
@@ -94,14 +119,14 @@
         /// </summary>
         private bool isMkv;
 
-        public string sourcePath;
-        private string dvdDrivePath;
-        private string dvdDriveLabel;
-        private List<DriveInformation> drives;
-
         /// <summary>
         /// The Toolbar Status Label
         /// </summary>
+        private string statusLabel;
+
+        /// <summary>
+        /// Program Status Label
+        /// </summary>
         private string programStatusLabel;
 
         /// <summary>
@@ -125,19 +150,35 @@
         private bool isEncoding;
 
         /// <summary>
+        /// An Indicated to show the status window
+        /// </summary>
+        private bool showStatusWindow;
+
+        /// <summary>
         /// Backing field for the selected preset.
         /// </summary>
         private Preset selectedPreset;
 
+        /// <summary>
+        /// Queue Edit Task
+        /// </summary>
+        private EncodeTask queueEditTask;
+
+        /// <summary>
+        /// The Source Menu Backing Field
+        /// </summary>
+        private IEnumerable<SourceMenuItem> sourceMenu;
+
+        /// <summary>
+        /// The last percentage complete value.
+        /// </summary>
+        private int lastEncodePercentage;
         #endregion
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MainViewModel"/> class.
         /// The viewmodel for HandBrakes main window.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
         /// <param name="userSettingService">
         /// The User Setting Service
         /// </param>
@@ -153,31 +194,50 @@
         /// <param name="errorService">
         /// The Error Service
         /// </param>
-        [ImportingConstructor]
-        public MainViewModel(IWindowManager windowManager, IUserSettingService userSettingService, IScan scanService, IEncode encodeService, IPresetService presetService,
-            IErrorService errorService)
+        /// <param name="shellViewModel">
+        /// The shell View Model.
+        /// </param>
+        /// <param name="updateService">
+        /// The update Service.
+        /// </param>
+        /// <param name="driveDetectService">
+        /// The drive Detect Service.
+        /// </param>
+        /// <param name="notificationService">
+        /// The notification Service.
+        /// *** Leave in Constructor. ***  TODO find out why?
+        /// </param>
+        public MainViewModel(IUserSettingService userSettingService, IScanServiceWrapper scanService, IEncodeServiceWrapper encodeService, IPresetService presetService,
+            IErrorService errorService, IShellViewModel shellViewModel, IUpdateService updateService, IDriveDetectService driveDetectService, INotificationService notificationService)
         {
             this.scanService = scanService;
             this.encodeService = encodeService;
             this.presetService = presetService;
             this.errorService = errorService;
+            this.shellViewModel = shellViewModel;
+            this.updateService = updateService;
+            this.driveDetectService = driveDetectService;
             this.userSettingService = userSettingService;
-            this.queueProcessor = IoC.Get<IQueueProcessor>(); // TODO Instance ID!
+            this.queueProcessor = IoC.Get<IQueueProcessor>();
 
             // Setup Properties
-            this.WindowTitle = "HandBrake WPF Test Application";
+            this.WindowTitle = "HandBrake";
             this.CurrentTask = new EncodeTask();
+            this.CurrentTask.PropertyChanged += this.CurrentTask_PropertyChanged;
             this.ScannedSource = new Source();
 
             // Setup Events
             this.scanService.ScanStared += this.ScanStared;
             this.scanService.ScanCompleted += this.ScanCompleted;
             this.scanService.ScanStatusChanged += this.ScanStatusChanged;
-
+            this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
             this.queueProcessor.QueueCompleted += this.QueueCompleted;
-            this.queueProcessor.QueuePaused += this.QueuePaused;
-            this.queueProcessor.EncodeService.EncodeStarted += this.EncodeStarted;
+            this.queueProcessor.QueueChanged += this.QueueChanged;
             this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeStatusChanged;
+            this.userSettingService.SettingChanged += this.UserSettingServiceSettingChanged;
+
+            this.Presets = this.presetService.Presets;
+            this.CancelScanCommand = new CancelScanCommand(this.scanService);
         }
 
         #region View Model Properties
@@ -231,7 +291,7 @@
 
             set
             {
-                if (!object.Equals(this.windowName, value))
+                if (!Equals(this.windowName, value))
                 {
                     this.windowName = value;
                 }
@@ -246,31 +306,62 @@
         {
             get
             {
-                return string.IsNullOrEmpty(this.programStatusLabel) ? "Ready" : this.sourceLabel;
+                return string.IsNullOrEmpty(this.programStatusLabel) ? "Ready" : this.programStatusLabel;
             }
 
             set
             {
-                if (!object.Equals(this.programStatusLabel, value))
+                if (!Equals(this.programStatusLabel, value))
                 {
                     this.programStatusLabel = value;
-                    this.NotifyOfPropertyChange("ProgramStatusLabel");
+                    this.NotifyOfPropertyChange(() => this.ProgramStatusLabel);
                 }
             }
         }
 
         /// <summary>
-        /// Gets a list of presets
+        /// Gets or sets the Program Status Toolbar Label
+        /// This indicates the status of HandBrake
         /// </summary>
-        public ObservableCollection<Preset> Presets
+        public string StatusLabel
         {
             get
             {
-                return this.presetService.Presets;
+                return string.IsNullOrEmpty(this.statusLabel) ? "Ready" : this.statusLabel;
+            }
+
+            set
+            {
+                if (!Equals(this.statusLabel, value))
+                {
+                    this.statusLabel = value;
+                    this.NotifyOfPropertyChange(() => this.StatusLabel);
+                }
             }
         }
 
         /// <summary>
+        /// Gets or sets the source menu.
+        /// </summary>
+        public IEnumerable<SourceMenuItem> SourceMenu
+        {
+            get
+            {
+                return this.sourceMenu;
+            }
+            set
+            {
+                this.sourceMenu = value;
+                this.NotifyOfPropertyChange(() => SourceMenu);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Presets.
+        /// </summary>
+        public IEnumerable<Preset> Presets { get; set; }
+
+        /// <summary>
         /// Gets or sets SelectedPreset.
         /// </summary>
         public Preset SelectedPreset
@@ -285,13 +376,23 @@
 
                 if (this.SelectedPreset != null)
                 {
-                    this.PictureSettingsViewModel.SetPreset(this.SelectedPreset);
-                    this.VideoViewModel.SetPreset(this.SelectedPreset);
-                    this.FiltersViewModel.SetPreset(this.SelectedPreset);
-                    this.AudioViewModel.SetPreset(this.SelectedPreset);
-                    this.SubtitleViewModel.SetPreset(this.SelectedPreset);
-                    this.ChaptersViewModel.SetPreset(this.SelectedPreset);
-                    this.AdvancedViewModel.SetPreset(this.SelectedPreset);
+                    // Main Window Settings
+                    this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;
+                    this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
+                    this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
+                    this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
+
+                    // Tab Settings
+                    this.PictureSettingsViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+                    this.VideoViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+                    this.FiltersViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+                    this.AudioViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+                    this.SubtitleViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+                    this.ChaptersViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+                    this.AdvancedViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+
+                    // Do this again to force an update for m4v/mp4 selection
+                    this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
                 }
 
                 this.NotifyOfPropertyChange(() => this.SelectedPreset);
@@ -334,7 +435,7 @@
 
             set
             {
-                if (!object.Equals(this.sourceLabel, value))
+                if (!Equals(this.sourceLabel, value))
                 {
                     this.sourceLabel = value;
                     this.NotifyOfPropertyChange("SourceLabel");
@@ -349,34 +450,34 @@
         {
             get
             {
-                // TODO Disc Label
-                //if (this.selectedSourceType == SourceType.DvdDrive)
-                //{
-                //    return this.dvdDriveLabel;
-                //}
+                // Sanity Check
+                if (ScannedSource == null || ScannedSource.ScanPath == null)
+                {
+                    return string.Empty;
+                }
 
+                // The title that is selected has a source name. This means it's part of a batch scan.
                 if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
                 {
-                    return Path.GetFileName(selectedTitle.SourceName);
+                    return Path.GetFileNameWithoutExtension(selectedTitle.SourceName);
                 }
 
-                // We have a drive, selected as a folder.
-                if (this.sourcePath.EndsWith("\\"))
+                // Check if we have a Folder, if so, check if it's a DVD / Bluray drive and get the label.
+                if (ScannedSource.ScanPath.EndsWith("\\"))
                 {
-                    drives = GeneralUtilities.GetDrives();
-                    foreach (DriveInformation item in drives)
+                    foreach (DriveInformation item in GeneralUtilities.GetDrives())
                     {
-                        if (item.RootDirectory.Contains(this.sourcePath))
+                        if (item.RootDirectory.Contains(this.ScannedSource.ScanPath))
                         {
                             return item.VolumeLabel;
                         }
                     }
                 }
 
-                if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
-                    return Path.GetFileNameWithoutExtension(this.sourcePath);
+                if (Path.GetFileNameWithoutExtension(this.ScannedSource.ScanPath) != "VIDEO_TS")
+                    return Path.GetFileNameWithoutExtension(this.ScannedSource.ScanPath);
 
-                return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
+                return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.ScannedSource.ScanPath));
             }
         }
 
@@ -395,6 +496,17 @@
         }
 
         /// <summary>
+        /// Gets a value indicating whether ShowTextEntryForPointToPointMode.
+        /// </summary>
+        public bool ShowTextEntryForPointToPointMode
+        {
+            get
+            {
+                return this.SelectedPointToPoint != PointToPointMode.Chapters;
+            }
+        }
+
+        /// <summary>
         /// Gets StartEndRangeItems.
         /// </summary>
         public IEnumerable<int> StartEndRangeItems
@@ -406,7 +518,7 @@
                     return null;
                 }
 
-                return this.SelectedTitle.Chapters.Select(item => item.ChapterNumber).Select(dummy => (int)dummy).ToList();
+                return this.SelectedTitle.Chapters.Select(item => item.ChapterNumber).Select(dummy => dummy).ToList();
             }
         }
 
@@ -460,7 +572,24 @@
             set
             {
                 this.isEncoding = value;
-                this.NotifyOfPropertyChange("IsEncoding");
+                this.NotifyOfPropertyChange(() => this.IsEncoding);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ShowStatusWindow.
+        /// </summary>
+        public bool ShowStatusWindow
+        {
+            get
+            {
+                return this.showStatusWindow;
+            }
+
+            set
+            {
+                this.showStatusWindow = value;
+                this.NotifyOfPropertyChange(() => this.ShowStatusWindow);
             }
         }
 
@@ -476,7 +605,7 @@
             set
             {
                 this.isMkv = value;
-                this.NotifyOfPropertyChange("IsMkv");
+                this.NotifyOfPropertyChange(() => this.IsMkv);
             }
         }
 
@@ -494,9 +623,37 @@
             }
         }
 
-        #endregion
+        /// <summary>
+        /// Gets a value indicating whether show debug menu.
+        /// </summary>
+        public bool ShowDebugMenu
+        {
+            get
+            {
+                return this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDebugFeatures);
+            }
+        }
 
-        #region Properties for Settings
+        /// <summary>
+        /// Gets or sets the cancel scan command.
+        /// </summary>
+        public CancelScanCommand CancelScanCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets Destination.
+        /// </summary>
+        public string Destination
+        {
+            get
+            {
+                return this.CurrentTask.Destination;
+            }
+            set
+            {
+                this.CurrentTask.Destination = value;
+                this.NotifyOfPropertyChange(() => this.Destination);
+            }
+        }
 
         /// <summary>
         /// Gets or sets SelectedTitle.
@@ -513,28 +670,36 @@
                 {
                     this.selectedTitle = value;
 
-                    if (selectedTitle == null)
+                    if (this.selectedTitle == null)
                     {
                         return;
                     }
 
                     // Use the Path on the Title, or the Source Scan path if one doesn't exist.
+                    this.SourceLabel = this.SourceName;
                     this.CurrentTask.Source = !string.IsNullOrEmpty(this.selectedTitle.SourceName) ? this.selectedTitle.SourceName : this.ScannedSource.ScanPath;
                     this.CurrentTask.Title = value.TitleNumber;
-                    this.NotifyOfPropertyChange("StartEndRangeItems");
-                    this.NotifyOfPropertyChange("SelectedTitle");
-                    this.NotifyOfPropertyChange("Angles");
+                    this.NotifyOfPropertyChange(() => this.StartEndRangeItems);
+                    this.NotifyOfPropertyChange(() => this.SelectedTitle);
+                    this.NotifyOfPropertyChange(() => this.Angles);
 
                     // Default the Start and End Point dropdowns
                     this.SelectedStartPoint = 1;
-                    this.SelectedEndPoint = selectedTitle.Chapters.Last().ChapterNumber;
+                    this.SelectedEndPoint = this.selectedTitle.Chapters != null &&
+                                            this.selectedTitle.Chapters.Count != 0
+                                                ? this.selectedTitle.Chapters.Last().ChapterNumber
+                                                : 1;
+
                     this.SelectedPointToPoint = PointToPointMode.Chapters;
                     this.SelectedAngle = 1;
 
-                    this.CurrentTask.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
-                    this.NotifyOfPropertyChange("CurrentTask");
+                    if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
+                    {
+                        this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+                    }
+                    this.NotifyOfPropertyChange(() => this.CurrentTask);
 
-                    this.Duration = selectedTitle.Duration.ToString();
+                    this.Duration = this.selectedTitle.Duration.ToString();
 
                     // Setup the tab controls
                     this.SetupTabs();
@@ -551,14 +716,20 @@
             {
                 return this.CurrentTask.StartPoint;
             }
+
             set
             {
-                this.CurrentTask.EndPoint = value;
-                this.NotifyOfPropertyChange("SelectedAngle");
+                this.CurrentTask.Angle = value;
+                this.NotifyOfPropertyChange(() => this.SelectedAngle);
             }
         }
 
         /// <summary>
+        /// Gets or sets a value indicating whether is timespan range.
+        /// </summary>
+        public bool IsTimespanRange { get; set; }
+
+        /// <summary>
         /// Gets or sets SelectedStartPoint.
         /// </summary>
         public int SelectedStartPoint
@@ -572,6 +743,11 @@
                 this.CurrentTask.StartPoint = value;
                 this.NotifyOfPropertyChange(() => this.SelectedStartPoint);
                 this.Duration = this.DurationCalculation();
+
+                if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming) && this.ScannedSource.ScanPath != null)
+                {
+                    this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+                }
             }
         }
 
@@ -589,6 +765,11 @@
                 this.CurrentTask.EndPoint = value;
                 this.NotifyOfPropertyChange(() => this.SelectedEndPoint);
                 this.Duration = this.DurationCalculation();
+
+                if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming) && this.ScannedSource.ScanPath != null)
+                {
+                    this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+                }
             }
         }
 
@@ -604,7 +785,59 @@
             set
             {
                 this.CurrentTask.PointToPointMode = value;
-                this.NotifyOfPropertyChange("SelectedPointToPoint");
+                this.NotifyOfPropertyChange(() => SelectedPointToPoint);
+                this.NotifyOfPropertyChange(() => ShowTextEntryForPointToPointMode);
+
+                if (value == PointToPointMode.Chapters && this.SelectedTitle != null)
+                {
+                    if (this.selectedTitle == null)
+                    {
+                        return;
+                    }
+
+
+                    this.SelectedStartPoint = 1;
+                    this.SelectedEndPoint = selectedTitle.Chapters.Last().ChapterNumber;
+                } 
+                else if (value == PointToPointMode.Seconds)
+                {
+                    if (this.selectedTitle == null)
+                    {
+                        return;
+                    }
+
+
+                    this.SelectedStartPoint = 0;
+
+                    int timeInSeconds;
+                    if (int.TryParse(selectedTitle.Duration.TotalSeconds.ToString(CultureInfo.InvariantCulture), out timeInSeconds))
+                    {
+                        this.SelectedEndPoint = timeInSeconds;
+                    }
+
+                    this.IsTimespanRange = true;
+                    this.NotifyOfPropertyChange(() => this.IsTimespanRange);
+                }
+                else
+                {
+                    if (this.selectedTitle == null)
+                    {
+                        return;
+                    }
+
+                    // Note this does not account for VFR. It's only a guesstimate. 
+                    double estimatedTotalFrames = selectedTitle.Fps * selectedTitle.Duration.TotalSeconds;
+
+                    this.SelectedStartPoint = 0;
+                    int totalFrames;
+                    if (int.TryParse(estimatedTotalFrames.ToString(CultureInfo.InvariantCulture), out totalFrames))
+                    {
+                        this.SelectedEndPoint = totalFrames;
+                    }
+
+                    this.IsTimespanRange = false;
+                    this.NotifyOfPropertyChange(() => this.IsTimespanRange);
+                }
             }
         }
 
@@ -620,9 +853,25 @@
             set
             {
                 this.selectedOutputFormat = value;
-                this.NotifyOfPropertyChange("SelectedOutputFormat");
-                this.NotifyOfPropertyChange("IsMkv");
+                this.CurrentTask.OutputFormat = value;
+                this.NotifyOfPropertyChange(() => SelectedOutputFormat);
+                this.NotifyOfPropertyChange(() => this.CurrentTask.OutputFormat);
+                this.NotifyOfPropertyChange(() => IsMkv);
                 this.SetExtension(string.Format(".{0}", this.selectedOutputFormat.ToString().ToLower())); // TODO, tidy up
+
+                this.VideoViewModel.RefreshTask();
+                this.AudioViewModel.RefreshTask();
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether show advanced tab.
+        /// </summary>
+        public bool ShowAdvancedTab
+        {
+            get
+            {
+                return this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);
             }
         }
 
@@ -634,7 +883,34 @@
         /// </summary>
         public override void OnLoad()
         {
+            // Check the CLI Executable.
+            CliCheckHelper.CheckCLIVersion();
+
+            // Perform an update check if required
+            this.updateService.PerformStartupUpdateCheck(this.HandleUpdateCheckResults);
+
+            // Setup the presets.
+            if (this.presetService.CheckIfPresetsAreOutOfDate())
+                if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification))
+                    this.errorService.ShowMessageBox("HandBrake has determined your built-in presets are out of date... These presets will now be updated.",
+                                    "Preset Update", MessageBoxButton.OK, MessageBoxImage.Information);
+
+            // Queue Recovery
+            QueueRecoveryHelper.RecoverQueue(this.queueProcessor, this.errorService);
+
             this.SelectedPreset = this.presetService.DefaultPreset;
+
+            // Populate the Source menu with drives.
+            this.SourceMenu = this.GenerateSourceMenu();
+
+            this.driveDetectService.StartDetection(this.DriveTrayChanged);
+
+            // Log Cleaning
+            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs))
+            {
+                Thread clearLog = new Thread(() => GeneralUtilities.ClearLogFiles(30));
+                clearLog.Start();
+            }
         }
 
         /// <summary>
@@ -642,16 +918,24 @@
         /// </summary>
         public void Shutdown()
         {
+            // Shutdown Service
+            this.driveDetectService.Close();
+
+            this.scanService.Shutdown();
+            this.encodeService.Shutdown();
+
             // Unsubscribe from Events.
             this.scanService.ScanStared -= this.ScanStared;
             this.scanService.ScanCompleted -= this.ScanCompleted;
             this.scanService.ScanStatusChanged -= this.ScanStatusChanged;
 
             this.queueProcessor.QueueCompleted -= this.QueueCompleted;
-            this.queueProcessor.QueuePaused -= this.QueuePaused;
-            this.queueProcessor.EncodeService.EncodeStarted -= this.EncodeStarted;
+            this.queueProcessor.QueueChanged -= this.QueueChanged;
+            this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
             this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
+            this.userSettingService.SettingChanged -= this.UserSettingServiceSettingChanged;
         }
+
         #endregion
 
         #region Menu and Taskbar
@@ -661,7 +945,8 @@
         /// </summary>
         public void OpenAboutApplication()
         {
-            this.WindowManager.ShowWindow(IoC.Get<IAboutViewModel>());
+            OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
+            command.Execute(OptionsTab.About);
         }
 
         /// <summary>
@@ -669,7 +954,7 @@
         /// </summary>
         public void OpenOptionsWindow()
         {
-            this.WindowManager.ShowWindow(IoC.Get<IOptionsViewModel>());
+            this.shellViewModel.DisplayWindow(ShellWindow.OptionsWindow);
         }
 
         /// <summary>
@@ -677,7 +962,20 @@
         /// </summary>
         public void OpenLogWindow()
         {
-            this.WindowManager.ShowWindow(IoC.Get<ILogViewModel>());
+            Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(LogView));
+
+            if (window != null)
+            {
+                ILogViewModel logvm = (ILogViewModel)window.DataContext;
+                logvm.SelectedTab = this.IsEncoding ? 0 : 1;
+                window.Activate();
+            }
+            else
+            {
+                ILogViewModel logvm = IoC.Get<ILogViewModel>();
+                logvm.SelectedTab = this.IsEncoding ? 0 : 1;
+                this.WindowManager.ShowWindow(logvm);
+            }
         }
 
         /// <summary>
@@ -685,7 +983,16 @@
         /// </summary>
         public void OpenQueueWindow()
         {
-            this.WindowManager.ShowWindow(IoC.Get<IQueueViewModel>());
+            Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));
+
+            if (window != null)
+            {
+                window.Activate();
+            }
+            else
+            {
+                this.WindowManager.ShowWindow(IoC.Get<IQueueViewModel>());
+            }
         }
 
         /// <summary>
@@ -693,7 +1000,19 @@
         /// </summary>
         public void OpenPreviewWindow()
         {
-            this.WindowManager.ShowWindow(IoC.Get<IPreviewViewModel>());
+            Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(PreviewView));
+            IPreviewViewModel viewModel = IoC.Get<IPreviewViewModel>();
+
+            if (window != null)
+            {
+                viewModel.Task = this.CurrentTask;
+                window.Activate();
+            }
+            else
+            {
+                viewModel.Task = this.CurrentTask;
+                this.WindowManager.ShowWindow(viewModel);
+            }
         }
 
         /// <summary>
@@ -709,14 +1028,8 @@
         /// </summary>
         public void CheckForUpdates()
         {
-            // TODO The update service needs refactoring.
-            this.userSettingService.SetUserSetting(UserSettingConstants.LastUpdateCheckDate, DateTime.Now);
-            string url = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakePlatform).Contains("x86_64")
-                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_x64)
-                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_i686);
-            UpdateService.BeginCheckForUpdates(UpdateCheckHelper.UpdateCheckDoneMenu, false,
-                url, userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),
-                userSettingService.GetUserSetting<int>(UserSettingConstants.Skipversion));
+            OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
+            command.Execute(OptionsTab.Updates);
         }
 
         /// <summary>
@@ -730,16 +1043,80 @@
                 return;
             }
 
-            QueueTask task = new QueueTask
-                                 {
-                                     Task = this.CurrentTask,
-                                     Query = QueryGeneratorUtility.GenerateQuery(this.CurrentTask)
-                                 };
-            this.queueProcessor.QueueManager.Add(task);
+            QueueTask task = new QueueTask { Task = new EncodeTask(this.CurrentTask) };
+            if (!this.queueProcessor.CheckForDestinationPathDuplicates(task.Task.Destination))
+            {
+                this.queueProcessor.Add(task);
+            }
+            else
+            {
+                this.errorService.ShowMessageBox("There are jobs on the queue with the same destination path. Please choose a different path for this job.", "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
 
             if (!this.IsEncoding)
             {
-                this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.QueueManager.Count);
+                this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.Count);
+            }
+        }
+
+        /// <summary>
+        /// Add all Items to the queue
+        /// </summary>
+        public void AddAllToQueue()
+        {
+            if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)
+            {
+                this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (!AutoNameHelper.IsAutonamingEnabled())
+            {
+                this.errorService.ShowMessageBox("You must turn on automatic file naming in preferences before you can add to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (this.CurrentTask != null && this.CurrentTask.SubtitleTracks != null && this.CurrentTask.SubtitleTracks.Count > 0)
+            {
+                this.errorService.ShowMessageBox("Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn't support! Tracks are reset with every new source / title selected.", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            foreach (Title title in this.ScannedSource.Titles)
+            {
+                this.SelectedTitle = title;
+                this.AddToQueue();
+            }
+        }
+
+        /// <summary>
+        /// The add selection to queue.
+        /// </summary>
+        public void AddSelectionToQueue()
+        {
+            if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)
+            {
+                this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (!AutoNameHelper.IsAutonamingEnabled())
+            {
+                this.errorService.ShowMessageBox("You must turn on automatic file naming in preferences before you can add to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueSelectionViewModel));
+            IQueueSelectionViewModel viewModel = IoC.Get<IQueueSelectionViewModel>();
+
+            viewModel.Setup(this.ScannedSource, this.SourceName);
+
+            if (window != null)
+            {
+                window.Activate();
+            }
+            else
+            {
+                this.WindowManager.ShowWindow(viewModel);
             }
         }
 
@@ -764,6 +1141,50 @@
         }
 
         /// <summary>
+        /// Folder Scan
+        /// </summary>
+        public void FolderScanTitleSpecific()
+        {
+            VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
+            dialog.ShowDialog();
+
+            if (string.IsNullOrEmpty(dialog.SelectedPath))
+            {
+                return;
+            }
+
+            ITitleSpecificViewModel titleSpecificView = IoC.Get<ITitleSpecificViewModel>();
+            this.WindowManager.ShowDialog(titleSpecificView);
+
+            if (titleSpecificView.SelectedTitle.HasValue)
+            {
+                this.StartScan(dialog.SelectedPath, titleSpecificView.SelectedTitle.Value);
+            }
+        }
+
+        /// <summary>
+        /// File Scan
+        /// </summary>
+        public void FileScanTitleSpecific()
+        {
+            VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.*)|*.*" };
+            dialog.ShowDialog();
+
+            if (string.IsNullOrEmpty(dialog.FileName))
+            {
+                return;
+            }
+
+            ITitleSpecificViewModel titleSpecificView = IoC.Get<ITitleSpecificViewModel>();
+            this.WindowManager.ShowDialog(titleSpecificView);
+
+            if (titleSpecificView.SelectedTitle.HasValue)
+            {
+                this.StartScan(dialog.FileName, titleSpecificView.SelectedTitle.Value);
+            }
+        }
+
+        /// <summary>
         /// Cancel a Scan
         /// </summary>
         public void CancelScan()
@@ -776,26 +1197,33 @@
         /// </summary>
         public void StartEncode()
         {
-            // Santiy Checking.
-            if (this.ScannedSource == null || this.CurrentTask == null)
+            if (this.queueProcessor.IsProcessing)
             {
-                this.errorService.ShowMessageBox("You must first scan a source.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                this.errorService.ShowMessageBox("HandBrake is already encoding.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
 
-            if (string.IsNullOrEmpty(this.CurrentTask.Destination))
+            // Check if we already have jobs, and if we do, just start the queue.
+            if (this.queueProcessor.Count != 0)
             {
-                this.errorService.ShowMessageBox("The Destination field was empty.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                this.queueProcessor.Start();
                 return;
             }
 
-            if (this.queueProcessor.IsProcessing)
+            // Otherwise, perform Santiy Checking then add to the queue and start if everything is ok.
+            if (this.SelectedTitle == null)
             {
-                this.errorService.ShowMessageBox("HandBrake is already encoding.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                this.errorService.ShowMessageBox("You must first scan a source.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (string.IsNullOrEmpty(this.Destination))
+            {
+                this.errorService.ShowMessageBox("The Destination field was empty.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
 
-            if (File.Exists(this.CurrentTask.Destination))
+            if (File.Exists(this.Destination))
             {
                 MessageBoxResult result = this.errorService.ShowMessageBox("The current file already exists, do you wish to overwrite it?", "Question", MessageBoxButton.YesNo, MessageBoxImage.Question);
                 if (result == MessageBoxResult.No)
@@ -805,19 +1233,30 @@
             }
 
             // Create the Queue Task and Start Processing
-            QueueTask task = new QueueTask(null)
+            QueueTask task = new QueueTask
                 {
-                    Destination = this.CurrentTask.Destination,
-                    Task = this.CurrentTask,
-                    Query = QueryGeneratorUtility.GenerateQuery(this.CurrentTask),
+                    Task = new EncodeTask(this.CurrentTask),
                     CustomQuery = false
                 };
-            this.queueProcessor.QueueManager.Add(task);
+            this.queueProcessor.Add(task);
             this.queueProcessor.Start();
             this.IsEncoding = true;
         }
 
         /// <summary>
+        /// Edit a Queue Task
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void EditQueueJob(EncodeTask task)
+        {
+            // Rescan the source to make sure it's still valid
+            this.queueEditTask = task;
+            this.scanService.Scan(task.Source, task.Title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), QueueEditAction);
+        }
+
+        /// <summary>
         /// Pause an Encode
         /// </summary>
         public void PauseEncode()
@@ -830,6 +1269,7 @@
         /// </summary>
         public void StopEncode()
         {
+            this.queueProcessor.Pause();
             this.encodeService.Stop();
         }
 
@@ -841,6 +1281,36 @@
             Application.Current.Shutdown();
         }
 
+        /// <summary>
+        /// DEBUG: Show CLI Query for settings+6
+        /// </summary>
+        public void ShowCliQuery()
+        {
+            this.errorService.ShowMessageBox(
+                QueryGeneratorUtility.GenerateQuery(this.CurrentTask,
+                userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
+                userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
+                userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav)),
+                "CLI Query",
+                MessageBoxButton.OK,
+                MessageBoxImage.Information);
+        }
+
+        /// <summary>
+        /// The debug scan log.
+        /// </summary>
+        public void DebugScanLog()
+        {
+            VistaOpenFileDialog dialog = new VistaOpenFileDialog();
+
+            dialog.ShowDialog();
+
+            if (File.Exists(dialog.FileName))
+            {
+                this.scanService.DebugScanLog(dialog.FileName);
+            }
+        }
+
         #endregion
 
         #region Main Window Public Methods
@@ -856,7 +1326,7 @@
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
             {
                 string[] fileNames = e.Data.GetData(DataFormats.FileDrop, true) as string[];
-                if (fileNames != null && fileNames.Count() >= 1 && File.Exists(fileNames[0]))
+                if (fileNames != null && fileNames.Any() && (File.Exists(fileNames[0]) || Directory.Exists(fileNames[0])))
                 {
                     this.StartScan(fileNames[0], 0);
                 }
@@ -870,18 +1340,47 @@
         /// </summary>
         public void BrowseDestination()
         {
-            VistaSaveFileDialog dialog = new VistaSaveFileDialog
+            SaveFileDialog saveFileDialog = new SaveFileDialog
                 {
                     Filter = "mp4|*.mp4;*.m4v|mkv|*.mkv",
+                    CheckPathExists = true,
                     AddExtension = true,
+                    DefaultExt = ".mp4",
                     OverwritePrompt = true,
-                    DefaultExt = ".mp4"
+                    FilterIndex = this.CurrentTask.OutputFormat == OutputFormat.Mkv ? 1 : 0,
                 };
-            dialog.ShowDialog();
 
-            this.CurrentTask.Destination = dialog.FileName;
-            this.NotifyOfPropertyChange("CurrentTask");
-            this.SetExtension(Path.GetExtension(dialog.FileName));
+            if (this.CurrentTask != null && !string.IsNullOrEmpty(this.CurrentTask.Destination))
+            {
+                if (Directory.Exists(Path.GetDirectoryName(this.CurrentTask.Destination)))
+                {
+                    saveFileDialog.InitialDirectory = Path.GetDirectoryName(this.CurrentTask.Destination) + "\\";
+                }
+
+                saveFileDialog.FileName = Path.GetFileName(this.CurrentTask.Destination);
+            }
+
+            saveFileDialog.ShowDialog();
+            this.Destination = saveFileDialog.FileName;
+
+            // Set the Extension Dropdown. This will also set Mp4/m4v correctly.
+            if (!string.IsNullOrEmpty(saveFileDialog.FileName))
+            {
+                switch (Path.GetExtension(saveFileDialog.FileName))
+                {
+                    case ".mkv":
+                        this.SelectedOutputFormat = OutputFormat.Mkv;
+                        break;
+                    case ".mp4":
+                        this.SelectedOutputFormat = OutputFormat.Mp4;
+                        break;
+                    case ".m4v":
+                        this.SelectedOutputFormat = OutputFormat.M4V;
+                        break;
+                }
+
+                this.NotifyOfPropertyChange(() => this.CurrentTask);
+            }
         }
 
         /// <summary>
@@ -895,6 +1394,36 @@
         }
 
         /// <summary>
+        /// Update a selected preset.
+        /// </summary>
+        public void PresetUpdate()
+        {
+            if (this.SelectedPreset == null)
+            {
+                this.errorService.ShowMessageBox(
+                    "Please select a preset to update.", "No Preset selected", MessageBoxButton.OK, MessageBoxImage.Warning);
+
+                return;
+            }
+
+            if (this.SelectedPreset.IsBuildIn)
+            {
+                this.errorService.ShowMessageBox(
+                    "You can not modify built in presets. Please select one of your own presets.", "No Preset selected", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+            if (this.errorService.ShowMessageBox("Are you sure you wish to update the selected preset?", "Are you sure?", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+            {
+                this.SelectedPreset.Task = new EncodeTask(this.CurrentTask);
+                this.presetService.Update(this.SelectedPreset);
+
+                this.errorService.ShowMessageBox(
+                        "The Preset has now been updated with your current settings.", "Preset Updated", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        /// <summary>
         /// Remove a Preset
         /// </summary>
         public void PresetRemove()
@@ -936,10 +1465,12 @@
 
             if (!string.IsNullOrEmpty(filename))
             {
-                EncodeTask parsed = PlistPresetHandler.Import(filename);
-                if (this.presetService.CheckIfPresetExists(parsed.PresetName))
+                PList plist = new PList(filename);
+                Preset preset = PlistPresetFactory.CreatePreset(plist);
+
+                if (this.presetService.CheckIfPresetExists(preset.Name))
                 {
-                    if (!presetService.CanUpdatePreset(parsed.PresetName))
+                    if (!presetService.CanUpdatePreset(preset.Name))
                     {
                         MessageBox.Show(
                             "You can not import a preset with the same name as a built-in preset.",
@@ -957,18 +1488,15 @@
                             MessageBoxImage.Warning);
                     if (result == MessageBoxResult.Yes)
                     {
-                        Preset preset = new Preset { Name = parsed.PresetName, CropSettings = parsed.UsesPictureSettings, Task = parsed };
-
                         presetService.Update(preset);
                     }
                 }
                 else
                 {
-                    Preset preset = new Preset { Name = parsed.PresetName, Task = parsed, CropSettings = parsed.UsesPictureSettings, };
                     presetService.Add(preset);
                 }
 
-                this.NotifyOfPropertyChange("Presets");
+                this.NotifyOfPropertyChange(() => this.Presets);
             }
         }
 
@@ -977,15 +1505,27 @@
         /// </summary>
         public void PresetExport()
         {
-            VistaSaveFileDialog savefiledialog = new VistaSaveFileDialog { Filter = "plist|*.plist", CheckPathExists = true };
+            VistaSaveFileDialog savefiledialog = new VistaSaveFileDialog
+                                                     {
+                                                         Filter = "plist|*.plist",
+                                                         CheckPathExists = true,
+                                                         AddExtension = true,
+                                                         DefaultExt = ".plist",
+                                                         OverwritePrompt = true,
+                                                         FilterIndex = 0
+                                                     };
             if (this.selectedPreset != null)
             {
                 savefiledialog.ShowDialog();
                 string filename = savefiledialog.FileName;
 
-                if (filename != null)
+                if (!string.IsNullOrEmpty(filename))
                 {
-                    PlistPresetHandler.Export(savefiledialog.FileName, this.selectedPreset);
+                    PlistUtility.Export(
+                        savefiledialog.FileName,
+                        this.selectedPreset,
+                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild)
+                                          .ToString(CultureInfo.InvariantCulture));
                 }
             }
             else
@@ -1005,14 +1545,20 @@
         }
 
         /// <summary>
-        /// Set the selected preset.
+        /// Start a Scan
         /// </summary>
-        /// <param name="e">
-        /// The RoutedPropertyChangedEventArgs.
+        /// <param name="filename">
+        /// The filename.
         /// </param>
-        public void SetSelectedPreset(RoutedPropertyChangedEventArgs<object> e)
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        public void StartScan(string filename, int title)
         {
-            this.SelectedPreset = e.NewValue as Preset;
+            if (!string.IsNullOrEmpty(filename))
+            {
+                this.scanService.Scan(filename, title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), null);
+            }
         }
 
         #endregion
@@ -1020,20 +1566,52 @@
         #region Private Methods
 
         /// <summary>
-        /// Start a Scan
+        /// Update all the UI Components to allow the user to edit their previous settings.
         /// </summary>
-        /// <param name="filename">
-        /// The filename.
+        /// <param name="successful">
+        /// The successful.
         /// </param>
-        /// <param name="title">
-        /// The title.
-        /// </param>
-        private void StartScan(string filename, int title)
+        private void QueueEditAction(bool successful)
         {
-            // TODO 
-            // 1. Disable GUI.
-            this.sourcePath = filename;
-            this.scanService.Scan(filename, title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount));
+            Execute.OnUIThread(() =>
+                {
+                    // Copy all the Scan data into the UI
+                    this.scanService.SouceData.CopyTo(this.ScannedSource);
+                    this.NotifyOfPropertyChange(() => this.ScannedSource);
+                    this.NotifyOfPropertyChange(() => this.ScannedSource.Titles);
+
+                    // Select the Users Title
+                    this.SelectedTitle = this.ScannedSource.Titles.FirstOrDefault(t => t.TitleNumber == this.CurrentTask.Title);
+                    this.CurrentTask = new EncodeTask(queueEditTask);
+                    this.NotifyOfPropertyChange(() => this.CurrentTask);
+
+                    // Update the Main Window
+                    this.NotifyOfPropertyChange(() => this.Destination);
+                    this.NotifyOfPropertyChange(() => this.SelectedStartPoint);
+                    this.NotifyOfPropertyChange(() => this.SelectedEndPoint);
+                    this.NotifyOfPropertyChange(() => this.SelectedAngle);
+                    this.NotifyOfPropertyChange(() => this.SelectedPointToPoint);
+                    this.NotifyOfPropertyChange(() => this.SelectedOutputFormat);
+                    this.NotifyOfPropertyChange(() => IsMkv);
+
+                    // Update the Tab Controls
+                    this.PictureSettingsViewModel.UpdateTask(this.CurrentTask);
+                    this.VideoViewModel.UpdateTask(this.CurrentTask);
+                    this.FiltersViewModel.UpdateTask(this.CurrentTask);
+                    this.AudioViewModel.UpdateTask(this.CurrentTask);
+                    this.SubtitleViewModel.UpdateTask(this.CurrentTask);
+                    this.ChaptersViewModel.UpdateTask(this.CurrentTask);
+                    this.AdvancedViewModel.UpdateTask(this.CurrentTask);
+
+                    // Tell the Preivew Window
+                    IPreviewViewModel viewModel = IoC.Get<IPreviewViewModel>();
+                    viewModel.Task = this.CurrentTask;
+
+                    // Cleanup
+                    this.ShowStatusWindow = false;
+                    this.SourceLabel = this.SourceName;
+                    this.StatusLabel = "Scan Completed";
+                });
         }
 
         /// <summary>
@@ -1060,7 +1638,6 @@
                         break;
                 }
 
-                this.selectedOutputFormat = OutputFormat.Mp4;
                 this.IsMkv = false;
             }
 
@@ -1071,17 +1648,16 @@
                 this.CurrentTask.LargeFile = false;
                 this.CurrentTask.OptimizeMP4 = false;
                 this.CurrentTask.IPod5GSupport = false;
-                this.selectedOutputFormat = OutputFormat.Mkv;
             }
 
             // Update The browse file extension display
             if (Path.HasExtension(newExtension))
             {
-                this.CurrentTask.Destination = Path.ChangeExtension(this.CurrentTask.Destination, newExtension);
+                this.Destination = Path.ChangeExtension(this.Destination, newExtension);
             }
 
             // Update the UI Display
-            this.NotifyOfPropertyChange("CurrentTask");
+            this.NotifyOfPropertyChange(() => this.CurrentTask);
         }
 
         /// <summary>
@@ -1110,12 +1686,16 @@
         /// </returns>
         private string DurationCalculation()
         {
+            if (this.selectedTitle == null)
+            {
+                return "--:--:--";
+            }
+
             double startEndDuration = this.SelectedEndPoint - this.SelectedStartPoint;
             switch (this.SelectedPointToPoint)
             {
                 case PointToPointMode.Chapters:
                     return this.SelectedTitle.CalculateDuration(this.SelectedStartPoint, this.SelectedEndPoint).ToString();
-                    break;
                 case PointToPointMode.Seconds:
                     return TimeSpan.FromSeconds(startEndDuration).ToString();
                 case PointToPointMode.Frames:
@@ -1126,6 +1706,20 @@
             return "--:--:--";
         }
 
+        /// <summary>
+        /// Handle Update Check Results
+        /// </summary>
+        /// <param name="information">
+        /// The information.
+        /// </param>
+        private void HandleUpdateCheckResults(UpdateCheckInformation information)
+        {
+            if (information.NewVersionAvailable)
+            {
+                this.ProgramStatusLabel = "A New Update is Available. Goto Tools Menu > Options to Install";
+            }
+        }
+
         #endregion
 
         #region Event Handlers
@@ -1140,7 +1734,8 @@
         /// </param>
         private void ScanStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs e)
         {
-            this.SourceLabel = "Scanning Title " + e.CurrentTitle + " of " + e.Titles;
+            this.SourceLabel = string.Format("Scanning Title {0} of {1} ({2}%)", e.CurrentTitle, e.Titles, e.Percentage);
+            this.StatusLabel = string.Format("Scanning Title {0} of {1} ({2}%)", e.CurrentTitle, e.Titles, e.Percentage);
         }
 
         /// <summary>
@@ -1154,24 +1749,38 @@
         /// </param>
         private void ScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)
         {
-            Caliburn.Micro.Execute.OnUIThread(() =>
+            this.scanService.SouceData.CopyTo(this.ScannedSource);
+            Execute.OnUIThread(() =>
                 {
                     if (e.Successful)
                     {
-                        this.scanService.SouceData.CopyTo(this.ScannedSource);
-                        this.NotifyOfPropertyChange("ScannedSource");
-                        this.NotifyOfPropertyChange("ScannedSource.Titles");
-                        this.SelectedTitle = this.ScannedSource.Titles.Where(t => t.MainTitle).FirstOrDefault()
+                        this.NotifyOfPropertyChange(() => this.ScannedSource);
+                        this.NotifyOfPropertyChange(() => this.ScannedSource.Titles);
+                        this.SelectedTitle = this.ScannedSource.Titles.FirstOrDefault(t => t.MainTitle)
                                              ?? this.ScannedSource.Titles.FirstOrDefault();
-                        this.JobContextService.CurrentSource = this.ScannedSource;
-                        this.JobContextService.CurrentTask = this.CurrentTask;
-                        this.SetupTabs();
                     }
 
-                    this.SourceLabel = "Scan Completed";
+                    this.ShowStatusWindow = false;
+                    if (e.Successful)
+                    {
+                        this.SourceLabel = this.SourceName;
+                        this.StatusLabel = "Scan Completed";
+                    }
+                    else if (e.Cancelled)
+                    {
+                        this.SourceLabel = "Scan Cancelled.";
+                        this.StatusLabel = "Scan Cancelled.";
+                    }
+                    else if (e.Exception == null && e.ErrorInformation != null)
+                    {
+                        this.SourceLabel = "Scan failed: " + e.ErrorInformation;
+                        this.StatusLabel = "Scan failed: " + e.ErrorInformation;
+                    }
+                    else
+                    {
+                        this.SourceLabel = "Scan Failed... See Activity Log for details.";                        this.StatusLabel = "Scan Failed... See Activity Log for details.";
+                    }
                 });
-
-            // TODO Re-enable GUI.
         }
 
         /// <summary>
@@ -1185,7 +1794,12 @@
         /// </param>
         private void ScanStared(object sender, EventArgs e)
         {
-            // TODO - Disable relevant parts of the UI.
+            Execute.OnUIThread(
+                () =>
+                {
+                    this.StatusLabel = "Scanning source, please wait...";
+                    this.ShowStatusWindow = true;
+                });
         }
 
         /// <summary>
@@ -1199,33 +1813,58 @@
         /// </param>
         private void EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)
         {
-            ProgramStatusLabel =
-                string.Format(
-                "{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss},  Pending Jobs {5}",
-                e.PercentComplete,
-                e.CurrentFrameRate,
-                e.AverageFrameRate,
-                e.EstimatedTimeLeft,
-                e.ElapsedTime,
-                this.queueProcessor.QueueManager.Count);
+            int percent;
+            int.TryParse(
+                Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture),
+                out percent);
+
+
+            Execute.OnUIThread(
+                () =>
+                {
+                    if (this.IsEncoding)
+                    {
+                        this.ProgramStatusLabel =
+                            string.Format(
+                                "{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss},  Pending Jobs {5}",
+                                e.PercentComplete,
+                                e.CurrentFrameRate,
+                                e.AverageFrameRate,
+                                e.EstimatedTimeLeft,
+                                e.ElapsedTime,
+                                this.queueProcessor.Count);
+
+                        if (lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)
+                        {
+                            this.windowsSeven.SetTaskBarProgress(percent);
+                        }
+
+                        lastEncodePercentage = percent;
+                    }
+                });
         }
 
         /// <summary>
-        /// Encode Started Handler
+        /// Handle the Queue Starting Event
         /// </summary>
         /// <param name="sender">
-        /// The Sender
+        /// The sender.
         /// </param>
         /// <param name="e">
-        /// The EventArgs
+        /// The e.
         /// </param>
-        private void EncodeStarted(object sender, EventArgs e)
+        void QueueProcessorJobProcessingStarted(object sender, HandBrake.ApplicationServices.EventArgs.QueueProgressEventArgs e)
         {
-            // TODO Handle Updating the UI
+            Execute.OnUIThread(
+               () =>
+               {
+                   this.ProgramStatusLabel = "Preparing to encode ...";
+                   this.IsEncoding = true;
+               });
         }
 
         /// <summary>
-        /// The Queue has been paused handler
+        /// The Queue has completed handler
         /// </summary>
         /// <param name="sender">
         /// The Sender
@@ -1233,26 +1872,157 @@
         /// <param name="e">
         /// The EventArgs
         /// </param>
-        private void QueuePaused(object sender, EventArgs e)
+        private void QueueCompleted(object sender, EventArgs e)
+        {
+            this.IsEncoding = false;
+
+            Execute.OnUIThread(
+                () =>
+                {
+                    this.ProgramStatusLabel = "Queue Finished";
+                    this.IsEncoding = false;
+
+                    if (this.windowsSeven.IsWindowsSeven)
+                    {
+                        this.windowsSeven.SetTaskBarProgressToNoProgress();
+                    }
+                });
+        }
+
+        /// <summary>
+        /// The queue changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EventArgs.
+        /// </param>
+        private void QueueChanged(object sender, EventArgs e)
         {
-            // TODO Handle Updating the UI
+            Execute.OnUIThread(
+              () =>
+              {
+                  this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.Count);
+              });
         }
 
         /// <summary>
-        /// The Queue has completed handler
+        /// The process drive.
+        /// </summary>
+        /// <param name="item">
+        /// The item.
+        /// </param>
+        private void ProcessDrive(object item)
+        {
+            if (item != null)
+            {
+                this.StartScan(((DriveInformation)item).RootDirectory, 0);
+            }
+        }
+
+        /// <summary>
+        /// The generate source menu.
+        /// </summary>
+        /// <returns>
+        /// The System.Collections.Generic.IEnumerable`1[T -&gt; HandBrakeWPF.Model.SourceMenuItem].
+        /// </returns>
+        private IEnumerable<SourceMenuItem> GenerateSourceMenu()
+        {
+            List<SourceMenuItem> menuItems = new List<SourceMenuItem>();
+
+            SourceMenuItem folderScan = new SourceMenuItem
+            {
+                Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/folder.png")), Width = 16, Height = 16 },
+                Text = "Open Folder",
+                Command = new SourceMenuCommand(this.FolderScan)
+            };
+            SourceMenuItem fileScan = new SourceMenuItem
+            {
+                Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/Movies.png")), Width = 16, Height = 16 },
+                Text = "Open File",
+                Command = new SourceMenuCommand(this.FileScan)
+            };
+
+            SourceMenuItem titleSpecific = new SourceMenuItem { Text = "Title Specific Scan" };
+            SourceMenuItem folderScanTitle = new SourceMenuItem
+            {
+                Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/folder.png")), Width = 16, Height = 16 },
+                Text = "Open Folder",
+                Command = new SourceMenuCommand(this.FolderScanTitleSpecific)
+            };
+            SourceMenuItem fileScanTitle = new SourceMenuItem
+            {
+                Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/Movies.png")), Width = 16, Height = 16 },
+                Text = "Open File",
+                Command = new SourceMenuCommand(this.FileScanTitleSpecific)
+            };
+            titleSpecific.Children.Add(folderScanTitle);
+            titleSpecific.Children.Add(fileScanTitle);
+
+            menuItems.Add(folderScan);
+            menuItems.Add(fileScan);
+            menuItems.Add(titleSpecific);
+
+            // Drives
+            menuItems.AddRange(
+                from item in GeneralUtilities.GetDrives()
+                let driveInformation = item
+                select
+                    new SourceMenuItem
+                        {
+                            Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/disc_small.png")), Width = 16, Height = 16 },
+                            Text = string.Format("{0} ({1})", item.RootDirectory, item.VolumeLabel),
+                            Command = new SourceMenuCommand(() => this.ProcessDrive(driveInformation)),
+                            Tag = item
+                        });
+
+            return menuItems;
+        }
+
+        /// <summary>
+        /// The drive tray changed.
+        /// </summary>
+        private void DriveTrayChanged()
+        {
+            Caliburn.Micro.Execute.OnUIThread(() => this.SourceMenu = this.GenerateSourceMenu());
+        }
+
+        /// <summary>
+        /// Allows the main window to respond to setting changes.
         /// </summary>
         /// <param name="sender">
-        /// The Sender
+        /// The sender.
         /// </param>
         /// <param name="e">
-        /// The EventArgs
+        /// The e.
         /// </param>
-        private void QueueCompleted(object sender, EventArgs e)
+        private void UserSettingServiceSettingChanged(object sender, HandBrake.ApplicationServices.EventArgs.SettingChangedEventArgs e)
         {
-            this.IsEncoding = false;
+            if (e.Key == UserSettingConstants.ShowAdvancedTab)
+            {
+                this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+            }
+        }
 
-            // TODO Handle Updating the UI
+        /// <summary>
+        /// Handle the property changed event of the encode task. 
+        /// Allows the main window to respond to changes.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void CurrentTask_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+           if (e.PropertyName == UserSettingConstants.ShowAdvancedTab)
+           {
+               this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+           }
         }
+
         #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs Changed

@@ -13,19 +13,18 @@
     using System.Collections.Generic;
     using System.Collections.Specialized;
     using System.ComponentModel;
-    using System.ComponentModel.Composition;
     using System.Diagnostics;
     using System.Globalization;
     using System.IO;
     using System.Linq;
     using System.Windows;
 
-    using Caliburn.Micro;
-
     using HandBrake.ApplicationServices;
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
 
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.ViewModels.Interfaces;
 
     using Ookii.Dialogs.Wpf;
@@ -33,7 +32,6 @@
     /// <summary>
     /// The Options View Model
     /// </summary>
-    [Export(typeof(IOptionsViewModel))]
     public class OptionsViewModel : ViewModelBase, IOptionsViewModel
     {
         #region Constants and Fields
@@ -44,6 +42,16 @@
         private readonly IUserSettingService userSettingService;
 
         /// <summary>
+        /// The Shell View Model
+        /// </summary>
+        private readonly IShellViewModel shellViewModel;
+
+        /// <summary>
+        /// Backing field for the update service.
+        /// </summary>
+        private readonly IUpdateService updateService;
+
+        /// <summary>
         /// The add audio mode options.
         /// </summary>
         private BindingList<string> addAudioModeOptions = new BindingList<string>();
@@ -134,24 +142,14 @@
         private bool disableLibdvdNav;
 
         /// <summary>
-        /// The disable p reset update check notification.
-        /// </summary>
-        private bool disablePresetUpdateCheckNotification;
-
-        /// <summary>
-        /// The display status messages tray icon.
-        /// </summary>
-        private bool displayStatusMessagesTrayIcon;
-
-        /// <summary>
-        /// The enable gui tooltips.
+        /// The disable libhb features
         /// </summary>
-        private bool enableGuiTooltips;
+        private bool disableLibhbFeatures;
 
         /// <summary>
-        /// The enable query editor.
+        /// The disable p reset update check notification.
         /// </summary>
-        private bool enableQueryEditor;
+        private bool disablePresetUpdateCheckNotification;
 
         /// <summary>
         /// The growl after encode.
@@ -204,11 +202,6 @@
         private BindingList<string> priorityLevelOptions = new BindingList<string>();
 
         /// <summary>
-        /// The prompt on different query.
-        /// </summary>
-        private bool promptOnDifferentQuery;
-
-        /// <summary>
         /// The remove underscores.
         /// </summary>
         private bool removeUnderscores;
@@ -278,12 +271,6 @@
         /// </summary>
         private string sendFileToPath;
 
-
-        /// <summary>
-        /// The show cli window.
-        /// </summary>
-        private bool showCliWindow;
-
         /// <summary>
         /// The vlc path.
         /// </summary>
@@ -309,6 +296,61 @@
         /// </summary>
         private bool showAdvancedPassthruOpts;
 
+        /// <summary>
+        /// Backing field for clear queue on encode completed.
+        /// </summary>
+        private bool clearQueueOnEncodeCompleted;
+
+        /// <summary>
+        /// The options tab that is selected.
+        /// </summary>
+        private OptionsTab selectedTab;
+
+        /// <summary>
+        /// Update Message
+        /// </summary>
+        private string updateMessage;
+
+        /// <summary>
+        /// Update Available
+        /// </summary>
+        private bool updateAvailable;
+
+        /// <summary>
+        /// Download progress backing field.
+        /// </summary>
+        private int downloadProgressPercentage;
+
+        /// <summary>
+        /// Backing field for update info.
+        /// </summary>
+        private UpdateCheckInformation updateInfo;
+
+        /// <summary>
+        /// The enable process isolation.
+        /// </summary>
+        private bool enableProcessIsolation;
+
+        /// <summary>
+        /// The server port.
+        /// </summary>
+        private int serverPort;
+
+        /// <summary>
+        /// The server port.
+        /// </summary>
+        private bool enableDebugFeatures;
+
+        /// <summary>
+        /// Backing field for EnableLibHb
+        /// </summary>
+        private bool enableLibHb;
+
+        /// <summary>
+        /// The show advanced tab backing field.
+        /// </summary>
+        private bool showAdvancedTab;
+
         #endregion
 
         #region Constructors and Destructors
@@ -316,21 +358,55 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="OptionsViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
         /// <param name="userSettingService">
         /// The user Setting Service.
         /// </param>
-        public OptionsViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        /// <param name="shellViewModel">
+        /// The shell View Model.
+        /// </param>
+        /// <param name="updateService">
+        /// The update Service.
+        /// </param>
+        public OptionsViewModel(IUserSettingService userSettingService, IShellViewModel shellViewModel, IUpdateService updateService )
         {
             this.Title = "Options";
             this.userSettingService = userSettingService;
-            this.Load();
+            this.shellViewModel = shellViewModel;
+            this.updateService = updateService;
+            this.OnLoad();
+
+            this.SelectedTab = OptionsTab.General;
+            this.UpdateMessage = "Click 'Check for Updates' to check for new versions";
         }
 
         #endregion
 
+        #region Window Properties
+
+        /// <summary>
+        /// Gets or sets SelectedTab.
+        /// </summary>
+        public OptionsTab SelectedTab
+        {
+            get
+            {
+                return this.selectedTab;
+            }
+
+            set
+            {
+                this.selectedTab = value;
+                this.NotifyOfPropertyChange(() => this.SelectedTab);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the about view model.
+        /// </summary>
+        public IAboutViewModel AboutViewModel { get; set; }
+
+        #endregion
+
         #region Properties
 
         #region General
@@ -489,23 +565,6 @@
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether EnableGuiTooltips.
-        /// </summary>
-        public bool EnableGuiTooltips
-        {
-            get
-            {
-                return this.enableGuiTooltips;
-            }
-
-            set
-            {
-                this.enableGuiTooltips = value;
-                this.NotifyOfPropertyChange("EnableGuiTooltips");
-            }
-        }
-
-        /// <summary>
         /// Gets or sets WhenDone.
         /// </summary>
         public string WhenDone
@@ -697,7 +756,7 @@
             set
             {
                 this.preferredLanguages = value;
-                this.NotifyOfPropertyChange("preferredLanguages");
+                this.NotifyOfPropertyChange("PreferredLanguages");
             }
         }
 
@@ -714,7 +773,7 @@
             set
             {
                 this.selectedPreferredLangauge = value;
-                this.NotifyOfPropertyChange("SelectedPreferreedLangauge");
+                this.NotifyOfPropertyChange(() => SelectedPreferredLangauge);
             }
         }
 
@@ -731,7 +790,7 @@
             set
             {
                 this.selectedPreferredSubtitleLangauge = value;
-                this.NotifyOfPropertyChange("SelectedPreferredSubtitleLangauge");
+                this.NotifyOfPropertyChange(() => SelectedPreferredSubtitleLangauge);
             }
         }
 
@@ -1040,40 +1099,6 @@
         #region Advanced
 
         /// <summary>
-        /// Gets or sets a value indicating whether EnableQueryEditor.
-        /// </summary>
-        public bool EnableQueryEditor
-        {
-            get
-            {
-                return this.enableQueryEditor;
-            }
-
-            set
-            {
-                this.enableQueryEditor = value;
-                this.NotifyOfPropertyChange("EnableQueryEditor");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether PromptOnDifferentQuery.
-        /// </summary>
-        public bool PromptOnDifferentQuery
-        {
-            get
-            {
-                return this.promptOnDifferentQuery;
-            }
-
-            set
-            {
-                this.promptOnDifferentQuery = value;
-                this.NotifyOfPropertyChange("PromptOnDifferentQuery");
-            }
-        }
-
-        /// <summary>
         /// Gets or sets ConstantQualityGranularity.
         /// </summary>
         public BindingList<string> ConstantQualityGranularity
@@ -1125,23 +1150,6 @@
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether DisplayStatusMessagesTrayIcon.
-        /// </summary>
-        public bool DisplayStatusMessagesTrayIcon
-        {
-            get
-            {
-                return this.displayStatusMessagesTrayIcon;
-            }
-
-            set
-            {
-                this.displayStatusMessagesTrayIcon = value;
-                this.NotifyOfPropertyChange("DisplayStatusMessagesTrayIcon");
-            }
-        }
-
-        /// <summary>
         /// Gets or sets LogVerbosityOptions.
         /// </summary>
         public BindingList<int> LogVerbosityOptions
@@ -1244,28 +1252,198 @@
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether ShowCliWindow.
+        /// Gets or sets a value indicating whether ClearQueueOnEncodeCompleted.
+        /// </summary>
+        public bool ClearQueueOnEncodeCompleted
+        {
+            get
+            {
+                return this.clearQueueOnEncodeCompleted;
+            }
+            set
+            {
+                this.clearQueueOnEncodeCompleted = value;
+                this.NotifyOfPropertyChange(() => this.ClearQueueOnEncodeCompleted);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ClearQueueOnEncodeCompleted.
+        /// </summary>
+        public bool EnableProcessIsolation
+        {
+            get
+            {
+                return this.enableProcessIsolation;
+            }
+            set
+            {
+                this.enableProcessIsolation = value;
+                this.NotifyOfPropertyChange(() => this.EnableProcessIsolation);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the server port.
+        /// </summary>
+        public int ServerPort
+        {
+            get
+            {
+                return this.serverPort;
+            }
+            set
+            {
+                this.serverPort = value;
+                this.NotifyOfPropertyChange(() => this.ServerPort);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether debug features are enabled.
+        /// </summary>
+        public bool EnableDebugFeatures
+        {
+            get
+            {
+                return this.enableDebugFeatures;
+            }
+            set
+            {
+                this.enableDebugFeatures = value;
+                this.NotifyOfPropertyChange(() => this.EnableDebugFeatures);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether enable lib hb.
+        /// </summary>
+        public bool EnableLibHb
+        {
+            get
+            {
+                return this.enableLibHb;
+            }
+            set
+            {
+                this.enableLibHb = value;
+                this.NotifyOfPropertyChange(() => this.EnableLibHb);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether enable lib hb.
+        /// </summary>
+        public bool ShowAdvancedTab
+        {
+            get
+            {
+                return this.showAdvancedTab;
+            }
+            set
+            {
+                this.showAdvancedTab = value;
+                this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether DisableLibdvdNav.
         /// </summary>
-        public bool ShowCliWindow
+        public bool DisableLibHbFeatures
         {
             get
             {
-                return this.showCliWindow;
+                return this.disableLibhbFeatures;
             }
 
             set
             {
-                this.showCliWindow = value;
-                this.NotifyOfPropertyChange("ShowCliWindow");
+                this.disableLibhbFeatures = value;
+                this.NotifyOfPropertyChange("DisableLibHbFeatures");
             }
         }
+
+
         #endregion
 
         #endregion
 
+        #region About HandBrake
+
+        /// <summary>
+        /// Gets Version.
+        /// </summary>
+        public string Version
+        {
+            get
+            {
+                return string.Format("{0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion());
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets UpdateMessage.
+        /// </summary>
+        public string UpdateMessage
+        {
+            get
+            {
+                return this.updateMessage;
+            }
+            set
+            {
+                this.updateMessage = value;
+                this.NotifyOfPropertyChange(() => this.UpdateMessage);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether UpdateAvailable.
+        /// </summary>
+        public bool UpdateAvailable
+        {
+            get
+            {
+                return this.updateAvailable;
+            }
+            set
+            {
+                this.updateAvailable = value;
+                this.NotifyOfPropertyChange(() => this.UpdateAvailable);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets DownloadProgressPercentage.
+        /// </summary>
+        public int DownloadProgressPercentage
+        {
+            get
+            {
+                return this.downloadProgressPercentage;
+            }
+            set
+            {
+                this.downloadProgressPercentage = value;
+                this.NotifyOfPropertyChange(() => this.DownloadProgressPercentage);
+            }
+        }
+
+        #endregion
+
         #region Public Methods
 
         /// <summary>
+        /// Load / Update the user settings.
+        /// </summary>
+        protected override void OnActivate()
+        {
+            this.OnLoad();
+            base.OnActivate();
+        }
+
+        /// <summary>
         /// Load User Settings
         /// </summary>
         public override void OnLoad()
@@ -1274,10 +1452,10 @@
             // General
             // #############################
 
-            this.enableGuiTooltips = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TooltipEnable);
-            this.checkForUpdates = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UpdateStatus);
+            this.CheckForUpdates = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UpdateStatus);
 
             // Days between update checks
+            this.checkForUpdatesFrequencies.Clear();
             this.checkForUpdatesFrequencies.Add("Daily");
             this.checkForUpdatesFrequencies.Add("Weekly");
             this.checkForUpdatesFrequencies.Add("Monthly");
@@ -1286,66 +1464,68 @@
             switch (this.userSettingService.GetUserSetting<int>(UserSettingConstants.DaysBetweenUpdateCheck))
             {
                 case 1:
-                    this.checkForUpdatesFrequency = 1;
+                    this.CheckForUpdatesFrequency = 0;
                     break;
                 case 7:
-                    this.checkForUpdatesFrequency = 2;
+                    this.CheckForUpdatesFrequency = 1;
                     break;
                 case 30:
-                    this.checkForUpdatesFrequency = 3;
+                    this.CheckForUpdatesFrequency = 2;
                     break;
             }
 
             // On Encode Completeion Action
+            this.whenDoneOptions.Clear();
             this.whenDoneOptions.Add("Do nothing");
             this.whenDoneOptions.Add("Shutdown");
             this.whenDoneOptions.Add("Suspend");
             this.whenDoneOptions.Add("Hibernate");
-            this.whenDoneOptions.Add("Lock system");
+            this.whenDoneOptions.Add("Lock System");
             this.whenDoneOptions.Add("Log off");
-            this.whenDoneOptions.Add("Quit HandBrake");
-            this.whenDone = userSettingService.GetUserSetting<string>("WhenCompleteAction");
+           // this.whenDoneOptions.Add("Quit HandBrake");
+            this.WhenDone = userSettingService.GetUserSetting<string>("WhenCompleteAction");
 
-            this.growlAfterEncode = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.GrowlEncode);
-            this.growlAfterQueue = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.GrowlQueue);
-            this.sendFileAfterEncode = this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SendFile);
-            this.sendFileTo = Path.GetFileNameWithoutExtension(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo)) ?? string.Empty;
-            this.sendFileToPath = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo) ?? string.Empty;
-            this.arguments = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileToArgs) ?? string.Empty;
+            this.GrowlAfterEncode = userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode);
+            this.GrowlAfterQueue = userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlQueue);
+            this.SendFileAfterEncode = this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SendFile);
+            this.SendFileTo = Path.GetFileNameWithoutExtension(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo)) ?? string.Empty;
+            this.SendFileToPath = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo) ?? string.Empty;
+            this.Arguments = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileToArgs) ?? string.Empty;
 
             // #############################
             // Output Settings
             // #############################
 
             // Enable auto naming feature.)
-            this.automaticallyNameFiles = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming);
+            this.AutomaticallyNameFiles = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming);
 
             // Store the auto name path
-            this.autoNameDefaultPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath) ?? string.Empty;
+            this.AutoNameDefaultPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath) ?? string.Empty;
             if (string.IsNullOrEmpty(this.autoNameDefaultPath))
-                this.autoNameDefaultPath = "Click 'Browse' to set the default location";
+                this.AutoNameDefaultPath = "Click 'Browse' to set the default location";
 
             // Store auto name format
-            this.autonameFormat = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) ?? string.Empty;
+            this.AutonameFormat = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) ?? string.Empty;
 
             // Use iPod/iTunes friendly .m4v extension for MP4 files.
+            this.mp4ExtensionOptions.Clear();
             this.mp4ExtensionOptions.Add("Automatic");
             this.mp4ExtensionOptions.Add("Always use MP4");
             this.mp4ExtensionOptions.Add("Always use M4V");
-            this.selectedMp4Extension = this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v);
+            this.SelectedMp4Extension = this.userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v);
 
             // Remove Underscores
-            this.removeUnderscores = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore);
+            this.RemoveUnderscores = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore);
 
             // Title case
-            this.changeToTitleCase = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameTitleCase);
+            this.ChangeToTitleCase = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameTitleCase);
 
             // #############################
             // Picture Tab
             // #############################
 
             // VLC Path
-            this.vlcPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path) ?? string.Empty;
+            this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path) ?? string.Empty;
 
             // #############################
             // Audio and Subtitles Tab
@@ -1355,7 +1535,9 @@
             this.SelectedLangaugesToMove = new BindingList<string>();
 
             IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
+            langList = (from entry in langList orderby entry.Key ascending select entry).ToDictionary(pair => pair.Key, pair => pair.Value);
 
+            this.selectedLangauges.Clear();
             foreach (string selectedItem in this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
             {
                 // removing wrong keys when a new Language list comes out.
@@ -1365,101 +1547,121 @@
                 }
             }
 
+            this.preferredLanguages.Clear();
+            this.availableLanguages.Clear();
             foreach (string item in langList.Keys)
             {
                 this.preferredLanguages.Add(item);
 
                 // In the available languages should be no "Any" and no selected language.
-                if ((item != "Any") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))
+                if ((item != "(Any)") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))
                 {
                     this.availableLanguages.Add(item);
                 }
             }
 
-            this.selectedPreferredLangauge = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) ?? string.Empty;
-            this.selectedPreferredSubtitleLangauge = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles) ?? string.Empty;
+            this.SelectedPreferredLangauge = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) ?? string.Empty;
+            this.SelectedPreferredSubtitleLangauge = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles) ?? string.Empty;
 
+            this.AddAudioModeOptions.Clear();
             this.AddAudioModeOptions.Add("None");
-            this.AddAudioModeOptions.Add("All Remaining Tracks");
-            this.AddAudioModeOptions.Add("All for Selected Languages");
+            this.AddAudioModeOptions.Add("Add All Remaining Tracks");
+            this.AddAudioModeOptions.Add("Add All for Selected Languages");
 
+            this.AddSubtitleModeOptions.Clear();
             this.AddSubtitleModeOptions.Add("None");
-            this.AddSubtitleModeOptions.Add("All");
-            this.AddSubtitleModeOptions.Add("First");
-            this.AddSubtitleModeOptions.Add("Selected");
-            this.AddSubtitleModeOptions.Add("Prefered Only (First)");
-            this.AddSubtitleModeOptions.Add("Prefered Only (All)");
+            this.AddSubtitleModeOptions.Add("Add All (Where possible)");
+            this.AddSubtitleModeOptions.Add("Add First");
+            this.AddSubtitleModeOptions.Add("Add all for Selected Languages");
+            this.AddSubtitleModeOptions.Add("Add only for Prefered Language (First)");
+            this.AddSubtitleModeOptions.Add("Add all for Prefered Language");
 
-            this.selectedAddAudioMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
-            this.selectedAddSubtitleMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
+            this.SelectedAddAudioMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
+            this.SelectedAddSubtitleMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
 
-            this.addOnlyOneAudioTrackPerLanguage = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);
+            this.AddOnlyOneAudioTrackPerLanguage = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);
 
-            this.addClosedCaptions = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption);
-            this.showAdvancedPassthruOpts = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
+            this.AddClosedCaptions = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption);
+            this.ShowAdvancedPassthruOpts = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
 
             // #############################
             // CLI
             // #############################
 
             // Priority level for encodes
-            this.priorityLevelOptions.Add("Realtime");
+            this.priorityLevelOptions.Clear();
             this.priorityLevelOptions.Add("High");
             this.priorityLevelOptions.Add("Above Normal");
             this.priorityLevelOptions.Add("Normal");
             this.priorityLevelOptions.Add("Below Normal");
             this.priorityLevelOptions.Add("Low");
-            this.selectedPriority = userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority);
+            this.SelectedPriority = userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority);
 
-            this.preventSleep = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep);
+            this.PreventSleep = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep);
 
             // Log Verbosity Level
+            this.logVerbosityOptions.Clear();
             this.logVerbosityOptions.Add(0);
             this.logVerbosityOptions.Add(1);
             this.logVerbosityOptions.Add(2);
-            this.selectedVerbosity = userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
+            this.SelectedVerbosity = userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
 
             // Logs
-            this.copyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogWithVideo);
-            this.copyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogToCopyDirectory);
+            this.CopyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogWithVideo);
+            this.CopyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogToCopyDirectory);
 
             // The saved log path
-            this.logDirectory = userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;
+            this.LogDirectory = userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;
 
-            this.clearOldOlgs = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);
+            this.ClearOldOlgs = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);
 
             // #############################
             // Advanced
             // #############################
 
             // Minimise to Tray
-            this.displayStatusMessagesTrayIcon = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TrayIconAlerts);
-            this.minimiseToTray = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);
-            this.enableQueryEditor = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.QueryEditorTab);
-            this.promptOnDifferentQuery = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PromptOnUnmatchingQueries);
-            this.disablePresetUpdateCheckNotification = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification);
-            this.showCliWindow = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI);
+            this.MinimiseToTray = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);
+            this.DisablePresetUpdateCheckNotification = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification);
+            this.ClearQueueOnEncodeCompleted = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ClearCompletedFromQueue);
+            this.ShowAdvancedTab = userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);
 
             // Set the preview count
+            this.PreviewPicturesToScan.Clear();
             this.PreviewPicturesToScan.Add(10);
             this.PreviewPicturesToScan.Add(15);
             this.PreviewPicturesToScan.Add(20);
             this.PreviewPicturesToScan.Add(25);
             this.PreviewPicturesToScan.Add(30);
-            this.selectedPreviewCount = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);
+            this.PreviewPicturesToScan.Add(35);
+            this.PreviewPicturesToScan.Add(40);
+            this.PreviewPicturesToScan.Add(45);
+            this.PreviewPicturesToScan.Add(50);
+            this.PreviewPicturesToScan.Add(55);
+            this.PreviewPicturesToScan.Add(60);
+            this.SelectedPreviewCount = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);
 
             // x264 step
-            this.ConstantQualityGranularity.Add("1.0");
+            this.ConstantQualityGranularity.Clear();
+            this.ConstantQualityGranularity.Add("1.00");
             this.ConstantQualityGranularity.Add("0.50");
             this.ConstantQualityGranularity.Add("0.25");
-            this.ConstantQualityGranularity.Add("0.20");
-            this.selectedGranulairty = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step).ToString("0.00", CultureInfo.InvariantCulture);
+            this.SelectedGranulairty = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step).ToString("0.00", CultureInfo.InvariantCulture);
 
             // Min Title Length
-            this.minLength = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.MinScanDuration);
+            this.MinLength = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.MinScanDuration);
+
+            // Use dvdnav
+            this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav);
 
-            // Use Experimental dvdnav
-            this.disableLibdvdNav = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav);
+            int port;
+            int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);
+            this.ServerPort = port;
+            this.EnableProcessIsolation = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
+            this.EnableDebugFeatures = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDebugFeatures);
+            this.EnableLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
+
+            // LibHbFeatures
+            this.DisableLibHbFeatures = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibHbFeatures);
         }
 
         /// <summary>
@@ -1468,7 +1670,7 @@
         public void Close()
         {
             this.Save();
-            this.TryClose();
+            this.shellViewModel.DisplayWindow(ShellWindow.MainWindow);
         }
 
         /// <summary>
@@ -1505,9 +1707,9 @@
         /// <summary>
         /// Audio List Move Left
         /// </summary>
-        public void LanguageMoveLeft()
+        public void LanguageMoveRight()
         {
-            if (this.AvailableLanguages.Count > 0)
+            if (this.SelectedAvailableToMove.Count > 0)
             {
                 List<string> copiedList = SelectedAvailableToMove.ToList();
                 foreach (string item in copiedList)
@@ -1515,15 +1717,17 @@
                     this.AvailableLanguages.Remove(item);
                     this.SelectedLangauges.Add(item);
                 }
+
+                this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
             }
         }
 
         /// <summary>
         /// Audio List Move Right
         /// </summary>
-        public void LanguageMoveRight()
+        public void LanguageMoveLeft()
         {
-            if (this.SelectedLangauges.Count > 0)
+            if (this.SelectedLangaugesToMove.Count > 0)
             {
                 List<string> copiedList = SelectedLangaugesToMove.ToList();
                 foreach (string item in copiedList)
@@ -1532,6 +1736,8 @@
                     this.AvailableLanguages.Add(item);
                 }
             }
+
+            this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
         }
 
         /// <summary>
@@ -1543,52 +1749,12 @@
             {
                 this.AvailableLanguages.Add(item);
             }
+            this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
 
             this.SelectedLangauges.Clear();
         }
 
         /// <summary>
-        ///  Audio List Language Move UP
-        /// </summary>
-        public void LanguageMoveUp()
-        {
-            List<string> langauges = this.SelectedLangauges.ToList();
-            foreach (string item in langauges)
-            {
-                if (this.SelectedLangaugesToMove.Contains(item))
-                {
-                    int index = this.SelectedLangauges.IndexOf(item);
-                    if (index != 0)
-                    {
-                        this.SelectedLangauges.Remove(item);
-                        this.SelectedLangauges.Insert(index - 1, item);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Audio List Language Move Down
-        /// </summary>
-        public void LanguageMoveDown()
-        {
-            List<string> langauges = this.SelectedLangauges.ToList();
-            int count = this.SelectedLangauges.Count;
-            foreach (string item in langauges)
-            {
-                if (this.SelectedLangaugesToMove.Contains(item))
-                {
-                    int index = this.SelectedLangauges.IndexOf(item);
-                    if ((index + 1) != count)
-                    {
-                        this.SelectedLangauges.Remove(item);
-                        this.SelectedLangauges.Insert(index + 1, item);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
         /// Browse - Log Path
         /// </summary>
         public void BrowseLogPath()
@@ -1622,6 +1788,27 @@
                 MessageBox.Show("HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButton.OK, MessageBoxImage.Information);
             }
         }
+        #endregion
+
+        #region Updates
+
+        /// <summary>
+        /// Download an Update
+        /// </summary>
+        public void DownloadUpdate()
+        {
+            this.UpdateMessage = "Preparing for Update ...";
+            this.updateService.DownloadFile(this.updateInfo.DownloadFile, this.DownloadComplete, this.DownloadProgress);
+        }
+
+        /// <summary>
+        /// Check for updates
+        /// </summary>
+        public void PerformUpdateCheck()
+        {
+            this.UpdateMessage = "Checking for Updates ...";
+            this.updateService.CheckForUpdates(this.UpdateCheckComplete);
+        }
 
         #endregion
 
@@ -1633,10 +1820,9 @@
             /* General */
             this.userSettingService.SetUserSetting(UserSettingConstants.UpdateStatus, this.CheckForUpdates);
             this.userSettingService.SetUserSetting(UserSettingConstants.DaysBetweenUpdateCheck, this.CheckForUpdatesFrequency);
-            this.userSettingService.SetUserSetting(UserSettingConstants.TooltipEnable, this.EnableGuiTooltips);
             this.userSettingService.SetUserSetting(ASUserSettingConstants.WhenCompleteAction, this.WhenDone);
-            this.userSettingService.SetUserSetting(ASUserSettingConstants.GrowlQueue, this.GrowlAfterQueue);
-            this.userSettingService.SetUserSetting(ASUserSettingConstants.GrowlEncode, this.GrowlAfterEncode);
+            this.userSettingService.SetUserSetting(UserSettingConstants.GrowlQueue, this.GrowlAfterQueue);
+            this.userSettingService.SetUserSetting(UserSettingConstants.GrowlEncode, this.GrowlAfterEncode);
             this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFileTo, this.SendFileToPath);
             this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFile, this.SendFileAfterEncode);
             this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFileToArgs, this.Arguments);
@@ -1675,21 +1861,92 @@
 
             /* Advanced */
             userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);
-            userSettingService.SetUserSetting(UserSettingConstants.TrayIconAlerts, this.DisplayStatusMessagesTrayIcon);
-            userSettingService.SetUserSetting(UserSettingConstants.QueryEditorTab, this.EnableQueryEditor);
-            userSettingService.SetUserSetting(UserSettingConstants.PromptOnUnmatchingQueries, this.PromptOnDifferentQuery);
             userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, this.DisablePresetUpdateCheckNotification);
-            userSettingService.SetUserSetting(ASUserSettingConstants.ShowCLI, this.ShowCliWindow);
+            userSettingService.SetUserSetting(ASUserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);
             userSettingService.SetUserSetting(ASUserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
-            userSettingService.SetUserSetting(ASUserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty));
+            userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));
+            userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
+            userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
 
             int value;
-            if (int.TryParse(this.MinLength.ToString(), out value))
+            if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))
             {
                 this.userSettingService.SetUserSetting(ASUserSettingConstants.MinScanDuration, value);
             }
 
             userSettingService.SetUserSetting(ASUserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);
+            userSettingService.SetUserSetting(UserSettingConstants.EnableProcessIsolation, this.EnableProcessIsolation);
+            userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString());
+            userSettingService.SetUserSetting(UserSettingConstants.EnableDebugFeatures, this.EnableDebugFeatures);
+            userSettingService.SetUserSetting(UserSettingConstants.DisableLibHbFeatures, this.DisableLibHbFeatures);
+        }
+
+        /// <summary>
+        /// Update Check Complete
+        /// </summary>
+        /// <param name="info">
+        /// The info.
+        /// </param>
+        private void UpdateCheckComplete(UpdateCheckInformation info)
+        {
+            this.updateInfo = info;
+            if (info.NewVersionAvailable)
+            {
+                this.UpdateMessage = "A New Update is Available!";
+                this.UpdateAvailable = true;
+            } 
+            else
+            {
+                this.UpdateMessage = "There are no new updates at this time.";
+                this.UpdateAvailable = false;
+            }
+        }
+
+        /// <summary>
+        /// Download Progress Action
+        /// </summary>
+        /// <param name="info">
+        /// The info.
+        /// </param>
+        private void DownloadProgress(DownloadStatus info)
+        {
+            if (info.TotalBytes == 0 || info.BytesRead == 0)
+            {
+                return;
+            }
+
+            long p = (info.BytesRead * 100) / info.TotalBytes;
+            int progress;
+            int.TryParse(p.ToString(CultureInfo.InvariantCulture), out progress);
+            this.DownloadProgressPercentage = progress;
+            this.UpdateMessage = string.Format(
+                "Downloading... {0}% - {1}k of {2}k", this.DownloadProgressPercentage, (info.BytesRead / 1024), (info.TotalBytes / 1024));
+        }
+
+        /// <summary>
+        /// Download Complete Action
+        /// </summary>
+        /// <param name="info">
+        /// The info.
+        /// </param>
+        private void DownloadComplete(DownloadStatus info)
+        {
+            this.UpdateAvailable = false;
+            this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Failed. You can try downloading the update from http://handbrake.fr";
+
+            Process.Start(Path.Combine(Path.GetTempPath(), "handbrake-setup.exe"));
+            Application.Current.Shutdown();
+        }
+
+        /// <summary>
+        /// The goto tab.
+        /// </summary>
+        /// <param name="tab">
+        /// The tab.
+        /// </param>
+        public void GotoTab(OptionsTab tab)
+        {
+            this.SelectedTab = tab;
         }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs Changed

@@ -11,8 +11,8 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.ComponentModel.Composition;
     using System.Drawing;
+    using System.Globalization;
 
     using Caliburn.Micro;
 
@@ -26,17 +26,17 @@
     /// <summary>
     /// The Picture Settings View Model
     /// </summary>
-    [Export(typeof(IPictureSettingsViewModel))]
     public class PictureSettingsViewModel : ViewModelBase, IPictureSettingsViewModel
     {
         /*
          * TODO:
-         * Handle Presets when a new title is set
-         * Handle changes in cropping affecting the resolution calcuation.
+         * - We are not handling cropping correctly within the UI.
+         * - The Height is not correctly set when using no Anamorphic
+         * - Maintain Aspect ratio needs corrected.
+         * - Custom Anamorphic.
          * 
          */
-
-        #region Backing Fields
+        #region Constants and Fields
 
         /// <summary>
         /// The display size.
@@ -44,9 +44,9 @@
         private string displaySize;
 
         /// <summary>
-        /// The source info.
+        ///  Backing field for for height control enabled
         /// </summary>
-        private string sourceInfo;
+        private bool heightControlEnabled = true;
 
         /// <summary>
         ///  Backing field for show custom anamorphic controls
@@ -54,30 +54,50 @@
         private bool showCustomAnamorphicControls;
 
         /// <summary>
-        ///  Backing field for for height control enabled
+        /// The source info.
         /// </summary>
-        private bool heightControlEnabled = true;
+        private string sourceInfo;
+
+        /// <summary>
+        /// Source Par Values
+        /// </summary>
+        private Size sourceParValues;
+
+        /// <summary>
+        /// Source Resolution
+        /// </summary>
+        private Size sourceResolution;
 
         /// <summary>
         /// Backing field for width control enabled.
         /// </summary>
         private bool widthControlEnabled = true;
 
-        #endregion
+        /// <summary>
+        /// Backing field for the show modulus field
+        /// </summary>
+        private bool showModulus;
 
-        #region Source Information
+        /// <summary>
+        /// Backing field for showing display size.
+        /// </summary>
+        private bool showDisplaySize;
 
         /// <summary>
-        /// Source Resolution
+        /// Backing field for max height
         /// </summary>
-        private Size sourceResolution;
+        private int maxHeight;
 
-        private double sourceAspectRatio;
+        /// <summary>
+        /// Backing field for max width
+        /// </summary>
+        private int maxWidth;
 
         /// <summary>
-        /// Source Par Values
+        /// The show keep ar backing field.
         /// </summary>
-        private Size sourceParValues;
+        private bool showKeepAr = true;
+
         #endregion
 
         #region Constructors and Destructors
@@ -96,16 +116,15 @@
             this.Task = new EncodeTask();
             this.SelectedModulus = 16;
             this.MaintainAspectRatio = true;
+
+            // Default the Max Width / Height to 1080p format
+            this.MaxHeight = 1080;
+            this.MaxWidth = 1920;
         }
 
         #endregion
 
-        #region Public Properties
-
-        /// <summary>
-        /// Gets or sets Task.
-        /// </summary>
-        public EncodeTask Task { get; set; }
+        #region Properties
 
         /// <summary>
         /// Gets AnamorphicModes.
@@ -127,10 +146,12 @@
             {
                 return this.Task.Cropping.Bottom;
             }
+
             set
             {
-                this.Task.Cropping.Bottom = this.CorrectForModulus(this.Task.Cropping.Bottom, value);
+                this.Task.Cropping.Bottom = value;
                 this.NotifyOfPropertyChange(() => this.CropBottom);
+                this.SetDisplaySize();
             }
         }
 
@@ -143,10 +164,12 @@
             {
                 return this.Task.Cropping.Left;
             }
+
             set
             {
-                this.Task.Cropping.Left = this.CorrectForModulus(this.Task.Cropping.Left, value);
+                this.Task.Cropping.Left = value;
                 this.NotifyOfPropertyChange(() => this.CropLeft);
+                this.SetDisplaySize();
             }
         }
 
@@ -159,10 +182,12 @@
             {
                 return this.Task.Cropping.Right;
             }
+
             set
             {
-                this.Task.Cropping.Right = this.CorrectForModulus(this.Task.Cropping.Right, value);
+                this.Task.Cropping.Right = value;
                 this.NotifyOfPropertyChange(() => this.CropRight);
+                this.SetDisplaySize();
             }
         }
 
@@ -178,8 +203,9 @@
 
             set
             {
-                this.Task.Cropping.Top = this.CorrectForModulus(this.Task.Cropping.Top, value);
+                this.Task.Cropping.Top = value;
                 this.NotifyOfPropertyChange(() => this.CropTop);
+                this.SetDisplaySize();
             }
         }
 
@@ -192,6 +218,7 @@
             {
                 return this.displaySize;
             }
+
             set
             {
                 this.displaySize = value;
@@ -206,13 +233,57 @@
         {
             get
             {
-                return this.Task.DisplayWidth.HasValue ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString()) : 0;
+                return this.Task.DisplayWidth.HasValue
+                           ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString(CultureInfo.InvariantCulture))
+                           : 0;
             }
+
             set
             {
-                this.Task.DisplayWidth = value;
-                this.CustomAnamorphicAdjust();
-                this.NotifyOfPropertyChange(() => this.DisplayWidth);
+                if (!object.Equals(this.Task.DisplayWidth, value))
+                {
+                    this.Task.DisplayWidth = value;
+                    this.CustomAnamorphicAdjust();
+                    this.NotifyOfPropertyChange(() => this.DisplayWidth);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Height.
+        /// </summary>
+        public int Height
+        {
+            get
+            {
+                return this.Task.Height.HasValue ? this.Task.Height.Value : 0;
+            }
+
+            set
+            {
+                if (!object.Equals(this.Task.Height, value))
+                {
+                    this.Task.Height = value;
+                    this.HeightAdjust();
+                    this.NotifyOfPropertyChange(() => this.Height);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether HeightControlEnabled.
+        /// </summary>
+        public bool HeightControlEnabled
+        {
+            get
+            {
+                return this.heightControlEnabled;
+            }
+
+            set
+            {
+                this.heightControlEnabled = value;
+                this.NotifyOfPropertyChange(() => this.HeightControlEnabled);
             }
         }
 
@@ -225,6 +296,7 @@
             {
                 return this.Task.HasCropping;
             }
+
             set
             {
                 this.Task.HasCropping = value;
@@ -241,6 +313,7 @@
             {
                 return this.Task.KeepDisplayAspect;
             }
+
             set
             {
                 this.Task.KeepDisplayAspect = value;
@@ -269,11 +342,15 @@
             {
                 return this.Task.PixelAspectY;
             }
+
             set
             {
-                this.Task.PixelAspectY = value;
-                this.CustomAnamorphicAdjust();
-                this.NotifyOfPropertyChange(() => this.ParHeight);
+                if (!object.Equals(this.Task.PixelAspectY, value))
+                {
+                    this.Task.PixelAspectY = value;
+                    this.CustomAnamorphicAdjust();
+                    this.NotifyOfPropertyChange(() => this.ParHeight);
+                }
             }
         }
 
@@ -286,11 +363,15 @@
             {
                 return this.Task.PixelAspectX;
             }
+
             set
             {
-                this.Task.PixelAspectX = value;
-                this.CustomAnamorphicAdjust();
-                this.NotifyOfPropertyChange(() => this.ParWidth);
+                if (!object.Equals(this.Task.PixelAspectX, value))
+                {
+                    this.Task.PixelAspectX = value;
+                    this.CustomAnamorphicAdjust();
+                    this.NotifyOfPropertyChange(() => this.ParWidth);
+                }
             }
         }
 
@@ -303,6 +384,7 @@
             {
                 return this.Task.Anamorphic;
             }
+
             set
             {
                 this.Task.Anamorphic = value;
@@ -320,6 +402,7 @@
             {
                 return this.Task.Modulus;
             }
+
             set
             {
                 this.Task.Modulus = value;
@@ -329,6 +412,55 @@
         }
 
         /// <summary>
+        /// Gets or sets a value indicating whether ShowCustomAnamorphicControls.
+        /// </summary>
+        public bool ShowCustomAnamorphicControls
+        {
+            get
+            {
+                return this.showCustomAnamorphicControls;
+            }
+
+            set
+            {
+                this.showCustomAnamorphicControls = value;
+                this.NotifyOfPropertyChange(() => this.ShowCustomAnamorphicControls);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ShowModulus.
+        /// </summary>
+        public bool ShowModulus
+        {
+            get
+            {
+                return this.showModulus;
+            }
+            set
+            {
+                this.showModulus = value;
+                this.NotifyOfPropertyChange(() => this.ShowModulus);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ShowDisplaySize.
+        /// </summary>
+        public bool ShowDisplaySize
+        {
+            get
+            {
+                return this.showDisplaySize;
+            }
+            set
+            {
+                this.showDisplaySize = value;
+                this.NotifyOfPropertyChange(() => this.ShowDisplaySize);
+            }
+        }
+
+        /// <summary>
         /// Gets or sets SourceInfo.
         /// </summary>
         public string SourceInfo
@@ -337,6 +469,7 @@
             {
                 return this.sourceInfo;
             }
+
             set
             {
                 this.sourceInfo = value;
@@ -345,6 +478,11 @@
         }
 
         /// <summary>
+        /// Gets or sets Task.
+        /// </summary>
+        public EncodeTask Task { get; set; }
+
+        /// <summary>
         /// Gets or sets Width.
         /// </summary>
         public int Width
@@ -356,256 +494,300 @@
 
             set
             {
-                this.Task.Width = value;
-                this.WidthAdjust();
-                this.NotifyOfPropertyChange(() => this.Width);
+                if (!object.Equals(this.Task.Width, value))
+                {
+                    this.Task.Width = value;
+                    this.WidthAdjust();
+                    this.NotifyOfPropertyChange(() => this.Width);
+                }
             }
         }
 
         /// <summary>
-        /// Gets or sets Height.
+        /// Gets or sets a value indicating whether WidthControlEnabled.
         /// </summary>
-        public int Height
+        public bool WidthControlEnabled
         {
             get
             {
-                return this.Task.Height.HasValue ? this.Task.Height.Value : 0;
+                return this.widthControlEnabled;
             }
+
             set
             {
-                this.Task.Height = value;
-                this.HeightAdjust();
-                this.NotifyOfPropertyChange(() => this.Height);
+                this.widthControlEnabled = value;
+                this.NotifyOfPropertyChange(() => this.WidthControlEnabled);
             }
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether ShowCustomAnamorphicControls.
+        /// Gets or sets MaxHeight.
         /// </summary>
-        public bool ShowCustomAnamorphicControls
+        public int MaxHeight
         {
             get
             {
-                return this.showCustomAnamorphicControls;
+                return this.maxHeight;
             }
             set
             {
-                this.showCustomAnamorphicControls = value;
-                this.NotifyOfPropertyChange(() => ShowCustomAnamorphicControls);
+                this.maxHeight = value;
+                this.NotifyOfPropertyChange(() => this.MaxHeight);
             }
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether HeightControlEnabled.
+        /// Gets or sets MinHeight.
         /// </summary>
-        public bool HeightControlEnabled
+        public int MaxWidth
         {
             get
             {
-                return this.heightControlEnabled;
+                return this.maxWidth;
             }
             set
             {
-                this.heightControlEnabled = value;
-                this.NotifyOfPropertyChange(() => HeightControlEnabled);
+                this.maxWidth = value;
+                this.NotifyOfPropertyChange(() => this.MaxWidth);
             }
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether WidthControlEnabled.
+        /// Gets SourceAspect.
         /// </summary>
-        public bool WidthControlEnabled
+        private Size SourceAspect
         {
             get
             {
-                return this.widthControlEnabled;
+                // display aspect = (width * par_width) / (height * par_height)
+                return new Size(
+                    (this.sourceParValues.Width * this.sourceResolution.Width),
+                    (this.sourceParValues.Height * this.sourceResolution.Height));
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether show keep ar.
+        /// </summary>
+        public bool ShowKeepAR
+        {
+            get
+            {
+                return this.showKeepAr;
             }
             set
             {
-                this.widthControlEnabled = value;
-                this.NotifyOfPropertyChange(() => WidthControlEnabled);
+                this.showKeepAr = value;
+                this.NotifyOfPropertyChange(() => this.ShowKeepAR);
             }
         }
 
         #endregion
 
-        #region Public Methods
+        #region Implemented Interfaces
+
+        #region ITabInterface
 
         /// <summary>
-        /// Setup this window for a new source
+        /// Setup this tab for the specified preset.
         /// </summary>
-        /// <param name="title">
-        /// The title.
-        /// </param>
         /// <param name="preset">
         /// The preset.
         /// </param>
         /// <param name="task">
         /// The task.
         /// </param>
-        public void SetSource(Title title, Preset preset, EncodeTask task)
+        public void SetPreset(Preset preset, EncodeTask task)
         {
-            if (title != null)
-            {
-                // Set cached info
-                this.sourceAspectRatio = title.AspectRatio;
-                this.sourceParValues = title.ParVal;
-                this.sourceResolution = title.Resolution;
-
-                // Set Screen Controls
-                this.SourceInfo = string.Format("{0}x{1}, Aspect Ratio: {2:0.00}", title.Resolution.Width, title.Resolution.Height, title.AspectRatio);
-                this.CropTop = title.AutoCropDimensions.Top;
-                this.CropBottom = title.AutoCropDimensions.Bottom;
-                this.CropLeft = title.AutoCropDimensions.Left;
-                this.CropRight = title.AutoCropDimensions.Right;
-
-                // TODO handle preset max width / height
-                this.Width = title.Resolution.Width;
-                this.Height = title.Resolution.Height;
-                this.MaintainAspectRatio = true;
-            }
-        }
+            this.Task = task;
 
-        /// <summary>
-        /// Setup this tab for the specified preset.
-        /// </summary>
-        /// <param name="preset">
-        /// The preset.
-        /// </param>
-        public void SetPreset(Preset preset)
-        {
             // TODO: These all need to be handled correctly.
+            this.SelectedAnamorphicMode = preset.Task.Anamorphic;
+
+            // Set the limits on the UI Controls.
+            this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
+            this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+            this.Task.MaxWidth = preset.Task.MaxWidth;
+            this.Task.MaxHeight = preset.Task.MaxHeight;
 
-            if (Task.UsesMaxPictureSettings)
+            // Setup the Width
+            if (preset.Task.MaxWidth.HasValue)
             {
-                this.Task.MaxWidth = preset.Task.MaxWidth;
-                this.Task.MaxHeight = preset.Task.MaxHeight;
-                this.Task.Width = preset.Task.MaxWidth ?? 0;
-                this.Task.Height = preset.Task.MaxHeight ?? 0;
+                if (this.Width > preset.Task.MaxWidth)
+                {
+                    // Limit the Width to the Max Width
+                    this.Width = preset.Task.MaxWidth.Value; 
+                }
+                else
+                {
+                    // Figure out the best width based on the preset and source
+                    this.Width = preset.Task.Width ?? this.GetModulusValue(this.getRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), preset.Task.MaxWidth.Value));
+                }
             }
             else
             {
-                this.Task.Width = preset.Task.Width ?? 0;
-                this.Task.Height = preset.Task.Height ?? 0;
+                this.Width = preset.Task.Width ?? this.GetModulusValue((this.sourceResolution.Width - this.CropLeft - this.CropRight));
             }
 
-            if (Task.Anamorphic == Anamorphic.Custom)
+            // Set the Maintain Aspect ratio. This will calculate Height for us now.
+            this.MaintainAspectRatio = preset.Task.Anamorphic == Anamorphic.None || preset.Task.KeepDisplayAspect;
+
+            // Set Height, but only if necessary.
+            if (preset.Task.MaxHeight.HasValue)
             {
-                this.Task.DisplayWidth = preset.Task.DisplayWidth ?? 0;
-                this.Task.PixelAspectX = preset.Task.PixelAspectX;
-                this.Task.PixelAspectY = preset.Task.PixelAspectY;
+                if (this.Height > preset.Task.MaxHeight)
+                {
+                    // Limit the Height to the Max Height of the preset. Setting this will recalculate the width.
+                    this.Height = preset.Task.MaxHeight.Value;
+                }
+                else
+                {
+                    // Only calculate height if Maintain Aspect ratio is off.
+                    if (!this.MaintainAspectRatio)
+                    {
+                        this.Height = preset.Task.Height ??
+                                      this.getRes(
+                                          (this.sourceResolution.Height - this.CropTop - this.CropBottom),
+                                          preset.Task.MaxHeight.Value);
+                    }
+                }
             }
 
-            this.Task.KeepDisplayAspect = preset.Task.KeepDisplayAspect;
+            // Anamorphic
+            if (preset.Task.Anamorphic == Anamorphic.Custom)
+            {
+                this.DisplayWidth = preset.Task.DisplayWidth != null ? int.Parse(preset.Task.DisplayWidth.ToString()) : 0;
+                this.ParWidth = preset.Task.PixelAspectX;
+                this.ParHeight = preset.Task.PixelAspectY;
+            }
 
-            if (this.Task.Modulus.HasValue)
+            // Modulus
+            if (preset.Task.Modulus.HasValue)
             {
-                this.Task.Modulus = preset.Task.Modulus;
+                this.SelectedModulus = preset.Task.Modulus;
             }
 
+            // Cropping
             if (preset.Task.HasCropping)
             {
-                this.Task.Cropping = preset.Task.Cropping;
+                this.IsCustomCrop = true;
+                this.CropLeft = preset.Task.Cropping.Left;
+                this.CropRight = preset.Task.Cropping.Right;
+                this.CropTop = preset.Task.Cropping.Top;
+                this.CropBottom = preset.Task.Cropping.Bottom;
             }
+            else
+            {
+                this.IsCustomCrop = false;
+            }
+
+            this.NotifyOfPropertyChange(() => this.Task);
         }
-        #endregion
 
         /// <summary>
-        /// Adjust other values after the user has altered the width
+        /// Update all the UI controls based on the encode task passed in.
         /// </summary>
-        private void WidthAdjust()
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
         {
-            if (this.Width > this.sourceResolution.Width)
-            {
-                this.Task.Width = this.sourceResolution.Width;
-                this.NotifyOfPropertyChange(() => this.Task.Width);
-            }
-
-            switch (SelectedAnamorphicMode)
-            {
-                case Anamorphic.None:
-                    if (this.MaintainAspectRatio)
-                    {
-                        double crop_width = this.sourceResolution.Width - this.CropLeft - this.CropRight;
-                        double crop_height = this.sourceResolution.Height - this.CropTop - this.CropBottom;
-
-                        if (SourceAspect.Width == 0 && SourceAspect.Height == 0)
-                            break;
-
-                        double newHeight = ((double)this.Width * this.sourceResolution.Width * SourceAspect.Height * crop_height) /
-                                           (this.sourceResolution.Height * SourceAspect.Width * crop_width);
-
-                        this.Task.Height = (int)Math.Round(GetModulusValue(newHeight), 0);
-                        this.NotifyOfPropertyChange("Height");
-                    }
-                    break;
-                case Anamorphic.Strict:
-                    this.Task.Width = 0;
-                    this.Task.Height = 0;
-
-                    this.NotifyOfPropertyChange(() => this.Task.Width);
-                    this.NotifyOfPropertyChange(() => this.Task.Height);
-                    this.SetDisplaySize();
-                    break;
-                case Anamorphic.Loose:
-                    this.Task.Height = 0;
-                    this.NotifyOfPropertyChange(() => this.Task.Width);
-                    this.NotifyOfPropertyChange(() => this.Task.Height);
-                    this.SetDisplaySize();
-                    break;
-                case Anamorphic.Custom:
-                    this.SetDisplaySize();
-                    break;
-            }
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.Width);
+            this.NotifyOfPropertyChange(() => this.Height);
+            this.NotifyOfPropertyChange(() => this.SelectedAnamorphicMode);
+            this.NotifyOfPropertyChange(() => this.SelectedModulus);
         }
 
         /// <summary>
-        /// Adjust other values after the user has altered the height
+        /// Setup this window for a new source
         /// </summary>
-        private void HeightAdjust()
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetSource(Title title, Preset preset, EncodeTask task)
         {
-            if (this.Height > this.sourceResolution.Height)
-            {
-                this.Task.Height = this.sourceResolution.Height;
-                this.NotifyOfPropertyChange(() => this.Task.Height);
-            }
+            this.Task = task;
 
-            switch (SelectedAnamorphicMode)
+            if (title != null)
             {
-                case Anamorphic.None:
-                    if (this.MaintainAspectRatio)
-                    {
-                        double crop_width = this.sourceResolution.Width - this.CropLeft - this.CropRight;
-                        double crop_height = this.sourceResolution.Height - this.CropTop - this.CropBottom;
+                // Set cached info
+                this.sourceParValues = title.ParVal;
+                this.sourceResolution = title.Resolution;
 
-                        double new_width = ((double)this.Height * this.sourceResolution.Height * SourceAspect.Width * crop_width) /
-                                           (this.sourceResolution.Width * SourceAspect.Height * crop_height);
+                // Set the Max Width / Height available to the user controls
+                if (this.sourceResolution.Width < this.MaxWidth)
+                {
+                    this.MaxWidth = this.sourceResolution.Width;
+                }
+                else if (this.sourceResolution.Width > this.MaxWidth)
+                {
+                    this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
+                }
+
+                if (this.sourceResolution.Height < this.MaxHeight)
+                {
+                    this.MaxHeight = this.sourceResolution.Height;
+                }
+                else if (this.sourceResolution.Height > this.MaxHeight)
+                {
+                    this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+                }
 
-                        this.Task.Width = (int)Math.Round(GetModulusValue(new_width), 0);
-                        this.NotifyOfPropertyChange(() => this.Task.Width);
-                    }
-                    break;
-                case Anamorphic.Custom:
-                    this.SetDisplaySize();
-                    break;
+                // Set Screen Controls
+                this.SourceInfo = string.Format(
+                    "{0}x{1}, Aspect Ratio: {2:0.00}",
+                    title.Resolution.Width,
+                    title.Resolution.Height,
+                    title.AspectRatio);
+
+                if (!preset.Task.HasCropping)
+                {
+                    this.CropTop = title.AutoCropDimensions.Top;
+                    this.CropBottom = title.AutoCropDimensions.Bottom;
+                    this.CropLeft = title.AutoCropDimensions.Left;
+                    this.CropRight = title.AutoCropDimensions.Right;
+                    this.IsCustomCrop = false;
+                }
+                else
+                {
+                    this.CropLeft = preset.Task.Cropping.Left;
+                    this.CropRight = preset.Task.Cropping.Right;
+                    this.CropTop = preset.Task.Cropping.Top;
+                    this.CropBottom = preset.Task.Cropping.Bottom;
+                    this.IsCustomCrop = true;
+                }
+
+                // Set the Width, and Maintain Aspect ratio. That should calc the Height for us.
+                this.Width = this.MaxWidth;
+                this.MaintainAspectRatio = true;
+
+                // If our height is too large, let it downscale the width for us by setting the height to the lower value.
+                if (this.Height > this.MaxHeight)
+                {
+                    this.Height = this.MaxHeight;
+                }
+       
+                if (this.SelectedAnamorphicMode == Anamorphic.Custom)
+                {
+                    this.AnamorphicAdjust(); // Refresh the values
+                }
             }
-        }
 
-        /// <summary>
-        /// Adjust other values after the user has altered one of the custom anamorphic settings
-        /// </summary>
-        private void CustomAnamorphicAdjust()
-        {
-            this.SetDisplaySize();
+            this.NotifyOfPropertyChange(() => this.Task);
         }
 
-        /// <summary>
-        /// Adjust other values after the user has altered the modulus
-        /// </summary>
-        private void ModulusAdjust()
-        {
-            this.WidthAdjust();
-        }
+        #endregion
+
+        #endregion
+
+        #region Methods
 
         /// <summary>
         /// Adjust other values after the user has altered the anamorphic.
@@ -614,28 +796,36 @@
         {
             this.DisplaySize = this.sourceResolution.IsEmpty
                                    ? "No Title Selected"
-                                   : string.Format("{0}x{1}",
+                                   : string.Format(
+                                       "{0}x{1}",
                                        this.CalculateAnamorphicSizes().Width,
                                        this.CalculateAnamorphicSizes().Height);
 
-            switch (SelectedAnamorphicMode)
+            this.ShowDisplaySize = true;
+            this.ShowKeepAR = true;
+            switch (this.SelectedAnamorphicMode)
             {
                 case Anamorphic.None:
                     this.WidthControlEnabled = true;
                     this.HeightControlEnabled = true;
                     this.ShowCustomAnamorphicControls = false;
-                    this.Width = sourceResolution.Width;
+                    this.ShowModulus = true;
+                    this.ShowDisplaySize = false;
+                    this.ShowKeepAR = true;
+                    this.SelectedModulus = 16; // Reset
+                    this.Width = this.sourceResolution.Width;
                     this.SetDisplaySize();
                     break;
                 case Anamorphic.Strict:
                     this.WidthControlEnabled = false;
                     this.HeightControlEnabled = false;
                     this.ShowCustomAnamorphicControls = false;
+                    this.ShowModulus = false;
+                    this.SelectedModulus = 16; // Reset
+                    this.ShowKeepAR = false;
 
                     this.Width = 0;
                     this.Height = 0;
-                    this.NotifyOfPropertyChange(() => Width);
-                    this.NotifyOfPropertyChange(() => Height);
                     this.SetDisplaySize();
                     break;
 
@@ -643,11 +833,11 @@
                     this.WidthControlEnabled = true;
                     this.HeightControlEnabled = false;
                     this.ShowCustomAnamorphicControls = false;
-
+                    this.ShowModulus = true;
                     this.Width = this.sourceResolution.Width;
                     this.Height = 0;
-                    this.NotifyOfPropertyChange(() => Width);
-                    this.NotifyOfPropertyChange(() => Height);
+                    this.ShowKeepAR = false;
+
                     this.SetDisplaySize();
                     break;
 
@@ -655,50 +845,29 @@
                     this.WidthControlEnabled = true;
                     this.HeightControlEnabled = true;
                     this.ShowCustomAnamorphicControls = true;
+                    this.MaintainAspectRatio = false;  // TODO Fix when implementing custom
+                    this.ShowModulus = true;
+                    this.ShowDisplaySize = false; // Disabled for Custom until we implement it properly. TODO
+                    this.ShowKeepAR = false;
 
+                    // Ignore any of the users current settings and reset to source to make things easier.
                     this.Width = this.sourceResolution.Width;
-                    this.Height = 0;
-                    this.NotifyOfPropertyChange(() => Width);
-                    this.NotifyOfPropertyChange(() => Height);
+                    this.Height = this.sourceResolution.Height - this.CropTop - this.CropBottom;
 
-                    this.DisplayWidth = this.CalculateAnamorphicSizes().Width;
+                    // Set the Display Width and set the Par X/Y to the source values initially.      
                     this.ParWidth = this.sourceParValues.Width;
                     this.ParHeight = this.sourceParValues.Height;
-                    this.NotifyOfPropertyChange(() => ParHeight);
-                    this.NotifyOfPropertyChange(() => ParWidth);
-                    this.NotifyOfPropertyChange(() => DisplayWidth);
+                    if (this.ParHeight != 0)
+                    {
+                        this.DisplayWidth = (this.Width * this.ParWidth / this.ParHeight);
+                    }
 
-                    this.SetDisplaySize();
+                    //this.SetDisplaySize();
                     break;
             }
         }
 
         /// <summary>
-        /// Gets SourceAspect.
-        /// </summary>
-        private Size SourceAspect
-        {
-            get
-            {
-                // display aspect = (width * par_width) / (height * par_height)
-                return new Size((this.sourceParValues.Width * this.sourceResolution.Width),
-                                (this.sourceParValues.Height * this.sourceResolution.Height));
-            }
-        }
-
-        /// <summary>
-        /// Set the display size text
-        /// </summary>
-        private void SetDisplaySize()
-        {
-            this.DisplaySize = this.sourceResolution.IsEmpty
-                                ? "No Title Selected"
-                                : string.Format("{0}x{1}",
-                                    this.CalculateAnamorphicSizes().Width,
-                                    this.CalculateAnamorphicSizes().Height);
-        }
-
-        /// <summary>
         /// Calculate the Anamorphic Resolution for the selected title.
         /// </summary>
         /// <returns>
@@ -725,11 +894,12 @@
                   - 2: Loose anamorphic, round to mod16 and preserve storage aspect ratio
                   - 3: Power user anamorphic, specify everything
               */
-            double calcWidth, calcHeight;
+            double calcHeight;
             switch (this.SelectedAnamorphicMode)
             {
                 default:
                 case Anamorphic.Strict:
+
                     /* Strict anamorphic */
                     double dispWidth = ((double)croppedWidth * this.sourceParValues.Width / this.sourceParValues.Height);
                     dispWidth = Math.Round(dispWidth, 0);
@@ -737,13 +907,14 @@
                     return output;
 
                 case Anamorphic.Loose:
+
                     /* "Loose" anamorphic.
                         - Uses mod16-compliant dimensions,
                         - Allows users to set the width
                     */
-                    calcWidth = GetModulusValue(this.Width); /* Time to get picture width that divide cleanly.*/
+                    double calcWidth = this.GetModulusValue(this.Width);
                     calcHeight = (calcWidth / storageAspect) + 0.5;
-                    calcHeight = GetModulusValue(calcHeight); /* Time to get picture height that divide cleanly.*/
+                    calcHeight = this.GetModulusValue(calcHeight); /* Time to get picture height that divide cleanly.*/
 
                     /* The film AR is the source's display width / cropped source height.
                        The output display width is the output height * film AR.
@@ -753,26 +924,67 @@
 
                     double disWidthLoose = (calcWidth * pixelAspectWidth / pixelAspectHeight);
                     if (double.IsNaN(disWidthLoose))
+                    {
                         disWidthLoose = 0;
+                    }
 
                     return new Size((int)disWidthLoose, (int)calcHeight);
 
                 case Anamorphic.Custom:
                     // Get the User Interface Values
-                    double UIdisplayWidth;
-                    double.TryParse(this.DisplayWidth.ToString(), out UIdisplayWidth);
+                    double uIdisplayWidth;
+                    double.TryParse(this.DisplayWidth.ToString(CultureInfo.InvariantCulture), NumberStyles.Any, CultureInfo.InvariantCulture, out uIdisplayWidth);
 
                     /* Anamorphic 3: Power User Jamboree - Set everything based on specified values */
-                    calcHeight = GetModulusValue(this.Height);
+                    calcHeight = this.GetModulusValue(this.Height);
 
                     if (this.MaintainAspectRatio)
-                        return new Size((int)Math.Truncate(UIdisplayWidth), (int)calcHeight);
+                    {
+                        return new Size((int)Math.Truncate(uIdisplayWidth), (int)calcHeight);
+                    }
 
-                    return new Size((int)Math.Truncate(UIdisplayWidth), (int)calcHeight);
+                    return new Size((int)Math.Truncate(uIdisplayWidth), (int)calcHeight);
             }
         }
 
         /// <summary>
+        /// Correct the new value so that the result of the modulus of that value is 0
+        /// </summary>
+        /// <param name="oldValue">
+        /// The old value.
+        /// </param>
+        /// <param name="newValue">
+        /// The new value.
+        /// </param>
+        /// <returns>
+        /// The Value corrected so that for a given modulus the result is 0
+        /// </returns>
+        private int CorrectForModulus(int oldValue, int newValue)
+        {
+            int remainder = newValue % 2;
+            if (remainder == 0)
+            {
+                return newValue;
+            }
+
+            return newValue > oldValue ? newValue + remainder : newValue - remainder;
+        }
+
+        /// <summary>
+        /// Adjust other values after the user has altered one of the custom anamorphic settings
+        /// </summary>
+        private void CustomAnamorphicAdjust()
+        {
+            if (this.MaintainAspectRatio && this.DisplayWidth != 0)
+            {
+                this.ParWidth = this.DisplayWidth;
+                this.ParHeight = this.Width;
+            }
+
+            this.SetDisplaySize();
+        }
+
+        /// <summary>
         /// For a given value, correct so that it matches the users currently selected modulus value
         /// </summary>
         /// <param name="value">
@@ -781,7 +993,7 @@
         /// <returns>
         /// Value corrected so that value % selected modulus == 0
         /// </returns>
-        private double GetModulusValue(double value)
+        private int GetModulusValue(double value)
         {
             if (this.SelectedModulus == null)
             {
@@ -790,33 +1002,154 @@
 
             double remainder = value % this.SelectedModulus.Value;
 
-            if (remainder == 0)
-                return value;
+            if (remainder.Equals(0.0d))
+            {
+                return (int)Math.Abs(value);
+            }
+
+            double result = remainder >= ((double)this.SelectedModulus.Value / 2)
+                       ? value + (this.SelectedModulus.Value - remainder)
+                       : value - remainder;
 
-            return remainder >= ((double)this.SelectedModulus.Value / 2) ? value + (this.SelectedModulus.Value - remainder) : value - remainder;
+            return (int)Math.Abs(result);
         }
 
         /// <summary>
-        /// Correct the new value so that the result of the modulus of that value is 0
+        /// Adjust other values after the user has altered the height
         /// </summary>
-        /// <param name="oldValue">
-        /// The old value.
+        private void HeightAdjust()
+        {
+            if (this.sourceResolution == new Size(0, 0))
+            {
+                return;
+            }
+
+            if (this.Height > this.sourceResolution.Height)
+            {
+                this.Task.Height = this.sourceResolution.Height;
+                this.NotifyOfPropertyChange(() => this.Task.Height);
+            }
+
+            switch (this.SelectedAnamorphicMode)
+            {
+                case Anamorphic.None:
+                    if (this.MaintainAspectRatio)
+                    {
+                        double cropWidth = this.sourceResolution.Width - this.CropLeft - this.CropRight;
+                        double cropHeight = this.sourceResolution.Height - this.CropTop - this.CropBottom;
+
+                        double newWidth = ((double)this.Height * this.sourceResolution.Height * this.SourceAspect.Width *
+                                            cropWidth) /
+                                           ((double)this.sourceResolution.Width * this.SourceAspect.Height * cropHeight);
+
+                        this.Task.Width = this.GetModulusValue(newWidth);
+                        this.NotifyOfPropertyChange(() => this.Task.Width);
+                    }
+
+                    break;
+                case Anamorphic.Custom:
+                    this.SetDisplaySize();
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Adjust other values after the user has altered the modulus
+        /// </summary>
+        private void ModulusAdjust()
+        {
+            this.WidthAdjust();
+        }
+
+        /// <summary>
+        /// Set the display size text
+        /// </summary>
+        private void SetDisplaySize()
+        {
+            this.DisplaySize = this.sourceResolution.IsEmpty
+                                   ? "No Title Selected"
+                                   : string.Format(
+                                       "{0}x{1}",
+                                       this.CalculateAnamorphicSizes().Width,
+                                       this.CalculateAnamorphicSizes().Height);
+        }
+
+        /// <summary>
+        /// Adjust other values after the user has altered the width
+        /// </summary>
+        private void WidthAdjust()
+        {
+            if (this.Width > this.sourceResolution.Width)
+            {
+                this.Task.Width = this.sourceResolution.Width;
+                this.NotifyOfPropertyChange(() => this.Task.Width);
+            }
+
+            switch (this.SelectedAnamorphicMode)
+            {
+                case Anamorphic.None:
+                    if (this.MaintainAspectRatio)
+                    {
+                        double cropWidth = this.sourceResolution.Width - this.CropLeft - this.CropRight;
+                        double cropHeight = this.sourceResolution.Height - this.CropTop - this.CropBottom;
+
+                        if (this.SourceAspect.Width == 0 && this.SourceAspect.Height == 0)
+                        {
+                            break;
+                        }
+
+                        double newHeight = ((double)this.Width * this.sourceResolution.Width * this.SourceAspect.Height *
+                                            cropHeight) /
+                                           ((double)this.sourceResolution.Height * this.SourceAspect.Width * cropWidth);
+
+                        this.Task.Height = this.GetModulusValue(newHeight);
+                        this.NotifyOfPropertyChange(() => this.Height);
+                    }
+                    this.SetDisplaySize();
+                    break;
+                case Anamorphic.Strict:
+                    this.Task.Width = 0;
+                    this.Task.Height = 0;
+
+                    this.NotifyOfPropertyChange(() => this.Width);
+                    this.NotifyOfPropertyChange(() => this.Height);
+                    this.SetDisplaySize();
+                    break;
+                case Anamorphic.Loose:
+                    this.Task.Height = 0;
+                    this.NotifyOfPropertyChange(() => this.Width);
+                    this.NotifyOfPropertyChange(() => this.Height);
+                    this.SetDisplaySize();
+                    break;
+                case Anamorphic.Custom:
+                    if (this.MaintainAspectRatio)
+                    {
+                        this.ParWidth = this.DisplayWidth;
+                        this.ParHeight = this.Width;
+                    }
+
+                    this.SetDisplaySize();
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Quick function to get the max resolution value
+        ///  </summary>
+        /// <param name="value">
+        /// The value.
         /// </param>
-        /// <param name="newValue">
-        /// The new value.
+        /// <param name="max">
+        /// The max.
         /// </param>
         /// <returns>
-        /// The Value corrected so that for a given modulus the result is 0
+        /// An Int
         /// </returns>
-        private int CorrectForModulus(int oldValue, int newValue)
+        private int getRes(int value, int max)
         {
-            int remainder = newValue % 2;
-            if (remainder == 0)
-            {
-                return newValue;
-            }
-
-            return newValue > oldValue ? newValue + remainder : newValue - remainder;
+            return value > max ? max : value;
         }
+
+        #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs Changed

@@ -9,31 +9,427 @@
 
 namespace HandBrakeWPF.ViewModels
 {
-    using Interfaces;
-    using Caliburn.Micro;
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.IO;
+    using System.Threading;
+    using System.Windows;
+
+    using HandBrake.ApplicationServices;
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    using HandBrakeWPF.Services;
+    using HandBrakeWPF.Services.Interfaces;
+    using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
     /// The About View Model
     /// </summary>
     public class PreviewViewModel : ViewModelBase, IPreviewViewModel
     {
+        #region Constants and Fields
+
+        /// <summary>
+        /// Backing field for the encode service.
+        /// </summary>
+        private readonly IEncodeServiceWrapper encodeService;
+
+        /// <summary>
+        /// The error service
+        /// </summary>
+        private readonly IErrorService errorService;
+
+        /// <summary>
+        /// The user Setting Service
+        /// </summary>
+        private readonly IUserSettingService userSettingService;
+
+        /// <summary>
+        /// The percentage.
+        /// </summary>
+        private string percentage;
+
+        /// <summary>
+        /// The percentage value.
+        /// </summary>
+        private double percentageValue;
+
+        /// <summary>
+        /// The Backing field for IsEncoding
+        /// </summary>
+        private bool isEncoding;
+
+        /// <summary>
+        /// Backing field for use system default player
+        /// </summary>
+        private bool useSystemDefaultPlayer;
+
+        #endregion
+
+        #region Constructors and Destructors
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PreviewViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
+        /// <param name="errorService">
+        /// The error Service.
+        /// </param>
+        /// <param name="userSettingService">
+        /// The user Setting Service.
         /// </param>
-        public PreviewViewModel(IWindowManager windowManager)
+        public PreviewViewModel(IErrorService errorService, IUserSettingService userSettingService)
         {
+            // Preview needs a seperate instance rather than the shared singleton. This could maybe do with being refactored at some point
+            this.encodeService = new EncodeServiceWrapper(userSettingService); 
+
+            this.errorService = errorService;
+            this.userSettingService = userSettingService;
             this.Title = "Preview";
+            this.Percentage = "0.00%";
+            this.PercentageValue = 0;
+            this.StartAt = 1;
+            this.Duration = 30;
+            this.CanPlay = true;
+
+            UseSystemDefaultPlayer = userSettingService.GetUserSetting<bool>(UserSettingConstants.DefaultPlayer);
+            this.Duration = userSettingService.GetUserSetting<int>(UserSettingConstants.LastPreviewDuration);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets Task.
+        /// </summary>
+        public EncodeTask Task { get; set; }
+
+        /// <summary>
+        /// Gets AvailableDurations.
+        /// </summary>
+        public IEnumerable<int> AvailableDurations
+        {
+            get
+            {
+                return new List<int> { 5, 10, 30, 45, 60, 75, 90, 105, 120, 150, 180, 210, 240 };
+            }
         }
 
         /// <summary>
+        /// Gets or sets Duration.
+        /// </summary>
+        public int Duration { get; set; }
+
+        /// <summary>
+        /// Gets or sets Percentage.
+        /// </summary>
+        public string Percentage
+        {
+            get
+            {
+                return this.percentage;
+            }
+
+            set
+            {
+                this.percentage = value;
+                this.NotifyOfPropertyChange(() => this.Percentage);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets PercentageValue.
+        /// </summary>
+        public double PercentageValue
+        {
+            get
+            {
+                return this.percentageValue;
+            }
+
+            set
+            {
+                this.percentageValue = value;
+                this.NotifyOfPropertyChange(() => this.PercentageValue);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets StartAt.
+        /// </summary>
+        public int StartAt { get; set; }
+
+        /// <summary>
+        /// Gets StartPoints.
+        /// </summary>
+        public IEnumerable<int> StartPoints
+        {
+            get
+            {
+                List<int> startPoints = new List<int>();
+                for (int i = 1;
+                     i <= this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);
+                     i++)
+                {
+                    startPoints.Add(i);
+                }
+
+                return startPoints;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether UseSystemDefaultPlayer.
+        /// </summary>
+        public bool UseSystemDefaultPlayer
+        {
+            get
+            {
+                return this.useSystemDefaultPlayer;
+            }
+            set
+            {
+                this.useSystemDefaultPlayer = value;
+                this.NotifyOfPropertyChange(() => UseSystemDefaultPlayer);
+                this.userSettingService.SetUserSetting(UserSettingConstants.DefaultPlayer, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether IsEncoding.
+        /// </summary>
+        public bool IsEncoding
+        {
+            get
+            {
+                return this.isEncoding;
+            }
+            set
+            {
+                this.isEncoding = value;
+                this.CanPlay = !value;
+                this.NotifyOfPropertyChange(() => this.CanPlay);
+                this.NotifyOfPropertyChange(() => this.IsEncoding);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Currently Playing / Encoding Filename.
+        /// </summary>
+        public string CurrentlyPlaying { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether can play.
+        /// </summary>
+        public bool CanPlay { get; set; }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
         /// Close this window.
         /// </summary>
         public void Close()
         {
             this.TryClose();
         }
+
+        /// <summary>
+        /// Handle The Initialisation 
+        /// </summary>
+        public override void OnLoad()
+        {
+        }
+
+        /// <summary>
+        /// Encode and play a sample
+        /// </summary>
+        public void Play()
+        {
+            try
+            {
+                this.IsEncoding = true;
+                if (File.Exists(this.CurrentlyPlaying))
+                    File.Delete(this.CurrentlyPlaying);
+            }
+            catch (Exception)
+            {
+                this.IsEncoding = false;
+                this.errorService.ShowMessageBox("Unable to delete previous preview file. You may need to restart the application.",
+                                "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            if (this.Task == null || string.IsNullOrEmpty(Task.Source))
+            {
+                this.errorService.ShowMessageBox("You must first scan a source and setup your encode before creating a perview.",
+                               "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            EncodeTask encodeTask = new EncodeTask(this.Task)
+                {
+                    PreviewDuration = this.Duration,
+                    PreviewStartAt = this.StartAt,
+                    PointToPointMode = PointToPointMode.Preview
+                };
+
+            // Filename handling.
+            if (string.IsNullOrEmpty(encodeTask.Destination))
+            {
+                string filename = Path.ChangeExtension(Path.GetTempFileName(), encodeTask.OutputFormat == OutputFormat.Mkv ? "m4v" : "mkv");
+                encodeTask.Destination = filename;
+                this.CurrentlyPlaying = filename;
+            }
+            else
+            {
+                string directory = Path.GetDirectoryName(encodeTask.Destination) ?? string.Empty;
+                string filename = Path.GetFileNameWithoutExtension(encodeTask.Destination);
+                string extension = Path.GetExtension(encodeTask.Destination);
+                string previewFilename = string.Format("{0}_preview{1}", filename, extension);
+                string previewFullPath = Path.Combine(directory, previewFilename);
+                encodeTask.Destination = previewFullPath;
+                this.CurrentlyPlaying = previewFullPath;
+            }
+
+            // Setup the encode task as a preview encode
+            encodeTask.IsPreviewEncode = true;
+            encodeTask.PreviewEncodeStartAt = this.StartAt.ToString(CultureInfo.InvariantCulture);
+            encodeTask.PreviewEncodeDuration = this.Duration;
+            QueueTask task = new QueueTask
+                {
+                    Task = encodeTask,
+                };
+
+            ThreadPool.QueueUserWorkItem(this.CreatePreview, task);
+        }
+
+        #endregion
+
+        #region Private Methods
+        /// <summary>
+        /// Play the Encoded file
+        /// </summary>
+        private void PlayFile()
+        {
+            // Launch VLC and Play video.
+            if (this.CurrentlyPlaying != string.Empty)
+            {
+                if (File.Exists(this.CurrentlyPlaying))
+                {
+                    string args = "\"" + this.CurrentlyPlaying + "\"";
+
+                    if (this.UseSystemDefaultPlayer)
+                    {
+                        Process.Start(args);
+                    }
+                    else
+                    {
+                        if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+                        {
+                            // Attempt to find VLC if it doesn't exist in the default set location.
+                            string vlcPath;
+
+                            if (8 == IntPtr.Size || (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))
+                                vlcPath = Environment.GetEnvironmentVariable("ProgramFiles(x86)");
+                            else
+                                vlcPath = Environment.GetEnvironmentVariable("ProgramFiles");
+
+                            if (!string.IsNullOrEmpty(vlcPath))
+                            {
+                                vlcPath = Path.Combine(vlcPath, "VideoLAN\\VLC\\vlc.exe");
+                            }
+
+                            if (File.Exists(vlcPath))
+                            {
+                                UserSettingService.SetUserSetting(UserSettingConstants.VLC_Path, vlcPath);
+                            }
+                            else
+                            {
+                                this.errorService.ShowMessageBox("Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\")",
+                                                                 "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+                            }
+                        }
+
+                        if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+                        {
+                            ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path), args);
+                            Process.Start(vlc);
+                        }
+                    }
+                }
+                else
+                {
+                    this.errorService.ShowMessageBox("Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.",
+                                 "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create the Preview.
+        /// </summary>
+        /// <param name="state">
+        /// The state.
+        /// </param>
+        private void CreatePreview(object state)
+        {
+            // Make sure we are not already encoding and if we are then display an error.
+            if (encodeService.IsEncoding)
+            {
+                this.errorService.ShowMessageBox("Handbrake is already encoding a video! Only one file can be encoded at any one time.",
+                                "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            this.encodeService.EncodeCompleted += this.encodeService_EncodeCompleted;
+            this.encodeService.EncodeStatusChanged += this.encodeService_EncodeStatusChanged;
+
+            this.encodeService.Start((QueueTask)state, false);
+            this.userSettingService.SetUserSetting(UserSettingConstants.LastPreviewDuration, this.Duration);
+        }
+        #endregion
+
+        #region Event Handlers
+        /// <summary>
+        /// Handle Encode Progress Events
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EncodeProgressEventArgs.
+        /// </param>
+        private void encodeService_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)
+        {
+            this.Percentage = string.Format("{0} %", e.PercentComplete.ToString(CultureInfo.InvariantCulture));
+            this.PercentageValue = e.PercentComplete;
+        }
+
+        /// <summary>
+        /// Handle the Encode Completed Event
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The EncodeCompletedEventArgs.
+        /// </param>
+        private void encodeService_EncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)
+        {
+            this.Percentage = "0.00%";
+            this.PercentageValue = 0;
+            this.IsEncoding = false;
+
+            this.encodeService.EncodeCompleted -= this.encodeService_EncodeCompleted;
+            this.encodeService.EncodeStatusChanged -= this.encodeService_EncodeStatusChanged;
+
+            this.PlayFile();
+        }
+        #endregion
     }
-}
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs Added

@@ -0,0 +1,198 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueSelectionViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Queue Selection View Model
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Linq;
+
+    using HandBrake.ApplicationServices.Parsing;
+
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Services.Interfaces;
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// The Queue Selection View Model
+    /// </summary>
+    public class QueueSelectionViewModel : ViewModelBase, IQueueSelectionViewModel
+    {
+        /// <summary>
+        /// The error service.
+        /// </summary>
+        private readonly IErrorService errorService;
+
+        /// <summary>
+        /// The ordered by duration.
+        /// </summary>
+        private bool orderedByDuration;
+
+        /// <summary>
+        /// The ordered by title.
+        /// </summary>
+        private bool orderedByTitle;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueueSelectionViewModel"/> class. 
+        /// </summary>
+        /// <param name="errorService">
+        /// The Error Service
+        /// </param>
+        public QueueSelectionViewModel(IErrorService errorService)
+        {
+            this.errorService = errorService;
+            this.Title = "Add to Queue";
+            this.TitleList = new BindingList<SelectionTitle>();
+            this.OrderedByTitle = true;
+        }
+
+        /// <summary>
+        /// Gets or sets the source.
+        /// </summary>
+        public string Source { get; set; }
+
+        /// <summary>
+        /// Gets or sets the selected titles.
+        /// </summary>
+        public BindingList<SelectionTitle> TitleList { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ordered by title.
+        /// </summary>
+        public bool OrderedByTitle
+        {
+            get
+            {
+                return this.orderedByTitle;
+            }
+
+            set
+            {
+                this.orderedByTitle = value;
+                this.NotifyOfPropertyChange(() => OrderedByTitle);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ordered by duration.
+        /// </summary>
+        public bool OrderedByDuration
+        {
+            get
+            {
+                return this.orderedByDuration;
+            }
+
+            set
+            {
+                this.orderedByDuration = value;
+                this.NotifyOfPropertyChange(() => OrderedByDuration);
+            }
+        }
+
+        /// <summary>
+        /// The order by title.
+        /// </summary>
+        public void OrderByTitle()
+        {
+            TitleList = new BindingList<SelectionTitle>(TitleList.OrderBy(o => o.Title.TitleNumber).ToList());
+            this.NotifyOfPropertyChange(() => TitleList);
+            this.OrderedByTitle = true;
+            this.OrderedByDuration = false;
+        }
+
+        /// <summary>
+        /// The order by duration.
+        /// </summary>
+        public void OrderByDuration()
+        {
+            TitleList = new BindingList<SelectionTitle>(TitleList.OrderByDescending(o => o.Title.Duration).ToList());
+            this.NotifyOfPropertyChange(() => TitleList);
+            this.OrderedByTitle = false;
+            this.OrderedByDuration = true;
+        }
+
+        /// <summary>
+        /// The select all.
+        /// </summary>
+        public void SelectAll()
+        {
+            foreach (var item in TitleList)
+            {
+                item.IsSelected = true;
+            }
+        }
+
+        /// <summary>
+        /// The select all.
+        /// </summary>
+        public void UnSelectAll()
+        {
+            foreach (var item in TitleList)
+            {
+                item.IsSelected = false;
+            }
+        }
+
+        /// <summary>
+        /// Add a Preset
+        /// </summary>
+        public void Add()
+        {
+            this.Close();
+        }
+
+        /// <summary>
+        /// Cancel adding a preset
+        /// </summary>
+        public void Cancel()
+        {
+            this.TitleList.Clear();
+            this.Close();
+        }
+
+        /// <summary>
+        /// Close this window.
+        /// </summary>
+        public void Close()
+        {
+            this.TryClose();
+        }
+
+        /// <summary>
+        /// The setup.
+        /// </summary>
+        /// <param name="scannedSource">
+        /// The scanned source.
+        /// </param>
+        /// <param name="srcName">
+        /// The src Name.
+        /// </param>
+        public void Setup(Source scannedSource, string srcName)
+        {
+            this.TitleList.Clear();
+
+            if (scannedSource != null)
+            {
+
+                IEnumerable<Title> titles = orderedByTitle
+                                         ? scannedSource.Titles
+                                         : scannedSource.Titles.OrderByDescending(o => o.Duration).ToList();
+
+                foreach (Title item in titles)
+                {
+                    SelectionTitle title = new SelectionTitle(item, srcName);
+                    TitleList.Add(title);
+                }
+            }
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs Changed

@@ -9,29 +9,36 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System;
     using System.Collections.ObjectModel;
-    using System.ComponentModel.Composition;
+    using System.ComponentModel;
     using System.Windows;
 
     using Caliburn.Micro;
 
+    using HandBrake.ApplicationServices;
+    using HandBrake.ApplicationServices.EventArgs;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services.Interfaces;
 
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.ViewModels.Interfaces;
 
+    using Ookii.Dialogs.Wpf;
+
     /// <summary>
     /// The Preview View Model
     /// </summary>
-    [Export(typeof(IQueueViewModel))]
     public class QueueViewModel : ViewModelBase, IQueueViewModel
     {
-        #region Private Fields
-        /// <summary>
-        /// Queue Processor Backing field
-        /// </summary>
-        private readonly IQueueProcessor queueProcessor;
+        /*
+         
+         * TODO FIX THE DRAP/DROP ADORNER!
+         */
+
+
+
+        #region Constants and Fields
 
         /// <summary>
         /// The Error Service Backing field
@@ -39,36 +46,57 @@
         private readonly IErrorService errorService;
 
         /// <summary>
-        /// Jobs pending backing field
+        /// The User Setting Service Backing Field.
         /// </summary>
-        private string jobsPending;
+        private readonly IUserSettingService userSettingService;
 
         /// <summary>
-        /// Job Status Backing field.
+        /// Queue Processor Backing field
         /// </summary>
-        private string jobStatus;
+        private readonly IQueueProcessor queueProcessor;
 
         /// <summary>
         /// IsEncoding Backing field
         /// </summary>
         private bool isEncoding;
 
+        /// <summary>
+        /// Job Status Backing field.
+        /// </summary>
+        private string jobStatus;
+
+        /// <summary>
+        /// Jobs pending backing field
+        /// </summary>
+        private string jobsPending;
+
+        /// <summary>
+        /// Backing field for the when done action description
+        /// </summary>
+        private string whenDoneAction;
+
         #endregion
 
+        #region Constructors and Destructors
+
         /// <summary>
         /// Initializes a new instance of the <see cref="QueueViewModel"/> class.
         /// </summary>
         /// <param name="windowManager">
         /// The window manager.
         /// </param>
-        /// <param name="queueProcessor"> 
+        /// <param name="userSettingService">
+        /// The user Setting Service.
+        /// </param>
+        /// <param name="queueProcessor">
         /// The Queue Processor Service 
         /// </param>
-        /// <param name="errorService"> 
+        /// <param name="errorService">
         /// The Error Service 
         /// </param>
-        public QueueViewModel(IWindowManager windowManager, IQueueProcessor queueProcessor, IErrorService errorService)
+        public QueueViewModel(IWindowManager windowManager, IUserSettingService userSettingService, IQueueProcessor queueProcessor, IErrorService errorService)
         {
+            this.userSettingService = userSettingService;
             this.queueProcessor = queueProcessor;
             this.errorService = errorService;
             this.Title = "Queue";
@@ -76,13 +104,9 @@
             this.JobStatus = "There are no jobs currently encoding";
         }
 
-        /// <summary>
-        /// Gets QueueJobs.
-        /// </summary>
-        public ObservableCollection<QueueTask> QueueJobs
-        {
-            get { return this.queueProcessor.QueueManager.Queue; }
-        }
+        #endregion
+
+        #region Properties
 
         /// <summary>
         /// Gets or sets a value indicating whether IsEncoding.
@@ -97,7 +121,7 @@
             set
             {
                 this.isEncoding = value;
-                this.NotifyOfPropertyChange("IsEncoding");
+                this.NotifyOfPropertyChange(() => IsEncoding);
             }
         }
 
@@ -114,7 +138,7 @@
             set
             {
                 this.jobStatus = value;
-                this.NotifyOfPropertyChange("JobStatus");
+                this.NotifyOfPropertyChange(() => this.JobStatus);
             }
         }
 
@@ -131,22 +155,92 @@
             set
             {
                 this.jobsPending = value;
-                this.NotifyOfPropertyChange("JobsPending");
+                this.NotifyOfPropertyChange(() => this.JobsPending);
             }
         }
 
         /// <summary>
-        /// Start Encode
+        /// Gets or sets WhenDoneAction.
         /// </summary>
-        public void StartEncode()
+        public string WhenDoneAction
         {
-            if (this.queueProcessor.QueueManager.Count == 0)
+            get
             {
-                this.errorService.ShowMessageBox("There are no pending jobs.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
+                return this.whenDoneAction;
+            }
+            set
+            {
+                this.whenDoneAction = value;
+                this.NotifyOfPropertyChange(() => this.WhenDoneAction);
             }
+        }
 
-            this.queueProcessor.Start();
+        /// <summary>
+        /// Gets the queue tasks.
+        /// </summary>
+        public BindingList<QueueTask> QueueTasks
+        {
+            get
+            {
+                return this.queueProcessor.Queue;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Update the When Done Setting
+        /// </summary>
+        /// <param name="action">
+        /// The action.
+        /// </param>
+        public void WhenDone(string action)
+        {
+            this.WhenDoneAction = action;
+            this.userSettingService.SetUserSetting(ASUserSettingConstants.WhenCompleteAction, action);
+        }
+
+        /// <summary>
+        /// Clear the Queue
+        /// </summary>
+        public void Clear()
+        {
+            MessageBoxResult result = this.errorService.ShowMessageBox(
+                "Are you sure you wish to clear the queue?", "Confirm", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+            if (result == MessageBoxResult.Yes)
+            {
+                this.queueProcessor.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Clear Completed Items
+        /// </summary>
+        public void ClearCompleted()
+        {
+            this.queueProcessor.ClearCompleted();
+        }
+
+        /// <summary>
+        /// Close this window.
+        /// </summary>
+        public void Close()
+        {
+            this.TryClose();
+        }
+
+        /// <summary>
+        /// Handle the On Window Load
+        /// </summary>
+        public override void OnLoad()
+        {
+            // Setup the window to the correct state.
+            this.IsEncoding = this.queueProcessor.EncodeService.IsEncoding;
+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+
+            base.OnLoad();
         }
 
         /// <summary>
@@ -167,85 +261,190 @@
         {
             if (task.Status == QueueItemStatus.InProgress)
             {
-                MessageBoxResult result = this.errorService.ShowMessageBox(
-                    "This encode is currently in progress. If you delete it, the encode will be stoped. Are you sure you wish to proceed?",
-                    "Warning", MessageBoxButton.YesNo, MessageBoxImage.Question);
+                MessageBoxResult result =
+                    this.errorService.ShowMessageBox(
+                        "This encode is currently in progress. If you delete it, the encode will be stopped. Are you sure you wish to proceed?",
+                        "Warning",
+                        MessageBoxButton.YesNo,
+                        MessageBoxImage.Question);
 
                 if (result == MessageBoxResult.Yes)
                 {
-                    this.queueProcessor.QueueManager.Remove(task);
+                    this.queueProcessor.EncodeService.Stop();
+                    this.queueProcessor.Remove(task);
                 }
             }
             else
             {
-                this.queueProcessor.QueueManager.Remove(task);
+                this.queueProcessor.Remove(task);
             }
+        }
 
-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);
+        /// <summary>
+        /// Reset the job state to waiting.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void RetryJob(QueueTask task)
+        {
+            task.Status = QueueItemStatus.Waiting;
+            this.queueProcessor.BackupQueue(null);
+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
         }
 
         /// <summary>
-        /// Handle the On Window Load
+        /// Start Encode
         /// </summary>
-        public override void OnLoad()
+        public void StartEncode()
         {
-            this.queueProcessor.JobProcessingStarted += queueProcessor_JobProcessingStarted;
-            this.queueProcessor.QueueCompleted += queueProcessor_QueueCompleted;
-            this.queueProcessor.QueuePaused += queueProcessor_QueuePaused;
-            this.queueProcessor.QueueManager.QueueChanged += QueueManager_QueueChanged;
+            if (this.queueProcessor.Count == 0)
+            {
+                this.errorService.ShowMessageBox(
+                    "There are no pending jobs.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
 
-            // Setup the window to the correct state.
-            this.IsEncoding = queueProcessor.EncodeService.IsEncoding;
-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);
+            this.queueProcessor.Start();
+        }
 
-            base.OnLoad();
+        /// <summary>
+        /// Export the Queue to a file.
+        /// </summary>
+        public void Export()
+        {
+            VistaSaveFileDialog dialog = new VistaSaveFileDialog
+                {
+                    Filter = "HandBrake Queue Files (*.hbq)|*.hbq",
+                    OverwritePrompt = true,
+                    DefaultExt = ".hbq",
+                    AddExtension = true
+                };
+            dialog.ShowDialog();
+
+            this.queueProcessor.BackupQueue(dialog.FileName);
         }
 
         /// <summary>
-        /// Close this window.
+        /// Import a saved queue
         /// </summary>
-        public void Close()
+        public void Import()
         {
-            this.TryClose();
+            VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "HandBrake Queue Files (*.hbq)|*.hbq", CheckFileExists = true };
+            dialog.ShowDialog();
+
+            this.queueProcessor.RestoreQueue(dialog.FileName);
         }
 
         /// <summary>
+        /// Edit this Job
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void EditJob(QueueTask task)
+        {
+            MessageBoxResult result = this.errorService.ShowMessageBox(
+                "Are you sure you wish to edit this job? It will be removed from the queue and sent to the main window.",
+                "Modify Job?",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+
+            if (result != MessageBoxResult.Yes)
+            {
+                return;
+            }
+
+            // Remove the job if it is not already encoding. Let the user decide if they want to cancel or not.
+            this.RemoveJob(task);
+
+            // Pass a copy of the job back to the Main Screen
+            IMainViewModel mvm = IoC.Get<IMainViewModel>();
+            mvm.EditQueueJob(new EncodeTask(task.Task));
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
         /// Override the OnActive to run the Screen Loading code in the view model base.
         /// </summary>
         protected override void OnActivate()
         {
             this.Load();
+
+            this.WhenDoneAction = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction);
+
+            this.queueProcessor.JobProcessingStarted += this.queueProcessor_JobProcessingStarted;
+            this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;
+            this.queueProcessor.QueuePaused += this.queueProcessor_QueuePaused;
+            this.queueProcessor.QueueChanged += this.QueueManager_QueueChanged;
+            this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeService_EncodeStatusChanged;
+
             base.OnActivate();
         }
 
         /// <summary>
-        /// Handle the Queue Paused Event
+        /// Override the Deactivate
+        /// </summary>
+        /// <param name="close">
+        /// The close.
+        /// </param>
+        protected override void OnDeactivate(bool close)
+        {
+            this.queueProcessor.JobProcessingStarted -= this.queueProcessor_JobProcessingStarted;
+            this.queueProcessor.QueueCompleted -= this.queueProcessor_QueueCompleted;
+            this.queueProcessor.QueuePaused -= this.queueProcessor_QueuePaused;
+            this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;
+            this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeService_EncodeStatusChanged;
+
+            base.OnDeactivate(close);
+        }
+
+        /// <summary>
+        /// Handle the Encode Status Changed Event.
         /// </summary>
         /// <param name="sender">
         /// The sender.
         /// </param>
         /// <param name="e">
-        /// The EventArgs.
+        /// The EncodeProgressEventArgs.
         /// </param>
-        private void queueProcessor_QueuePaused(object sender, System.EventArgs e)
+        private void EncodeService_EncodeStatusChanged(
+            object sender, EncodeProgressEventArgs e)
         {
-            this.JobStatus = "Queue Paused";
-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);
+            Caliburn.Micro.Execute.OnUIThread(() =>
+            {
+                if (this.IsEncoding)
+                {
+                    this.JobStatus =
+                        string.Format(
+                            "Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:hh\\:mm\\:ss}",
+                            e.Task,
+                            e.TaskCount,
+                            e.PercentComplete,
+                            e.CurrentFrameRate,
+                            e.AverageFrameRate,
+                            e.EstimatedTimeLeft,
+                            e.ElapsedTime);
+                }
+
+            });
         }
 
         /// <summary>
-        /// Handle the Queue Completed Event
+        /// Handle the Queue Changed Event.
         /// </summary>
         /// <param name="sender">
         /// The sender.
         /// </param>
         /// <param name="e">
-        /// The EventArgs.
+        /// The e.
         /// </param>
-        private void queueProcessor_QueueCompleted(object sender, System.EventArgs e)
+        private void QueueManager_QueueChanged(object sender, EventArgs e)
         {
-            this.JobStatus = "Queue Completed";
-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);
+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
         }
 
         /// <summary>
@@ -257,47 +456,46 @@
         /// <param name="e">
         /// The QueueProgressEventArgs.
         /// </param>
-        private void queueProcessor_JobProcessingStarted(object sender, HandBrake.ApplicationServices.EventArgs.QueueProgressEventArgs e)
+        private void queueProcessor_JobProcessingStarted(
+            object sender, QueueProgressEventArgs e)
         {
             this.JobStatus = "Queue Started";
-            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);
-            this.queueProcessor.EncodeService.EncodeStatusChanged += EncodeService_EncodeStatusChanged;
+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+            this.IsEncoding = true;
         }
 
         /// <summary>
-        /// Handle the Encode Status Changed Event.
+        /// Handle the Queue Completed Event
         /// </summary>
         /// <param name="sender">
         /// The sender.
         /// </param>
         /// <param name="e">
-        /// The EncodeProgressEventArgs.
+        /// The EventArgs.
         /// </param>
-        private void EncodeService_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)
+        private void queueProcessor_QueueCompleted(object sender, EventArgs e)
         {
-            this.JobStatus = string.Format(
-                "Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:hh\\:mm\\:ss}",
-                e.Task,
-                e.TaskCount,
-                e.PercentComplete,
-                e.CurrentFrameRate,
-                e.AverageFrameRate,
-                e.EstimatedTimeLeft,
-                e.ElapsedTime);
+            this.JobStatus = "Queue Completed";
+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+            this.IsEncoding = false;
         }
 
         /// <summary>
-        /// Handle the Queue Changed Event.
+        /// Handle the Queue Paused Event
         /// </summary>
         /// <param name="sender">
         /// The sender.
         /// </param>
         /// <param name="e">
-        /// The e.
+        /// The EventArgs.
         /// </param>
-        private void QueueManager_QueueChanged(object sender, System.EventArgs e)
+        private void queueProcessor_QueuePaused(object sender, EventArgs e)
         {
-            // TODO
+            this.JobStatus = "Queue Paused";
+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+            this.IsEncoding = false;
         }
+
+        #endregion
     }
-}
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs Added

@@ -0,0 +1,180 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ShellViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Shell View Model
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+    using System.Windows;
+
+    using Caliburn.Micro;
+
+    using HandBrake.ApplicationServices.Services.Interfaces;
+
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Services.Interfaces;
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// The Shell View Model
+    /// </summary>
+    public class ShellViewModel : ViewModelBase, IShellViewModel
+    {
+        /// <summary>
+        /// Backing field for the error service.
+        /// </summary>
+        private readonly IErrorService errorService;
+
+        #region Constants and Fields
+
+        /// <summary>
+        /// The show main window.
+        /// </summary>
+        private bool showMainWindow;
+
+        /// <summary>
+        /// The show options.
+        /// </summary>
+        private bool showOptions;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShellViewModel"/> class.
+        /// </summary>
+        /// <param name="errorService">
+        /// The error Service.
+        /// </param>
+        public ShellViewModel(IErrorService errorService)
+        {
+            this.errorService = errorService;
+            this.showMainWindow = true;
+            this.showOptions = false;
+        }
+
+        /// <summary>
+        /// Change the page displayed on this window.
+        /// </summary>
+        /// <param name="window">
+        /// The window.
+        /// </param>
+        public void DisplayWindow(ShellWindow window)
+        {
+            if (window == ShellWindow.MainWindow)
+            {
+                this.ShowMainWindow = true;
+                this.ShowOptions = false;
+            }
+            else if (window == ShellWindow.OptionsWindow)
+            {
+                this.ShowOptions = true;
+                this.ShowMainWindow = false;
+            }
+            else
+            {
+                this.ShowMainWindow = true;
+                this.ShowOptions = false;
+            }
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets MainViewModel.
+        /// </summary>
+        public IMainViewModel MainViewModel { get; set; }
+
+        /// <summary>
+        /// Gets or sets OptionsViewModel.
+        /// </summary>
+        public IOptionsViewModel OptionsViewModel { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ShowMainWindow.
+        /// </summary>
+        public bool ShowMainWindow
+        {
+            get
+            {
+                return this.showMainWindow;
+            }
+            set
+            {
+                this.showMainWindow = value;
+                this.NotifyOfPropertyChange(() => this.ShowMainWindow);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether ShowOptions.
+        /// </summary>
+        public bool ShowOptions
+        {
+            get
+            {
+                return this.showOptions;
+            }
+            set
+            {
+                this.showOptions = value;
+                this.NotifyOfPropertyChange(() => this.ShowOptions);
+            }
+        }
+
+        /// <summary>
+        /// Gets WindowTitle.
+        /// </summary>
+        public string WindowTitle
+        {
+            get
+            {
+                return "HandBrake";
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Checks with the use if this window can be closed.
+        /// </summary>
+        /// <returns>
+        /// Returns true if the window can be closed.
+        /// </returns>
+        public bool CanClose()
+        {
+            IQueueProcessor processor = IoC.Get<IQueueProcessor>();
+            if (processor != null && processor.EncodeService.IsEncoding)
+            {
+                MessageBoxResult result =
+                    errorService.ShowMessageBox(
+                        "An Encode is currently running. Exiting HandBrake will stop this encode.\nAre you sure you wish to continue?",
+                        "Warning",
+                        MessageBoxButton.YesNo,
+                        MessageBoxImage.Warning);
+
+                if (result == MessageBoxResult.Yes)
+                {
+                    processor.Pause();
+                    processor.EncodeService.Stop();
+                    if (this.MainViewModel != null)
+                    {
+                        this.MainViewModel.Shutdown();
+                    }
+
+                    return true;
+                }
+                return false;
+            }
+
+            if (this.MainViewModel != null)
+            {
+                this.MainViewModel.Shutdown();
+            }
+            return true;
+        }
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs Changed

@@ -10,18 +10,17 @@
 namespace HandBrakeWPF.ViewModels
 {
     using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.ComponentModel.Composition;
+    using System.Collections.Specialized;
+    using System.IO;
     using System.Linq;
 
-    using Caliburn.Micro;
-
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
 
+    using HandBrakeWPF.Commands;
+    using HandBrakeWPF.Model;
     using HandBrakeWPF.ViewModels.Interfaces;
 
     using Ookii.Dialogs.Wpf;
@@ -29,20 +28,19 @@
     /// <summary>
     /// The Subtitles View Model
     /// </summary>
-    [Export(typeof(ISubtitlesViewModel))]
     public class SubtitlesViewModel : ViewModelBase, ISubtitlesViewModel
     {
         #region Constants and Fields
 
         /// <summary>
-        /// The subtitle tracks.
+        /// Backing field for the source subtitle tracks.
         /// </summary>
-        private ObservableCollection<SubtitleTrack> subtitleTracks;
+        private IList<Subtitle> sourceTracks;
 
         /// <summary>
-        /// Backing field for the source subtitle tracks.
+        /// The Foreign Audio Search Track
         /// </summary>
-        private IEnumerable<Subtitle> sourceTracks;
+        private readonly Subtitle ForeignAudioSearchTrack;
 
         #endregion
 
@@ -51,40 +49,25 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="HandBrakeWPF.ViewModels.SubtitlesViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
-        /// <param name="userSettingService">
-        /// The user Setting Service.
-        /// </param>
-        public SubtitlesViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        public SubtitlesViewModel()
         {
-            this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();
+            this.Task = new EncodeTask();
 
-            Langauges = LanguageUtilities.MapLanguages().Keys;
-            CharacterCodes = CharCodesUtilities.GetCharacterCodes();
+            this.Langauges = LanguageUtilities.MapLanguages().Keys;
+            this.CharacterCodes = CharCodesUtilities.GetCharacterCodes();
+
+            this.ForeignAudioSearchTrack = new Subtitle { SubtitleType = SubtitleType.ForeignAudioSearch, Language = "Foreign Audio Search (Bitmap)" };
+            this.SourceTracks = new List<Subtitle> { this.ForeignAudioSearchTrack };
         }
 
         #endregion
 
-        #region Public Properties
+        #region Properties
 
         /// <summary>
-        ///   Gets or sets State.
+        /// Gets or sets CharacterCodes.
         /// </summary>
-        public ObservableCollection<SubtitleTrack> SubtitleTracks
-        {
-            get
-            {
-                return this.subtitleTracks;
-            }
-
-            set
-            {
-                this.subtitleTracks = value;
-                this.NotifyOfPropertyChange(() => this.SubtitleTracks);
-            }
-        }
+        public IEnumerable<string> CharacterCodes { get; set; }
 
         /// <summary>
         /// Gets or sets Langauges.
@@ -92,27 +75,27 @@
         public IEnumerable<string> Langauges { get; set; }
 
         /// <summary>
-        /// Gets or sets CharacterCodes.
-        /// </summary>
-        public IEnumerable<string> CharacterCodes { get; set; }
-
-
-        /// <summary>
         /// Gets or sets SourceTracks.
         /// </summary>
-        public IEnumerable<Subtitle> SourceTracks
+        public IList<Subtitle> SourceTracks
         {
             get
             {
                 return this.sourceTracks;
             }
+
             set
             {
                 this.sourceTracks = value;
-                this.NotifyOfPropertyChange(() => SourceTracks);
+                this.NotifyOfPropertyChange(() => this.SourceTracks);
             }
         }
 
+        /// <summary>
+        /// Gets or sets Task.
+        /// </summary>
+        public EncodeTask Task { get; set; }
+
         #endregion
 
         #region Public Methods
@@ -122,18 +105,48 @@
         /// </summary>
         public void Add()
         {
-            if (this.SourceTracks != null)
+            this.Add(null);
+        }
+
+        /// <summary>
+        /// Add all closed captions not already on the list.
+        /// </summary>
+        public void AddAllClosedCaptions()
+        {
+
+            foreach (Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC))
             {
-                Subtitle source = this.SourceTracks.FirstOrDefault();
-                if (source != null)
-                {
-                    SubtitleTrack track = new SubtitleTrack
-                    {
-                        SubtitleType = SubtitleType.VobSub
-                    };
+                this.Add(subtitle);
+            }
+        }
 
-                    this.SubtitleTracks.Add(track);
-                }
+        /// <summary>
+        /// Add all the remaining subtitle tracks.
+        /// </summary>
+        public void AddAllRemaining()
+        {
+            foreach (Subtitle subtitle in this.SourceTitlesSubset(null))
+            {
+                this.Add(subtitle);
+            }
+        }
+
+        /// <summary>
+        /// Add all remaining tracks for the users preferred and selected languages
+        /// </summary>
+        public void AddAllRemainingForSelectedLanguages()
+        {
+            // Get a list of subtitle tracks that match the users lanaguages
+            StringCollection userSelectedLanguages =
+                this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
+            userSelectedLanguages.Add(
+                this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles));
+            List<Subtitle> availableTracks =
+                this.SourceTracks.Where(subtitle => userSelectedLanguages.Contains(subtitle.Language)).ToList();
+
+            foreach (Subtitle subtitle in this.SourceTitlesSubset(availableTracks))
+            {
+                this.Add(subtitle);
             }
         }
 
@@ -142,7 +155,12 @@
         /// </summary>
         public void Import()
         {
-            VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "SRT files (*.srt)|*.srt", CheckFileExists = true, Multiselect = true };
+            VistaOpenFileDialog dialog = new VistaOpenFileDialog
+                {
+                    Filter = "SRT files (*.srt)|*.srt",
+                    CheckFileExists = true,
+                    Multiselect = true
+                };
 
             dialog.ShowDialog();
 
@@ -150,13 +168,14 @@
             {
                 SubtitleTrack track = new SubtitleTrack
                     {
-                        SrtFileName = srtFile,
+                        SrtFileName = Path.GetFileNameWithoutExtension(srtFile),
                         SrtOffset = 0,
                         SrtCharCode = "UTF-8",
                         SrtLang = "English",
-                        SubtitleType = SubtitleType.SRT
+                        SubtitleType = SubtitleType.SRT,
+                        SrtPath = srtFile
                     };
-                this.SubtitleTracks.Add(track);
+                this.Task.SubtitleTracks.Add(track);
             }
         }
 
@@ -168,7 +187,133 @@
         /// </param>
         public void Remove(SubtitleTrack track)
         {
-            this.SubtitleTracks.Remove(track);
+            this.Task.SubtitleTracks.Remove(track);
+        }
+
+        /// <summary>
+        /// Clear all Tracks
+        /// </summary>
+        public void Clear()
+        {
+            this.Task.SubtitleTracks.Clear();
+        }
+
+        /// <summary>
+        /// Select the default subtitle track.
+        /// </summary>
+        /// <param name="subtitle">
+        /// The subtitle.
+        /// </param>
+        public void SelectDefaultTrack(SubtitleTrack subtitle)
+        {
+            foreach (SubtitleTrack track in this.Task.SubtitleTracks)
+            {
+                if (track == subtitle)
+                {
+                    continue; // Skip the track the user selected.
+                }
+                track.Default = false;
+            }
+
+            this.NotifyOfPropertyChange(() => this.Task);
+        }
+
+        /// <summary>
+        /// Select the burned in track.
+        /// </summary>
+        /// <param name="subtitle">
+        /// The subtitle.
+        /// </param>
+        public void SelectBurnedInTrack(SubtitleTrack subtitle)
+        {
+            foreach (SubtitleTrack track in this.Task.SubtitleTracks)
+            {
+                if (track == subtitle)
+                {
+                    continue; // Skip the track the user selected.
+                }
+                track.Burned = false;
+            }
+            this.NotifyOfPropertyChange(() => this.Task);
+        }
+
+        /// <summary>
+        /// Automatic Subtitle Selection based on user preferences.
+        /// </summary>
+        public void AutomaticSubtitleSelection()
+        {
+            this.Task.SubtitleTracks.Clear();
+
+            // New DUB Settings
+            int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
+            switch (mode)
+            {
+                case 1: // Adding all remaining subtitle tracks
+                    this.AddAllRemaining();
+                    break;
+                case 2: // Adding only the first or preferred first subtitle track.
+                    this.Add();
+                    break;
+                case 3: // Selected Languages Only
+                    this.AddAllRemainingForSelectedLanguages();
+                    break;
+                case 4: // Prefered Only
+                    this.AddForPreferredLanaguages(true);
+                    break;
+                case 5: // Prefered Only All
+                    this.AddForPreferredLanaguages(false);
+                    break;
+            }
+
+            // Add all closed captions if enabled.
+            if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption))
+            {
+                this.AddAllClosedCaptions();
+            }
+        }
+
+        /// <summary>
+        /// Open the options screen to the Audio and Subtitles tab.
+        /// </summary>
+        public void SetDefaultBehaviour()
+        {
+            OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
+            command.Execute(OptionsTab.AudioAndSubtitles);
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region ITabInterface
+
+        /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
+        {
+            // Note, We don't support Subtitles in presets yet.
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.Task);
+        }
+
+        /// <summary>
+        /// Update all the UI controls based on the encode task passed in.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
+        {
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.Task.SubtitleTracks);
+            this.NotifyOfPropertyChange(() => this.Task);
         }
 
         /// <summary>
@@ -185,19 +330,106 @@
         /// </param>
         public void SetSource(Title title, Preset preset, EncodeTask task)
         {
-            this.SourceTracks = title.Subtitles;
-            this.SubtitleTracks = task.SubtitleTracks;
+            this.SourceTracks.Clear();
+            this.SourceTracks.Add(ForeignAudioSearchTrack);
+            foreach (Subtitle subtitle in title.Subtitles)
+            {
+                this.SourceTracks.Add(subtitle);
+            }
+
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.Task);
+
+            this.AutomaticSubtitleSelection();
         }
 
+        #endregion
+
+        #endregion
+
+        #region Methods
+
         /// <summary>
-        /// Setup this tab for the specified preset.
+        /// Add a subtitle track.
+        /// The Source track is set based on the following order. If null, it will skip to the next option.
+        ///   1. Passed in Subitle param
+        ///   2. First preferred Subtitle from source
+        ///   3. First subtitle from source.
+        /// Will not add a subtitle if the source has none.
         /// </summary>
-        /// <param name="preset">
-        /// The preset.
+        /// <param name="subtitle">
+        /// The subtitle. Use null to add preferred, or first from source (based on user preference)
+        /// </param>
+        private void Add(Subtitle subtitle)
+        {
+            string preferred =
+                this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
+
+            Subtitle source = subtitle ??
+                              ((this.SourceTracks != null)
+                                   ? (this.SourceTracks.FirstOrDefault(l => l.Language == preferred) ??
+                                      this.SourceTracks.FirstOrDefault(s => s.SubtitleType != SubtitleType.ForeignAudioSearch))
+                                   : null);
+
+            if (source == null)
+            {
+                source = ForeignAudioSearchTrack;
+            }
+
+            SubtitleTrack track = new SubtitleTrack
+                    {
+                        SubtitleType = SubtitleType.VobSub,
+                        SourceTrack = source,
+                    };
+
+            if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) &&
+                this.Task != null &&
+                (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))
+            {
+                this.SelectBurnedInTrack(track);
+            }
+            
+            this.Task.SubtitleTracks.Add(track);
+        }
+
+        /// <summary>
+        /// Add all tracks for the preferred languages settings.
+        /// </summary>
+        /// <param name="firstOnly">
+        /// The first only.
+        /// </param>
+        private void AddForPreferredLanaguages(bool firstOnly)
+        {
+            string preferred =
+                this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
+
+            foreach (Subtitle subtitle in this.SourceTitlesSubset(null))
+            {
+                if (subtitle.Language == preferred)
+                {
+                    this.Add(subtitle);
+                    if (firstOnly)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of Source subtitle tracks that are not currently used.
+        /// </summary>
+        /// <param name="subtitles">
+        /// The subtitles. (Optional).  If null, works on the full source subtitle collection
         /// </param>
-        public void SetPreset(Preset preset)
+        /// <returns>
+        /// An IEnumerable collection of subtitles
+        /// </returns>
+        private IEnumerable<Subtitle> SourceTitlesSubset(IEnumerable<Subtitle> subtitles)
         {
-            // We don't currently support subtitles within presets.
+            return subtitles != null
+                       ? subtitles.Where(subtitle => !this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, subtitle))).ToList()
+                       : this.SourceTracks.Where(subtitle => !this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, subtitle))).ToList();
         }
 
         #endregion

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs Added

@@ -0,0 +1,82 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="TitleSpecificViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the TitleSpecificViewModel type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// The Title Specific View Model
+    /// </summary>
+    public class TitleSpecificViewModel : ViewModelBase, ITitleSpecificViewModel
+    {
+        #region Constants and Fields
+
+        /// <summary>
+        /// The selected title.
+        /// </summary>
+        private int? selectedTitle;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TitleSpecificViewModel"/> class. 
+        /// </summary>
+        public TitleSpecificViewModel()
+        {
+            this.SelectedTitle = 0;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets SelectedTitle.
+        /// </summary>
+        public int? SelectedTitle
+        {
+            get
+            {
+                return this.selectedTitle;
+            }
+
+            set
+            {
+                this.selectedTitle = value;
+                this.NotifyOfPropertyChange(() => this.SelectedTitle);
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Cancel the request to scan.
+        /// </summary>
+        public void Cancel()
+        {
+            this.selectedTitle = null;
+            this.TryClose();
+        }
+
+        /// <summary>
+        /// Open the selected title.
+        /// </summary>
+        public void Open()
+        {
+            this.TryClose();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs Changed

@@ -11,31 +11,56 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.ComponentModel.Composition;
+    using System.ComponentModel;
+    using System.Globalization;
+    using System.Linq;
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop;
     using HandBrake.Interop.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding.x264;
 
+    using HandBrakeWPF.Commands.Interfaces;
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.Properties;
     using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
     /// The Video View Model
     /// </summary>
-    [Export(typeof(IVideoViewModel))]
     public class VideoViewModel : ViewModelBase, IVideoViewModel
     {
         #region Constants and Fields
         /// <summary>
+        /// Same as source constant.
+        /// </summary>
+        private const string SameAsSource = "Same as source";
+
+        /// <summary>
+        /// The possible h264 levels.
+        /// </summary>
+        private static readonly List<string> Levels = new List<string> { "Auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2"};
+
+        /// <summary>
         /// Backing field for the user setting service.
         /// </summary>
-        private IUserSettingService userSettingService;
+        private readonly IUserSettingService userSettingService;
+
+        /// <summary>
+        /// The advanced encoder options command
+        /// </summary>
+        private readonly IAdvancedEncoderOptionsCommand advancedEncoderOptionsCommand;
+
+        /// <summary>
+        /// Backing field used to display / hide the x264 options
+        /// </summary>
+        private bool displayX264Options;
 
         /// <summary>
         /// The quality max.
@@ -57,6 +82,26 @@
         /// </summary>
         private int rf;
 
+        /// <summary>
+        /// The x264 preset value.
+        /// </summary>
+        private int x264PresetValue;
+
+        /// <summary>
+        /// The extra arguments.
+        /// </summary>
+        private string extraArguments;
+
+        /// <summary>
+        /// The can clear tracker.
+        /// </summary>
+        private bool canClear;
+
+        /// <summary>
+        /// The use advanced tab.
+        /// </summary>
+        private bool useAdvancedTab;
+
         #endregion
 
         #region Constructors and Destructors
@@ -64,20 +109,28 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="VideoViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
         /// <param name="userSettingService">
         /// The user Setting Service.
         /// </param>
-        public VideoViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        /// <param name="advancedEncoderOptionsCommand">
+        /// The advanced Encoder Options Command.
+        /// </param>
+        public VideoViewModel(IUserSettingService userSettingService, IAdvancedEncoderOptionsCommand advancedEncoderOptionsCommand)
         {
             this.Task = new EncodeTask { VideoEncoder = VideoEncoder.X264 };
             this.userSettingService = userSettingService;
+            this.advancedEncoderOptionsCommand = advancedEncoderOptionsCommand;
             this.QualityMin = 0;
             this.QualityMax = 51;
             this.IsConstantQuantity = true;
             this.VideoEncoders = EnumHelper<VideoEncoder>.GetEnumList();
+
+            X264Presets = new BindingList<x264Preset>(EnumHelper<x264Preset>.GetEnumList().ToList());
+            H264Profiles = EnumHelper<x264Profile>.GetEnumList();
+            X264Tunes = EnumHelper<x264Tune>.GetEnumList().Where(t => t != x264Tune.Fastdecode);
+            this.H264Levels = Levels;
+
+            this.userSettingService.SettingChanged += this.UserSettingServiceSettingChanged;
         }
 
         #endregion
@@ -90,13 +143,51 @@
         public EncodeTask Task { get; set; }
 
         /// <summary>
+        /// Gets a value indicating whether show advanced tab.
+        /// </summary>
+        public bool ShowAdvancedTab
+        {
+            get
+            {
+                bool showAdvTabSetting =
+                    this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);
+                if (!showAdvTabSetting)
+                {
+                    this.UseAdvancedTab = false;
+                }
+
+                return showAdvTabSetting;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether use video tab.
+        /// </summary>
+        public bool UseAdvancedTab
+        {
+            get
+            {
+                return this.useAdvancedTab;
+            }
+            set
+            {
+                if (!object.Equals(value, this.useAdvancedTab))
+                {
+                    this.useAdvancedTab = value;
+                    this.Task.ShowAdvancedTab = value;
+                    this.NotifyOfPropertyChange(() => this.UseAdvancedTab);
+                }
+            }
+        }
+
+        /// <summary>
         /// Gets Framerates.
         /// </summary>
         public IEnumerable<string> Framerates
         {
             get
             {
-                return new List<string> { "Same as source", "5", "10", "12", "15", "23.976", "24", "25", "29.97`" };
+                return new List<string> { "Same as source", "5", "10", "12", "15", "23.976", "24", "25", "29.97", "30", "50", "59.94", "60" };
             }
         }
 
@@ -195,6 +286,17 @@
         }
 
         /// <summary>
+        /// Gets a value indicating whether is lossless.
+        /// </summary>
+        public bool IsLossless
+        {
+            get
+            {
+                return 51.Equals(this.RF);
+            }
+        }
+
+        /// <summary>
         /// Gets or sets QualityMax.
         /// </summary>
         public int QualityMax
@@ -205,8 +307,11 @@
             }
             set
             {
-                this.qualityMax = value;
-                this.NotifyOfPropertyChange(() => this.QualityMax);
+                if (!qualityMax.Equals(value))
+                {
+                    this.qualityMax = value;
+                    this.NotifyOfPropertyChange(() => this.QualityMax);
+                }
             }
         }
 
@@ -221,8 +326,11 @@
             }
             set
             {
-                this.qualityMin = value;
-                this.NotifyOfPropertyChange(() => this.QualityMin);
+                if (!qualityMin.Equals(value))
+                {
+                    this.qualityMin = value;
+                    this.NotifyOfPropertyChange(() => this.QualityMin);
+                }
             }
         }
 
@@ -239,7 +347,8 @@
             {
                 this.rf = value;
 
-                double cqStep = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
+                double cqStep = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);
+                this.SetQualitySliderBounds();
                 switch (this.SelectedVideoEncoder)
                 {
                     case VideoEncoder.FFMpeg:
@@ -250,8 +359,6 @@
                         double rfValue = 51.0 - value * cqStep;
                         rfValue = Math.Round(rfValue, 2);
                         this.Task.Quality = rfValue;
-
-                        // TODO: Lossless warning.
                         break;
                     case VideoEncoder.Theora:
                         Task.Quality = value;
@@ -260,6 +367,7 @@
 
                 this.NotifyOfPropertyChange(() => this.RF);
                 this.NotifyOfPropertyChange(() => this.DisplayRF);
+                this.NotifyOfPropertyChange(() => this.IsLossless);
             }
         }
 
@@ -275,6 +383,17 @@
         }
 
         /// <summary>
+        /// Gets the rfqp.
+        /// </summary>
+        public string Rfqp
+        {
+            get
+            {
+                return this.SelectedVideoEncoder == VideoEncoder.X264 ? "RF" : "QP";
+            }
+        }
+
+        /// <summary>
         /// Gets or sets SelectedFramerate.
         /// </summary>
         public string SelectedFramerate
@@ -286,7 +405,7 @@
                     return "Same as source";
                 }
 
-                return this.Task.Framerate.ToString();
+                return this.Task.Framerate.Value.ToString(CultureInfo.InvariantCulture);
             }
             set
             {
@@ -294,15 +413,20 @@
                 {
                     this.Task.Framerate = null;
                     this.ShowPeakFramerate = false;
+
+                    if (this.Task.FramerateMode == FramerateMode.PFR)
+                    {
+                        this.IsVariableFramerate = true;
+                    }
                 }
                 else if (!string.IsNullOrEmpty(value))
                 {
                     this.ShowPeakFramerate = true;
                     if (this.Task.FramerateMode == FramerateMode.VFR)
                     {
-                        this.Task.FramerateMode = FramerateMode.PFR; 
-                    } 
-                    this.Task.Framerate = double.Parse(value);
+                        this.IsPeakFramerate = true;
+                    }
+                    this.Task.Framerate = double.Parse(value, CultureInfo.InvariantCulture);
                 }
 
                 this.NotifyOfPropertyChange(() => this.SelectedFramerate);
@@ -328,23 +452,13 @@
                 IAdvancedViewModel advancedViewModel = IoC.Get<IAdvancedViewModel>();
                 advancedViewModel.SetEncoder(this.Task.VideoEncoder);
 
-                // Update the Quality Slider
-                switch (this.SelectedVideoEncoder)
-                {
-                    case VideoEncoder.FFMpeg:
-                    case VideoEncoder.FFMpeg2:
-                        this.QualityMin = 1;
-                        this.QualityMax = 31;
-                        break;
-                    case VideoEncoder.X264:
-                        this.QualityMin = 0;
-                        this.QualityMax = (int)(51 / userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step));
-                        break;
-                    case VideoEncoder.Theora:
-                        this.QualityMin = 0;
-                        this.QualityMax = 63;
-                        break;
-                }
+                // Update the Quality Slider. Make sure the bounds are up to date with the users settings.
+                this.SetQualitySliderBounds();
+
+                // Hide the x264 controls when not needed.
+                this.DisplayX264Options = value == VideoEncoder.X264;
+
+                this.NotifyOfPropertyChange(() => this.Rfqp);
             }
         }
 
@@ -369,6 +483,201 @@
         /// </summary>
         public IEnumerable<VideoEncoder> VideoEncoders { get; set; }
 
+        /// <summary>
+        /// Gets or sets the extra arguments.
+        /// </summary>
+        public string ExtraArguments
+        {
+            get
+            {
+                return this.Task.ExtraAdvancedArguments;
+            }
+            set
+            {
+                if (!object.Equals(this.Task.AdvancedEncoderOptions, value))
+                {
+                    this.Task.ExtraAdvancedArguments = value;
+                    this.NotifyOfPropertyChange(() => this.ExtraArguments);
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether display x 264 options.
+        /// </summary>
+        public bool DisplayX264Options
+        {
+            get
+            {
+                return this.displayX264Options;
+            }
+            set
+            {
+                this.displayX264Options = value;
+                this.NotifyOfPropertyChange(() => this.DisplayX264Options);
+                this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the x 264 preset value.
+        /// </summary>
+        public int X264PresetValue
+        {
+            get
+            {
+                return this.x264PresetValue;
+            }
+            set
+            {
+                if (!object.Equals(this.X264PresetValue, value))
+                {
+                    this.x264PresetValue = value;
+                    this.X264Preset = this.X264Presets[value];
+                    this.NotifyOfPropertyChange(() => this.x264PresetValue);
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets X264Preset.
+        /// </summary>
+        public x264Preset X264Preset
+        {
+            get
+            {
+                return this.Task.X264Preset;
+            }
+            set
+            {
+                if (!object.Equals(this.X264Preset, value))
+                {
+                    this.Task.X264Preset = value;
+                    this.NotifyOfPropertyChange(() => this.X264Preset);
+                    ResetAdvancedTab();
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets H264Profile.
+        /// </summary>
+        public x264Profile H264Profile
+        {
+            get
+            {
+                return this.Task.H264Profile;
+            }
+
+            set
+            {
+                if (!object.Equals(this.H264Profile, value))
+                {
+                    this.Task.H264Profile = value;
+                    this.NotifyOfPropertyChange(() => this.H264Profile);
+                    ResetAdvancedTab();
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets H264Profile.
+        /// </summary>
+        public string H264Level
+        {
+            get
+            {
+                return this.Task.H264Level;
+            }
+            set
+            {
+                if (!object.Equals(this.H264Level, value))
+                {
+                    this.Task.H264Level = value;
+                    this.NotifyOfPropertyChange(() => this.H264Level);
+                    ResetAdvancedTab();
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets X264Tune.
+        /// </summary>
+        public x264Tune X264Tune
+        {
+            get
+            {
+                return this.Task.X264Tune;
+            }
+            set
+            {
+                if (!object.Equals(this.X264Tune, value))
+                {
+                    this.Task.X264Tune = value;
+                    this.NotifyOfPropertyChange(() => this.X264Tune);
+                    ResetAdvancedTab();
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether fast decode.
+        /// </summary>
+        public bool FastDecode
+        {
+            get
+            {
+                return this.Task.FastDecode;
+            }
+            set
+            {
+                if (!object.Equals(this.FastDecode, value))
+                {
+                    this.Task.FastDecode = value;
+                    this.NotifyOfPropertyChange(() => this.FastDecode);
+                    ResetAdvancedTab();
+                    this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets X264Presets.
+        /// </summary>
+        public BindingList<x264Preset> X264Presets { get; set; }
+
+        /// <summary>
+        /// Gets or sets X264Profiles.
+        /// </summary>
+        public IEnumerable<x264Profile> H264Profiles { get; set; }
+
+        /// <summary>
+        /// Gets or sets X264Tunes.
+        /// </summary>
+        public IEnumerable<x264Tune> X264Tunes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the x 264 levels.
+        /// </summary>
+        public IEnumerable<string> H264Levels { get; set; }
+
+        /// <summary>
+        /// Gets the full options tooltip.
+        /// </summary>
+        public string FullOptionsTooltip
+        {
+            get
+            {
+                return string.Format(Resources.Video_x264ExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; 
+            }
+        }
+
         #endregion
 
         #region Public Methods
@@ -396,15 +705,22 @@
         /// <param name="preset">
         /// The preset.
         /// </param>
-        public void SetPreset(Preset preset)
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
         {
+            this.Task = task;
             if (preset == null || preset.Task == null)
             {
                 return;
             }
-            
+
             this.SelectedVideoEncoder = preset.Task.VideoEncoder;
-            this.SelectedFramerate = preset.Task.Framerate.ToString();
+            this.SelectedFramerate = preset.Task.Framerate.HasValue ? preset.Task.Framerate.Value.ToString(CultureInfo.InvariantCulture) : SameAsSource;
+
+            this.IsConstantQuantity = preset.Task.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality;
+
             switch (preset.Task.FramerateMode)
             {
                 case FramerateMode.CFR:
@@ -419,17 +735,228 @@
                     this.ShowPeakFramerate = true;
                     break;
             }
-             
-            // TODO Compute RF
-            this.RF = 20;
+
+            double cqStep = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);
+            double rfValue = 0;
+            this.SetQualitySliderBounds();
+            switch (this.SelectedVideoEncoder)
+            {
+                case VideoEncoder.FFMpeg:
+                case VideoEncoder.FFMpeg2:
+                    if (preset.Task.Quality.HasValue)
+                    {
+                        int cq;
+                        int.TryParse(preset.Task.Quality.Value.ToString(CultureInfo.InvariantCulture), out cq);
+                        this.RF = 32 - cq;
+                    }
+                    break;
+                case VideoEncoder.X264:
+
+                    double multiplier = 1.0 / cqStep;
+                    if (preset.Task.Quality.HasValue)
+                    {
+                        rfValue = preset.Task.Quality.Value * multiplier;
+                    }
+
+                    this.RF = this.QualityMax - (int)Math.Round(rfValue, 0);
+
+                    break;
+
+                case VideoEncoder.Theora:
+                    if (preset.Task.Quality.HasValue)
+                    {
+                        this.RF = (int)preset.Task.Quality.Value;
+                    }
+                    break;
+            }
 
             this.Task.TwoPass = preset.Task.TwoPass;
             this.Task.TurboFirstPass = preset.Task.TurboFirstPass;
             this.Task.VideoBitrate = preset.Task.VideoBitrate;
 
             this.NotifyOfPropertyChange(() => this.Task);
+
+            if (preset.Task != null)
+            {
+                this.SetEncoder(preset.Task.VideoEncoder);
+                this.X264PresetValue = preset.Task.VideoEncoder == VideoEncoder.X264
+                                           ? (int)preset.Task.X264Preset
+                                           : (int)x264Preset.Medium;
+                this.H264Profile = preset.Task.VideoEncoder == VideoEncoder.X264 ? preset.Task.H264Profile : x264Profile.None;
+                this.X264Tune = preset.Task.VideoEncoder == VideoEncoder.X264 ? preset.Task.X264Tune : x264Tune.None;
+                this.H264Level = preset.Task.VideoEncoder == VideoEncoder.X264 ? preset.Task.H264Level : "Auto";
+                this.FastDecode = preset.Task.VideoEncoder == VideoEncoder.X264 && preset.Task.FastDecode;
+                this.ExtraArguments = preset.Task.ExtraAdvancedArguments;
+
+                this.UseAdvancedTab = !string.IsNullOrEmpty(preset.Task.AdvancedEncoderOptions) && this.ShowAdvancedTab;
+            }
+        }
+
+        /// <summary>
+        /// Update all the UI controls based on the encode task passed in.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
+        {
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.IsConstantFramerate);
+            this.NotifyOfPropertyChange(() => this.IsConstantQuantity);
+            this.NotifyOfPropertyChange(() => this.IsPeakFramerate);
+            this.NotifyOfPropertyChange(() => this.IsVariableFramerate);
+            this.NotifyOfPropertyChange(() => this.SelectedVideoEncoder);
+            this.NotifyOfPropertyChange(() => this.SelectedFramerate);
+            this.NotifyOfPropertyChange(() => this.RF);
+            this.NotifyOfPropertyChange(() => this.DisplayRF);
+            this.NotifyOfPropertyChange(() => this.Task.VideoBitrate);
+            this.NotifyOfPropertyChange(() => this.Task.TwoPass);
+            this.NotifyOfPropertyChange(() => this.Task.TurboFirstPass);
+
+            this.NotifyOfPropertyChange(() => this.X264Tune);
+            this.NotifyOfPropertyChange(() => this.X264Preset);
+            this.NotifyOfPropertyChange(() => this.H264Level);
+            this.NotifyOfPropertyChange(() => this.H264Profile);
+            this.NotifyOfPropertyChange(() => this.FastDecode);
+            this.NotifyOfPropertyChange(() => this.ExtraArguments);
+        }
+
+        /// <summary>
+        /// Set the currently selected encoder.
+        /// </summary>
+        /// <param name="encoder">
+        /// The Video Encoder.
+        /// </param>
+        public void SetEncoder(VideoEncoder encoder)
+        {
+            this.DisplayX264Options = encoder == VideoEncoder.X264;
+        }
+
+        /// <summary>
+        /// Trigger a Notify Property Changed on the Task to force various UI elements to update.
+        /// </summary>
+        public void RefreshTask()
+        {
+            this.NotifyOfPropertyChange(() => this.Task);
+
+            if (Task.OutputFormat == OutputFormat.Mp4 && this.SelectedVideoEncoder == VideoEncoder.Theora)
+            {
+                this.SelectedVideoEncoder = VideoEncoder.X264;
+            }
+        }
+
+        /// <summary>
+        /// Clear advanced settings.
+        /// </summary>
+        public void ClearAdvancedSettings()
+        {
+            this.canClear = false;
+            this.X264PresetValue = 5;
+            this.X264Tune = x264Tune.None;
+            this.H264Profile = x264Profile.None;
+            this.FastDecode = false;
+            this.H264Level = "Auto";
+            this.ExtraArguments = string.Empty;
+            this.canClear = true;
         }
 
         #endregion
+
+        /// <summary>
+        /// Set the bounds of the Constant Quality Slider
+        /// </summary>
+        private void SetQualitySliderBounds()
+        {
+            // Note Updating bounds to the same values won't trigger an update.
+            // The properties are smart enough to not take in equal values.
+            switch (this.SelectedVideoEncoder)
+            {
+                case VideoEncoder.FFMpeg:
+                case VideoEncoder.FFMpeg2:
+                    this.QualityMin = 1;
+                    this.QualityMax = 31;
+                    break;
+                case VideoEncoder.X264:
+                    this.QualityMin = 0;
+                    this.QualityMax = (int)(51 / userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step));
+                    break;
+                case VideoEncoder.Theora:
+                    this.QualityMin = 0;
+                    this.QualityMax = 63;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Reset advanced tab.
+        /// </summary>
+        private void ResetAdvancedTab()
+        {
+            if (canClear)
+            {
+                this.advancedEncoderOptionsCommand.ExecuteClearAdvanced();
+            }
+        }
+
+        /// <summary>
+        /// The get actualx 264 query.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        private string GetActualx264Query()
+        {
+            if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibHbFeatures))
+            {
+                return string.Empty; // Feature is disabled.
+            }
+
+            string preset = EnumHelper<x264Preset>.GetDisplay(this.X264Preset).ToLower().Replace(" ", string.Empty);
+            string profile = EnumHelper<x264Profile>.GetDisplay(this.H264Profile).ToLower();
+
+            List<string> tunes = new List<string>();
+            if (X264Tune != x264Tune.None)
+            {
+                tunes.Add(this.X264Tune.ToString().ToLower().Replace(" ", string.Empty)); // TODO tidy this sillyness up.
+            }
+            if (this.FastDecode)
+            {
+                tunes.Add("fastdecode");
+            }
+
+            // Get the width or height, default if we don't have it yet so we don't crash.
+            int width = this.Task.Width.HasValue ? this.Task.Width.Value : 720;
+            int height = this.Task.Height.HasValue ? this.Task.Height.Value : 576;
+
+            if (height == 0)
+            {
+                height = 576;
+            }
+
+            if (width == 0)
+            {
+                width = 720;
+            }
+
+            // TODO figure out what is wrong with this??
+            return HandBrakeUtils.CreateX264OptionsString(preset, tunes, this.ExtraArguments, profile, this.H264Level, width, height);
+        }
+
+        /// <summary>
+        /// The user setting service_ setting changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void UserSettingServiceSettingChanged(object sender, HandBrake.ApplicationServices.EventArgs.SettingChangedEventArgs e)
+        {
+            if (e.Key == UserSettingConstants.ShowAdvancedTab)
+            {
+                this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+            }
+        }
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs Added

@@ -0,0 +1,1155 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="X264ViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The X264 Advanced View Model
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Parsing;
+    using HandBrake.Interop.Model.Encoding;
+
+    using HandBrakeWPF.Commands.Interfaces;
+    using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Model;
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    /// <summary>
+    /// The Advanced View Model
+    /// </summary>
+    public class X264ViewModel : ViewModelBase, IX264ViewModel
+    {
+        /// <summary>
+        /// The advanced encoder options command.
+        /// </summary>
+        private readonly IAdvancedEncoderOptionsCommand advancedEncoderOptionsCommand;
+
+        #region Constants and Fields
+
+        /// <summary>
+        /// The adaptive b frames.
+        /// </summary>
+        private AdvancedChoice adaptiveBFrames;
+
+        /// <summary>
+        /// The adaptive quantization strength.
+        /// </summary>
+        private double adaptiveQuantizationStrength;
+
+        /// <summary>
+        /// The analysis.
+        /// </summary>
+        private AdvancedChoice analysis;
+
+        /// <summary>
+        /// The b frames.
+        /// </summary>
+        private AdvancedChoice bFrames;
+
+        /// <summary>
+        /// The cabac entropy coding.
+        /// </summary>
+        private bool cabacEntropyCoding;
+
+        /// <summary>
+        /// The deblocking strength.
+        /// </summary>
+        private AdvancedChoice deblockingStrength;
+
+        /// <summary>
+        /// The deblocking threshold.
+        /// </summary>
+        private AdvancedChoice deblockingThreshold;
+
+        /// <summary>
+        /// The direct prediction.
+        /// </summary>
+        private AdvancedChoice directPrediction;
+
+        /// <summary>
+        /// The eight by eight dct.
+        /// </summary>
+        private bool eightByEightDct;
+
+        /// <summary>
+        /// The motion estimation method.
+        /// </summary>
+        private AdvancedChoice motionEstimationMethod;
+
+        /// <summary>
+        /// The motion estimation range.
+        /// </summary>
+        private int motionEstimationRange;
+
+        /// <summary>
+        /// The no dct decimate.
+        /// </summary>
+        private bool noDctDecimate;
+
+        /// <summary>
+        /// The psychovisual rate distortion.
+        /// </summary>
+        private double psychovisualRateDistortion;
+
+        /// <summary>
+        /// The psychovisual trellis.
+        /// </summary>
+        private double psychovisualTrellis;
+
+        /// <summary>
+        /// The pyramidal b frames.
+        /// </summary>
+        private AdvancedChoice pyramidalBFrames;
+
+        /// <summary>
+        /// The reference frames.
+        /// </summary>
+        private AdvancedChoice referenceFrames;
+
+        /// <summary>
+        /// The subpixel motion estimation.
+        /// </summary>
+        private AdvancedChoice subpixelMotionEstimation;
+
+        /// <summary>
+        /// The trellis.
+        /// </summary>
+        private AdvancedChoice trellis;
+
+        /// <summary>
+        /// X264 options that have UI elements that correspond to them.
+        /// </summary>
+        private HashSet<string> uiOptions = new HashSet<string>
+            {
+                "ref",
+                "bframes",
+                "b-adapt",
+                "direct",
+                "weightp",
+                "b-pyramid",
+                "me",
+                "subme",
+                "subq",
+                "merange",
+                "analyse",
+                "8x8dct",
+                "cabac",
+                "trellis",
+                "aq-strength",
+                "psy-rd",
+                "no-dct-decimate",
+                "deblock"
+            };
+
+        /// <summary>
+        /// The weighted p frames.
+        /// </summary>
+        private bool weightedPFrames;
+
+        #endregion
+
+        #region Constructors and Destructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="X264ViewModel"/> class.
+        /// </summary>
+        /// <param name="advancedEncoderOptionsCommand">
+        /// The advanced Encoder Options Command.
+        /// </param>
+        public X264ViewModel(IAdvancedEncoderOptionsCommand advancedEncoderOptionsCommand)
+        {
+            this.advancedEncoderOptionsCommand = advancedEncoderOptionsCommand;
+            this.Task = new EncodeTask();
+            this.UpdateUIFromAdvancedOptions();
+        }
+
+        /// <summary>
+        /// The task object property changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The PropertyChangedEventArgs.
+        /// </param>
+        private void Task_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == UserSettingConstants.ShowAdvancedTab)
+            {
+                ShowX264AdvancedOptions = this.Task.ShowAdvancedTab;
+                this.NotifyOfPropertyChange(() => ShowX264AdvancedOptions);
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether show x 264 advanced options.
+        /// </summary>
+        public bool ShowX264AdvancedOptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets AdaptiveBFrames.
+        /// </summary>
+        public AdvancedChoice AdaptiveBFrames
+        {
+            get
+            {
+                return this.adaptiveBFrames;
+            }
+
+            set
+            {
+                this.adaptiveBFrames = value;
+                this.NotifyOfPropertyChange(() => this.AdaptiveBFrames);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets AdaptiveQuantizationStrength.
+        /// </summary>
+        public double AdaptiveQuantizationStrength
+        {
+            get
+            {
+                return this.adaptiveQuantizationStrength;
+            }
+
+            set
+            {
+                this.adaptiveQuantizationStrength = value;
+                this.NotifyOfPropertyChange(() => this.AdaptiveQuantizationStrength);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets AdvancedOptionsString.
+        /// </summary>
+        public string AdvancedOptionsString
+        {
+            get
+            {
+                return this.Task.AdvancedEncoderOptions;
+            }
+
+            set
+            {
+                this.Task.AdvancedEncoderOptions = value;
+                this.UpdateUIFromAdvancedOptions();
+                this.NotifyOfPropertyChange(() => this.AdvancedOptionsString);
+
+                // Reset the video tab if the user is using this tab.
+                if (!string.IsNullOrEmpty(this.Task.AdvancedEncoderOptions))
+                {
+                    this.advancedEncoderOptionsCommand.ExecuteClearVideo();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Analysis.
+        /// </summary>
+        public AdvancedChoice Analysis
+        {
+            get
+            {
+                return this.analysis;
+            }
+
+            set
+            {
+                this.analysis = value;
+                this.NotifyOfPropertyChange(() => this.Analysis);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether AutomaticChange.
+        /// </summary>
+        public bool AutomaticChange { get; set; }
+
+        /// <summary>
+        /// Gets or sets BFrames.
+        /// </summary>
+        public AdvancedChoice BFrames
+        {
+            get
+            {
+                return this.bFrames;
+            }
+
+            set
+            {
+                this.bFrames = value;
+                this.NotifyOfPropertyChange(() => this.BFrames);
+                this.NotifyOfPropertyChange(() => this.BFramesOptionsVisible);
+                this.NotifyOfPropertyChange(() => this.PyramidalBFramesVisible);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether BFramesOptionsVisible.
+        /// </summary>
+        public bool BFramesOptionsVisible
+        {
+            get
+            {
+                return this.BFrames.Value != "0";
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether CabacEntropyCoding.
+        /// </summary>
+        public bool CabacEntropyCoding
+        {
+            get
+            {
+                return this.cabacEntropyCoding;
+            }
+
+            set
+            {
+                this.cabacEntropyCoding = value;
+                this.NotifyOfPropertyChange(() => this.CabacEntropyCoding);
+                this.NotifyOfPropertyChange(() => this.PsychovisualTrellisVisible);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets DeblockingStrength.
+        /// </summary>
+        public AdvancedChoice DeblockingStrength
+        {
+            get
+            {
+                return this.deblockingStrength;
+            }
+
+            set
+            {
+                this.deblockingStrength = value;
+                this.NotifyOfPropertyChange(() => this.DeblockingStrength);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets DeblockingThreshold.
+        /// </summary>
+        public AdvancedChoice DeblockingThreshold
+        {
+            get
+            {
+                return this.deblockingThreshold;
+            }
+
+            set
+            {
+                this.deblockingThreshold = value;
+                this.NotifyOfPropertyChange(() => this.DeblockingThreshold);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets DirectPrediction.
+        /// </summary>
+        public AdvancedChoice DirectPrediction
+        {
+            get
+            {
+                return this.directPrediction;
+            }
+
+            set
+            {
+                this.directPrediction = value;
+                this.NotifyOfPropertyChange(() => this.DirectPrediction);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether EightByEightDct.
+        /// </summary>
+        public bool EightByEightDct
+        {
+            get
+            {
+                return this.eightByEightDct;
+            }
+
+            set
+            {
+                this.eightByEightDct = value;
+                this.NotifyOfPropertyChange(() => this.EightByEightDct);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets MotionEstimationMethod.
+        /// </summary>
+        public AdvancedChoice MotionEstimationMethod
+        {
+            get
+            {
+                return this.motionEstimationMethod;
+            }
+
+            set
+            {
+                this.motionEstimationMethod = value;
+                this.NotifyOfPropertyChange(() => this.MotionEstimationMethod);
+
+                if ((MotionEstimationMethod.Value == "hex" || MotionEstimationMethod.Value == "dia") && (motionEstimationRange > 16))
+                {
+                    this.motionEstimationRange = 16;
+                    this.NotifyOfPropertyChange(() => this.MotionEstimationRange);
+                }
+
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets MotionEstimationRange.
+        /// </summary>
+        public int MotionEstimationRange
+        {
+            get
+            {
+                return this.motionEstimationRange;
+            }
+
+            set
+            {
+                if ((MotionEstimationMethod.Value == "hex" || MotionEstimationMethod.Value == "dia") && (value > 16))
+                {
+                    this.motionEstimationRange = 16;
+                }
+                else if (value < 4)
+                {
+                    this.motionEstimationRange = 4;
+                }
+                else
+                {
+                    this.motionEstimationRange = value;
+                }
+
+                this.NotifyOfPropertyChange(() => this.MotionEstimationRange);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether NoDctDecimate.
+        /// </summary>
+        public bool NoDctDecimate
+        {
+            get
+            {
+                return this.noDctDecimate;
+            }
+
+            set
+            {
+                this.noDctDecimate = value;
+                this.NotifyOfPropertyChange(() => this.NoDctDecimate);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets PsychovisualRateDistortion.
+        /// </summary>
+        public double PsychovisualRateDistortion
+        {
+            get
+            {
+                return this.psychovisualRateDistortion;
+            }
+
+            set
+            {
+                this.psychovisualRateDistortion = value;
+                this.NotifyOfPropertyChange(() => this.PsychovisualRateDistortion);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets PsychovisualTrellis.
+        /// </summary>
+        public double PsychovisualTrellis
+        {
+            get
+            {
+                return this.psychovisualTrellis;
+            }
+
+            set
+            {
+                this.psychovisualTrellis = value;
+                this.NotifyOfPropertyChange(() => this.PsychovisualTrellis);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether PsychovisualTrellisVisible.
+        /// </summary>
+        public bool PsychovisualTrellisVisible
+        {
+            get
+            {
+                return this.CabacEntropyCoding && this.Trellis.Value != "0";
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether PsychovisualRateDistortionVisible.
+        /// </summary>
+        public bool PsychovisualRateDistortionVisible
+        {
+            get
+            {
+                int value;
+                int.TryParse(this.SubpixelMotionEstimation.Value.Trim(), out value);
+                return value >= 6;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets PyramidalBFrames.
+        /// </summary>
+        public AdvancedChoice PyramidalBFrames
+        {
+            get
+            {
+                return this.pyramidalBFrames;
+            }
+
+            set
+            {
+                this.pyramidalBFrames = value;
+                this.NotifyOfPropertyChange(() => this.PyramidalBFrames);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether PyramidalBFramesVisible.
+        /// </summary>
+        public bool PyramidalBFramesVisible
+        {
+            get
+            {
+                return int.Parse(this.BFrames.Value) > 1;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets ReferenceFrames.
+        /// </summary>
+        public AdvancedChoice ReferenceFrames
+        {
+            get
+            {
+                return this.referenceFrames;
+            }
+
+            set
+            {
+                this.referenceFrames = value;
+                this.NotifyOfPropertyChange(() => this.ReferenceFrames);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets SubpixelMotionEstimation.
+        /// </summary>
+        public AdvancedChoice SubpixelMotionEstimation
+        {
+            get
+            {
+                return this.subpixelMotionEstimation;
+            }
+
+            set
+            {
+                this.subpixelMotionEstimation = value;
+                this.NotifyOfPropertyChange(() => this.SubpixelMotionEstimation);
+                this.NotifyOfPropertyChange(() => this.PsychovisualRateDistortionVisible);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Task.
+        /// </summary>
+        public EncodeTask Task { get; set; }
+
+        /// <summary>
+        /// Gets or sets Trellis.
+        /// </summary>
+        public AdvancedChoice Trellis
+        {
+            get
+            {
+                return this.trellis;
+            }
+
+            set
+            {
+                this.trellis = value;
+                this.NotifyOfPropertyChange(() => this.Trellis);
+                this.NotifyOfPropertyChange(() => this.PsychovisualTrellisVisible);
+                this.UpdateOptionsString();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether WeightedPFrames.
+        /// </summary>
+        public bool WeightedPFrames
+        {
+            get
+            {
+                return this.weightedPFrames;
+            }
+
+            set
+            {
+                this.weightedPFrames = value;
+                this.NotifyOfPropertyChange(() => this.WeightedPFrames);
+                this.UpdateOptionsString();
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// The update ui from advanced options.
+        /// </summary>
+        public void UpdateUIFromAdvancedOptions()
+        {
+            this.AutomaticChange = true;
+
+            // Reset UI to defaults, and re-apply options.
+            this.SetAdvancedToDefaults();
+
+            if (this.Task.AdvancedEncoderOptions == null)
+            {
+                this.AutomaticChange = false;
+                return;
+            }
+
+            // Check the updated options string. Update UI for any recognized options.
+            string[] newOptionsSegments = this.Task.AdvancedEncoderOptions.Split(':');
+            foreach (string newOptionsSegment in newOptionsSegments)
+            {
+                int equalsIndex = newOptionsSegment.IndexOf('=');
+                if (equalsIndex >= 0)
+                {
+                    string optionName = newOptionsSegment.Substring(0, equalsIndex);
+                    string optionValue = newOptionsSegment.Substring(equalsIndex + 1);
+
+                    if (optionName != string.Empty && optionValue != string.Empty)
+                    {
+                        AdvancedChoice newChoice;
+                        int parseInt;
+                        double parseDouble;
+                        string[] subParts;
+
+                        switch (optionName)
+                        {
+                            case "ref":
+                                if (int.TryParse(optionValue, out parseInt))
+                                {
+                                    newChoice =
+                                        AdvancedChoicesHelper.ReferenceFrames.SingleOrDefault(
+                                            choice => choice.Value == parseInt.ToString(CultureInfo.InvariantCulture));
+                                    if (newChoice != null)
+                                    {
+                                        this.ReferenceFrames = newChoice;
+                                    }
+                                }
+
+                                break;
+                            case "bframes":
+                                if (int.TryParse(optionValue, out parseInt))
+                                {
+                                    newChoice =
+                                        AdvancedChoicesHelper.BFrames.SingleOrDefault(
+                                            choice => choice.Value == parseInt.ToString(CultureInfo.InvariantCulture));
+                                    if (newChoice != null)
+                                    {
+                                        this.BFrames = newChoice;
+                                    }
+                                }
+
+                                break;
+                            case "b-adapt":
+                                newChoice =
+                                    AdvancedChoicesHelper.AdaptiveBFrames.SingleOrDefault(
+                                        choice => choice.Value == optionValue);
+                                if (newChoice != null)
+                                {
+                                    this.AdaptiveBFrames = newChoice;
+                                }
+
+                                break;
+                            case "direct":
+                                newChoice =
+                                    AdvancedChoicesHelper.DirectPrediction.SingleOrDefault(
+                                        choice => choice.Value == optionValue);
+                                if (newChoice != null)
+                                {
+                                    this.DirectPrediction = newChoice;
+                                }
+
+                                break;
+                            case "weightp":
+                                if (optionValue == "0")
+                                {
+                                    this.WeightedPFrames = false;
+                                }
+                                else if (optionValue == "1")
+                                {
+                                    this.WeightedPFrames = true;
+                                }
+
+                                break;
+                            case "b-pyramid":
+                                newChoice =
+                                    AdvancedChoicesHelper.PyramidalBFrames.SingleOrDefault(
+                                        choice => choice.Value == optionValue);
+                                if (newChoice != null)
+                                {
+                                    this.PyramidalBFrames = newChoice;
+                                }
+
+                                break;
+                            case "me":
+                                newChoice =
+                                    AdvancedChoicesHelper.MotionEstimationMethod.SingleOrDefault(
+                                        choice => choice.Value == optionValue);
+                                if (newChoice != null)
+                                {
+                                    this.MotionEstimationMethod = newChoice;
+                                }
+
+                                break;
+                            case "subme":
+                            case "subq":
+                                if (int.TryParse(optionValue, out parseInt))
+                                {
+                                    newChoice =
+                                        AdvancedChoicesHelper.SubpixelMotionEstimation.SingleOrDefault(
+                                            choice => choice.Value == parseInt.ToString(CultureInfo.InvariantCulture));
+                                    if (newChoice != null)
+                                    {
+                                        this.SubpixelMotionEstimation = newChoice;
+                                    }
+                                }
+
+                                break;
+                            case "merange":
+                                if (int.TryParse(optionValue, out parseInt))
+                                {
+                                    this.MotionEstimationRange = parseInt;
+                                }
+
+                                break;
+                            case "analyse":
+                                newChoice =
+                                    AdvancedChoicesHelper.Analysis.SingleOrDefault(
+                                        choice => choice.Value == optionValue);
+                                if (newChoice != null)
+                                {
+                                    this.Analysis = newChoice;
+                                }
+
+                                break;
+                            case "8x8dct":
+                                if (optionValue == "0")
+                                {
+                                    this.EightByEightDct = false;
+                                }
+                                else if (optionValue == "1")
+                                {
+                                    this.EightByEightDct = true;
+                                }
+
+                                break;
+                            case "cabac":
+                                if (optionValue == "0")
+                                {
+                                    this.CabacEntropyCoding = false;
+                                }
+                                else if (optionValue == "1")
+                                {
+                                    this.CabacEntropyCoding = true;
+                                }
+
+                                break;
+                            case "trellis":
+                                if (int.TryParse(optionValue, out parseInt))
+                                {
+                                    newChoice =
+                                        AdvancedChoicesHelper.Trellis.SingleOrDefault(
+                                            choice => choice.Value == parseInt.ToString(CultureInfo.InvariantCulture));
+                                    if (newChoice != null)
+                                    {
+                                        this.Trellis = newChoice;
+                                    }
+                                }
+
+                                break;
+                            case "aq-strength":
+                                if (double.TryParse(optionValue, NumberStyles.Any, CultureInfo.InvariantCulture, out parseDouble) && parseDouble >= 0.0 &&
+                                    parseDouble <= 2.0)
+                                {
+                                    this.AdaptiveQuantizationStrength = Math.Round(parseDouble, 1);
+                                }
+
+                                break;
+                            case "psy-rd":
+                                subParts = optionValue.Split(',');
+                                if (subParts.Length == 2)
+                                {
+                                    double psyRD, psyTrellis;
+                                    if (double.TryParse(subParts[0], NumberStyles.Any, CultureInfo.InvariantCulture, out psyRD) &&
+                                        double.TryParse(subParts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out psyTrellis))
+                                    {
+                                        if (psyRD >= 0.0 && psyRD <= 2.0 && psyTrellis >= 0.0 && psyTrellis <= 1.0)
+                                        {
+                                            this.PsychovisualRateDistortion = Math.Round(psyRD, 1);
+                                            this.PsychovisualTrellis = Math.Round(psyTrellis, 2);
+                                        }
+                                    }
+                                }
+
+                                break;
+                            case "no-dct-decimate":
+                                if (optionValue == "0")
+                                {
+                                    this.NoDctDecimate = false;
+                                }
+                                else if (optionValue == "1")
+                                {
+                                    this.NoDctDecimate = true;
+                                }
+
+                                break;
+                            case "deblock":
+                                subParts = optionValue.Split(',');
+                                if (subParts.Length == 2)
+                                {
+                                    int dbStrength, dbThreshold;
+                                    if (int.TryParse(subParts[0], out dbStrength) &&
+                                        int.TryParse(subParts[1], out dbThreshold))
+                                    {
+                                        newChoice =
+                                            AdvancedChoicesHelper.DeblockingStrength.SingleOrDefault(
+                                                choice => choice.Value == subParts[0]);
+                                        if (newChoice != null)
+                                        {
+                                            this.DeblockingStrength = newChoice;
+                                        }
+
+                                        newChoice =
+                                            AdvancedChoicesHelper.DeblockingThreshold.SingleOrDefault(
+                                                choice => choice.Value == subParts[1]);
+                                        if (newChoice != null)
+                                        {
+                                            this.DeblockingThreshold = newChoice;
+                                        }
+                                    }
+                                }
+
+                                break;
+                        }
+                    }
+                }
+            }
+
+            this.AutomaticChange = false;
+        }
+
+        #endregion
+
+        #region Implemented Interfaces
+
+        #region IAdvancedViewModel
+
+        /// <summary>
+        /// The set encoder.
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder.
+        /// </param>
+        public void SetEncoder(VideoEncoder encoder)
+        {   
+        }
+
+        /// <summary>
+        /// The clear.
+        /// </summary>
+        public void Clear()
+        {
+            this.AdvancedOptionsString = string.Empty;
+        }
+
+        #endregion
+
+        #region ITabInterface
+
+        /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetPreset(Preset preset, EncodeTask task)
+        {
+            this.Task.PropertyChanged -= this.Task_PropertyChanged;
+            this.Task = task;
+            this.Task.PropertyChanged += this.Task_PropertyChanged;
+            this.AdvancedOptionsString = preset.Task.AdvancedEncoderOptions;
+        }
+
+        /// <summary>
+        /// Update all the UI controls based on the encode task passed in.
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void UpdateTask(EncodeTask task)
+        {
+            this.Task = task;
+            this.SetEncoder(task.VideoEncoder);
+            this.AdvancedOptionsString = task.AdvancedEncoderOptions;
+        }
+
+        /// <summary>
+        /// Setup this window for a new source
+        /// </summary>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public void SetSource(Title title, Preset preset, EncodeTask task)
+        {
+            this.Task = task;
+            this.NotifyOfPropertyChange(() => this.AdvancedOptionsString);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// The set advanced to defaults.
+        /// </summary>
+        private void SetAdvancedToDefaults()
+        {
+            this.ReferenceFrames = AdvancedChoicesHelper.ReferenceFrames.SingleOrDefault(choice => choice.IsDefault);
+            this.BFrames = AdvancedChoicesHelper.BFrames.SingleOrDefault(choice => choice.IsDefault);
+            this.AdaptiveBFrames = AdvancedChoicesHelper.AdaptiveBFrames.SingleOrDefault(choice => choice.IsDefault);
+            this.DirectPrediction = AdvancedChoicesHelper.DirectPrediction.SingleOrDefault(choice => choice.IsDefault);
+            this.WeightedPFrames = true;
+            this.PyramidalBFrames = AdvancedChoicesHelper.PyramidalBFrames.SingleOrDefault(choice => choice.IsDefault);
+            this.MotionEstimationMethod =
+                AdvancedChoicesHelper.MotionEstimationMethod.SingleOrDefault(choice => choice.IsDefault);
+            this.SubpixelMotionEstimation =
+                AdvancedChoicesHelper.SubpixelMotionEstimation.SingleOrDefault(choice => choice.IsDefault);
+            this.MotionEstimationRange = 16;
+            this.Analysis = AdvancedChoicesHelper.Analysis.SingleOrDefault(choice => choice.IsDefault);
+            this.EightByEightDct = true;
+            this.CabacEntropyCoding = true;
+            this.Trellis = AdvancedChoicesHelper.Trellis.SingleOrDefault(choice => choice.IsDefault);
+            this.AdaptiveQuantizationStrength = 1.0;
+            this.PsychovisualRateDistortion = 1.0;
+            this.PsychovisualTrellis = 0.0;
+            this.DeblockingStrength =
+                AdvancedChoicesHelper.DeblockingStrength.SingleOrDefault(choice => choice.IsDefault);
+            this.DeblockingThreshold =
+                AdvancedChoicesHelper.DeblockingThreshold.SingleOrDefault(choice => choice.IsDefault);
+            this.NoDctDecimate = false;
+        }
+
+        /// <summary>
+        /// Update the x264 options string from a UI change.
+        /// </summary>
+        private void UpdateOptionsString()
+        {
+            if (this.AutomaticChange)
+            {
+                return;
+            }
+
+            List<string> newOptions = new List<string>();
+
+            // First add any parts of the options string that don't correspond to the UI
+            if (this.AdvancedOptionsString != null)
+            {
+                string[] existingSegments = this.AdvancedOptionsString.Split(':');
+                foreach (string existingSegment in existingSegments)
+                {
+                    string optionName = existingSegment;
+                    int equalsIndex = existingSegment.IndexOf('=');
+                    if (equalsIndex >= 0)
+                    {
+                        optionName = existingSegment.Substring(0, existingSegment.IndexOf("=", System.StringComparison.Ordinal));
+                    }
+
+                    if (!this.uiOptions.Contains(optionName) && optionName != string.Empty)
+                    {
+                        newOptions.Add(existingSegment);
+                    }
+                }
+            }
+
+            // Now add everything from the UI
+            if (!this.ReferenceFrames.IsDefault)
+            {
+                newOptions.Add("ref=" + this.ReferenceFrames.Value);
+            }
+
+            if (!this.BFrames.IsDefault)
+            {
+                newOptions.Add("bframes=" + this.BFrames.Value);
+            }
+
+            if (this.BFrames.Value != "0")
+            {
+                if (!this.AdaptiveBFrames.IsDefault)
+                {
+                    newOptions.Add("b-adapt=" + this.AdaptiveBFrames.Value);
+                }
+
+                if (!this.DirectPrediction.IsDefault)
+                {
+                    newOptions.Add("direct=" + this.DirectPrediction.Value);
+                }
+
+                if (this.BFrames.Value != "1" && !this.PyramidalBFrames.IsDefault)
+                {
+                    newOptions.Add("b-pyramid=" + this.PyramidalBFrames.Value);
+                }
+            }
+
+            if (!this.WeightedPFrames)
+            {
+                newOptions.Add("weightp=0");
+            }
+
+            if (!this.MotionEstimationMethod.IsDefault)
+            {
+                newOptions.Add("me=" + this.MotionEstimationMethod.Value);
+            }
+
+            if (!this.SubpixelMotionEstimation.IsDefault)
+            {
+                newOptions.Add("subme=" + this.SubpixelMotionEstimation.Value);
+            }
+
+            if (this.MotionEstimationRange != 16)
+            {
+                newOptions.Add("merange=" + this.MotionEstimationRange);
+            }
+
+            if (!this.Analysis.IsDefault)
+            {
+                newOptions.Add("analyse=" + this.Analysis.Value);
+            }
+
+            if (this.Analysis.Value != "none" && !this.EightByEightDct)
+            {
+                newOptions.Add("8x8dct=0");
+            }
+
+            if (!this.CabacEntropyCoding)
+            {
+                newOptions.Add("cabac=0");
+            }
+
+            if (!this.Trellis.IsDefault)
+            {
+                newOptions.Add("trellis=" + this.Trellis.Value);
+            }
+
+            double psTrellis = 0.0;
+            if (this.CabacEntropyCoding && this.Trellis.Value != "0")
+            {
+                psTrellis = this.PsychovisualTrellis;
+            }
+
+            if (this.AdaptiveQuantizationStrength != 1.0)
+            {
+                newOptions.Add(
+                    "aq-strength=" + this.AdaptiveQuantizationStrength.ToString("F1", CultureInfo.InvariantCulture));
+            }
+
+            if (this.PsychovisualRateDistortion != 1.0 || psTrellis > 0.0)
+            {
+                newOptions.Add(
+                    "psy-rd=" + this.PsychovisualRateDistortion.ToString("F1", CultureInfo.InvariantCulture) + "," +
+                    psTrellis.ToString("F2", CultureInfo.InvariantCulture));
+            }
+
+            if (this.NoDctDecimate)
+            {
+                newOptions.Add("no-dct-decimate=1");
+            }
+
+            if (!this.DeblockingStrength.IsDefault || !this.DeblockingThreshold.IsDefault)
+            {
+                newOptions.Add("deblock=" + this.DeblockingStrength.Value + "," + this.DeblockingThreshold.Value);
+            }
+
+            this.Task.AdvancedEncoderOptions = string.Join(":", newOptions);
+            this.NotifyOfPropertyChange(() => this.AdvancedOptionsString);
+
+            // Reset the video tab if the user is using this tab.
+            if (!string.IsNullOrEmpty(this.Task.AdvancedEncoderOptions))
+            {
+                this.advancedEncoderOptionsCommand.ExecuteClearVideo();
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AboutView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AboutView.xaml Changed

@@ -1,12 +1,12 @@
-<Window x:Class="HandBrakeWPF.Views.AboutView"
+<UserControl x:Class="HandBrakeWPF.Views.AboutView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="{Binding Title}" 
-        Height="320" Width="600">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+             TextOptions.TextFormattingMode="Display">
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <Grid Grid.Row="0">
@@ -14,40 +14,37 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            
-            <Image Source="Images/logo64.png" Width="64" Height="64" Grid.Column="0" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />
+
+            <Image Grid.Column="0"
+                   Width="96"
+                   Height="96"
+                   Margin="10,10,10,10"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Top"
+                   SnapsToDevicePixels="True"
+                   Source="Images/logo128.png" />
 
             <Grid Grid.Column="1">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
 
-                <StackPanel Orientation="Horizontal" Margin="5,10,0,0" Grid.Row="0">
-                    <TextBlock Text="HandBrake" FontWeight="Bold" FontSize="14" Margin="0,0,5,0" />
-                    <TextBlock Text="{Binding Version}" Margin="0,0,0,1" VerticalAlignment="Bottom" />
+                <StackPanel Grid.Row="0"
+                            Margin="5,10,0,0"
+                            Orientation="Horizontal">
+                    <TextBlock Margin="0,0,5,0" FontSize="12" FontWeight="Bold" Text="HandBrake " />
+                    <TextBlock Margin="0,0,0,1" FontSize="12" VerticalAlignment="Bottom" Text="{Binding Version}" />
                 </StackPanel>
-                
-                <TextBlock Text="Copyright 2003-2011 HandBrake Team" Margin="5,0,0,0 " Grid.Row="1" />
-
-                <TextBlock Text="License:" Margin="5,10,0,5" Grid.Row="2" />
-                <TextBox VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" 
-                         VerticalScrollBarVisibility="Auto" Margin="10,0,10,10" Grid.Row="3">
-                    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.
+                <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="License: " />
 
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-                </TextBox>
+                <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="2" Margin="10,0,10,10" HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />
 
             </Grid>
         </Grid>
 
-        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1">
-            <Button Content="Close" Micro:Message.Attach="[Event Click] = [Action Close]"
-                    HorizontalAlignment="Right" Padding="12,2" Margin="0,5,10,5" VerticalAlignment="Center" />
-        </StackPanel>
     </Grid>
-</Window>
+</UserControl>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AddPresetView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AddPresetView.xaml Changed

@@ -1,34 +1,61 @@
 <Window x:Class="HandBrakeWPF.Views.AddPresetView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
-        mc:Ignorable="d" 
-             Title="{Binding Title}" 
-             Width="350" Height="310">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+        Title="{Binding Title}"
+        Width="350"
+        ResizeMode="NoResize"
+        SizeToContent="Height"
+        WindowStartupLocation="CenterScreen"
+        TextOptions.TextFormattingMode="Display"
+        mc:Ignorable="d">
 
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="#FFF1F0EF">
+    <Window.Resources>
+        <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+        <Converters:EnumComboConverter x:Key="enumComboConverter" />
+
+        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+            <Setter Property="Margin" Value="0,2,0,2" />
+        </Style>
+    </Window.Resources>
+
+    <Grid HorizontalAlignment="Stretch"
+          VerticalAlignment="Stretch"
+          Background="#FFF1F0EF">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        
-        
-        <StackPanel Orientation="Horizontal" Grid.Row="0"  Background="White" Height="30" Margin="0,0,0,10" >
-            <Image Source="Images/Add16.png" Margin="10,0,5,0" Width="16" Height="16" VerticalAlignment="Center" />
-            <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                <TextBlock Text="Add a Preset" FontWeight="Bold" />
+
+        
+        <StackPanel Grid.Row="0"
+                    Height="30"
+                    Margin="0,0,0,10"
+                    Background="White"
+                    Orientation="Horizontal">
+            <Image Width="24"
+                   Height="24"
+                   Margin="10,0,5,0"
+                   VerticalAlignment="Center"
+                   Source="Images/Add40.png" />
+            <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+                <TextBlock FontWeight="Bold" Text="Add a Preset" />
             </StackPanel>
         </StackPanel>
 
-        <Grid Margin="10,0,10,0" Grid.Row="1">
+        <Grid Grid.Row="1" Margin="10,0,10,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            
+
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -40,39 +67,91 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
-            
-            <TextBlock Text="Preset Name:" Grid.Row="0" Grid.Column="0" />
-            <TextBox Width="150" Text="{Binding Preset.Name}" Grid.Row="0" Grid.Column="1"  HorizontalAlignment="Left"/>
+            
+            <TextBlock Grid.Row="0"
+                       Grid.Column="0"
+                       Text="Preset Name:" />
+            <TextBox Grid.Row="0"
+                     Grid.Column="1"
+                     Width="150"
+                     HorizontalAlignment="Left"
+                     Text="{Binding Preset.Name}" />
 
-            
-            <TextBlock Text="Picture Settings:" FontWeight="Bold"  Grid.Row="1" Grid.Column="0" Margin="0,20,0,0" />
+            
+            <TextBlock Grid.Row="1"
+                       Grid.Column="0"
+                       Margin="0,20,0,0"
+                       FontWeight="Bold"
+                       Text="Picture Settings:" />
 
-            <TextBlock Text="Use Picture Size:"  Grid.Row="2" Grid.Column="0" />
-            <ComboBox Width="100" ItemsSource="{Binding PictureSettingModes}" SelectedItem="{Binding SelectedPictureMode}"  Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" />
+            <TextBlock Grid.Row="2"
+                       Grid.Column="0"
+                       Style="{StaticResource LongToolTipHolder}"
+                       ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
+                       Text="Picture Size:" />
+            <ComboBox Grid.Row="2"
+                      Grid.Column="1"
+                      Width="125"
+                      HorizontalAlignment="Left"
+                      Style="{StaticResource LongToolTipHolder}"
+                      ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
+                      ItemsSource="{Binding PictureSettingsModes,
+                                            Converter={StaticResource enumComboConverter}}"
+                      SelectedItem="{Binding SelectedPictureSettingMode,
+                                             Converter={StaticResource enumComboConverter}}" />
 
-            <StackPanel Orientation="Horizontal" Margin="0,10,0,0"  Grid.Row="3" Grid.Column="1">
+            <StackPanel Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="0,10,0,0"
+                        Orientation="Horizontal"
+                        Visibility="{Binding ShowCustomInputs,
+                                             Converter={StaticResource boolToVisConverter}}">
                 <TextBox Width="50" Text="{Binding CustomWidth}" />
-                <TextBlock Text="X" FontWeight="Bold" Margin="10,0,10,0" />
+                <TextBlock Margin="10,0,10,0"
+                           FontWeight="Bold"
+                           Text="X" />
                 <TextBox Width="50" Text="{Binding CustomHeight}" />
             </StackPanel>
 
-            <CheckBox Content="Use Picture Filters" IsChecked="{Binding Preset.UsePictureFilters}" Margin="0,10,0,0"  Grid.Row="4" Grid.Column="1"/>
+            <CheckBox Grid.Row="4"
+                      Grid.Column="0" Grid.ColumnSpan="2"
+                      Margin="0,10,0,0"
+                      Content="Save Video Filter Settings"
+                      IsChecked="{Binding Preset.UsePictureFilters}" />
 
-            
-            <TextBlock Text="Description:" FontWeight="Bold" Grid.Row="5" Grid.Column="0" />
-            <TextBox Text="{Binding Preset.Description}" Grid.Row="6" Grid.ColumnSpan="2"  HorizontalAlignment="Stretch"/>
+            
+            <TextBlock Grid.Row="5"
+                       Grid.Column="0"
+                       FontWeight="Bold" Margin="0,10,0,0"
+                       Text="Description:" />
+            <TextBox Grid.Row="6"
+                     Grid.ColumnSpan="2" Margin="0,10,0,0"
+                     HorizontalAlignment="Stretch"
+                     Text="{Binding Preset.Description}" />
         </Grid>
 
-        
-        <Grid Background="LightGray" Grid.Row="3" Margin="0,20,0,0">
+        
+        <Grid Grid.Row="3"
+              Margin="0,20,0,0"
+              Background="LightGray">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <Button Content="Cancel" Padding="8,2" Margin="0,5,10,5" Grid.Column="1" cal:Message.Attach="[Event Click] = [Action Cancel]" />
-            <Button Content="Add" Padding="8,2" Margin="0,5,10,5" Grid.Column="2" cal:Message.Attach="[Event Click] = [Action Add]" />
+            <Button Grid.Column="1"
+                    Margin="0,5,10,5"
+                    cal:Message.Attach="[Event Click] = [Action Cancel]"
+                    Content="Cancel"
+                    IsCancel="True"
+                    Padding="8,2" />
+            <Button Grid.Column="2"
+                    Margin="0,5,10,5"
+                    cal:Message.Attach="[Event Click] = [Action Add]"
+                    Content="Add"
+                    IsDefault="True"
+                    Padding="8,2" />
         </Grid>
 
     </Grid>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AdvancedView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AdvancedView.xaml Changed

@@ -1,61 +1,29 @@
 <UserControl x:Class="HandBrakeWPF.Views.AdvancedView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300"
-             x:Name="advancedView">
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             x:Name="advancedView"
+             mc:Ignorable="d"
+             >
     <UserControl.Resources>
-        <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
-        <Converters:EnumComboConverter x:Key="x264DisplayConverter" />
-    </UserControl.Resources>
+        <Converters:BooleanToVisibilityConverter x:Key="BooleanVisibilityConverter" />
 
+      </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="Advanced" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
-
-        <Grid Grid.Row="1" Margin="10,10,0,0" Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <StackPanel Grid.Row="0" Orientation="Vertical" Margin="0,0,0,10">
-
-                <TextBlock Text="X264 Advanced Options:" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />
-                
-                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,10">
-                    <TextBlock Text="Preset:" VerticalAlignment="Center" />
-                    <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
-                          ItemsSource="{Binding X264Presets, Converter={StaticResource x264DisplayConverter}}" 
-                          SelectedItem="{Binding X264Preset, Converter={StaticResource x264DisplayConverter}}"/>
-
-                    <TextBlock Text="Profile:" VerticalAlignment="Center" />
-                    <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
-                          ItemsSource="{Binding X264Profiles, Converter={StaticResource x264DisplayConverter}}" 
-                          SelectedItem="{Binding X264Profile, Converter={StaticResource x264DisplayConverter}}"/>
-
-
-                    <TextBlock Text="Tune:" VerticalAlignment="Center" />
-                    <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
-                          ItemsSource="{Binding X264Tunes, Converter={StaticResource x264DisplayConverter}}" 
-                          SelectedItem="{Binding X264Tune, Converter={StaticResource x264DisplayConverter}}"/>
-                </StackPanel>
-            </StackPanel>
+        <ContentControl x:Name="X264ViewModel"
+                        Visibility="{Binding ShowX264Panel, Converter={StaticResource BooleanVisibilityConverter}}" />
 
-        </Grid>
+        <ContentControl x:Name="EncoderOptionsViewModel" 
+                        Visibility="{Binding ShowSimplePanel, Converter={StaticResource BooleanVisibilityConverter}}" />
 
-        <StackPanel Grid.Row="2" Margin="10" Height="100" VerticalAlignment="Top" >
-            <TextBlock Text="Advanced Query" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />
-            <TextBox Text="{Binding Query}" 
-                 VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="150" TextWrapping="Wrap" />
-        </StackPanel>
 
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AudioView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AudioView.xaml Changed

@@ -1,17 +1,27 @@
 <UserControl x:Class="HandBrakeWPF.Views.AudioView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
+             xmlns:cal="http://www.caliburnproject.org"
+             xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-             xmlns:cal="http://www.caliburnproject.org"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
-             xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
-             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d">
-    
+             xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+             d:DesignHeight="170"
+             d:DesignWidth="616"
+             mc:Ignorable="d">
+
     <UserControl.Resources>
         <Conveters:EnumComboConverter x:Key="enumComboConverter" />
+        <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+        <Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
+        <Audio:AudioBitrateConverter x:Key="audioBitrateConverter" />
+        <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
     </UserControl.Resources>
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -19,46 +29,120 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="Audio Tracks" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+        <TextBlock Grid.Row="0"
+                   Margin="10,5,0,0"
+                   FontWeight="Bold"
+                   Text="Audio Tracks" />
 
         <Grid Grid.Row="1" Margin="10,5,10,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <Button Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]" Grid.Column="0" Width="75" Margin="0,0,10,0" />
+            <Button Grid.Column="0"
+                    MaxWidth="95"
+                    Margin="0,0,10,0"
+                    cal:Message.Attach="[Event Click] = [Action Add]"
+                    Content="Add Track" />
+
+            <StackPanel Grid.Column="2"
+                        Orientation="Horizontal"
+                        Visibility="{Binding ShowPassthruOptions,
+                                             Converter={StaticResource boolToVisConverter}}">
+                <TextBlock Margin="5,0,5,0" Text="Auto Passthru:" VerticalAlignment="Center" />
+                <CheckBox Margin="0,0,5,0"
+                          Content="MP3" VerticalAlignment="Center"    
+                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowMP3Pass}" />
+                <CheckBox Margin="0,0,5,0"
+                          Content="AAC" VerticalAlignment="Center"
+                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAACPass}" />
+                <CheckBox Margin="0,0,5,0"
+                          Content="AC3" VerticalAlignment="Center"
+                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAC3Pass}" />
+                <CheckBox Margin="0,0,5,0"
+                          Content="DTS" VerticalAlignment="Center"
+                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSPass}" />
+                <CheckBox Margin="0,0,5,0"
+                          Content="DTSHD" VerticalAlignment="Center"
+                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />
+                <TextBlock Margin="5,0,5,0" Text="Fallback:" />
+
+                <ComboBox Grid.Column="3" VerticalAlignment="Center"
+                                      Width="100"
+                                      Height="22"
+                                      Margin="10,0,5,0">
+                    <ComboBox.SelectedItem>
+                        <MultiBinding Converter="{StaticResource audioEncoderConverter}">
+                            <Binding Path="Task.AllowedPassthruOptions.AudioEncoderFallback" />
+                        </MultiBinding>
+                    </ComboBox.SelectedItem>
+                    <ComboBox.ItemsSource>
+                        <MultiBinding Converter="{StaticResource audioEncoderConverter}" ConverterParameter="True">
+                            <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                            <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                        </MultiBinding>
+                    </ComboBox.ItemsSource>
+                </ComboBox>
+
+            </StackPanel>
+
         </Grid>
 
-        <ListBox Grid.Row="2" ItemsSource="{Binding AudioTracks}" 
-                 SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"
-                 dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
-                 dd:DragDrop.DropHandler="{Binding}">
+        <ListBox Grid.Row="2"
+                 Margin="10,10,10,10"
+                 Background="LightGray"
+                 dd:DragDrop.DropHandler="{Binding}"
+                 dd:DragDrop.IsDragSource="True"
+                 dd:DragDrop.IsDropTarget="True"
+                 ItemsSource="{Binding Task.AudioTracks}"
+                 SelectionMode="Extended">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Background" Value="WhiteSmoke" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                 </Style>
             </ListBox.ItemContainerStyle>
 
+            <ListBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="Add New Track" cal:Message.Attach="[Event Click] = [Action Add]" />
+                    <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />
+                    <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+                    <Separator />
+                    <MenuItem Header="Clear All" cal:Message.Attach="[Event Click] = [Action Clear]" />
+                    <Separator />
+                    <MenuItem Header="Configure Default Behaviours" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />
+                </ContextMenu>
+            </ListBox.ContextMenu>
+
             <ListBox.ItemTemplate>
                 <DataTemplate>
-
+                   
                     <Grid HorizontalAlignment="Stretch">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        
-                        <Image Source="Images/Movies.png" Width="16" Height="16" Grid.Column="0" Margin="10,0,10,0" />
+                        
+                        <Image Grid.Column="0" Grid.Row="0"
+                               Width="16"
+                               Height="16"
+                               Margin="10,0,10,0"
+                               Source="Images/Movies.png" />
 
-                        
-                        <Grid Grid.Column="1" HorizontalAlignment="Stretch">
+                        
+                        <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" MaxWidth="160" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
@@ -69,57 +153,204 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            
+
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="28" />
                                 <RowDefinition Height="28" />
                             </Grid.RowDefinitions>
-                            
-                            
-
-                            <TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
-                            <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Height="22"
-                                      ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
-                                      SelectedItem="{Binding ScannedTrack}"/>
-                            <TextBlock Text="Codec" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
-                            <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
-                                      ItemsSource="{Binding DataContext.AudioEncoders, Converter={StaticResource enumComboConverter},  RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
-                                      SelectedItem="{Binding Encoder, Converter={StaticResource enumComboConverter}}"/>
-                            <TextBlock Text="Bitrate" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center" />
-                            <ComboBox Width="70" Grid.Column="5" Margin="5,0,5,0" Height="22" 
-                                      ItemsSource="{Binding DataContext.AudioBitrates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
-                                      SelectedItem="{Binding Bitrate}"/>
-                            <TextBlock Text="Samplerate" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center" />
-                            <ComboBox Width="70" Grid.Column="7" Margin="5,0,5,0" Height="22" 
-                                      ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
-                                      SelectedItem="{Binding SampleRate}"/>
-
-                            
-                            <TextBlock Text="Mixdown" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>
-                            <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Grid.Row="1" Height="22"
-                                      ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
-                                      SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"/>
-                            <TextBlock Text="DRC" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"/>
-                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding DRC}" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left"  Margin="5,0,5,0" />
-                            <TextBlock Text="Gain" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"/>
-                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding Gain}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left"  Margin="5,0,5,0" />
-                            
+
+                            
+
+                            <TextBlock Grid.Column="0"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Source" />
+                            <ComboBox Grid.Column="1"
+                                      Height="22"
+                                      MaxWidth="150"
+                                      Margin="5,0,5,0"
+                                      HorizontalAlignment="Stretch"
+                                      ItemsSource="{Binding DataContext.SourceTracks,
+                                                            RelativeSource={RelativeSource FindAncestor,
+                                                                                           AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding ScannedTrack}" />
+
+                            <TextBlock Grid.Column="2"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Codec" />
+                            <ComboBox Grid.Column="3"
+                                      Width="100"
+                                      Height="22"
+                                      Margin="5,0,5,0">
+                                <ComboBox.SelectedItem>
+                                    <MultiBinding Converter="{StaticResource audioEncoderConverter}">
+                                        <Binding Path="Encoder" />
+                                    </MultiBinding>
+                                </ComboBox.SelectedItem>
+                                <ComboBox.ItemsSource>
+                                    <MultiBinding Converter="{StaticResource audioEncoderConverter}">
+                                        <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                                        <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                                    </MultiBinding>
+                                </ComboBox.ItemsSource>
+                            </ComboBox>
+
+                            <TextBlock Grid.Column="4"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Bitrate"
+                                       Visibility="{Binding CannotSetBitrate,
+                                                            Converter={StaticResource boolToVisConverter},
+                                                            ConverterParameter=true}" />
+                            <ComboBox Grid.Column="5"
+                                      Width="70"
+                                      Height="22"
+                                      Margin="5,0,5,0"
+                                      ItemsSource="{Binding TrackReference,
+                                                            Converter={StaticResource audioBitrateConverter}}"
+                                      SelectedItem="{Binding Bitrate}"
+                                      Visibility="{Binding CannotSetBitrate,
+                                                           Converter={StaticResource boolToVisConverter},
+                                                           ConverterParameter=true}" />
+
+                            <TextBlock Grid.Column="6"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Samplerate"
+                                       Visibility="{Binding IsPassthru,
+                                                            Converter={StaticResource boolToVisConverter},
+                                                            ConverterParameter=true}" />
+                            <ComboBox Grid.Column="7"
+                                      Width="70"
+                                      Height="22"
+                                      Margin="5,0,5,0"
+                                      ItemsSource="{Binding DataContext.SampleRates,
+                                                            RelativeSource={RelativeSource FindAncestor,
+                                                                                           AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding SampleRateDisplayValue}"
+                                      Visibility="{Binding IsPassthru,
+                                                           Converter={StaticResource boolToVisConverter},
+                                                           ConverterParameter=true}" />
+
+                            
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="0"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Mixdown"
+                                       Visibility="{Binding IsPassthru,
+                                                            Converter={StaticResource boolToVisConverter},
+                                                            ConverterParameter=true}" />
+                            <ComboBox Grid.Row="1"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      MaxWidth="300"
+                                      Margin="5,0,5,0"
+                                      HorizontalAlignment="Stretch"
+                                      ItemsSource="{Binding DataContext.AudioMixdowns,
+                                                            Converter={StaticResource enumComboConverter},
+                                                            RelativeSource={RelativeSource FindAncestor,
+                                                                                           AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding MixDown,
+                                                             Converter={StaticResource enumComboConverter}}"
+                                      Visibility="{Binding IsPassthru,
+                                                           Converter={StaticResource boolToVisConverter},
+                                                           ConverterParameter=true}" />
+
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="2"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="DRC"
+                                       Visibility="{Binding IsPassthru,
+                                                            Converter={StaticResource boolToVisConverter},
+                                                            ConverterParameter=true}" />
+
+                            <NumericUpDown:NumericUpDown Name="drcNumericCtl"
+                                                         Grid.Row="1"
+                                                         Grid.Column="3"
+                                                         Width="45"
+                                                         Margin="5,0,5,0"
+                                                         HorizontalAlignment="Left"
+                                                         DecimalPlace="1"
+                                                         LargeChange="0.1"
+                                                         Maximum="4"
+                                                         Minimum="0"
+                                                         SmallChange="0.1"
+                                                         Visibility="{Binding IsPassthru,
+                                                                              Converter={StaticResource boolToHiddenVisConverter},
+                                                                              ConverterParameter=true}"
+                                                         Value="{Binding DRC,
+                                                                         Mode=TwoWay}" />
+
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="4"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Gain"
+                                       Visibility="{Binding IsPassthru,
+                                                            Converter={StaticResource boolToVisConverter},
+                                                            ConverterParameter=true}" />
+                            <NumericUpDown:NumericUpDown Name="gainNumericCtl"
+                                                         Grid.Row="1"
+                                                         Grid.Column="5"
+                                                         Width="45"
+                                                         Margin="5,0,5,0"
+                                                         HorizontalAlignment="Left"
+                                                         DecimalPlace="0"
+                                                         LargeChange="1"
+                                                         Maximum="20"
+                                                         Minimum="-20"
+                                                         SmallChange="1"
+                                                         Visibility="{Binding IsPassthru,
+                                                                              Converter={StaticResource boolToHiddenVisConverter},
+                                                                              ConverterParameter=true}"
+                                                         Value="{Binding Gain,
+                                                                         Mode=TwoWay}" />
+
+                            <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="6" Grid.Row="1" Grid.ColumnSpan="2"
+                                          FontWeight="Bold" Height="22" Padding="4,0" HorizontalAlignment="Left" >
+                                <ToggleButton.Style>
+                                    <Style TargetType="{x:Type ToggleButton}">
+                                        <Setter Property="Content" Value="Show Advanced"/>
+                                        <Style.Triggers>
+                                            <Trigger Property="IsChecked" Value="True">
+                                                <Setter Property="Content" Value="Hide Advanced"/>
+                                            </Trigger>
+                                            <Trigger Property="IsChecked" Value="False">
+                                                <Setter Property="Content" Value="Show Advanced"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ToggleButton.Style>
+                            </ToggleButton>
+ 
                         </Grid>
 
-                        
-                        <Image Source="Images/delete.png" Width="16" Height="16" Grid.Column="2" Margin="10,0,10,0">
-                            <i:Interaction.Triggers>
-                                <i:EventTrigger EventName="MouseDown">
-                                    <cal:ActionMessage MethodName="Remove">
-                                        <cal:Parameter Value="{Binding}" />
-                                    </cal:ActionMessage>
-                                </i:EventTrigger>
-                            </i:Interaction.Triggers>
-                        </Image>
+                        
+                        <StackPanel Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">
+                            <Image Width="16" Height="16" Margin="10,0,10,0" Source="Images/delete.png">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="MouseDown">
+                                        <cal:ActionMessage MethodName="Remove">
+                                            <cal:Parameter Value="{Binding}" />
+                                        </cal:ActionMessage>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                            </Image>
+                        </StackPanel>
 
+                        
+                        <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >
+                                <TextBlock Text="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="0,0,5,0" />
+                                <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />
+                            </StackPanel>
+                                
+                        </Grid>
                     </Grid>
 
-
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/ChaptersView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ChaptersView.xaml Changed

@@ -10,9 +10,9 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        
+
         <TextBlock Text="Chapter Markers" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
-        
+
         <Grid Grid.Row="1" Margin="10,5,10,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -25,12 +25,26 @@
             <Button Content="Export" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />
         </Grid>
 
-        <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Chapters}" 
+        <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Task.ChapterNames}" 
                   VerticalAlignment="Stretch" HorizontalAlignment="Stretch" AutoGenerateColumns="False"
                   CanUserSortColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False"
                   CanUserAddRows="False" CanUserDeleteRows="False">
+            <DataGrid.CellStyle>
+                <Style TargetType="DataGridCell">
+                    <Setter Property="MinHeight" Value="22" />
+                </Style>
+            </DataGrid.CellStyle>
+            <DataGrid.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="Import Names" cal:Message.Attach="[Event Click] = [Action Import]" />
+                    <MenuItem Header="Export Names" cal:Message.Attach="[Event Click] = [Action Export]" />
+                    <Separator />
+                    <MenuItem Header="Reset Chapter Names" cal:Message.Attach="[Event Click] = [Action Reset]" />
+                </ContextMenu>
+            </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Chapter Number" Width="150" Binding="{Binding ChapterNumber}" IsReadOnly="True" />
+                <DataGridTextColumn Header="Chapter Number" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />
+                <DataGridTextColumn Header="Duration" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />
                 <DataGridTextColumn Header="Chapter Name"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />
             </DataGrid.Columns>
         </DataGrid>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/EncoderOptionsView.xaml Added

@@ -0,0 +1,28 @@
+<UserControl x:Class="HandBrakeWPF.Views.EncoderOptionsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             x:Name="x264View"
+             mc:Ignorable="d"
+             >
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="100" />
+        </Grid.RowDefinitions>
+
+        <TextBlock Margin="10,5,10,0" Grid.Row="0"
+                           VerticalAlignment="Center"
+                           FontWeight="Bold"
+                           Text="Advanced Query"
+                           />
+        <TextBox Grid.Row="1"
+                         Margin="10,5,10,5"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Text="{Binding AdvancedOptionsString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         TextWrapping="Wrap"
+                         />
+    </Grid>
+</UserControl>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/EncoderOptionsView.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncoderOptionsView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for EncoderOptionsView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// Interaction logic for AdvancedView.xaml
+    /// </summary>
+    public partial class EncoderOptionsView : UserControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncoderOptionsView"/> class. 
+        /// </summary>
+        public EncoderOptionsView()
+        {
+            InitializeComponent();
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/ErrorView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ErrorView.xaml Changed

@@ -1,7 +1,16 @@
 <Window x:Class="HandBrakeWPF.Views.ErrorView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
-        Title="{Binding Title}" Height="380" Width="680" FontSize="11" Background="#FFF0F0F0">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        Title="{Binding Title}"
+        Width="680"
+        Height="380"
+        MinWidth="680"
+        MinHeight="380"
+        Background="#FFF0F0F0"
+        FontSize="11"
+        TextOptions.TextFormattingMode="Display"
+        WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="70" />
@@ -9,47 +18,79 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        
-        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="0,0,0,0" Background="White">
-            <Image Source="Images/ErrorX.png" Width="64" Height="64" Margin="10,0,0,0" />
-            <Grid Margin="10,0,0,0" Height="64">
+        
+        <StackPanel Grid.Row="0"
+                    Margin="0,0,0,0"
+                    Background="White"
+                    Orientation="Horizontal">
+            <Image Width="64"
+                   Height="64"
+                   Margin="10,0,0,0"
+                   Source="Images/ErrorX.png" />
+            <Grid Height="64" Margin="10,0,0,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <TextBlock Text="{Binding ErrorMessage}" FontWeight="Bold" Grid.Row="0" Margin="0,5,0,0" />
-                <TextBlock Text="{Binding Solution}" Grid.Row="1" Margin="0,5,0,0" />
+                <TextBlock Grid.Row="0"
+                           Margin="0,5,0,0"
+                           FontWeight="Bold"
+                           Text="{Binding ErrorMessage}" />
+                <TextBlock Grid.Row="1"
+                           Margin="0,5,0,0"
+                           Text="{Binding Solution}" />
 
-                <TextBlock Text="Error Details:" FontWeight="Bold" Margin="0,0,0,2" VerticalAlignment="Bottom" Grid.Row="2" />
+                <TextBlock Grid.Row="2"
+                           Margin="0,0,0,2"
+                           VerticalAlignment="Bottom"
+                           FontWeight="Bold"
+                           Text="Error Details:" />
             </Grid>
         </StackPanel>
 
-        
-        <TextBox Text="{Binding Details}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" 
-                         VerticalScrollBarVisibility="Auto" Margin="84,10,10,10" Grid.Row="1"  />
+        
+        <TextBox Grid.Row="1"
+                 Margin="84,10,10,10"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch"
+                 IsReadOnly="True"
+                 Text="{Binding Details}"
+                 TextWrapping="Wrap"
+                 VerticalScrollBarVisibility="Auto" />
 
 
-        
-        <Grid Grid.Row ="2" Background="LightGray">
+        
+        <Grid Grid.Row="2" Background="LightGray">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <Button Padding="8,2" Margin="5" Grid.Column="1" cal:Message.Attach="[Event Click] = [Action Copy]">
+            <Button Grid.Column="1"
+                    Margin="5"
+                    cal:Message.Attach="[Event Click] = [Action Copy]"
+                    Padding="8,2">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <Image Source="Images/copy.png" Grid.Column="0" Width="16" Height="16" Margin="0,0,5,0" />
-                    <TextBlock Text="Copy" Grid.Column="1" />
+                    <Image Grid.Column="0"
+                           Width="16"
+                           Height="16"
+                           Margin="0,0,5,0"
+                           Source="Images/copy.png" />
+                    <TextBlock Grid.Column="1" Text="Copy to Clipboard" />
                 </Grid>
             </Button>
 
-            <Button Content="Close" Padding="8,2" Margin="0,5,10,5" Grid.Column="2" cal:Message.Attach="[Event Click] = [Action Close]"></Button>
+            <Button Grid.Column="2"
+                    Margin="0,5,10,5"
+                    cal:Message.Attach="[Event Click] = [Action Close]"
+                    Content="Close"
+                    Padding="8,2" />
         </Grid>
     </Grid>
 </Window>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/FiltersView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/FiltersView.xaml Changed

@@ -6,6 +6,7 @@
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d" >
     <UserControl.Resources>
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+        <Converters:EnumComboConverter x:Key="boolComboConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -34,27 +35,31 @@
                 </Grid.ColumnDefinitions>
 
                 <TextBlock Text="Detelecine:" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />
-                <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions}" SelectedItem="{Binding SelectedDetelecine}" Grid.Column="1" Margin="0,0,0,10"/>
+                <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions, Converter={StaticResource boolComboConverter}}" 
+                          SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
                 <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine}"
                          Visibility="{Binding ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}"/>
 
                 <TextBlock Text="Decomb:" Grid.Row="1" Grid.Column="0" Margin="0,0,0,10"/>
-                <ComboBox Width="120" Grid.Row="1" ItemsSource="{Binding DecombOptions}" SelectedItem="{Binding SelectedDecomb}" Grid.Column="1" Margin="0,0,0,10"/>
+                <ComboBox Width="120" Grid.Row="1" ItemsSource="{Binding DecombOptions, Converter={StaticResource boolComboConverter}}" 
+                          SelectedItem="{Binding SelectedDecomb, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
                 <TextBox Width="120" Grid.Row="1" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDecomb}"
                          Visibility="{Binding ShowDecombCustom, Converter={StaticResource boolToVisConverter}}" />
 
                 <TextBlock Text="Deinterlace:" Grid.Row="2" Grid.Column="0" Margin="0,0,0,10"/>
-                <ComboBox Width="120" Grid.Row="2" ItemsSource="{Binding DeInterlaceOptions}" SelectedItem="{Binding SelectedDeInterlace}" Grid.Column="1" Margin="0,0,0,10"/>
+                <ComboBox Width="120" Grid.Row="2" ItemsSource="{Binding DeInterlaceOptions, Converter={StaticResource boolComboConverter}}"
+                          SelectedItem="{Binding SelectedDeInterlace, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
                 <TextBox Width="120" Grid.Row="2" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDeinterlace}"
                          Visibility="{Binding ShowDeinterlaceCustom, Converter={StaticResource boolToVisConverter}}" />
 
                 <TextBlock Text="Denoise:" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>
-                <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions}" SelectedItem="{Binding SelectedDenoise}" Grid.Column="1" Margin="0,0,0,10"/>
+                <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions, Converter={StaticResource boolComboConverter}}" 
+                          SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
                 <TextBox Width="120" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDenoise}"
                          Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}" />
 
                 <TextBlock Text="Deblock:" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>
-                <Slider Width="120" Value="{Binding DeblockValue}" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"/>
+                <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"/>
                 <TextBlock Text="{Binding DeblockText}" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10"/>
 
                 <CheckBox Content="Grayscale" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"/>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/FiltersView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/FiltersView.xaml.cs Changed

@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="FiltersView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for FiltersView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrakeWPF.Views
 {
+    using System.Windows.Controls;
+
     /// <summary>
     /// Interaction logic for FiltersView.xaml
     /// </summary>
     public partial class FiltersView : UserControl
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FiltersView"/> class.
+        /// </summary>
         public FiltersView()
         {
             InitializeComponent();

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Complete.png Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/ErrorX.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/ErrorX.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Movies.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Movies.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Options24.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Options24.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Output_Small.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Output_Small.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Pause.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Pause.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Play.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Play.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Preferences.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Preferences.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Queue.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Queue.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Refresh.ico Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Working0.png Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/add.png Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/add40.png Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/disc_small.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/disc_small.png Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/information.png Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/logo128.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/logo128.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/logo64.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/logo64.png Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/Images/picture.png -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/picture.png Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/picture_small.png Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/remove.png Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/warningsmall.png Added

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/LogView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/LogView.xaml Changed

@@ -1,34 +1,61 @@
 <Window x:Class="HandBrakeWPF.Views.LogView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
-        Title="{Binding Title}" Height="600" Width="500">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        Title="{Binding Title}"
+        Width="525"
+        Height="600"
+        MinWidth="525"
+        MinHeight="600"
+        WindowStartupLocation="CenterScreen"
+        TextOptions.TextFormattingMode="Display">
     <Grid>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <ToolBar Grid.Row="0">
-                <Button cal:Message.Attach="[Event Click] = [Action CopyLog]">
+            <ToolBar Grid.Row="0"
+                     ToolBar.OverflowMode="Never" 
+                     ToolBarTray.IsLocked="True"
+                     Loaded="ToolBarLoaded"
+                     >
+                          
+                <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/copy.png" Width="16"/>
-                        <TextBlock Text="Copy" Margin="2,0,0,0" />
+                        <Image Width="16" Source="Images/copy.png" />
+                        <TextBlock Margin="2,0,0,0" Text="Copy to clipboard" />
                     </StackPanel>
                 </Button>
                 <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/folder.png" Width="16"/>
-                        <TextBlock Text="Open Log Directory" Margin="2,0,0,0" />
+                        <Image Width="16" Source="Images/folder.png" />
+                        <TextBlock Margin="2,0,0,0" Text="Open Log Directory" />
                     </StackPanel>
                 </Button>
-                
-                <Separator />
 
-                <ComboBox Width="100" HorizontalAlignment="Right" ItemsSource="{Binding LogModes}" SelectedIndex="{Binding SelectedMode}">
-                </ComboBox>
             </ToolBar>
 
-            <TextBox AcceptsReturn="True" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible" IsReadOnly="True" Grid.Row="1" Text="{Binding Log}"  />
+            <TabControl Grid.Row="1" SelectedIndex="{Binding SelectedTab}">
+                <TabItem Header="Encode Log">
+                    <TextBox Grid.Row="1"
+                     AcceptsReturn="True"
+                     IsReadOnly="True"
+                     ScrollViewer.VerticalScrollBarVisibility="Visible"
+                     Text="{Binding EncodeLog, Mode=OneWay,  UpdateSourceTrigger=PropertyChanged}"
+                     TextWrapping="Wrap" />
+                </TabItem>
+                
+                <TabItem Header="Scan Log">
+                    <TextBox Grid.Row="1"
+                     AcceptsReturn="True"
+                     IsReadOnly="True"
+                     ScrollViewer.VerticalScrollBarVisibility="Visible"
+                     Text="{Binding ScanLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                     TextWrapping="Wrap" />
+                </TabItem>
+
+            </TabControl>
         </Grid>
 
     </Grid>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/LogView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/LogView.xaml.cs Changed

@@ -10,15 +10,41 @@
 namespace HandBrakeWPF.Views
 {
     using System.Windows;
+    using System.Windows.Controls;
 
     /// <summary>
     /// Interaction logic for LogView.xaml
     /// </summary>
     public partial class LogView : Window
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogView"/> class.
+        /// </summary>
         public LogView()
         {
             InitializeComponent();
         }
+
+        /// <summary>
+        /// Hide the Toolbar Endplate.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ToolBarLoaded(object sender, RoutedEventArgs e)
+        {
+            ToolBar toolBar = sender as ToolBar;
+            if (toolBar != null)
+            {
+                var overflowGrid = toolBar.Template.FindName("OverflowGrid", toolBar) as FrameworkElement;
+                if (overflowGrid != null)
+                {
+                    overflowGrid.Visibility = Visibility.Collapsed;
+                }
+            }
+        }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml Changed

@@ -1,294 +1,641 @@
-<Window x:Class="HandBrakeWPF.Views.MainView"
+<UserControl x:Class="HandBrakeWPF.Views.MainView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:Controls="clr-namespace:HandBrakeWPF.Controls"
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11" Background="#FFF0F0F0"
+        AllowDrop="True"
+        Background="#FFF0F0F0"
+        FontSize="11"
         Micro:Message.Attach="[Event Loaded] = [Action Load]"
-        AllowDrop="True">
+        SnapsToDevicePixels="True"
+        UseLayoutRounding="True"
+        >
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Drop">
             <Micro:ActionMessage MethodName="FilesDroppedOnWindow">
-                <Micro:Parameter Value="$eventArgs"></Micro:Parameter>
+                <Micro:Parameter Value="$eventArgs" />
             </Micro:ActionMessage>
         </i:EventTrigger>
     </i:Interaction.Triggers>
 
-    <Window.Resources>
+    <UserControl.Resources>
+
         <Style TargetType="Button">
-            <Setter Property="Foreground" Value="DarkOrange" />
             <Setter Property="FontWeight" Value="Bold" />
             <Setter Property="Padding" Value="5,1" />
             <Setter Property="FontSize" Value="11.5" />
             <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="MinHeight" Value="22" />
         </Style>
 
         <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock">
-            <Setter Property="Foreground" Value="DarkOrange" />
             <Setter Property="FontWeight" Value="Bold" />
             <Setter Property="Padding" Value="5,5" />
         </Style>
 
+        <CollectionViewSource x:Key="presetsCvs" Source="{Binding Presets}">
+            <CollectionViewSource.GroupDescriptions>
+                <PropertyGroupDescription PropertyName="Category" />
+            </CollectionViewSource.GroupDescriptions>
+        </CollectionViewSource>
+
+        <Style TargetType="ListBoxItem">
+            <Setter Property="Padding" Value="0,2,0,2" />
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding IsBuildIn}" Value="True">
+                    <Setter Property="Foreground" Value="DarkBlue" />
+                </DataTrigger>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="FontWeight" Value="Bold"/>
+                    <Setter Property="Background" Value="Transparent"/>
+                </Trigger>
+                <DataTrigger Binding="{Binding IsDefault}" Value="True" >
+                    <Setter Property="FontStyle" Value="Italic" />
+                </DataTrigger>
+                <DataTrigger Binding="{Binding IsDefault}" Value="False" >
+                    <Setter Property="FontStyle" Value="Normal" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style x:Key="ContainerStyle" TargetType="{x:Type GroupItem}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Expander Header="{Binding Name}" IsExpanded="True">
+                            <ItemsPresenter />
+                        </Expander>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
-    </Window.Resources>
-
-    <Grid>
-        <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-            
-            <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                
-                <Menu Height="23" VerticalAlignment="Top" HorizontalAlignment="Stretch">
-                    <MenuItem Header="File">
-                        <MenuItem Header="Cancel Scan" Micro:Message.Attach="[Event Click] = [Action CancelScan]" />
-                        <Separator />
-                        <MenuItem Header="Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                    </MenuItem>
 
-                    <MenuItem Header="Tools">
-                        <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]" />
-                        <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" />
-                        <Separator />
-                        <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" />
+    </UserControl.Resources>
+
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        
+        <StackPanel Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Orientation="Vertical"
+                    >
+            
+            <Menu Height="23"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Top"
+                  >
+                <MenuItem Header="File">
+                    <MenuItem Header="Cancel Scan" Command="{Binding CancelScanCommand}" />
+                    <Separator />
+                    <MenuItem Header="Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+                </MenuItem>
+
+                <MenuItem Header="Tools">
+                    <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+                        <MenuItem.Icon>
+                            <Image Width="16" Source="Images/Queue_Small.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="Activity Log" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
+                        <MenuItem.Icon>
+                            <Image Width="16" Source="Images/Output_Small.png" />
+                        </MenuItem.Icon>
                     </MenuItem>
+                    <Separator />
+                    <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]">
+                        <MenuItem.Icon>
+                            <Image Width="16" Source="Images/Pref_Small.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
 
-                    <MenuItem Header="Help">
-                        <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" />
-                        <Separator />
-                        <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action CheckForUpdates]" />
-                        <Separator />
-                        <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
+                <MenuItem Header="Help">
+                    <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">
+                        <MenuItem.Icon>
+                            <Image Width="16" Height="16"  Source="Images/information.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <Separator />
+                    <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action CheckForUpdates]" />
+                    <Separator />
+                    <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
+                </MenuItem>
+
+                <MenuItem Header="Debug" Visibility="{Binding ShowDebugMenu, Converter={StaticResource boolToVisConverter}}" >
+                    <MenuItem Header="Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />
+                    <MenuItem Header="Debug Scan Log" Micro:Message.Attach="[Event Click] = [Action DebugScanLog]" />
+                </MenuItem>
+            </Menu>
+
+            
+            <ToolBar Name="mainToolBar"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     SnapsToDevicePixels="False"
+                     ToolBar.OverflowMode="Never"
+                     ToolBarTray.IsLocked="True"
+                     >
+                <Menu Background="Transparent">
+                    <MenuItem ItemsSource="{Binding SourceMenu}">
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Image Width="32"
+                                       Height="32"
+                                       Source="Images/Movies.png"
+                                       />
+                                <Label Margin="8,0,0,0"
+                                       VerticalAlignment="Center"
+                                       Content="Source"
+                                       />
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem.ItemContainerStyle>
+                            <Style TargetType="{x:Type MenuItem}">
+                                <Setter Property="Header" Value="{Binding Text}" />
+                                <Setter Property="MenuItem.Command" Value="{Binding Command}"/>
+                                <Setter Property="MenuItem.CommandParameter" Value="123"/>
+                                <Setter Property="ItemsSource" Value="{Binding Children}" />
+                                <Setter Property="Icon" Value="{Binding Image}" />
+                            </Style>
+                        </MenuItem.ItemContainerStyle>
                     </MenuItem>
                 </Menu>
 
-                
-                <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">
-
-                    <Menu Background="Transparent" >
-                        <MenuItem>
-                            <MenuItem.Header>
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="Images/Movies.png" Height="32" Width="32" />
-                                    <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                                </StackPanel>
-                            </MenuItem.Header>
-
-                            <MenuItem Micro:Message.Attach="[Event Click] = [Action FolderScan]">
-                                <MenuItem.Header>
-                                    <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/folder.png" Height="20" Width="20" />
-                                        <Label Content="Open Folder"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                </MenuItem.Header>
-                            </MenuItem>
-                            <MenuItem Micro:Message.Attach="[Event Click] = [Action FileScan]">
-                                <MenuItem.Header>
+                <Separator />
+
+                <Button Name="Start"
+                        Micro:Message.Attach="[Event Click] = [Action StartEncode]"
+                        Visibility="{Binding IsEncoding,
+                                             Converter={StaticResource boolToVisConverter},
+                                             ConverterParameter=true}"
+                        >
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/Play.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Start"
+                               />
+                    </StackPanel>
+                </Button>
+
+                <Button Name="Stop"
+                        Micro:Message.Attach="[Event Click] = [Action StopEncode]"
+                        Visibility="{Binding IsEncoding,
+                                             Converter={StaticResource boolToVisConverter},
+                                             ConverterParameter=false}"
+                        >
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/stop.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Stop"
+                               />
+                    </StackPanel>
+                </Button>
+
+                <Menu Background="Transparent">
+                    <MenuItem>
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Name="QueueDrop"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        Background="Transparent"
+                                        Micro:Message.Attach="[Event Click] = [Action AddToQueue]"
+                                        >
                                     <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/Movies.png" Height="20" Width="20" />
-                                        <Label Content="Open File"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                                        <Image Width="32"
+                                               Height="32"
+                                               SnapsToDevicePixels="True"
+                                               Source="Images/AddToQueue_small.png"
+                                               />
+                                        <Label Margin="8,0,0,0"
+                                               VerticalAlignment="Center"
+                                               Content="Add To Queue"
+                                               />
                                     </StackPanel>
-                                </MenuItem.Header>
-                            </MenuItem>
-                        </MenuItem>
-                    </Menu>
-
-                    <Separator />
-
-                    <Button Name="Start" Micro:Message.Attach="[Event Click] = [Action StartEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="Images/Play.png" Height="32" Width="32" />
-                            <Label Content="Start"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
-
-                    <Button Name="Stop" Micro:Message.Attach="[Event Click] = [Action StopEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="Images/stop.png" Height="32" Width="32" />
-                            <Label Content="Stop"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
-
-                    <Button Name="AddToQueue"  Micro:Message.Attach="[Event Click] = [Action AddToQueue]">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="Images/AddToQueue.png" Height="32" Width="32" />
-                            <Label Content="Add To Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
-
-                    <Button Name="ShowQueue"  Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="Images/Queue.png" Height="32" Width="32" />
-                            <Label Content="Show Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
-
-                    <Separator />
+                                    <Button.Style>
+                                        <Style TargetType="{x:Type Button}">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
+                                                        <Border x:Name="border"
+                                                                Background="{TemplateBinding Background}"
+                                                                SnapsToDevicePixels="True"
+                                                                >
+                                                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                              Content="{TemplateBinding Content}"
+                                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                                              />
+                                                        </Border>
+                                                        <ControlTemplate.Triggers>
+                                                            <Trigger Property="IsPressed" Value="True">
+                                                                <Setter TargetName="border" Property="Background" Value="#FF98B5E2" />
+                                                            </Trigger>
+                                                        </ControlTemplate.Triggers>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </Button.Style>
+                                </Button>
 
-                    <Button Name="Preview" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="Images/window.png" Height="32" Width="32" />
-                            <Label Content="Preview"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
-
-                    <Button Name="ActivityWindow" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="Images/ActivityWindow.png" Height="32" Width="32" />
-                            <Label Content="Activity Window"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
-                </ToolBar>
-            </StackPanel>
+                                <Path Height="5"
+                                      Margin="2,2,2,0"
+                                      Data="M 0 0 L 4 4 L 8 0 Z"
+                                      Fill="{DynamicResource GlyphBrush}"
+                                      />
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]" />
+                        
+                    </MenuItem>
+                </Menu>
 
-            
-            <StackPanel Orientation="Horizontal">
-
-                
-                <StackPanel Orientation="Vertical">
-                    
-                    <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
-                        <StackPanel Orientation="Horizontal">
-                            <Label Content="Source" FontWeight="Bold" />
-                            <Label Content="{Binding Path=SourceLabel}" />
-                        </StackPanel>
-
-                        <StackPanel Orientation="Horizontal">
-                            <Label Content="Title" Margin="8,0,0,0" />
-                            <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding ScannedSource.Titles}" SelectedItem="{Binding Path=SelectedTitle}" />
-
-                            <Label Content="Angle" Margin="8,0,0,0" />
-                            <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding Angles}"  SelectedItem="{Binding SelectedAngle}"/>
-
-                            <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" ItemsSource="{Binding RangeMode}" SelectedItem="{Binding SelectedPointToPoint}" />
-                            <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedStartPoint}" />
-                            <Label Content="through" Margin="8,0,0,0" />
-                            <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedEndPoint}" />
-                            <Label Content="Duration" Margin="8,0,0,0" />
-                            <Label Content="{Binding Duration}" Margin="8,0,0,0" />
-                        </StackPanel>
+                <Button Name="ShowQueue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/Queue_small.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Show Queue"
+                               />
                     </StackPanel>
-
-                    
-                    <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
-                        <Label Content="Destination" FontWeight="Bold" />
-                        <StackPanel Orientation="Horizontal">
-                            <Label Content="File" Margin="8,0,0,0" />
-                            <TextBox Name="Destination" Margin="8,0,0,0" Width="600" Text="{Binding CurrentTask.Destination}" />
-                            <Button Name="DestinationBrowser" Margin="8,0,0,0" Padding="8,0,8,0" Content="Browse" Micro:Message.Attach="[Event Click] = [Action BrowseDestination]" />
-                        </StackPanel>
+                </Button>
+
+                <Separator />
+
+                <Button Name="Preview" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/picture_small.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Preview"
+                               />
                     </StackPanel>
-
-                    
-                    <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
-                        <Label Content="Output Settings (Preset: None)" FontWeight="Bold" />
-                        <StackPanel Orientation="Horizontal">
-                            <Label Content="Container" Margin="8,0,0,0" />
-                            <ComboBox Name="Container" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding OutputFormats}" SelectedItem="{Binding SelectedOutputFormat}" />
-
-                            <CheckBox Name="LargeFileMp4" Content="Large File Size" IsChecked="{Binding Path=CurrentTask.LargeFile}"
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />
-                            <CheckBox Name="WebOptimized" Content="Web Optimized" IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />
-                            <CheckBox Name="iPod5G" Content="iPod 5G Support" IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />
-                        </StackPanel>
+                </Button>
+
+                <Button Name="ActivityWindow" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/ActivityWindow.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Activity Log"
+                               />
                     </StackPanel>
+                </Button>
+            </ToolBar>
+        </StackPanel>
 
-                    
-                    <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Margin="10,10,10,10" Name="tabControl" >
-                        <TabItem Header="Picture" Name="pictureTab">
-                            <ContentControl x:Name="PictureSettingsViewModel" ></ContentControl>
-                        </TabItem>
-                        <TabItem Header="Video Filters" Name="filtersTab">
-                            <ContentControl x:Name="FiltersViewModel" ></ContentControl>
-                        </TabItem>
-                        <TabItem Header="Video" Name="videoTab">
-                            <ContentControl x:Name="VideoViewModel" ></ContentControl>
-                        </TabItem>
-                        <TabItem Header="Audio" Name="audioTab">
-                            <ContentControl x:Name="AudioViewModel" ></ContentControl>
-                        </TabItem>
-                        <TabItem Header="Subtitles" Name="subtitlesTab">
-                            <ContentControl x:Name="SubtitleViewModel"></ContentControl>
-                        </TabItem>
-                        <TabItem Header="Chapters" Name="chaptersTab">
-                            <ContentControl x:Name="ChaptersViewModel"></ContentControl>
-                        </TabItem>
-                        <TabItem Header="Advanced" Name="advancedTab">
-                            <ContentControl x:Name="AdvancedViewModel"></ContentControl>
-                        </TabItem>
-                    </TabControl>
-
+        
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="270" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            
+            <StackPanel Orientation="Vertical">
+                
+                <StackPanel Margin="10,5,5,5"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            >
+                    <StackPanel Orientation="Horizontal">
+                        <Label Content="Source" FontWeight="Bold" />
+                        <Label Content="{Binding Path=SourceLabel}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <Label Margin="8,0,0,0" Content="Title" />
+                        <ComboBox Name="Titles"
+                                  MinWidth="100"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding ScannedSource.Titles}"
+                                  SelectedItem="{Binding Path=SelectedTitle}"
+                                  />
+                        <Label Margin="8,0,0,0" Content="Angle" />
+                        <ComboBox Name="Angles"
+                                  MinWidth="60"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding Angles}"
+                                  SelectedItem="{Binding SelectedAngle}"
+                                  />
+                        <ComboBox Name="PointToPointMode"
+                                  MinWidth="80"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding RangeMode}"
+                                  SelectedItem="{Binding SelectedPointToPoint}"
+                                  />
+                        <ComboBox Name="StartPoint"
+                                  MinWidth="60"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding StartEndRangeItems}"
+                                  SelectedItem="{Binding SelectedStartPoint}"
+                                  Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                       Converter={StaticResource boolToVisConverter},
+                                                       ConverterParameter=true}"
+                                  />
+                        <Controls:TimeSpanBox  Number="{Binding SelectedStartPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                               Minimum="0" AllowEmpty="False" ShowTimeSpan="{Binding IsTimespanRange}"
+                                               MinWidth="80" Margin="8,0,0,0"  Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                       Converter={StaticResource boolToVisConverter},
+                                                       ConverterParameter=false}"
+                                                />
+                        
+                        <Label Margin="8,0,0,0" Content="through" />
+                        <ComboBox Name="EndPoint"
+                                  MinWidth="60"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding StartEndRangeItems}"
+                                  SelectedItem="{Binding SelectedEndPoint}"
+                                  Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                       Converter={StaticResource boolToVisConverter},
+                                                       ConverterParameter=true}"
+                                  />
+                        <Controls:TimeSpanBox  Number="{Binding SelectedEndPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                               Minimum="0" AllowEmpty="False" ShowTimeSpan="{Binding IsTimespanRange}"
+                                               MinWidth="80" Margin="8,0,0,0"  Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                       Converter={StaticResource boolToVisConverter},
+                                                       ConverterParameter=false}"
+                                                />
+  
+                        <Label Margin="8,0,0,0" Content="Duration" />
+                        <Label Margin="8,0,0,0" Content="{Binding Duration}" />
+                    </StackPanel>
                 </StackPanel>
+            </StackPanel>
 
-                
-                <StackPanel Margin="5,5,5,5" Orientation="Vertical">
-                    <GroupBox Header="Presets" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                        <StackPanel Orientation="Vertical">
-                            <TreeView ItemsSource="{Binding Presets}" Width="240" Height="460">
-
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="SelectedItemChanged">
-                                        <Micro:ActionMessage MethodName="SetSelectedPreset">
-                                            <Micro:Parameter Value="$eventArgs"></Micro:Parameter>
-                                        </Micro:ActionMessage>
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-
-                            </TreeView>
-
-
-                            <ToolBar Name="presetsToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" UseLayoutRounding="False" Background="Transparent" 
-                                     SnapsToDevicePixels="False">
-                                <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]">
-                                    <Button.Content>
-                                        <StackPanel Orientation="Horizontal">
-                                            <Image Source="Images/Add16.png" Height="16" Width="16" />
-                                            <TextBlock Text="Add" Style="{StaticResource textBlockOrangeStyle}"  Margin="2,0,0,0" VerticalAlignment="Center" />
-                                        </StackPanel>
-                                    </Button.Content>
-                                </Button>
-
-                                <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">
-                                    <Button.Content>
-                                        <StackPanel Orientation="Horizontal">
-                                            <Image Source="Images/Close.png" Height="16" Width="16" />
-                                            <TextBlock Text="Remove" Style="{StaticResource textBlockOrangeStyle}"  Margin="2,0,0,0" VerticalAlignment="Center" />
-                                        </StackPanel>
-                                    </Button.Content>
-                                </Button>
+            
+            <StackPanel Grid.Row="1"
+                        Margin="10,5,5,5"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        >
+                <Label Content="Destination" FontWeight="Bold" />
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label Margin="8,0,0,0" Content="File" />
+                    <TextBox Name="Destination"
+                             Grid.Column="1"
+                             Margin="8,0,0,0"
+                             Text="{Binding Destination,
+                                            UpdateSourceTrigger=PropertyChanged}"
+                             />
+                    <Button Name="DestinationBrowser"
+                            Grid.Column="2"
+                            Margin="8,0,0,0"
+                            Content="Browse"
+                            Micro:Message.Attach="[Event Click] = [Action BrowseDestination]"
+                            />
+                </Grid>
+            </StackPanel>
 
-                                <Menu Background="Transparent" >
-                                    <MenuItem ToolBar.OverflowMode="Never">
-                                        <MenuItem.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Image Source="Images/Options24.png" Height="16" Width="16" />
-                                                <TextBlock Text="Options" Style="{StaticResource textBlockOrangeStyle}" Margin="2,0,0,0" VerticalAlignment="Center" />
-                                            </StackPanel>
-                                        </MenuItem.Header>
-
-                                        <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
-                                        <Separator />
-                                        <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
-                                        <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
-                                        <Separator />
-                                        <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
-                                    </MenuItem>
-                                </Menu>
-
-
-                            </ToolBar>
-                        </StackPanel>
-                    </GroupBox>
+            
+            <StackPanel Grid.Row="2"
+                        Margin="10,5,5,5"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        >
+                <Label Content="Output Settings" FontWeight="Bold" />
+                <StackPanel Orientation="Horizontal">
+                    <Label Margin="8,0,0,0" Content="Container" />
+                    <ComboBox Name="Container"
+                              MinWidth="100"
+                              Margin="8,0,0,0"
+                              ItemsSource="{Binding OutputFormats}"
+                              SelectedItem="{Binding SelectedOutputFormat}"
+                              />
+                    <CheckBox Name="LargeFileMp4"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              Content="Large File Size"
+                              IsChecked="{Binding Path=CurrentTask.LargeFile}"
+                              Visibility="{Binding IsMkv,
+                                                   Converter={StaticResource boolToVisConverter},
+                                                   ConverterParameter=true}"
+                              />
+                    <CheckBox Name="WebOptimized"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              Content="Web Optimized"
+                              IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
+                              Visibility="{Binding IsMkv,
+                                                   Converter={StaticResource boolToVisConverter},
+                                                   ConverterParameter=true}"
+                              />
+                    <CheckBox Name="iPod5G"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              Content="iPod 5G Support"
+                              IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
+                              Visibility="{Binding IsMkv,
+                                                   Converter={StaticResource boolToVisConverter},
+                                                   ConverterParameter=true}"
+                              />
                 </StackPanel>
-
             </StackPanel>
 
-            
-            <StatusBar Grid.Row="6" Height="28" Grid.ColumnSpan="2" VerticalAlignment="Bottom">
-                <Label Content="{Binding Path=ProgramStatusLabel}" FontSize="10" VerticalAlignment="Center" />
-            </StatusBar>
-
-        </StackPanel>
+            
+            <TabControl Name="tabControl"
+                        Grid.Row="3"
+                        Margin="10,10,5,5"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        >
+                <TabItem Name="pictureTab" Header="Picture">
+                    <ContentControl x:Name="PictureSettingsViewModel" />
+                </TabItem>
+                <TabItem Name="filtersTab" Header="Filters">
+                    <ContentControl x:Name="FiltersViewModel" />
+                </TabItem>
+                <TabItem Name="videoTab" Header="Video">
+                    <ContentControl x:Name="VideoViewModel" />
+                </TabItem>
+                <TabItem Name="audioTab" Header="Audio">
+                    <ContentControl x:Name="AudioViewModel" />
+                </TabItem>
+                <TabItem Name="subtitlesTab" Header="Subtitles">
+                    <ContentControl x:Name="SubtitleViewModel" />
+                </TabItem>
+                <TabItem Name="chaptersTab" Header="Chapters">
+                    <ContentControl x:Name="ChaptersViewModel" />
+                </TabItem>
+                <TabItem Name="advancedTab" Header="Advanced" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">
+                    <ContentControl x:Name="AdvancedViewModel" />
+                </TabItem>
+            </TabControl>
+
+            
+            <GroupBox Grid.RowSpan="4"
+                      Grid.Column="1"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Header="Presets"
+                      Margin="0,0,0,5"
+                      Background="White"
+                      >
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <ListBox HorizontalAlignment="Stretch"
+                             VerticalAlignment="Stretch" ItemsSource="{Binding Source={StaticResource presetsCvs}}"
+                             SelectedItem="{Binding SelectedPreset, Mode=TwoWay}" BorderThickness="0,0,0,1"
+                             BorderBrush="LightGray"
+                            >
+
+                        <ListBox.GroupStyle>
+                            <GroupStyle ContainerStyle="{StaticResource ContainerStyle}"/>
+                        </ListBox.GroupStyle>
+
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}" Margin="24,0,0,0" Padding="8,1" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+
+                    </ListBox>
+
+                    <ToolBar Name="presetsToolBar"
+                             Grid.Row="1"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Stretch"
+                             Background="Transparent"
+                             SnapsToDevicePixels="False"
+                             UseLayoutRounding="False"
+                             ToolBar.OverflowMode="Never" 
+                             ToolBarTray.IsLocked="True"
+                             Loaded="ToolBarLoaded"
+                             >
+                        <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]" >
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Width="18"
+                                           Height="18"
+                                           Source="Images/add.png"
+                                           />
+                                    <TextBlock Margin="2,0,0,0"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource textBlockOrangeStyle}"
+                                               Text="Add"
+                                               />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                        <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Width="18"
+                                           Height="18"
+                                           Source="Images/remove.png"
+                                           />
+                                    <TextBlock Margin="2,0,0,0"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource textBlockOrangeStyle}"
+                                               Text="Remove"
+                                               />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                        <Menu Background="Transparent">
+                            <MenuItem ToolBar.OverflowMode="Never">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="20"
+                                               Height="20"
+                                               Source="Images/Options24.png"
+                                               />
+                                        <TextBlock Margin="2,0,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Style="{StaticResource textBlockOrangeStyle}"
+                                                   Text="Options"
+                                                   />
+                                    </StackPanel>
+                                </MenuItem.Header>
+                                <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
+                                <Separator />
+                                <MenuItem Header="Update Selected Preset" Micro:Message.Attach="[Event Click] = [Action PresetUpdate]" />
+                                <Separator />
+                                <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
+                                <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
+                                <Separator />
+                                <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
+                            </MenuItem>
+                        </Menu>
+                    </ToolBar>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        
+        <Controls:StatusPanel x:Name="loadingPanel"
+                              Grid.Row="1"
+                              Grid.RowSpan="2"
+                              Height="70"
+                              VerticalAlignment="Bottom"
+                              Panel.ZIndex="10"
+                              IsLoading="{Binding ShowStatusWindow}"
+                              Message="{Binding StatusLabel}"
+                              SubMessage="Please Wait ..."
+                              />
+
+        
+        <StatusBar Grid.Row="2"
+                   Grid.ColumnSpan="2"
+                   Height="32"
+                   Margin="0"
+                   VerticalAlignment="Bottom"
+                   Padding="0"
+                   >
+            <Label VerticalAlignment="Center"
+                   Content="{Binding Path=ProgramStatusLabel}"
+                   FontSize="11"
+                   Padding="0,0,0,5"
+                   />
+
+        </StatusBar>
     </Grid>
-</Window>
+</UserControl>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml.cs Changed

@@ -10,18 +10,42 @@
 namespace HandBrakeWPF.Views
 {
     using System.Windows;
+    using System.Windows.Controls;
 
     /// <summary>
     /// Interaction logic for MainView.xaml
     /// </summary>
-    public partial class MainView : Window
+    public partial class MainView : UserControl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MainView"/> class.
         /// </summary>
         public MainView()
         {
-            InitializeComponent();
+            this.InitializeComponent();
+        }
+
+        /// <summary>
+        /// Hide the overflow control on the Preset panel.
+        /// TODO find a better way of doing this. This seems to be the common solution. 
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ToolBarLoaded(object sender, RoutedEventArgs e)
+        {
+            ToolBar toolBar = sender as ToolBar;
+            if (toolBar != null)
+            {
+                var overflowGrid = toolBar.Template.FindName("OverflowGrid", toolBar) as FrameworkElement;
+                if (overflowGrid != null)
+                {
+                    overflowGrid.Visibility = Visibility.Collapsed;
+                }
+            }
         }
     }
 }

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/OptionsView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/OptionsView.xaml Changed

@@ -1,68 +1,102 @@
-<Window x:Class="HandBrakeWPF.Views.OptionsView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<UserControl  x:Class="HandBrakeWPF.Views.OptionsView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
-        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" Title="{Binding Title}" MinWidth="620" MinHeight="600" Width="620" Height="600">
+        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
+              xmlns:Options="clr-namespace:HandBrakeWPF.Converters.Options"
+              xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
+              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" xmlns:local="clr-namespace:HandBrakeWPF.Model"
+              Background="White">
 
-    <Window.Resources>
+    <UserControl.Resources>
         <Style TargetType="Button">
-            <Setter Property="Foreground" Value="DarkOrange" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Padding" Value="5,0.5" />
+            <Setter Property="Padding" Value="5,1" />
             <Setter Property="FontSize" Value="11.5" />
             <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="MinHeight" Value="22" />
         </Style>
 
-
-
         <Style TargetType="TextBlock">
             <Setter Property="Margin" Value="0,0,5,0" />
         </Style>
 
+        <Style TargetType="TextBox">
+            <Setter Property="Padding" Value="5,2" />
+            <Setter Property="MinHeight" Value="22" />
+        </Style>
+
         <Style TargetType="CheckBox">
             <Setter Property="Margin" Value="0,0,0,5" />
         </Style>
-    </Window.Resources>
 
+        <Style TargetType="ListBoxItem">
+            <Setter Property="Padding" Value="8,4" />
+        </Style>
+
+        <Options:OptionsTabConverter x:Key="tabConverter" />
+        <Options:OptionsTabNameConverter x:Key="tabNameConverter" />
+        
+        <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+
+        <ObjectDataProvider MethodName="GetValues"
+                        ObjectType="{x:Type local:OptionsTab}"
+                        x:Key="OptionTabsList">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="local:OptionsTab" />
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="150" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <StackPanel Orientation="Vertical" Grid.Column="0" Margin="10,10,0,0">
+            <Border BorderThickness="0 0 0 1" BorderBrush="LightGray" Margin="0,0,0,10">
+                <TextBlock Text="Preferences" FontSize="16" />
+            </Border>
+
+            <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}}" SelectedItem="{Binding SelectedTab}"
+                     BorderThickness="0" Background="Transparent">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
 
-    <StackPanel Orientation="Vertical" Background="#FFF1F0EF">
-        
-        <StackPanel Orientation="Horizontal"  Background="White" Height="50" >
-            <Image Source="Images/Preferences.png" Margin="10,0,5,0" Width="32" Height="32" VerticalAlignment="Center" />
-            <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                <TextBlock Text="Options" FontWeight="Bold" />
-                <TextBlock Text="Preferences to control various features in HandBrake" />
-            </StackPanel>
         </StackPanel>
 
-        
-        <TabControl Margin="10,10,10,10" Height="460">
-            <TabItem Header="General">
-                <StackPanel Orientation="Vertical">
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+        <ScrollViewer Grid.Column="1">
+            <StackPanel Orientation="Vertical">
 
-                        <TextBlock Text="At Launch:" Grid.Column="0" FontWeight="Bold"/>
+                <StackPanel Name="General" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.General}}">
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="General" FontSize="16" />
+                    </Border>
+
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
+
+                        <TextBlock Text="On Startup" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
                             <CheckBox Content="Check for Updates" IsChecked="{Binding CheckForUpdates}" />
                             <ComboBox Name="checkForUpdateFrequency" ItemsSource="{Binding CheckForUpdatesFrequencies}" SelectedIndex="{Binding CheckForUpdatesFrequency}" Margin="25,0,0,5" HorizontalAlignment="Left" Width="120"></ComboBox>
-
-                            <CheckBox Content="Enable Tooltips" IsChecked="{Binding EnableGuiTooltips}" />
                         </StackPanel>
-                    </Grid>
-
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+                    </StackPanel>
 
-                        <TextBlock Text="When Done:" Grid.Column="0" FontWeight="Bold"/>
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,20">
+                        <TextBlock Text="When Done" Grid.Column="0" FontSize="14" Margin="0,0,0,10" />
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
                             <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120"  HorizontalAlignment="Left"></ComboBox>
 
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
@@ -73,42 +107,58 @@
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
                                 <CheckBox Content="Send file to:" VerticalAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" />
                                 <TextBlock Margin="5,0,5,5" VerticalAlignment="Center" Text="{Binding SendFileTo}" />
-                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" Width="55"/>
+                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />
                             </StackPanel>
 
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
                                 <TextBlock VerticalAlignment="Center"  Margin="25,0,5,0" Text="Arguments:" />
-                                <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="180" />
+                                <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="250" />
                             </StackPanel>
 
                         </StackPanel>
-                    </Grid>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,20">
+
+                        <TextBlock Text="Path to VLC Player" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center" Text="Path:" />
+                                <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="250" />
+                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />
+                            </StackPanel>
+                            <TextBlock Margin="30,0,0,0" Text="This path is used for the video preview feature only." />
+
+                        </StackPanel>
+                    </StackPanel>
                 </StackPanel>
-            </TabItem>
 
-            <TabItem Header="Output Files">
-                <StackPanel Orientation="Vertical">
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+                <StackPanel Name="Output" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.OutputFiles}}">
+
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Output Files" FontSize="16" />
+                    </Border>
 
-                        <TextBlock Text="Output Files:" Grid.Column="0" FontWeight="Bold"/>
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                        <TextBlock Text="Automatic File Naming" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
                             <CheckBox Content="Automatically name output files" IsChecked="{Binding AutomaticallyNameFiles}" />
 
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                <TextBlock VerticalAlignment="Center" Text="Arguments: " />
+                                <TextBlock VerticalAlignment="Center" Text="Default Path: " />
                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="180" />
-                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" Width="55"/>
+                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />
                             </StackPanel>
                             <TextBlock Text="Available Options: {source_path} or {source_folder_name} (Not Both)" />
 
-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                            <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
                                 <TextBlock VerticalAlignment="Center" Text="Format:" />
-                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="180" />
+                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="180" ToolTip=" {Source} = Source Name,  {Title} = Title Number,  {Chapters} = Selected Chapters, {Date} = Todays Date,"  />
                             </StackPanel>
                             <TextBlock Text="Available Options: {source} {title} {chapters} {date}" />
 
@@ -122,177 +172,176 @@
                                 <ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left"></ComboBox>
                             </StackPanel>
                         </StackPanel>
-                    </Grid>
+                    </StackPanel>
                 </StackPanel>
-            </TabItem>
-
-            <TabItem Header="Preview">
-                <StackPanel Orientation="Vertical">
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Text="VLC Path:" Grid.Column="0" FontWeight="Bold"/>
-
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center" Text="Path:" />
-                                <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="180" />
-                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" Width="55"/>
-                            </StackPanel>
-                            <TextBlock Text="This path is used for the video preview feature only." />
 
+                <StackPanel Name="Audio" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.AudioAndSubtitles}}">
+                   
+                    
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Audio and Subtitle Language Handling" FontSize="16" />
+                    </Border>
+                    <TextBlock Text="Control the default selection behaviour for audio and subtitle tracks" Margin="0,10,0,10" />
+
+                    <TextBlock Text="Select your preferred languages" Grid.Column="0" Margin="10,10,0,0" FontSize="14"/>
+
+                    <Grid Margin="20,10,0,0" >
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"  Text="Audio: " />
+                            <ComboBox Name="primaryAudioLanguage" VerticalAlignment="Center"  ItemsSource="{Binding PreferredLanguages}" 
+                                      SelectedItem="{Binding SelectedPreferredLangauge}" Width="120" />
+                            <TextBlock VerticalAlignment="Center"  Text="Subtitles: " Margin="10,0,0,0" />
+                            <ComboBox Name="primarySubtitleLanguage" VerticalAlignment="Center"  ItemsSource="{Binding PreferredLanguages}" 
+                                      SelectedItem="{Binding SelectedPreferredSubtitleLangauge}" Width="120" />
                         </StackPanel>
                     </Grid>
-                </StackPanel>
-            </TabItem>
-
-            <TabItem Header="Audio and Subtitles">
-                <StackPanel Orientation="Vertical">
 
-                    <TextBlock Text="Automatic Selection" Grid.Column="0" Margin="10,10,0,0" FontWeight="Bold"/>
+                    <TextBlock Text="Automatic language selection behaviour" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
 
-                    <Grid Margin="10,10,0,0">
+                    <Grid Margin="20,10,0,0" >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="140" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="Preferred Language:" Grid.Column="0"/>
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <TextBlock VerticalAlignment="Center"  Text="Audio: " FontSize="10" />
-                            <ComboBox Name="primaryAudioLanguage" VerticalAlignment="Center"  ItemsSource="{Binding PreferredLanguages}" SelectedItem="{Binding SelectedPreferredLangauge}" Width="120" />
-                            <TextBlock VerticalAlignment="Center"  Text="Subtitles: " FontSize="10" Margin="10,0,0,0" />
-                            <ComboBox Name="primarySubtitleLanguage" VerticalAlignment="Center"  ItemsSource="{Binding PreferredLanguages}" SelectedItem="{Binding SelectedPreferredSubtitleLangauge}" Width="120" />
-                        </StackPanel>
+                        
+                        <TextBlock Text="Audio:" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
+                        <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left"
+                                  ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />
+                        <CheckBox Content="Add only one audio track per language" Grid.Column="1" Grid.Row="1"  HorizontalAlignment="Left"
+                                  IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" Margin="0,5,0,0" />
+                        
+                        
+                        <TextBlock Text="Subtitle:"  Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        <ComboBox Name="autoSubtitleMode"  Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left"
+                                  ItemsSource="{Binding AddSubtitleModeOptions}" SelectedIndex="{Binding SelectedAddSubtitleMode}" Width="120" Margin="0,0,5,0" />
+                        <CheckBox Content="Add Closed Captions when available"  Grid.Column="3" Grid.Row="1" Margin="0,5,0,0" 
+                                  HorizontalAlignment="Left" IsChecked="{Binding AddClosedCaptions}"/>
                     </Grid>
 
-                    <Grid Margin="10,10,0,0">
+                    <TextBlock Text="Additional languages for possible selection" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
+
+                    <Grid Margin="20,20,0,0">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="Additional Tracks:" Grid.Column="0"/>
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <Grid Margin="10,10,0,10">
+                        <StackPanel Orientation="Horizontal">
+                            <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
 
                                 <StackPanel Orientation="Vertical" Grid.Column="0">
-                                    <TextBlock Text="Available Langauges" Margin="0,0,0,5"/>
+                                    <TextBlock Text="Available Languages" Margin="0,0,0,5"/>
                                     <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
-                                             SelectionMode="Extended" Width="140" Height="160"></ListBox>
+                                             SelectionMode="Extended" Width="140" Height="140"></ListBox>
                                 </StackPanel>
 
                                 <DockPanel Grid.Column="1" Margin="10,0,10,0">
                                     <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                        <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" Width="60" >
-                                            <Image Source="Images/arrow_right.png" Width="24" Height="24" />
-                                        </Button>
-                                        <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" Width="60" >
-                                            <Image Source="Images/arrow_left.png" Width="24" Height="24" />
-                                        </Button>
-                                        <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="60" />
+                                        <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
+                                        <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />    
+                                        <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
                                     </StackPanel>
                                 </DockPanel>
 
                                 <StackPanel Orientation="Vertical" Grid.Column="2">
-                                    <TextBlock Text="Selected Langauges"  Margin="0,0,0,5"/>
+                                    <TextBlock Text="Chosen Selected Languages"  Margin="0,0,0,5"/>
                                     <ListBox Name="selectedLangauges" ItemsSource="{Binding SelectedLangauges}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
-                                             SelectionMode="Extended" Width="140" Height="160" />
+                                             SelectionMode="Extended" Width="140" Height="140"
+                                             dd:DragDrop.DropHandler="{Binding}"
+                                             dd:DragDrop.IsDragSource="True"
+                                             dd:DragDrop.IsDropTarget="True"/>
                                 </StackPanel>
-
-                                <DockPanel Grid.Column="3" Margin="10,0,10,0">
-                                    <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                        <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveUp]"  >
-                                            <Image Source="Images/arrow_up.png" Width="16" Height="16" />
-                                        </Button>
-                                        <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveDown]"  >
-                                            <Image Source="Images/arrow_down.png" Width="16" Height="16" />
-                                        </Button>
-                                    </StackPanel>
-                                </DockPanel>
-
                             </Grid>
                         </StackPanel>
                     </Grid>
 
-                    <GroupBox Header="Add Additional Tracks" >
-                        <StackPanel Orientation="Vertical">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="Audio:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />
-                                <ComboBox Name="autoAudioMode" ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />
-                                <CheckBox Content="Add only one audio track per langauge" VerticalAlignment="Center" IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" />
-                            </StackPanel>
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,0">
+                        <Label Content="Audio Tab Options" FontSize="14"/>
+                        <CheckBox IsChecked="{Binding ShowAdvancedPassthruOpts}" Content="Show advanced audio passthru options. (Requires Restart)"
+                                  Margin="20,0,0,0" />
+                    </StackPanel>
+
+                </StackPanel>
+
+                <StackPanel Name="Advanced" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">
+
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Advanced" FontSize="16" />
+                    </Border>
+
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
+
+                        <TextBlock Text="Advanced Options" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
 
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                            <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />
+                            <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />
+                            <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
+                            <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
+                            <CheckBox Content="Show Advanced Tab" IsChecked="{Binding ShowAdvancedTab}" />
+                            <CheckBox Content="Disable LibHB Features" IsChecked="{Binding DisableLibHbFeatures}" />
+                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                                <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />
+                                <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock Text="Minimum length of title to scan (seconds):" VerticalAlignment="Center" Width="250" />
+                                <TextBox Name="MinTitleLength" Text="{Binding MinLength}"  Width="120"/>
+                                
+                            </StackPanel>
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                <TextBlock Text="Subtitle:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />
-                                <ComboBox Name="autoSubtitleMode" ItemsSource="{Binding AddSubtitleModeOptions}" SelectedIndex="{Binding SelectedAddSubtitleMode}" Width="120" Margin="0,0,5,0" />
+                                <TextBlock Text="Priority Level:" Width="250" VerticalAlignment="Center" />
+                                <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions}" SelectedItem="{Binding SelectedPriority}" Width="120" />
                             </StackPanel>
 
-                            <CheckBox Content="Add Closed Captions when available" Margin="120,5,0,0" IsChecked="{Binding AddClosedCaptions}"/>
                         </StackPanel>
-                    </GroupBox>
+                    </StackPanel>
 
-                    <StackPanel Orientation="Vertical">
-                        <Label Content="Audio Tab Options" FontWeight="Bold" />
-                        <CheckBox IsChecked="{Binding ShowAdvancedPassthruOpts}" Content="Show advanced audio passthru options. (Requires Restart)"
-                                  Margin="5,0,0,0" />
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
+                        <TextBlock Text="x264 Settings" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+                        <StackPanel Orientation="Horizontal" Grid.Column="1"  Margin="20,0,0,0">
+                            <TextBlock Text="Constant quality fractional granularity:" VerticalAlignment="Center" Width="250" />
+                            <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranulairty}" Width="120"/>
+                        </StackPanel>
                     </StackPanel>
 
-                </StackPanel>
-            </TabItem>
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
-            <TabItem Header="System and Logging">
-                <StackPanel Orientation="Vertical">
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="DVD Reading" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
 
-                        <TextBlock Text="CLI:" Grid.Column="0" FontWeight="Bold"/>
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <TextBlock Text="Priority Level:" VerticalAlignment="Center" />
-                            <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions}" SelectedItem="{Binding SelectedPriority}" Width="120" />
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                            <CheckBox Content="Disable LibDVDNav. (libdvdread will be used instead)" IsChecked="{Binding DisableLibdvdNav}" />
                         </StackPanel>
-                    </Grid>
 
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="System:" Grid.Column="0" FontWeight="Bold"/>
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />
-                        </StackPanel>
-                    </Grid>
+                    </StackPanel>
 
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
-                        <TextBlock Text="Logs:" Grid.Column="0" FontWeight="Bold"/>
+                        <TextBlock Text="Logging" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
                             <StackPanel Orientation="Horizontal" Grid.Column="1">
-                                <TextBlock Text="Log Verbosity Level:" VerticalAlignment="Center" />
+                                <TextBlock Text="Log Verbosity Level:" Width="250" VerticalAlignment="Center" />
                                 <ComboBox Name="logVerbosityLevel" ItemsSource="{Binding LogVerbosityOptions}" SelectedItem="{Binding SelectedVerbosity}" Width="120" />
                             </StackPanel>
 
-                            <CheckBox Content="Put a copy of individual encode logs in the same location as the encoded video" IsChecked="{Binding CopyLogToEncodeDirectory}" />
-                            <CheckBox Content="Put a copy of individual encode logs in a specified location: " IsChecked="{Binding CopyLogToSepcficedLocation}" />
+                            <CheckBox Content="Put a copy of individual encode logs in the same location as the encoded video" Margin="0,5,0,0" IsChecked="{Binding CopyLogToEncodeDirectory}" />
+                            <CheckBox Content="Put a copy of individual encode logs in a specified location: " Margin="0,5,0,0" IsChecked="{Binding CopyLogToSepcficedLocation}" />
                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
                                 <TextBlock Text="Log Path:" VerticalAlignment="Center" />
                                 <TextBox Width="120" Text="{Binding LogDirectory}" />
@@ -306,71 +355,84 @@
                             <CheckBox Content="Clear Log files older than 30 days " Margin="0,5,0,0" IsChecked="{Binding ClearOldOlgs}" />
                         </StackPanel>
 
-                    </Grid>
-                </StackPanel>
-            </TabItem>
+                    </StackPanel>
 
-            <TabItem Header="Advanced">
-                <StackPanel Orientation="Vertical">
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="GUI:" Grid.Column="0" FontWeight="Bold"/>
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
-                            <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />
-                            <CheckBox Content="Display status messages from tray icon (balloon popups)" IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />
-                            <CheckBox Content="Enable 'Query Editor' tab (Requires Restart)" IsChecked="{Binding EnableQueryEditor}" />
-                            <CheckBox Content="Prompt when a manual query does not match GUI settings" Margin="10,0,0,5" IsChecked="{Binding PromptOnDifferentQuery}" />
-                            <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
-                            <CheckBox Content="Show CLI window (Allows you to cleanly exit encode with ctrl-c)" IsChecked="{Binding ShowCliWindow}" />
-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
-                                <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />
-                                <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                <TextBlock Text="Minimum length of title to scan (seconds):" VerticalAlignment="Center" Width="250" />
-                                <TextBox Name="MinTitleLength" Text="{Binding MinLength}"  Width="120"/>
-                                
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
+
+                        <TextBlock Text="Experimental Features" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+                        
+                        <TextBlock Text="These options are for developer testing of features that are currently in progress!!!!" FontWeight="Bold" Margin="0,0,0,10" />
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                            
+                            <CheckBox Content="Enable LibHB Scanning and Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />
+                            <CheckBox Content="Enable Process Isolation (Run Scans and Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" />
+                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
+                                <TextBlock Text="Server Port:" VerticalAlignment="Center" />
+                                <TextBox Width="50" MaxLength="5" Text="{Binding ServerPort}" />
                             </StackPanel>
 
+                            <CheckBox Content="Enable Debug Features" IsChecked="{Binding EnableDebugFeatures}" Margin="0,10,0,0" />
                         </StackPanel>
-                    </Grid>
+                    </StackPanel>
+                </StackPanel>
+
+                <StackPanel Name="Updates" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Updates}}">
+
 
-                    <Grid Margin="10,0,0,10">
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Updates" FontSize="16" />
+                    </Border>
+
+                    <TextBlock Text="Current Version" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
+
+                    <Grid Margin="20,10,0,20">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="70" />
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="x264:" Grid.Column="0" FontWeight="Bold"/>
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <TextBlock Text="Constant quality fractional granularity:" VerticalAlignment="Center" Width="250" />
-                            <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranulairty}" Width="120"/>
-                        </StackPanel>
+
+                        
+                        <TextBlock Grid.Column="0" Margin="0,0,5,0" Text="Version:" />
+                        <TextBlock Grid.Column="1" Margin="0,0,0,1" VerticalAlignment="Bottom" Text="{Binding Version}" />
                     </Grid>
 
-                    <Grid Margin="10,0,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
+                    <TextBlock Text="Updates" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
 
-                        <TextBlock Text="DVD:" Grid.Column="0" FontWeight="Bold"/>
+                    <StackPanel Margin="20,0,0,0" Orientation="Horizontal">
+                        <Button Content="Check for Updates" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />
+                        <Button Content="Download Update" Width="120" cal:Message.Attach="[Event Click] = [Action DownloadUpdate]" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
+                    </StackPanel>
+                    
+                    <StackPanel Margin="20,10,0,0" Orientation="Horizontal">
+                        <ProgressBar Minimum="0" Maximum="100" Height="20" Width="400" Value="{Binding DownloadProgressPercentage}" 
+                                 Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
+                        <TextBlock Text="{Binding UpdateMessage}" Margin="10,0,10,0" VerticalAlignment="Center" />
+                    </StackPanel>
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
-                            <CheckBox Content="Disable LibDVDNav. (libdvdread will be used instead)" IsChecked="{Binding DisableLibdvdNav}" />
-                        </StackPanel>
+                </StackPanel>
+
+                <StackPanel Name="About" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.About}}">
+
+
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="About HandBrake" FontSize="16" />
+                    </Border>
+
+                    <ContentControl x:Name="AboutViewModel" />
 
-                    </Grid>
                 </StackPanel>
-            </TabItem>
-        </TabControl>
+            </StackPanel>
+        </ScrollViewer>
 
-        <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
-                    HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,0" />
+        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1" Grid.ColumnSpan="2" >
+            <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
+                    HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
+        </StackPanel>
 
 
-    </StackPanel>
-</Window>
+    </Grid>
+</UserControl>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml Changed

@@ -1,12 +1,16 @@
 <UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
-             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters">
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:controls="clr-namespace:HandBrakeWPF.Controls">
 
     <UserControl.Resources>
         <Converters:BooleanConverter x:Key="boolConverter" />
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+        <Converters:BooleanToHiddenVisibilityConverter x:Key="boolToVisHiddenConverter" />
+        <Style TargetType="controls:NumberBox">
+            <Setter Property="Height" Value="24" />
+        </Style>
     </UserControl.Resources>
 
     <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
@@ -24,12 +28,14 @@
             
             <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
                 <Label Content="Width:" Grid.Row="1" Grid.Column="0" />
-                <NumericUpDown:NumericUpDown Value="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" SmallChange="{Binding SelectedModulus, Mode=OneWay}"
+                <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"
                                              Minimum="0" Grid.Row="1" Grid.Column="1" Width="60"  />
                 <Label Content="Height:" Grid.Row="1" Grid.Column="2" />
-                <NumericUpDown:NumericUpDown Value="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" SmallChange="{Binding SelectedModulus, Mode=OneWay}" 
+                <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}" 
                                              Minimum="0" Grid.Row="1" Grid.Column="3" Width="60"  />
-                <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}" VerticalAlignment="Center" Margin="5,0,0,0" />
+                <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"
+                          Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" 
+                          VerticalAlignment="Center" Margin="5,0,0,0" />
             </StackPanel>
 
             
@@ -45,13 +51,16 @@
                 </Grid.ColumnDefinitions>
 
                 <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />
-                <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" />
+                <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" 
+                       Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />
 
                 <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 
+                          Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}"
+                          Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
             </Grid>
             
-            
+            
             <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -68,9 +77,12 @@
                 <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />
                 <Label Content="PAR Height:" Grid.Row="5" Grid.Column="0" />
 
-                <NumericUpDown:NumericUpDown Width="60" Value="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <NumericUpDown:NumericUpDown Width="60" Value="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <NumericUpDown:NumericUpDown Width="60" Value="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 
+                                    AllowEmpty="False" />
+                <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
+                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />
+                <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
+                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />
             </Grid>
             
             
@@ -84,9 +96,11 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
-                <Label Content="Display Size:" Grid.Row="0" Grid.Column="0" />
+                <Label Content="Display Size:" Grid.Row="0" Grid.Column="0"
+                       Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
 
-                <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
+                       Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
             </Grid>
         </StackPanel>
 
@@ -118,14 +132,17 @@
                 <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
                 <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
 
-                <NumericUpDown:NumericUpDown Width="45" Value="{Binding CropTop, Mode=TwoWay}" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2" 
-                                             HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <NumericUpDown:NumericUpDown Width="45" Value="{Binding CropBottom, Mode=TwoWay}" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2" 
-                                             HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <NumericUpDown:NumericUpDown Width="45" Value="{Binding CropLeft, Mode=TwoWay}" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1" 
-                                             HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <NumericUpDown:NumericUpDown Width="45" Value="{Binding CropRight, Mode=TwoWay}" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
-                                             HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
+                                    Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
+
+                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
+                                    Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
+
+                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
+                                    Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
+
+                <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
+                                    Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
 
             </Grid>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/PreviewView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/PreviewView.xaml Changed

@@ -1,12 +1,82 @@
 <Window x:Class="HandBrakeWPF.Views.PreviewView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             Title="{Binding Title}" 
-             Width="300" Height="300">
-    <Grid Background="Beige">
-            
-    </Grid>
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="{Binding Title}"
+        Width="380"
+        Background="#FFF1F0EF"
+        ResizeMode="NoResize"
+        SizeToContent="Height"
+        WindowStartupLocation="CenterScreen"
+        TextOptions.TextFormattingMode="Display"
+        mc:Ignorable="d">
+
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Padding" Value="5,1" />
+            <Setter Property="FontSize" Value="11.5" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+    </Window.Resources>
+
+    <StackPanel Orientation="Vertical">
+
+        <StackPanel Grid.Row="0"
+                    Height="30"
+                    Margin="0,0,0,10"
+                    Background="White"
+                    Orientation="Horizontal">
+            <Image Width="24"
+                   Height="24"
+                   Margin="10,0,5,0"
+                   VerticalAlignment="Center"
+                   Source="Images/window.png" />
+            <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+                <TextBlock FontWeight="Bold" Text="Create a video preview" />
+            </StackPanel>
+        </StackPanel>
+
+        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+            <TextBlock Margin="0,0,5,0"
+                       VerticalAlignment="Center"
+                       Text="Start at Preview:" />
+            <ComboBox Width="60"
+                      ItemsSource="{Binding StartPoints}"
+                      SelectedItem="{Binding StartAt}" />
+
+            <TextBlock Margin="10,0,5,0"
+                       VerticalAlignment="Center"
+                       Text="Duration:" />
+            <ComboBox Width="60"
+                      ItemsSource="{Binding AvailableDurations}"
+                      SelectedItem="{Binding Duration}" />
+        </StackPanel>
+
+        <StackPanel Margin="10,10,0,0" Orientation="Horizontal">
+            <ProgressBar Width="310"
+                         Height="22"
+                         Maximum="100"
+                         Minimum="0"
+                         Value="{Binding PercentageValue}" />
+            <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" />
+        </StackPanel>
+
+        <StackPanel Width="360"
+                    Margin="10,10,0,10"
+                    Orientation="Horizontal">
+            <CheckBox VerticalAlignment="Center"
+                      Content="Use system default player"
+                      IsChecked="{Binding UseSystemDefaultPlayer}" />
+            <Button Margin="10,0,0,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    cal:Message.Attach="[Event Click] = [Action Play]"
+                    Content="Play"
+                    IsDefault="True"
+                    Padding="8,2" />
+        </StackPanel>
+    </StackPanel>
 </Window>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml Added

@@ -0,0 +1,140 @@
+<Window x:Class="HandBrakeWPF.Views.QueueSelectionView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="{Binding Title}"
+        Width="450"
+        MaxHeight="450"
+        SizeToContent="Height"
+        WindowStartupLocation="CenterScreen"
+        TextOptions.TextFormattingMode="Display"
+        mc:Ignorable="d">
+
+    <Window.Resources>
+
+        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+            <Setter Property="Margin" Value="0,2,0,2" />
+        </Style>
+    </Window.Resources>
+
+    <Grid HorizontalAlignment="Stretch"
+          VerticalAlignment="Stretch"
+          Background="#FFF1F0EF">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        
+        <StackPanel Grid.Row="0"
+                    Height="30"
+                    Margin="0,0,0,10"
+                    Background="White"
+                    Orientation="Horizontal">
+            <Image Width="24"
+                   Height="24"
+                   Margin="10,0,5,0"
+                   VerticalAlignment="Center"
+                   Source="Images/AddToQueue_small.png" />
+            <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+                <TextBlock FontWeight="Bold" Text="Queue Multiple Items" />
+            </StackPanel>
+        </StackPanel>
+
+        
+        <StackPanel Orientation="Vertical" Grid.Row="1" Margin="10,10,10,0">
+            <TextBlock Text="Select multiple titles to add: " />
+        </StackPanel>
+
+        
+        <ListBox Grid.Row="2"
+                 Margin="10,10,10,10"
+                 VerticalAlignment="Stretch"
+                 Background="LightGray"
+                 ItemsSource="{Binding TitleList}"
+                 SelectionMode="Single">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                    <Setter Property="Background" Value="WhiteSmoke" />
+                    <Setter Property="Margin" Value="0,0,0,1" />
+                </Style>
+            </ListBox.ItemContainerStyle>
+
+            <ListBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="Select All" cal:Message.Attach="[Event Click] = [Action SelectAll]" />
+                    <MenuItem Header="Select All" cal:Message.Attach="[Event Click] = [Action UnSelectAll]" />
+                    <Separator />
+                    <MenuItem Header="Order by Title" IsChecked="{Binding OrderedByTitle}" cal:Message.Attach="[Event Click] = [Action OrderByTitle]" />
+                    <MenuItem Header="Order by Duration" IsChecked="{Binding OrderedByDuration}" cal:Message.Attach="[Event Click] = [Action OrderByDuration]" />
+                </ContextMenu>
+            </ListBox.ContextMenu>
+
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid HorizontalAlignment="Stretch" MinHeight="28">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        
+                        <CheckBox IsChecked="{Binding IsSelected}" Grid.RowSpan="2" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
+
+                        <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Margin="10,0,0,0" >                           
+                            <TextBlock Text="Title:" Margin="0,0,5,0" FontWeight="Bold" />
+                            <TextBlock Text="{Binding Title}" Margin="5,0,5,0" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Margin="10,0,0,0" >
+                            <TextBlock Text="Source:" Margin="0,0,5,0" FontWeight="Bold" />
+                            <TextBlock Text="{Binding SourceName}" Margin="5,0,5,0" />
+                        </StackPanel>
+                    </Grid>
+
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        
+        <StackPanel Orientation="Vertical" Grid.Row="3" Margin="10,10,10,0">
+            <TextBlock Text="Checklist " />
+        </StackPanel>
+
+        
+        <Grid Grid.Row="4"
+              Margin="0,20,0,0"
+              Background="LightGray">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Button Grid.Column="1"
+                    Margin="0,5,10,5"
+                    cal:Message.Attach="[Event Click] = [Action Cancel]"
+                    Content="Cancel"
+                    IsCancel="True"
+                    Padding="8,2" />
+            <Button Grid.Column="2"
+                    Margin="0,5,10,5"
+                    cal:Message.Attach="[Event Click] = [Action Add]"
+                    Content="Add"
+                    IsDefault="True"
+                    Padding="8,2" />
+        </Grid>
+
+    </Grid>
+</Window>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueSelectionView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for QueueSelectionView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+    using System.Windows;
+
+    /// <summary>
+    /// Interaction logic for QueueSelectionView.xaml
+    /// </summary>
+    public partial class QueueSelectionView : Window
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueueSelectionView"/> class.
+        /// </summary>
+        public QueueSelectionView()
+        {
+            InitializeComponent();
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml Changed

@@ -1,110 +1,322 @@
 <Window x:Class="HandBrakeWPF.Views.QueueView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
-             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-        xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d" Title="{Binding Title}" 
-             Width="600" Height="400"
-             Background="#FFF0F0F0">
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:YourNamespace="clr-namespace:HandBrakeWPF.AttachedProperties"
+        xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
+        xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles" Title="{Binding Title}"
+        Width="600"
+        Height="400"
+        MinWidth="600"
+        MinHeight="400"
+        MaxWidth="600"
+        Background="#FFF0F0F0"
+        WindowStartupLocation="CenterScreen"
+        TextOptions.TextFormattingMode="Display"
+        mc:Ignorable="d">
 
     <Window.Resources>
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
         <Converters:FullPathToFileNameConverter x:Key="filePathToFilenameConverter" />
+        <Converters:EnumComboConverter x:Key="enumComboConverter" />
+        <Converters:QueueStatusToVisibilityConverter x:Key="queueStatusVisConverter" />
+        <Audio:AudioQueueDisplayConverter x:Key="audioTrackDisplayConverter" />
+        <Subtitles:SubtitlesQueueDisplayConverter x:Key="subtitleTrackDisplayConverter" />
     </Window.Resources>
 
-    <Grid >
+    <Grid>
 
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">
-
-            <Button Name="Start" cal:Message.Attach="[Event Click] = [Action StartEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
-                <StackPanel Orientation="Horizontal">
-                    <Image Source="Images/Play.png" Height="32" Width="32" />
-                    <Label Content="Start"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                </StackPanel>
-            </Button>
-
-            <Button Name="Pause" cal:Message.Attach="[Event Click] = [Action PauseEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
-                <StackPanel Orientation="Horizontal">
-                    <Image Source="Images/Pause.png" Height="32" Width="32" />
-                    <Label Content="Pause"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                </StackPanel>
-            </Button>
+        <ToolBar Name="mainToolBar"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch"
+                 SnapsToDevicePixels="True">
+
+            <DockPanel Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ToolBarPanel}}}" Background="Transparent">
+                <DockPanel.Resources>
+                    <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
+                    <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />
+                </DockPanel.Resources>
+
+                <Button Name="Start"
+                        cal:Message.Attach="[Event Click] = [Action StartEncode]"
+                        Visibility="{Binding IsEncoding,
+                                             Converter={StaticResource boolToVisConverter},
+                                             ConverterParameter=true}">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/Play.png" />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Start" />
+                    </StackPanel>
+                </Button>
+
+                <Button Name="Pause"
+                        cal:Message.Attach="[Event Click] = [Action PauseEncode]"
+                        Visibility="{Binding IsEncoding,
+                                             Converter={StaticResource boolToVisConverter},
+                                             ConverterParameter=false}">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/Pause.png" />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Pause" />
+                    </StackPanel>
+                </Button>
+
+                <Menu HorizontalAlignment="Right" Background="Transparent">
+                    <MenuItem>
+                        <MenuItem.Header>
+                            <StackPanel Height="32" Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           FontWeight="Bold"
+                                           Text="When Done: " />
+                                <Label Margin="8,0,0,0"
+                                       VerticalAlignment="Center"
+                                       Content="{Binding WhenDoneAction}" />
+                                <Path Height="5"
+                                      Margin="2,2,2,0"
+                                      Data="M 0 0 L 4 4 L 8 0 Z"
+                                      Fill="{DynamicResource GlyphBrush}" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem x:Name="doNothing"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"
+                                  Header="Do nothing"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                        <MenuItem x:Name="shutdown"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"
+                                  Header="Shutdown"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                        <MenuItem x:Name="suspend"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"
+                                  Header="Suspend"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                        <MenuItem x:Name="hibernate"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"
+                                  Header="Hibernate"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                        <MenuItem x:Name="lock"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"
+                                  Header="Lock system"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                        <MenuItem x:Name="logoff"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"
+                                  Header="Log off"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                        <MenuItem x:Name="quit"
+                                  cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"
+                                  Header="Quit HandBrake"
+                                  IsCheckable="True"
+                                  YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+                    </MenuItem>
+                </Menu>
+            </DockPanel>
         </ToolBar>
 
         <StackPanel Grid.Row="1" Margin="10,20,10,20">
             <TextBlock Text="{Binding JobsPending}" />
             <TextBlock Text="{Binding JobStatus}" />
         </StackPanel>
+        
+        <ListBox Grid.Row="2"
+                 Margin="10,0,10,10"
+                 Background="LightGray"
+                 dd:DragDrop.DropHandler="{Binding}"
+                 dd:DragDrop.IsDragSource="True"
+                 dd:DragDrop.IsDropTarget="True"
+                 ItemsSource="{Binding QueueTasks, Mode=OneWay}"
+                 SelectionMode="Extended">
+
+            <ListBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />
+                    <Separator />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />
+                </ContextMenu>
+            </ListBox.ContextMenu>
 
-        <ListBox Grid.Row="2" ItemsSource="{Binding QueueJobs}" SelectionMode="Extended" Background="LightGray" Margin="10,0,10,10"
-                 dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
-                 dd:DragDrop.DropHandler="{Binding}">
             <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
+                <Style TargetType="{x:Type ListBoxItem}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Background" Value="WhiteSmoke" />
                     <Setter Property="Margin" Value="0,0,0,1" />
+                    <Setter Property="ToolTip">
+                        <Setter.Value>
+                            <StackPanel Grid.Column="1"
+                                    Margin="0,5,0,5"
+                                    HorizontalAlignment="Stretch">
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock FontWeight="Bold" Text="Video" />
+                                    <TextBlock Text=": " />
+                                    <TextBlock Text="{Binding Task.VideoEncoder, Converter={StaticResource enumComboConverter}}" />
+                                    <TextBlock Margin="10,0,0,0" FontWeight="Bold" Text="Audio: " />
+                                    <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}" />
+                                </StackPanel>
+
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock FontWeight="Bold" Text="Subtitles: " />
+                                    <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}" />
+                                </StackPanel>
+
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock FontWeight="Bold" Text="Advanced: " />
+                                    <TextBlock Text="{Binding Task.AdvancedEncoderOptions}" />
+                                </StackPanel>
+
+                            </StackPanel>
+                        </Setter.Value>
+                    </Setter>
                 </Style>
             </ListBox.ItemContainerStyle>
 
             <ListBox.ItemTemplate>
                 <DataTemplate x:Name="QueueItemTemplate">
 
-                    <Grid HorizontalAlignment="Stretch" >
+                    <Grid HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        
-                        <Image Source="Images/Movies.png" Width="16" Height="16" Grid.Column="0" Margin="10,0,10,0" />
+                        
+                        <Image Grid.Column="0"
+                               Width="16"
+                               Height="16"
+                               Margin="10,0,10,0">
+                            <Image.Style>
+                                <Style TargetType="{x:Type Image}">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
+                                            <Setter Property="Source" Value="Images\Movies.png" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
+                                            <Setter Property="Source" Value="Images\Working0.png" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
+                                            <Setter Property="Source" Value="Images\Complete.png" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
+                                            <Setter Property="Source" Value="Images\WarningSmall.png" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Image.Style>
+                        </Image>
 
-                        
-                            <StackPanel Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,5,0,5">
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="Title: " FontWeight="Bold" />
-                                    <TextBlock Text="{Binding Task.Title}"/>
-
-                                    <TextBlock Text="{Binding Task.PointToPointMode}" FontWeight="Bold" Margin="10,0,0,0" />
-                                    <TextBlock Text=": "  />
-                                    <TextBlock Text="{Binding Task.StartPoint}"/>
-                                    <TextBlock Text="to" Margin="5,0,5,0" />
-                                    <TextBlock Text="{Binding Task.EndPoint}"/>
-                                </StackPanel>
+                        
+                        <StackPanel Grid.Column="1"
+                                    Margin="0,5,0,5"
+                                    HorizontalAlignment="Stretch">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock FontWeight="Bold" Text="Title: " />
+                                <TextBlock Text="{Binding Task.Title}" />
 
-                                
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="Source: " FontWeight="Bold" />
-                                    <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"/>
-                                </StackPanel>
+                                <TextBlock Margin="10,0,0,0"
+                                           FontWeight="Bold"
+                                           Text="{Binding Task.PointToPointMode}" />
+                                <TextBlock Text=": " />
+                                <TextBlock Text="{Binding Task.StartPoint}" />
+                                <TextBlock Margin="5,0,5,0" Text="to" />
+                                <TextBlock Text="{Binding Task.EndPoint}" />
+                            </StackPanel>
 
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="Destination: " FontWeight="Bold" />
-                                    <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}"/>
-                                </StackPanel>
+                            
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock FontWeight="Bold" Text="Source: " />
+                                <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}" />
                             </StackPanel>
-         
-                        
-                        <Image Source="Images/delete.png" Width="16" Height="16" Grid.Column="2" Margin="10,0,10,0">
-                            <i:Interaction.Triggers>
-                                <i:EventTrigger EventName="MouseDown">
-                                    <cal:ActionMessage MethodName="RemoveJob">
-                                        <cal:Parameter Value="{Binding}" />
-                                    </cal:ActionMessage>
-                                </i:EventTrigger>
-                            </i:Interaction.Triggers>
-                        </Image>
-                    </Grid>
 
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock FontWeight="Bold" Text="Destination: " />
+                                <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" />
+                            </StackPanel>
+                        </StackPanel>
+
+                        
+                        <Grid Grid.Column="2"
+                              Margin="10,0,10,0"
+                              VerticalAlignment="Center">
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <Image Width="20"  Grid.Row="0" Grid.Column="0"
+                                       Height="20" VerticalAlignment="Center" Margin="0,5,0,0"
+                                       Source="Images/Refresh.ico"
+                                       ToolTip="Reset job status to Waiting."
+                                       Visibility="{Binding Status,
+                                                            Converter={StaticResource queueStatusVisConverter}}">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="MouseDown">
+                                        <cal:ActionMessage MethodName="RetryJob">
+                                            <cal:Parameter Value="{Binding}" />
+                                        </cal:ActionMessage>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                            </Image>
+
+                            <Image Width="20" Grid.Row="0" Grid.Column="1"
+                                       Height="20"
+                                       Margin="10,5,0,0"
+                                       Source="Images/Options24.png"
+                                       ToolTip="Edit this Job">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="MouseDown">
+                                        <cal:ActionMessage MethodName="EditJob">
+                                            <cal:Parameter Value="{Binding}" />
+                                        </cal:ActionMessage>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                            </Image>
 
+                            <Image Width="20"  Grid.Row="0" Grid.Column="2"
+                                       Height="20"
+                                       Margin="10,5,0,0"
+                                       Source="Images/delete.png"
+                                       ToolTip="Remove this Job">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="MouseDown">
+                                        <cal:ActionMessage MethodName="RemoveJob">
+                                            <cal:Parameter Value="{Binding}" />
+                                        </cal:ActionMessage>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                            </Image>
+
+
+                        </Grid>
+
+                    </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ShellView.xaml Added

@@ -0,0 +1,26 @@
+<Window x:Class="HandBrakeWPF.Views.ShellView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
+        xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" Title="{Data:Binding Path=WindowTitle}"
+        Width="1015"
+        Height="680"
+        MinWidth="1015"
+        MinHeight="670"
+        AllowDrop="True"
+        Background="#FFF0F0F0"
+        FontSize="11"
+        SnapsToDevicePixels="True"
+        UseLayoutRounding="True"
+        WindowStartupLocation="CenterScreen"
+        TextOptions.TextFormattingMode="Display"
+        >
+    <Window.Resources>
+        <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+    </Window.Resources>
+    
+    <Grid>
+        <ContentControl x:Name="MainViewModel"  Visibility="{Binding ShowMainWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+        <ContentControl x:Name="OptionsViewModel"  Visibility="{Binding ShowOptions, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+    </Grid>
+</Window>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs Added

@@ -0,0 +1,155 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ShellView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for ShellView.xaml
+// </summary> 
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+    using System;
+    using System.IO;
+    using System.Windows;
+    using System.Windows.Forms;
+    using System.Windows.Input;
+    using System.Windows.Resources;
+
+    using Caliburn.Micro;
+
+    using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.ApplicationServices.Utilities;
+
+    using HandBrakeWPF.Commands;
+    using HandBrakeWPF.ViewModels.Interfaces;
+
+    using Application = System.Windows.Application;
+
+    /// <summary>
+    /// Interaction logic for ShellView.xaml
+    /// </summary>
+    public partial class ShellView
+    {
+        /// <summary>
+        /// The my notify icon.
+        /// </summary>
+        private readonly System.Windows.Forms.NotifyIcon notifyIcon;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShellView"/> class.
+        /// </summary>
+        public ShellView()
+        {
+            this.InitializeComponent();
+
+            IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
+            bool minimiseToTray = userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);
+
+            if (minimiseToTray)
+            {
+                this.notifyIcon = new System.Windows.Forms.NotifyIcon();
+                this.notifyIcon.ContextMenu = new ContextMenu(new[] { new MenuItem("Restore", NotifyIconClick) });
+
+                StreamResourceInfo streamResourceInfo = Application.GetResourceStream(new Uri("pack://application:,,,/handbrakepineapple.ico"));
+                if (streamResourceInfo != null)
+                {
+                    Stream iconStream = streamResourceInfo.Stream;
+                    this.notifyIcon.Icon = new System.Drawing.Icon(iconStream);
+                }
+                this.notifyIcon.DoubleClick += this.NotifyIconClick;
+                this.StateChanged += this.ShellViewStateChanged;
+            }
+
+            // Start Encode (Ctrl+S)
+            // Stop Encode (Ctrl+K)
+            // Open Log Window (Ctrl+L)
+            // Open Queue Window (Ctrl+Q)
+            // Add to Queue (Ctrl+A)
+            // Scan a File (Ctrl+F)
+            // Scan a Folder (Ctrl+R)
+
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.S, ModifierKeys.Control)), new KeyGesture(Key.S, ModifierKeys.Control)));
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.K, ModifierKeys.Control)), new KeyGesture(Key.K, ModifierKeys.Control)));
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.L, ModifierKeys.Control)), new KeyGesture(Key.L, ModifierKeys.Control)));
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.Q, ModifierKeys.Control)), new KeyGesture(Key.Q, ModifierKeys.Control)));
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.A, ModifierKeys.Control)), new KeyGesture(Key.A, ModifierKeys.Control)));
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.F, ModifierKeys.Control)), new KeyGesture(Key.F, ModifierKeys.Control)));
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.R, ModifierKeys.Control)), new KeyGesture(Key.R, ModifierKeys.Control)));
+
+            // Enable Windows 7 Taskbar progress indication.
+            if (this.TaskbarItemInfo == null)
+            {
+                this.TaskbarItemInfo = Win7.WindowsTaskbar;
+            }
+        }
+
+        /// <summary>
+        /// The notify icon_ click.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NotifyIconClick(object sender, EventArgs e)
+        {
+            this.WindowState = WindowState.Normal;
+        }
+
+        /// <summary>
+        /// The shell view state changed.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void ShellViewStateChanged(object sender, EventArgs e)
+        {
+            if (this.notifyIcon != null)
+            {
+                if (this.WindowState == WindowState.Minimized)
+                {
+                    this.ShowInTaskbar = false;
+                    notifyIcon.Visible = true;
+                    // notifyIcon.ShowBalloonTip(5000, "HandBrake", "Application Minimised", ToolTipIcon.Info);          
+                }
+                else if (this.WindowState == WindowState.Normal)
+                {
+                    notifyIcon.Visible = false;
+                    this.ShowInTaskbar = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check with the user before closing.
+        /// </summary>
+        /// <param name="e">
+        /// The CancelEventArgs.
+        /// </param>
+        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+        {
+            IShellViewModel shellViewModel = this.DataContext as IShellViewModel;
+
+            if (shellViewModel != null)
+            {
+                bool canClose = shellViewModel.CanClose();
+                if (!canClose)
+                {
+                    e.Cancel = true;
+                }
+            }
+
+            if (this.notifyIcon != null)
+            {
+                this.notifyIcon.Visible = false;
+            }
+
+            base.OnClosing(e);
+        }
+    }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Styles Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml Added

@@ -0,0 +1,37 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="{x:Type StatusBar}" TargetType="{x:Type StatusBar}">
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type StatusBar}">
+                    <Border Background="#FAFAFA" Padding="1">
+                        <ItemsPresenter Margin="0" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type ComboBox}">
+        <Setter Property="MinHeight" Value="22"/>
+        <Setter Property="Margin" Value="0,2,0,2" />
+    </Style>
+
+    <Style TargetType="{x:Type TextBlock}">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style TargetType="{x:Type Button}">
+        <Setter Property="MinHeight" Value="22"/>
+    </Style>
+
+    <Style TargetType="{x:Type RadioButton}">
+        <Setter Property="Margin" Value="0,0,0,8" />
+    </Style>
+
+    <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
+
+</ResourceDictionary>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml Changed

@@ -1,11 +1,21 @@
 <UserControl x:Class="HandBrakeWPF.Views.SubtitlesView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
+             xmlns:cal="http://www.caliburnproject.org"
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
-             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d">
+             xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+             d:DesignHeight="153"
+             d:DesignWidth="319"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
+    </UserControl.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -13,7 +23,10 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="Subtitles" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+        <TextBlock Grid.Row="0"
+                   Margin="10,5,0,0"
+                   FontWeight="Bold"
+                   Text="Subtitles" />
 
         <Grid Grid.Row="1" Margin="10,5,10,0">
             <Grid.ColumnDefinitions>
@@ -21,22 +34,47 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <Button Content="Add" Name="AddTrack" Grid.Column="0" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Add]" />
-            <Button Content="Import SRT" Grid.Column="2" Width="75" cal:Message.Attach="[Event Click] = [Action Import]" />
+            <Button Name="AddTrack"
+                    Grid.Column="0"
+                    Width="75"
+                    Margin="0,0,10,0"
+                    cal:Message.Attach="[Event Click] = [Action Add]"
+                    Content="Add" />
+            <Button Grid.Column="2"
+                    MaxWidth="100"
+                    cal:Message.Attach="[Event Click] = [Action Import]"
+                    Content="Import SRT" />
         </Grid>
 
-        <ListBox Grid.Row="2" ItemsSource="{Binding SubtitleTracks}" 
-                 SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"
-                 dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
-                 dd:DragDrop.DropHandler="{Binding}">
+        <ListBox Grid.Row="2"
+                 Margin="10,10,10,10"
+                 Background="LightGray"
+                 dd:DragDrop.DropHandler="{Binding}"
+                 dd:DragDrop.IsDragSource="True"
+                 dd:DragDrop.IsDropTarget="True"
+                 ItemsSource="{Binding Task.SubtitleTracks}"
+                 SelectionMode="Extended">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Background" Value="WhiteSmoke" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                 </Style>
             </ListBox.ItemContainerStyle>
 
+            <ListBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="Add New Track" cal:Message.Attach="[Event Click] = [Action Add]" />
+                    <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />
+                    <MenuItem Header="Add All Remaining Closed Captions" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />
+                    <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />    
+                    <Separator />
+                    <MenuItem Header="Clear All" cal:Message.Attach="[Event Click] = [Action Clear]" />
+                    <Separator />
+                    <MenuItem Header="Configure Default Behaviours" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />
+                </ContextMenu>
+            </ListBox.ContextMenu>
+
             <ListBox.ItemTemplate>
                 <DataTemplate>
 
@@ -47,14 +85,18 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        
-                        <Image Source="Images/Movies.png" Width="16" Height="16" Grid.Column="0" Margin="10,0,10,0" />
+                        
+                        <Image Grid.Column="0"
+                               Width="16"
+                               Height="16"
+                               Margin="10,0,10,0"
+                               Source="Images/Movies.png" />
 
-                        
+                        
                         <Grid Grid.Column="1" HorizontalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" MaxWidth="300" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
@@ -71,30 +113,136 @@
                                 <RowDefinition Height="28" />
                             </Grid.RowDefinitions>
 
-                            
-
-                            <TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
-                            <ComboBox Width="100" ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
-                                      SelectedItem="{Binding SourceTrack}" Grid.Column="1" Margin="5,0,5,0" Height="22" />
-                            <TextBlock Text="Forced Only" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
-                            <CheckBox Grid.Column="3" IsChecked="{Binding Forced}" VerticalAlignment="Center" Margin="5,0,5,0"/>
-                            <TextBlock Text="Burn In" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center" />
-                            <CheckBox Grid.Column="5" IsChecked="{Binding Burned}" VerticalAlignment="Center" Margin="5,0,5,0"/>
-                            <TextBlock Text="Default" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center" />
-                            <CheckBox Grid.Column="7" IsChecked="{Binding Default}" VerticalAlignment="Center" Margin="5,0,5,0"/>
-
-                            
-                            <TextBlock Text="Language" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>
-                            <ComboBox Width="100" Grid.Column="1" ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" SelectedItem="{Binding SrtLang}" Margin="5,0,5,0" Grid.Row="1" Height="22" />
-                            <TextBlock Text="Char Code" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"/>
-                            <ComboBox Width="100" Grid.Column="3" ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" SelectedItem="{Binding SrtCharCode}" Grid.Row="1" Margin="5,0,5,0" Height="22" />
-                            <TextBlock Text="Offset (ms)" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"/>
-                            <NumericUpDown:NumericUpDown Width="45" Value="{Binding SrtOffset}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left"  Margin="5,0,5,0" />
+                            
+
+                            <TextBlock Grid.Column="0"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Source" />
+                            <ComboBox Grid.Column="1"
+                                      Height="22"
+                                      MaxWidth="300"
+                                      Margin="5,0,5,0"
+                                      HorizontalAlignment="Stretch"
+                                      ItemsSource="{Binding DataContext.SourceTracks,
+                                                            RelativeSource={RelativeSource FindAncestor,
+                                                                                           AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding SourceTrack}"
+                                      Visibility="{Binding IsSrtSubtitle,
+                                                           Converter={StaticResource booleanToVisConverter},
+                                                           ConverterParameter=true}" />
+                            <TextBlock Grid.Column="1"
+                                       VerticalAlignment="Center"
+                                       Text="{Binding SrtFileName}"
+                                       Visibility="{Binding IsSrtSubtitle,
+                                                            Converter={StaticResource booleanToVisConverter},
+                                                            ConverterParameter=false}" />
 
+                            <TextBlock Grid.Column="2"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Forced Only"
+                                       Visibility="{Binding IsSrtSubtitle,
+                                                            Converter={StaticResource booleanToVisConverter},
+                                                            ConverterParameter=true}" />
+                            <CheckBox Grid.Column="3"
+                                      Margin="5,0,5,0"
+                                      VerticalAlignment="Center"
+                                      IsEnabled="{Binding CanBeForced}"
+                                      IsChecked="{Binding Forced}"
+                                      Visibility="{Binding IsSrtSubtitle,
+                                                           Converter={StaticResource booleanToVisConverter},
+                                                           ConverterParameter=true}" />
+                            <TextBlock Grid.Column="4"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Burn In"
+                                       Visibility="{Binding IsSrtSubtitle,
+                                                            Converter={StaticResource booleanToVisConverter},
+                                                            ConverterParameter=true}" />
+                            <CheckBox Grid.Column="5"
+                                      Margin="5,0,5,0"
+                                      VerticalAlignment="Center"
+                                      IsChecked="{Binding Burned}"
+                                      IsEnabled="{Binding CanBeBurned}"
+                                      Visibility="{Binding IsSrtSubtitle,
+                                                           Converter={StaticResource booleanToVisConverter},
+                                                           ConverterParameter=true}">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="Click">
+                                        <cal:ActionMessage MethodName="SelectBurnedInTrack">
+                                            <cal:Parameter Value="{Binding}" />
+                                        </cal:ActionMessage>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                            </CheckBox>
+                            <TextBlock Grid.Column="6"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Default" />
+                            <CheckBox Grid.Column="7"
+                                      Margin="5,0,5,0"
+                                      VerticalAlignment="Center"
+                                      IsChecked="{Binding Default}">
+                                <i:Interaction.Triggers>
+                                    <i:EventTrigger EventName="Click">
+                                        <cal:ActionMessage MethodName="SelectDefaultTrack">
+                                            <cal:Parameter Value="{Binding}" />
+                                        </cal:ActionMessage>
+                                    </i:EventTrigger>
+                                </i:Interaction.Triggers>
+                            </CheckBox>
+
+                            
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="0"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Language" />
+                            <ComboBox Grid.Row="1"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      MaxWidth="300"
+                                      Margin="5,0,5,0"
+                                      HorizontalAlignment="Stretch"
+                                      IsEnabled="{Binding IsSrtSubtitle}"
+                                      ItemsSource="{Binding DataContext.Langauges,
+                                                            RelativeSource={RelativeSource FindAncestor,
+                                                                                           AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding SrtLang}" />
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="2"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Char Code" />
+                            <ComboBox Grid.Row="1"
+                                      Grid.Column="3"
+                                      Width="100"
+                                      Height="22"
+                                      Margin="5,0,5,0"
+                                      IsEnabled="{Binding IsSrtSubtitle}"
+                                      ItemsSource="{Binding DataContext.CharacterCodes,
+                                                            RelativeSource={RelativeSource FindAncestor,
+                                                                                           AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding SrtCharCode}" />
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="4"
+                                       VerticalAlignment="Center"
+                                       FontWeight="Bold"
+                                       Text="Offset (ms)" />
+
+                            <controls:NumberBox Grid.Row="1" Grid.Column="5" Width="65" Height="24" Margin="5,0,5,0"
+                                            Minimum="-900000" Maximum="900000" IsEnabled="{Binding IsSrtSubtitle}"
+                                            Number="{Binding SrtOffset, Mode=TwoWay}" />
+                            
                         </Grid>
 
-                        
-                        <Image Source="Images/delete.png" Width="16" Height="16" Grid.Column="2" Margin="10,0,10,0">
+                        
+                        <Image Grid.Column="2"
+                               Width="16"
+                               Height="16"
+                               Margin="10,0,10,0"
+                               Source="Images/delete.png">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="MouseDown">
                                     <cal:ActionMessage MethodName="Remove">
@@ -111,6 +259,6 @@
             </ListBox.ItemTemplate>
         </ListBox>
 
-       
+
     </Grid>
 </UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml Added

@@ -0,0 +1,67 @@
+<Window x:Class="HandBrakeWPF.Views.TitleSpecificView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
+        xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+        Title="Scan Title"
+        Width="250"
+        Background="#FFF1F0EF"
+        ResizeMode="NoResize"
+        SizeToContent="Height"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        
+        <StackPanel Grid.Row="0"
+                    Height="30"
+                    Margin="0,0,0,10"
+                    Background="White"
+                    Orientation="Horizontal">
+            <Image Width="24"
+                   Height="24"
+                   Margin="10,0,5,0"
+                   VerticalAlignment="Center"
+                   Source="Images/Movies.png" />
+            <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+                <TextBlock FontWeight="Bold" Text="Title Specific Scan" />
+            </StackPanel>
+        </StackPanel>
+
+        <StackPanel Grid.Row="1"
+                    Margin="10,10,0,10"
+                    Orientation="Horizontal">
+            <TextBlock Text="Choose a title to scan:" />
+
+            <controls:NumberBox Width="60" Height="24" Margin="10,0,0,0"
+                                Minimum="0" Maximum="1000" Number="{Binding SelectedTitle, Mode=TwoWay}" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="2"
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+            <Button Name="Cancel"
+                    Margin="0,0,10,0"
+                    cal:Message.Attach="[Event Click] = [Action Cancel]"
+                    Content="Cancel"
+                    IsCancel="True"
+                    Padding="8,1" />
+            <Button Name="OpenTitle"
+                    Margin="0,0,10,0"
+                    cal:Message.Attach="[Event Click] = [Action Open]"
+                    Content="Open Title"
+                    IsDefault="True"
+                    Padding="8,1" />
+        </StackPanel>
+
+    </Grid>
+</Window>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="TitleSpecificView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for TitleSpecificView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+    using System.Windows;
+
+    /// <summary>
+    /// Interaction logic for TitleSpecific.xaml
+    /// </summary>
+    public partial class TitleSpecificView : Window
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TitleSpecificView"/> class.
+        /// </summary>
+        public TitleSpecificView()
+        {
+            this.InitializeComponent();
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml Changed

@@ -3,12 +3,30 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d" >
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:Video="clr-namespace:HandBrakeWPF.Converters.Video"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" mc:Ignorable="d" >
 
     <UserControl.Resources>
         <Converters:BooleanConverter x:Key="boolConverter" />
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
         <Converters:EnumComboConverter x:Key="enumComboConverter" />
+        <Converters:InverseBooleanConverter x:Key="inverseConverter" />
+        <Video:VideoEncoderConverter x:Key="videoEncoderConverter" />
+        
+        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+        </Style>
+
+        <Style TargetType="ToolTip">
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <TextBlock TextWrapping="Wrap" Width="450" Text="{Binding}" />
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </UserControl.Resources>
    
     <Grid Margin="10,5,0,0">
@@ -23,6 +41,11 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
+            
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
             <StackPanel Orientation="Vertical" Grid.Column="0" >
 
@@ -30,17 +53,32 @@
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
                     <TextBlock Text="Video Codec:" Width="100" />
-                    <ComboBox Width="120" ItemsSource="{Binding VideoEncoders, Converter={StaticResource enumComboConverter}, Mode=TwoWay}" 
-                              SelectedItem="{Binding SelectedVideoEncoder, Converter={StaticResource enumComboConverter}, Mode=TwoWay}" />
+
+                    <ComboBox Width="120">
+                        <ComboBox.SelectedItem>
+                            <MultiBinding Converter="{StaticResource videoEncoderConverter}">
+                                <Binding Path="SelectedVideoEncoder" />
+                            </MultiBinding>
+                        </ComboBox.SelectedItem>
+                        <ComboBox.ItemsSource>
+                            <MultiBinding Converter="{StaticResource videoEncoderConverter}">
+                                <Binding Path="VideoEncoders"/>
+                                <Binding Path="Task" />
+                            </MultiBinding>
+                        </ComboBox.ItemsSource>
+                    </ComboBox>
+                    
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="Franerate (FPS):" Width="100"/>
+                    <TextBlock Text="Framerate (FPS):" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>
                     <StackPanel Orientation="Vertical">
                         <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />
-                        <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" />
-                        <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
-                        <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+                        <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />
+                        <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 
+                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+                        <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"
+                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
                     </StackPanel>
                 </StackPanel>
             </StackPanel>
@@ -52,15 +90,21 @@
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
                     <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0"/>
                     <TextBlock Text="{Binding DisplayRF}" Width="25" />
-                    <TextBlock Text="RF" FontWeight="Bold" />
+                    <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" />
+
+                    <TextBlock Text="{x:Static Properties:Resources.Video_LosslessWarning}" Visibility="{Binding IsLossless, Converter={StaticResource boolToVisConverter}}" 
+                           Margin="10,0,0,0" ToolTip="{x:Static Properties:Resources.Video_LosslessWarningTooltip}" FontWeight="Bold" />
                 </StackPanel>
 
-                <Slider Width="240" Value="{Binding RF}"  Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"
-                        IsEnabled="{Binding IsConstantQuantity}" Margin="0,0,0,20" />
+                <Slider Width="280" Value="{Binding RF}" HorizontalAlignment="Left"  Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"
+                        IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,20"
+                        ToolTip="{x:Static Properties:Resources.Video_QualitySlider}" Style="{StaticResource LongToolTipHolder}" 
+                        IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" />
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
                     <RadioButton Content="Avg Bitrate (kbps):" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
-                    <TextBox Width="75" Text="{Binding Task.VideoBitrate}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
+                    <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" 
+                             IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="30,0,0,0">
@@ -72,7 +116,84 @@
 
             </StackPanel>
 
+            
+            <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,20,0,0" Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <TextBlock Text="Optimise Video:" Margin="0,0,0,8" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />
+
+                <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" 
+                          Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+                <Grid Grid.Row="2" Margin="0,5,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}"
+                      Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+
+
+                    
+                    <TextBlock Text="x264 Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
+                    <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal">
+                        <Slider Minimum="0" Maximum="9" Width="150" Value="{Binding X264PresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 
+                            IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:Resources.Video_x264Preset}" 
+                            Style="{StaticResource LongToolTipHolder}" />
+                        <TextBlock Text="{Binding X264Preset, Converter={StaticResource enumComboConverter}}" Margin="5,0,0,0" />
+                    </StackPanel>
 
+                    <TextBlock Text="x264 Tune:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0"  />
+                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,10,5,0" Height="22"
+                          ItemsSource="{Binding X264Tunes, Converter={StaticResource enumComboConverter}}" 
+                          SelectedItem="{Binding X264Tune, Converter={StaticResource enumComboConverter}}"
+                          ToolTip="{x:Static Properties:Resources.Video_x264Tune}"
+                          Style="{StaticResource LongToolTipHolder}" />
+                    <CheckBox IsChecked="{Binding FastDecode}" Content="Fast Decode" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"
+                          ToolTip="{x:Static Properties:Resources.Video_x264FastDecode}"/>
+
+
+                    
+                    <TextBlock Text="H.264 Profile:" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" />
+                    <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,10,5,0" Height="22" VerticalAlignment="Center"
+                          ItemsSource="{Binding H264Profiles, Converter={StaticResource enumComboConverter}}" 
+                          SelectedItem="{Binding H264Profile, Converter={StaticResource enumComboConverter}}"
+                          Style="{StaticResource LongToolTipHolder}"
+                          ToolTip="{x:Static Properties:Resources.Video_x264Profile}" />
+
+                    <TextBlock Text="H.264 Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" />
+                    <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center"
+                          ItemsSource="{Binding H264Levels}" 
+                          SelectedItem="{Binding H264Level}"
+                          Style="{StaticResource LongToolTipHolder}"
+                          ToolTip="{x:Static Properties:Resources.Video_x264Level}"/>
+
+                    
+                    <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                    <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"
+                         ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" />
+
+
+                </Grid>
+            </Grid>
+            
+         
         </Grid>
 
     </Grid>

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs Changed

@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for VideoView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrakeWPF.Views
 {
+    using System.Windows.Controls;
+
     /// <summary>
     /// Interaction logic for VideoView.xaml
     /// </summary>
     public partial class VideoView : UserControl
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VideoView"/> class.
+        /// </summary>
         public VideoView()
         {
             InitializeComponent();

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/X264View.xaml Added

@@ -0,0 +1,539 @@
+<UserControl x:Class="HandBrakeWPF.Views.X264View"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+             xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+             x:Name="x264View"
+             mc:Ignorable="d"
+             >
+    <UserControl.Resources>
+        <Converters:AdvancedVisibilityConverter x:Key="VisibilityConverter" />
+        <Converters:BooleanToVisibilityConverter x:Key="BooleanVisibilityConverter" />
+        <Style x:Key="AdvancedLabel" TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+
+        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+            <Setter Property="Margin" Value="0,2,0,2" />
+        </Style>
+
+        <Style x:Key="LongToolTip" TargetType="TextBlock">
+            <Setter Property="Width" Value="400" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+
+      </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        
+
+        <TextBlock Text="{x:Static Properties:Resources.Advanced_NotInUse}" Grid.Row="0"
+                       TextWrapping="Wrap" Width="480" Margin="0, 100, 0, 0" FontSize="12"
+                       Visibility="{Binding ShowX264AdvancedOptions, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}" />
+
+        <Grid Grid.Row="1" Visibility="{Binding ShowX264AdvancedOptions, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            
+            <StackPanel Grid.Row="0"
+                            Grid.Column="0"
+                            Orientation="Vertical"
+                            >
+                
+                <StackPanel Orientation="Vertical">
+                    <TextBlock Grid.Row="0"
+                                   Margin="10,5,0,0"
+                                   FontWeight="Bold"
+                                   Text="Encoding: "
+                                   />
+                    <Grid Margin="0,5,0,0"
+                              HorizontalAlignment="Left"
+                              VerticalAlignment="Top"
+                              >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" MinWidth="100" />
+                        </Grid.ColumnDefinitions>
+
+                        <Label Grid.Row="0"
+                                   Grid.Column="0"
+                                   Content="Reference Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                        <ComboBox Grid.Row="0"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      DisplayMemberPath="Label"
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.ReferenceFrames}"
+                                      SelectedItem="{Binding ReferenceFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_ReferenceFramesToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+
+                        <Label Grid.Row="1"
+                                   Grid.Column="0"
+                                   Content="Maximum B-Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                        <ComboBox Grid.Row="1"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      DisplayMemberPath="Label"
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.BFrames}"
+                                      SelectedItem="{Binding BFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_BFramesToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+
+
+                        <Label Grid.Row="4"
+                                   Grid.Column="0"
+                                   Height="28"
+                                   Content="CABAC:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                        <CheckBox Grid.Row="4"
+                                      Grid.Column="1"
+                                      Height="16"
+                                      IsChecked="{Binding CabacEntropyCoding}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                            <CheckBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_CabacToolTip}" />
+                            </CheckBox.ToolTip>
+                        </CheckBox>
+
+                        <Label Grid.Row="5"
+                                   Grid.Column="0"
+                                   Height="28"
+                                   Content="8x8 Transform:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                        <CheckBox Grid.Row="5"
+                                      Grid.Column="1"
+                                      Height="16"
+                                      IsChecked="{Binding EightByEightDct}"
+                                      Style="{StaticResource LongToolTipHolder}">
+                            <CheckBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_EightByEightDctToolTip}" />
+                            </CheckBox.ToolTip>
+                        </CheckBox>
+
+                        <Label Grid.Row="6"
+                                   Grid.Column="0"
+                                   Content="Weighted P-Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                        <CheckBox Grid.Row="6"
+                                      Grid.Column="1"
+                                      VerticalAlignment="Center"
+                                      IsChecked="{Binding WeightedPFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                            <CheckBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_WeightPToolTip}" />
+                            </CheckBox.ToolTip>
+                        </CheckBox>
+
+                        <Label Grid.Row="7"
+                                   Grid.Column="0"
+                                   Content="Pyramidal B-Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   Visibility="{Binding PyramidalBFramesVisible,
+                                                        Converter={StaticResource VisibilityConverter}}"
+                                   />
+                        <ComboBox Grid.Row="7"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      MaxWidth="100"
+                                      DisplayMemberPath="Label"
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}"
+                                      SelectedItem="{Binding PyramidalBFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      Visibility="{Binding PyramidalBFramesVisible,
+                                                           Converter={StaticResource VisibilityConverter}}"
+                                      >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PyramidalBFramesToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
+
+            
+            <Grid Grid.Row="0" Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                
+                <TextBlock Text="Analysis: " Grid.Row="0" Margin="10,5,0,0" FontWeight="Bold"  />
+                <Grid Grid.Row="1"  HorizontalAlignment="Left" VerticalAlignment="Top">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" MinWidth="100" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Adaptive B-Frames:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding BFramesOptionsVisible,
+                                                    Converter={StaticResource VisibilityConverter}}" Height="26" VerticalAlignment="Top" />
+                    <ComboBox Grid.Row="0"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.AdaptiveBFrames}"
+                                  SelectedItem="{Binding AdaptiveBFrames}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  Visibility="{Binding BFramesOptionsVisible,
+                                                       Converter={StaticResource VisibilityConverter}}"
+                                  >
+                        <ComboBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveBFramesToolTip}" />
+                        </ComboBox.ToolTip>
+                    </ComboBox>
+
+                    <Label Grid.Row="1"
+                               Grid.Column="0"
+                               Content="Adaptive Direct Mode:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding BFramesOptionsVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                    <ComboBox Grid.Row="1"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DirectPrediction}"
+                                  SelectedItem="{Binding DirectPrediction}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  Visibility="{Binding BFramesOptionsVisible,
+                                                       Converter={StaticResource VisibilityConverter}}"
+                                  >
+                        <ComboBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveDirectModeToolTip}" />
+                        </ComboBox.ToolTip>
+                    </ComboBox>
+
+                    <Label Grid.Row="2"
+                               Grid.Column="0"
+                               Content="Motion Est Method:"
+                               Style="{StaticResource AdvancedLabel}"
+                               />
+                    <ComboBox Grid.Row="2"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationMethod}"
+                                  SelectedItem="{Binding MotionEstimationMethod}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                        <ComboBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_MotionEstimationMethodToolTip}" />
+                        </ComboBox.ToolTip>
+                    </ComboBox>
+
+                    <Label Grid.Row="3"
+                               Grid.Column="0"
+                               Content="Subpixel Motion Est:"
+                               Style="{StaticResource AdvancedLabel}"
+                               />
+                    <ComboBox Grid.Row="3"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.SubpixelMotionEstimation}"
+                                  SelectedItem="{Binding SubpixelMotionEstimation}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                        <ComboBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_SubpixelMotionEstimationToolTip}" />
+                        </ComboBox.ToolTip>
+                    </ComboBox>
+
+                    <Label Grid.Row="4"
+                               Grid.Column="0"
+                               Content="Motion Est Range:"
+                               Style="{StaticResource AdvancedLabel}" />
+                    <controls:NumberBox Grid.Row="4"
+                                            Grid.Column="1"
+                                            Width="120"
+                                            Height="22"
+                                            MaxWidth="120"
+                                            Minimum="4" Maximum="64"   
+                                            Number="{Binding MotionEstimationRange, Mode=TwoWay}"
+                                            ToolTip="{x:Static Properties:Resources.Advanced_MotionEstimationRangeToolTip}" 
+                                            />
+
+
+                    
+                    <Label Grid.Row="0" Grid.Column="2"
+                               Height="28"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               Content="Partition Type:"
+                               />
+                    <ComboBox Grid.Row="0" Grid.Column="3"
+                                  Width="100"
+                                  Height="23"
+                                  MaxWidth="100"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Analysis}"
+                                  SelectedItem="{Binding Analysis}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                        <ComboBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AnalysisToolTip}" />
+                        </ComboBox.ToolTip>
+                    </ComboBox>
+
+                    <Label Grid.Row="1" Grid.Column="2" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Content="Trellis:" />
+                    <ComboBox Grid.Row="1"
+                                  Grid.Column="3"
+                                  Width="100"
+                                  Height="23"
+                                  MaxWidth="100"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Trellis}"
+                                  SelectedItem="{Binding Trellis}"
+                                  Style="{StaticResource LongToolTipHolder}">
+                        <ComboBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_TrellisToolTip}" />
+                        </ComboBox.ToolTip>
+                    </ComboBox>
+                </Grid>
+
+                
+                <TextBlock Text="Psychovisual: " Grid.Row="2" Margin="10,5,0,0" FontWeight="Bold"  />
+                <Grid Grid.Row="3"
+                          Height="90"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Top"
+                          >
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" MinWidth="100" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <Label Grid.Row="0" Grid.Column="0"
+                               Content="Adaptive Quant Strength:"
+                               Style="{StaticResource AdvancedLabel}"
+                               />
+                    <Slider Grid.Row="0" Grid.Column="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="0.2"
+                                Maximum="2.0"
+                                 Width="150"
+                                Minimum="0.0"
+                                SmallChange="0.1"
+                                Style="{StaticResource LongToolTipHolder}"
+                                TickFrequency="0.1"
+                                TickPlacement="BottomRight"
+                                Value="{Binding AdaptiveQuantizationStrength}"
+                                >
+                        <Slider.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveQuantizationStrengthToolTip}" />
+                        </Slider.ToolTip>
+                    </Slider>
+
+                    <Label Grid.Row="1" Grid.Column="0"
+                               Content="Rate Distortion:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding PsychovisualRateDistortionVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                    <Slider Grid.Row="1" Grid.Column="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="0.2"
+                                Maximum="2.0"
+                                Minimum="0.0"
+                                Width="150"
+                                SmallChange="0.1"
+                                Style="{StaticResource LongToolTipHolder}"
+                                TickFrequency="0.1"
+                                TickPlacement="BottomRight"
+                                Visibility="{Binding PsychovisualRateDistortionVisible,
+                                                     Converter={StaticResource VisibilityConverter}}"
+                                Value="{Binding PsychovisualRateDistortion}"
+                                >
+                        <Slider.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" />
+                        </Slider.ToolTip>
+                    </Slider>
+
+                    <Label Grid.Row="2" Grid.Column="0"
+                               Content="Psychovisual Trellis:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding PsychovisualTrellisVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                    <Slider Grid.Row="2" Grid.Column="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="0.2"
+                                Maximum="1.0"
+                                Minimum="0.0"
+                                Width="150"
+                                SmallChange="0.05"
+                                Style="{StaticResource LongToolTipHolder}"
+                                TickFrequency="0.05"
+                                TickPlacement="BottomRight"
+                                Visibility="{Binding PsychovisualTrellisVisible,
+                                                     Converter={StaticResource VisibilityConverter}}"
+                                Value="{Binding PsychovisualTrellis}"
+                                >
+                        <Slider.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PsychovisualTrellisToolTip}" />
+                        </Slider.ToolTip>
+                    </Slider>
+
+                    <Label Grid.Row="0" Grid.Column="2"  Width="110"
+                                   HorizontalAlignment="Left"
+                                   VerticalAlignment="Center"
+                                   HorizontalContentAlignment="Right"
+                                   Content="No DCT-Decimate:"
+                                   />
+                    <CheckBox Grid.Row="0" Grid.Column="3"  HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      IsChecked="{Binding NoDctDecimate}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                        <CheckBox.ToolTip>
+                            <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_NoDctDecimateToolTip}" />
+                        </CheckBox.ToolTip>
+                    </CheckBox>
+
+                    <Label Grid.Row="1"
+                               Grid.Column="2"
+                               Height="28"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               Content="Deblocking:"
+                               />
+                    <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="3" Grid.RowSpan="2">
+                        <ComboBox
+                                  Width="85"
+                                  Height="23"
+                                  MaxWidth="85"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingStrength}"
+                                  SelectedItem="{Binding DeblockingStrength}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+                        <ComboBox 
+                                  Width="85"
+                                  Height="23"
+                                  MaxWidth="85"
+                                  Margin="0,5,0,0"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingThreshold}"
+                                  SelectedItem="{Binding DeblockingThreshold}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+                    </StackPanel>
+
+                </Grid>
+
+            </Grid>
+
+        </Grid>
+        
+        <TextBlock Grid.Row="2" Margin="10,5,10,0"
+                   VerticalAlignment="Center"
+                   FontWeight="Bold"
+                   Text="x264 Encoder Options:"
+                   Visibility="{Binding ShowX264AdvancedOptions, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}" />
+        
+        <TextBox Grid.Row="3"
+                 Margin="10,2,10, 2"
+                 MinHeight="50"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch"
+                 Style="{StaticResource LongToolTipHolder}"
+                 ToolTip="{x:Static Properties:Resources.Advanced_EncoderOptions}"
+                 Text="{Binding AdvancedOptionsString, UpdateSourceTrigger=PropertyChanged}"
+                 TextWrapping="Wrap"
+                 Visibility="{Binding ShowX264AdvancedOptions, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}"
+                 />
+    </Grid>
+</UserControl>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/X264View.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Interaction logic for AdvancedView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// Interaction logic for AdvancedView.xaml
+    /// </summary>
+    public partial class X264View : UserControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdvancedView"/> class.
+        /// </summary>
+        public X264View()
+        {
+            InitializeComponent();
+        }
+    }
+}

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/defaultsettings.xml -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/defaultsettings.xml Changed

@@ -5,7 +5,7 @@
       <string>X264Step</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:double" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0.25</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:double" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">1.0</anyType>
     </value>
   </item>
   <item>
@@ -114,14 +114,6 @@
   </item>
   <item>
     <key>
-      <string>HandBrakeVersion</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">NotSet</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
       <string>updateStatus</string>
     </key>
     <value>
@@ -130,14 +122,6 @@
   </item>
   <item>
     <key>
-      <string>tooltipEnable</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
       <string>defaultPreset</string>
     </key>
     <value>
@@ -170,22 +154,6 @@
   </item>
   <item>
     <key>
-      <string>appcast_i686</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast.i386.xml</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
-      <string>appcast_x64</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast_unstable.x86_64.xml</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
       <string>autoNameFormat</string>
     </key>
     <value>
@@ -205,7 +173,7 @@
       <string>MainWindowMinimize</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
     </value>
   </item>
   <item>
@@ -226,14 +194,6 @@
   </item>
   <item>
     <key>
-      <string>trayIconAlerts</string>
-    </key>
-    <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
-    </value>
-  </item>
-  <item>
-    <key>
       <string>lastUpdateCheckDate</string>
     </key>
     <value>
@@ -245,7 +205,7 @@
       <string>daysBetweenUpdateCheck</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">7</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">30</anyType>
     </value>
   </item>
   <item>
@@ -269,7 +229,7 @@
       <string>NativeLanguage</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">(Any)</anyType>
     </value>
   </item>
   <item>
@@ -277,7 +237,7 @@
       <string>NativeLanguageSubtitles</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">(Any)</anyType>
     </value>
   </item>
   <item>
@@ -426,10 +386,66 @@
   </item>
   <item>
     <key>
-      <string>HandBrakePlatform</string>
+      <string>ClearCompletedFromQueue</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>ServerPort</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">MinGW i686</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">8000</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>EnableProcessIsolation</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>EnableDebugFeatures</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>EnableLibHb</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>ShowAdvancedTab</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>LastPreviewDuration</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">30</anyType>
+    </value>
+  </item>
+  <item>
+    <key>
+      <string>DisableLibHbFeatures</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
     </value>
   </item>
 </dictionary>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/handbrakepineapple.ico -> HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/handbrakepineapple.ico Changed

HandBrake-0.9.8.tar.bz2/win/CS/Properties/AssemblyInfo.cs.tmpl -> HandBrake-0.9.9.tar.bz2/win/CS/Properties/AssemblyInfo.cs.tmpl Changed

HandBrake-0.9.8.tar.bz2/win/CS/build.xml -> HandBrake-0.9.9.tar.bz2/win/CS/build.xml Changed

@@ -5,37 +5,40 @@
   It may be used under the terms of the GNU General Public License
   
   HandBrake Build Scipt for usage with Jenkins.
-  Usage: msbuild build.xml /p:Platform=x86
+  Usage: 
+    msbuild build.xml /p:Platform=x86 /t:Nightly
+    msbuild build.xml /p:Platform=x86 /t:Release
   Reuqires: HandBrakeCli.exe to be in the release folder.
--->
-<Project DefaultTargets="NightlyBuild" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
+-->
+<Project DefaultTargets="Nightly" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   
   <PropertyGroup>
     <Configuration>Release</Configuration>
   </PropertyGroup>
-  
+
   
   <ItemGroup>
     <ProjectsToBuild Include="HandBrake.Interop\HandBrakeInterop\*proj" Exclude="$(MSBuildProjectFile)"/>
-    <ProjectsToBuild Include="HandBrake.ApplicationServices\*proj" Exclude="$(MSBuildProjectFile)"/> 
-    <ProjectsToBuild Include="HandBrakeCS.*proj" Exclude="$(MSBuildProjectFile)"/>
+    <ProjectsToBuild Include="HandBrake.ApplicationServices\*proj" Exclude="$(MSBuildProjectFile)"/>
+    <ProjectsToBuild Include="HandBrakeWPF\HandBrakeWPF.*proj" Exclude="$(MSBuildProjectFile)"/>
   </ItemGroup>
 
   
   <PropertyGroup>
-    <NightlyDependsOn>BuildRelease;NightlyPostBuildEvent</NightlyDependsOn>
+    <NightlyDependsOn>NightlyPreBuild;BuildRelease;NightlyPostBuild</NightlyDependsOn>
   </PropertyGroup>
 
   <PropertyGroup>
-    <InstallDependsOn>BuildRelease;CreateReleasePostBuildEvent</InstallDependsOn>
+    <InstallDependsOn>PreBuild;BuildRelease;ReleasePostBuild</InstallDependsOn>
   </PropertyGroup>
-  
-  
-  <Target Name="NightlyBuild" DependsOnTargets="$(NightlyDependsOn)"/>
-  <Target Name="ReleaseInstaller" DependsOnTargets="$(InstallDependsOn)"/>
-  
-  
+
+  
+  <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
+  <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>
+
+  
   <Target Name="BuildRelease">
     <MSBuild Projects ="@(ProjectsToBuild)"
              ContinueOnError ="false"
@@ -44,27 +47,38 @@
     </MSBuild>
   </Target>
 
-  
-  <Target Name="NightlyPostBuildEvent">
-    <Exec Command="copy $(ProjectDir)Installer\MakeNightly.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)Installer\MakeNightly64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
-    
-    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
-    
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+  
+  <Target Name="NightlyPreBuild">
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />
+  </Target>
+  
+  <Target Name="PreBuild">
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+    <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />
   </Target>
 
-  <Target Name="CreateReleasePostBuildEvent">
-    <Exec Command="copy $(ProjectDir)Installer\Installer.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />
-    <Exec Command="copy $(ProjectDir)Installer\Installer64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
-
-    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
-    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
+  
+  <Target Name="NightlyPostBuild">
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+  </Target>
 
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
+  <Target Name="ReleasePostBuild">
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+    <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
   </Target>
 
 </Project>
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/doc/CREDITS -> HandBrake-0.9.9.tar.bz2/win/CS/doc/CREDITS Changed

HandBrake-0.9.8.tar.bz2/win/CS/doc/NEWS -> HandBrake-0.9.9.tar.bz2/win/CS/doc/NEWS Changed

@@ -1,648 +1,717 @@
 NEWS file for HandBrake <http://handbrake.fr/>
 
-Changes betwen 0.9.5 and 0.9.6:
 
-Encoders:
----------
+Changes betwen 0.9.8 and 0.9.9:
+
+    General
+     - Improved HandBrake pineapple icon by Matt Johnson
+     - Improved Retina-resolution icons within the application, by Nik Pawlak
+        + http://nikpawlak.com
+    Core
+     - Blu-ray (PGS) subtitle support
+        + works with Foreign Audio Search
+        + can be Burned-In
+        + can be passed through to MKV (but not MP4)
+     - Additional video framerates
+        + 30, 50, 59.94, 60 fps
+     - Double framerate ("bob") mode for the deinterlace and decomb filters
+     - Better audio remix support
+        + additional mixdowns: 6.1, 7.1, 7.1 (5F/2R/LFE)
+            CLI users should note 6ch becomes 5point1
+        + better-than-Stereo sources can be upmixed to 5.1
+        + discard one channel from Stereo sources
+            Mono (Left Only), Mono (Right Only)
+     - Allow the selection of higher audio bitrates where appropriate
+     - Allow the selection of lower audio samplerates where appropriate
+        + 8, 11.025, 12, 16 kHz
+     - Audio dithering (TPDF) when converting to 16-bit FLAC
+     - Use libavcodec for DTS audio decoding (instead of libdca)
+        + DTS-ES 6.1 Discrete support
+     - All graphical interfaces: support for x264's preset, tune and profile options
+        + alternative to the Advanced panel (which is still available)
+        + HandBrake-specific option to ensure compliance with a specific H.264 level
+     - Updated built-in presets
+        + take advantage of x264 preset/tune/profile support
+        + removed increasingly suboptimal and irrelevant Legacy presets
+     - Assorted bug fixes and improvements to the core library (libhb)
+     - Updated libraries
+        + x264 r2273-b3065e6
+        + Libav v9.6
+        + libbluray 0.2.3
+    Windows
+     - User Interface has been re-written in WPF
+        + Includes many small UI enhancements
+     - Switched to .NET 4 Client Profile
+        + smaller download for those who don't have .NET 4 Full installed
+    Mac
+     - Assorted bug fixes
+        + including better support for Retina displays
+     - Prevent sleep during encoding and scanning for Mountain Lion
+     - Drag & Drop files onto the Main window or application icon to scan
+     - Nicer progress indication on the dock icon
+     - Preview window improvements and bugfixes
+     - Updated Growl to 2.0.1
+        + Notification Center support (when Growl is not installed)
+    Linux
+     - Assorted bug fixes and improvements
+     - Use some system libraries rather than bundling
+        + fontconfig, freetype, libxml2, libass, libogg, libvorbis, libtheora and libsamplerate
+    Command Line Interface
+     - Audio option (-a) will ignore invalid input tracks and encode with only the valid ones
+     - Allow use of hh:mm:ss format when specifying p-to-p start/stop time
+     - Advanced audio options
+        + enable level normalization when downmixing (disabled by default)
+        + disable audio dithering or select a specific algorithm
+
+
+
+
+Changes betwen 0.9.7 and 0.9.8:
+
+    - Corrects a few crash bugs that showed up in 0.9.7
+
+
+
+Changes betwen 0.9.6 and 0.9.7:
+
+    - This is a bug fix release for 0.9.6.
+    - Includes an AppleTV3 Preset and updated iPad Preset
+
 
--> Video:
 
-   - updated libx264 (revision 2146)
-   - MPEG-2 encoder (from libavcodec)
-   - advanced options support for libavcodec encoders
-     format: option1=value1:option2=value2
-             -bf 2 -trellis 2 becomes bf=2:trellis=2
+Changes betwen 0.9.5 and 0.9.6:
 
--> Audio:
+    Encoders:
 
-   - audio gain control (increase/decrease audio volume)
+    -> Video:
 
-   - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
-   - new AAC encoder (from libavcodec) (considered experimental)
-     (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
-     (should be on par with faac in terms of quality, sometimes better)
-   - FLAC encoder (16-bit, MKV container only)
+       - updated libx264 (revision 2146)
+       - MPEG-2 encoder (from libavcodec)
+       - advanced options support for libavcodec encoders
+         format: option1=value1:option2=value2
+                 -bf 2 -trellis 2 becomes bf=2:trellis=2
 
-   - Mac OS X: HE-AAC encoding support, via Core Audio
+    -> Audio:
 
-   - quality-based variable bitrate encoding support
-     works with: Lame MP3, Vorbis, Core Audio AAC
-     only implemented in CLI and Linux GUI
+       - audio gain control (increase/decrease audio volume)
 
-   - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
+       - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
+       - new AAC encoder (from libavcodec) (considered experimental)
+         (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
+         (should be on par with faac in terms of quality, sometimes better)
+       - FLAC encoder (16-bit, MKV container only)
 
+       - Mac OS X: HE-AAC encoding support, via Core Audio
 
--> Audio Passthru:
+       - quality-based variable bitrate encoding support
+         works with: Lame MP3, Vorbis, Core Audio AAC
+         only implemented in CLI and Linux GUI
 
-   - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
-   - DTS-HD Passthru (MP4, MKV containers)
-   - MP3 Passthru (MP4, MKV containers)
-   - AAC Passthru (MP4, MKV containers)
-     (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
-      which will break playback in e.g. QuickTime Player)
-   - Auto Passthru: one encoder, multiple codecs
-     lets you define allowed codecs (from supported passthru codecs)
-     lets you pick a fallback encoder if passthru is not possible
+       - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
 
-Muxers:
--------
 
-   - start MKV clusters with a video keyframe whenever possible
-     should improve seeking and DLNA streaming
+    -> Audio Passthru:
 
-   - bug fix: use ISO 639-2 bibliographic form for MKV language codes
-   - bug fix: fix crash due to division by zero in MP4 muxer
-   - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
+       - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
+       - DTS-HD Passthru (MP4, MKV containers)
+       - MP3 Passthru (MP4, MKV containers)
+       - AAC Passthru (MP4, MKV containers)
+         (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
+          which will break playback in e.g. QuickTime Player)
+       - Auto Passthru: one encoder, multiple codecs
+         lets you define allowed codecs (from supported passthru codecs)
+         lets you pick a fallback encoder if passthru is not possible
 
-Decoders:
----------
+    Muxers:
+       - start MKV clusters with a video keyframe whenever possible
+         should improve seeking and DLNA streaming
 
--> Video:
+       - bug fix: use ISO 639-2 bibliographic form for MKV language codes
+       - bug fix: fix crash due to division by zero in MP4 muxer
+       - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
 
-   - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
-     frame-based multithreading for H.264, VP8
-     10-bit decoding support for H.264, DNxHD
-     Apple ProRes decoding support
-   - improved average framerate detection
-   - duplicate frame detection for improved frame drop decision (CFR/PFR)
-   - new Same as source, Constant Framerate option
-     for devices that don't support variable framerate
-     automatically picks a constant framerate closest to the detected average framerate
+    Decoders:
 
-   - bug fix: fix problem when resolution changes in the middle of a video stream
+    -> Video:
 
--> Audio:
+       - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
+         frame-based multithreading for H.264, VP8
+         10-bit decoding support for H.264, DNxHD
+         Apple ProRes decoding support
+       - improved average framerate detection
+       - duplicate frame detection for improved frame drop decision (CFR/PFR)
+       - new Same as source, Constant Framerate option
+         for devices that don't support variable framerate
+         automatically picks a constant framerate closest to the detected average framerate
 
-   - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
+       - bug fix: fix problem when resolution changes in the middle of a video stream
 
-   - bug fix: libavcodec-decoded streams can now be decoded multiple times
-              previously, multiple decodes of the same source tracks weren't possible
-              and audio output tracks had to be dropped
-   - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
-   - bug fix: fix DTS decoder audio volume (was too low)
-   - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
-   - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
+    -> Audio:
 
--> Subtitles:
+       - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
 
-   - updated libass (0.10.0)
-   - improved handling of subtitles with overlapping timestamps
-   - improved handling of DVD subtitles without Stop Display commands
-   - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
+       - bug fix: libavcodec-decoded streams can now be decoded multiple times
+                  previously, multiple decodes of the same source tracks weren't possible
+                  and audio output tracks had to be dropped
+       - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
+       - bug fix: fix DTS decoder audio volume (was too low)
+       - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
+       - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
 
-   - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
+    -> Subtitles:
 
-Demuxers:
----------
+       - updated libass (0.10.0)
+       - improved handling of subtitles with overlapping timestamps
+       - improved handling of DVD subtitles without Stop Display commands
+       - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
 
-   - improved MPEG Program/Transport stream support
-     support for MPEG-1 Program streams
-     support for HD-DVD EVOB streams
-     improved handling of Transport streams that have no PCR
-   - WTV container support (via libavformat)
+       - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
 
-   - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
-   - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
-   - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
+    Demuxers:
 
-Filters:
---------
+       - improved MPEG Program/Transport stream support
+         support for MPEG-1 Program streams
+         support for HD-DVD EVOB streams
+         improved handling of Transport streams that have no PCR
+       - WTV container support (via libavformat)
 
-   - new, much improved decomb filter (but slower)
-     new settings are default
-     old settings become decomb "Fast"
+       - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
+       - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
+       - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
 
-Presets:
---------
+    Filters:
 
-   - improved "Normal" preset (much faster, similar file size and quality)
-   - removed obsolete legacy presets
-   - added new device presets for Android phones/tablets
-     recent and/or powerful devices recommended
+       - new, much improved decomb filter (but slower)
+         new settings are default
+         old settings become decomb "Fast"
 
-Mac OS X:
----------
+    Presets:
 
--> DVD decryption:
+       - improved "Normal" preset (much faster, similar file size and quality)
+       - removed obsolete legacy presets
+       - added new device presets for Android phones/tablets
+         recent and/or powerful devices recommended
 
-   - VLC 2.x or later will not work for DVD decryption
-     and is therefore unsupported as of HandBrake 0.9.6
-   - libdvdcss is now the preferred method for DVD decryption
-     already works with HandBrake 0.9.5
-     a .pkg installer is available from Videolan:
-     http://download.videolan.org/libdvdcss/last/macosx/
+    Mac OS X:
 
--> Build system:
+    -> DVD decryption:
 
-   - support for Xcode 4 and Mac OS X 10.7 "Lion"
-   - Mac OS X 10.5 "Leopard" no longer supported
+       - VLC 2.x or later will not work for DVD decryption
+         and is therefore unsupported as of HandBrake 0.9.6
+       - libdvdcss is now the preferred method for DVD decryption
+         already works with HandBrake 0.9.5
+         a .pkg installer is available from Videolan:
+         http://download.videolan.org/libdvdcss/last/macosx/
 
-Mac OS X GUI:
--------------
+    -> Build system:
 
--> OS X 10.7 Lion support:
+       - support for Xcode 4 and Mac OS X 10.7 "Lion"
+       - Mac OS X 10.5 "Leopard" no longer supported
 
-   - bug fix: Live Preview window widgets updated to work under Lion
-   - bug fix: fixed positioning of widgets in the Audio panel under Lion
+    Mac OS X GUI:
 
--> Other:
+    -> OS X 10.7 Lion support:
 
-   - wider main window providing more room for various widgets
+       - bug fix: Live Preview window widgets updated to work under Lion
+       - bug fix: fixed positioning of widgets in the Audio panel under Lion
 
-Windows GUI:
-------------
+    -> Other:
 
--> Preview window:
+       - wider main window providing more room for various widgets
 
-   - complete redesign
-   - support for VLC or the system default video player
-   - dropped built-in QuickTime playback support
+    Windows GUI:
+    -> Preview window:
 
--> Other:
+       - complete redesign
+       - support for VLC or the system default video player
+       - dropped built-in QuickTime playback support
 
-   - much improved control over the default audio and subtitle tracks selected (see Options)
-   - ability to set the minimal title length that will show up during a scan (see Options)
-   - several other usability improvements
-   - installer now has a silent option for easier network installs (launch the installer with /S)
+    -> Other:
 
-Linux GUI:
-----------
+       - much improved control over the default audio and subtitle tracks selected (see Options)
+       - ability to set the minimal title length that will show up during a scan (see Options)
+       - several other usability improvements
+       - installer now has a silent option for easier network installs (launch the installer with /S)
 
--> Audio panel:
+    Linux GUI:
+    -> Audio panel:
 
-   - new advanced audio options section for gain and audio track names
-   - dynamic range compression and samplerate moved to advanced audio options
+       - new advanced audio options section for gain and audio track names
+       - dynamic range compression and samplerate moved to advanced audio options
 
--> Other:
+    -> Other:
 
-   - minor UI tweaks and usability enhancements
+       - minor UI tweaks and usability enhancements
 
-Miscellaneous:
---------------
+    Miscellaneous:
+       - Target Size is gone, and isn't coming back
+         Don't bother complaining on the forums
 
-   - Target Size is gone, and isn't coming back
-     Don't bother complaining on the forums
+       - CLI: support for x264 presets, tunes and profiles
+         new --x264-preset, --x264-tune and --x264-profile options
 
-   - CLI: support for x264 presets, tunes and profiles
-     new --x264-preset, --x264-tune and --x264-profile options
+       - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
+       - DVD: improved main feature detection
 
-   - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
-   - DVD: improved main feature detection
+       - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
 
-   - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
 
 
 Changes between 0.9.4 and 0.9.5:
 
-* Core Library
-  - BluRay disc structure support. (No decryption support) 
-  - Updated Libraries (x264, ffmpeg) 
-  - SSA Subtitle support. (Including burn-in) 
-  - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
-  - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
-  - Updated Presets for newer devices and better quality 
-  - AC3 encoding support.
-  - Many Bug fixes and other small improvements
-  - Improved DVD Main Feature detection (when using dvdnav)
-  - Universal audio downmix support (all audio types can be downmixed)
-
-*All GUIs
-  - Updated x264 Advanced Panel
-  - Video Quality Slider drops % value and only shows RF for x264
-  - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
-  - Peak framerate option (Capped VFR)
-  - Many Bug fixes
-  - Many Tweaks to improve usability.
-  - Ability to edit queue jobs
-  - Point-to-Point encoding (second or frame start and end times)
-
-* Mac GUI
-  - New Audio Panel supporting >4 Audio Tracks
-  - VLC detection in /Applications and ~/Applications
-
-* Windows GUI
-  - Encode Status in GUI. (CLI window is now always hidden)
-  - Improved Auto-Naming for Destination file name.
-  - Drag / Drop Video onto Main Window to scan.
-  
-* Linux GUI
-  - Multiple instance support (run multiple copies of ghb at once)
-  - Many Bug fixes and UI improvements. 
+    * Core Library
+      - BluRay disc structure support. (No decryption support) 
+      - Updated Libraries (x264, ffmpeg) 
+      - SSA Subtitle support. (Including burn-in) 
+      - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
+      - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
+      - Updated Presets for newer devices and better quality 
+      - AC3 encoding support.
+      - Many Bug fixes and other small improvements
+      - Improved DVD Main Feature detection (when using dvdnav)
+      - Universal audio downmix support (all audio types can be downmixed)
+
+    *All GUIs
+      - Updated x264 Advanced Panel
+      - Video Quality Slider drops % value and only shows RF for x264
+      - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
+      - Peak framerate option (Capped VFR)
+      - Many Bug fixes
+      - Many Tweaks to improve usability.
+      - Ability to edit queue jobs
+      - Point-to-Point encoding (second or frame start and end times)
+
+    * Mac GUI
+      - New Audio Panel supporting >4 Audio Tracks
+      - VLC detection in /Applications and ~/Applications
+
+    * Windows GUI
+      - Encode Status in GUI. (CLI window is now always hidden)
+      - Improved Auto-Naming for Destination file name.
+      - Drag / Drop Video onto Main Window to scan.
+      
+    * Linux GUI
+      - Multiple instance support (run multiple copies of ghb at once)
+      - Many Bug fixes and UI improvements. 
   
-Changes between 0.9.3 and 0.9.4:
 
-Core:
-
-* New build system, allowing 64-bit binaries (around 10% faster)
-* Soft subtitles and Closed Captions:
-  - DVD Closed Captions
-  - ATSC Closed Captions
-  - SRT subtitle import
-  - Text soft subtitles in MP4 and MKV output
-  - Bitmap soft subtitles in MKV output
-* Better support for DVD inputs:
-  - Uses libdvdnav
-  - DVD angles support
-  - Workaround for libdvdread malloc bomb on invalid PGC entry
-  - DVD drive region detection support in Linux
-  - Handles DVD programs with more than 16 streams
-  - No longer tries to detect and discard duplicate titles when scanning
-  - Libdvdnav patched to perform read error recovery
-  - Libdvdread patched to allow raw device access in Windows
-  - Handles poorly mastered DVDs that had the menus ripped out of them
-* Better support for non-DVD inputs:
-  - Preserves MP4 metadata
-  - TrueHD
-  - DTS-HD demuxing
-  - 8 bit audio
-  - Better handling of transport streams where audio starts first
-  - Better handling of transport streams that have been spliced together, leading to duplicate timestamps
-  - Better VC-1 frame detection
-  - Fixes bug that was causing one sec. of audio to be dropped on many ffmpeg files
-  - Looks harder for aspect ratio info from DV sources
-  - No longer truncates the last (dummy) chapter
-  - Allows specifying field parity for detelecine and decomb
-* Better AV sync
-* Support for sources with no audio
-* DTS passthrough for MKV
-* x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset). 
-* Better sample interleaving
-* Better, optional deinterlacer for decomb (EEDI2)
-* New mode structure for the decomb filter
-* Variable verbose logging levels
-* Fixed timing for first two frames coming out of filters
-* Libtheora bumped to 1.1.0
-* Improvements to our theora implementation (2 pass encoding + soft target rate control)
-* Caters to Theora's insistence on content having mod16 framing dimensions specified
-* Flushes LAME encoder's final packets
-* Fixed interjob framerate calculation
-* Fixed pthreads regression in cygwin
-* Tweaks for packaging tools
-* Solaris 10 build support
-
-All interfaces:
-
-* Live video preview
-* New subtitle tab
-* New filters and picture settings inspector
-* Custom anamorphic mode
-* Updated Sparkle
-* Custom number of preview images
-* Quality slider now works off actual rate factor/quantizer values instead of percentages
-* Partially updated advanced x264 tab
-* New built-in presets
-* Use libdvdnav by default on DVD sources
-* Removed Constant QP encoding option for x264 (use CRF)
-* Various bug fixes and UI tweaks
-* x264 turbo 1st pass mode now uses subme=2 not subme=1
-
-Mac:
-
-* Core Audio AAC encoding
-* H.264 video source decoding crash fixed
-* Queue displays varying row heights based on encode settings
-* Fixed EyeTV package scanning
-* 64bit / 32 bit VLC detection 
-* Preset import/export
-
-Windows:
-
-* New audio tab
-* AAC audio source decoding bug fixed
-* Tray minimization is now optional
-* Queue can now be started from main window
-* Growl for Windows notification support
-* General UI improvements
-* Preset import
-* Preferred language control for audio dubs and subtitles
-* Fixed file extensions resetting to m4v when enabling chapter markers in mkv
-* Faster updating of GUI elements from CLI data
-* Cleanup / Improved some of the programs options. (Growl, use m4v, drive detection)
-* Numerous fixes in the Picture Settings Panel and CLI Query Handling code.
-* Bug Fixes and Usability improvements.
-
-Linux:
-
-* General UI improvements
-* Inhibits sleep mode while encoding
-* Single title scan
-* Chapter duration display
-* Notifications when encodes complete
-* Tray minimization
-* Full screen preview
-* Preset import/export
-* Preferred language control for audio dubs and subtitles
-* Preferences rearrangement
-* Preference to auto-apply .m4v extension
-* New system tray icon behavior
-* Preference for what to do when encode completes
-* Preference for how often to delete activity logs
-* Preference to disable automatic scanning
-* New Gnome session manager support
-* Improved "auto" audio selection
-* Use .m4v as the default extension for the MPEG-4 container
-* Use .m4v when soft subs are enabled
-* Alternate angle encoding fix
-* Only strips drive letters for Windows builds
-* Show correct audio format info when it's been sanitized for incompatibilities
-* Preserve chapter list modifications made to queued jobs
-* Fixed error when navigating chapter titles with the keyboard
-* Bug Fixes.
-
-CLI:
-
-* Options to handle new subtitle, anamorphic, and preview features
-* --srt-file, --srt-codeset, --srt-offset, --srt-lang, --srt-default
-* --native-dub option lets users request dubbing instead of subs when the audio isn't in their native language
-* Allow encoding sources with no audio without explicitly stating -a none
-* Update checker on MinGW built exe should now work correctly.
-* Matches GUIs' default verbosity level of 1
+
+Changes between 0.9.3 and 0.9.4:
+    Core:
+
+    * New build system, allowing 64-bit binaries (around 10% faster)
+    * Soft subtitles and Closed Captions:
+      - DVD Closed Captions
+      - ATSC Closed Captions
+      - SRT subtitle import
+      - Text soft subtitles in MP4 and MKV output
+      - Bitmap soft subtitles in MKV output
+    * Better support for DVD inputs:
+      - Uses libdvdnav
+      - DVD angles support
+      - Workaround for libdvdread malloc bomb on invalid PGC entry
+      - DVD drive region detection support in Linux
+      - Handles DVD programs with more than 16 streams
+      - No longer tries to detect and discard duplicate titles when scanning
+      - Libdvdnav patched to perform read error recovery
+      - Libdvdread patched to allow raw device access in Windows
+      - Handles poorly mastered DVDs that had the menus ripped out of them
+    * Better support for non-DVD inputs:
+      - Preserves MP4 metadata
+      - TrueHD
+      - DTS-HD demuxing
+      - 8 bit audio
+      - Better handling of transport streams where audio starts first
+      - Better handling of transport streams that have been spliced together, leading to duplicate timestamps
+      - Better VC-1 frame detection
+      - Fixes bug that was causing one sec. of audio to be dropped on many ffmpeg files
+      - Looks harder for aspect ratio info from DV sources
+      - No longer truncates the last (dummy) chapter
+      - Allows specifying field parity for detelecine and decomb
+    * Better AV sync
+    * Support for sources with no audio
+    * DTS passthrough for MKV
+    * x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset). 
+    * Better sample interleaving
+    * Better, optional deinterlacer for decomb (EEDI2)
+    * New mode structure for the decomb filter
+    * Variable verbose logging levels
+    * Fixed timing for first two frames coming out of filters
+    * Libtheora bumped to 1.1.0
+    * Improvements to our theora implementation (2 pass encoding + soft target rate control)
+    * Caters to Theora's insistence on content having mod16 framing dimensions specified
+    * Flushes LAME encoder's final packets
+    * Fixed interjob framerate calculation
+    * Fixed pthreads regression in cygwin
+    * Tweaks for packaging tools
+    * Solaris 10 build support
+
+    All interfaces:
+
+    * Live video preview
+    * New subtitle tab
+    * New filters and picture settings inspector
+    * Custom anamorphic mode
+    * Updated Sparkle
+    * Custom number of preview images
+    * Quality slider now works off actual rate factor/quantizer values instead of percentages
+    * Partially updated advanced x264 tab
+    * New built-in presets
+    * Use libdvdnav by default on DVD sources
+    * Removed Constant QP encoding option for x264 (use CRF)
+    * Various bug fixes and UI tweaks
+    * x264 turbo 1st pass mode now uses subme=2 not subme=1
+
+    Mac:
+
+    * Core Audio AAC encoding
+    * H.264 video source decoding crash fixed
+    * Queue displays varying row heights based on encode settings
+    * Fixed EyeTV package scanning
+    * 64bit / 32 bit VLC detection 
+    * Preset import/export
+
+    Windows:
+
+    * New audio tab
+    * AAC audio source decoding bug fixed
+    * Tray minimization is now optional
+    * Queue can now be started from main window
+    * Growl for Windows notification support
+    * General UI improvements
+    * Preset import
+    * Preferred language control for audio dubs and subtitles
+    * Fixed file extensions resetting to m4v when enabling chapter markers in mkv
+    * Faster updating of GUI elements from CLI data
+    * Cleanup / Improved some of the programs options. (Growl, use m4v, drive detection)
+    * Numerous fixes in the Picture Settings Panel and CLI Query Handling code.
+    * Bug Fixes and Usability improvements.
+
+    Linux:
+
+    * General UI improvements
+    * Inhibits sleep mode while encoding
+    * Single title scan
+    * Chapter duration display
+    * Notifications when encodes complete
+    * Tray minimization
+    * Full screen preview
+    * Preset import/export
+    * Preferred language control for audio dubs and subtitles
+    * Preferences rearrangement
+    * Preference to auto-apply .m4v extension
+    * New system tray icon behavior
+    * Preference for what to do when encode completes
+    * Preference for how often to delete activity logs
+    * Preference to disable automatic scanning
+    * New Gnome session manager support
+    * Improved "auto" audio selection
+    * Use .m4v as the default extension for the MPEG-4 container
+    * Use .m4v when soft subs are enabled
+    * Alternate angle encoding fix
+    * Only strips drive letters for Windows builds
+    * Show correct audio format info when it's been sanitized for incompatibilities
+    * Preserve chapter list modifications made to queued jobs
+    * Fixed error when navigating chapter titles with the keyboard
+    * Bug Fixes.
+
+    CLI:
+
+    * Options to handle new subtitle, anamorphic, and preview features
+    * --srt-file, --srt-codeset, --srt-offset, --srt-lang, --srt-default
+    * --native-dub option lets users request dubbing instead of subs when the audio isn't in their native language
+    * Allow encoding sources with no audio without explicitly stating -a none
+    * Update checker on MinGW built exe should now work correctly.
+    * Matches GUIs' default verbosity level of 1
 
 Changes between 0.9.2 and 0.9.3:
 
 0.9.3 Snapshot 5 -> 0.9.3 Final
-- Better PMT processing
-- Basic underlying support for live previews (encode from a seek point for a set number of frames)
-- Better searching for IDR frames in H.264 streams
-- Preset changes (iPhone goes CRF, some old Apple presets resurrected as Legacy)
-- Assorted bug fixes
+    - Better PMT processing
+    - Basic underlying support for live previews (encode from a seek point for a set number of frames)
+    - Better searching for IDR frames in H.264 streams
+    - Preset changes (iPhone goes CRF, some old Apple presets resurrected as Legacy)
+    - Assorted bug fixes
 
 0.9.3 Snapshot 4 -> 0.9.3 Snapshot 5 (r1913)
-Core Library
-- VC-1 stream input
-- Newer libmp4v2, which fixes the issue with output > 2 gigs in Linux
-- Proper allocation for preview frames
-- Avoids corruption of previews of sources that use widths that aren't cleanly divisible by 8
-- Decodes DTS internally instead of using ffmpeg, to allow mixdowns
-- Better support for DTS in MKV files with implicit timestamps or large timestamp errors
-- Ensures proper chroma size by rounding up when dealing with odd dimensions
-- Ensures "auto" samplerate sends a valid value to faac (22050, 24000, 32000, 44100, or 48000)
-- Bumped Theora to 1.0 final
-- Bumped x264 to r1024, which includes Nehalem optimizations as well as speed boosts for things such as b-adapt=2
-
-Mac GUI
-- Allows multibyte characters in chapter titles
-
-Windows GUI
-- Fixes issue parsing presets that use maxWidth and maxHeight (-X and -Y)
-- DRC defaults to 1 now
-- Chapter markers disabled for non-DVD sources
-- Makes sure Normal preset gets loaded
-- Fixes arithmetic overflow crash when scanning
-
-Linux GUI
-- Update checker
-- Limits range of chapters to encode to the number of chapters on the DVD
-- Disabled entry of dimensions larger than the source
-
-CLI
-- Allows overriding of audio (tracks, bitrates, samplerates, codecs, mixdowns) and x264 options in built-in presets
-
-Documentation
-- Documentation updates have begun on the wiki, although they are not yet complete
+    Core Library
+    - VC-1 stream input
+    - Newer libmp4v2, which fixes the issue with output > 2 gigs in Linux
+    - Proper allocation for preview frames
+    - Avoids corruption of previews of sources that use widths that aren't cleanly divisible by 8
+    - Decodes DTS internally instead of using ffmpeg, to allow mixdowns
+    - Better support for DTS in MKV files with implicit timestamps or large timestamp errors
+    - Ensures proper chroma size by rounding up when dealing with odd dimensions
+    - Ensures "auto" samplerate sends a valid value to faac (22050, 24000, 32000, 44100, or 48000)
+    - Bumped Theora to 1.0 final
+    - Bumped x264 to r1024, which includes Nehalem optimizations as well as speed boosts for things such as b-adapt=2
+
+    Mac GUI
+    - Allows multibyte characters in chapter titles
+
+    Windows GUI
+    - Fixes issue parsing presets that use maxWidth and maxHeight (-X and -Y)
+    - DRC defaults to 1 now
+    - Chapter markers disabled for non-DVD sources
+    - Makes sure Normal preset gets loaded
+    - Fixes arithmetic overflow crash when scanning
+
+    Linux GUI
+    - Update checker
+    - Limits range of chapters to encode to the number of chapters on the DVD
+    - Disabled entry of dimensions larger than the source
+
+    CLI
+    - Allows overriding of audio (tracks, bitrates, samplerates, codecs, mixdowns) and x264 options in built-in presets
+
+    Documentation
+    - Documentation updates have begun on the wiki, although they are not yet complete
 
 0.9.3 Snapshot 3 -> 0.9.3 Snapshot 4 (r1896)
-Core Library
-- Converts video in other color spaces to YUV420 (this means DV support)
-- Official, standards-based AC3-in-MP4
-- Tries to base the AV timing for streams off audio when possible
-- Keeps some audio fixes for lost packets in over the air streams from interfering with other sources
-- Handles rendering of sources where the picture resolution changes mid-stream (this fixes the long-standing bug reading a particular episode of Doctor Who)
-- Wider window for clock references (AV sync)
-- Fixed a crash when closing out data for AAC encoding on aborted encodes
-- Rejiggered verbose activity log display to be more laconic by default
-- Updated x264 to r1016, which means b-rdo and bime are gone and replaced with new subme modes
-- DTS and HDMV DTS audio support in streams
-- Doesn't show the audio track button on iPhones/iPod Touches unless there's more than 1 track
-- Tries to avoid garbage data from AC3 sync by searching for two agreeing packets
-- As the MPEG4IP project is defunct, switched to an independently maintained libmp4v2 which has folded in all our cumbersome patches
-- Fixed SunOS compilation
-- Fixed conflict between maxHeight and maxWidth and loose anamorphic
-- Warn in the log when titles are being ignored during scan for lack of audio
-- Fixed bug with Slow/Slowest deinterlacing and decomb which could leave a flickering line at the top or bottom of the screen
-- Extracts audio and subtitle types from DVD sources, to do things like label commentary tracks
-- Better handling of the beginning of AVI and WMV sources that start after time 0
-- Optimize MP4 for web download works with AC3 tracks now
-
-Mac GUI
-- Nested presets
-- Individual activity logs for each encode (stored by default in ~/Application Support/HandBrake, can be co-located with encoded file destination by preference)
-- Allows reading from ZFS volumes
-- Fixed target size mode. It keeps breaking itself. Maybe it should just be put out of its misery...
-- Assorted other improvements
-
-Windows GUI
-- Nested presets
-- Individual activity logs for each encode
-- Slow and slower deinterlacing and decomb work now in Windows
-- Added resizeable update window
-- Fixed parsing of non-DVD source audio formats
-- Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
-- Fixed bug with MKV presets showing up as .m4v
-- Assorted other improvements
-
-Linux GUI (GTK)
-- Nested presets
-- Individual activity logs for each encode
-- Allows pending queue items to be removed, and reloaded in the main window for editing
-- Better handling of HD previews
-- Assorted other improvements
-
-CLI
-- Updated presets to the equivalent of the nested ones in the GUIs
-- Allows setting custom audio track names in MP4 files
-- Allows selection of the COLR atom in MP4 files, between Bt.601 and Bt.709
-- Fixed reading of device paths in OS X
-
-A special note on the new presets (they're collapsible-triangle-folder-thing-errific!)
-- Deux Six Quatre, Blind, Broke, and Bedlam are gone. They were dead weight.
-- iPod Low-Rez is now iPod Classic & iPod Nano
-- iPod High-Rez is now iPod Legacy
-- iPhone / iPod Touch is now iPhone & iPod Touch, so take care CLI users
-- Animation and Television now use the decomb and detelecine (VFR) filters
-- High Profile presets now use psy-trellis and the new subme 9 mode with B-frame RD refinement
-- AppleTV is now CRF, so sizes will vary with content
-- PS3 preset should be fixed
-- Constant Quality Rate still needs its quality % lowered, probably
-
-The keen reader is already asking "iPod Legacy? WTF is iPod High-Rez called iPod Legacy now?"
-
-The answer is Universal.
-
-The Universal preset is designed to play on all modern iPods (anything newer than the iPod 5.5G). It also plays on iPhones. It also plays on AppleTVs. It should also play just about anywhere else, hence the name. It is full anamorphic DVD resolution--no tricks with downscaling like stuff from the iTunes Store. It includes chapters, and has the first audio track in both AAC (DPL2 downmixed) and AC3 pass-thru, just like the AppleTV preset. In fact, it should give the same quality as the AppleTV preset, but faster...and at a larger file size. Like the AppleTV preset, it used CRF, so sizes will vary.
+    Core Library
+    - Converts video in other color spaces to YUV420 (this means DV support)
+    - Official, standards-based AC3-in-MP4
+    - Tries to base the AV timing for streams off audio when possible
+    - Keeps some audio fixes for lost packets in over the air streams from interfering with other sources
+    - Handles rendering of sources where the picture resolution changes mid-stream (this fixes the long-standing bug reading a particular episode of Doctor Who)
+    - Wider window for clock references (AV sync)
+    - Fixed a crash when closing out data for AAC encoding on aborted encodes
+    - Rejiggered verbose activity log display to be more laconic by default
+    - Updated x264 to r1016, which means b-rdo and bime are gone and replaced with new subme modes
+    - DTS and HDMV DTS audio support in streams
+    - Doesn't show the audio track button on iPhones/iPod Touches unless there's more than 1 track
+    - Tries to avoid garbage data from AC3 sync by searching for two agreeing packets
+    - As the MPEG4IP project is defunct, switched to an independently maintained libmp4v2 which has folded in all our cumbersome patches
+    - Fixed SunOS compilation
+    - Fixed conflict between maxHeight and maxWidth and loose anamorphic
+    - Warn in the log when titles are being ignored during scan for lack of audio
+    - Fixed bug with Slow/Slowest deinterlacing and decomb which could leave a flickering line at the top or bottom of the screen
+    - Extracts audio and subtitle types from DVD sources, to do things like label commentary tracks
+    - Better handling of the beginning of AVI and WMV sources that start after time 0
+    - Optimize MP4 for web download works with AC3 tracks now
+
+    Mac GUI
+    - Nested presets
+    - Individual activity logs for each encode (stored by default in ~/Application Support/HandBrake, can be co-located with encoded file destination by preference)
+    - Allows reading from ZFS volumes
+    - Fixed target size mode. It keeps breaking itself. Maybe it should just be put out of its misery...
+    - Assorted other improvements
+
+    Windows GUI
+    - Nested presets
+    - Individual activity logs for each encode
+    - Slow and slower deinterlacing and decomb work now in Windows
+    - Added resizeable update window
+    - Fixed parsing of non-DVD source audio formats
+    - Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
+    - Fixed bug with MKV presets showing up as .m4v
+    - Assorted other improvements
+
+    Linux GUI (GTK)
+    - Nested presets
+    - Individual activity logs for each encode
+    - Allows pending queue items to be removed, and reloaded in the main window for editing
+    - Better handling of HD previews
+    - Assorted other improvements
+
+    CLI
+    - Updated presets to the equivalent of the nested ones in the GUIs
+    - Allows setting custom audio track names in MP4 files
+    - Allows selection of the COLR atom in MP4 files, between Bt.601 and Bt.709
+    - Fixed reading of device paths in OS X
+
+    A special note on the new presets (they're collapsible-triangle-folder-thing-errific!)
+    - Deux Six Quatre, Blind, Broke, and Bedlam are gone. They were dead weight.
+    - iPod Low-Rez is now iPod Classic & iPod Nano
+    - iPod High-Rez is now iPod Legacy
+    - iPhone / iPod Touch is now iPhone & iPod Touch, so take care CLI users
+    - Animation and Television now use the decomb and detelecine (VFR) filters
+    - High Profile presets now use psy-trellis and the new subme 9 mode with B-frame RD refinement
+    - AppleTV is now CRF, so sizes will vary with content
+    - PS3 preset should be fixed
+    - Constant Quality Rate still needs its quality % lowered, probably
+
+    The keen reader is already asking "iPod Legacy? WTF is iPod High-Rez called iPod Legacy now?"
+
+    The answer is Universal.
+
+    The Universal preset is designed to play on all modern iPods (anything newer than the iPod 5.5G). It also plays on iPhones. It also plays on AppleTVs. It should also play just about anywhere else, hence the name. It is full anamorphic DVD resolution--no tricks with downscaling like stuff from the iTunes Store. It includes chapters, and has the first audio track in both AAC (DPL2 downmixed) and AC3 pass-thru, just like the AppleTV preset. In fact, it should give the same quality as the AppleTV preset, but faster...and at a larger file size. Like the AppleTV preset, it used CRF, so sizes will vary.
 
 0.9.3 Snapshot2 -> 0.9.3 Snapshot 3 (r1797)
-Core Library:
-- Universal input support, utilizing libavcodec from the FFmpeg project for decoding non-MPEG-2 video
-- Newer, faster, better version of the x264 codec, including psychovisual optimizations
-- Better AV sync through full compliance with the MPEG Standard Target Decoder timing model
-- More accurate auto-cropping
-- Support for New Zealand and Norwegian HDTV broadcasts (H.264 and AAC-LATM in MPEG-TS)
-- Detelecine is now "VFR detelecine" by default, dropping some frames and extending others to make up lost time, old behavior of keeping duplicate frames is enabled by selecting a framerate besides "Same as source"
-- Threaded deinterlacing in Slow and Slower modes
-- Threaded and entirely rewritten decomb filter
-- Better audio resampling interpolator
-- Better gamma in QuickTime through the use of the COLR MP4 atom
-- Better constant quality encoding when using FFmpeg
-- Hopefully better cache and virtual memory performance by recycling buffers that were most recently used instead of least
-- Fix for MP4s with "negative duration" errors.
-- Set the detelecine filter to work better with PAL by using "loose" breaks
-- Fix for missing initial H.264 NAL units, improves reliability of 8x8dct
-- Fix for subtitle-scan with XviD encoding
-- Fix for crash at the end of 2nd pass using x264
-- Deblock filter works now
-- Rewritten update system, so the core library can read a portion of Sparkle appcasts.
-- Updates for libsamplerate, libogg, xvidcore, libtheora, libmpeg2, lame, faac, and of course ffmpeg and x264.
-
-Mac GUI
-- Entirely rewritten and far more flexible queue that can be saved between sessions, capable of preserving queued items after a crash
-- Now requires vlc 0.9.xx to read protected dvd's in the users /Applications folder
-- Fix for 4x3 loose anamorphic to keep it from downscaling
-- Countless other improvements
-
-Windows GUI
-- Resolution calculation
-- Better preset bar
-- Better queue (including queue recovery feature)
-- Better activity log window
-- Improved UI (layout changes, animated x264 options, DVD drive detection, duration displayed)
-- More options - includes support for custom auto name format & starting the CLI minimized
-- Countless other improvements
-
-Linux GUI (GTK)
-- It's alive!
-
-Known Issues in Snapshot 3
-- Possibility of a flickering line at the top or bottom of the frame after Slow or Slower deinterlacing or decombing
-- Input bitrate display may be off by a factor of 100 for H.264-in-TS sources
-- Constant Quality Rate preset probably needs a lower quality level (60% - 55%)
-- With non-DVD sources that don't have AC3 audio, you can't encode 1 input audio track to multiple output audio tracks
-- Slow and Slower deinterlacing and decombing are BROKEN in Windows
-- QuickTime won't read Xvid-in-MP4 output, although VLC will
-- Windows GUI does not detect all audio tracks from non-DVD sources
+    Core Library:
+    - Universal input support, utilizing libavcodec from the FFmpeg project for decoding non-MPEG-2 video
+    - Newer, faster, better version of the x264 codec, including psychovisual optimizations
+    - Better AV sync through full compliance with the MPEG Standard Target Decoder timing model
+    - More accurate auto-cropping
+    - Support for New Zealand and Norwegian HDTV broadcasts (H.264 and AAC-LATM in MPEG-TS)
+    - Detelecine is now "VFR detelecine" by default, dropping some frames and extending others to make up lost time, old behavior of keeping duplicate frames is enabled by selecting a framerate besides "Same as source"
+    - Threaded deinterlacing in Slow and Slower modes
+    - Threaded and entirely rewritten decomb filter
+    - Better audio resampling interpolator
+    - Better gamma in QuickTime through the use of the COLR MP4 atom
+    - Better constant quality encoding when using FFmpeg
+    - Hopefully better cache and virtual memory performance by recycling buffers that were most recently used instead of least
+    - Fix for MP4s with "negative duration" errors.
+    - Set the detelecine filter to work better with PAL by using "loose" breaks
+    - Fix for missing initial H.264 NAL units, improves reliability of 8x8dct
+    - Fix for subtitle-scan with XviD encoding
+    - Fix for crash at the end of 2nd pass using x264
+    - Deblock filter works now
+    - Rewritten update system, so the core library can read a portion of Sparkle appcasts.
+    - Updates for libsamplerate, libogg, xvidcore, libtheora, libmpeg2, lame, faac, and of course ffmpeg and x264.
+
+    Mac GUI
+    - Entirely rewritten and far more flexible queue that can be saved between sessions, capable of preserving queued items after a crash
+    - Now requires vlc 0.9.xx to read protected dvd's in the users /Applications folder
+    - Fix for 4x3 loose anamorphic to keep it from downscaling
+    - Countless other improvements
+
+    Windows GUI
+    - Resolution calculation
+    - Better preset bar
+    - Better queue (including queue recovery feature)
+    - Better activity log window
+    - Improved UI (layout changes, animated x264 options, DVD drive detection, duration displayed)
+    - More options - includes support for custom auto name format & starting the CLI minimized
+    - Countless other improvements
+
+    Linux GUI (GTK)
+    - It's alive!
+
+    Known Issues in Snapshot 3
+    - Possibility of a flickering line at the top or bottom of the frame after Slow or Slower deinterlacing or decombing
+    - Input bitrate display may be off by a factor of 100 for H.264-in-TS sources
+    - Constant Quality Rate preset probably needs a lower quality level (60% - 55%)
+    - With non-DVD sources that don't have AC3 audio, you can't encode 1 input audio track to multiple output audio tracks
+    - Slow and Slower deinterlacing and decombing are BROKEN in Windows
+    - QuickTime won't read Xvid-in-MP4 output, although VLC will
+    - Windows GUI does not detect all audio tracks from non-DVD sources
 
 0.9.3 Snapshot 1 -> 0.9.3 Snapshot 2 (r1477)
-Core Library:
-- Anamorphic PAR for the AVI container
-- Allow constant frame rates when they different from the source's frame rate (otherwise pass through the variable MPEG-2 frame durations )
-- Decomb filter (selectively deinterlaces when it sees interlacing in the frame)
-- Filter bug fixed, that would skip any filters after detelecine, if VFR wasn't enabled
-- Loose anamorphic + FFmpeg video bug fixed
+    Core Library:
+    - Anamorphic PAR for the AVI container
+    - Allow constant frame rates when they different from the source's frame rate (otherwise pass through the variable MPEG-2 frame durations )
+    - Decomb filter (selectively deinterlaces when it sees interlacing in the frame)
+    - Filter bug fixed, that would skip any filters after detelecine, if VFR wasn't enabled
+    - Loose anamorphic + FFmpeg video bug fixed
 
-Windows GUI:
-- Title dropdown list bug fixed
-- Missing log file bug fixed
+    Windows GUI:
+    - Title dropdown list bug fixed
+    - Missing log file bug fixed
 
-CLI:
-- Default audio samplerate changed to 48kHz, audio bitrate changed to 160kbps.
-- Samplerate entry bug fixed
+    CLI:
+    - Default audio samplerate changed to 48kHz, audio bitrate changed to 160kbps.
+    - Samplerate entry bug fixed
 
 0.9.2 -> 0.9.3 Snapshot 1 (r1457)
-Core Library:
-- New audio subsystem (no more AAC+AC3, control each track's codec and settings individually)
-- Removed libdvdcss (HandBrake no longer decrypts DVDs on its own, will use VLC to do so if it's available)
-- Added Theora encoder
-- Fixed x264-in-avi and ffmpeg-in-avi
-- Fixed xvid
-- More accurate scaling
-- Major sync improvements
-- Major stream improvements
-- AAC+AC3 support in MKV
-- MKV seeking fixes
-- Make sure subtitles get displayed long enough to read them
-- Updated VBV 2-pass and VBV 1-pass patch for x264
-- Adaptive Quantization for x264
-- Recover from bad preview scans
-- Recover from invalid PGNs
-- Fixed vorbis bitrate control
-- Snapshot builds
-
-Mac:
-- New audio interface
-- Loads libdvdcss from VLC at runtime if it's present on the user's system
-- No more general-purpose "Codecs" menu -- set video and audio codecs individually
-- More robust preset system, in preparation for nested presets
-- Made 64-bit MP4 file widget more prominent
-- Only allow useful x264 options in the advanced tab
-- Various fixes and improvements
-
-Windows:
-- New x264 tab
-- New audio interface
-- Various fixes and improvements
-
-CLI:
-- New audio interface
+    Core Library:
+    - New audio subsystem (no more AAC+AC3, control each track's codec and settings individually)
+    - Removed libdvdcss (HandBrake no longer decrypts DVDs on its own, will use VLC to do so if it's available)
+    - Added Theora encoder
+    - Fixed x264-in-avi and ffmpeg-in-avi
+    - Fixed xvid
+    - More accurate scaling
+    - Major sync improvements
+    - Major stream improvements
+    - AAC+AC3 support in MKV
+    - MKV seeking fixes
+    - Make sure subtitles get displayed long enough to read them
+    - Updated VBV 2-pass and VBV 1-pass patch for x264
+    - Adaptive Quantization for x264
+    - Recover from bad preview scans
+    - Recover from invalid PGNs
+    - Fixed vorbis bitrate control
+    - Snapshot builds
+
+    Mac:
+    - New audio interface
+    - Loads libdvdcss from VLC at runtime if it's present on the user's system
+    - No more general-purpose "Codecs" menu -- set video and audio codecs individually
+    - More robust preset system, in preparation for nested presets
+    - Made 64-bit MP4 file widget more prominent
+    - Only allow useful x264 options in the advanced tab
+    - Various fixes and improvements
+
+    Windows:
+    - New x264 tab
+    - New audio interface
+    - Various fixes and improvements
+
+    CLI:
+    - New audio interface
+
+
 
 Changes between 0.9.1 and 0.9.2:
+    CORE
+
+    - AC3 in MP4 support
+    - Multi-track audio support for Apple devices
+    - Better handling of audio discontinuities
+    - More flexible, "loose" anamorphic
+    - Variable frame rate encoding
+    - MP4 optimization for progressive downloads
+    - Dynamic range compression for encoding from AC3 audio
+    - Ability to encode an audio stream and pass it through at the same time
+    - iPhone-compatible anamorphic (pasp atom)
+    - Robust program and transport stream support
+    - Better handling of DVD read errors from invalid VOB units
+    - Detects and works around missing end of cell markers
+    - Recovers from loss of signal in a stream
+    - Drops subtitles less often
+    - Keeps chapter markers in better sync and prevents duplicates
+    - Better handling of B-Frames
+    - Tunes FIFO sizes by CPU count
+    - Finally squashes the bug that cut off the end of movies
+    - Preset changes
+    - Standardizes on standard out for progress and standard error for everything else.
+    - Correct channel counts when passing AC3 audio to Matroska
+    - Tag MP4 files as encoded with HandBrake
+    - No more merging short chapters
+    - Newer copies of x264,
+    - VBV 2-pass patch for x264
+    - Sets keyframes for x264 by frame rate.
+    - Support for >2GB MKV files in Linux
+    - Code audio languages in a way QuickTime understands
+    - Better subtitle positioning
+    - Fewer crashes in 2-pass encoding
+
+    MAC
+
+    - Leopard Only
+    - Sparkle
+    - Reads .eyetv files as well as .dvdmedia files
+    - Much better queue
+    - More white space
+    - Code restructuring
+    - Activity window logging, complete with a "black box recorder" for crashes
+    - Ability to open a single title for a DVD instead of scanning the whole thing
+    - Warns people when they try to queue up two files with the same name
+    - Maintains picture filter states between jobs
+    - .xib Interface Builder files SVN can track
+    - Switches to NSImageView for previews, so no more useless OpenGL effects
+    - Temporary loss of localizations for foreign languages (the old system was broken anyway)
+    - Separate filter settings for every queued job
+
+    WIN
+
+    - Revamped preset system
+    - Sparkle-compatible update checker
+    - Activity log window
+    - CLI built-in preset parsing
+    - No more admin rights required in Vista
+    - Handles more display resolutions
+
+    CLI
+
+    - Built-in presets
+    - Short names for denoising (weak, medium, strong) and deinterlacing (fast, slow, slower) 
+    - Solaris port
+    - No more x264b30 (use -e x264 -I -x level=30:cabac=0 instead or better yet an iPod preset)
+    - Chapter marker .csv input fixed
+    - CRF as default quality mode for x264, now -q is CRF and if you want CQP add -Q to it
+
 
-CORE
-
-- AC3 in MP4 support
-- Multi-track audio support for Apple devices
-- Better handling of audio discontinuities
-- More flexible, "loose" anamorphic
-- Variable frame rate encoding
-- MP4 optimization for progressive downloads
-- Dynamic range compression for encoding from AC3 audio
-- Ability to encode an audio stream and pass it through at the same time
-- iPhone-compatible anamorphic (pasp atom)
-- Robust program and transport stream support
-- Better handling of DVD read errors from invalid VOB units
-- Detects and works around missing end of cell markers
-- Recovers from loss of signal in a stream
-- Drops subtitles less often
-- Keeps chapter markers in better sync and prevents duplicates
-- Better handling of B-Frames
-- Tunes FIFO sizes by CPU count
-- Finally squashes the bug that cut off the end of movies
-- Preset changes
-- Standardizes on standard out for progress and standard error for everything else.
-- Correct channel counts when passing AC3 audio to Matroska
-- Tag MP4 files as encoded with HandBrake
-- No more merging short chapters
-- Newer copies of x264,
-- VBV 2-pass patch for x264
-- Sets keyframes for x264 by frame rate.
-- Support for >2GB MKV files in Linux
-- Code audio languages in a way QuickTime understands
-- Better subtitle positioning
-- Fewer crashes in 2-pass encoding
-
-MAC
-
-- Leopard Only
-- Sparkle
-- Reads .eyetv files as well as .dvdmedia files
-- Much better queue
-- More white space
-- Code restructuring
-- Activity window logging, complete with a "black box recorder" for crashes
-- Ability to open a single title for a DVD instead of scanning the whole thing
-- Warns people when they try to queue up two files with the same name
-- Maintains picture filter states between jobs
-- .xib Interface Builder files SVN can track
-- Switches to NSImageView for previews, so no more useless OpenGL effects
-- Temporary loss of localizations for foreign languages (the old system was broken anyway)
-- Separate filter settings for every queued job
-
-WIN
-
-- Revamped preset system
-- Sparkle-compatible update checker
-- Activity log window
-- CLI built-in preset parsing
-- No more admin rights required in Vista
-- Handles more display resolutions
-
-CLI
-
-- Built-in presets
-- Short names for denoising (weak, medium, strong) and deinterlacing (fast, slow, slower) 
-- Solaris port
-- No more x264b30 (use -e x264 -I -x level=30:cabac=0 instead or better yet an iPod preset)
-- Chapter marker .csv input fixed
-- CRF as default quality mode for x264, now -q is CRF and if you want CQP add -Q to it
 
 Changes between 0.9.0 and 0.9.1:
 
@@ -684,7 +753,9 @@
 	+ Fixed: Add-to-queue issues
 	+ Fixed: Foreign language issues
 	Assorted other changes
-	
+
+
+
 Changes between 0.8.5b1 and 0.9.0:
 
 	Core HandBrake Changes
@@ -729,6 +800,8 @@
 	+ Changed: DVD information parser
 	Assorted other changes
 
+
+
 Changes between 0.8.0b1 and 0.8.5b1
 
 	Core HandBrake Changes
@@ -808,6 +881,7 @@
 	+ Removed: The Help and Support window. Been replaced with a few Web Links.
 
 
+    
 Changes between 0.7.1 and 0.8.0
  + MediaFork project forked from HandBrake source <http://handbrake.m0k.org/>
  + Updated libraries (meaning better quality, hopefully fewer bugs, and increased speeds)
@@ -823,10 +897,14 @@
  + New preference item to select the default audio language (Mac OS X)
  + Bugfix for reading straight from a DVD
 
+ 
+ 
 Changes between 0.7.0 and 0.7.1
  + Universal Binary for PPC and Intel
  + Bugfixes for missing subtitles, audio glitches with LPCM tracks and more
 
+ 
+ 
 Changes between 0.7.0-beta3 and 0.7.0
  + Multithreaded H.264 encoding with x264
  + Added option for H.264 Baseline (suitable for iPods)
@@ -834,6 +912,8 @@
  + Fixes for some DVD titles HandBrake would not recognize
  + Fixes audio gliches when encoding from LPCM tracks
 
+ 
+ 
 Changes between 0.6.2 and 0.7.0-beta3
  + Chapters selection
  + Custom framerate
@@ -850,6 +930,8 @@
  + Grayscale encoding
  + Up-to-date BeOS UI
 
+ 
+ 
 Changes between 0.6.1 and 0.6.2
  + Support for DVDs with MPEG audio tracks
  + Rewrote the DVD navigation code
@@ -859,9 +941,13 @@
  + Internal improvements
  + Bugfixes
 
+ 
+ 
 Changes between 0.6.0 and 0.6.1
  + Fixed LPCM endianness issue
 
+ 
+ 
 Changes between 0.5.2 and 0.6.0
  + MP4 and OGM output
  + AAC and Vorbis encoding
@@ -871,37 +957,53 @@
  + GTK2 linux interface
  + OS X interface localization
 
+ 
+ 
 Changes between 0.5.1 and 0.5.2
  + Bugfixes
 
+ 
+ 
 Changes between 0.5 and 0.5.1
  + 2-pass XviD encoding
  + Bugfixes
 
+ 
+ 
 Changes between 0.4 and 0.5
  + Bugfixes, rewrite of large parts of the core
  + XviD encoding (1-pass only)
 
+ 
+ 
 Changes between 0.3 and 0.4
  + Better multithreading
  + Allow the user to specify a target size instead of bitrate
  + Misc GUI enhancements
  + Use low-priority threads on OS X
 
+ 
+ 
 Changes between 0.2 and 0.3
  + OSX & Linux ports
  + Allow 2-pass encoding
  + Many internal changes & fixes
 
+ 
+ 
 Changes between 0.1.1 and 0.2
  + Fixed a major bug that made HandBrake probably crash after ~ 15
    minutes encoded
  + Fixed a few minor memory leaks
 
+ 
+ 
 Changes between 0.1 and 0.1.1
  + Fixed a stupid bug that prevented to scan volumes correctly if
    FAT/NTFS/etc volumes were mounted
 
+   
+   
 Changes between 0.1-alpha2 and 0.1 :
  + Automatically detect ripped DVDs on BFS volumes
  + Allow picture cropping and resizing
@@ -910,9 +1012,13 @@
    and BSPlayer)
  + Better A/V sync with some DVDs
 
+ 
+ 
 Changes between 0.1-alpha and 0.1-alpha2 :
  + Show length for each title
  + Fixed the screwed-audio bug
  + Many bugfixes...
 
+ 
+ 
 First version is 0.1-alpha.

HandBrake-0.9.8.tar.bz2/win/CS/doc/THANKS -> HandBrake-0.9.9.tar.bz2/win/CS/doc/THANKS Changed

HandBrake-0.9.8.tar.bz2/win/CS/libraries/EagleBoost.Wpf.Presentation.dll -> HandBrake-0.9.9.tar.bz2/win/CS/libraries/EagleBoost.Wpf.Presentation.dll Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/EagleBoost.Wpf.Presentation.pdb Added

HandBrake-0.9.8.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML -> HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML Changed

@@ -4,18 +4,46 @@
         <name>GongSolutions.Wpf.DragDrop</name>
     </assembly>
     <members>
+        <member name="T:GongSolutions.Wpf.DragDrop.IDragSource">
+            <summary>
+            Interface implemented by Drag Handlers.
+            </summary>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)">
+            <summary>
+            Queries whether a drag can be started.
+            </summary>
+            
+            <param name="dragInfo">
+            Information about the drag.
+            </param>
+            
+            <remarks>
+            To allow a drag to be started, the <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects"/> property on <paramref name="dragInfo"/> 
+            should be set to a value other than <see cref="!:DragDropEffects.None"/>. 
+            </remarks>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.Dropped(GongSolutions.Wpf.DragDrop.IDropInfo)">
+            <summary>
+            Notifies the drag handler that a drop has occurred.
+            </summary>
+            
+            <param name="dropInfo">
+              Information about the drop.
+            </param>
+        </member>
         <member name="T:GongSolutions.Wpf.DragDrop.IDropTarget">
             <summary>
             Interface implemented by Drop Handlers.
             </summary>
         </member>
-        <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.DropInfo)">
+        <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.IDropInfo)">
             <summary>
             Updates the current drag state.
             </summary>
             
             <param name="dropInfo">
-            Information about the drag.
+              Information about the drag.
             </param>
             
             <remarks>
@@ -24,44 +52,206 @@
             and <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Data"/> should be set to a non-null value.
             </remarks>
         </member>
-        <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.DropInfo)">
+        <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.IDropInfo)">
             <summary>
             Performs a drop.
             </summary>
             
             <param name="dropInfo">
-            Information about the drop.
+              Information about the drop.
             </param>
         </member>
-        <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.Data">
             <summary>
-            Holds information about a the target of a drag drop operation.
+            Gets or sets the drag data.
             </summary>
             
             <remarks>
-            The <see cref="T:GongSolutions.Wpf.DragDrop.DropInfo"/> class holds all of the framework's information about the current 
-            target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.DropInfo)"/> method to determine whether 
-            the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.DropInfo)"/> to perform the drop.
+            This must be set by a drag handler in order for a drag to start.
             </remarks>
         </member>
-        <member name="M:GongSolutions.Wpf.DragDrop.DropInfo.#ctor(System.Object,System.Windows.DragEventArgs,GongSolutions.Wpf.DragDrop.DragInfo)">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.DragStartPosition">
             <summary>
-            Initializes a new instance of the DropInfo class.
+            Gets the position of the click that initiated the drag, relative to <see cref="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSource"/>.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.PositionInDraggedItem">
+            <summary>
+            Gets the point where the cursor was relative to the item being dragged when the drag was started.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.Effects">
+            <summary>
+            Gets or sets the allowed effects for the drag.
+            </summary>
+            
+            <remarks>
+            This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drag handler in order 
+            for a drag to start.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.MouseButton">
+            <summary>
+            Gets the mouse button that initiated the drag.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceCollection">
+            <summary>
+            Gets the collection that the source ItemsControl is bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceItem">
+            <summary>
+            Gets the object that a dragged item is bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceItems">
+            <summary>
+            Gets a collection of objects that the selected items in an ItemsControl are bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be empty.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSource">
+            <summary>
+            Gets the control that initiated the drag.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSourceItem">
+            <summary>
+            Gets the item in an ItemsControl that started the drag.
+            </summary>
+            
+            <remarks>
+            If the control that initiated the drag is an ItemsControl, this property will hold the item
+            container of the clicked item. For example, if <see cref="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSource"/> is a ListBox this
+            will hold a ListBoxItem.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.DataObject">
+            <summary>
+            Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
+            a custom instance if custom drag and drop behavior is needed.
+            </summary>
+        </member>
+        <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
+            <summary>
+            Holds information about a the source of a drag drop operation.
+            </summary>
+            
+            <remarks>
+            The <see cref="T:GongSolutions.Wpf.DragDrop.DragInfo"/> class holds all of the framework's information about the source
+            of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)"/> to determine whether a drag 
+            can start, and what the dragged data should be.
+            </remarks>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.DragInfo.#ctor(System.Object,System.Windows.Input.MouseButtonEventArgs)">
+            <summary>
+            Initializes a new instance of the DragInfo class.
             </summary>
             
             <param name="sender">
-            The sender of the drag event.
+            The sender of the mouse event that initiated the drag.
             </param>
             
             <param name="e">
-            The drag event.
+            The mouse event that initiated the drag.
             </param>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.Data">
+            <summary>
+            Gets or sets the drag data.
+            </summary>
             
-            <param name="dragInfo">
-            Information about the source of the drag, if the drag came from within the framework.
-            </param>
+            <remarks>
+            This must be set by a drag handler in order for a drag to start.
+            </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.Data">
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.DragStartPosition">
+            <summary>
+            Gets the position of the click that initiated the drag, relative to <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource"/>.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.PositionInDraggedItem">
+            <summary>
+            Gets the point where the cursor was relative to the item being dragged when the drag was started.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects">
+            <summary>
+            Gets or sets the allowed effects for the drag.
+            </summary>
+            
+            <remarks>
+            This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drag handler in order 
+            for a drag to start.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.MouseButton">
+            <summary>
+            Gets the mouse button that initiated the drag.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceCollection">
+            <summary>
+            Gets the collection that the source ItemsControl is bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItem">
+            <summary>
+            Gets the object that a dragged item is bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItems">
+            <summary>
+            Gets a collection of objects that the selected items in an ItemsControl are bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be empty.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource">
+            <summary>
+            Gets the control that initiated the drag.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSourceItem">
+            <summary>
+            Gets the item in an ItemsControl that started the drag.
+            </summary>
+            
+            <remarks>
+            If the control that initiated the drag is an ItemsControl, this property will hold the item
+            container of the clicked item. For example, if <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource"/> is a ListBox this
+            will hold a ListBoxItem.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.DataObject">
+            <summary>
+            Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
+            a custom instance if custom drag and drop behavior is needed.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.Data">
             <summary>
             Gets the drag data.
             </summary>
@@ -73,13 +263,18 @@
             - A typed IEnumerable if multiple items were dragged.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DragInfo">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DragInfo">
             <summary>
-            Gets a <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.DragInfo"/> object holding information about the source of the drag, 
+            Gets a <see cref="P:GongSolutions.Wpf.DragDrop.IDropInfo.DragInfo"/> object holding information about the source of the drag, 
             if the drag came from within the framework.
             </summary>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DropTargetAdorner">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DropPosition">
+            <summary>
+            Gets the mouse position relative to the VisualTarget
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DropTargetAdorner">
             <summary>
             Gets or sets the class of drop target to display.
             </summary>
@@ -89,7 +284,7 @@
             class.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.Effects">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.Effects">
             <summary>
             Gets or sets the allowed effects for the drop.
             </summary>
@@ -99,12 +294,12 @@
             for a drop to be possible.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.InsertIndex">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.InsertIndex">
             <summary>
-            Gets the current insert position within <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetCollection"/>.
+            Gets the current insert position within <see cref="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetCollection"/>.
             </summary>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetCollection">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetCollection">
             <summary>
             Gets the collection that the target ItemsControl is bound to.
             </summary>
@@ -113,7 +308,7 @@
             If the current drop target is unbound or not an ItemsControl, this will be null.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetItem">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetItem">
             <summary>
             Gets the object that the current drop target is bound to.
             </summary>
@@ -122,7 +317,7 @@
             If the current drop target is unbound or not an ItemsControl, this will be null.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetGroup">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetGroup">
             <summary>
             Gets the current group target.
             </summary>
@@ -132,12 +327,12 @@
             the drag is currently over.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTarget">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTarget">
             <summary>
             Gets the control that is the current drop target.
             </summary>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetItem">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTargetItem">
             <summary>
             Gets the item in an ItemsControl that is the current drop target.
             </summary>
@@ -146,125 +341,187 @@
             If the current drop target is unbound or not an ItemsControl, this will be null.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetOrientation">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTargetOrientation">
             <summary>
-            Gets th orientation of the current drop target.
+            Gets the orientation of the current drop target.
             </summary>
         </member>
-        <member name="T:GongSolutions.Wpf.DragDrop.IDragSource">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTargetFlowDirection">
             <summary>
-            Interface implemented by Drag Handlers.
+            Gets the FlowDirection of the current drop target.
             </summary>
         </member>
-        <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.DragInfo)">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DestinationText">
             <summary>
-            Queries whether a drag can be started.
+            Gets and sets the text displayed in the DropDropEffects adorner.
             </summary>
-            
-            <param name="dragInfo">
-            Information about the drag.
-            </param>
-            
-            <remarks>
-            To allow a drag to be started, the <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects"/> property on <paramref name="dragInfo"/> 
-            should be set to a value other than <see cref="!:DragDropEffects.None"/>. 
-            </remarks>
         </member>
-        <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.InsertPosition">
             <summary>
-            Holds information about a the source of a drag drop operation.
+            Gets the relative position the item will be inserted to compared to the TargetItem
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.KeyStates">
+            <summary>
+            Gets a flag enumeration indicating the current state of the SHIFT, CTRL, and ALT keys, as well as the state of the mouse buttons.
+            </summary>
+        </member>
+        <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
+            <summary>
+            Holds information about a the target of a drag drop operation.
             </summary>
             
             <remarks>
-            The <see cref="T:GongSolutions.Wpf.DragDrop.DragInfo"/> class holds all of the framework's information about the source
-            of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.DragInfo)"/> to determine whether a drag 
-            can start, and what the dragged data should be.
+            The <see cref="T:GongSolutions.Wpf.DragDrop.DropInfo"/> class holds all of the framework's information about the current 
+            target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.IDropInfo)"/> method to determine whether 
+            the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.IDropInfo)"/> to perform the drop.
             </remarks>
         </member>
-        <member name="M:GongSolutions.Wpf.DragDrop.DragInfo.#ctor(System.Object,System.Windows.Input.MouseButtonEventArgs)">
+        <member name="M:GongSolutions.Wpf.DragDrop.DropInfo.#ctor(System.Object,System.Windows.DragEventArgs,GongSolutions.Wpf.DragDrop.DragInfo)">
             <summary>
-            Initializes a new instance of the DragInfo class.
+            Initializes a new instance of the DropInfo class.
             </summary>
             
             <param name="sender">
-            The sender of the mouse event that initiated the drag.
+            The sender of the drag event.
             </param>
             
             <param name="e">
-            The mouse event that initiated the drag.
+            The drag event.
+            </param>
+            
+            <param name="dragInfo">
+            Information about the source of the drag, if the drag came from within the framework.
             </param>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.Data">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.Data">
             <summary>
-            Gets or sets the drag data.
+            Gets the drag data.
             </summary>
             
             <remarks>
-            This must be set by a drag handler in order for a drag to start.
+            If the drag came from within the framework, this will hold:
+            
+            - The dragged data if a single item was dragged.
+            - A typed IEnumerable if multiple items were dragged.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.DragStartPosition">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DragInfo">
             <summary>
-            Gets the position of the click that initiated the drag, relative to <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource"/>.
+            Gets a <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.DragInfo"/> object holding information about the source of the drag, 
+            if the drag came from within the framework.
             </summary>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DropPosition">
             <summary>
-            Gets or sets the allowed effects for the drag.
+            Gets the mouse position relative to the VisualTarget
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DropTargetAdorner">
+            <summary>
+            Gets or sets the class of drop target to display.
             </summary>
             
             <remarks>
-            This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drag handler in order 
-            for a drag to start.
+            The standard drop target adorner classes are held in the <see cref="T:GongSolutions.Wpf.DragDrop.DropTargetAdorners"/>
+            class.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.MouseButton">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.Effects">
             <summary>
-            Gets the mouse button that initiated the drag.
+            Gets or sets the allowed effects for the drop.
+            </summary>
+            
+            <remarks>
+            This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drop handler in order 
+            for a drop to be possible.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.InsertIndex">
+            <summary>
+            Gets the current insert position within <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetCollection"/>.
             </summary>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceCollection">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetCollection">
             <summary>
-            Gets the collection that the source ItemsControl is bound to.
+            Gets the collection that the target ItemsControl is bound to.
             </summary>
             
             <remarks>
-            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            If the current drop target is unbound or not an ItemsControl, this will be null.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItem">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetItem">
             <summary>
-            Gets the object that a dragged item is bound to.
+            Gets the object that the current drop target is bound to.
             </summary>
             
             <remarks>
-            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            If the current drop target is unbound or not an ItemsControl, this will be null.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItems">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetGroup">
             <summary>
-            Gets a collection of objects that the selected items in an ItemsControl are bound to.
+            Gets the current group target.
             </summary>
             
             <remarks>
-            If the control that initated the drag is unbound or not an ItemsControl, this will be empty.
+            If the drag is currently over an ItemsControl with groups, describes the group that
+            the drag is currently over.
             </remarks>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTarget">
             <summary>
-            Gets the control that initiated the drag.
+            Gets the control that is the current drop target.
             </summary>
         </member>
-        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSourceItem">
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetItem">
             <summary>
-            Gets the item in an ItemsControl that started the drag.
+            Gets the item in an ItemsControl that is the current drop target.
             </summary>
             
             <remarks>
-            If the control that initiated the drag is an ItemsControl, this property will hold the item
-            container of the clicked item. For example, if <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource"/> is a ListBox this
-            will hold a ListBoxItem.
+            If the current drop target is unbound or not an ItemsControl, this will be null.
             </remarks>
         </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetOrientation">
+            <summary>
+            Gets the orientation of the current drop target.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetFlowDirection">
+            <summary>
+            Gets the orientation of the current drop target.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DestinationText">
+            <summary>
+            Gets and sets the text displayed in the DropDropEffects adorner.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.InsertPosition">
+            <summary>
+            Gets the relative position the item will be inserted to compared to the TargetItem
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.KeyStates">
+            <summary>
+            Gets a flag enumeration indicating the current state of the SHIFT, CTRL, and ALT keys, as well as the state of the mouse buttons.
+            </summary>
+        </member>
+        <member name="T:GongSolutions.Wpf.DragDrop.Icons.IconFactory">
+            <summary>
+            Static class to provide access to standard application images
+            </summary>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.Icons.IconFactory.GetImage(System.String,System.Int32)">
+            <summary>
+            Loads an image based on the name and size required.
+            Images need to be marked as 'Resource' in the project for them be loaded.
+            </summary>
+            <param name="iconName">Name of the icon</param>
+            <param name="size">The size of the icon</param>
+            <returns>The image to be displayed</returns>
+        </member>
     </members>
 </doc>

HandBrake-0.9.8.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll -> HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb Added

HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/notes.txt Added

HandBrake-0.9.8.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.dll -> HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.dll Changed

HandBrake-0.9.8.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.pdb -> HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.pdb Changed

HandBrake-0.9.8.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.xml -> HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.xml Changed

@@ -168,6 +168,12 @@
               Resets the executor to use a non-dispatcher-based action executor.
             </summary>
         </member>
+        <member name="M:Caliburn.Micro.Execute.SetUIThreadMarshaller(System.Action{System.Action})">
+            <summary>
+            Sets a custom UI thread marshaller.
+            </summary>
+            <param name="marshaller">The marshaller.</param>
+        </member>
         <member name="M:Caliburn.Micro.Execute.OnUIThread(System.Action)">
             <summary>
               Executes the action on the UI thread.
@@ -229,6 +235,18 @@
             </summary>
             <param name = "propertyName">Name of the property.</param>
         </member>
+        <member name="M:Caliburn.Micro.PropertyChangedBase.OnDeserialized(System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Called when the object is deserialized.
+            </summary>
+            <param name="c">The streaming context.</param>
+        </member>
+        <member name="M:Caliburn.Micro.PropertyChangedBase.ShouldSerializeIsNotifying">
+            <summary>
+            Used to indicate whether or not the IsNotifying property is serialized to Xml.
+            </summary>
+            <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>
+        </member>
         <member name="P:Caliburn.Micro.PropertyChangedBase.IsNotifying">
             <summary>
               Enables/Disables property change notification.
@@ -384,11 +402,72 @@
             </summary>
             <param name = "items">The items.</param>
         </member>
+        <member name="M:Caliburn.Micro.BindableCollection`1.OnDeserialized(System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Called when the object is deserialized.
+            </summary>
+            <param name="c">The streaming context.</param>
+        </member>
+        <member name="M:Caliburn.Micro.BindableCollection`1.ShouldSerializeIsNotifying">
+            <summary>
+            Used to indicate whether or not the IsNotifying property is serialized to Xml.
+            </summary>
+            <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>
+        </member>
         <member name="P:Caliburn.Micro.BindableCollection`1.IsNotifying">
             <summary>
               Enables/Disables property change notification.
             </summary>
         </member>
+        <member name="T:Caliburn.Micro.RegExHelper">
+            <summary>
+             Helper class for encoding strings to regular expression patterns
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.RegExHelper.NameRegEx">
+            <summary>
+            Regular expression pattern for valid name
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.RegExHelper.SubNamespaceRegEx">
+            <summary>
+            Regular expression pattern for subnamespace (including dot)
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.RegExHelper.NamespaceRegEx">
+            <summary>
+            Regular expression pattern for namespace or namespace fragment
+            </summary>
+        </member>
+        <member name="M:Caliburn.Micro.RegExHelper.GetCaptureGroup(System.String,System.String)">
+            <summary>
+            Creates a named capture group with the specified regular expression 
+            </summary>
+            <param name="groupName">Name of capture group to create</param>
+            <param name="regEx">Regular expression pattern to capture</param>
+            <returns>Regular expression capture group with the specified group name</returns>
+        </member>
+        <member name="M:Caliburn.Micro.RegExHelper.NamespaceToRegEx(System.String)">
+            <summary>
+            Converts a namespace (including wildcards) to a regular expression string
+            </summary>
+            <param name="srcNamespace">Source namespace to convert to regular expression</param>
+            <returns>Namespace converted to a regular expression</returns>
+        </member>
+        <member name="M:Caliburn.Micro.RegExHelper.GetNameCaptureGroup(System.String)">
+            <summary>
+            Creates a capture group for a valid name regular expression pattern
+            </summary>
+            <param name="groupName">Name of capture group to create</param>
+            <returns>Regular expression capture group with the specified group name</returns>
+        </member>
+        <member name="M:Caliburn.Micro.RegExHelper.GetNamespaceCaptureGroup(System.String)">
+            <summary>
+            Creates a capture group for a namespace regular expression pattern
+            </summary>
+            <param name="groupName">Name of capture group to create</param>
+            <returns>Regular expression capture group with the specified group name</returns>
+        </member>
         <member name="T:Caliburn.Micro.ILog">
             <summary>
             A logger.
@@ -1033,6 +1112,75 @@
              Used to transform names.
             </summary>
         </member>
+        <member name="F:Caliburn.Micro.ViewModelLocator.InterfaceCaptureGroupName">
+            <summary>
+            The name of the capture group used as a marker for rules that return interface types
+            </summary>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">
+            <summary>
+            Specifies how type mappings are created, including default type mappings. Calling this method will
+            clear all existing name transformation rules and create new default type mappings according to the
+            configuration.
+            </summary>
+            <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddDefaultTypeMapping(System.String)">
+            <summary>
+            Adds a default type mapping using the standard namespace mapping convention
+            </summary>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">
+            <summary>
+            Adds a standard type mapping based on namespace RegEx replace and filter patterns
+            </summary>
+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+            <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">
+            <summary>
+            Adds a standard type mapping based on namespace RegEx replace and filter patterns
+            </summary>
+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+            <param name="nsTargetRegEx">RegEx replace value for target namespace</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String[],System.String)">
+            <summary>
+            Adds a standard type mapping based on simple namespace mapping
+            </summary>
+            <param name="nsSource">Namespace of source type</param>
+            <param name="nsTargets">Namespaces of target type as an array</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String,System.String)">
+            <summary>
+            Adds a standard type mapping based on simple namespace mapping
+            </summary>
+            <param name="nsSource">Namespace of source type</param>
+            <param name="nsTarget">Namespace of target type</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">
+            <summary>
+            Adds a standard type mapping by substituting one subnamespace for another
+            </summary>
+            <param name="nsSource">Subnamespace of source type</param>
+            <param name="nsTargets">Subnamespaces of target type as an array</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">
+            <summary>
+            Adds a standard type mapping by substituting one subnamespace for another
+            </summary>
+            <param name="nsSource">Subnamespace of source type</param>
+            <param name="nsTarget">Subnamespace of target type</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
         <member name="M:Caliburn.Micro.ViewModelLocator.MakeInterface(System.String)">
             <summary>
               Makes a type name into an interface name.
@@ -1040,6 +1188,17 @@
             <param name = "typeName">The part.</param>
             <returns></returns>
         </member>
+        <member name="F:Caliburn.Micro.ViewModelLocator.TransformName">
+            <summary>
+            Transforms a View type name into all of its possible ViewModel type names. Accepts a flag
+            to include or exclude interface types.
+            </summary>
+            <returns>Enumeration of transformed names</returns>
+            <remarks>Arguments:
+            typeName = The name of the View type being resolved to its companion ViewModel.
+            includeInterfaces = Flag to indicate if interface types are included
+            </remarks>
+        </member>
         <member name="F:Caliburn.Micro.ViewModelLocator.LocateTypeForViewType">
             <summary>
               Determines the view model type based on the specified view type.
@@ -1104,67 +1263,67 @@
         </member>
         <member name="T:Caliburn.Micro.Action">
             <summary>
-            A host for action related attached properties.
+              A host for action related attached properties.
             </summary>
         </member>
         <member name="F:Caliburn.Micro.Action.TargetProperty">
             <summary>
-            A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/>.  
-            The DataContext of the element will be set to this instance.
+              A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element will be set to this instance.
             </summary>
         </member>
         <member name="F:Caliburn.Micro.Action.TargetWithoutContextProperty">
             <summary>
-            A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/>.  
-            The DataContext of the element is not set to this instance.
+              A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element is not set to this instance.
             </summary>
         </member>
         <member name="M:Caliburn.Micro.Action.SetTarget(System.Windows.DependencyObject,System.Object)">
             <summary>
-            Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/>.
+              Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .
             </summary>
-            <param name="d">The element to attach the target to.</param>
-            <param name="target">The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.</param>
+            <param name="d"> The element to attach the target to. </param>
+            <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>
         </member>
         <member name="M:Caliburn.Micro.Action.GetTarget(System.Windows.DependencyObject)">
             <summary>
-            Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.
+              Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .
             </summary>
-            <param name="d">The element to which the target is attached.</param>
-            <returns>The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/></returns>
+            <param name="d"> The element to which the target is attached. </param>
+            <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>
         </member>
         <member name="M:Caliburn.Micro.Action.SetTargetWithoutContext(System.Windows.DependencyObject,System.Object)">
             <summary>
-            Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/>.
+              Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .
             </summary>
-            <param name="d">The element to attach the target to.</param>
-            <param name="target">The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.</param>
-            <remarks>The DataContext will not be set.</remarks>
+            <param name="d"> The element to attach the target to. </param>
+            <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>
+            <remarks>
+              The DataContext will not be set.
+            </remarks>
         </member>
         <member name="M:Caliburn.Micro.Action.GetTargetWithoutContext(System.Windows.DependencyObject)">
             <summary>
-            Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/>.
+              Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .
             </summary>
-            <param name="d">The element to which the target is attached.</param>
-            <returns>The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/></returns>
+            <param name="d"> The element to which the target is attached. </param>
+            <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>
         </member>
         <member name="M:Caliburn.Micro.Action.HasTargetSet(System.Windows.DependencyObject)">
             <summary>
-             Checks if the <see cref="T:Caliburn.Micro.ActionMessage"/>-Target was set.
+              Checks if the <see cref="T:Caliburn.Micro.ActionMessage"/> -Target was set.
             </summary>
-            <param name="element">DependencyObject to check</param>
-            <returns>True if Target or TargetWithoutContext was set on <paramref name="element"/></returns>
+            <param name="element"> DependencyObject to check </param>
+            <returns> True if Target or TargetWithoutContext was set on <paramref name="element"/> </returns>
         </member>
         <member name="M:Caliburn.Micro.Action.Invoke(System.Object,System.String,System.Windows.DependencyObject,System.Windows.FrameworkElement,System.Object,System.Object[])">
             <summary>
-             Uses the action pipeline to invoke the method.
+              Uses the action pipeline to invoke the method.
             </summary>
-            <param name="target">The object instance to invoke the method on.</param>
-            <param name="methodName">The name of the method to invoke.</param>
-            <param name="view">The view.</param>
-            <param name="source">The source of the invocation.</param>
-            <param name="eventArgs">The event args.</param>
-            <param name="parameters">The method parameters.</param>
+            <param name="target"> The object instance to invoke the method on. </param>
+            <param name="methodName"> The name of the method to invoke. </param>
+            <param name="view"> The view. </param>
+            <param name="source"> The source of the invocation. </param>
+            <param name="eventArgs"> The event args. </param>
+            <param name="parameters"> The method parameters. </param>
         </member>
         <member name="T:Caliburn.Micro.ScreenExtensions">
             <summary>
@@ -1224,6 +1383,13 @@
             Generic extension methods used by the framework.
             </summary>
         </member>
+        <member name="M:Caliburn.Micro.ExtensionMethods.GetAssemblyName(System.Reflection.Assembly)">
+            <summary>
+            Get's the name of the assembly.
+            </summary>
+            <param name="assembly">The assembly.</param>
+            <returns>The assembly's name.</returns>
+        </member>
         <member name="M:Caliburn.Micro.ExtensionMethods.GetAttributes``1(System.Reflection.MemberInfo,System.Boolean)">
             <summary>
             Gets all the attributes of a particular type.
@@ -1290,6 +1456,17 @@
             Derives the SelectedItem property name.
             </summary>
         </member>
+        <member name="F:Caliburn.Micro.ConventionManager.SetBinding">
+            <summary>
+            Creates a binding and sets it on the element, applying the appropriate conventions.
+            </summary>
+            <param name="viewModelType"></param>
+            <param name="path"></param>
+            <param name="property"></param>
+            <param name="element"></param>
+            <param name="convention"></param>
+            <param name="bindableProperty"></param>
+        </member>
         <member name="F:Caliburn.Micro.ConventionManager.ApplyBindingMode">
             <summary>
             Applies the appropriate binding mode to the binding.
@@ -1315,16 +1492,6 @@
             Determines whether a custom update source trigger should be applied to the binding.
             </summary>
         </member>
-        <member name="F:Caliburn.Micro.ConventionManager.HasBinding">
-            <summary>
-            Determines whether a particular dependency property already has a binding on the provided element.
-            </summary>
-        </member>
-        <member name="F:Caliburn.Micro.ConventionManager.SetBinding">
-            <summary>
-            Creates a binding and sets it on the element.
-            </summary>
-        </member>
         <member name="M:Caliburn.Micro.ConventionManager.AddElementConvention``1(System.Windows.DependencyProperty,System.String,System.String)">
             <summary>
             Adds an element convention.
@@ -1348,6 +1515,28 @@
             <returns>The convention if found, null otherwise.</returns>
             <remarks>Searches the class hierarchy for conventions.</remarks>
         </member>
+        <member name="M:Caliburn.Micro.ConventionManager.HasBinding(System.Windows.FrameworkElement,System.Windows.DependencyProperty)">
+            <summary>
+            Determines whether a particular dependency property already has a binding on the provided element.
+            </summary>
+        </member>
+        <member name="M:Caliburn.Micro.ConventionManager.SetBindingWithoutBindingOverwrite(System.Type,System.String,System.Reflection.PropertyInfo,System.Windows.FrameworkElement,Caliburn.Micro.ElementConvention,System.Windows.DependencyProperty)">
+            <summary>
+            Creates a binding and sets it on the element, guarding against pre-existing bindings.
+            </summary>
+        </member>
+        <member name="M:Caliburn.Micro.ConventionManager.SetBindingWithoutBindingOrValueOverwrite(System.Type,System.String,System.Reflection.PropertyInfo,System.Windows.FrameworkElement,Caliburn.Micro.ElementConvention,System.Windows.DependencyProperty)">
+            <summary>
+            Creates a binding and set it on the element, guarding against pre-existing bindings and pre-existing values.
+            </summary>
+            <param name="viewModelType"></param>
+            <param name="path"></param>
+            <param name="property"></param>
+            <param name="element"></param>
+            <param name="convention"></param>
+            <param name="bindableProperty"> </param>
+            <returns></returns>
+        </member>
         <member name="M:Caliburn.Micro.ConventionManager.ApplyItemTemplate(System.Windows.Controls.ItemsControl,System.Reflection.PropertyInfo)">
             <summary>
             Attempts to apply the default item template to the items control.
@@ -1355,7 +1544,7 @@
             <param name="itemsControl">The items control.</param>
             <param name="property">The collection property.</param>
         </member>
-        <member name="M:Caliburn.Micro.ConventionManager.ConfigureSelectedItem(System.Windows.FrameworkElement,System.Windows.DependencyProperty,System.Type,System.String)">
+        <member name="F:Caliburn.Micro.ConventionManager.ConfigureSelectedItem">
             <summary>
             Configures the selected item convention.
             </summary>
@@ -1364,12 +1553,24 @@
             <param name="viewModelType">The view model type.</param>
             <param name="path">The property path.</param>
         </member>
-        <member name="M:Caliburn.Micro.ConventionManager.ApplyHeaderTemplate(System.Windows.FrameworkElement,System.Windows.DependencyProperty,System.Type)">
+        <member name="F:Caliburn.Micro.ConventionManager.ConfigureSelectedItemBinding">
+            <summary>
+            Configures the SelectedItem binding for matched selection path.
+            </summary>
+            <param name="selector">The element that has a SelectedItem property.</param>
+            <param name="selectedItemProperty">The SelectedItem property.</param>
+            <param name="viewModelType">The view model type.</param>
+            <param name="selectionPath">The property path.</param>
+            <param name="binding">The binding to configure.</param>
+            <returns>A bool indicating whether to apply binding</returns>
+        </member>
+        <member name="M:Caliburn.Micro.ConventionManager.ApplyHeaderTemplate(System.Windows.FrameworkElement,System.Windows.DependencyProperty,System.Windows.DependencyProperty,System.Type)">
             <summary>
             Applies a header template based on <see cref="T:Caliburn.Micro.IHaveDisplayName"/>
             </summary>
             <param name="element"></param>
             <param name="headerTemplateProperty"></param>
+            <param name="headerTemplateSelectorProperty"> </param>
             <param name="viewModelType"></param>
         </member>
         <member name="M:Caliburn.Micro.ConventionManager.GetPropertyCaseInsensitive(System.Type,System.String)">
@@ -1392,41 +1593,41 @@
         </member>
         <member name="T:Caliburn.Micro.Message">
             <summary>
-            Host's attached properties related to routed UI messaging.
+              Host's attached properties related to routed UI messaging.
             </summary>
         </member>
         <member name="M:Caliburn.Micro.Message.SetHandler(System.Windows.DependencyObject,System.Object)">
             <summary>
-            Places a message handler on this element.
+              Places a message handler on this element.
             </summary>
-            <param name="d">The element.</param>
-            <param name="value">The message handler.</param>
+            <param name="d"> The element. </param>
+            <param name="value"> The message handler. </param>
         </member>
         <member name="M:Caliburn.Micro.Message.GetHandler(System.Windows.DependencyObject)">
             <summary>
-            Gets the message handler for this element.
+              Gets the message handler for this element.
             </summary>
-            <param name="d">The element.</param>
-            <returns>The message handler.</returns>
+            <param name="d"> The element. </param>
+            <returns> The message handler. </returns>
         </member>
         <member name="F:Caliburn.Micro.Message.AttachProperty">
             <summary>
-            A property definition representing attached triggers and messages.
+              A property definition representing attached triggers and messages.
             </summary>
         </member>
         <member name="M:Caliburn.Micro.Message.SetAttach(System.Windows.DependencyObject,System.String)">
             <summary>
-            Sets the attached triggers and messages.
+              Sets the attached triggers and messages.
             </summary>
-            <param name="d">The element to attach to.</param>
-            <param name="attachText">The parsable attachment text.</param>
+            <param name="d"> The element to attach to. </param>
+            <param name="attachText"> The parsable attachment text. </param>
         </member>
         <member name="M:Caliburn.Micro.Message.GetAttach(System.Windows.DependencyObject)">
             <summary>
-            Gets the attached triggers and messages.
+              Gets the attached triggers and messages.
             </summary>
-            <param name="d">The element that was attached to.</param>
-            <returns>The parsable attachment text.</returns>
+            <param name="d"> The element that was attached to. </param>
+            <returns> The parsable attachment text. </returns>
         </member>
         <member name="T:Caliburn.Micro.IHaveParameters">
             <summary>
@@ -1507,6 +1708,79 @@
               Separator used when resolving View names for context instances.
             </summary>
         </member>
+        <member name="M:Caliburn.Micro.ViewLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">
+            <summary>
+            Specifies how type mappings are created, including default type mappings. Calling this method will
+            clear all existing name transformation rules and create new default type mappings according to the
+            configuration.
+            </summary>
+            <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddDefaultTypeMapping(System.String)">
+            <summary>
+            Adds a default type mapping using the standard namespace mapping convention
+            </summary>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.RegisterViewSuffix(System.String)">
+            <summary>
+            This method registers a View suffix or synonym so that View Context resolution works properly.
+            It is automatically called internally when calling AddNamespaceMapping(), AddDefaultTypeMapping(),
+            or AddTypeMapping(). It should not need to be called explicitly unless a rule that handles synonyms
+            is added directly through the NameTransformer.
+            </summary>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View".</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">
+            <summary>
+            Adds a standard type mapping based on namespace RegEx replace and filter patterns
+            </summary>
+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+            <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">
+            <summary>
+            Adds a standard type mapping based on namespace RegEx replace and filter patterns
+            </summary>
+            <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+            <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+            <param name="nsTargetRegEx">RegEx replace value for target namespace</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String[],System.String)">
+            <summary>
+            Adds a standard type mapping based on simple namespace mapping
+            </summary>
+            <param name="nsSource">Namespace of source type</param>
+            <param name="nsTargets">Namespaces of target type as an array</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String,System.String)">
+            <summary>
+            Adds a standard type mapping based on simple namespace mapping
+            </summary>
+            <param name="nsSource">Namespace of source type</param>
+            <param name="nsTarget">Namespace of target type</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">
+            <summary>
+            Adds a standard type mapping by substituting one subnamespace for another
+            </summary>
+            <param name="nsSource">Subnamespace of source type</param>
+            <param name="nsTargets">Subnamespaces of target type as an array</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
+        <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">
+            <summary>
+            Adds a standard type mapping by substituting one subnamespace for another
+            </summary>
+            <param name="nsSource">Subnamespace of source type</param>
+            <param name="nsTarget">Subnamespace of target type</param>
+            <param name="viewSuffix">Suffix for type name. Should  be "View" or synonym of "View". (Optional)</param>
+        </member>
         <member name="F:Caliburn.Micro.ViewLocator.GetOrCreateViewType">
             <summary>
               Retrieves the view from the IoC container or tries to create it if not found.
@@ -1515,6 +1789,22 @@
               Pass the type of view as a parameter and recieve an instance of the view.
             </remarks>
         </member>
+        <member name="F:Caliburn.Micro.ViewLocator.ModifyModelTypeAtDesignTime">
+            <summary>
+            Modifies the name of the type to be used at design time.
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.ViewLocator.TransformName">
+            <summary>
+            Transforms a ViewModel type name into all of its possible View type names. Optionally accepts an instance
+            of context object
+            </summary>
+            <returns>Enumeration of transformed names</returns>
+            <remarks>Arguments:
+            typeName = The name of the ViewModel type being resolved to its companion View.
+            context = An instance of the context or null.
+            </remarks>
+        </member>
         <member name="F:Caliburn.Micro.ViewLocator.LocateTypeForModelType">
             <summary>
               Locates the view type based on the specified model type.
@@ -1542,6 +1832,11 @@
               Pass the model instance, display location (or null) and the context (or null) as parameters and receive a view instance.
             </remarks>
         </member>
+        <member name="F:Caliburn.Micro.ViewLocator.DeterminePackUriFromType">
+            <summary>
+            Transforms a view type into a pack uri.
+            </summary>
+        </member>
         <member name="M:Caliburn.Micro.ViewLocator.InitializeComponent(System.Object)">
             <summary>
               When a view does not contain a code-behind file, we need to automatically call InitializeCompoent.
@@ -1560,7 +1855,7 @@
         </member>
         <member name="F:Caliburn.Micro.MessageBinder.CustomConverters">
             <summary>
-            Custom converters used by the framework registered by detination type for which the will be selected.
+            Custom converters used by the framework registered by destination type for which they will be selected.
             The converter is passed the existing value to convert and a "context" object.
             </summary>
         </member>
@@ -1916,6 +2211,11 @@
             <param name = "getReplaceString">A function to do a transform on each item in the ReplaceValueList prior to applying the regular expression transform</param>
             <returns>The transformed names.</returns>
         </member>
+        <member name="P:Caliburn.Micro.NameTransformer.UseEagerRuleSelection">
+            <summary>
+            Flag to indicate if transformations from all matched rules are returned. Otherwise, transformations from only the first matched rule are returned.
+            </summary>
+        </member>
         <member name="T:Caliburn.Micro.NameTransformer.Rule">
             <summary>
              A rule that describes a name transform.
@@ -2072,20 +2372,22 @@
             A service that manages windows.
             </summary>
         </member>
-        <member name="M:Caliburn.Micro.IWindowManager.ShowDialog(System.Object,System.Object)">
+        <member name="M:Caliburn.Micro.IWindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
             Shows a modal dialog for the specified model.
             </summary>
             <param name="rootModel">The root model.</param>
             <param name="context">The context.</param>
+            <param name="settings">The optional dialog settings.</param>
             <returns>The dialog result.</returns>
         </member>
-        <member name="M:Caliburn.Micro.IWindowManager.ShowWindow(System.Object,System.Object)">
+        <member name="M:Caliburn.Micro.IWindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
             Shows a non-modal window for the specified model.
             </summary>
             <param name="rootModel">The root model.</param>
             <param name="context">The context.</param>
+            <param name="settings">The optional window settings.</param>
         </member>
         <member name="M:Caliburn.Micro.IWindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
@@ -2100,20 +2402,22 @@
             A service that manages windows.
             </summary>
         </member>
-        <member name="M:Caliburn.Micro.WindowManager.ShowDialog(System.Object,System.Object)">
+        <member name="M:Caliburn.Micro.WindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
             Shows a modal dialog for the specified model.
             </summary>
             <param name="rootModel">The root model.</param>
             <param name="context">The context.</param>
+            <param name="settings">The dialog popup settings.</param>
             <returns>The dialog result.</returns>
         </member>
-        <member name="M:Caliburn.Micro.WindowManager.ShowWindow(System.Object,System.Object)">
+        <member name="M:Caliburn.Micro.WindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
             Shows a window for the specified model.
             </summary>
             <param name="rootModel">The root model.</param>
             <param name="context">The context.</param>
+            <param name="settings">The optional window settings.</param>
         </member>
         <member name="M:Caliburn.Micro.WindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
@@ -2131,13 +2435,14 @@
             <param name="settings">The optional popup settings.</param>
             <returns>The popup.</returns>
         </member>
-        <member name="M:Caliburn.Micro.WindowManager.CreateWindow(System.Object,System.Boolean,System.Object)">
+        <member name="M:Caliburn.Micro.WindowManager.CreateWindow(System.Object,System.Boolean,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
             Creates a window.
             </summary>
             <param name="rootModel">The view model.</param>
             <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
             <param name="context">The view context.</param>
+            <param name="settings">The optional popup settings.</param>
             <returns>The window.</returns>
         </member>
         <member name="M:Caliburn.Micro.WindowManager.EnsureWindow(System.Object,System.Object,System.Boolean)">
@@ -2156,13 +2461,14 @@
             <param name="window">The window to whose owner needs to be determined.</param>
             <returns>The owner.</returns>
         </member>
-        <member name="M:Caliburn.Micro.WindowManager.CreatePage(System.Object,System.Object)">
+        <member name="M:Caliburn.Micro.WindowManager.CreatePage(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
             <summary>
             Creates the page.
             </summary>
             <param name="rootModel">The root model.</param>
             <param name="context">The context.</param>
-            <returns></returns>
+            <param name="settings">The optional popup settings.</param>
+            <returns>The page.</returns>
         </member>
         <member name="M:Caliburn.Micro.WindowManager.EnsurePage(System.Object,System.Object)">
             <summary>
@@ -2170,7 +2476,7 @@
             </summary>
             <param name="model">The model.</param>
             <param name="view">The view.</param>
-            <returns></returns>
+            <returns>The page.</returns>
         </member>
         <member name="T:Caliburn.Micro.SequentialResult">
             <summary>
@@ -2219,6 +2525,7 @@
             <summary>
             Creates an instance of the bootstrapper.
             </summary>
+            <param name="useApplication">Set this to false when hosting Caliburn.Micro inside and Office or WinForms application. The default is true.</param>
         </member>
         <member name="M:Caliburn.Micro.Bootstrapper.StartDesignTime">
             <summary>
@@ -2230,14 +2537,14 @@
             Called by the bootstrapper's constructor at runtime to start the framework.
             </summary>
         </member>
-        <member name="M:Caliburn.Micro.Bootstrapper.Configure">
+        <member name="M:Caliburn.Micro.Bootstrapper.PrepareApplication">
             <summary>
-            Override to configure the framework and setup your IoC container.
+            Provides an opportunity to hook into the application object.
             </summary>
         </member>
-        <member name="M:Caliburn.Micro.Bootstrapper.PrepareApplication">
+        <member name="M:Caliburn.Micro.Bootstrapper.Configure">
             <summary>
-            Provides an opportunity to hook into the application object.
+            Override to configure the framework and setup your IoC container.
             </summary>
         </member>
         <member name="M:Caliburn.Micro.Bootstrapper.SelectAssemblies">
@@ -2312,29 +2619,101 @@
             <param name="sender">The sender.</param>
             <param name="e">The args.</param>
         </member>
+        <member name="T:Caliburn.Micro.TypeMappingConfiguration">
+            <summary>
+            Class to specify settings for configuring type mappings by the ViewLocator or ViewModelLocator
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.DefaultSubNamespaceForViews">
+            <summary>
+            The default subnamespace for Views. Used for creating default subnamespace mappings. Defaults to "Views".
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.DefaultSubNamespaceForViewModels">
+            <summary>
+            The default subnamespace for ViewModels. Used for creating default subnamespace mappings. Defaults to "ViewModels".
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.UseNameSuffixesInMappings">
+            <summary>
+            Flag to indicate whether or not the name of the Type should be transformed when adding a type mapping. Defaults to true.
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.NameFormat">
+            <summary>
+            The format string used to compose the name of a type from base name and name suffix
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.IncludeViewSuffixInViewModelNames">
+            <summary>
+            Flag to indicate if ViewModel names should include View suffixes (i.e. CustomerPageViewModel vs. CustomerViewModel)
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.ViewSuffixList">
+            <summary>
+            List of View suffixes for which default type mappings should be created. Applies only when UseNameSuffixesInMappings = true.
+            Default values are "View", "Page"
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.TypeMappingConfiguration.ViewModelSuffix">
+            <summary>
+            The name suffix for ViewModels. Applies only when UseNameSuffixesInMappings = true. The default is "ViewModel".
+            </summary>
+        </member>
         <member name="T:Caliburn.Micro.Bind">
             <summary>
-            Hosts dependency properties for binding.
+              Hosts dependency properties for binding.
             </summary>
         </member>
         <member name="F:Caliburn.Micro.Bind.ModelProperty">
             <summary>
-            Allows binding on an existing view.
+              Allows binding on an existing view. Use this on root UserControls, Pages and Windows; not in a DataTemplate.
+            </summary>
+        </member>
+        <member name="F:Caliburn.Micro.Bind.ModelWithoutContextProperty">
+            <summary>
+              Allows binding on an existing view without setting the data context. Use this from within a DataTemplate.
             </summary>
         </member>
+        <member name="M:Caliburn.Micro.Bind.GetModelWithoutContext(System.Windows.DependencyObject)">
+            <summary>
+              Gets the model to bind to.
+            </summary>
+            <param name = "dependencyObject">The dependency object to bind to.</param>
+            <returns>The model.</returns>
+        </member>
+        <member name="M:Caliburn.Micro.Bind.SetModelWithoutContext(System.Windows.DependencyObject,System.Object)">
+            <summary>
+              Sets the model to bind to.
+            </summary>
+            <param name = "dependencyObject">The dependency object to bind to.</param>
+            <param name = "value">The model.</param>
+        </member>
         <member name="M:Caliburn.Micro.Bind.GetModel(System.Windows.DependencyObject)">
             <summary>
-            Gets the model to bind to.
+              Gets the model to bind to.
             </summary>
-            <param name="dependencyObject">The dependency object to bind to.</param>
+            <param name = "dependencyObject">The dependency object to bind to.</param>
             <returns>The model.</returns>
         </member>
         <member name="M:Caliburn.Micro.Bind.SetModel(System.Windows.DependencyObject,System.Object)">
             <summary>
-            Sets the model to bind to.
+              Sets the model to bind to.
+            </summary>
+            <param name = "dependencyObject">The dependency object to bind to.</param>
+            <param name = "value">The model.</param>
+        </member>
+        <member name="F:Caliburn.Micro.Bind.AtDesignTimeProperty">
+            <summary>
+            Allows application of conventions at design-time.
+            </summary>
+        </member>
+        <member name="M:Caliburn.Micro.Bind.SetAtDesignTime(System.Windows.DependencyObject,System.Boolean)">
+            <summary>
+            Sets whether or not do bind conventions at design-time.
             </summary>
-            <param name="dependencyObject">The dependency object to bind to.</param>
-            <param name="value">The model.</param>
+            <param name="dependencyObject">The ui to apply conventions to.</param>
+            <param name="value">Whether or not to apply conventions.</param>
         </member>
         <member name="T:Caliburn.Micro.AttachedCollection`1">
             <summary>

fontconfig-2.8.0.tar.gz Deleted

freetype-2.4.7.tar.bz2 Deleted

handbrake.ebuild Added

@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Sebastien Piccand <sebcactus gmail com>
+
+pkgname=('handbrake' 'handbrake-cli')
+pkgver=0.9.8
+pkgrel=28
+arch=('i686' 'x86_64')
+url="http://handbrake.fr/"
+license=('GPL')
+makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
+             'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi')
+source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2)
+
+build() {
+  cd "$srcdir/HandBrake-$pkgver"
+  mv "libhb/hb.h" "libhb/hb2.h"
+  
+  # Fix #include libhb
+  for file in $(grep -R '#include "hb.h"' * 2>/dev/null | awk -F':' '{print $1}'); do sed -i 's/#include\ \"hb\.h\"/#include\ \"hb2\.h\"/g' ${file}; done
+  # Use Python 2
+  sed -i 's/python /python2 /' gtk/src/Makefile.am
+
+  #disable harfbuzz
+  sed -i 's/--disable-png\ --disable-enca\ \\/--disable-png\ --disable-enca\ --disable-harfbuzz\ \\/g' "$srcdir/HandBrake-$pkgver/contrib/libass/module.defs"
+
+  ./configure --prefix=/usr --force --disable-gtk-update-checks
+  cd build
+  make
+}
+
+package_handbrake() {
+  pkgdesc="Multithreaded video transcoder"
+  depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib'
+           'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
+  install=$pkgname.install
+
+  cd "$srcdir/HandBrake-$pkgver/build"
+
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/bin/HandBrakeCLI"
+}
+
+package_handbrake-cli() {
+  pkgdesc="Multithreaded video transcoder (CLI)"
+  depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi')
+
+  cd "$srcdir/HandBrake-$pkgver/build"
+  install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
+}
+
+# vim:set ts=2 sw=2 et:
+sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798')

libass-0.10.0-1.tar.gz Deleted

libav-v9.6.tar.bz2 Added

libbluray-0.0.1-pre-213-ga869da8.tar.gz/.gitignore Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/TODO.txt Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/doc/README Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/m4/.dummy Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/COPYING -> libbluray-0.2.3.tar.bz2/COPYING Changed

@@ -456,47 +456,3 @@
 DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  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 library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; 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.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

libbluray-0.2.3.tar.bz2/ChangeLog Added

libbluray-0.0.1-pre-213-ga869da8.tar.gz/Makefile.am -> libbluray-0.2.3.tar.bz2/Makefile.am Changed

libbluray-0.2.3.tar.bz2/Makefile.in Added

@@ -0,0 +1,902 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#   Copyright (c) 2009 Oren Ben-Kiki <oren@ben-kiki.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+#
+#   Automake Support
+#
+#   The following is a template aminclude.am file for use with Automake.
+#   Make targets and variables values are controlled by the various
+#   DX_COND_* conditionals set by autoconf.
+#
+#   The provided targets are:
+#
+#     doxygen-doc: Generate all doxygen documentation.
+#
+#     doxygen-run: Run doxygen, which will generate some of the
+#                  documentation (HTML, CHM, CHI, MAN, RTF, XML)
+#                  but will not do the post processing required
+#                  for the rest of it (PS, PDF, and some MAN).
+#
+#     doxygen-man: Rename some doxygen generated man pages.
+#
+#     doxygen-ps:  Generate doxygen PostScript documentation.
+#
+#     doxygen-pdf: Generate doxygen PDF documentation.
+#
+#   Note that by default these are not integrated into the automake targets.
+#   If doxygen is used to generate man pages, you can achieve this
+#   integration by setting man3_MANS to the list of man pages generated and
+#   then adding the dependency:
+#
+#     $(man3_MANS): doxygen-doc
+#
+#   This will cause make to run doxygen and generate all the documentation.
+#
+#   The following variable is intended for use in Makefile.am:
+#
+#     DX_CLEANFILES = everything to clean.
+#
+#   Then add this variable to MOSTLYCLEANFILES.
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/configure $(top_srcdir)/doxygen-include.am \
+	$(top_srcdir)/src/libbluray/bluray-version.h.in COPYING \
+	ChangeLog build-aux/config.guess build-aux/config.sub \
+	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
+	build-aux/missing
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = src/libbluray/bluray-version.h
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
+BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
+BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
+BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
+DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DX_CONFIG = @DX_CONFIG@
+DX_DOCDIR = @DX_DOCDIR@
+DX_DOT = @DX_DOT@
+DX_DOXYGEN = @DX_DOXYGEN@
+DX_DVIPS = @DX_DVIPS@
+DX_EGREP = @DX_EGREP@
+DX_ENV = @DX_ENV@
+DX_FLAG_chi = @DX_FLAG_chi@
+DX_FLAG_chm = @DX_FLAG_chm@
+DX_FLAG_doc = @DX_FLAG_doc@
+DX_FLAG_dot = @DX_FLAG_dot@
+DX_FLAG_html = @DX_FLAG_html@
+DX_FLAG_man = @DX_FLAG_man@
+DX_FLAG_pdf = @DX_FLAG_pdf@
+DX_FLAG_ps = @DX_FLAG_ps@
+DX_FLAG_rtf = @DX_FLAG_rtf@
+DX_FLAG_xml = @DX_FLAG_xml@
+DX_HHC = @DX_HHC@
+DX_LATEX = @DX_LATEX@
+DX_MAKEINDEX = @DX_MAKEINDEX@
+DX_PDFLATEX = @DX_PDFLATEX@
+DX_PERL = @DX_PERL@
+DX_PROJECT = @DX_PROJECT@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
+SET_MAKE = @SET_MAKE@
+SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
+SET_WARNINGS = @SET_WARNINGS@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
+@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
+@DX_COND_chi_TRUE@@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
+@DX_COND_doc_TRUE@@DX_COND_man_TRUE@DX_CLEAN_MAN = @DX_DOCDIR@/man
+@DX_COND_doc_TRUE@@DX_COND_rtf_TRUE@DX_CLEAN_RTF = @DX_DOCDIR@/rtf
+@DX_COND_doc_TRUE@@DX_COND_xml_TRUE@DX_CLEAN_XML = @DX_DOCDIR@/xml
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_PS_GOAL = doxygen-ps
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_PDF_GOAL = doxygen-pdf
+@DX_COND_doc_TRUE@@DX_COND_latex_TRUE@DX_CLEAN_LATEX = @DX_DOCDIR@/latex
+@DX_COND_doc_TRUE@DX_CLEANFILES = \
+@DX_COND_doc_TRUE@	-r \
+@DX_COND_doc_TRUE@	@DX_DOCDIR@
+
+SUBDIRS = src
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = bootstrap doc COPYING player_wrappers README.txt ChangeLog
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
+AUTOMAKE_OPTIONS = \
+	dist-bzip2 \
+	no-dist-gzip
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/doxygen-include.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/doxygen-include.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+src/libbluray/bluray-version.h: $(top_builddir)/config.status $(top_srcdir)/src/libbluray/bluray-version.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
+
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	cd @DX_DOCDIR@/latex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(DX_LATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(MAKEINDEX_PATH) refman.idx; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(DX_LATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	countdown=5; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@				refman.log > /dev/null 2>&1 \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@			&& test $$countdown -gt 0; do \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@			$(DX_LATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@			countdown=`expr $$countdown - 1`; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	done; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
+
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
+
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	cd @DX_DOCDIR@/latex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	$(DX_PDFLATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	$(DX_MAKEINDEX) refman.idx; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	$(DX_PDFLATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	countdown=5; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@				refman.log > /dev/null 2>&1 \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@			&& test $$countdown -gt 0; do \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@			$(DX_PDFLATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@			countdown=`expr $$countdown - 1`; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	done; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	mv refman.pdf ../@PACKAGE@.pdf
+
+@DX_COND_doc_TRUE@.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_COND_doc_TRUE@.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_COND_doc_TRUE@doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
+
+@DX_COND_doc_TRUE@doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_COND_doc_TRUE@@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
+@DX_COND_doc_TRUE@	rm -rf @DX_DOCDIR@
+@DX_COND_doc_TRUE@	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

libbluray-0.2.3.tar.bz2/aclocal.m4 Added

@@ -0,0 +1,1009 @@
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.3], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 12
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+m4_if([$1], [v7],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/ax_prog_doxygen.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
+m4_include([m4/pkg.m4])

libbluray-0.2.3.tar.bz2/build-aux Added

libbluray-0.2.3.tar.bz2/build-aux/config.guess Added

@@ -0,0 +1,1530 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file 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, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

libbluray-0.2.3.tar.bz2/build-aux/config.sub Added

@@ -0,0 +1,1773 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file 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, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

libbluray-0.2.3.tar.bz2/build-aux/depcomp Added

@@ -0,0 +1,688 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2011-12-04.11; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
+
+# 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, 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, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> "$depfile"
+    echo >> "$depfile"
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/	\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

libbluray-0.2.3.tar.bz2/build-aux/install-sh Added

@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-01-19.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# 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
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for `test' and other utilities.
+  case $src in
+    -* | [=!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X$//$[^/]' \| \
+	     X"$dst" : 'X$//$$' \| \
+	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/$.*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	[-=!]*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

libbluray-0.2.3.tar.bz2/build-aux/ltmain.sh Added

@@ -0,0 +1,9661 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
+TIMESTAMP=""
+package_revision=1.3337
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/$[^/]*$.*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/$[`"$\\]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$["`\\]$/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\$[^$bs]\$$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^$[0-9]$/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/$(C)$[ 0-9,-]*$ [1-9][0-9]*$/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	p
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $opt_debug
+
+    func_error "missing argument for $1."
+    exit_cmd=exit
+}
+
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^$..$.*$/\1/;q'
+    my_sed_short_rest='1s/^..$.*$$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^$--[^=]*$=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+nonopt=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+    esac
+  done
+
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
+
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=$[^ ]*$ .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/$[ ']$$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/$[ ']-[LR]$=/\1/g; s/$[ ']$=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%$[^/]*$$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+volatile const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$[\\"]$/\\\1/g
+s/$/\\n/
+s/$[^\n]*$.*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps ; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $[^ $]*$/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_append libobjs " $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$opt_mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS="$save_ifs"
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$opt_mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    func_append oldobjs " $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
+      else
+	odir="$dir/$objdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case "$opt_mode" in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$opt_mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$opt_mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+

libbluray-0.2.3.tar.bz2/build-aux/missing Added

@@ -0,0 +1,331 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2012-01-06.13; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# 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, 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, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
+sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG=\${$#}
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG=\${$#}
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit $?
+    fi
+    ;;
+
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* $[^ ]*$ *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

libbluray-0.2.3.tar.bz2/config.h.in Added

@@ -0,0 +1,134 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <jni.h> header file. */
+#undef HAVE_JNI_H
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
+/* Define to 1 if libxml2 is to be used for metadata parsing */
+#undef HAVE_LIBXML2
+
+/* Define to 1 if you have the <linux/cdrom.h> header file. */
+#undef HAVE_LINUX_CDROM_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <mntent.h> header file. */
+#undef HAVE_MNTENT_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if `d_type' is a member of `struct dirent'. */
+#undef HAVE_STRUCT_DIRENT_D_TYPE
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* "Defines the architecture of the java vm." */
+#undef JAVA_ARCH
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* "Define to 1 if using BD-Java" */
+#undef USING_BDJAVA
+
+/* Version number of package */
+#undef VERSION
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to '0x0500' for Windows XP APIs. */
+#undef _WIN32_WINNT

libbluray-0.2.3.tar.bz2/configure Added

@@ -0,0 +1,17055 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.68 for libbluray 0.2.3.
+#
+# Report bugs to <http://www.videolan.org/developers/libbluray.html>.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://www.videolan.org/developers/libbluray.html about
+$0: your system, including any error possibly output before
+$0: this message. Then install a modern shell, or manually
+$0: run the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X$//$[^/]' \| \
+	 X"$as_dir" : 'X$//$$' \| \
+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '$a$' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*$...$'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
+	 X"$0" : 'X$//$$' \| \
+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/$[^/][^/]*$\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='libbluray'
+PACKAGE_TARNAME='libbluray'
+PACKAGE_VERSION='0.2.3'
+PACKAGE_STRING='libbluray 0.2.3'
+PACKAGE_BUGREPORT='http://www.videolan.org/developers/libbluray.html'
+PACKAGE_URL=''
+
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+SET_DEBUG_OPTS
+SET_OPTIMIZATIONS
+SET_WARNINGS
+DLOPEN_LIBS
+BDJAVA_CFLAGS
+LT_VERSION_INFO
+BLURAY_VERSION_MICRO
+BLURAY_VERSION_MINOR
+BLURAY_VERSION_MAJOR
+DOXYGEN_PAPER_SIZE
+DX_COND_latex_FALSE
+DX_COND_latex_TRUE
+DX_COND_pdf_FALSE
+DX_COND_pdf_TRUE
+DX_PDFLATEX
+DX_FLAG_pdf
+DX_COND_ps_FALSE
+DX_COND_ps_TRUE
+DX_EGREP
+DX_DVIPS
+DX_MAKEINDEX
+DX_LATEX
+DX_FLAG_ps
+DX_COND_html_FALSE
+DX_COND_html_TRUE
+DX_FLAG_html
+DX_COND_chi_FALSE
+DX_COND_chi_TRUE
+DX_FLAG_chi
+DX_COND_chm_FALSE
+DX_COND_chm_TRUE
+DX_HHC
+DX_FLAG_chm
+DX_COND_xml_FALSE
+DX_COND_xml_TRUE
+DX_FLAG_xml
+DX_COND_rtf_FALSE
+DX_COND_rtf_TRUE
+DX_FLAG_rtf
+DX_COND_man_FALSE
+DX_COND_man_TRUE
+DX_FLAG_man
+DX_COND_dot_FALSE
+DX_COND_dot_TRUE
+DX_DOT
+DX_FLAG_dot
+DX_COND_doc_FALSE
+DX_COND_doc_TRUE
+DX_PERL
+DX_DOXYGEN
+DX_FLAG_doc
+DX_ENV
+DX_DOCDIR
+DX_CONFIG
+DX_PROJECT
+USING_BDJAVA_FALSE
+USING_BDJAVA_TRUE
+USING_EXAMPLES_FALSE
+USING_EXAMPLES_TRUE
+LIBXML2_LIBS
+LIBXML2_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+HAVE_PKG_CONFIG
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+LIBTOOL
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_jdk
+enable_werror
+enable_extra_warnings
+enable_optimizations
+enable_examples
+enable_debug
+enable_bdjava
+enable_libxml2
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_largefile
+enable_doxygen_doc
+enable_doxygen_dot
+enable_doxygen_man
+enable_doxygen_rtf
+enable_doxygen_xml
+enable_doxygen_chm
+enable_doxygen_chi
+enable_doxygen_html
+enable_doxygen_ps
+enable_doxygen_pdf
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+LIBXML2_CFLAGS
+LIBXML2_LIBS
+DOXYGEN_PAPER_SIZE'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X$//$[^/]' \| \
+	 X"$as_myself" : 'X$//$$' \| \
+	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures libbluray 0.2.3 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/libbluray]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of libbluray 0.2.3:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-werror         set warnings as errors via -Werror (default is no)
+  --enable-extra-warnings set extra warnings (default is yes)
+  --enable-optimizations  enable optimizations (default is yes)
+  --enable-examples       build examples (default is yes)
+  --enable-debug          enable debugging information (default is yes)
+  --enable-bdjava         enable BD-Java support (default is no)
+  --enable-libxml2        enable libxml2 support (default is yes)
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-largefile     omit support for large files
+  --disable-doxygen-doc   don't generate any doxygen documentation
+  --disable-doxygen-dot   don't generate graphics for doxygen documentation
+  --enable-doxygen-man    generate doxygen manual pages
+  --enable-doxygen-rtf    generate doxygen RTF documentation
+  --enable-doxygen-xml    generate doxygen XML documentation
+  --enable-doxygen-chm    generate doxygen compressed HTML help documentation
+  --enable-doxygen-chi    generate doxygen seperate compressed HTML help index
+                          file
+  --disable-doxygen-html  don't generate doxygen plain HTML documentation
+  --disable-doxygen-ps    don't generate doxygen PostScript documentation
+  --disable-doxygen-pdf   don't generate doxygen PDF documentation
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-jdk=DIR          Specify the path to the JDK (default is
+                          "/usr/lib/jvm/java-6-openjdk")
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  LIBXML2_CFLAGS
+              C compiler flags for LIBXML2, overriding pkg-config
+  LIBXML2_LIBS
+              linker flags for LIBXML2, overriding pkg-config
+  DOXYGEN_PAPER_SIZE
+              a4wide (default), a4, letter, legal or executive
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <http://www.videolan.org/developers/libbluray.html>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+libbluray configure 0.2.3
+generated by GNU Autoconf 2.68
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ---------------------------------------------------------------- ##
+## Report this to http://www.videolan.org/developers/libbluray.html ##
+## ---------------------------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by libbluray $as_me 0.2.3, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_aux_dir=
+for ac_dir in build-aux "$srcdir"/build-aux; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if ${ac_cv_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+am__api_version='1.11'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='libbluray'
+ VERSION='0.2.3'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+   ($_am_tar --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && break
+    done
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x ustar -w "$$tardir"'
+    am__tar_='pax -L -x ustar -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+    am__untar='cpio -i -H ustar -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_ustar}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+   ($am__untar <conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+if ${am_cv_prog_tar_ustar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_prog_tar_ustar=$_am_tool
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+case "${host_os}" in
+  "")
+    SYS=unknown
+    ;;
+  *mingw32* | *cygwin* | *wince* | *mingwce*)
+    case "${host_os}" in
+      *wince* | *mingwce* | *mingw32ce*)
+        SYS=mingwce
+        ;;
+      *mingw32*)
+        SYS=mingw32
+
+$as_echo "#define _WIN32_WINNT 0x0501" >>confdefs.h
+
+        ;;
+    esac
+    ;;
+  *)
+    SYS="${host_os}"
+    ;;
+esac
+
+# messages
+library_not_found="Could not find required library!"
+function_not_found="Could not find required function!"
+libxml2_missing="Could not find libxml2 - disclib meta parser disabled."
+pkg_config_missing="Could not find pkg-config.  Assuming..."
+
+# configure options
+
+
+# Check whether --with-jdk was given.
+if test "${with_jdk+set}" = set; then :
+  withval=$with_jdk; JDK_HOME=$withval
+else
+
+    # Set JDK_HOME unless already set in environment
+    if [ -z "$JDK_HOME" ]; then
+      JDK_HOME="/usr/lib/jvm/java-6-openjdk"
+    fi
+
+fi
+
+
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror; use_werror=$enableval
+else
+  use_werror=no
+fi
+
+
+# Check whether --enable-extra-warnings was given.
+if test "${enable_extra_warnings+set}" = set; then :
+  enableval=$enable_extra_warnings; use_extra_warnings=$enableval
+else
+  use_extra_warnings=yes
+fi
+
+
+# Check whether --enable-optimizations was given.
+if test "${enable_optimizations+set}" = set; then :
+  enableval=$enable_optimizations; use_optimizations=$enableval
+else
+  use_optimizations=yes
+fi
+
+
+# Check whether --enable-examples was given.
+if test "${enable_examples+set}" = set; then :
+  enableval=$enable_examples; use_examples=$enableval
+else
+  use_examples=yes
+fi
+
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug; use_debug=$enableval
+else
+  use_debug=yes
+fi
+
+
+# Check whether --enable-bdjava was given.
+if test "${enable_bdjava+set}" = set; then :
+  enableval=$enable_bdjava; use_bdjava=$enableval
+else
+  use_bdjava=no
+fi
+
+
+# Check whether --enable-libxml2 was given.
+if test "${enable_libxml2+set}" = set; then :
+  enableval=$enable_libxml2; use_libxml2=$enableval
+else
+  use_libxml2=yes
+fi
+
+
+# required programs
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$["`$\\]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$["`\\]$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='$[_A-Za-z][_A-Za-z0-9]*$'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[^ ]*$[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $lib[^ ]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]$$symcode$symcode*$[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	  *\ $GNU\ Binutils$\ 2.[2-9]*) ;;
+	  *\ $GNU\ Binutils$\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	link_all_deplibs=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=$[A-Za-z]:$,\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/$[A-Za-z]:$,\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# required types
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if ${ac_cv_type_signal+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <signal.h>
+
+int
+main ()
+{
+return *(signal (0, 0)) (0) == 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_type_signal=int
+else
+  ac_cv_type_signal=void
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
+
+# required headers
+for ac_header in stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in sys/time.h time.h mntent.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+if test "${SYS}" != "mingw32" ; then
+    for ac_header in pthread.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+else
+  as_fn_error $? "pthread.h required" "$LINENO" 5
+fi
+
+done
+
+fi
+
+# required structures
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if eval \${$as_ac_Header+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main ()
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_ac_Header=yes"
+else
+  eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+fi
+
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dir; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opendir+:} false; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' x; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opendir+:} false; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+
+
+
+  ac_fn_c_check_member "$LINENO" "struct dirent" "d_type" "ac_cv_member_struct_dirent_d_type" "
+#include <sys/types.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# ifdef HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# ifdef HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# ifdef HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
+
+"
+if test "x$ac_cv_member_struct_dirent_d_type" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_DIRENT_D_TYPE 1
+_ACEOF
+
+
+fi
+
+
+
+# required system services
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
+
+
+# required functions
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes; then :
+
+else
+  as_fn_error $? "$function_not_found" "$LINENO" 5
+fi
+
+
+# required libraries
+# pthreads (not on win32)
+if test "${SYS}" != "mingw32" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_create=yes
+else
+  ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+  LIBS="$LIBS -lpthread"
+fi
+
+fi
+
+# dlopen check
+if test "${SYS}" != "mingw32" ; then
+  for ac_func in dlopen
+do :
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLOPEN 1
+_ACEOF
+ DLOPEN_LIBS=""
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  DLOPEN_LIBS="-ldl"
+else
+  as_fn_error $? "$library_not_found" "$LINENO" 5
+fi
+
+fi
+done
+
+fi
+
+# check for pkg-config itself so we don't try the m4 macro without pkg-config
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_PKG_CONFIG"; then
+  ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_HAVE_PKG_CONFIG="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
+if test -n "$HAVE_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5
+$as_echo "$HAVE_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+# libxml2 for metadata parser
+if test "x$use_libxml2" = "xyes"; then
+  if test "x$HAVE_PKG_CONFIG" = "xyes"; then
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
+$as_echo_n "checking for LIBXML2... " >&6; }
+
+if test -n "$LIBXML2_CFLAGS"; then
+    pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBXML2_LIBS"; then
+    pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.6" 2>&1`
+        else
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.6" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBXML2_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $libxml2_missing" >&5
+$as_echo "$as_me: $libxml2_missing" >&6;}
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: $libxml2_missing" >&5
+$as_echo "$as_me: $libxml2_missing" >&6;}
+else
+	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
+	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
+
+fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $pkg_config_missing $libxml2_missing" >&5
+$as_echo "$as_me: $pkg_config_missing $libxml2_missing" >&6;}
+  fi
+fi
+
+# function testing for supported compiler options
+check_cc_options()
+{
+  local tmpfile=$(mktemp XXXXXXXXXX)
+  local tmpcfile="$tmpfile.c"
+  mv $tmpfile $tmpcfile
+  local retval=1
+  printf "Checking if compiler supports $@... "
+  if $CC -c $@ $tmpcfile -o /dev/null >/dev/null 2>&1; then
+    local retval=0
+  fi
+  rm $tmpcfile
+  if [ $retval = "0" ]; then
+    echo "yes"
+  else
+    echo "no"
+  fi
+  return $retval
+}
+
+# set default warnings if supported
+check_cc_options -Wall && \
+  SET_WARNINGS="$SET_WARNINGS -Wall"
+check_cc_options -Wdisabled-optimization && \
+  SET_WARNINGS="$SET_WARNINGS -Wdisabled-optimization"
+check_cc_options -Wpointer-arith && \
+  SET_WARNINGS="$SET_WARNINGS -Wpointer-arith"
+check_cc_options -Wredundant-decls && \
+  SET_WARNINGS="$SET_WARNINGS -Wredundant-decls"
+check_cc_options -Wcast-qual && \
+  SET_WARNINGS="$SET_WARNINGS -Wcast-qual"
+check_cc_options -Wwrite-strings && \
+  SET_WARNINGS="$SET_WARNINGS -Wwrite-strings"
+check_cc_options -Wtype-limits && \
+  SET_WARNINGS="$SET_WARNINGS -Wtype-limits"
+check_cc_options -Wundef && \
+  SET_WARNINGS="$SET_WARNINGS -Wundef"
+
+# no implicit function declarations
+check_cc_options -Werror-implicit-function-declaration && \
+  SET_WARNINGS="$SET_WARNINGS -Werror-implicit-function-declaration"
+
+# use -Werror
+if [ $use_werror = "yes" ]; then
+  check_cc_options -Werror && \
+    SET_WARNINGS="$SET_WARNINGS -Werror"
+fi
+
+# use extra warnings
+if [ $use_extra_warnings = "yes" ]; then
+  check_cc_options -Wextra && \
+    SET_WARNINGS="$SET_WARNINGS -Wextra"
+  check_cc_options -Winline && \
+    SET_WARNINGS="$SET_WARNINGS -Winline"
+fi
+
+# use optimizations
+if [ $use_optimizations = "yes" ]; then
+  check_cc_options -O3 && \
+    SET_OPTIMIZATIONS="$SET_OPTIMIZATIONS -O3"
+  check_cc_options -fomit-frame-pointer && \
+    SET_OPTIMIZATIONS="$SET_OPTIMIZATIONS -fomit-frame-pointer"
+fi
+
+# use debug
+if [ $use_debug = "yes" ]; then
+  check_cc_options -g && \
+    SET_DEBUG_OPTS="$SET_DEBUG_OPTS -g"
+fi
+
+# use examples
+ if  test $use_examples = "yes" ; then
+  USING_EXAMPLES_TRUE=
+  USING_EXAMPLES_FALSE='#'
+else
+  USING_EXAMPLES_TRUE='#'
+  USING_EXAMPLES_FALSE=
+fi
+
+
+# use bdjava
+if [ $use_bdjava = "yes" ]; then
+  case $target_cpu in
+       x86_64) java_arch=amd64 ;;
+       i?86)   java_arch=i386 ;;
+       *)      java_arch=$target_cpu ;;
+  esac
+  case $target_os in
+       linux*)   java_os=linux ;;
+       win*)     java_os=win32 ;;
+       freebsd*) java_os=freebsd ;;
+       *)        java_os=$target_os ;;
+  esac
+
+  BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os"
+
+  temp_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$BDJAVA_CFLAGS $CPPFLAGS"
+  for ac_header in jni.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
+if test "x$ac_cv_header_jni_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_JNI_H 1
+_ACEOF
+
+else
+  as_fn_error $? "\"Could not find jni.h\"" "$LINENO" 5
+fi
+
+done
+
+  CPPFLAGS="$temp_CPPFLAGS"
+
+
+$as_echo "#define USING_BDJAVA 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define JAVA_ARCH "$java_arch"
+_ACEOF
+
+fi
+ if  test $use_bdjava = "yes" ; then
+  USING_BDJAVA_TRUE=
+  USING_BDJAVA_FALSE='#'
+else
+  USING_BDJAVA_TRUE='#'
+  USING_BDJAVA_FALSE=
+fi
+
+
+# generate documentation
+
+
+# Files:
+DX_PROJECT=libbluray
+
+DX_CONFIG=doc/doxygen-config
+
+DX_DOCDIR=doc/doxygen
+
+
+# Environment variables used inside doxygen.cfg:
+DX_ENV="$DX_ENV SRCDIR='$srcdir'"
+
+DX_ENV="$DX_ENV PROJECT='$DX_PROJECT'"
+
+DX_ENV="$DX_ENV DOCDIR='$DX_DOCDIR'"
+
+DX_ENV="$DX_ENV VERSION='$PACKAGE_VERSION'"
+
+
+# Doxygen itself:
+
+
+
+    # Check whether --enable-doxygen-doc was given.
+if test "${enable_doxygen_doc+set}" = set; then :
+  enableval=$enable_doxygen_doc;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_doc=1
+
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_doc=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-doc" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_doc=1
+
+
+
+fi
+
+if test "$DX_FLAG_doc" = 1; then
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}doxygen", so it can be a program name with args.
+set dummy ${ac_tool_prefix}doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_DOXYGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_DOXYGEN="$DX_DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_DOXYGEN=$ac_cv_path_DX_DOXYGEN
+if test -n "$DX_DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DOXYGEN" >&5
+$as_echo "$DX_DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_DOXYGEN"; then
+  ac_pt_DX_DOXYGEN=$DX_DOXYGEN
+  # Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_DOXYGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_DOXYGEN="$ac_pt_DX_DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_DOXYGEN=$ac_cv_path_ac_pt_DX_DOXYGEN
+if test -n "$ac_pt_DX_DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DOXYGEN" >&5
+$as_echo "$ac_pt_DX_DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_DOXYGEN" = x; then
+    DX_DOXYGEN=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_DOXYGEN=$ac_pt_DX_DOXYGEN
+  fi
+else
+  DX_DOXYGEN="$ac_cv_path_DX_DOXYGEN"
+fi
+
+if test "$DX_FLAG_doc$DX_DOXYGEN" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - will not generate any doxygen documentation" >&5
+$as_echo "$as_me: WARNING: doxygen not found - will not generate any doxygen documentation" >&2;}
+    DX_FLAG_doc=0
+
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}perl", so it can be a program name with args.
+set dummy ${ac_tool_prefix}perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_PERL="$DX_PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_PERL=$ac_cv_path_DX_PERL
+if test -n "$DX_PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_PERL" >&5
+$as_echo "$DX_PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_PERL"; then
+  ac_pt_DX_PERL=$DX_PERL
+  # Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_PERL="$ac_pt_DX_PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_PERL=$ac_cv_path_ac_pt_DX_PERL
+if test -n "$ac_pt_DX_PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_PERL" >&5
+$as_echo "$ac_pt_DX_PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_PERL" = x; then
+    DX_PERL=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_PERL=$ac_pt_DX_PERL
+  fi
+else
+  DX_PERL="$ac_cv_path_DX_PERL"
+fi
+
+if test "$DX_FLAG_doc$DX_PERL" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - will not generate any doxygen documentation" >&5
+$as_echo "$as_me: WARNING: perl not found - will not generate any doxygen documentation" >&2;}
+    DX_FLAG_doc=0
+
+fi
+
+    :
+fi
+if test "$DX_FLAG_doc" = 1; then
+     if :; then
+  DX_COND_doc_TRUE=
+  DX_COND_doc_FALSE='#'
+else
+  DX_COND_doc_TRUE='#'
+  DX_COND_doc_FALSE=
+fi
+
+    DX_ENV="$DX_ENV PERL_PATH='$DX_PERL'"
+
+    :
+else
+     if false; then
+  DX_COND_doc_TRUE=
+  DX_COND_doc_FALSE='#'
+else
+  DX_COND_doc_TRUE='#'
+  DX_COND_doc_FALSE=
+fi
+
+
+    :
+fi
+
+
+# Dot for graphics:
+
+
+
+    # Check whether --enable-doxygen-dot was given.
+if test "${enable_doxygen_dot+set}" = set; then :
+  enableval=$enable_doxygen_dot;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_dot=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-dot requires doxygen-dot" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_dot=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-dot" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_dot=1
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_dot=0
+
+
+
+fi
+
+if test "$DX_FLAG_dot" = 1; then
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dot", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dot; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_DOT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_DOT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_DOT="$DX_DOT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_DOT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_DOT=$ac_cv_path_DX_DOT
+if test -n "$DX_DOT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DOT" >&5
+$as_echo "$DX_DOT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_DOT"; then
+  ac_pt_DX_DOT=$DX_DOT
+  # Extract the first word of "dot", so it can be a program name with args.
+set dummy dot; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_DOT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_DOT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_DOT="$ac_pt_DX_DOT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_DOT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_DOT=$ac_cv_path_ac_pt_DX_DOT
+if test -n "$ac_pt_DX_DOT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DOT" >&5
+$as_echo "$ac_pt_DX_DOT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_DOT" = x; then
+    DX_DOT=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_DOT=$ac_pt_DX_DOT
+  fi
+else
+  DX_DOT="$ac_cv_path_DX_DOT"
+fi
+
+if test "$DX_FLAG_dot$DX_DOT" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dot not found - will not generate graphics for doxygen documentation" >&5
+$as_echo "$as_me: WARNING: dot not found - will not generate graphics for doxygen documentation" >&2;}
+    DX_FLAG_dot=0
+
+fi
+
+    :
+fi
+if test "$DX_FLAG_dot" = 1; then
+     if :; then
+  DX_COND_dot_TRUE=
+  DX_COND_dot_FALSE='#'
+else
+  DX_COND_dot_TRUE='#'
+  DX_COND_dot_FALSE=
+fi
+
+    DX_ENV="$DX_ENV HAVE_DOT='YES'"
+
+             DX_ENV="$DX_ENV DOT_PATH='`expr ".$DX_DOT" : '$\.$[^/]*$' \| "x$DX_DOT" : 'x$.*$/[^/]*$'`'"
+
+    :
+else
+     if false; then
+  DX_COND_dot_TRUE=
+  DX_COND_dot_FALSE='#'
+else
+  DX_COND_dot_TRUE='#'
+  DX_COND_dot_FALSE=
+fi
+
+    DX_ENV="$DX_ENV HAVE_DOT='NO'"
+
+    :
+fi
+
+
+# Man pages generation:
+
+
+
+    # Check whether --enable-doxygen-man was given.
+if test "${enable_doxygen_man+set}" = set; then :
+  enableval=$enable_doxygen_man;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_man=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-man requires doxygen-man" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_man=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-man" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_man=0
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_man=0
+
+
+
+fi
+
+if test "$DX_FLAG_man" = 1; then
+
+    :
+fi
+if test "$DX_FLAG_man" = 1; then
+     if :; then
+  DX_COND_man_TRUE=
+  DX_COND_man_FALSE='#'
+else
+  DX_COND_man_TRUE='#'
+  DX_COND_man_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_MAN='YES'"
+
+    :
+else
+     if false; then
+  DX_COND_man_TRUE=
+  DX_COND_man_FALSE='#'
+else
+  DX_COND_man_TRUE='#'
+  DX_COND_man_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_MAN='NO'"
+
+    :
+fi
+
+
+# RTF file generation:
+
+
+
+    # Check whether --enable-doxygen-rtf was given.
+if test "${enable_doxygen_rtf+set}" = set; then :
+  enableval=$enable_doxygen_rtf;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_rtf=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-rtf requires doxygen-rtf" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_rtf=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-rtf" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_rtf=0
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_rtf=0
+
+
+
+fi
+
+if test "$DX_FLAG_rtf" = 1; then
+
+    :
+fi
+if test "$DX_FLAG_rtf" = 1; then
+     if :; then
+  DX_COND_rtf_TRUE=
+  DX_COND_rtf_FALSE='#'
+else
+  DX_COND_rtf_TRUE='#'
+  DX_COND_rtf_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_RTF='YES'"
+
+    :
+else
+     if false; then
+  DX_COND_rtf_TRUE=
+  DX_COND_rtf_FALSE='#'
+else
+  DX_COND_rtf_TRUE='#'
+  DX_COND_rtf_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_RTF='NO'"
+
+    :
+fi
+
+
+# XML file generation:
+
+
+
+    # Check whether --enable-doxygen-xml was given.
+if test "${enable_doxygen_xml+set}" = set; then :
+  enableval=$enable_doxygen_xml;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_xml=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-xml requires doxygen-xml" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_xml=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-xml" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_xml=0
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_xml=0
+
+
+
+fi
+
+if test "$DX_FLAG_xml" = 1; then
+
+    :
+fi
+if test "$DX_FLAG_xml" = 1; then
+     if :; then
+  DX_COND_xml_TRUE=
+  DX_COND_xml_FALSE='#'
+else
+  DX_COND_xml_TRUE='#'
+  DX_COND_xml_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_XML='YES'"
+
+    :
+else
+     if false; then
+  DX_COND_xml_TRUE=
+  DX_COND_xml_FALSE='#'
+else
+  DX_COND_xml_TRUE='#'
+  DX_COND_xml_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_XML='NO'"
+
+    :
+fi
+
+
+# (Compressed) HTML help generation:
+
+
+
+    # Check whether --enable-doxygen-chm was given.
+if test "${enable_doxygen_chm+set}" = set; then :
+  enableval=$enable_doxygen_chm;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_chm=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-chm requires doxygen-chm" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_chm=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-chm" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_chm=0
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_chm=0
+
+
+
+fi
+
+if test "$DX_FLAG_chm" = 1; then
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}hhc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}hhc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_HHC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_HHC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_HHC="$DX_HHC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_HHC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_HHC=$ac_cv_path_DX_HHC
+if test -n "$DX_HHC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_HHC" >&5
+$as_echo "$DX_HHC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_HHC"; then
+  ac_pt_DX_HHC=$DX_HHC
+  # Extract the first word of "hhc", so it can be a program name with args.
+set dummy hhc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_HHC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_HHC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_HHC="$ac_pt_DX_HHC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_HHC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_HHC=$ac_cv_path_ac_pt_DX_HHC
+if test -n "$ac_pt_DX_HHC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_HHC" >&5
+$as_echo "$ac_pt_DX_HHC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_HHC" = x; then
+    DX_HHC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_HHC=$ac_pt_DX_HHC
+  fi
+else
+  DX_HHC="$ac_cv_path_DX_HHC"
+fi
+
+if test "$DX_FLAG_chm$DX_HHC" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&5
+$as_echo "$as_me: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&2;}
+    DX_FLAG_chm=0
+
+fi
+
+    :
+fi
+if test "$DX_FLAG_chm" = 1; then
+     if :; then
+  DX_COND_chm_TRUE=
+  DX_COND_chm_FALSE='#'
+else
+  DX_COND_chm_TRUE='#'
+  DX_COND_chm_FALSE=
+fi
+
+    DX_ENV="$DX_ENV HHC_PATH='$DX_HHC'"
+
+             DX_ENV="$DX_ENV GENERATE_HTML='YES'"
+
+             DX_ENV="$DX_ENV GENERATE_HTMLHELP='YES'"
+
+    :
+else
+     if false; then
+  DX_COND_chm_TRUE=
+  DX_COND_chm_FALSE='#'
+else
+  DX_COND_chm_TRUE='#'
+  DX_COND_chm_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_HTMLHELP='NO'"
+
+    :
+fi
+
+
+# Seperate CHI file generation.
+
+
+
+    # Check whether --enable-doxygen-chi was given.
+if test "${enable_doxygen_chi+set}" = set; then :
+  enableval=$enable_doxygen_chi;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_chi=1
+
+
+test "$DX_FLAG_chm" = "1" \
+|| as_fn_error $? "doxygen-chi requires doxygen-chi" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_chi=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-chi" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_chi=0
+
+
+test "$DX_FLAG_chm" = "1" || DX_FLAG_chi=0
+
+
+
+fi
+
+if test "$DX_FLAG_chi" = 1; then
+
+    :
+fi
+if test "$DX_FLAG_chi" = 1; then
+     if :; then
+  DX_COND_chi_TRUE=
+  DX_COND_chi_FALSE='#'
+else
+  DX_COND_chi_TRUE='#'
+  DX_COND_chi_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_CHI='YES'"
+
+    :
+else
+     if false; then
+  DX_COND_chi_TRUE=
+  DX_COND_chi_FALSE='#'
+else
+  DX_COND_chi_TRUE='#'
+  DX_COND_chi_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_CHI='NO'"
+
+    :
+fi
+
+
+# Plain HTML pages generation:
+
+
+
+    # Check whether --enable-doxygen-html was given.
+if test "${enable_doxygen_html+set}" = set; then :
+  enableval=$enable_doxygen_html;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_html=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-html requires doxygen-html" "$LINENO" 5
+
+test "$DX_FLAG_chm" = "0" \
+|| as_fn_error $? "doxygen-html contradicts doxygen-html" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_html=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-html" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_html=1
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_html=0
+
+
+test "$DX_FLAG_chm" = "0" || DX_FLAG_html=0
+
+
+
+fi
+
+if test "$DX_FLAG_html" = 1; then
+
+    :
+fi
+if test "$DX_FLAG_html" = 1; then
+     if :; then
+  DX_COND_html_TRUE=
+  DX_COND_html_FALSE='#'
+else
+  DX_COND_html_TRUE='#'
+  DX_COND_html_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_HTML='YES'"
+
+    :
+else
+     if false; then
+  DX_COND_html_TRUE=
+  DX_COND_html_FALSE='#'
+else
+  DX_COND_html_TRUE='#'
+  DX_COND_html_FALSE=
+fi
+
+    test "$DX_FLAG_chm" = 1 || DX_ENV="$DX_ENV GENERATE_HTML='NO'"
+
+    :
+fi
+
+
+# PostScript file generation:
+
+
+
+    # Check whether --enable-doxygen-ps was given.
+if test "${enable_doxygen_ps+set}" = set; then :
+  enableval=$enable_doxygen_ps;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_ps=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-ps requires doxygen-ps" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_ps=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-ps" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_ps=1
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_ps=0
+
+
+
+fi
+
+if test "$DX_FLAG_ps" = 1; then
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}latex", so it can be a program name with args.
+set dummy ${ac_tool_prefix}latex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_LATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_LATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_LATEX="$DX_LATEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_LATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_LATEX=$ac_cv_path_DX_LATEX
+if test -n "$DX_LATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_LATEX" >&5
+$as_echo "$DX_LATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_LATEX"; then
+  ac_pt_DX_LATEX=$DX_LATEX
+  # Extract the first word of "latex", so it can be a program name with args.
+set dummy latex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_LATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_LATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_LATEX="$ac_pt_DX_LATEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_LATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_LATEX=$ac_cv_path_ac_pt_DX_LATEX
+if test -n "$ac_pt_DX_LATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_LATEX" >&5
+$as_echo "$ac_pt_DX_LATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_LATEX" = x; then
+    DX_LATEX=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_LATEX=$ac_pt_DX_LATEX
+  fi
+else
+  DX_LATEX="$ac_cv_path_DX_LATEX"
+fi
+
+if test "$DX_FLAG_ps$DX_LATEX" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: latex not found - will not generate doxygen PostScript documentation" >&5
+$as_echo "$as_me: WARNING: latex not found - will not generate doxygen PostScript documentation" >&2;}
+    DX_FLAG_ps=0
+
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}makeindex", so it can be a program name with args.
+set dummy ${ac_tool_prefix}makeindex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_MAKEINDEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_MAKEINDEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_MAKEINDEX="$DX_MAKEINDEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_MAKEINDEX=$ac_cv_path_DX_MAKEINDEX
+if test -n "$DX_MAKEINDEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_MAKEINDEX" >&5
+$as_echo "$DX_MAKEINDEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_MAKEINDEX"; then
+  ac_pt_DX_MAKEINDEX=$DX_MAKEINDEX
+  # Extract the first word of "makeindex", so it can be a program name with args.
+set dummy makeindex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_MAKEINDEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_MAKEINDEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_MAKEINDEX="$ac_pt_DX_MAKEINDEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_MAKEINDEX=$ac_cv_path_ac_pt_DX_MAKEINDEX
+if test -n "$ac_pt_DX_MAKEINDEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_MAKEINDEX" >&5
+$as_echo "$ac_pt_DX_MAKEINDEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_MAKEINDEX" = x; then
+    DX_MAKEINDEX=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_MAKEINDEX=$ac_pt_DX_MAKEINDEX
+  fi
+else
+  DX_MAKEINDEX="$ac_cv_path_DX_MAKEINDEX"
+fi
+
+if test "$DX_FLAG_ps$DX_MAKEINDEX" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&5
+$as_echo "$as_me: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&2;}
+    DX_FLAG_ps=0
+
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dvips", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dvips; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_DVIPS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_DVIPS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_DVIPS="$DX_DVIPS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_DVIPS=$ac_cv_path_DX_DVIPS
+if test -n "$DX_DVIPS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DVIPS" >&5
+$as_echo "$DX_DVIPS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_DVIPS"; then
+  ac_pt_DX_DVIPS=$DX_DVIPS
+  # Extract the first word of "dvips", so it can be a program name with args.
+set dummy dvips; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_DVIPS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_DVIPS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_DVIPS="$ac_pt_DX_DVIPS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_DVIPS=$ac_cv_path_ac_pt_DX_DVIPS
+if test -n "$ac_pt_DX_DVIPS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DVIPS" >&5
+$as_echo "$ac_pt_DX_DVIPS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_DVIPS" = x; then
+    DX_DVIPS=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_DVIPS=$ac_pt_DX_DVIPS
+  fi
+else
+  DX_DVIPS="$ac_cv_path_DX_DVIPS"
+fi
+
+if test "$DX_FLAG_ps$DX_DVIPS" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&5
+$as_echo "$as_me: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&2;}
+    DX_FLAG_ps=0
+
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}egrep", so it can be a program name with args.
+set dummy ${ac_tool_prefix}egrep; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_EGREP="$DX_EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_EGREP=$ac_cv_path_DX_EGREP
+if test -n "$DX_EGREP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_EGREP" >&5
+$as_echo "$DX_EGREP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_EGREP"; then
+  ac_pt_DX_EGREP=$DX_EGREP
+  # Extract the first word of "egrep", so it can be a program name with args.
+set dummy egrep; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_EGREP="$ac_pt_DX_EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_EGREP=$ac_cv_path_ac_pt_DX_EGREP
+if test -n "$ac_pt_DX_EGREP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_EGREP" >&5
+$as_echo "$ac_pt_DX_EGREP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_EGREP" = x; then
+    DX_EGREP=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_EGREP=$ac_pt_DX_EGREP
+  fi
+else
+  DX_EGREP="$ac_cv_path_DX_EGREP"
+fi
+
+if test "$DX_FLAG_ps$DX_EGREP" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&5
+$as_echo "$as_me: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&2;}
+    DX_FLAG_ps=0
+
+fi
+
+    :
+fi
+if test "$DX_FLAG_ps" = 1; then
+     if :; then
+  DX_COND_ps_TRUE=
+  DX_COND_ps_FALSE='#'
+else
+  DX_COND_ps_TRUE='#'
+  DX_COND_ps_FALSE=
+fi
+
+
+    :
+else
+     if false; then
+  DX_COND_ps_TRUE=
+  DX_COND_ps_FALSE='#'
+else
+  DX_COND_ps_TRUE='#'
+  DX_COND_ps_FALSE=
+fi
+
+
+    :
+fi
+
+
+# PDF file generation:
+
+
+
+    # Check whether --enable-doxygen-pdf was given.
+if test "${enable_doxygen_pdf+set}" = set; then :
+  enableval=$enable_doxygen_pdf;
+case "$enableval" in
+#(
+y|Y|yes|Yes|YES)
+    DX_FLAG_pdf=1
+
+
+test "$DX_FLAG_doc" = "1" \
+|| as_fn_error $? "doxygen-pdf requires doxygen-pdf" "$LINENO" 5
+
+;; #(
+n|N|no|No|NO)
+    DX_FLAG_pdf=0
+
+;; #(
+*)
+    as_fn_error $? "invalid value '$enableval' given to doxygen-pdf" "$LINENO" 5
+;;
+esac
+
+else
+
+DX_FLAG_pdf=1
+
+
+test "$DX_FLAG_doc" = "1" || DX_FLAG_pdf=0
+
+
+
+fi
+
+if test "$DX_FLAG_pdf" = 1; then
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pdflatex", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pdflatex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_PDFLATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_PDFLATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_PDFLATEX="$DX_PDFLATEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_PDFLATEX=$ac_cv_path_DX_PDFLATEX
+if test -n "$DX_PDFLATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_PDFLATEX" >&5
+$as_echo "$DX_PDFLATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_PDFLATEX"; then
+  ac_pt_DX_PDFLATEX=$DX_PDFLATEX
+  # Extract the first word of "pdflatex", so it can be a program name with args.
+set dummy pdflatex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_PDFLATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_PDFLATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_PDFLATEX="$ac_pt_DX_PDFLATEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_PDFLATEX=$ac_cv_path_ac_pt_DX_PDFLATEX
+if test -n "$ac_pt_DX_PDFLATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_PDFLATEX" >&5
+$as_echo "$ac_pt_DX_PDFLATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_PDFLATEX" = x; then
+    DX_PDFLATEX=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_PDFLATEX=$ac_pt_DX_PDFLATEX
+  fi
+else
+  DX_PDFLATEX="$ac_cv_path_DX_PDFLATEX"
+fi
+
+if test "$DX_FLAG_pdf$DX_PDFLATEX" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&5
+$as_echo "$as_me: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&2;}
+    DX_FLAG_pdf=0
+
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}makeindex", so it can be a program name with args.
+set dummy ${ac_tool_prefix}makeindex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_MAKEINDEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_MAKEINDEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_MAKEINDEX="$DX_MAKEINDEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_MAKEINDEX=$ac_cv_path_DX_MAKEINDEX
+if test -n "$DX_MAKEINDEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_MAKEINDEX" >&5
+$as_echo "$DX_MAKEINDEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_MAKEINDEX"; then
+  ac_pt_DX_MAKEINDEX=$DX_MAKEINDEX
+  # Extract the first word of "makeindex", so it can be a program name with args.
+set dummy makeindex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_MAKEINDEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_MAKEINDEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_MAKEINDEX="$ac_pt_DX_MAKEINDEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_MAKEINDEX=$ac_cv_path_ac_pt_DX_MAKEINDEX
+if test -n "$ac_pt_DX_MAKEINDEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_MAKEINDEX" >&5
+$as_echo "$ac_pt_DX_MAKEINDEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_MAKEINDEX" = x; then
+    DX_MAKEINDEX=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_MAKEINDEX=$ac_pt_DX_MAKEINDEX
+  fi
+else
+  DX_MAKEINDEX="$ac_cv_path_DX_MAKEINDEX"
+fi
+
+if test "$DX_FLAG_pdf$DX_MAKEINDEX" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&5
+$as_echo "$as_me: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&2;}
+    DX_FLAG_pdf=0
+
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}egrep", so it can be a program name with args.
+set dummy ${ac_tool_prefix}egrep; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DX_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DX_EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DX_EGREP="$DX_EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DX_EGREP=$ac_cv_path_DX_EGREP
+if test -n "$DX_EGREP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_EGREP" >&5
+$as_echo "$DX_EGREP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DX_EGREP"; then
+  ac_pt_DX_EGREP=$DX_EGREP
+  # Extract the first word of "egrep", so it can be a program name with args.
+set dummy egrep; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_DX_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_DX_EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_DX_EGREP="$ac_pt_DX_EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_DX_EGREP=$ac_cv_path_ac_pt_DX_EGREP
+if test -n "$ac_pt_DX_EGREP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_EGREP" >&5
+$as_echo "$ac_pt_DX_EGREP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_DX_EGREP" = x; then
+    DX_EGREP=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DX_EGREP=$ac_pt_DX_EGREP
+  fi
+else
+  DX_EGREP="$ac_cv_path_DX_EGREP"
+fi
+
+if test "$DX_FLAG_pdf$DX_EGREP" = 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: egrep not found - will not generate doxygen PDF documentation" >&5
+$as_echo "$as_me: WARNING: egrep not found - will not generate doxygen PDF documentation" >&2;}
+    DX_FLAG_pdf=0
+
+fi
+
+    :
+fi
+if test "$DX_FLAG_pdf" = 1; then
+     if :; then
+  DX_COND_pdf_TRUE=
+  DX_COND_pdf_FALSE='#'
+else
+  DX_COND_pdf_TRUE='#'
+  DX_COND_pdf_FALSE=
+fi
+
+
+    :
+else
+     if false; then
+  DX_COND_pdf_TRUE=
+  DX_COND_pdf_FALSE='#'
+else
+  DX_COND_pdf_TRUE='#'
+  DX_COND_pdf_FALSE=
+fi
+
+
+    :
+fi
+
+
+# LaTeX generation for PS and/or PDF:
+if test "$DX_FLAG_ps" = 1 || test "$DX_FLAG_pdf" = 1; then
+     if :; then
+  DX_COND_latex_TRUE=
+  DX_COND_latex_FALSE='#'
+else
+  DX_COND_latex_TRUE='#'
+  DX_COND_latex_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_LATEX='YES'"
+
+else
+     if false; then
+  DX_COND_latex_TRUE=
+  DX_COND_latex_FALSE='#'
+else
+  DX_COND_latex_TRUE='#'
+  DX_COND_latex_FALSE=
+fi
+
+    DX_ENV="$DX_ENV GENERATE_LATEX='NO'"
+
+fi
+
+# Paper size for PS and/or PDF:
+
+case "$DOXYGEN_PAPER_SIZE" in
+#(
+"")
+    DOXYGEN_PAPER_SIZE=""
+
+;; #(
+a4wide|a4|letter|legal|executive)
+    DX_ENV="$DX_ENV PAPER_SIZE='$DOXYGEN_PAPER_SIZE'"
+
+;; #(
+*)
+    as_fn_error $? "unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" "$LINENO" 5
+;;
+esac
+
+#For debugging:
+#echo DX_FLAG_doc=$DX_FLAG_doc
+#echo DX_FLAG_dot=$DX_FLAG_dot
+#echo DX_FLAG_man=$DX_FLAG_man
+#echo DX_FLAG_html=$DX_FLAG_html
+#echo DX_FLAG_chm=$DX_FLAG_chm
+#echo DX_FLAG_chi=$DX_FLAG_chi
+#echo DX_FLAG_rtf=$DX_FLAG_rtf
+#echo DX_FLAG_xml=$DX_FLAG_xml
+#echo DX_FLAG_pdf=$DX_FLAG_pdf
+#echo DX_FLAG_ps=$DX_FLAG_ps
+#echo DX_ENV=$DX_ENV
+
+
+# export library version number
+BLURAY_VERSION_MAJOR=0
+
+BLURAY_VERSION_MINOR=2
+
+BLURAY_VERSION_MICRO=3
+
+
+# export library (.so) version
+LT_VERSION_INFO="3:0:2"
+
+
+# generate output files
+
+
+
+
+
+ac_config_files="$ac_config_files Makefile src/Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
+     t end
+     s/^$[^=]*$=$.*$$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USING_EXAMPLES_TRUE}" && test -z "${USING_EXAMPLES_FALSE}"; then
+  as_fn_error $? "conditional \"USING_EXAMPLES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USING_BDJAVA_TRUE}" && test -z "${USING_BDJAVA_FALSE}"; then
+  as_fn_error $? "conditional \"USING_BDJAVA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_doc\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_doc\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_dot\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_dot\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_man\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_man\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_rtf\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_rtf\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_xml\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_xml\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_chm\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_chm\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_chi\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_chi\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_html\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_html\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_ps\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_ps\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_pdf\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_pdf\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_latex\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then
+  as_fn_error $? "conditional \"DX_COND_latex\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '$a$' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*$...$'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
+	 X"$0" : 'X$//$$' \| \
+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/$[^/][^/]*$\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X$//$[^/]' \| \
+	 X"$as_dir" : 'X$//$$' \| \
+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by libbluray $as_me 0.2.3, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <http://www.videolan.org/developers/libbluray.html>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+libbluray config.status 0.2.3
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X$[^=]*$='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X$[^=]*$='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
+    "src/libbluray.pc") CONFIG_FILES="$CONFIG_FILES src/libbluray.pc" ;;
+    "src/libbluray/bluray-version.h") CONFIG_FILES="$CONFIG_FILES src/libbluray/bluray-version.h" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/$.\{148\}$..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/$.\{148\}$..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = "&#x7;"
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/$=[	 ]*$.*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = "&#x7;"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X$//$[^/]' \| \
+	 X"$ac_file" : 'X$//$$' \| \
+	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X$//$[^/]' \| \
+	 X"$_am_arg" : 'X$//$$' \| \
+	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X$//$[^/]' \| \
+	 X"$mf" : 'X$//$$' \| \
+	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X$//$[^/]' \| \
+	 X"$file" : 'X$//$$' \| \
+	 X"$file" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=""
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+
+
+echo "  Summary:"
+echo "  --------"
+echo "  BD-J support:        $use_bdjava"
+echo "  Metadata support:    $use_libxml2"
+echo "  Build examples:      $use_examples"
+

libbluray-0.0.1-pre-213-ga869da8.tar.gz/configure.ac -> libbluray-0.2.3.tar.bz2/configure.ac Changed

@@ -1,9 +1,27 @@
+# library version number
+m4_define([bluray_major], 0)
+m4_define([bluray_minor], 2)
+m4_define([bluray_micro], 3)
+m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro])
+
+# shared library version (.so version)
+#
+# - If there are no interface changes, increase revision.
+# - If interfaces have been added, increase current and age. Set revision to 0.
+# - If interfaces have been changed or removed, increase current and set age and revision to 0.
+#
+# Library file name will be libbluray.so.(current-age).age.revision
+#
+m4_define([lt_current],  3)
+m4_define([lt_revision], 0)
+m4_define([lt_age],      2)
+
 # initilization
-AC_INIT([libbluray],[0.2], [http://bd.videolan.org/])
+AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign tar-ustar])
 AM_CONFIG_HEADER(config.h)
 
 case "${host_os}" in
@@ -29,17 +47,10 @@
 # messages
 library_not_found="Could not find required library!"
 function_not_found="Could not find required function!"
-using_dlopen_crypto_libs="Using libaacs and libbdplus via dlopen."
-using_normal_linking="Using libaacs and libbdplus via normal linking."
 libxml2_missing="Could not find libxml2 - disclib meta parser disabled."
 pkg_config_missing="Could not find pkg-config.  Assuming..."
 
 # configure options
-AC_ARG_WITH([dlopen-crypto-libs],
-  [AS_HELP_STRING([--with-dlopen-crypto-libs],
-  [use libaacs and libbdplus via dlopen (default is auto)])],
-  [use_dlopen_crypto_libs=$withval],
-  [use_dlopen_crypto_libs=auto])
 
 AC_ARG_WITH([jdk],
   AS_HELP_STRING([--with-jdk=DIR],
@@ -88,6 +99,12 @@
   [use_bdjava=$enableval],
   [use_bdjava=no])
 
+AC_ARG_ENABLE([libxml2],
+  [AS_HELP_STRING([--enable-libxml2],
+  [enable libxml2 support (default is yes)])],
+  [use_libxml2=$enableval],
+  [use_libxml2=yes])
+
 # required programs
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -98,7 +115,7 @@
 # required headers
 AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
 AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h])
-AC_CHECK_HEADERS([sys/time.h time.h])
+AC_CHECK_HEADERS([sys/time.h time.h mntent.h])
 if test "${SYS}" != "mingw32" ; then
     AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([pthread.h required])])
 fi
@@ -119,42 +136,28 @@
 fi
 
 # dlopen check
-if [[ $use_dlopen_crypto_libs = "auto" ]]; then
-  if test "${SYS}" != "mingw32" ; then
-      AC_CHECK_LIB([dl], [dlopen],
-        [DLOPEN_LDFLAGS="-ldl"; AC_MSG_NOTICE($using_dlopen_crypto_libs)
-         AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])],
-        [use_dlopen_crypto_libs="no"; AC_MSG_NOTICE($using_normal_linking)])
-  else
-         AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])
-  fi
-elif [[ $use_dlopen_crypto_libs = "yes" ]]; then
-  AC_CHECK_LIB([dl], [dlopen],
-    [DLOPEN_LDFLAGS="-ldl"; AC_MSG_NOTICE($using_dlopen_crypto_libs)
-     AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])],
-    [AC_MSG_ERROR($library_not_found)])
-else
-  AC_CHECK_LIB([aacs], [aacs_open],,
-    [AC_MSG_ERROR($library_not_found)])
-  AC_CHECK_LIB([bdplus], [bdplus_init],,
-    [AC_MSG_ERROR($library_not_found)])
-  AC_MSG_NOTICE($using_normal_linking)
+if test "${SYS}" != "mingw32" ; then
+  AC_CHECK_FUNCS(
+    [dlopen],
+    [DLOPEN_LIBS=""],
+    [AC_CHECK_LIB([dl], [dlopen],
+      [DLOPEN_LIBS="-ldl"],
+      [AC_MSG_ERROR($library_not_found)])])
 fi
-AM_CONDITIONAL([DLOPEN_CRYPTO_LIBS],
-  [test $use_dlopen_crypto_libs = "auto" || test $use_dlopen_crypto_libs = "yes"])
 
 # check for pkg-config itself so we don't try the m4 macro without pkg-config
 AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
 
 # libxml2 for metadata parser
-if test "x$HAVE_PKG_CONFIG" = "xyes"
-then
+if test "x$use_libxml2" = "xyes"; then
+  if test "x$HAVE_PKG_CONFIG" = "xyes"; then
     PKG_CHECK_MODULES([LIBXML2], libxml-2.0 >= 2.6, 
         [AC_DEFINE([HAVE_LIBXML2], [1], 
             [Define to 1 if libxml2 is to be used for metadata parsing])],
         [AC_MSG_NOTICE($libxml2_missing)])
-else
+  else
     AC_MSG_NOTICE($pkg_config_missing $libxml2_missing)
+  fi
 fi
 
 # function testing for supported compiler options
@@ -195,6 +198,10 @@
 check_cc_options -Wundef && \
   SET_WARNINGS="$SET_WARNINGS -Wundef"
 
+# no implicit function declarations
+check_cc_options -Werror-implicit-function-declaration && \
+  SET_WARNINGS="$SET_WARNINGS -Werror-implicit-function-declaration"
+
 # use -Werror
 if [[ $use_werror = "yes" ]]; then
   check_cc_options -Werror && \
@@ -255,11 +262,35 @@
 # generate documentation
 DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen])
 
+# export library version number
+BLURAY_VERSION_MAJOR=bluray_major()
+AC_SUBST(BLURAY_VERSION_MAJOR)
+BLURAY_VERSION_MINOR=bluray_minor()
+AC_SUBST(BLURAY_VERSION_MINOR)
+BLURAY_VERSION_MICRO=bluray_micro()
+AC_SUBST(BLURAY_VERSION_MICRO)
+
+# export library (.so) version
+LT_VERSION_INFO="lt_current():lt_revision():lt_age()"
+AC_SUBST(LT_VERSION_INFO)
+
 # generate output files
 AC_SUBST(BDJAVA_CFLAGS)
-AC_SUBST(DLOPEN_LDFLAGS)
+AC_SUBST(DLOPEN_LIBS)
 AC_SUBST(SET_WARNINGS)
 AC_SUBST(SET_OPTIMIZATIONS)
 AC_SUBST(SET_DEBUG_OPTS)
-AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc])
+AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h])
 AC_OUTPUT
+
+
+dnl ---------------------------------------------
+dnl Some infos:
+dnl ---------------------------------------------
+
+echo "  Summary:"
+echo "  --------"
+echo "  BD-J support:        $use_bdjava"
+echo "  Metadata support:    $use_libxml2"
+echo "  Build examples:      $use_examples"
+

libbluray-0.2.3.tar.bz2/m4/libtool.m4 Added

@@ -0,0 +1,8001 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$[["`\\]]$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=$[[A-Za-z]]:$,\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/$[[A-Za-z]]:$,\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $lib[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]$$symcode$symcode*$[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	  *\ $GNU\ Binutils$\ 2.[[2-9]]*) ;;
+	  *\ $GNU\ Binutils$\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^$[	 ]$], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS

libbluray-0.2.3.tar.bz2/m4/ltoptions.m4 Added

@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])

libbluray-0.2.3.tar.bz2/m4/ltsugar.m4 Added

@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])

libbluray-0.2.3.tar.bz2/m4/ltversion.m4 Added

libbluray-0.2.3.tar.bz2/m4/lt~obsolete.m4 Added

@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

libbluray-0.0.1-pre-213-ga869da8.tar.gz/player_wrappers/xine/input_bluray.c -> libbluray-0.2.3.tar.bz2/player_wrappers/xine/input_bluray.c Changed

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000-2005 the xine project
  *
- * Copyright (C) 2009 Petri Hintukainen <phintuka@users.sourceforge.net>
+ * Copyright (C) 2009-2011 Petri Hintukainen <phintuka@users.sourceforge.net>
  *
  * This file is part of xine, a free video player.
  *
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <pthread.h>
 
 #include <libbluray/bluray.h>
 #include <libbluray/keys.h>
@@ -51,7 +52,7 @@
 
 #define LOGMSG(x...)  xine_log (this->stream->xine, XINE_LOG_MSG, "input_bluray: " x);
 
-#define XINE_ENGINE_INTERNAL
+#define XINE_ENGINE_INTERNAL  // stream->demux_plugin
 
 #ifdef HAVE_CONFIG_H
 # include "xine_internal.h"
@@ -80,6 +81,8 @@
 #define PKT_SIZE          192
 #define TICKS_IN_MS       45
 
+#define MIN_TITLE_LENGTH  180
+
 typedef struct {
 
   input_class_t   input_class;
@@ -99,7 +102,7 @@
 
   xine_stream_t        *stream;
   xine_event_queue_t   *event_queue;
-  xine_osd_t           *osd;
+  xine_osd_t           *osd[2];
 
   bluray_input_class_t *class;
 
@@ -117,122 +120,220 @@
   int                num_titles;        /* navigation mode, number of titles in disc index */
   int                current_title;     /* navigation mode, title from disc index */
   BLURAY_TITLE_INFO *title_info;
-  int                current_clip;
+  pthread_mutex_t    title_info_mutex;  /* lock this when accessing title_info outside of input/demux thread */
+  unsigned int       current_clip;
+  time_t             still_end_time;
   int                error;
   int                menu_open;
+  int                stream_flushed;
   int                pg_enable;
   int                pg_stream;
+  int                mouse_inside_button;
 
   uint32_t           cap_seekable;
   uint8_t            nav_mode;
 
 } bluray_input_plugin_t;
 
-static void close_overlay(bluray_input_plugin_t *this)
+static void send_num_buttons(bluray_input_plugin_t *this, int n)
+{
+  xine_event_t   event;
+  xine_ui_data_t data;
+
+  event.type = XINE_EVENT_UI_NUM_BUTTONS;
+  event.data = &data;
+  event.data_length = sizeof(data);
+  data.num_buttons = n;
+
+  xine_event_send(this->stream, &event);
+}
+
+static xine_osd_t *get_overlay(bluray_input_plugin_t *this, int plane)
+{
+  if (!this->osd[plane]) {
+    this->osd[plane] = xine_osd_new(this->stream, 0, 0, 1920, 1080);
+  }
+  if (!this->pg_enable) {
+    _x_select_spu_channel(this->stream, -1);
+  }
+  return this->osd[plane];
+}
+
+static void close_overlay(bluray_input_plugin_t *this, int plane)
 {
-  if (this->osd) {
-    xine_osd_free(this->osd);
-    this->osd = NULL;
+  if (plane < 0) {
+    close_overlay(this, 0);
+    close_overlay(this, 1);
+    return;
+  }
+
+  if (plane < 2 && this->osd[plane]) {
+    xine_osd_free(this->osd[plane]);
+    this->osd[plane] = NULL;
+    if (plane == 1) {
+      send_num_buttons(this, 0);
+      this->menu_open = 0;
+    }
+  }
+}
+
+static void open_overlay(bluray_input_plugin_t *this, const BD_OVERLAY * const ov)
+{
+  if (!this->osd[ov->plane]) {
+    this->osd[ov->plane] = xine_osd_new(this->stream, ov->x, ov->y, ov->w, ov->h);
+  }
+}
+
+static void draw_bitmap(xine_osd_t *osd, const BD_OVERLAY * const ov)
+{
+  unsigned i;
+
+  /* convert and set palette */
+  if (ov->palette) {
+    uint32_t color[256];
+    uint8_t  trans[256];
+    for(i = 0; i < 256; i++) {
+      trans[i] = ov->palette[i].T;
+      color[i] = (ov->palette[i].Y << 16) | (ov->palette[i].Cr << 8) | ov->palette[i].Cb;
+    }
+
+    xine_osd_set_palette(osd, color, trans);
+  }
+
+  /* uncompress and draw bitmap */
+  if (ov->img) {
+    const BD_PG_RLE_ELEM *rlep = ov->img;
+    uint8_t *img = malloc(ov->w * ov->h);
+    unsigned pixels = ov->w * ov->h;
+
+    for (i = 0; i < pixels; i += rlep->len, rlep++) {
+      memset(img + i, rlep->color, rlep->len);
+    }
+
+    xine_osd_draw_bitmap(osd, img, ov->x, ov->y, ov->w, ov->h, NULL);
+
+    free(img);
   }
 }
 
 static void overlay_proc(void *this_gen, const BD_OVERLAY * const ov)
 {
   bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
-  uint32_t color[256];
-  uint8_t  trans[256];
-  unsigned i;
 
   if (!this) {
     return;
   }
 
-  if (!ov || ov->plane == 1)
-    this->menu_open = 0;
-
-  if (!ov || !ov->img) {
+  if (!ov) {
     /* hide OSD */
-    close_overlay(this);
+    close_overlay(this, -1);
     return;
   }
 
-  /* open xine OSD */
-
-  if (!this->osd) {
-    this->osd = xine_osd_new(this->stream, 0, 0, 1920, 1080);
+  if (ov->plane > 1) {
+    return;
   }
-  if (!this->pg_enable)
-    _x_select_spu_channel(this->stream, -1);
 
-  /* convert and set palette */
+#if defined(BD_OVERLAY_INTERFACE_VERSION) && BD_OVERLAY_INTERFACE_VERSION >= 2
 
-  for(i = 0; i < 256; i++) {
-    trans[i] = ov->palette[i].T;
-    color[i] = (ov->palette[i].Y << 16) | (ov->palette[i].Cr << 8) | ov->palette[i].Cb;
+  switch (ov->cmd) {
+    case BD_OVERLAY_INIT:    /* init overlay plane. Size of full plane in x,y,w,h */
+      open_overlay(this, ov);
+      return;
+    case BD_OVERLAY_CLOSE:   /* close overlay */
+      close_overlay(this, ov->plane);
+      return;
   }
 
-  xine_osd_set_palette(this->osd, color, trans);
+  xine_osd_t *osd = get_overlay(this, ov->plane);
 
-  /* uncompress and draw bitmap */
+  switch (ov->cmd) {
+    case BD_OVERLAY_DRAW:    /* draw bitmap (x,y,w,h,img,palette) */
+      draw_bitmap(osd, ov);
+      return;
+
+    case BD_OVERLAY_WIPE:    /* clear area (x,y,w,h) */
+      xine_osd_draw_rect(osd, ov->x, ov->y, ov->x + ov->w - 1, ov->y + ov->h - 1, 0xff, 1);
+      return;
+
+    case BD_OVERLAY_CLEAR:   /* clear plane */
+      xine_osd_draw_rect(osd, 0, 0, osd->osd.width - 1, osd->osd.height - 1, 0xff, 1);
+      xine_osd_clear(osd);
+      xine_osd_hide(osd, 0);
+      return;
 
-  const BD_PG_RLE_ELEM *rlep = ov->img;
-  uint8_t *img = malloc(ov->w * ov->h);
-  unsigned pixels = ov->w * ov->h;
+    case BD_OVERLAY_FLUSH:   /* all changes have been done, flush overlay to display at given pts */
+      xine_osd_show(osd, 0);
+
+      if (ov->plane == 1) {
+        this->menu_open = 1;
+        send_num_buttons(this, 1);
+      }
+      return;
 
-  for (i = 0; i < pixels; i += rlep->len, rlep++) {
-    memset(img + i, rlep->color, rlep->len);
+    default:
+      LOGMSG("unknown overlay command %d", ov->cmd);
+      return;
   }
 
-  xine_osd_draw_bitmap(this->osd, img, ov->x, ov->y, ov->w, ov->h, NULL);
+#else
+
+  xine_osd_t *osd = get_overlay(this, ov->plane);
+
+  if (ov->img) {
+    draw_bitmap(osd, ov);
+
+  } else {
+
+    if (ov->x == 0 && ov->y == 0 && ov->w == 1920 && ov->h == 1080) {
+      /* Nothing to display, close OSD */
+      close_overlay(this, ov->plane);
+      return;
+    }
 
-  free(img);
+    /* wipe rect */
+    xine_osd_draw_rect(osd, ov->x, ov->y, ov->x + ov->w - 1, ov->y + ov->h - 1, 0xff, 1);
+  }
 
   /* display */
 
-  xine_osd_show(this->osd, 0);
+  xine_osd_show(osd, 0);
 
-  if (ov->plane == 1)
+  if (ov->plane == 1) {
     this->menu_open = 1;
+    send_num_buttons(this, 1);
+  }
+#endif
 }
 
+/*
+ * stream info
+ */
+
 static void update_stream_info(bluray_input_plugin_t *this)
 {
-  /* set stream info */
-
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_ANGLE_COUNT,    this->title_info->angle_count);
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_ANGLE_NUMBER,   bd_get_current_angle(this->bdh));
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_CHAPTERS,       this->title_info->chapter_count > 0);
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_CHAPTER_COUNT,  this->title_info->chapter_count);
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_CHAPTER_NUMBER, bd_get_current_chapter(this->bdh) + 1);
+  if (this->title_info) {
+    /* set stream info */
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_ANGLE_COUNT,    this->title_info->angle_count);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_ANGLE_NUMBER,   bd_get_current_angle(this->bdh));
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_CHAPTERS,       this->title_info->chapter_count > 0);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_CHAPTER_COUNT,  this->title_info->chapter_count);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_CHAPTER_NUMBER, bd_get_current_chapter(this->bdh) + 1);
+  }
 }
 
-static void update_title_info(bluray_input_plugin_t *this, int playlist_id)
+static void update_title_name(bluray_input_plugin_t *this)
 {
-  if (this->title_info)
-    bd_free_title_info(this->title_info);
-
-  if (playlist_id < 0)
-    this->title_info = bd_get_title_info(this->bdh, this->current_title_idx);
-  else
-    this->title_info = bd_get_playlist_info(this->bdh, playlist_id);
-
-  if (!this->title_info) {
-    LOGMSG("bd_get_title_info(%d) failed\n", this->current_title_idx);
-    return;
-  }
-
-  /* set title */
-
+  char           title_name[64] = "";
   xine_ui_data_t udata;
-  xine_event_t uevent = {
-    .type = XINE_EVENT_UI_SET_TITLE,
-    .stream = this->stream,
-    .data = &udata,
+  xine_event_t   uevent = {
+    .type        = XINE_EVENT_UI_SET_TITLE,
+    .stream      = this->stream,
+    .data        = &udata,
     .data_length = sizeof(udata)
   };
 
-  char title_name[64] = "";
-
+  /* check disc library metadata */
   if (this->meta_dl) {
     unsigned i;
     for (i = 0; i < this->meta_dl->toc_count; i++)
@@ -242,6 +343,7 @@
             strncpy(title_name, this->meta_dl->toc_entries[i].title_name, sizeof(title_name));
   }
 
+  /* title name */
   if (title_name[0]) {
   } else if (this->current_title == BLURAY_TITLE_TOP_MENU) {
     strcpy(title_name, "Top Menu");
@@ -256,6 +358,7 @@
              this->current_title_idx + 1, this->num_title_idx);
   }
 
+  /* disc name */
   if (this->disc_name && this->disc_name[0]) {
     udata.str_len = snprintf(udata.str, sizeof(udata.str), "%s, %s",
                              this->disc_name, title_name);
@@ -263,10 +366,33 @@
     udata.str_len = snprintf(udata.str, sizeof(udata.str), "%s",
                              title_name);
   }
-  xine_event_send(this->stream, &uevent);
 
   _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, udata.str);
 
+  xine_event_send(this->stream, &uevent);
+}
+
+static void update_title_info(bluray_input_plugin_t *this, int playlist_id)
+{
+  /* update title_info */
+
+  pthread_mutex_lock(&this->title_info_mutex);
+
+  if (this->title_info)
+    bd_free_title_info(this->title_info);
+
+  if (playlist_id < 0)
+    this->title_info = bd_get_title_info(this->bdh, this->current_title_idx, 0);
+  else
+    this->title_info = bd_get_playlist_info(this->bdh, playlist_id, 0);
+
+  pthread_mutex_unlock(&this->title_info_mutex);
+
+  if (!this->title_info) {
+    LOGMSG("bd_get_title_info(%d) failed\n", this->current_title_idx);
+    return;
+  }
+
   /* calculate and set stream rate */
 
   uint64_t rate = bd_get_title_size(this->bdh) * UINT64_C(8) // bits
@@ -276,10 +402,18 @@
 
   /* set stream info */
 
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_COUNT,  this->num_title_idx);
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_NUMBER, this->current_title_idx + 1);
+  if (this->nav_mode) {
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_COUNT,  this->num_titles);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_NUMBER, this->current_title);
+  } else {
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_COUNT,  this->num_title_idx);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_NUMBER, this->current_title_idx + 1);
+  }
 
   update_stream_info(this);
+
+  /* set title */
+  update_title_name(this);
 }
 
 static int open_title (bluray_input_plugin_t *this, int title_idx)
@@ -296,6 +430,27 @@
   return 1;
 }
 
+#ifndef DEMUX_OPTIONAL_DATA_FLUSH
+#  define DEMUX_OPTIONAL_DATA_FLUSH 0x10000
+#endif
+
+static void stream_flush(bluray_input_plugin_t *this)
+{
+  if (this->stream_flushed)
+    return;
+
+  lprintf("Stream flush\n");
+
+  this->stream_flushed = 1;
+
+  int tmp = 0;
+  if (DEMUX_OPTIONAL_SUCCESS !=
+      this->stream->demux_plugin->get_optional_data(this->stream->demux_plugin, &tmp, DEMUX_OPTIONAL_DATA_FLUSH)) {
+    LOGMSG("stream flush not supported by the demuxer !\n");
+    return;
+  }
+}
+
 static void stream_reset(bluray_input_plugin_t *this)
 {
   if (!this || !this->stream || !this->stream->demux_plugin)
@@ -305,7 +460,7 @@
 
   this->cap_seekable = 0;
 
-  xine_set_param(this->stream, XINE_PARAM_FINE_SPEED, XINE_FINE_SPEED_NORMAL);
+  _x_set_fine_speed(this->stream, XINE_FINE_SPEED_NORMAL);
   this->stream->demux_plugin->seek(this->stream->demux_plugin, 0, 0, 1);
   _x_demux_control_start(this->stream);
 
@@ -314,34 +469,28 @@
 
 static void wait_secs(bluray_input_plugin_t *this, unsigned seconds)
 {
-  // infinite still mode ?
-  if (!seconds) {
-    xine_usec_sleep(10*1000);
-    return;
-  }
-
-  // clip to allowed range
-  if (seconds > 300) {
-    seconds = 300;
+  stream_flush(this);
+
+  if (this->still_end_time) {
+    if (time(NULL) >= this->still_end_time) {
+      lprintf("pause end\n");
+      this->still_end_time = 0;
+      bd_read_skip_still(this->bdh);
+      stream_reset(this);
+      return;
+    }
   }
 
-  // pause the stream
-  int paused = _x_get_fine_speed(this->stream) == XINE_SPEED_PAUSE;
-  if (!paused) {
-    _x_set_fine_speed(this->stream, XINE_SPEED_PAUSE);
-  }
+  else if (seconds) {
+    if (seconds > 300) {
+      seconds = 300;
+    }
 
-  // wait until interrupted
-  int loops = seconds * 25; /* N * 40 ms */
-  while (!this->stream->demux_action_pending && loops-- > 0) {
-    xine_usec_sleep(40*1000);
+    lprintf("still image, pause for %d seconds\n", seconds);
+    this->still_end_time = time(NULL) + seconds;
   }
 
-  lprintf("paused for %d seconds (%d ms left)\n", seconds - loops/25, loops * 40);
-
-  if (!paused) {
-    _x_set_fine_speed(this->stream, XINE_FINE_SPEED_NORMAL);
-  }
+  xine_usec_sleep(40*1000);
 }
 
 static void update_spu_channel(bluray_input_plugin_t *this, int channel)
@@ -376,6 +525,11 @@
         this->error = 1;
         return;
 
+      case BD_EVENT_READ_ERROR:
+        LOGMSG("m2ts file read error");
+        /*stream_flush(this); leave error detection and handling for upper layer */
+        return;
+
       case BD_EVENT_ENCRYPTED:
         lprintf("BD_EVENT_ENCRYPTED\n");
         _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
@@ -387,6 +541,7 @@
 
       case BD_EVENT_SEEK:
         lprintf("BD_EVENT_SEEK\n");
+        this->still_end_time = 0;
         stream_reset(this);
         break;
 
@@ -413,6 +568,11 @@
         _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_ANGLE_NUMBER, ev.param);
         break;
 
+      case BD_EVENT_END_OF_TITLE:
+        lprintf("BD_EVENT_END_OF_TITLE\n");
+        stream_flush(this);
+        break;
+
       case BD_EVENT_TITLE:
         this->current_title = ev.param;
         break;
@@ -427,10 +587,8 @@
 
       case BD_EVENT_PLAYITEM:
         lprintf("BD_EVENT_PLAYITEM %d\n", ev.param);
-        if (ev.param < this->title_info->clip_count)
-          this->current_clip = ev.param;
-        else
-          this->current_clip = 0;
+        this->current_clip = ev.param;
+        this->still_end_time = 0;
         break;
 
       case BD_EVENT_CHAPTER:
@@ -470,6 +628,7 @@
         break;
 
       default:
+        LOGMSG("unhandled libbluray event %d [param %d]\n", ev.event, ev.param);
         break;
     }
 }
@@ -484,6 +643,25 @@
   }
 }
 
+static void send_mouse_enter_leave_event(bluray_input_plugin_t *this, int direction)
+{
+  if (direction != this->mouse_inside_button) {
+    xine_event_t        event;
+    xine_spu_button_t   spu_event;
+
+    spu_event.direction = direction;
+    spu_event.button    = 1;
+
+    event.type        = XINE_EVENT_SPU_BUTTON;
+    event.stream      = this->stream;
+    event.data        = &spu_event;
+    event.data_length = sizeof(spu_event);
+    xine_event_send(this->stream, &event);
+
+    this->mouse_inside_button = direction;
+  }
+}
+
 static void handle_events(bluray_input_plugin_t *this)
 {
   if (!this->event_queue)
@@ -515,6 +693,7 @@
           } else {
             bd_play_title(this->bdh, MAX(1, this->current_title - 1));
           }
+          stream_reset(this);
           break;
 
         case XINE_EVENT_INPUT_RIGHT:
@@ -524,6 +703,7 @@
           } else {
             bd_play_title(this->bdh, MIN(this->num_titles, this->current_title + 1));
           }
+          stream_reset(this);
           break;
       }
     }
@@ -536,13 +716,18 @@
         if (input->button == 1) {
           bd_mouse_select(this->bdh, pts, input->x, input->y);
           bd_user_input(this->bdh, pts, BD_VK_MOUSE_ACTIVATE);
+          send_mouse_enter_leave_event(this, 0);
         }
         break;
       }
 
       case XINE_EVENT_INPUT_MOUSE_MOVE: {
         xine_input_data_t *input = event->data;
-        bd_mouse_select(this->bdh, pts, input->x, input->y);
+        if (bd_mouse_select(this->bdh, pts, input->x, input->y) > 0) {
+          send_mouse_enter_leave_event(this, 1);
+        } else {
+          send_mouse_enter_leave_event(this, 0);
+        }
         break;
       }
 
@@ -571,37 +756,42 @@
       case XINE_EVENT_INPUT_NUMBER_9:  bd_user_input(this->bdh, pts, BD_VK_9); break;
 
       case XINE_EVENT_INPUT_NEXT: {
-        unsigned chapter = bd_get_current_chapter(this->bdh) + 1;
-
-        lprintf("XINE_EVENT_INPUT_NEXT: next chapter\n");
-
-        if (chapter >= this->title_info->chapter_count) {
-          if (this->current_title_idx < this->num_title_idx - 1) {
-            open_title(this, this->current_title_idx + 1);
-            stream_reset(this);
-          }
-        } else {
-          bd_seek_chapter(this->bdh, chapter);
-          update_stream_info(this);
-          stream_reset(this);
+        cfg_entry_t* entry = this->class->xine->config->lookup_entry(this->class->xine->config,
+                                                                     "media.bluray.skip_behaviour");
+        switch (entry->num_value) {
+          case 0: /* skip by chapter */
+            bd_seek_chapter(this->bdh, bd_get_current_chapter(this->bdh) + 1);
+            update_stream_info(this);
+            break;
+          case 1: /* skip by title */
+            if (!this->nav_mode) {
+              open_title(this, MIN(this->num_title_idx - 1, this->current_title_idx + 1));
+            } else {
+              bd_play_title(this->bdh, MIN(this->num_titles, this->current_title + 1));
+            }
+            break;
         }
+        stream_reset(this);
         break;
       }
 
       case XINE_EVENT_INPUT_PREVIOUS: {
-        int chapter = bd_get_current_chapter(this->bdh) - 1;
-
-        lprintf("XINE_EVENT_INPUT_PREVIOUS: previous chapter\n");
-
-        if (chapter < 0 && this->current_title_idx > 0) {
-          open_title(this, this->current_title_idx - 1);
-          stream_reset(this);
-        } else {
-          chapter = MAX(0, chapter);
-          bd_seek_chapter(this->bdh, chapter);
-          update_stream_info(this);
-          stream_reset(this);
+        cfg_entry_t* entry = this->class->xine->config->lookup_entry(this->class->xine->config,
+                                                                     "media.bluray.skip_behaviour");
+        switch (entry->num_value) {
+          case 0: /* skip by chapter */
+            bd_seek_chapter(this->bdh, MAX(0, ((int)bd_get_current_chapter(this->bdh)) - 1));
+            update_stream_info(this);
+            break;
+          case 1: /* skip by title */
+            if (!this->nav_mode) {
+              open_title(this, MAX(0, this->current_title_idx - 1));
+            } else {
+              bd_play_title(this->bdh, MAX(1, this->current_title - 1));
+            }
+            break;
         }
+        stream_reset(this);
         break;
       }
 
@@ -638,7 +828,8 @@
   return this->cap_seekable  |
          INPUT_CAP_BLOCK     |
          INPUT_CAP_AUDIOLANG |
-         INPUT_CAP_SPULANG;
+         INPUT_CAP_SPULANG   |
+         INPUT_CAP_CHAPTERS;
 }
 
 #if XINE_VERSION_CODE >= 10190
@@ -663,7 +854,7 @@
       if (result == 0) {
         handle_events(this);
         if (ev.event == BD_EVENT_NONE) {
-          if (this->stream->demux_action_pending) {
+          if (_x_action_pending(this->stream)) {
             break;
           }
         }
@@ -677,6 +868,8 @@
   if (result < 0)
     LOGMSG("bd_read() failed: %s (%d of %d)\n", strerror(errno), (int)result, (int)len);
 
+  this->stream_flushed = 0;
+
   return result;
 }
 
@@ -713,7 +906,7 @@
 
   if (!this || !this->bdh)
     return -1;
-  if (this->current_title_idx < 0)
+  if (this->still_end_time)
     return offset;
 
   /* convert relative seeks to absolute */
@@ -737,20 +930,33 @@
 {
   bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
 
-  if (!this || !this->bdh || !this->title_info)
+  if (!this || !this->bdh)
     return -1;
 
+  if (this->still_end_time)
+    return bd_tell(this->bdh);
+
   /* convert relative seeks to absolute */
 
   if (origin == SEEK_CUR) {
     time_offset += this_gen->get_current_time(this_gen);
   }
   else if (origin == SEEK_END) {
+
+    pthread_mutex_lock(&this->title_info_mutex);
+
+    if (!this->title_info) {
+      pthread_mutex_unlock(&this->title_info_mutex);
+      return -1;
+    }
+
     int duration = this->title_info->duration / 90;
     if (time_offset < duration)
       time_offset = duration - time_offset;
     else
       time_offset = 0;
+
+    pthread_mutex_unlock(&this->title_info_mutex);
   }
 
   lprintf("bluray_plugin_seek_time() seeking to %d.%03ds\n", time_offset / 1000, time_offset % 1000);
@@ -793,12 +999,9 @@
   return this->mrl;
 }
 
-static int bluray_plugin_get_optional_data (input_plugin_t *this_gen, void *data, int data_type)
+static int get_optional_data_impl (bluray_input_plugin_t *this, void *data, int data_type)
 {
-  bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
-
-  if (!this || !this->stream || !data)
-    return INPUT_OPTIONAL_UNSUPPORTED;
+  unsigned int current_clip = this->current_clip;
 
   switch (data_type) {
     case INPUT_OPTIONAL_DATA_DEMUXER:
@@ -810,9 +1013,9 @@
      * - channel number can be mpeg-ts PID (0x1100 ... 0x11ff)
      */
     case INPUT_OPTIONAL_DATA_AUDIOLANG:
-      if (this->title_info) {
+      if (this->title_info && this->title_info->clip_count < current_clip) {
         int               channel = *((int *)data);
-        BLURAY_CLIP_INFO *clip    = &this->title_info->clips[this->current_clip];
+        BLURAY_CLIP_INFO *clip    = &this->title_info->clips[current_clip];
 
         if (channel >= 0 && channel < clip->audio_stream_count) {
           memcpy(data, clip->audio_streams[channel].lang, 4);
@@ -840,9 +1043,9 @@
      * - channel number can be mpeg-ts PID (0x1200 ... 0x12ff)
      */
     case INPUT_OPTIONAL_DATA_SPULANG:
-      if (this->title_info) {
+      if (this->title_info && this->title_info->clip_count < current_clip) {
         int               channel = *((int *)data);
-        BLURAY_CLIP_INFO *clip    = &this->title_info->clips[this->current_clip];
+        BLURAY_CLIP_INFO *clip    = &this->title_info->clips[current_clip];
 
         if (channel >= 0 && channel < clip->pg_stream_count) {
           memcpy(data, clip->pg_streams[channel].lang, 4);
@@ -872,6 +1075,20 @@
   return INPUT_OPTIONAL_UNSUPPORTED;
 }
 
+static int bluray_plugin_get_optional_data (input_plugin_t *this_gen, void *data, int data_type)
+{
+  bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
+  int r = INPUT_OPTIONAL_UNSUPPORTED;
+
+  if (this && this->stream && data) {
+    pthread_mutex_lock(&this->title_info_mutex);
+    r = get_optional_data_impl(this, data, data_type);
+    pthread_mutex_unlock(&this->title_info_mutex);
+  }
+
+  return r;
+}
+
 static void bluray_plugin_dispose (input_plugin_t *this_gen)
 {
   bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
@@ -879,13 +1096,18 @@
   if (this->bdh)
     bd_register_overlay_proc(this->bdh, NULL, NULL);
 
-  close_overlay(this);
+  close_overlay(this, -1);
 
   if (this->event_queue)
     xine_event_dispose_queue(this->event_queue);
 
+  pthread_mutex_lock(&this->title_info_mutex);
   if (this->title_info)
     bd_free_title_info(this->title_info);
+  this->title_info = NULL;
+  pthread_mutex_unlock(&this->title_info_mutex);
+
+  pthread_mutex_destroy(&this->title_info_mutex);
 
   if (this->bdh)
     bd_close(this->bdh);
@@ -1044,7 +1266,7 @@
 
   /* load title list */
 
-  this->num_title_idx = bd_get_titles(this->bdh, TITLES_RELEVANT);
+  this->num_title_idx = bd_get_titles(this->bdh, TITLES_RELEVANT, MIN_TITLE_LENGTH);
   LOGMSG("%d titles\n", this->num_title_idx);
 
   if (this->num_title_idx < 1)
@@ -1057,7 +1279,7 @@
     uint64_t duration = 0;
     int i, playlist = 99999;
     for (i = 0; i < this->num_title_idx; i++) {
-      BLURAY_TITLE_INFO *info = bd_get_title_info(this->bdh, i);
+      BLURAY_TITLE_INFO *info = bd_get_title_info(this->bdh, i, 0);
       if (info->duration > duration) {
         title    = i;
         duration = info->duration;
@@ -1077,9 +1299,8 @@
   bd_set_player_setting_str(this->bdh, BLURAY_PLAYER_SETTING_MENU_LANG,    this->class->language);
   bd_set_player_setting_str(this->bdh, BLURAY_PLAYER_SETTING_COUNTRY_CODE, this->class->country);
 
-  /* init eq */
-  BD_EVENT ev;
-  bd_get_event(this->bdh, &ev);
+  /* init event queue */
+  bd_get_event(this->bdh, NULL);
 
   /* get disc name */
 
@@ -1166,6 +1387,8 @@
 
   this->event_queue = xine_event_new_queue (this->stream);
 
+  pthread_mutex_init(&this->title_info_mutex, NULL);
+
   this->pg_stream = -1;
 
   return &this->input_plugin;
@@ -1262,6 +1485,8 @@
 {
   (void)data;
 
+  static char *skip_modes[] = {"skip chapter", "skip title", NULL};
+
   config_values_t      *config = xine->config;
   bluray_input_class_t *this   = (bluray_input_class_t *) calloc(1, sizeof (bluray_input_class_t));
 
@@ -1318,6 +1543,14 @@
                            "control age limit is higher than this limit"),
                          0, parental_change_cb, this);
 
+  /* */
+  config->register_enum(config, "media.bluray.skip_behaviour", 0,
+                        skip_modes,
+                        _("unit for the skip action"),
+                        _("You can configure the behaviour when issuing a skip command (using the skip "
+                          "buttons for example)."),
+                        20, NULL, NULL);
+
   return this;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/Makefile.am -> libbluray-0.2.3.tar.bz2/src/Makefile.am Changed

@@ -1,13 +1,8 @@
-# library version info
-# NOTE: this is not the same as the library's release number
-LIB_CURRENT=0
-LIB_REVISION=0
-LIB_AGE=0
-LIB_VERSION_INFO="$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)"
+LIB_VERSION_INFO="@LT_VERSION_INFO@"
 
 SUBDIRS= . examples
 
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
+SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
 SET_WARNINGS = @SET_WARNINGS@
 SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
 SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
@@ -28,6 +23,8 @@
 	libbluray/bdj/native/org_videolan_Libbluray.h \
 	libbluray/bdj/native/org_videolan_Libbluray.c
 
+EXTRA_DIST = libbluray/bdj/build.xml libbluray/bdj/java
+
 lib_LTLIBRARIES=libbluray.la
 libbluray_ladir= $(includedir)/libbluray
 libbluray_la_SOURCES=libbluray/bluray.h \
@@ -85,19 +82,21 @@
 	util/strutl.c \
 	util/strutl.h \
 	util/macro.h \
+	util/mutex.h \
 	util/logging.c \
 	util/log_control.h \
 	util/bits.h \
 	util/logging.h
-libbluray_la_HEADERS= libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h
-libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO) $(DLOPEN_LDFLAGS) $(LIBXML2_LIBS)
+libbluray_la_HEADERS= libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h libbluray/bluray-version.h
+libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(DLOPEN_LIBS)
 
 if USING_BDJAVA
 libbluray_la_SOURCES+=$(SOURCES_bdj)
 AM_CFLAGS+=@BDJAVA_CFLAGS@
 
 all-local:
-	ant -f libbluray/bdj/build.xml
+	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig

libbluray-0.2.3.tar.bz2/src/Makefile.in Added

@@ -0,0 +1,1094 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USING_BDJAVA_TRUE@am__append_1 = $(SOURCES_bdj)
+@USING_BDJAVA_TRUE@am__append_2 = @BDJAVA_CFLAGS@
+subdir = src
+DIST_COMMON = $(libbluray_la_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/libbluray.pc.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = libbluray.pc
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(libbluray_ladir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libbluray_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__libbluray_la_SOURCES_DIST = libbluray/bluray.h libbluray/bluray.c \
+	libbluray/register.h libbluray/register.c libbluray/keys.h \
+	libbluray/bdnav libbluray/bdnav/bdparse.h \
+	libbluray/bdnav/uo_mask_table.h libbluray/bdnav/navigation.h \
+	libbluray/bdnav/index_parse.c libbluray/bdnav/navigation.c \
+	libbluray/bdnav/sound_parse.c libbluray/bdnav/sound_parse.h \
+	libbluray/bdnav/mpls_parse.h libbluray/bdnav/clpi_parse.c \
+	libbluray/bdnav/mpls_parse.c libbluray/bdnav/index_parse.h \
+	libbluray/bdnav/clpi_parse.h libbluray/bdnav/meta_data.h \
+	libbluray/bdnav/meta_parse.c libbluray/bdnav/meta_parse.h \
+	libbluray/decoders libbluray/decoders/pes_buffer.h \
+	libbluray/decoders/pes_buffer.c \
+	libbluray/decoders/m2ts_demux.h \
+	libbluray/decoders/m2ts_demux.c libbluray/decoders/overlay.h \
+	libbluray/decoders/pg.h libbluray/decoders/pg_decode.h \
+	libbluray/decoders/pg_decode.c libbluray/decoders/ig.h \
+	libbluray/decoders/ig_decode.h libbluray/decoders/ig_decode.c \
+	libbluray/decoders/graphics_processor.h \
+	libbluray/decoders/graphics_processor.c \
+	libbluray/decoders/graphics_controller.h \
+	libbluray/decoders/graphics_controller.c libbluray/hdmv \
+	libbluray/hdmv/hdmv_insn.h libbluray/hdmv/hdmv_vm.h \
+	libbluray/hdmv/hdmv_vm.c libbluray/hdmv/mobj_parse.h \
+	libbluray/hdmv/mobj_parse.c libbluray/hdmv/mobj_print.c \
+	file/dir_posix.c file/file.h file/file_posix.c file/dl.h \
+	file/dl_posix.c file/filesystem.h file/filesystem.c \
+	util/attributes.h util/strutl.c util/strutl.h util/macro.h \
+	util/mutex.h util/logging.c util/log_control.h util/bits.h \
+	util/logging.h libbluray/bdj/bdj.h libbluray/bdj/bdj_private.h \
+	libbluray/bdj/bdj_util.h libbluray/bdj/bdj_util.c \
+	libbluray/bdj/bdj.c libbluray/bdj/bdjo_parser.h \
+	libbluray/bdj/bdjo_parser.c libbluray/bdj/common.h \
+	libbluray/bdj/native/org_videolan_Libbluray.h \
+	libbluray/bdj/native/org_videolan_Libbluray.c
+am__objects_1 = bdj_util.lo bdj.lo bdjo_parser.lo \
+	org_videolan_Libbluray.lo
+@USING_BDJAVA_TRUE@am__objects_2 = $(am__objects_1)
+am_libbluray_la_OBJECTS = bluray.lo register.lo index_parse.lo \
+	navigation.lo sound_parse.lo clpi_parse.lo mpls_parse.lo \
+	meta_parse.lo pes_buffer.lo m2ts_demux.lo pg_decode.lo \
+	ig_decode.lo graphics_processor.lo graphics_controller.lo \
+	hdmv_vm.lo mobj_parse.lo mobj_print.lo dir_posix.lo \
+	file_posix.lo dl_posix.lo filesystem.lo strutl.lo logging.lo \
+	$(am__objects_2)
+libbluray_la_OBJECTS = $(am_libbluray_la_OBJECTS)
+libbluray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libbluray_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libbluray_la_SOURCES)
+DIST_SOURCES = $(am__libbluray_la_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+DATA = $(pkgconfig_DATA)
+HEADERS = $(libbluray_la_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
+BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
+BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
+BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = $(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
+DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DX_CONFIG = @DX_CONFIG@
+DX_DOCDIR = @DX_DOCDIR@
+DX_DOT = @DX_DOT@
+DX_DOXYGEN = @DX_DOXYGEN@
+DX_DVIPS = @DX_DVIPS@
+DX_EGREP = @DX_EGREP@
+DX_ENV = @DX_ENV@
+DX_FLAG_chi = @DX_FLAG_chi@
+DX_FLAG_chm = @DX_FLAG_chm@
+DX_FLAG_doc = @DX_FLAG_doc@
+DX_FLAG_dot = @DX_FLAG_dot@
+DX_FLAG_html = @DX_FLAG_html@
+DX_FLAG_man = @DX_FLAG_man@
+DX_FLAG_pdf = @DX_FLAG_pdf@
+DX_FLAG_ps = @DX_FLAG_ps@
+DX_FLAG_rtf = @DX_FLAG_rtf@
+DX_FLAG_xml = @DX_FLAG_xml@
+DX_HHC = @DX_HHC@
+DX_LATEX = @DX_LATEX@
+DX_MAKEINDEX = @DX_MAKEINDEX@
+DX_PDFLATEX = @DX_PDFLATEX@
+DX_PERL = @DX_PERL@
+DX_PROJECT = @DX_PROJECT@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
+SET_MAKE = @SET_MAKE@
+SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
+SET_WARNINGS = @SET_WARNINGS@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+LIB_VERSION_INFO = "@LT_VERSION_INFO@"
+SUBDIRS = . examples
+SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
+SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray/bdnav
+AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) \
+	$(SET_OPTIMIZATIONS) $(SET_DEBUG_OPTS) $(SET_INCLUDES) \
+	$(LIBXML2_CFLAGS) $(am__append_2)
+SOURCES_bdj = libbluray/bdj/bdj.h \
+	libbluray/bdj/bdj_private.h \
+	libbluray/bdj/bdj_util.h \
+	libbluray/bdj/bdj_util.c \
+	libbluray/bdj/bdj.c \
+	libbluray/bdj/bdjo_parser.h \
+	libbluray/bdj/bdjo_parser.c \
+	libbluray/bdj/common.h \
+	libbluray/bdj/native/org_videolan_Libbluray.h \
+	libbluray/bdj/native/org_videolan_Libbluray.c
+
+EXTRA_DIST = libbluray/bdj/build.xml libbluray/bdj/java
+lib_LTLIBRARIES = libbluray.la
+libbluray_ladir = $(includedir)/libbluray
+libbluray_la_SOURCES = libbluray/bluray.h libbluray/bluray.c \
+	libbluray/register.h libbluray/register.c libbluray/keys.h \
+	libbluray/bdnav libbluray/bdnav/bdparse.h \
+	libbluray/bdnav/uo_mask_table.h libbluray/bdnav/navigation.h \
+	libbluray/bdnav/index_parse.c libbluray/bdnav/navigation.c \
+	libbluray/bdnav/sound_parse.c libbluray/bdnav/sound_parse.h \
+	libbluray/bdnav/mpls_parse.h libbluray/bdnav/clpi_parse.c \
+	libbluray/bdnav/mpls_parse.c libbluray/bdnav/index_parse.h \
+	libbluray/bdnav/clpi_parse.h libbluray/bdnav/meta_data.h \
+	libbluray/bdnav/meta_parse.c libbluray/bdnav/meta_parse.h \
+	libbluray/decoders libbluray/decoders/pes_buffer.h \
+	libbluray/decoders/pes_buffer.c \
+	libbluray/decoders/m2ts_demux.h \
+	libbluray/decoders/m2ts_demux.c libbluray/decoders/overlay.h \
+	libbluray/decoders/pg.h libbluray/decoders/pg_decode.h \
+	libbluray/decoders/pg_decode.c libbluray/decoders/ig.h \
+	libbluray/decoders/ig_decode.h libbluray/decoders/ig_decode.c \
+	libbluray/decoders/graphics_processor.h \
+	libbluray/decoders/graphics_processor.c \
+	libbluray/decoders/graphics_controller.h \
+	libbluray/decoders/graphics_controller.c libbluray/hdmv \
+	libbluray/hdmv/hdmv_insn.h libbluray/hdmv/hdmv_vm.h \
+	libbluray/hdmv/hdmv_vm.c libbluray/hdmv/mobj_parse.h \
+	libbluray/hdmv/mobj_parse.c libbluray/hdmv/mobj_print.c \
+	file/dir_posix.c file/file.h file/file_posix.c file/dl.h \
+	file/dl_posix.c file/filesystem.h file/filesystem.c \
+	util/attributes.h util/strutl.c util/strutl.h util/macro.h \
+	util/mutex.h util/logging.c util/log_control.h util/bits.h \
+	util/logging.h $(am__append_1)
+libbluray_la_HEADERS = libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h libbluray/bluray-version.h
+libbluray_la_LDFLAGS = -version-info $(LIB_VERSION_INFO)
+libbluray_la_LIBADD = $(LIBXML2_LIBS) $(DLOPEN_LIBS)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libbluray.pc
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+libbluray.pc: $(top_builddir)/config.status $(srcdir)/libbluray.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libbluray.la: $(libbluray_la_OBJECTS) $(libbluray_la_DEPENDENCIES) $(EXTRA_libbluray_la_DEPENDENCIES) 
+	$(libbluray_la_LINK) -rpath $(libdir) $(libbluray_la_OBJECTS) $(libbluray_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdj_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdjo_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bluray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clpi_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dl_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesystem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_controller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_processor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdmv_vm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ig_decode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m2ts_demux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpls_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navigation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/org_videolan_Libbluray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pes_buffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pg_decode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/register.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strutl.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+bluray.lo: libbluray/bluray.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bluray.lo -MD -MP -MF $(DEPDIR)/bluray.Tpo -c -o bluray.lo `test -f 'libbluray/bluray.c' || echo '$(srcdir)/'`libbluray/bluray.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bluray.Tpo $(DEPDIR)/bluray.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bluray.c' object='bluray.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bluray.lo `test -f 'libbluray/bluray.c' || echo '$(srcdir)/'`libbluray/bluray.c
+
+register.lo: libbluray/register.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'libbluray/register.c' || echo '$(srcdir)/'`libbluray/register.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'libbluray/register.c' || echo '$(srcdir)/'`libbluray/register.c
+
+index_parse.lo: libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT index_parse.lo -MD -MP -MF $(DEPDIR)/index_parse.Tpo -c -o index_parse.lo `test -f 'libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/index_parse.Tpo $(DEPDIR)/index_parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/index_parse.c' object='index_parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o index_parse.lo `test -f 'libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/index_parse.c
+
+navigation.lo: libbluray/bdnav/navigation.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT navigation.lo -MD -MP -MF $(DEPDIR)/navigation.Tpo -c -o navigation.lo `test -f 'libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`libbluray/bdnav/navigation.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/navigation.Tpo $(DEPDIR)/navigation.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/navigation.c' object='navigation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o navigation.lo `test -f 'libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`libbluray/bdnav/navigation.c
+
+sound_parse.lo: libbluray/bdnav/sound_parse.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sound_parse.lo -MD -MP -MF $(DEPDIR)/sound_parse.Tpo -c -o sound_parse.lo `test -f 'libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/sound_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sound_parse.Tpo $(DEPDIR)/sound_parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/sound_parse.c' object='sound_parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sound_parse.lo `test -f 'libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/sound_parse.c
+
+clpi_parse.lo: libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clpi_parse.lo -MD -MP -MF $(DEPDIR)/clpi_parse.Tpo -c -o clpi_parse.lo `test -f 'libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clpi_parse.Tpo $(DEPDIR)/clpi_parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/clpi_parse.c' object='clpi_parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clpi_parse.lo `test -f 'libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/clpi_parse.c
+
+mpls_parse.lo: libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpls_parse.lo -MD -MP -MF $(DEPDIR)/mpls_parse.Tpo -c -o mpls_parse.lo `test -f 'libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpls_parse.Tpo $(DEPDIR)/mpls_parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/mpls_parse.c' object='mpls_parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpls_parse.lo `test -f 'libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/mpls_parse.c
+
+meta_parse.lo: libbluray/bdnav/meta_parse.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT meta_parse.lo -MD -MP -MF $(DEPDIR)/meta_parse.Tpo -c -o meta_parse.lo `test -f 'libbluray/bdnav/meta_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/meta_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/meta_parse.Tpo $(DEPDIR)/meta_parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/meta_parse.c' object='meta_parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o meta_parse.lo `test -f 'libbluray/bdnav/meta_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/meta_parse.c
+
+pes_buffer.lo: libbluray/decoders/pes_buffer.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pes_buffer.lo -MD -MP -MF $(DEPDIR)/pes_buffer.Tpo -c -o pes_buffer.lo `test -f 'libbluray/decoders/pes_buffer.c' || echo '$(srcdir)/'`libbluray/decoders/pes_buffer.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pes_buffer.Tpo $(DEPDIR)/pes_buffer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/pes_buffer.c' object='pes_buffer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pes_buffer.lo `test -f 'libbluray/decoders/pes_buffer.c' || echo '$(srcdir)/'`libbluray/decoders/pes_buffer.c
+
+m2ts_demux.lo: libbluray/decoders/m2ts_demux.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m2ts_demux.lo -MD -MP -MF $(DEPDIR)/m2ts_demux.Tpo -c -o m2ts_demux.lo `test -f 'libbluray/decoders/m2ts_demux.c' || echo '$(srcdir)/'`libbluray/decoders/m2ts_demux.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m2ts_demux.Tpo $(DEPDIR)/m2ts_demux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/m2ts_demux.c' object='m2ts_demux.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m2ts_demux.lo `test -f 'libbluray/decoders/m2ts_demux.c' || echo '$(srcdir)/'`libbluray/decoders/m2ts_demux.c
+
+pg_decode.lo: libbluray/decoders/pg_decode.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pg_decode.lo -MD -MP -MF $(DEPDIR)/pg_decode.Tpo -c -o pg_decode.lo `test -f 'libbluray/decoders/pg_decode.c' || echo '$(srcdir)/'`libbluray/decoders/pg_decode.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pg_decode.Tpo $(DEPDIR)/pg_decode.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/pg_decode.c' object='pg_decode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pg_decode.lo `test -f 'libbluray/decoders/pg_decode.c' || echo '$(srcdir)/'`libbluray/decoders/pg_decode.c
+
+ig_decode.lo: libbluray/decoders/ig_decode.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ig_decode.lo -MD -MP -MF $(DEPDIR)/ig_decode.Tpo -c -o ig_decode.lo `test -f 'libbluray/decoders/ig_decode.c' || echo '$(srcdir)/'`libbluray/decoders/ig_decode.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ig_decode.Tpo $(DEPDIR)/ig_decode.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/ig_decode.c' object='ig_decode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ig_decode.lo `test -f 'libbluray/decoders/ig_decode.c' || echo '$(srcdir)/'`libbluray/decoders/ig_decode.c
+
+graphics_processor.lo: libbluray/decoders/graphics_processor.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT graphics_processor.lo -MD -MP -MF $(DEPDIR)/graphics_processor.Tpo -c -o graphics_processor.lo `test -f 'libbluray/decoders/graphics_processor.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_processor.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/graphics_processor.Tpo $(DEPDIR)/graphics_processor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/graphics_processor.c' object='graphics_processor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o graphics_processor.lo `test -f 'libbluray/decoders/graphics_processor.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_processor.c
+
+graphics_controller.lo: libbluray/decoders/graphics_controller.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT graphics_controller.lo -MD -MP -MF $(DEPDIR)/graphics_controller.Tpo -c -o graphics_controller.lo `test -f 'libbluray/decoders/graphics_controller.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_controller.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/graphics_controller.Tpo $(DEPDIR)/graphics_controller.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/graphics_controller.c' object='graphics_controller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o graphics_controller.lo `test -f 'libbluray/decoders/graphics_controller.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_controller.c
+
+hdmv_vm.lo: libbluray/hdmv/hdmv_vm.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hdmv_vm.lo -MD -MP -MF $(DEPDIR)/hdmv_vm.Tpo -c -o hdmv_vm.lo `test -f 'libbluray/hdmv/hdmv_vm.c' || echo '$(srcdir)/'`libbluray/hdmv/hdmv_vm.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hdmv_vm.Tpo $(DEPDIR)/hdmv_vm.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/hdmv/hdmv_vm.c' object='hdmv_vm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hdmv_vm.lo `test -f 'libbluray/hdmv/hdmv_vm.c' || echo '$(srcdir)/'`libbluray/hdmv/hdmv_vm.c
+
+mobj_parse.lo: libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_parse.lo -MD -MP -MF $(DEPDIR)/mobj_parse.Tpo -c -o mobj_parse.lo `test -f 'libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_parse.Tpo $(DEPDIR)/mobj_parse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/hdmv/mobj_parse.c' object='mobj_parse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_parse.lo `test -f 'libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_parse.c
+
+mobj_print.lo: libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_print.lo -MD -MP -MF $(DEPDIR)/mobj_print.Tpo -c -o mobj_print.lo `test -f 'libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_print.Tpo $(DEPDIR)/mobj_print.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/hdmv/mobj_print.c' object='mobj_print.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_print.lo `test -f 'libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_print.c
+
+dir_posix.lo: file/dir_posix.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir_posix.lo -MD -MP -MF $(DEPDIR)/dir_posix.Tpo -c -o dir_posix.lo `test -f 'file/dir_posix.c' || echo '$(srcdir)/'`file/dir_posix.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dir_posix.Tpo $(DEPDIR)/dir_posix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/dir_posix.c' object='dir_posix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir_posix.lo `test -f 'file/dir_posix.c' || echo '$(srcdir)/'`file/dir_posix.c
+
+file_posix.lo: file/file_posix.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_posix.lo -MD -MP -MF $(DEPDIR)/file_posix.Tpo -c -o file_posix.lo `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_posix.Tpo $(DEPDIR)/file_posix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/file_posix.c' object='file_posix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_posix.lo `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+
+dl_posix.lo: file/dl_posix.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dl_posix.lo -MD -MP -MF $(DEPDIR)/dl_posix.Tpo -c -o dl_posix.lo `test -f 'file/dl_posix.c' || echo '$(srcdir)/'`file/dl_posix.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dl_posix.Tpo $(DEPDIR)/dl_posix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/dl_posix.c' object='dl_posix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dl_posix.lo `test -f 'file/dl_posix.c' || echo '$(srcdir)/'`file/dl_posix.c
+
+filesystem.lo: file/filesystem.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT filesystem.lo -MD -MP -MF $(DEPDIR)/filesystem.Tpo -c -o filesystem.lo `test -f 'file/filesystem.c' || echo '$(srcdir)/'`file/filesystem.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/filesystem.Tpo $(DEPDIR)/filesystem.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/filesystem.c' object='filesystem.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filesystem.lo `test -f 'file/filesystem.c' || echo '$(srcdir)/'`file/filesystem.c
+
+strutl.lo: util/strutl.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strutl.lo -MD -MP -MF $(DEPDIR)/strutl.Tpo -c -o strutl.lo `test -f 'util/strutl.c' || echo '$(srcdir)/'`util/strutl.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/strutl.Tpo $(DEPDIR)/strutl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util/strutl.c' object='strutl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strutl.lo `test -f 'util/strutl.c' || echo '$(srcdir)/'`util/strutl.c
+
+logging.lo: util/logging.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logging.lo -MD -MP -MF $(DEPDIR)/logging.Tpo -c -o logging.lo `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logging.Tpo $(DEPDIR)/logging.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util/logging.c' object='logging.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logging.lo `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+
+bdj_util.lo: libbluray/bdj/bdj_util.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bdj_util.lo -MD -MP -MF $(DEPDIR)/bdj_util.Tpo -c -o bdj_util.lo `test -f 'libbluray/bdj/bdj_util.c' || echo '$(srcdir)/'`libbluray/bdj/bdj_util.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bdj_util.Tpo $(DEPDIR)/bdj_util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/bdj_util.c' object='bdj_util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bdj_util.lo `test -f 'libbluray/bdj/bdj_util.c' || echo '$(srcdir)/'`libbluray/bdj/bdj_util.c
+
+bdj.lo: libbluray/bdj/bdj.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bdj.lo -MD -MP -MF $(DEPDIR)/bdj.Tpo -c -o bdj.lo `test -f 'libbluray/bdj/bdj.c' || echo '$(srcdir)/'`libbluray/bdj/bdj.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bdj.Tpo $(DEPDIR)/bdj.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/bdj.c' object='bdj.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bdj.lo `test -f 'libbluray/bdj/bdj.c' || echo '$(srcdir)/'`libbluray/bdj/bdj.c
+
+bdjo_parser.lo: libbluray/bdj/bdjo_parser.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bdjo_parser.lo -MD -MP -MF $(DEPDIR)/bdjo_parser.Tpo -c -o bdjo_parser.lo `test -f 'libbluray/bdj/bdjo_parser.c' || echo '$(srcdir)/'`libbluray/bdj/bdjo_parser.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bdjo_parser.Tpo $(DEPDIR)/bdjo_parser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/bdjo_parser.c' object='bdjo_parser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bdjo_parser.lo `test -f 'libbluray/bdj/bdjo_parser.c' || echo '$(srcdir)/'`libbluray/bdj/bdjo_parser.c
+
+org_videolan_Libbluray.lo: libbluray/bdj/native/org_videolan_Libbluray.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT org_videolan_Libbluray.lo -MD -MP -MF $(DEPDIR)/org_videolan_Libbluray.Tpo -c -o org_videolan_Libbluray.lo `test -f 'libbluray/bdj/native/org_videolan_Libbluray.c' || echo '$(srcdir)/'`libbluray/bdj/native/org_videolan_Libbluray.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/org_videolan_Libbluray.Tpo $(DEPDIR)/org_videolan_Libbluray.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/native/org_videolan_Libbluray.c' object='org_videolan_Libbluray.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o org_videolan_Libbluray.lo `test -f 'libbluray/bdj/native/org_videolan_Libbluray.c' || echo '$(srcdir)/'`libbluray/bdj/native/org_videolan_Libbluray.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-libbluray_laHEADERS: $(libbluray_la_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libbluray_ladir)" || $(MKDIR_P) "$(DESTDIR)$(libbluray_ladir)"
+	@list='$(libbluray_la_HEADERS)'; test -n "$(libbluray_ladir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libbluray_ladir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libbluray_ladir)" || exit $$?; \
+	done
+
+uninstall-libbluray_laHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libbluray_la_HEADERS)'; test -n "$(libbluray_ladir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libbluray_ladir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+@USING_BDJAVA_FALSE@all-local:
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libbluray_ladir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-libbluray_laHEADERS install-pkgconfigDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES uninstall-libbluray_laHEADERS \
+	uninstall-pkgconfigDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES \
+	install-libbluray_laHEADERS install-man install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-libbluray_laHEADERS uninstall-pkgconfigDATA
+
+
+@USING_BDJAVA_TRUE@all-local:
+@USING_BDJAVA_TRUE@	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/Makefile.am -> libbluray-0.2.3.tar.bz2/src/examples/Makefile.am Changed

libbluray-0.2.3.tar.bz2/src/examples/Makefile.in Added

@@ -0,0 +1,924 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdsplice$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	mpls_dump$(EXEEXT) clpi_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	index_dump$(EXEEXT) mobj_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	sound_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	libbluray_test$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	list_titles$(EXEEXT) hdmv_test$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	$(am__EXEEXT_1)
+@USING_EXAMPLES_TRUE@bin_PROGRAMS = bd_info$(EXEEXT)
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_1 = @BDJAVA_CFLAGS@
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_2 = bdj_test
+subdir = src/examples
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__EXEEXT_1 =  \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__bd_info_SOURCES_DIST = bd_info.c
+@USING_EXAMPLES_TRUE@am_bd_info_OBJECTS = bd_info.$(OBJEXT)
+bd_info_OBJECTS = $(am_bd_info_OBJECTS)
+@USING_EXAMPLES_TRUE@bd_info_DEPENDENCIES = $(BLURAY_LIB)
+am__bdj_test_SOURCES_DIST = bdj_test.c
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am_bdj_test_OBJECTS =  \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test.$(OBJEXT)
+bdj_test_OBJECTS = $(am_bdj_test_OBJECTS)
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_DEPENDENCIES =  \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	$(BLURAY_LIB)
+am__bdsplice_SOURCES_DIST = bdsplice.c
+@USING_EXAMPLES_TRUE@am_bdsplice_OBJECTS = bdsplice.$(OBJEXT)
+bdsplice_OBJECTS = $(am_bdsplice_OBJECTS)
+@USING_EXAMPLES_TRUE@bdsplice_DEPENDENCIES = $(BLURAY_LIB)
+am__clpi_dump_SOURCES_DIST = clpi_dump.c util.c util.h \
+	../util/logging.c ../file/file_posix.c \
+	../libbluray/bdnav/clpi_parse.c
+@USING_EXAMPLES_TRUE@am_clpi_dump_OBJECTS = clpi_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util.$(OBJEXT) logging.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	file_posix.$(OBJEXT) clpi_parse.$(OBJEXT)
+clpi_dump_OBJECTS = $(am_clpi_dump_OBJECTS)
+clpi_dump_LDADD = $(LDADD)
+am__hdmv_test_SOURCES_DIST = hdmv_test.c
+@USING_EXAMPLES_TRUE@am_hdmv_test_OBJECTS = hdmv_test.$(OBJEXT)
+hdmv_test_OBJECTS = $(am_hdmv_test_OBJECTS)
+@USING_EXAMPLES_TRUE@hdmv_test_DEPENDENCIES = $(BLURAY_LIB)
+am__index_dump_SOURCES_DIST = index_dump.c ../util/logging.c \
+	../file/file_posix.c ../libbluray/bdnav/index_parse.c
+@USING_EXAMPLES_TRUE@am_index_dump_OBJECTS = index_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	index_parse.$(OBJEXT)
+index_dump_OBJECTS = $(am_index_dump_OBJECTS)
+index_dump_LDADD = $(LDADD)
+am__libbluray_test_SOURCES_DIST = libbluray_test.c ../util/logging.c
+@USING_EXAMPLES_TRUE@am_libbluray_test_OBJECTS =  \
+@USING_EXAMPLES_TRUE@	libbluray_test.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT)
+libbluray_test_OBJECTS = $(am_libbluray_test_OBJECTS)
+@USING_EXAMPLES_TRUE@libbluray_test_DEPENDENCIES = $(BLURAY_LIB)
+am__list_titles_SOURCES_DIST = list_titles.c ../util/logging.c
+@USING_EXAMPLES_TRUE@am_list_titles_OBJECTS = list_titles.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT)
+list_titles_OBJECTS = $(am_list_titles_OBJECTS)
+@USING_EXAMPLES_TRUE@list_titles_DEPENDENCIES = $(BLURAY_LIB)
+am__mobj_dump_SOURCES_DIST = mobj_dump.c ../util/logging.c \
+	../file/file_posix.c ../libbluray/hdmv/mobj_parse.c \
+	../libbluray/hdmv/mobj_print.c
+@USING_EXAMPLES_TRUE@am_mobj_dump_OBJECTS = mobj_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	mobj_parse.$(OBJEXT) mobj_print.$(OBJEXT)
+mobj_dump_OBJECTS = $(am_mobj_dump_OBJECTS)
+mobj_dump_LDADD = $(LDADD)
+am__mpls_dump_SOURCES_DIST = mpls_dump.c util.c util.h \
+	../util/strutl.c ../util/logging.c ../file/file_posix.c \
+	../file/dir_posix.c ../libbluray/bdnav/mpls_parse.c \
+	../libbluray/bdnav/clpi_parse.c \
+	../libbluray/bdnav/navigation.c
+@USING_EXAMPLES_TRUE@am_mpls_dump_OBJECTS = mpls_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util.$(OBJEXT) strutl.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	dir_posix.$(OBJEXT) mpls_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	clpi_parse.$(OBJEXT) navigation.$(OBJEXT)
+mpls_dump_OBJECTS = $(am_mpls_dump_OBJECTS)
+mpls_dump_LDADD = $(LDADD)
+am__sound_dump_SOURCES_DIST = sound_dump.c ../util/logging.c \
+	../file/file_posix.c ../libbluray/bdnav/sound_parse.c
+@USING_EXAMPLES_TRUE@am_sound_dump_OBJECTS = sound_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	sound_parse.$(OBJEXT)
+sound_dump_OBJECTS = $(am_sound_dump_OBJECTS)
+sound_dump_LDADD = $(LDADD)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(bd_info_SOURCES) $(bdj_test_SOURCES) $(bdsplice_SOURCES) \
+	$(clpi_dump_SOURCES) $(hdmv_test_SOURCES) \
+	$(index_dump_SOURCES) $(libbluray_test_SOURCES) \
+	$(list_titles_SOURCES) $(mobj_dump_SOURCES) \
+	$(mpls_dump_SOURCES) $(sound_dump_SOURCES)
+DIST_SOURCES = $(am__bd_info_SOURCES_DIST) \
+	$(am__bdj_test_SOURCES_DIST) $(am__bdsplice_SOURCES_DIST) \
+	$(am__clpi_dump_SOURCES_DIST) $(am__hdmv_test_SOURCES_DIST) \
+	$(am__index_dump_SOURCES_DIST) \
+	$(am__libbluray_test_SOURCES_DIST) \
+	$(am__list_titles_SOURCES_DIST) $(am__mobj_dump_SOURCES_DIST) \
+	$(am__mpls_dump_SOURCES_DIST) $(am__sound_dump_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
+BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
+BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
+BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = $(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
+DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DX_CONFIG = @DX_CONFIG@
+DX_DOCDIR = @DX_DOCDIR@
+DX_DOT = @DX_DOT@
+DX_DOXYGEN = @DX_DOXYGEN@
+DX_DVIPS = @DX_DVIPS@
+DX_EGREP = @DX_EGREP@
+DX_ENV = @DX_ENV@
+DX_FLAG_chi = @DX_FLAG_chi@
+DX_FLAG_chm = @DX_FLAG_chm@
+DX_FLAG_doc = @DX_FLAG_doc@
+DX_FLAG_dot = @DX_FLAG_dot@
+DX_FLAG_html = @DX_FLAG_html@
+DX_FLAG_man = @DX_FLAG_man@
+DX_FLAG_pdf = @DX_FLAG_pdf@
+DX_FLAG_ps = @DX_FLAG_ps@
+DX_FLAG_rtf = @DX_FLAG_rtf@
+DX_FLAG_xml = @DX_FLAG_xml@
+DX_HHC = @DX_HHC@
+DX_LATEX = @DX_LATEX@
+DX_MAKEINDEX = @DX_MAKEINDEX@
+DX_PDFLATEX = @DX_PDFLATEX@
+DX_PERL = @DX_PERL@
+DX_PROJECT = @DX_PROJECT@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
+SET_MAKE = @SET_MAKE@
+SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
+SET_WARNINGS = @SET_WARNINGS@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
+SET_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/file -I$(top_srcdir)/src/libbluray/bdnav
+AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) \
+	$(SET_OPTIMIZATIONS) $(SET_DEBUG_OPTS) $(SET_INCLUDES) \
+	$(am__append_1)
+@USING_EXAMPLES_TRUE@BLURAY_LIB = $(top_builddir)/src/libbluray.la
+@USING_EXAMPLES_TRUE@bdsplice_SOURCES = \
+@USING_EXAMPLES_TRUE@	bdsplice.c
+
+@USING_EXAMPLES_TRUE@bdsplice_LDADD = $(BLURAY_LIB)
+@USING_EXAMPLES_TRUE@mpls_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	mpls_dump.c util.c util.h \
+@USING_EXAMPLES_TRUE@	../util/strutl.c \
+@USING_EXAMPLES_TRUE@	../util/logging.c \
+@USING_EXAMPLES_TRUE@	../file/file_posix.c \
+@USING_EXAMPLES_TRUE@	../file/dir_posix.c \
+@USING_EXAMPLES_TRUE@	../libbluray/bdnav/mpls_parse.c \
+@USING_EXAMPLES_TRUE@	../libbluray/bdnav/clpi_parse.c \
+@USING_EXAMPLES_TRUE@	../libbluray/bdnav/navigation.c
+
+@USING_EXAMPLES_TRUE@clpi_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	clpi_dump.c util.c util.h \
+@USING_EXAMPLES_TRUE@	../util/logging.c \
+@USING_EXAMPLES_TRUE@	../file/file_posix.c \
+@USING_EXAMPLES_TRUE@	../libbluray/bdnav/clpi_parse.c
+
+@USING_EXAMPLES_TRUE@sound_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	sound_dump.c \
+@USING_EXAMPLES_TRUE@	../util/logging.c \
+@USING_EXAMPLES_TRUE@	../file/file_posix.c \
+@USING_EXAMPLES_TRUE@	../libbluray/bdnav/sound_parse.c
+
+@USING_EXAMPLES_TRUE@index_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	index_dump.c \
+@USING_EXAMPLES_TRUE@	../util/logging.c \
+@USING_EXAMPLES_TRUE@	../file/file_posix.c \
+@USING_EXAMPLES_TRUE@	../libbluray/bdnav/index_parse.c
+
+@USING_EXAMPLES_TRUE@mobj_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	mobj_dump.c \
+@USING_EXAMPLES_TRUE@	../util/logging.c \
+@USING_EXAMPLES_TRUE@	../file/file_posix.c \
+@USING_EXAMPLES_TRUE@	../libbluray/hdmv/mobj_parse.c \
+@USING_EXAMPLES_TRUE@	../libbluray/hdmv/mobj_print.c
+
+@USING_EXAMPLES_TRUE@libbluray_test_SOURCES = \
+@USING_EXAMPLES_TRUE@	libbluray_test.c ../util/logging.c
+
+@USING_EXAMPLES_TRUE@libbluray_test_LDADD = $(BLURAY_LIB)
+@USING_EXAMPLES_TRUE@hdmv_test_SOURCES = \
+@USING_EXAMPLES_TRUE@	hdmv_test.c
+
+@USING_EXAMPLES_TRUE@hdmv_test_LDADD = $(BLURAY_LIB)
+@USING_EXAMPLES_TRUE@list_titles_SOURCES = \
+@USING_EXAMPLES_TRUE@	list_titles.c ../util/logging.c
+
+@USING_EXAMPLES_TRUE@list_titles_LDADD = $(BLURAY_LIB)
+@USING_EXAMPLES_TRUE@bd_info_SOURCES = \
+@USING_EXAMPLES_TRUE@	bd_info.c
+
+@USING_EXAMPLES_TRUE@bd_info_LDADD = $(BLURAY_LIB)
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_SOURCES = bdj_test.c
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_LDADD = $(BLURAY_LIB)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/examples/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+bd_info$(EXEEXT): $(bd_info_OBJECTS) $(bd_info_DEPENDENCIES) $(EXTRA_bd_info_DEPENDENCIES) 
+	@rm -f bd_info$(EXEEXT)
+	$(LINK) $(bd_info_OBJECTS) $(bd_info_LDADD) $(LIBS)
+bdj_test$(EXEEXT): $(bdj_test_OBJECTS) $(bdj_test_DEPENDENCIES) $(EXTRA_bdj_test_DEPENDENCIES) 
+	@rm -f bdj_test$(EXEEXT)
+	$(LINK) $(bdj_test_OBJECTS) $(bdj_test_LDADD) $(LIBS)
+bdsplice$(EXEEXT): $(bdsplice_OBJECTS) $(bdsplice_DEPENDENCIES) $(EXTRA_bdsplice_DEPENDENCIES) 
+	@rm -f bdsplice$(EXEEXT)
+	$(LINK) $(bdsplice_OBJECTS) $(bdsplice_LDADD) $(LIBS)
+clpi_dump$(EXEEXT): $(clpi_dump_OBJECTS) $(clpi_dump_DEPENDENCIES) $(EXTRA_clpi_dump_DEPENDENCIES) 
+	@rm -f clpi_dump$(EXEEXT)
+	$(LINK) $(clpi_dump_OBJECTS) $(clpi_dump_LDADD) $(LIBS)
+hdmv_test$(EXEEXT): $(hdmv_test_OBJECTS) $(hdmv_test_DEPENDENCIES) $(EXTRA_hdmv_test_DEPENDENCIES) 
+	@rm -f hdmv_test$(EXEEXT)
+	$(LINK) $(hdmv_test_OBJECTS) $(hdmv_test_LDADD) $(LIBS)
+index_dump$(EXEEXT): $(index_dump_OBJECTS) $(index_dump_DEPENDENCIES) $(EXTRA_index_dump_DEPENDENCIES) 
+	@rm -f index_dump$(EXEEXT)
+	$(LINK) $(index_dump_OBJECTS) $(index_dump_LDADD) $(LIBS)
+libbluray_test$(EXEEXT): $(libbluray_test_OBJECTS) $(libbluray_test_DEPENDENCIES) $(EXTRA_libbluray_test_DEPENDENCIES) 
+	@rm -f libbluray_test$(EXEEXT)
+	$(LINK) $(libbluray_test_OBJECTS) $(libbluray_test_LDADD) $(LIBS)
+list_titles$(EXEEXT): $(list_titles_OBJECTS) $(list_titles_DEPENDENCIES) $(EXTRA_list_titles_DEPENDENCIES) 
+	@rm -f list_titles$(EXEEXT)
+	$(LINK) $(list_titles_OBJECTS) $(list_titles_LDADD) $(LIBS)
+mobj_dump$(EXEEXT): $(mobj_dump_OBJECTS) $(mobj_dump_DEPENDENCIES) $(EXTRA_mobj_dump_DEPENDENCIES) 
+	@rm -f mobj_dump$(EXEEXT)
+	$(LINK) $(mobj_dump_OBJECTS) $(mobj_dump_LDADD) $(LIBS)
+mpls_dump$(EXEEXT): $(mpls_dump_OBJECTS) $(mpls_dump_DEPENDENCIES) $(EXTRA_mpls_dump_DEPENDENCIES) 
+	@rm -f mpls_dump$(EXEEXT)
+	$(LINK) $(mpls_dump_OBJECTS) $(mpls_dump_LDADD) $(LIBS)
+sound_dump$(EXEEXT): $(sound_dump_OBJECTS) $(sound_dump_DEPENDENCIES) $(EXTRA_sound_dump_DEPENDENCIES) 
+	@rm -f sound_dump$(EXEEXT)
+	$(LINK) $(sound_dump_OBJECTS) $(sound_dump_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bd_info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdj_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdsplice.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clpi_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clpi_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_posix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_posix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdmv_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbluray_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_titles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpls_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpls_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navigation.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strutl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+logging.o: ../util/logging.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logging.o -MD -MP -MF $(DEPDIR)/logging.Tpo -c -o logging.o `test -f '../util/logging.c' || echo '$(srcdir)/'`../util/logging.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logging.Tpo $(DEPDIR)/logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/logging.c' object='logging.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logging.o `test -f '../util/logging.c' || echo '$(srcdir)/'`../util/logging.c
+
+logging.obj: ../util/logging.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logging.obj -MD -MP -MF $(DEPDIR)/logging.Tpo -c -o logging.obj `if test -f '../util/logging.c'; then $(CYGPATH_W) '../util/logging.c'; else $(CYGPATH_W) '$(srcdir)/../util/logging.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logging.Tpo $(DEPDIR)/logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/logging.c' object='logging.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logging.obj `if test -f '../util/logging.c'; then $(CYGPATH_W) '../util/logging.c'; else $(CYGPATH_W) '$(srcdir)/../util/logging.c'; fi`
+
+file_posix.o: ../file/file_posix.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_posix.o -MD -MP -MF $(DEPDIR)/file_posix.Tpo -c -o file_posix.o `test -f '../file/file_posix.c' || echo '$(srcdir)/'`../file/file_posix.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_posix.Tpo $(DEPDIR)/file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/file_posix.c' object='file_posix.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_posix.o `test -f '../file/file_posix.c' || echo '$(srcdir)/'`../file/file_posix.c
+
+file_posix.obj: ../file/file_posix.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_posix.obj -MD -MP -MF $(DEPDIR)/file_posix.Tpo -c -o file_posix.obj `if test -f '../file/file_posix.c'; then $(CYGPATH_W) '../file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/file_posix.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_posix.Tpo $(DEPDIR)/file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/file_posix.c' object='file_posix.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_posix.obj `if test -f '../file/file_posix.c'; then $(CYGPATH_W) '../file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/file_posix.c'; fi`
+
+clpi_parse.o: ../libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clpi_parse.o -MD -MP -MF $(DEPDIR)/clpi_parse.Tpo -c -o clpi_parse.o `test -f '../libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clpi_parse.Tpo $(DEPDIR)/clpi_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/clpi_parse.c' object='clpi_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clpi_parse.o `test -f '../libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/clpi_parse.c
+
+clpi_parse.obj: ../libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clpi_parse.obj -MD -MP -MF $(DEPDIR)/clpi_parse.Tpo -c -o clpi_parse.obj `if test -f '../libbluray/bdnav/clpi_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/clpi_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/clpi_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clpi_parse.Tpo $(DEPDIR)/clpi_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/clpi_parse.c' object='clpi_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clpi_parse.obj `if test -f '../libbluray/bdnav/clpi_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/clpi_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/clpi_parse.c'; fi`
+
+index_parse.o: ../libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT index_parse.o -MD -MP -MF $(DEPDIR)/index_parse.Tpo -c -o index_parse.o `test -f '../libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/index_parse.Tpo $(DEPDIR)/index_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/index_parse.c' object='index_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o index_parse.o `test -f '../libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/index_parse.c
+
+index_parse.obj: ../libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT index_parse.obj -MD -MP -MF $(DEPDIR)/index_parse.Tpo -c -o index_parse.obj `if test -f '../libbluray/bdnav/index_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/index_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/index_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/index_parse.Tpo $(DEPDIR)/index_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/index_parse.c' object='index_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o index_parse.obj `if test -f '../libbluray/bdnav/index_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/index_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/index_parse.c'; fi`
+
+mobj_parse.o: ../libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_parse.o -MD -MP -MF $(DEPDIR)/mobj_parse.Tpo -c -o mobj_parse.o `test -f '../libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_parse.Tpo $(DEPDIR)/mobj_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_parse.c' object='mobj_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_parse.o `test -f '../libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_parse.c
+
+mobj_parse.obj: ../libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_parse.obj -MD -MP -MF $(DEPDIR)/mobj_parse.Tpo -c -o mobj_parse.obj `if test -f '../libbluray/hdmv/mobj_parse.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_parse.Tpo $(DEPDIR)/mobj_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_parse.c' object='mobj_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_parse.obj `if test -f '../libbluray/hdmv/mobj_parse.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_parse.c'; fi`
+
+mobj_print.o: ../libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_print.o -MD -MP -MF $(DEPDIR)/mobj_print.Tpo -c -o mobj_print.o `test -f '../libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_print.Tpo $(DEPDIR)/mobj_print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_print.c' object='mobj_print.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_print.o `test -f '../libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_print.c
+
+mobj_print.obj: ../libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_print.obj -MD -MP -MF $(DEPDIR)/mobj_print.Tpo -c -o mobj_print.obj `if test -f '../libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_print.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_print.Tpo $(DEPDIR)/mobj_print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_print.c' object='mobj_print.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_print.obj `if test -f '../libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_print.c'; fi`
+
+strutl.o: ../util/strutl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strutl.o -MD -MP -MF $(DEPDIR)/strutl.Tpo -c -o strutl.o `test -f '../util/strutl.c' || echo '$(srcdir)/'`../util/strutl.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/strutl.Tpo $(DEPDIR)/strutl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/strutl.c' object='strutl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strutl.o `test -f '../util/strutl.c' || echo '$(srcdir)/'`../util/strutl.c
+
+strutl.obj: ../util/strutl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strutl.obj -MD -MP -MF $(DEPDIR)/strutl.Tpo -c -o strutl.obj `if test -f '../util/strutl.c'; then $(CYGPATH_W) '../util/strutl.c'; else $(CYGPATH_W) '$(srcdir)/../util/strutl.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/strutl.Tpo $(DEPDIR)/strutl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/strutl.c' object='strutl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strutl.obj `if test -f '../util/strutl.c'; then $(CYGPATH_W) '../util/strutl.c'; else $(CYGPATH_W) '$(srcdir)/../util/strutl.c'; fi`
+
+dir_posix.o: ../file/dir_posix.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir_posix.o -MD -MP -MF $(DEPDIR)/dir_posix.Tpo -c -o dir_posix.o `test -f '../file/dir_posix.c' || echo '$(srcdir)/'`../file/dir_posix.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dir_posix.Tpo $(DEPDIR)/dir_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/dir_posix.c' object='dir_posix.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir_posix.o `test -f '../file/dir_posix.c' || echo '$(srcdir)/'`../file/dir_posix.c
+
+dir_posix.obj: ../file/dir_posix.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir_posix.obj -MD -MP -MF $(DEPDIR)/dir_posix.Tpo -c -o dir_posix.obj `if test -f '../file/dir_posix.c'; then $(CYGPATH_W) '../file/dir_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/dir_posix.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dir_posix.Tpo $(DEPDIR)/dir_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/dir_posix.c' object='dir_posix.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir_posix.obj `if test -f '../file/dir_posix.c'; then $(CYGPATH_W) '../file/dir_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/dir_posix.c'; fi`
+
+mpls_parse.o: ../libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpls_parse.o -MD -MP -MF $(DEPDIR)/mpls_parse.Tpo -c -o mpls_parse.o `test -f '../libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpls_parse.Tpo $(DEPDIR)/mpls_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/mpls_parse.c' object='mpls_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpls_parse.o `test -f '../libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/mpls_parse.c
+
+mpls_parse.obj: ../libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpls_parse.obj -MD -MP -MF $(DEPDIR)/mpls_parse.Tpo -c -o mpls_parse.obj `if test -f '../libbluray/bdnav/mpls_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/mpls_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/mpls_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpls_parse.Tpo $(DEPDIR)/mpls_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/mpls_parse.c' object='mpls_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpls_parse.obj `if test -f '../libbluray/bdnav/mpls_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/mpls_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/mpls_parse.c'; fi`
+
+navigation.o: ../libbluray/bdnav/navigation.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT navigation.o -MD -MP -MF $(DEPDIR)/navigation.Tpo -c -o navigation.o `test -f '../libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`../libbluray/bdnav/navigation.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/navigation.Tpo $(DEPDIR)/navigation.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/navigation.c' object='navigation.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o navigation.o `test -f '../libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`../libbluray/bdnav/navigation.c
+
+navigation.obj: ../libbluray/bdnav/navigation.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT navigation.obj -MD -MP -MF $(DEPDIR)/navigation.Tpo -c -o navigation.obj `if test -f '../libbluray/bdnav/navigation.c'; then $(CYGPATH_W) '../libbluray/bdnav/navigation.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/navigation.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/navigation.Tpo $(DEPDIR)/navigation.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/navigation.c' object='navigation.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o navigation.obj `if test -f '../libbluray/bdnav/navigation.c'; then $(CYGPATH_W) '../libbluray/bdnav/navigation.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/navigation.c'; fi`
+
+sound_parse.o: ../libbluray/bdnav/sound_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sound_parse.o -MD -MP -MF $(DEPDIR)/sound_parse.Tpo -c -o sound_parse.o `test -f '../libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/sound_parse.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sound_parse.Tpo $(DEPDIR)/sound_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/sound_parse.c' object='sound_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sound_parse.o `test -f '../libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/sound_parse.c
+
+sound_parse.obj: ../libbluray/bdnav/sound_parse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sound_parse.obj -MD -MP -MF $(DEPDIR)/sound_parse.Tpo -c -o sound_parse.obj `if test -f '../libbluray/bdnav/sound_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/sound_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/sound_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sound_parse.Tpo $(DEPDIR)/sound_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/sound_parse.c' object='sound_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sound_parse.obj `if test -f '../libbluray/bdnav/sound_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/sound_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/sound_parse.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/bd_info.c -> libbluray-0.2.3.tar.bz2/src/examples/bd_info.c Changed

@@ -50,6 +50,34 @@
     return "<undefined>";
 }
 
+static const char *_hex2str(const uint8_t *data, size_t len)
+{
+    static char *str = NULL;
+    size_t i;
+
+    str = realloc(str, 2*len + 1);
+    *str = 0;
+
+    for (i = 0; i < len; i++) {
+        sprintf(str+2*i, "%02X", data[i]);
+    }
+
+    return str;
+}
+
+static const char *_aacs_error2str(int error_code)
+{
+    switch (error_code) {
+        case BD_AACS_CORRUPTED_DISC: return "corrupted BluRay disc";
+        case BD_AACS_NO_CONFIG:      return "AACS configuration file missing";
+        case BD_AACS_NO_PK:          return "no matching processing key";
+        case BD_AACS_NO_CERT:        return "no valid AACS certificate";
+        case BD_AACS_CERT_REVOKED:   return "AACS certificate revoked";
+        case BD_AACS_MMC_FAILED:     return "MMC authentication failed";
+    }
+    return "unknown error";
+}
+
 static const char *_res2str(int x, int y)
 {
     if (x > 0 && y > 0 && x < 0xffff && y < 0xffff) {
@@ -61,7 +89,7 @@
     return "";
 }
 
-static void _print_meta(META_DL *meta)
+static void _print_meta(const META_DL *meta)
 {
     if (!meta) {
         printf("\nNo disc library metadata\n");
@@ -130,7 +158,14 @@
     printf("\nAACS detected       : %s\n", _yes_no(info->aacs_detected));
     if (info->aacs_detected) {
         printf("libaacs detected    : %s\n", _yes_no(info->libaacs_detected));
-        printf("AACS handled        : %s\n", _yes_no(info->aacs_handled));
+        if (info->libaacs_detected) {
+          printf("Disc ID             : %s\n", _hex2str(info->disc_id, sizeof(info->disc_id)));
+          printf("AACS MKB version    : %d\n", info->aacs_mkbv);
+          printf("AACS handled        : %s\n", _yes_no(info->aacs_handled));
+          if (!info->aacs_handled) {
+            printf("                      (%s)\n", _aacs_error2str(info->aacs_error_code));
+          }
+        }
     }
 
     printf("\nBD+ detected        : %s\n", _yes_no(info->bdplus_detected));
@@ -141,5 +176,7 @@
 
     _print_meta(bd_get_meta(bd));
 
+    bd_close(bd);
+
     return 0;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/bdj_test.c -> libbluray-0.2.3.tar.bz2/src/examples/bdj_test.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/bdsplice.c -> libbluray-0.2.3.tar.bz2/src/examples/bdsplice.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/hdmv_test.c -> libbluray-0.2.3.tar.bz2/src/examples/hdmv_test.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/libbluray_test.c -> libbluray-0.2.3.tar.bz2/src/examples/libbluray_test.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/list_titles.c -> libbluray-0.2.3.tar.bz2/src/examples/list_titles.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/mpls_dump.c -> libbluray-0.2.3.tar.bz2/src/examples/mpls_dump.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/util.c -> libbluray-0.2.3.tar.bz2/src/examples/util.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/file/file.h -> libbluray-0.2.3.tar.bz2/src/file/file.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/file/file_posix.c -> libbluray-0.2.3.tar.bz2/src/file/file_posix.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdj/native/org_videolan_Libbluray.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdj/native/org_videolan_Libbluray.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/clpi_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_parse.c Changed

@@ -323,7 +323,7 @@
 }
 
 static uint32_t
-_find_stc_spn(CLPI_CL *cl, uint8_t stc_id)
+_find_stc_spn(const CLPI_CL *cl, uint8_t stc_id)
 {
     int ii;
     CLPI_ATC_SEQ *atc;
@@ -341,10 +341,10 @@
 // Returns the spn for the entry that is closest to but
 // before the given timestamp
 uint32_t
-clpi_lookup_spn(CLPI_CL *cl, uint32_t timestamp, int before, uint8_t stc_id)
+clpi_lookup_spn(const CLPI_CL *cl, uint32_t timestamp, int before, uint8_t stc_id)
 {
-    CLPI_EP_MAP_ENTRY *entry;
-    CLPI_CPI *cpi = &cl->cpi;
+    const CLPI_EP_MAP_ENTRY *entry;
+    const CLPI_CPI *cpi = &cl->cpi;
     int ii, jj;
     uint32_t coarse_pts, pts; // 45khz timestamps
     uint32_t spn, coarse_spn, stc_spn;
@@ -447,10 +447,10 @@
 // Returns the spn for the entry that is closest to but
 // before the given packet
 uint32_t
-clpi_access_point(CLPI_CL *cl, uint32_t pkt, int next, int angle_change, uint32_t *time)
+clpi_access_point(const CLPI_CL *cl, uint32_t pkt, int next, int angle_change, uint32_t *time)
 {
-    CLPI_EP_MAP_ENTRY *entry;
-    CLPI_CPI *cpi = &cl->cpi;
+    const CLPI_EP_MAP_ENTRY *entry;
+    const CLPI_CPI *cpi = &cl->cpi;
     int ii, jj;
     uint32_t coarse_spn, spn;
     int start, end;
@@ -575,8 +575,8 @@
     X_FREE(cl);
 }
 
-CLPI_CL*
-clpi_parse(char *path, int verbose)
+static CLPI_CL*
+_clpi_parse(const char *path, int verbose)
 {
     BITSTREAM  bits;
     BD_FILE_H *fp;
@@ -627,84 +627,109 @@
 }
 
 CLPI_CL*
-clpi_copy(CLPI_CL* dest_cl, CLPI_CL* src_cl)
+clpi_parse(const char *path, int verbose)
+{
+    CLPI_CL *cl = _clpi_parse(path, verbose);
+
+    /* if failed, try backup file */
+    if (!cl) {
+        int   len    = strlen(path);
+        char *backup = malloc(len + 8);
+
+        strncpy(backup, path, len - 18);
+        strcpy(backup + len - 18, "BACKUP/");
+        strcpy(backup + len - 18 + 7, path + len - 18);
+
+        cl = _clpi_parse(backup, verbose);
+
+        X_FREE(backup);
+    }
+
+    return cl;
+}
+
+CLPI_CL*
+clpi_copy(const CLPI_CL* src_cl)
 {
+    CLPI_CL* dest_cl = NULL;
     int ii, jj;
-    if (dest_cl && src_cl) {
-      dest_cl->clip.clip_stream_type = src_cl->clip.clip_stream_type;
-      dest_cl->clip.application_type = src_cl->clip.application_type;
-      dest_cl->clip.is_atc_delta = src_cl->clip.is_atc_delta;
-      dest_cl->clip.atc_delta_count = src_cl->clip.atc_delta_count;
-      dest_cl->clip.ts_recording_rate = src_cl->clip.ts_recording_rate;
-      dest_cl->clip.num_source_packets = src_cl->clip.num_source_packets;
-      dest_cl->clip.ts_type_info.validity = src_cl->clip.ts_type_info.validity;
-      memcpy(dest_cl->clip.ts_type_info.format_id, src_cl->clip.ts_type_info.format_id, 5);
-      dest_cl->clip.atc_delta = malloc(src_cl->clip.atc_delta_count * sizeof(CLPI_ATC_DELTA));
-      for (ii = 0; ii < src_cl->clip.atc_delta_count; ii++) {
-        dest_cl->clip.atc_delta[ii].delta =  src_cl->clip.atc_delta[ii].delta;
-	memcpy(dest_cl->clip.atc_delta[ii].file_id, src_cl->clip.atc_delta[ii].file_id, 6);
-	memcpy(dest_cl->clip.atc_delta[ii].file_code, src_cl->clip.atc_delta[ii].file_code, 5);
-      }
-
-      dest_cl->sequence.num_atc_seq = src_cl->sequence.num_atc_seq;
-      dest_cl->sequence.atc_seq = malloc(src_cl->sequence.num_atc_seq * sizeof(CLPI_ATC_SEQ));
-      for (ii = 0; ii < src_cl->sequence.num_atc_seq; ii++) {
-	dest_cl->sequence.atc_seq[ii].spn_atc_start = src_cl->sequence.atc_seq[ii].spn_atc_start;
-	dest_cl->sequence.atc_seq[ii].offset_stc_id = src_cl->sequence.atc_seq[ii].offset_stc_id;
-	dest_cl->sequence.atc_seq[ii].num_stc_seq = src_cl->sequence.atc_seq[ii].num_stc_seq;
-	dest_cl->sequence.atc_seq[ii].stc_seq = malloc(src_cl->sequence.atc_seq[ii].num_stc_seq * sizeof(CLPI_STC_SEQ));
-        for (jj = 0; jj < src_cl->sequence.atc_seq[ii].num_stc_seq; jj++) {
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start = src_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start;
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid = src_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid;
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time;
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time;
+
+    if (src_cl) {
+        dest_cl = (CLPI_CL*) calloc(1, sizeof(CLPI_CL));
+
+        dest_cl->clip.clip_stream_type = src_cl->clip.clip_stream_type;
+        dest_cl->clip.application_type = src_cl->clip.application_type;
+        dest_cl->clip.is_atc_delta = src_cl->clip.is_atc_delta;
+        dest_cl->clip.atc_delta_count = src_cl->clip.atc_delta_count;
+        dest_cl->clip.ts_recording_rate = src_cl->clip.ts_recording_rate;
+        dest_cl->clip.num_source_packets = src_cl->clip.num_source_packets;
+        dest_cl->clip.ts_type_info.validity = src_cl->clip.ts_type_info.validity;
+        memcpy(dest_cl->clip.ts_type_info.format_id, src_cl->clip.ts_type_info.format_id, 5);
+        dest_cl->clip.atc_delta = malloc(src_cl->clip.atc_delta_count * sizeof(CLPI_ATC_DELTA));
+        for (ii = 0; ii < src_cl->clip.atc_delta_count; ii++) {
+            dest_cl->clip.atc_delta[ii].delta =  src_cl->clip.atc_delta[ii].delta;
+            memcpy(dest_cl->clip.atc_delta[ii].file_id, src_cl->clip.atc_delta[ii].file_id, 6);
+            memcpy(dest_cl->clip.atc_delta[ii].file_code, src_cl->clip.atc_delta[ii].file_code, 5);
+        }
+
+        dest_cl->sequence.num_atc_seq = src_cl->sequence.num_atc_seq;
+        dest_cl->sequence.atc_seq = malloc(src_cl->sequence.num_atc_seq * sizeof(CLPI_ATC_SEQ));
+        for (ii = 0; ii < src_cl->sequence.num_atc_seq; ii++) {
+            dest_cl->sequence.atc_seq[ii].spn_atc_start = src_cl->sequence.atc_seq[ii].spn_atc_start;
+            dest_cl->sequence.atc_seq[ii].offset_stc_id = src_cl->sequence.atc_seq[ii].offset_stc_id;
+            dest_cl->sequence.atc_seq[ii].num_stc_seq = src_cl->sequence.atc_seq[ii].num_stc_seq;
+            dest_cl->sequence.atc_seq[ii].stc_seq = malloc(src_cl->sequence.atc_seq[ii].num_stc_seq * sizeof(CLPI_STC_SEQ));
+            for (jj = 0; jj < src_cl->sequence.atc_seq[ii].num_stc_seq; jj++) {
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start = src_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start;
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid = src_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid;
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time;
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time;
+            }
+        }
+
+        dest_cl->program.num_prog = src_cl->program.num_prog;
+        dest_cl->program.progs = malloc(src_cl->program.num_prog * sizeof(CLPI_PROG));
+        for (ii = 0; ii < src_cl->program.num_prog; ii++) {
+            dest_cl->program.progs[ii].spn_program_sequence_start = src_cl->program.progs[ii].spn_program_sequence_start;
+            dest_cl->program.progs[ii].program_map_pid = src_cl->program.progs[ii].program_map_pid;
+            dest_cl->program.progs[ii].num_streams = src_cl->program.progs[ii].num_streams;
+            dest_cl->program.progs[ii].num_groups = src_cl->program.progs[ii].num_groups;
+            dest_cl->program.progs[ii].streams = malloc(src_cl->program.progs[ii].num_streams * sizeof(CLPI_PROG_STREAM));
+            for (jj = 0; jj < src_cl->program.progs[ii].num_streams; jj++) {
+                dest_cl->program.progs[ii].streams[jj].coding_type = src_cl->program.progs[ii].streams[jj].coding_type;
+                dest_cl->program.progs[ii].streams[jj].pid = src_cl->program.progs[ii].streams[jj].pid;
+                dest_cl->program.progs[ii].streams[jj].format = src_cl->program.progs[ii].streams[jj].format;
+                dest_cl->program.progs[ii].streams[jj].rate = src_cl->program.progs[ii].streams[jj].rate;
+                dest_cl->program.progs[ii].streams[jj].aspect = src_cl->program.progs[ii].streams[jj].aspect;
+                dest_cl->program.progs[ii].streams[jj].oc_flag = src_cl->program.progs[ii].streams[jj].oc_flag;
+                dest_cl->program.progs[ii].streams[jj].char_code = src_cl->program.progs[ii].streams[jj].char_code;
+                memcpy(dest_cl->program.progs[ii].streams[jj].lang,src_cl->program.progs[ii].streams[jj].lang,4);
+            }
         }
-      }
-
-      dest_cl->program.num_prog = src_cl->program.num_prog;
-      dest_cl->program.progs = malloc(src_cl->program.num_prog * sizeof(CLPI_PROG));
-      for (ii = 0; ii < src_cl->program.num_prog; ii++) {
-	dest_cl->program.progs[ii].spn_program_sequence_start = src_cl->program.progs[ii].spn_program_sequence_start;
-	dest_cl->program.progs[ii].program_map_pid = src_cl->program.progs[ii].program_map_pid;
-	dest_cl->program.progs[ii].num_streams = src_cl->program.progs[ii].num_streams;
-	dest_cl->program.progs[ii].num_groups = src_cl->program.progs[ii].num_groups;
-	dest_cl->program.progs[ii].streams = malloc(src_cl->program.progs[ii].num_streams * sizeof(CLPI_PROG_STREAM));
-	for (jj = 0; jj < src_cl->program.progs[ii].num_streams; jj++) {
-	  dest_cl->program.progs[ii].streams[jj].coding_type = src_cl->program.progs[ii].streams[jj].coding_type;
-	  dest_cl->program.progs[ii].streams[jj].pid = src_cl->program.progs[ii].streams[jj].pid;
-	  dest_cl->program.progs[ii].streams[jj].format = src_cl->program.progs[ii].streams[jj].format;
-	  dest_cl->program.progs[ii].streams[jj].rate = src_cl->program.progs[ii].streams[jj].rate;
-	  dest_cl->program.progs[ii].streams[jj].aspect = src_cl->program.progs[ii].streams[jj].aspect;
-	  dest_cl->program.progs[ii].streams[jj].oc_flag = src_cl->program.progs[ii].streams[jj].oc_flag;
-	  dest_cl->program.progs[ii].streams[jj].char_code = src_cl->program.progs[ii].streams[jj].char_code;
-	  memcpy(dest_cl->program.progs[ii].streams[jj].lang,src_cl->program.progs[ii].streams[jj].lang,4);
-	}
-      }
-
-      dest_cl->cpi.num_stream_pid = src_cl->cpi.num_stream_pid;
-      dest_cl->cpi.entry = malloc(src_cl->cpi.num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY));
-      for (ii = 0; ii < dest_cl->cpi.num_stream_pid; ii++) {
-	dest_cl->cpi.entry[ii].pid = src_cl->cpi.entry[ii].pid;
-	dest_cl->cpi.entry[ii].ep_stream_type = src_cl->cpi.entry[ii].ep_stream_type;
-	dest_cl->cpi.entry[ii].num_ep_coarse = src_cl->cpi.entry[ii].num_ep_coarse;
-	dest_cl->cpi.entry[ii].num_ep_fine = src_cl->cpi.entry[ii].num_ep_fine;
-	dest_cl->cpi.entry[ii].ep_map_stream_start_addr = src_cl->cpi.entry[ii].ep_map_stream_start_addr;
-	dest_cl->cpi.entry[ii].coarse = malloc(src_cl->cpi.entry[ii].num_ep_coarse * sizeof(CLPI_EP_COARSE));
-	for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_coarse; jj++) {
-	  dest_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id = src_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id;
-	  dest_cl->cpi.entry[ii].coarse[jj].pts_ep = src_cl->cpi.entry[ii].coarse[jj].pts_ep;
-	  dest_cl->cpi.entry[ii].coarse[jj].spn_ep = src_cl->cpi.entry[ii].coarse[jj].spn_ep;
-	}
-	dest_cl->cpi.entry[ii].fine = malloc(src_cl->cpi.entry[ii].num_ep_fine * sizeof(CLPI_EP_FINE));
-	for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_fine; jj++) {
-	  dest_cl->cpi.entry[ii].fine[jj].is_angle_change_point = src_cl->cpi.entry[ii].fine[jj].is_angle_change_point;
-	  dest_cl->cpi.entry[ii].fine[jj].i_end_position_offset = src_cl->cpi.entry[ii].fine[jj].i_end_position_offset;
-	  dest_cl->cpi.entry[ii].fine[jj].pts_ep = src_cl->cpi.entry[ii].fine[jj].pts_ep;
-	  dest_cl->cpi.entry[ii].fine[jj].spn_ep = src_cl->cpi.entry[ii].fine[jj].spn_ep;
-	}
-      }
-      return dest_cl;
-    }
-    clpi_free(dest_cl);
-    return NULL;
+
+        dest_cl->cpi.num_stream_pid = src_cl->cpi.num_stream_pid;
+        dest_cl->cpi.entry = malloc(src_cl->cpi.num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY));
+        for (ii = 0; ii < dest_cl->cpi.num_stream_pid; ii++) {
+            dest_cl->cpi.entry[ii].pid = src_cl->cpi.entry[ii].pid;
+            dest_cl->cpi.entry[ii].ep_stream_type = src_cl->cpi.entry[ii].ep_stream_type;
+            dest_cl->cpi.entry[ii].num_ep_coarse = src_cl->cpi.entry[ii].num_ep_coarse;
+            dest_cl->cpi.entry[ii].num_ep_fine = src_cl->cpi.entry[ii].num_ep_fine;
+            dest_cl->cpi.entry[ii].ep_map_stream_start_addr = src_cl->cpi.entry[ii].ep_map_stream_start_addr;
+            dest_cl->cpi.entry[ii].coarse = malloc(src_cl->cpi.entry[ii].num_ep_coarse * sizeof(CLPI_EP_COARSE));
+            for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_coarse; jj++) {
+                dest_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id = src_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id;
+                dest_cl->cpi.entry[ii].coarse[jj].pts_ep = src_cl->cpi.entry[ii].coarse[jj].pts_ep;
+                dest_cl->cpi.entry[ii].coarse[jj].spn_ep = src_cl->cpi.entry[ii].coarse[jj].spn_ep;
+            }
+            dest_cl->cpi.entry[ii].fine = malloc(src_cl->cpi.entry[ii].num_ep_fine * sizeof(CLPI_EP_FINE));
+            for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_fine; jj++) {
+                dest_cl->cpi.entry[ii].fine[jj].is_angle_change_point = src_cl->cpi.entry[ii].fine[jj].is_angle_change_point;
+                dest_cl->cpi.entry[ii].fine[jj].i_end_position_offset = src_cl->cpi.entry[ii].fine[jj].i_end_position_offset;
+                dest_cl->cpi.entry[ii].fine[jj].pts_ep = src_cl->cpi.entry[ii].fine[jj].pts_ep;
+                dest_cl->cpi.entry[ii].fine[jj].spn_ep = src_cl->cpi.entry[ii].fine[jj].spn_ep;
+            }
+        }
+    }
+
+    return dest_cl;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/clpi_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/index_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/index_parse.c Changed

@@ -66,7 +66,12 @@
 
     index_len = bs_read(bs, 32);
 
-    /* TODO: check if goes to extension data area or EOF */
+    /* TODO: check if goes to extension data area */
+
+    if ((bs_end(bs) - bs_pos(bs))/8 < (off_t)index_len) {
+        BD_DEBUG(DBG_NAV | DBG_CRIT, "index.bdmv: invalid index_len %d !\n", index_len);
+        return 0;
+    }
 
     if (!_parse_playback_obj(bs, &index->first_play) ||
         !_parse_playback_obj(bs, &index->top_menu)) {
@@ -144,7 +149,7 @@
     return 1;
 }
 
-INDX_ROOT *indx_parse(const char *file_name)
+static INDX_ROOT *_indx_parse(const char *file_name)
 {
     BITSTREAM  bs;
     BD_FILE_H *fp;
@@ -188,6 +193,26 @@
     return NULL;
 }
 
+INDX_ROOT *indx_parse(const char *file_name)
+{
+    INDX_ROOT *indx = _indx_parse(file_name);
+
+    /* if failed, try backup file */
+    if (!indx) {
+        int   len    = strlen(file_name);
+        char *backup = malloc(len + 8);
+
+        strcpy(backup, file_name);
+        strcpy(backup + len - 10, "BACKUP/index.bdmv");
+
+        indx = _indx_parse(backup);
+
+        X_FREE(backup);
+    }
+
+    return indx;
+}
+
 void indx_free(INDX_ROOT **p)
 {
     if (p && *p) {

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/meta_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/meta_parse.c Changed

@@ -43,46 +43,52 @@
 #include <libxml/tree.h>
 #endif
 
+#define BAD_CAST_CONST (const xmlChar *)
+
+
 #ifdef HAVE_LIBXML2
 static void _parseManifestNode(xmlNode * a_node, META_DL *disclib)
 {
     xmlNode *cur_node = NULL;
+    xmlChar *tmp;
 
     for (cur_node = a_node; cur_node; cur_node = cur_node->next) {
         if (cur_node->type == XML_ELEMENT_NODE) {
-            if (xmlStrEqual(cur_node->parent->name, xmlCharStrdup("title"))) {
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("name"))) {
-                    disclib->di_name = (char*)xmlStrdup(xmlNodeGetContent(cur_node));
+            if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "title")) {
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "name")) {
+                    disclib->di_name = (char*)xmlNodeGetContent(cur_node);
                 }
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("alternative"))) {
-                    disclib->di_alternative = (char*)xmlStrdup(xmlNodeGetContent(cur_node));
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "alternative")) {
+                    disclib->di_alternative = (char*)xmlNodeGetContent(cur_node);
                 }
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("numSets"))) {
-                    disclib->di_num_sets = atoi((char*)xmlNodeGetContent(cur_node));
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "numSets")) {
+                    disclib->di_num_sets = atoi((char*)(tmp = xmlNodeGetContent(cur_node)));
+                    xmlFree(tmp);
                 }
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("setNumber"))) {
-                    disclib->di_set_number = atoi((char*)xmlNodeGetContent(cur_node));
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "setNumber")) {
+                    disclib->di_set_number = atoi((char*)(tmp = xmlNodeGetContent(cur_node)));
+                    xmlFree(tmp);
                 }
             }
-            else if (xmlStrEqual(cur_node->parent->name, xmlCharStrdup("tableOfContents"))) {
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("titleName")) && xmlGetProp(cur_node, xmlCharStrdup("titleNumber"))) {
+            else if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "tableOfContents")) {
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "titleName") && (tmp = xmlGetProp(cur_node, BAD_CAST_CONST "titleNumber"))) {
                     int i = disclib->toc_count;
                     disclib->toc_count++;
                     disclib->toc_entries = realloc(disclib->toc_entries, (disclib->toc_count*sizeof(META_TITLE)));
-                    disclib->toc_entries[i].title_number = atoi((const char*)xmlGetProp(cur_node, xmlCharStrdup("titleNumber")));
-                    disclib->toc_entries[i].title_name = (char*)xmlStrdup(xmlNodeGetContent(cur_node));
+                    disclib->toc_entries[i].title_number = atoi((const char*)tmp);
+                    disclib->toc_entries[i].title_name = (char*)xmlNodeGetContent(cur_node);
+                    X_FREE(tmp);
                 }
             }
-            else if (xmlStrEqual(cur_node->parent->name, xmlCharStrdup("description"))) {
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("thumbnail")) && xmlGetProp(cur_node, xmlCharStrdup("href"))) {
+            else if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "description")) {
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "thumbnail") && (tmp = xmlGetProp(cur_node, BAD_CAST_CONST "href"))) {
                     uint8_t i = disclib->thumb_count;
                     disclib->thumb_count++;
                     disclib->thumbnails = realloc(disclib->thumbnails, (disclib->thumb_count*sizeof(META_THUMBNAIL)));
-                    int len = xmlStrlen(xmlGetProp(cur_node, xmlCharStrdup("href")));
-                    disclib->thumbnails[i].path = (char*) malloc(len+1);
-                    strcpy(disclib->thumbnails[i].path, (char*) xmlGetProp(cur_node, xmlCharStrdup("href")));
-                    if (xmlGetProp(cur_node, xmlCharStrdup("size"))) {
-                        sscanf((const char*)xmlGetProp(cur_node, xmlCharStrdup("size")), "%ix%i", &disclib->thumbnails[i].xres, &disclib->thumbnails[i].yres);
+                    disclib->thumbnails[i].path = (char *)tmp;
+                    if ((tmp = xmlGetProp(cur_node, BAD_CAST_CONST "size"))) {
+                        sscanf((const char*)tmp, "%ix%i", &disclib->thumbnails[i].xres, &disclib->thumbnails[i].yres);
+                        X_FREE(tmp);
                     }
                     else {
                         disclib->thumbnails[i].xres = disclib->thumbnails[i].yres = -1;
@@ -144,6 +150,8 @@
         BD_FILE_H *handle = file_open(path, "rb");
         if (handle == NULL) {
             BD_DEBUG(DBG_DIR, "Failed to open meta file (%s)\n", path);
+            X_FREE(path);
+            X_FREE(base);
             continue;
         }
 
@@ -157,6 +165,8 @@
             doc = xmlReadMemory((char*)data, size_read, base, NULL, 0);
             if (doc == NULL) {
                 BD_DEBUG(DBG_DIR, "Failed to parse %s\n", path);
+                X_FREE(path);
+                X_FREE(base);
                 continue;
             }
             xmlNode *root_element = NULL;
@@ -171,6 +181,8 @@
             X_FREE(data);
         }
         file_close(handle);
+        X_FREE(path);
+        X_FREE(base);
     }
     xmlCleanupParser();
     return root;
@@ -180,7 +192,7 @@
 #endif
 }
 
-META_DL *meta_get(META_ROOT *meta_root, const char *language_code)
+const META_DL *meta_get(const META_ROOT *meta_root, const char *language_code)
 {
     unsigned i;
 
@@ -216,18 +228,19 @@
         uint8_t i;
         for (i = 0; i < (*p)->dl_count; i++) {
             uint32_t t;
-            for (t=0; i < (*p)->dl_entries[i].toc_count; t++) {
+            for (t = 0; t < (*p)->dl_entries[i].toc_count; t++) {
                 X_FREE((*p)->dl_entries[i].toc_entries[t].title_name);
-                X_FREE((*p)->dl_entries[i].toc_entries);
             }
-            for (t = 0; i < (*p)->dl_entries[i].thumb_count; t++) {
+            for (t = 0; t < (*p)->dl_entries[i].thumb_count; t++) {
                 X_FREE((*p)->dl_entries[i].thumbnails[t].path);
-                X_FREE((*p)->dl_entries[i].thumbnails);
             }
+            X_FREE((*p)->dl_entries[i].toc_entries);
+            X_FREE((*p)->dl_entries[i].thumbnails);
             X_FREE((*p)->dl_entries[i].filename);
             X_FREE((*p)->dl_entries[i].di_name);
             X_FREE((*p)->dl_entries[i].di_alternative);
         }
+        X_FREE((*p)->dl_entries);
         X_FREE(*p);
     }
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/meta_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/meta_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/mpls_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/mpls_parse.c Changed

@@ -401,9 +401,20 @@
 static void
 _clean_stn(MPLS_STN *stn)
 {
+    if(stn->secondary_audio) {
+        X_FREE(stn->secondary_audio->sa_primary_audio_ref);
+    }
+    if(stn->secondary_video) {
+        X_FREE(stn->secondary_video->sv_secondary_audio_ref);
+        X_FREE(stn->secondary_video->sv_pip_pg_ref);
+    }
+
     X_FREE(stn->video);
     X_FREE(stn->audio);
     X_FREE(stn->pg);
+    X_FREE(stn->ig);
+    X_FREE(stn->secondary_audio);
+    X_FREE(stn->secondary_video);
 }
 
 static int
@@ -723,8 +734,8 @@
     _clean_playlist(pl);
 }
 
-MPLS_PL*
-mpls_parse(char *path, int verbose)
+static MPLS_PL*
+_mpls_parse(const char *path, int verbose)
 {
     BITSTREAM  bits;
     BD_FILE_H *fp;
@@ -764,3 +775,24 @@
     return pl;
 }
 
+MPLS_PL*
+mpls_parse(const char *path, int verbose)
+{
+    MPLS_PL *pl = _mpls_parse(path, verbose);
+
+    /* if failed, try backup file */
+    if (!pl) {
+        int   len    = strlen(path);
+        char *backup = malloc(len + 8);
+
+        strncpy(backup, path, len - 19);
+        strcpy(backup + len - 19, "BACKUP/");
+        strcpy(backup + len - 19 + 7, path + len - 19);
+
+        pl = _mpls_parse(backup, verbose);
+
+        X_FREE(backup);
+    }
+
+    return pl;
+}

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/mpls_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/mpls_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/navigation.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/navigation.c Changed

@@ -111,7 +111,7 @@
     return duration;
 }
 
-NAV_TITLE_LIST* nav_get_title_list(const char *root, uint32_t flags)
+NAV_TITLE_LIST* nav_get_title_list(const char *root, uint32_t flags, uint32_t min_title_length)
 {
     BD_DIR_H *dir;
     BD_DIRENT ent;
@@ -171,6 +171,11 @@
                 mpls_free(pl);
                 continue;
             }
+            if (min_title_length > 0 &&
+                _pl_duration(pl) < min_title_length*45000) {
+                mpls_free(pl);
+                continue;
+            }
             if (ii >= title_info_alloc) {
                 NAV_TITLE_INFO *tmp = NULL;
                 title_info_alloc += 100;
@@ -197,6 +202,7 @@
     for (ii = 0; ii < title_list->count; ii++) {
         mpls_free(pl_list[ii]);
     }
+    X_FREE(pl_list);
     return title_list;
 }
 
@@ -271,9 +277,7 @@
         mpls_free(pl_list[ii]);
     }
     if (count > 0) {
-        char *str = (char*)malloc(strlen(longest) + 1);
-        strcpy(str, longest);
-        return str;
+        return strdup(longest);
     } else {
         return NULL;
     }
@@ -429,8 +433,12 @@
             clip->connection = CONNECT_SEAMLESS;
             break;
         default:
-            clip->start_pkt = clpi_lookup_spn(clip->cl, in_time, 1,
+            if (ref) {
+                clip->start_pkt = clpi_lookup_spn(clip->cl, in_time, 1,
                                               mpls_clip[clip->angle].stc_id);
+            } else {
+                clip->start_pkt = 0;
+            }
             clip->connection = CONNECT_NON_SEAMLESS;
             break;
     }
@@ -456,8 +464,7 @@
     if (title == NULL) {
         return NULL;
     }
-    title->root = (char*)malloc(strlen(root) + 1);
-    strcpy(title->root, root);
+    title->root = strdup(root);
     strncpy(title->name, playlist, 11);
     title->name[10] = '\0';
     path = str_printf("%s" DIR_SEP "BDMV" DIR_SEP "PLAYLIST" DIR_SEP "%s",

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/navigation.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/navigation.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/sound_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/sound_parse.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bluray-version.h Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2011 hpi1
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLURAY_VERSION_H_
+#define BLURAY_VERSION_H_
+
+#define BLURAY_VERSION_CODE(major, minor, micro) \
+    (((major) * 10000) +                         \
+     ((minor) *   100) +                         \
+     ((micro) *     1))
+
+#define BLURAY_VERSION_MAJOR 0
+#define BLURAY_VERSION_MINOR 2
+#define BLURAY_VERSION_MICRO 3
+
+#define BLURAY_VERSION_STRING "0.2.3"
+
+#define BLURAY_VERSION \
+    BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
+
+#endif /* BLURAY_VERSION_H_ */

libbluray-0.2.3.tar.bz2/src/libbluray/bluray-version.h.in Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2011 hpi1
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLURAY_VERSION_H_
+#define BLURAY_VERSION_H_
+
+#define BLURAY_VERSION_CODE(major, minor, micro) \
+    (((major) * 10000) +                         \
+     ((minor) *   100) +                         \
+     ((micro) *     1))
+
+#define BLURAY_VERSION_MAJOR @BLURAY_VERSION_MAJOR@
+#define BLURAY_VERSION_MINOR @BLURAY_VERSION_MINOR@
+#define BLURAY_VERSION_MICRO @BLURAY_VERSION_MICRO@
+
+#define BLURAY_VERSION_STRING "@BLURAY_VERSION_MAJOR@.@BLURAY_VERSION_MINOR@.@BLURAY_VERSION_MICRO@"
+
+#define BLURAY_VERSION \
+    BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
+
+#endif /* BLURAY_VERSION_H_ */

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bluray.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bluray.c Changed

@@ -23,39 +23,50 @@
 #include "config.h"
 #endif
 
+#include "bluray-version.h"
 #include "bluray.h"
 #include "register.h"
 #include "util/macro.h"
 #include "util/logging.h"
 #include "util/strutl.h"
+#include "util/mutex.h"
 #include "bdnav/navigation.h"
 #include "bdnav/index_parse.h"
 #include "bdnav/meta_parse.h"
 #include "bdnav/clpi_parse.h"
+#include "bdnav/sound_parse.h"
 #include "hdmv/hdmv_vm.h"
 #include "decoders/graphics_controller.h"
 #include "file/file.h"
-#ifdef DLOPEN_CRYPTO_LIBS
 #include "file/dl.h"
-#endif
 #ifdef USING_BDJAVA
 #include "bdj/bdj.h"
 #endif
 
-#ifndef DLOPEN_CRYPTO_LIBS
-#include <libaacs/aacs.h>
-#include <libbdplus/bdplus.h>
-#endif
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
 
+#ifdef HAVE_MNTENT_H
+#include <sys/stat.h>
+#include <mntent.h>
+#endif
+
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+#endif
+
 typedef int     (*fptr_int)();
 typedef int32_t (*fptr_int32)();
 typedef void*   (*fptr_p_void)();
 
 #define MAX_EVENTS 31  /* 2^n - 1 */
 typedef struct bd_event_queue_s {
+    BD_MUTEX mutex;
     unsigned in;  /* next free slot */
     unsigned out; /* next event */
     BD_EVENT ev[MAX_EVENTS+1];
@@ -105,6 +116,7 @@
     /* streams */
     BD_STREAM      st0; /* main path */
     BD_PRELOAD     st_ig; /* preloaded IG stream sub path */
+    int            ig_pid; /* pid of currently selected IG stream in main path */
 
     /* buffer for bd_read(): current aligned unit of main stream (st0) */
     uint8_t        int_buf[6144];
@@ -119,17 +131,13 @@
     uint64_t       next_chapter_start;
 
     /* aacs */
-#ifdef DLOPEN_CRYPTO_LIBS
     void           *h_libaacs;   // library handle
-#endif
     void           *aacs;
     fptr_p_void    libaacs_open;
     fptr_int       libaacs_decrypt_unit;
 
     /* BD+ */
-#ifdef DLOPEN_CRYPTO_LIBS
     void           *h_libbdplus; // library handle
-#endif
     void           *bdplus;
     fptr_p_void    bdplus_init;
     fptr_int32     bdplus_seek;
@@ -147,20 +155,27 @@
 
     /* graphics */
     GRAPHICS_CONTROLLER *graphics_controller;
+    SOUND_DATA          *sound_effects;
+    uint32_t             gc_status;
 };
 
-#ifdef DLOPEN_CRYPTO_LIBS
-#    define DL_CALL(lib,func,param,...)             \
+#define DL_CALL(lib,func,param,...)             \
      do {                                           \
           fptr_p_void fptr = (fptr_p_void)dl_dlsym(lib, #func);  \
           if (fptr) {                               \
               fptr(param, ##__VA_ARGS__);           \
           }                                         \
       } while (0)
-#else
-#    define DL_CALL(lib,func,param,...)         \
-     func (param, ##__VA_ARGS__)
-#endif
+
+/*
+ * Library version
+ */
+void bd_get_version(int *major, int *minor, int *micro)
+{
+    *major = BLURAY_VERSION_MAJOR;
+    *minor = BLURAY_VERSION_MINOR;
+    *micro = BLURAY_VERSION_MICRO;
+}
 
 /*
  * Navigation mode event queue
@@ -170,8 +185,21 @@
 {
     if (!bd->event_queue) {
         bd->event_queue = calloc(1, sizeof(struct bd_event_queue_s));
+        bd_mutex_init(&bd->event_queue->mutex);
     } else {
-        memset(bd->event_queue, 0, sizeof(struct bd_event_queue_s));
+        bd_mutex_lock(&bd->event_queue->mutex);
+        bd->event_queue->in  = 0;
+        bd->event_queue->out = 0;
+        memset(bd->event_queue->ev, 0, sizeof(bd->event_queue->ev));
+        bd_mutex_unlock(&bd->event_queue->mutex);
+    }
+}
+
+static void _free_event_queue(BLURAY *bd)
+{
+    if (bd->event_queue) {
+        bd_mutex_destroy(&bd->event_queue->mutex);
+        X_FREE(bd->event_queue);
     }
 }
 
@@ -180,11 +208,18 @@
     struct bd_event_queue_s *eq = bd->event_queue;
 
     if (eq) {
+        bd_mutex_lock(&eq->mutex);
+
         if (eq->in != eq->out) {
+
             *ev = eq->ev[eq->out];
             eq->out = (eq->out + 1) & MAX_EVENTS;
+
+            bd_mutex_unlock(&eq->mutex);
             return 1;
         }
+
+        bd_mutex_unlock(&eq->mutex);
     }
 
     ev->event = BD_EVENT_NONE;
@@ -197,14 +232,20 @@
     struct bd_event_queue_s *eq = bd->event_queue;
 
     if (eq) {
+        bd_mutex_lock(&eq->mutex);
+
         unsigned new_in = (eq->in + 1) & MAX_EVENTS;
 
         if (new_in != eq->out) {
             eq->ev[eq->in] = ev;
             eq->in = new_in;
+
+            bd_mutex_unlock(&eq->mutex);
             return 1;
         }
 
+        bd_mutex_unlock(&eq->mutex);
+
         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_queue_event(%d, %d): queue overflow !\n", ev.event, ev.param);
     }
 
@@ -217,8 +258,9 @@
 
 static void _update_stream_psr_by_lang(BD_REGISTERS *regs,
                                        uint32_t psr_lang, uint32_t psr_stream,
-                                       uint32_t enable_flag, uint32_t undefined_val,
-                                       MPLS_STREAM *streams, unsigned num_streams)
+                                       uint32_t enable_flag,
+                                       MPLS_STREAM *streams, unsigned num_streams,
+                                       uint32_t *lang, uint32_t blacklist)
 {
     uint32_t psr_val;
     int      stream_idx = -1;
@@ -242,13 +284,21 @@
 
     if (stream_idx < 0) {
         /* requested language not found */
-        stream_idx = undefined_val - 1;
+        stream_idx = 0;
         enable_flag = 0;
+
+    } else {
+        if (lang) {
+            *lang = psr_val;
+        }
+        if (blacklist == psr_val) {
+            enable_flag = 0;
+        }
     }
 
     /* update PSR */
 
-    BD_DEBUG(DBG_BLURAY, "Selected stream %d (language %s)\n", ii, streams[ii].lang);
+    BD_DEBUG(DBG_BLURAY, "Selected stream %d (language %s)\n", stream_idx, streams[stream_idx].lang);
 
     bd_psr_lock(regs);
 
@@ -269,13 +319,16 @@
      */
     if (bd->title_type == title_undef) {
         MPLS_STN *stn = &clip->title->pl->play_item[clip->ref].stn;
+        uint32_t audio_lang = 0;
 
         _update_stream_psr_by_lang(bd->regs,
-                                   PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0, 0xff,
-                                   stn->audio, stn->num_audio);
+                                   PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0,
+                                   stn->audio, stn->num_audio,
+                                   &audio_lang, 0);
         _update_stream_psr_by_lang(bd->regs,
-                                   PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000, 0xfff,
-                                   stn->pg, stn->num_pg);
+                                   PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000,
+                                   stn->pg, stn->num_pg,
+                                   NULL, audio_lang);
     }
 }
 
@@ -372,7 +425,7 @@
                     if (!bd->libaacs_decrypt_unit(bd->aacs, buf)) {
                         BD_DEBUG(DBG_AACS | DBG_CRIT, "Unable decrypt unit (AACS)! (%p)\n", bd);
 
-                        return 0;
+                        return -1;
                     } // decrypt
                 } // aacs
 
@@ -396,27 +449,47 @@
                     BD_DEBUG(DBG_BLURAY | DBG_CRIT,
                           "TP header copy permission indicator != 0, unit is still encrypted? (%p)\n", bd);
                     _queue_event(bd, (BD_EVENT){BD_EVENT_ENCRYPTED, 0});
-                    return 0;
+                    return -1;
                 }
 
                 BD_DEBUG(DBG_STREAM, "Read unit OK! (%p)\n", bd);
 
+#ifdef BLURAY_READ_ERROR_TEST
+                /* simulate broken blocks */
+                if (random() % 1000)
+#else
                 return 1;
+#endif
             }
 
             BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read %d bytes at %"PRIu64" failed ! (%p)\n", len, st->clip_block_pos, bd);
 
+            _queue_event(bd, (BD_EVENT){BD_EVENT_READ_ERROR, 0});
+
+            /* skip broken unit */
+            st->clip_block_pos += len;
+            st->clip_pos += len;
+            file_seek(st->fp, st->clip_block_pos, SEEK_SET);
+
             return 0;
         }
 
         BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read past EOF ! (%p)\n", bd);
 
+        /* This is caused by truncated .m2ts file or invalid clip length.
+         *
+         * Increase position to avoid infinite loops.
+         * Next clip won't be selected until all packets of this clip have been read.
+         */
+        st->clip_block_pos += len;
+        st->clip_pos += len;
+
         return 0;
     }
 
     BD_DEBUG(DBG_BLURAY, "No valid title selected! (%p)\n", bd);
 
-    return 0;
+    return -1;
 }
 
 /*
@@ -452,7 +525,7 @@
     uint8_t *end = p->buf + p->clip_size;
 
     for (; buf < end; buf += 6144) {
-        if (!_read_block(bd, &st, buf)) {
+        if (_read_block(bd, &st, buf) <= 0) {
             BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_preload_m2ts(): error loading %s at %"PRIu64"\n",
                   st.clip->name, (uint64_t)(buf - p->buf));
             _close_m2ts(&st);
@@ -496,6 +569,52 @@
 }
 
 /*
+ * Graphics controller interface
+ */
+
+static int _run_gc(BLURAY *bd, gc_ctrl_e msg, uint32_t param)
+{
+    int result = -1;
+
+    if (bd && bd->graphics_controller && bd->hdmv_vm) {
+        GC_NAV_CMDS cmds = {-1, NULL, -1, 0};
+
+        result = gc_run(bd->graphics_controller, msg, param, &cmds);
+
+        if (cmds.num_nav_cmds > 0) {
+            hdmv_vm_set_object(bd->hdmv_vm, cmds.num_nav_cmds, cmds.nav_cmds);
+            bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
+        }
+
+        if (cmds.status != bd->gc_status) {
+            uint32_t changed_flags = cmds.status ^ bd->gc_status;
+            bd->gc_status = cmds.status;
+            if (changed_flags & GC_STATUS_MENU_OPEN) {
+                _queue_event(bd, (BD_EVENT){BD_EVENT_MENU, !!(bd->gc_status & GC_STATUS_MENU_OPEN)});
+            }
+            if (changed_flags & GC_STATUS_POPUP) {
+                _queue_event(bd, (BD_EVENT){BD_EVENT_POPUP, !!(bd->gc_status & GC_STATUS_POPUP)});
+            }
+        }
+
+        if (cmds.sound_id_ref >= 0 && cmds.sound_id_ref < 0xff) {
+            _queue_event(bd, (BD_EVENT){BD_EVENT_SOUND_EFFECT, cmds.sound_id_ref});
+        }
+
+    } else {
+        if (bd->gc_status & GC_STATUS_MENU_OPEN) {
+            _queue_event(bd, (BD_EVENT){BD_EVENT_MENU, 0});
+        }
+        if (bd->gc_status & GC_STATUS_POPUP) {
+            _queue_event(bd, (BD_EVENT){BD_EVENT_POPUP, 0});
+        }
+        bd->gc_status = GC_STATUS_NONE;
+    }
+
+    return result;
+}
+
+/*
  * libaacs and libbdplus open / close
  */
 
@@ -511,12 +630,10 @@
 {
     _libaacs_close(bd);
 
-#ifdef DLOPEN_CRYPTO_LIBS
     if (bd->h_libaacs) {
         dl_dlclose(bd->h_libaacs);
         bd->h_libaacs = NULL;
     }
-#endif
 
     bd->libaacs_open         = NULL;
     bd->libaacs_decrypt_unit = NULL;
@@ -546,7 +663,6 @@
 
 static int _libaacs_load(BLURAY *bd)
 {
-#ifdef DLOPEN_CRYPTO_LIBS
     if (bd->h_libaacs) {
         return 1;
     }
@@ -562,6 +678,12 @@
         if (bd->libaacs_open && bd->libaacs_decrypt_unit) {
             BD_DEBUG(DBG_BLURAY, "Loaded libaacs (%p)\n", bd->h_libaacs);
             bd->disc_info.libaacs_detected = 1;
+
+            if (file_open != file_open_default()) {
+                BD_DEBUG(DBG_BLURAY, "Registering libaacs filesystem handler %p (%p)\n", file_open, bd->h_libaacs);
+                DL_CALL(bd->h_libaacs, aacs_register_file, file_open);
+            }
+
             return 1;
 
         } else {
@@ -575,16 +697,6 @@
     _libaacs_unload(bd);
 
     return 0;
-
-#else
-    BD_DEBUG(DBG_BLURAY, "Using libaacs via normal linking\n");
-
-    bd->libaacs_open         = &aacs_open;
-    bd->libaacs_decrypt_unit = &aacs_decrypt_unit;
-    bd->disc_info.libaacs_detected = 1;
-
-    return 1;
-#endif
 }
 
 static int _libaacs_open(BLURAY *bd, const char *keyfile_path)
@@ -601,17 +713,59 @@
         return 0;
     }
 
-    bd->aacs = bd->libaacs_open(bd->device_path, keyfile_path);
+    int error_code = 0;
+    fptr_p_void aacs_open2 = (fptr_p_void)dl_dlsym(bd->h_libaacs, "aacs_open2");
+    if (!aacs_open2) {
+        BD_DEBUG(DBG_BLURAY, "Using old aacs_open(), no verbose error reporting available (%p)\n", bd->aacs);
+        bd->aacs = bd->libaacs_open(bd->device_path, keyfile_path);
+    } else {
+        bd->aacs = aacs_open2(bd->device_path, keyfile_path, &error_code);
+    }
 
     if (bd->aacs) {
-        BD_DEBUG(DBG_BLURAY, "Opened libaacs (%p)\n", bd->aacs);
-        bd->disc_info.aacs_handled = 1;
-        return 1;
+        fptr_int    aacs_get_mkb_version = (fptr_int)    dl_dlsym(bd->h_libaacs, "aacs_get_mkb_version");
+        fptr_p_void aacs_get_disc_id     = (fptr_p_void) dl_dlsym(bd->h_libaacs, "aacs_get_disc_id");
+        if (aacs_get_mkb_version) {
+            bd->disc_info.aacs_mkbv = aacs_get_mkb_version(bd->aacs);
+        }
+        if (aacs_get_disc_id) {
+            memcpy(bd->disc_info.disc_id, aacs_get_disc_id(bd->aacs), 20);
+        }
+
+        if (!error_code) {
+            BD_DEBUG(DBG_BLURAY, "Opened libaacs (%p)\n", bd->aacs);
+            bd->disc_info.aacs_handled = 1;
+            return 1;
+        }
     }
 
     BD_DEBUG(DBG_BLURAY, "aacs_open() failed!\n");
     bd->disc_info.aacs_handled = 0;
 
+    switch (error_code) {
+        case 0: /* AACS_SUCCESS */
+            break;
+        case -1: /* AACS_ERROR_CORRUPTED_DISC */
+            bd->disc_info.aacs_error_code = BD_AACS_CORRUPTED_DISC;
+            break;
+        case -2: /* AACS_ERROR_NO_CONFIG */
+            bd->disc_info.aacs_error_code = BD_AACS_NO_CONFIG;
+            break;
+        case -3: /* AACS_ERROR_NO_PK */
+            bd->disc_info.aacs_error_code = BD_AACS_NO_PK;
+            break;
+        case -4: /* AACS_ERROR_NO_CERT */
+            bd->disc_info.aacs_error_code = BD_AACS_NO_CERT;
+            break;
+        case -5: /* AACS_ERROR_CERT_REVOKED */
+            bd->disc_info.aacs_error_code = BD_AACS_CERT_REVOKED;
+            break;
+        case -6: /* AACS_ERROR_MMC_OPEN */
+        case -7: /* AACS_ERROR_MMC_FAILURE */
+            bd->disc_info.aacs_error_code = BD_AACS_MMC_FAILED;
+            break;
+    }
+
     _libaacs_unload(bd);
     return 0;
 }
@@ -619,16 +773,12 @@
 static uint8_t *_libaacs_get_vid(BLURAY *bd)
 {
     if (bd->aacs) {
-#ifdef DLOPEN_CRYPTO_LIBS
         fptr_p_void fptr = (fptr_p_void)dl_dlsym(bd->h_libaacs, "aacs_get_vid");
         if (fptr) {
             return (uint8_t*)fptr(bd->aacs);
         }
         BD_DEBUG(DBG_BLURAY, "aacs_get_vid() dlsym failed! (%p)", bd);
         return NULL;
-#else
-        return aacs_get_vid(bd->aacs);
-#endif
     }
 
     BD_DEBUG(DBG_BLURAY, "_libaacs_get_vid(): libaacs not initialized! (%p)", bd);
@@ -647,12 +797,10 @@
 {
     _libbdplus_close(bd);
 
-#ifdef DLOPEN_CRYPTO_LIBS
     if (bd->h_libbdplus) {
         dl_dlclose(bd->h_libbdplus);
         bd->h_libbdplus = NULL;
     }
-#endif
 
     bd->bdplus_init  = NULL;
     bd->bdplus_seek  = NULL;
@@ -685,7 +833,6 @@
 {
     BD_DEBUG(DBG_BDPLUS, "attempting to load libbdplus\n");
 
-#ifdef DLOPEN_CRYPTO_LIBS
     if (bd->h_libbdplus) {
         return 1;
     }
@@ -714,17 +861,6 @@
     _libbdplus_unload(bd);
 
     return 0;
-
-#else
-    BD_DEBUG(DBG_BLURAY,"Using libbdplus via normal linking\n");
-
-    bd->bdplus_init  = &bdplus_init;
-    bd->bdplus_seek  = &bdplus_seek;
-    bd->bdplus_fixup = &bdplus_fixup;
-    bd->disc_info.libbdplus_detected = 1;
-
-    return 1;
-#endif
 }
 
 static int _libbdplus_open(BLURAY *bd, const char *keyfile_path)
@@ -786,8 +922,8 @@
 
 static int _meta_open(BLURAY *bd)
 {
-    if (!bd->meta){
-      bd->meta = meta_parse(bd->device_path);
+    if (!bd->meta) {
+        bd->meta = meta_parse(bd->device_path);
     }
 
     return !!bd->meta;
@@ -838,37 +974,108 @@
     }
 }
 
+#ifdef HAVE_MNTENT_H
+/*
+ * Replace device node (/dev/sr0) by mount point
+ * Implemented on Linux and MacOSX
+ */
+static void get_mount_point(BLURAY *bd)
+{
+    struct stat st;
+    if (stat (bd->device_path, &st) )
+        return;
+
+    /* If it's a directory, all is good */
+    if (S_ISDIR(st.st_mode))
+        return;
+
+    FILE *f = setmntent ("/proc/self/mounts", "r");
+    if (!f)
+        return;
+
+    struct mntent* m;
+#ifdef HAVE_GETMNTENT_R
+    struct mntent mbuf;
+    char buf [8192];
+    while ((m = getmntent_r (f, &mbuf, buf, sizeof(buf))) != NULL) {
+#else
+    while ((m = getmntent (f)) != NULL) {
+#endif
+        if (!strcmp (m->mnt_fsname, bd->device_path)) {
+            free(bd->device_path);
+            bd->device_path = strdup (m->mnt_dir);
+            break;
+        }
+    }
+    endmntent (f);
+}
+#endif
+#ifdef __APPLE__
+static void get_mount_point(BLURAY *bd)
+{
+    struct stat st;
+    if (stat (bd->device_path, &st) )
+        return;
+
+    /* If it's a directory, all is good */
+    if (S_ISDIR(st.st_mode))
+        return;
+
+    struct statfs mbuf[128];
+    int fs_count;
+
+    if ( (fs_count = getfsstat (NULL, 0, MNT_NOWAIT)) == -1 ) {
+        return;
+    }
+
+    getfsstat (mbuf, fs_count * sizeof(mbuf[0]), MNT_NOWAIT);
+
+    for ( int i = 0; i < fs_count; ++i) {
+        if (!strcmp (mbuf[i].f_mntfromname, bd->device_path)) {
+            free(bd->device_path);
+            bd->device_path = strdup (mbuf[i].f_mntonname);
+        }
+    }
+}
+#endif
+
 /*
  * open / close
  */
 
 BLURAY *bd_open(const char* device_path, const char* keyfile_path)
 {
-    BLURAY *bd = calloc(1, sizeof(BLURAY));
+    BD_DEBUG(DBG_BLURAY, "libbluray version "BLURAY_VERSION_STRING"\n");
 
-    if (device_path) {
+    if (!device_path) {
+        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No device path provided!\n");
+        return NULL;
+    }
 
-        bd->device_path = (char*)malloc(strlen(device_path) + 1);
-        strcpy(bd->device_path, device_path);
+    BLURAY *bd = calloc(1, sizeof(BLURAY));
 
-        _libaacs_open(bd, keyfile_path);
+    if (!bd) {
+        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't allocate memory\n");
+        return NULL;
+    }
 
-        _libbdplus_open(bd, keyfile_path);
+    bd->device_path = strdup(device_path);
 
-        _index_open(bd);
+#if (defined HAVE_MNTENT_H || defined __APPLE__)
+    get_mount_point(bd);
+#endif
 
-        bd->meta = NULL;
+    _libaacs_open(bd, keyfile_path);
 
-        bd->regs = bd_registers_init();
+    _libbdplus_open(bd, keyfile_path);
 
-        _fill_disc_info(bd);
+    _index_open(bd);
 
-        BD_DEBUG(DBG_BLURAY, "BLURAY initialized! (%p)\n", bd);
-    } else {
-        X_FREE(bd);
+    bd->regs = bd_registers_init();
 
-        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No device path provided!\n");
-    }
+    _fill_disc_info(bd);
+
+    BD_DEBUG(DBG_BLURAY, "BLURAY initialized! (%p)\n", bd);
 
     return bd;
 }
@@ -895,9 +1102,11 @@
 
     gc_free(&bd->graphics_controller);
     indx_free(&bd->index);
+    meta_free(&bd->meta);
+    sound_free(&bd->sound_effects);
     bd_registers_free(bd->regs);
 
-    X_FREE(bd->event_queue);
+    _free_event_queue(bd);
     X_FREE(bd->device_path);
 
     BD_DEBUG(DBG_BLURAY, "BLURAY destroyed! (%p)\n", bd);
@@ -968,9 +1177,13 @@
 uint64_t bd_tell_time(BLURAY *bd)
 {
     uint32_t clip_pkt = 0, out_pkt = 0, out_time = 0;
+    NAV_CLIP *clip;
 
     if (bd && bd->title) {
-        nav_packet_search(bd->title, bd->s_pos / 192, &clip_pkt, &out_pkt, &out_time);
+        clip = nav_packet_search(bd->title, bd->s_pos / 192, &clip_pkt, &out_pkt, &out_time);
+        if (clip) {
+            out_time += clip->start_time;
+        }
     }
 
     return ((uint64_t)out_time) * 2;
@@ -1149,15 +1362,15 @@
                     }
                 }
             }
+            if (st->clip == NULL) {
+                // We previously reached the last clip.  Nothing
+                // else to read.
+                _queue_event(bd, (BD_EVENT){BD_EVENT_END_OF_TITLE, 0});
+                return 0;
+            }
             if (st->int_buf_off == 6144 || clip_pkt >= st->clip->end_pkt) {
 
                 // Do we need to get the next clip?
-                if (st->clip == NULL) {
-                    // We previously reached the last clip.  Nothing
-                    // else to read.
-                    _queue_event(bd, (BD_EVENT){BD_EVENT_END_OF_TITLE, 0});
-                    return 0;
-                }
                 if (clip_pkt >= st->clip->end_pkt) {
 
                     // split read()'s at clip boundary
@@ -1191,12 +1404,24 @@
                     }
                 }
 
-                if (_read_block(bd, st, bd->int_buf)) {
+                int r = _read_block(bd, st, bd->int_buf);
+                if (r > 0) {
+
+                    if (bd->ig_pid > 0) {
+                        if (gc_decode_ts(bd->graphics_controller, bd->ig_pid, bd->int_buf, 1, -1) > 0) {
+                            /* initialize menus */
+                            _run_gc(bd, GC_CTRL_INIT_MENU, 0);
+                        }
+                    }
 
                     st->int_buf_off = st->clip_pos % 6144;
 
-                } else {
+                } else if (r == 0) {
+                    /* recoverable error (EOF, broken block) */
                     return out_len;
+                } else {
+                    /* fatal error */
+                    return -1;
                 }
             }
             if (size > (unsigned int)6144 - st->int_buf_off) {
@@ -1254,7 +1479,7 @@
     unsigned  ig_stream = bd_psr_read(bd->regs, PSR_IG_STREAM_ID);
 
     if (ig_stream > 0 && ig_stream <= pi->stn.num_ig) {
-        ig_stream--;
+        ig_stream--; /* stream number to table index */
         if (pi->stn.ig[ig_stream].stream_type == 2) {
             *sub_path_idx = pi->stn.ig[ig_stream].subpath_id;
         }
@@ -1286,16 +1511,17 @@
     bd->st_ig.clip = &bd->title->sub_path[ig_subpath].clip_list.clip[0];
 
     if (!_preload_m2ts(bd, &bd->st_ig)) {
+        _close_preload(&bd->st_ig);
         return 0;
     }
 
-    gc_decode_ts(bd->graphics_controller, ig_pid, bd->st_ig.buf, bd->st_ig.clip_size / 6144, -1);
-
     return 1;
 }
 
 static int _preload_subpaths(BLURAY *bd)
 {
+    _close_preload(&bd->st_ig);
+
     if (bd->title->pl->sub_count <= 0) {
         return 0;
     }
@@ -1303,6 +1529,34 @@
     return _preload_ig_subpath(bd);
 }
 
+static int _init_ig_stream(BLURAY *bd)
+{
+    int      ig_subpath = -1;
+    uint16_t ig_pid     = 0;
+
+    bd->ig_pid = 0;
+
+    if (!bd->graphics_controller) {
+        return 0;
+    }
+
+    _find_ig_stream(bd, &ig_pid, &ig_subpath);
+
+    /* decode already preloaded IG sub-path */
+    if (bd->st_ig.clip) {
+        gc_decode_ts(bd->graphics_controller, ig_pid, bd->st_ig.buf, bd->st_ig.clip_size / 6144, -1);
+        return 1;
+    }
+
+    /* store PID of main path embedded IG stream */
+    if (ig_subpath < 0) {
+        bd->ig_pid = ig_pid;
+        return 1;
+    }
+
+    return 0;
+}
+
 /*
  * select title / angle
  */
@@ -1455,7 +1709,7 @@
  * title lists
  */
 
-uint32_t bd_get_titles(BLURAY *bd, uint8_t flags)
+uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
 {
     if (!bd) {
         BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_get_titles(NULL) failed (%p)\n", bd);
@@ -1465,7 +1719,7 @@
     if (bd->title_list != NULL) {
         nav_free_title_list(bd->title_list);
     }
-    bd->title_list = nav_get_title_list(bd->device_path, flags);
+    bd->title_list = nav_get_title_list(bd->device_path, flags, min_title_length);
 
     if (!bd->title_list) {
         BD_DEBUG(DBG_BLURAY | DBG_CRIT, "nav_get_title_list(%s) failed (%p)\n", bd->device_path, bd);
@@ -1541,12 +1795,13 @@
     return title_info;
 }
 
-static BLURAY_TITLE_INFO *_get_title_info(BLURAY *bd, uint32_t title_idx, uint32_t playlist, const char *mpls_name)
+static BLURAY_TITLE_INFO *_get_title_info(BLURAY *bd, uint32_t title_idx, uint32_t playlist, const char *mpls_name,
+                                          unsigned angle)
 {
     NAV_TITLE *title;
     BLURAY_TITLE_INFO *title_info;
 
-    title = nav_title_open(bd->device_path, mpls_name, 0);
+    title = nav_title_open(bd->device_path, mpls_name, angle);
     if (title == NULL) {
         BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open title %s! (%p)\n",
               mpls_name, bd);
@@ -1559,7 +1814,7 @@
     return title_info;
 }
 
-BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx)
+BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)
 {
     if (bd->title_list == NULL) {
         BD_DEBUG(DBG_BLURAY, "Title list not yet read! (%p)\n", bd);
@@ -1572,15 +1827,16 @@
 
     return _get_title_info(bd,
                            title_idx, bd->title_list->title_info[title_idx].mpls_id,
-                           bd->title_list->title_info[title_idx].name);
+                           bd->title_list->title_info[title_idx].name,
+                           angle);
 }
 
-BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist)
+BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)
 {
     char *f_name = str_printf("%05d.mpls", playlist);
     BLURAY_TITLE_INFO *title_info;
 
-    title_info = _get_title_info(bd, 0, playlist, f_name);
+    title_info = _get_title_info(bd, 0, playlist, f_name, angle);
 
     X_FREE(f_name);
 
@@ -1690,61 +1946,80 @@
  * Navigation mode interface
  */
 
-/*
- * notification events to APP
- */
-static void _process_psr_event(void *handle, BD_PSR_EVENT *ev)
+static void _process_psr_restore_event(BLURAY *bd, BD_PSR_EVENT *ev)
 {
-    BLURAY *bd = (BLURAY*)handle;
+    /* PSR restore events are handled internally.
+     * Restore stored playback position.
+     */
 
-    /* PSR restore events are handled internally */
+    BD_DEBUG(DBG_BLURAY, "PSR restore: psr%u = %u (%p)\n", ev->psr_idx, ev->new_val, bd);
 
-    if (ev->ev_type == BD_PSR_RESTORE) {
+    switch (ev->psr_idx) {
+        case PSR_ANGLE_NUMBER:
+            /* can't set angle before playlist is opened */
+            return;
+        case PSR_TITLE_NUMBER:
+            /* pass to the application */
+            _queue_event(bd, (BD_EVENT){BD_EVENT_TITLE, ev->new_val});
+            return;
+        case PSR_CHAPTER:
+            /* will be selected automatically */
+            return;
+        case PSR_PLAYLIST:
+            bd_select_playlist(bd, ev->new_val);
+            nav_set_angle(bd->title, bd->st0.clip, bd_psr_read(bd->regs, PSR_ANGLE_NUMBER) - 1);
+            return;
+        case PSR_PLAYITEM:
+            bd_seek_playitem(bd, ev->new_val);
+            return;
+        case PSR_TIME:
+            bd_seek_time(bd, ((int64_t)ev->new_val) << 1);
+            _init_ig_stream(bd);
+            _run_gc(bd, GC_CTRL_INIT_MENU, 0);
+            return;
+
+        case PSR_SELECTED_BUTTON_ID:
+        case PSR_MENU_PAGE_ID:
+            /* handled by graphics controller */
+            return;
 
-        BD_DEBUG(DBG_BLURAY, "PSR RESTORE event %d %d (%p)\n", ev->psr_idx, ev->new_val, bd);
+        default:
+            /* others: ignore */
+            return;
+    }
+}
 
-        /* Restore stored playback position */
+/*
+ * notification events to APP
+ */
 
-        switch (ev->psr_idx) {
-            case PSR_ANGLE_NUMBER:
-                /* can't set angle before playlist is opened */
-                return;
-            case PSR_TITLE_NUMBER:
-                /* pass to the application */
-                break;
-            case PSR_CHAPTER:
-                /* will be selected automatically */
-                return;
-            case PSR_PLAYLIST:
-                bd_select_playlist(bd, ev->new_val);
-                nav_set_angle(bd->title, bd->st0.clip, bd_psr_read(bd->regs, PSR_ANGLE_NUMBER) - 1);
-                return;
-            case PSR_PLAYITEM:
-                bd_seek_playitem(bd, ev->new_val);
-                return;
-            case PSR_TIME:
-                bd_seek_time(bd, ((int64_t)ev->new_val) << 1);
-                return;
-            case PSR_SELECTED_BUTTON_ID:
-            case PSR_MENU_PAGE_ID:
-                /* TODO: need to inform graphics controller ? */
-            default:
-                /* others: ignore */
-                return;
-        }
+static void _process_psr_write_event(BLURAY *bd, BD_PSR_EVENT *ev)
+{
+    if (ev->ev_type == BD_PSR_WRITE) {
+        BD_DEBUG(DBG_BLURAY, "PSR write: psr%u = %u (%p)\n", ev->psr_idx, ev->new_val, bd);
     }
 
-    BD_DEBUG(DBG_BLURAY, "PSR event %d %d (%p)\n", ev->psr_idx, ev->new_val, bd);
-
     switch (ev->psr_idx) {
 
         /* current playback position */
 
-        case PSR_ANGLE_NUMBER: _queue_event(bd, (BD_EVENT){BD_EVENT_ANGLE, ev->new_val}); break;
-        case PSR_TITLE_NUMBER: _queue_event(bd, (BD_EVENT){BD_EVENT_TITLE, ev->new_val}); break;
-        case PSR_PLAYLIST: _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYLIST, ev->new_val}); break;
-        case PSR_PLAYITEM: _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYITEM, ev->new_val}); break;
-        case PSR_CHAPTER:  _queue_event(bd, (BD_EVENT){BD_EVENT_CHAPTER,  ev->new_val}); break;
+        case PSR_ANGLE_NUMBER: _queue_event(bd, (BD_EVENT){BD_EVENT_ANGLE,    ev->new_val}); break;
+        case PSR_TITLE_NUMBER: _queue_event(bd, (BD_EVENT){BD_EVENT_TITLE,    ev->new_val}); break;
+        case PSR_PLAYLIST:     _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYLIST, ev->new_val}); break;
+        case PSR_PLAYITEM:     _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYITEM, ev->new_val}); break;
+        case PSR_CHAPTER:      _queue_event(bd, (BD_EVENT){BD_EVENT_CHAPTER,  ev->new_val}); break;
+
+        default:;
+    }
+}
+
+static void _process_psr_change_event(BLURAY *bd, BD_PSR_EVENT *ev)
+{
+    BD_DEBUG(DBG_BLURAY, "PSR change: psr%u = %u (%p)\n", ev->psr_idx, ev->new_val, bd);
+
+    _process_psr_write_event(bd, ev);
+
+    switch (ev->psr_idx) {
 
         /* stream selection */
 
@@ -1781,14 +2056,35 @@
     }
 }
 
+static void _process_psr_event(void *handle, BD_PSR_EVENT *ev)
+{
+    BLURAY *bd = (BLURAY*)handle;
+
+    switch(ev->ev_type) {
+        case BD_PSR_WRITE:
+            _process_psr_write_event(bd, ev);
+            break;
+        case BD_PSR_CHANGE:
+            _process_psr_change_event(bd, ev);
+            break;
+        case BD_PSR_RESTORE:
+            _process_psr_restore_event(bd, ev);
+            break;
+
+        case BD_PSR_SAVE:
+            BD_DEBUG(DBG_BLURAY, "PSR save event (%p)\n", bd);
+            break;
+        default:
+            BD_DEBUG(DBG_BLURAY, "PSR event %d: psr%u = %u (%p)\n", ev->ev_type, ev->psr_idx, ev->new_val, bd);
+            break;
+    }
+}
+
 static void _queue_initial_psr_events(BLURAY *bd)
 {
     const uint32_t psrs[] = {
         PSR_ANGLE_NUMBER,
         PSR_TITLE_NUMBER,
-        PSR_CHAPTER,
-        PSR_PLAYLIST,
-        PSR_PLAYITEM,
         PSR_IG_STREAM_ID,
         PSR_PRIMARY_AUDIO_ID,
         PSR_PG_STREAM,
@@ -1798,13 +2094,13 @@
 
     for (ii = 0; ii < sizeof(psrs) / sizeof(psrs[0]); ii++) {
         BD_PSR_EVENT ev = {
-            .ev_type = 0,
+            .ev_type = BD_PSR_CHANGE,
             .psr_idx = psrs[ii],
             .old_val = 0,
             .new_val = bd_psr_read(bd->regs, psrs[ii]),
         };
 
-        _process_psr_event(bd, &ev);
+        _process_psr_change_event(bd, &ev);
     }
 }
 
@@ -1823,6 +2119,8 @@
 
 static int _play_hdmv(BLURAY *bd, unsigned id_ref)
 {
+    int result = 1;
+
     bd->title_type = title_hdmv;
 
 #ifdef USING_BDJAVA
@@ -1834,12 +2132,12 @@
     }
 
     if (hdmv_vm_select_object(bd->hdmv_vm, id_ref)) {
-        return 0;
+        result = 0;
     }
 
     bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
 
-    return 1;
+    return result;
 }
 
 static int _play_title(BLURAY *bd, unsigned title)
@@ -1922,8 +2220,10 @@
 
     _init_event_queue(bd);
 
+    bd_psr_lock(bd->regs);
     bd_psr_register_cb(bd->regs, _process_psr_event, bd);
     _queue_initial_psr_events(bd);
+    bd_psr_unlock(bd->regs);
 
     return _play_title(bd, BLURAY_TITLE_FIRST_PLAY);
 }
@@ -1980,33 +2280,21 @@
     return _play_title(bd, BLURAY_TITLE_TOP_MENU);
 }
 
-static void _run_gc(BLURAY *bd, gc_ctrl_e msg, uint32_t param)
-{
-    if (bd && bd->graphics_controller && bd->hdmv_vm) {
-        GC_NAV_CMDS cmds = {-1, NULL, -1};
-
-        gc_run(bd->graphics_controller, msg, param, &cmds);
-
-        if (cmds.num_nav_cmds > 0) {
-            hdmv_vm_set_object(bd->hdmv_vm, cmds.num_nav_cmds, cmds.nav_cmds);
-            bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
-        }
-    }
-}
-
 static void _process_hdmv_vm_event(BLURAY *bd, HDMV_EVENT *hev)
 {
     BD_DEBUG(DBG_BLURAY, "HDMV event: %d %d\n", hev->event, hev->param);
 
     switch (hev->event) {
         case HDMV_EVENT_TITLE:
+            _close_playlist(bd);
             _play_title(bd, hev->param);
             break;
 
         case HDMV_EVENT_PLAY_PL:
             bd_select_playlist(bd, hev->param);
             /* initialize menus */
-            _run_gc(bd, GC_CTRL_NOP, 0);
+            _init_ig_stream(bd);
+            _run_gc(bd, GC_CTRL_INIT_MENU, 0);
             break;
 
         case HDMV_EVENT_PLAY_PI:
@@ -2020,12 +2308,8 @@
             break;
 
         case HDMV_EVENT_PLAY_STOP:
-            BD_DEBUG(DBG_BLURAY|DBG_CRIT, "HDMV_EVENT_PLAY_STOP: not tested !\n");
             // stop current playlist
-            bd_seek(bd, (uint64_t)bd->title->packets * 192 - 1);
-            bd->st0.clip = NULL;
-            // resume suspended movie object
-            hdmv_vm_resume(bd->hdmv_vm);
+            _close_playlist(bd);
             break;
 
         case HDMV_EVENT_STILL:
@@ -2135,29 +2419,36 @@
         _queue_initial_psr_events(bd);
     }
 
-    return _get_event(bd, event);
+    if (event) {
+        return _get_event(bd, event);
+    }
+
+    return 0;
 }
 
 /*
  * user interaction
  */
 
-void bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y)
+void bd_set_scr(BLURAY *bd, int64_t pts)
 {
     if (pts >= 0) {
         bd_psr_write(bd->regs, PSR_TIME, (uint32_t)(((uint64_t)pts) >> 1));
     }
+}
 
-    _run_gc(bd, GC_CTRL_MOUSE_MOVE, (x << 16) | y);
+int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y)
+{
+    bd_set_scr(bd, pts);
+
+    return _run_gc(bd, GC_CTRL_MOUSE_MOVE, (x << 16) | y);
 }
 
-void bd_user_input(BLURAY *bd, int64_t pts, uint32_t key)
+int bd_user_input(BLURAY *bd, int64_t pts, uint32_t key)
 {
-    if (pts >= 0) {
-        bd_psr_write(bd->regs, PSR_TIME, (uint32_t)(((uint64_t)pts) >> 1));
-    }
+    bd_set_scr(bd, pts);
 
-    _run_gc(bd, GC_CTRL_VK_KEY, key);
+    return _run_gc(bd, GC_CTRL_VK_KEY, key);
 }
 
 void bd_register_overlay_proc(BLURAY *bd, void *handle, bd_overlay_proc_f func)
@@ -2173,7 +2464,41 @@
     }
 }
 
-struct meta_dl *bd_get_meta(BLURAY *bd)
+int bd_get_sound_effect(BLURAY *bd, unsigned sound_id, BLURAY_SOUND_EFFECT *effect)
+{
+    if (!bd || !effect) {
+        return -1;
+    }
+
+    if (!bd->sound_effects) {
+
+        char *file = str_printf("%s/BDMV/AUXDATA/sound.bdmv", bd->device_path);
+        bd->sound_effects = sound_parse(file);
+        X_FREE(file);
+
+        if (!bd->sound_effects) {
+            return -1;
+        }
+    }
+
+    if (sound_id < bd->sound_effects->num_sounds) {
+        SOUND_OBJECT *o = &bd->sound_effects->sounds[sound_id];
+
+        effect->num_channels = o->num_channels;
+        effect->num_frames   = o->num_frames;
+        effect->samples      = (const int16_t *)o->samples;
+
+        return 1;
+    }
+
+    return 0;
+}
+
+/*
+ *
+ */
+
+const struct meta_dl *bd_get_meta(BLURAY *bd)
 {
     if (!bd) {
         return NULL;
@@ -2196,12 +2521,9 @@
 
 struct clpi_cl *bd_get_clpi(BLURAY *bd, unsigned clip_ref)
 {
-    NAV_CLIP *clip;
-
     if (bd->title && clip_ref < bd->title->clip_list.count) {
-      clip = &bd->title->clip_list.clip[clip_ref];
-      CLPI_CL *cl = (CLPI_CL*) calloc(1, sizeof(CLPI_CL));
-      return clpi_copy(cl, clip->cl);
+      NAV_CLIP *clip = &bd->title->clip_list.clip[clip_ref];
+      return clpi_copy(clip->cl);
     }
     return NULL;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bluray.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bluray.h Changed

@@ -44,22 +44,24 @@
 typedef struct bluray BLURAY;
 
 typedef enum {
-    BLURAY_STREAM_TYPE_VIDEO_MPEG1        = 0x01,
-    BLURAY_STREAM_TYPE_VIDEO_MPEG2        = 0x02,
-    BLURAY_STREAM_TYPE_AUDIO_MPEG1        = 0x03,
-    BLURAY_STREAM_TYPE_AUDIO_MPEG2        = 0x04,
-    BLURAY_STREAM_TYPE_AUDIO_LPCM         = 0x80,
-    BLURAY_STREAM_TYPE_AUDIO_AC3          = 0x81,
-    BLURAY_STREAM_TYPE_AUDIO_DTS          = 0x82,
-    BLURAY_STREAM_TYPE_AUDIO_TRUHD        = 0x83,
-    BLURAY_STREAM_TYPE_AUDIO_AC3PLUS      = 0x84,
-    BLURAY_STREAM_TYPE_AUDIO_DTSHD        = 0x85,
-    BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER = 0x86,
-    BLURAY_STREAM_TYPE_VIDEO_VC1          = 0xea,
-    BLURAY_STREAM_TYPE_VIDEO_H264         = 0x1b,
-    BLURAY_STREAM_TYPE_SUB_PG             = 0x90,
-    BLURAY_STREAM_TYPE_SUB_IG             = 0x91,
-    BLURAY_STREAM_TYPE_SUB_TEXT           = 0x92
+    BLURAY_STREAM_TYPE_VIDEO_MPEG1              = 0x01,
+    BLURAY_STREAM_TYPE_VIDEO_MPEG2              = 0x02,
+    BLURAY_STREAM_TYPE_AUDIO_MPEG1              = 0x03,
+    BLURAY_STREAM_TYPE_AUDIO_MPEG2              = 0x04,
+    BLURAY_STREAM_TYPE_AUDIO_LPCM               = 0x80,
+    BLURAY_STREAM_TYPE_AUDIO_AC3                = 0x81,
+    BLURAY_STREAM_TYPE_AUDIO_DTS                = 0x82,
+    BLURAY_STREAM_TYPE_AUDIO_TRUHD              = 0x83,
+    BLURAY_STREAM_TYPE_AUDIO_AC3PLUS            = 0x84,
+    BLURAY_STREAM_TYPE_AUDIO_DTSHD              = 0x85,
+    BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER       = 0x86,
+    BLURAY_STREAM_TYPE_VIDEO_VC1                = 0xea,
+    BLURAY_STREAM_TYPE_VIDEO_H264               = 0x1b,
+    BLURAY_STREAM_TYPE_SUB_PG                   = 0x90,
+    BLURAY_STREAM_TYPE_SUB_IG                   = 0x91,
+    BLURAY_STREAM_TYPE_SUB_TEXT                 = 0x92,
+    BLURAY_STREAM_TYPE_AUDIO_AC3PLUS_SECONDARY  = 0xa1,
+    BLURAY_STREAM_TYPE_AUDIO_DTSHD_SECONDARY    = 0xa2
 } bd_stream_type_e;
 
 typedef enum {
@@ -166,6 +168,18 @@
     BLURAY_TITLE_CHAPTER *chapters;
 } BLURAY_TITLE_INFO;
 
+typedef struct bd_sound_effect {
+    uint8_t         num_channels; /* 1 - mono, 2 - stereo */
+    uint32_t        num_frames;
+    const int16_t  *samples;      /* 48000 Hz, 16 bit LPCM. interleaved if stereo */
+} BLURAY_SOUND_EFFECT;
+
+/**
+ *  Get library version
+ *
+ */
+void bd_get_version(int *major, int *minor, int *micro);
+
 /**
  *
  *  This must be called after bd_open() and before bd_select_title().
@@ -174,9 +188,10 @@
  *
  * @param bd  BLURAY object
  * @param flags  title flags
+ * @param min_title_length  filter out titles shorter than min_title_length seconds
  * @return number of titles found
  */
-uint32_t bd_get_titles(BLURAY *bd, uint8_t flags);
+uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length);
 
 /**
  *
@@ -184,9 +199,10 @@
  *
  * @param bd  BLURAY object
  * @param title_idx title index number
+ * @param angle angle number (chapter offsets and clip size depend on selected angle)
  * @return allocated BLURAY_TITLE_INFO object, NULL on error
  */
-BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx);
+BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle);
 
 /**
  *
@@ -194,9 +210,10 @@
  *
  * @param bd  BLURAY object
  * @param playlist playlist number
+ * @param angle angle number (chapter offsets and clip size depend on selected angle)
  * @return allocated BLURAY_TITLE_INFO object, NULL on error
  */
-BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist);
+BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle);
 
 /**
  *
@@ -209,7 +226,7 @@
 /**
  *  Initializes libbluray objects
  *
- * @param device_path   path to mounted Blu-ray disc
+ * @param device_path   path to mounted Blu-ray disc or device
  * @param keyfile_path  path to KEYDB.cfg (may be NULL)
  * @return allocated BLURAY object, NULL if error
  */
@@ -248,7 +265,7 @@
  * @param bd  BLURAY object
  * @param buf buffer to read data into
  * @param len size of data to be read
- * @return size of data read, -1 if error
+ * @return size of data read, -1 if error, 0 if EOF
  */
 int bd_read(BLURAY *bd, unsigned char *buf, int len);
 
@@ -390,6 +407,14 @@
  * Disc info
  */
 
+/* AACS error codes */
+#define BD_AACS_CORRUPTED_DISC  -1
+#define BD_AACS_NO_CONFIG       -2
+#define BD_AACS_NO_PK           -3
+#define BD_AACS_NO_CERT         -4
+#define BD_AACS_CERT_REVOKED    -5
+#define BD_AACS_MMC_FAILED      -6
+
 typedef struct {
     uint8_t  bluray_detected;
 
@@ -408,6 +433,14 @@
     uint8_t  libbdplus_detected;
     uint8_t  bdplus_handled;
 
+    /* aacs error code */
+    int      aacs_error_code;
+    /* aacs MKB version */
+    int      aacs_mkbv;
+
+    /* Disc ID */
+    uint8_t  disc_id[20];
+
 } BLURAY_DISC_INFO;
 
 /**
@@ -461,14 +494,15 @@
 
 typedef enum {
     BD_EVENT_NONE = 0,
-    BD_EVENT_ERROR,
-    BD_EVENT_ENCRYPTED,
+    BD_EVENT_ERROR,       /* Fatal error. Playback can't be continued. */
+    BD_EVENT_READ_ERROR,  /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
+    BD_EVENT_ENCRYPTED,   /* .m2ts file is encrypted and can't be played */
 
     /* current playback position */
     BD_EVENT_ANGLE,     /* current angle, 1...N */
     BD_EVENT_TITLE,     /* current title, 1...N (0 = top menu) */
     BD_EVENT_PLAYLIST,  /* current playlist (xxxxx.mpls) */
-    BD_EVENT_PLAYITEM,  /* current play item */
+    BD_EVENT_PLAYITEM,  /* current play item, 0...N-1  */
     BD_EVENT_CHAPTER,   /* current chapter, 1...N */
     BD_EVENT_END_OF_TITLE,
 
@@ -495,6 +529,14 @@
     /* Still playback for n seconds (reached end of still mode play item) */
     BD_EVENT_STILL_TIME,             /* 0 = infinite ; 1...300 = seconds */
 
+    /* Play sound effect */
+    BD_EVENT_SOUND_EFFECT,           /* effect ID */
+
+    /* Pop-Up menu available */
+    BD_EVENT_POPUP,                  /* 0 - no, 1 - yes */
+
+    /* Interactive menu visible */
+    BD_EVENT_MENU,                   /* 0 - no, 1 - yes */
 } bd_event_e;
 
 typedef struct {
@@ -509,7 +551,7 @@
  *  Get event from libbluray event queue.
  *
  * @param bd  BLURAY object
- * @param event next BD_EVENT from event queue
+ * @param event next BD_EVENT from event queue, NULL to initialize event queue
  * @return 1 on success, 0 if no events
  */
 int  bd_get_event(BLURAY *bd, BD_EVENT *event);
@@ -520,7 +562,7 @@
 
 /**
  *
- *  Start playing disc in navigation mode.
+ *  Start playing disc in navigation mode (using on-disc menus).
  *
  *  Playback is started from "First Play" title.
  *
@@ -596,9 +638,9 @@
  * @param bd  BLURAY object
  * @param pts current playback position (1/90000s) or -1
  * @param key input key
- * @return 1 on success, 0 if error
+ * @return <0 on error, 0 on success, >0 if selection/activation changed
  */
-void bd_user_input(BLURAY *bd, int64_t pts, uint32_t key);
+int bd_user_input(BLURAY *bd, int64_t pts, uint32_t key);
 
 /**
  *
@@ -608,9 +650,24 @@
  * @param pts current playback position (1/90000s) or -1
  * @param x mouse pointer x-position
  * @param y mouse pointer y-position
- * @return none
+ * @return <0 on error, 0 when mouse is outside of buttons, 1 when mouse is inside button
+ */
+int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y);
+
+/**
+ *
+ *  Get sound effect
+ *
+ * @param bd  BLURAY object
+ * @param effect_id  sound effect id (0...N)
+ * @param effect     sound effect data
+ * @return <0 when no effects, 0 when id out of range, 1 on success
+ */
+int bd_get_sound_effect(BLURAY *bd, unsigned sound_id, struct bd_sound_effect *effect);
+
+/*
+ *
  */
-void bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y);
 
 struct meta_dl;
 /**
@@ -618,9 +675,9 @@
  *  Get meta information about the bluray disc.
  *
  * @param bd  BLURAY object
- * @return allocated META_DL (disclib) object, NULL on error
+ * @return META_DL (disclib) object, NULL on error
  */
-struct meta_dl *bd_get_meta(BLURAY *bd);
+const struct meta_dl *bd_get_meta(BLURAY *bd);
 
 
 struct clpi_cl;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_controller.c -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_controller.c Changed

@@ -43,6 +43,8 @@
 typedef struct {
     uint16_t enabled_button;  /* enabled button id */
     uint16_t x, y, w, h;      /* button rect on overlay plane (if drawn) */
+    int      visible_object_id; /* id of currently visible object */
+    int      animate_indx;    /* currently showing object index of animated button, < 0 for static buttons */
 } BOG_DATA;
 
 struct graphics_controller_s {
@@ -56,11 +58,17 @@
     void          (*overlay_proc)(void *, const struct bd_overlay_s * const);
 
     /* state */
+    unsigned        ig_open;
     unsigned        ig_drawn;
+    unsigned        ig_dirty;
+    unsigned        pg_open;
     unsigned        pg_drawn;
+    unsigned        pg_dirty;
     unsigned        popup_visible;
     unsigned        valid_mouse_position;
+    unsigned        auto_action_triggered;
     BOG_DATA       *bog_data;
+    BOG_DATA       *saved_bog_data;
 
     /* data */
     PG_DISPLAY_SET *pgs;
@@ -147,23 +155,57 @@
 enum { BTN_NORMAL, BTN_SELECTED, BTN_ACTIVATED };
 
 static BD_PG_OBJECT *_find_object_for_button(PG_DISPLAY_SET *s,
-                                             BD_IG_BUTTON *button, int state)
+                                             BD_IG_BUTTON *button, int state,
+                                             BOG_DATA *bog_data)
 {
     BD_PG_OBJECT *object   = NULL;
     unsigned object_id     = 0xffff;
+    unsigned object_id_end = 0xffff;
+    unsigned repeat        = 0;
 
     switch (state) {
         case BTN_NORMAL:
-            object_id = button->normal_start_object_id_ref;
+            object_id     = button->normal_start_object_id_ref;
+            object_id_end = button->normal_end_object_id_ref;
+            repeat        = button->normal_repeat_flag;
             break;
         case BTN_SELECTED:
-            object_id = button->selected_start_object_id_ref;
+            object_id     = button->selected_start_object_id_ref;
+            object_id_end = button->selected_end_object_id_ref;
+            repeat        = button->selected_repeat_flag;
             break;
         case BTN_ACTIVATED:
-            object_id = button->activated_start_object_id_ref;
+            object_id     = button->activated_start_object_id_ref;
+            object_id_end = button->activated_end_object_id_ref;
             break;
     }
 
+    if (bog_data) {
+        if (bog_data->animate_indx >= 0) {
+            int range = object_id_end - object_id;
+
+            if (range > 0 && object_id < 0xffff && object_id_end < 0xffff) {
+                GC_TRACE("animate button #%d: animate_indx %d, range %d, repeat %d\n",
+                         button->id, bog_data->animate_indx, range, repeat);
+
+                object_id += bog_data->animate_indx % (range + 1);
+                bog_data->animate_indx++;
+                if (!repeat && bog_data->animate_indx > range) {
+                /* terminate animation to the last object */
+                    bog_data->animate_indx = -1;
+                }
+
+            } else {
+                /* no animation for this button */
+                bog_data->animate_indx = -1;
+            }
+        }
+    }
+
+    if (!repeat && object_id_end < 0xfffe) {
+        object_id = object_id_end;
+    }
+
     object = _find_object(s, object_id);
 
     return object;
@@ -173,6 +215,14 @@
  * util
  */
 
+static int _areas_overlap(BOG_DATA *a, BOG_DATA *b)
+{
+    return !(a->x + a->w <= b->x        ||
+             a->x        >= b->x + b->w ||
+             a->y + a->h <= b->y        ||
+             a->y        >= b->y + b->h);
+}
+
 static int _is_button_enabled(GRAPHICS_CONTROLLER *gc, BD_IG_PAGE *page, unsigned button_id)
 {
     unsigned ii;
@@ -238,6 +288,53 @@
     return 0xffff;
 }
 
+static int _save_page_state(GRAPHICS_CONTROLLER *gc)
+{
+    if (!gc->bog_data) {
+        GC_ERROR("_save_page_state(): no bog data !\n");
+        return -1;
+    }
+
+    PG_DISPLAY_SET *s       = gc->igs;
+    BD_IG_PAGE     *page    = NULL;
+    unsigned        page_id = bd_psr_read(gc->regs, PSR_MENU_PAGE_ID);
+    unsigned        ii;
+
+    page = _find_page(&s->ics->interactive_composition, page_id);
+    if (!page) {
+        GC_ERROR("_save_page_state(): unknown page #%d (have %d pages)\n",
+              page_id, s->ics->interactive_composition.num_pages);
+        return -1;
+    }
+
+    /* copy enabled button state, clear draw state */
+
+    X_FREE(gc->saved_bog_data);
+    gc->saved_bog_data = calloc(page->num_bogs, sizeof(*gc->saved_bog_data));
+
+    for (ii = 0; ii < page->num_bogs; ii++) {
+        gc->saved_bog_data[ii].enabled_button = gc->bog_data[ii].enabled_button;
+        gc->saved_bog_data[ii].animate_indx   = gc->bog_data[ii].animate_indx >= 0 ? 0 : -1;
+    }
+
+    return 1;
+}
+
+static int _restore_page_state(GRAPHICS_CONTROLLER *gc)
+{
+    if (gc->saved_bog_data) {
+        if (gc->bog_data) {
+            GC_ERROR("_restore_page_state(): bog data already exists !\n");
+            X_FREE(gc->bog_data);
+        }
+        gc->bog_data       = gc->saved_bog_data;
+        gc->saved_bog_data = NULL;
+
+        return 1;
+    }
+    return -1;
+}
+
 static void _reset_page_state(GRAPHICS_CONTROLLER *gc)
 {
     PG_DISPLAY_SET *s       = gc->igs;
@@ -259,6 +356,68 @@
 
     for (ii = 0; ii < page->num_bogs; ii++) {
         gc->bog_data[ii].enabled_button = page->bog[ii].default_valid_button_id_ref;
+        gc->bog_data[ii].animate_indx   = 0;
+        gc->bog_data[ii].visible_object_id = -1;
+    }
+}
+
+/*
+ * overlay operations
+ */
+
+static void _open_osd(GRAPHICS_CONTROLLER *gc, int plane,
+                      unsigned width, unsigned height)
+{
+    if (gc->overlay_proc) {
+        const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_INIT,
+            .pts     = -1,
+            .plane   = plane,
+            .w       = width,
+            .h       = height,
+        };
+
+        gc->overlay_proc(gc->overlay_proc_handle, &ov);
+
+        if (plane == BD_OVERLAY_IG) {
+            gc->ig_open = 1;
+        } else {
+            gc->pg_open = 1;
+        }
+    }
+}
+
+static void _close_osd(GRAPHICS_CONTROLLER *gc, int plane)
+{
+    if (gc->overlay_proc) {
+        const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_CLOSE,
+            .pts     = -1,
+            .plane   = plane,
+        };
+
+        gc->overlay_proc(gc->overlay_proc_handle, &ov);
+    }
+
+    if (plane == BD_OVERLAY_IG) {
+        gc->ig_open = 0;
+        gc->ig_drawn = 0;
+    } else {
+        gc->pg_open = 0;
+        gc->pg_drawn = 0;
+    }
+}
+
+static void _flush_osd(GRAPHICS_CONTROLLER *gc, int plane, int64_t pts)
+{
+    if (gc->overlay_proc) {
+        const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_FLUSH,
+            .pts     = pts,
+            .plane   = plane,
+        };
+
+        gc->overlay_proc(gc->overlay_proc_handle, &ov);
     }
 }
 
@@ -266,16 +425,15 @@
                             uint16_t x, uint16_t y, uint16_t w, uint16_t h)
 {
     if (gc->overlay_proc) {
-        /* clear plane */
+        /* wipe area */
         const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_WIPE,
             .pts     = -1,
             .plane   = plane,
             .x       = x,
             .y       = y,
             .w       = w,
             .h       = h,
-            .palette = NULL,
-            .img     = NULL,
         };
 
         gc->overlay_proc(gc->overlay_proc_handle, &ov);
@@ -284,9 +442,18 @@
 
 static void _clear_osd(GRAPHICS_CONTROLLER *gc, int plane)
 {
-    _clear_osd_area(gc, plane, 0, 0, 1920, 1080);
+    if (gc->overlay_proc) {
+        /* clear plane */
+        const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_CLEAR,
+            .pts     = -1,
+            .plane   = plane,
+        };
+
+        gc->overlay_proc(gc->overlay_proc_handle, &ov);
+    }
 
-    if (plane) {
+    if (plane == BD_OVERLAY_IG) {
         gc->ig_drawn      = 0;
     } else {
         gc->pg_drawn      = 0;
@@ -297,28 +464,73 @@
 {
     if (gc->ig_drawn && bog_data->w && bog_data->h) {
 
-        _clear_osd_area(gc, 1, bog_data->x, bog_data->y, bog_data->w, bog_data->h);
+        _clear_osd_area(gc, BD_OVERLAY_IG, bog_data->x, bog_data->y, bog_data->w, bog_data->h);
 
         bog_data->x = bog_data->y = bog_data->w = bog_data->h = 0;
+        bog_data->visible_object_id = -1;
+
+        gc->ig_dirty = 1;
+    }
+}
+
+static void _render_object(GRAPHICS_CONTROLLER *gc,
+                           int64_t pts, unsigned plane,
+                           uint16_t x, uint16_t y,
+                           BD_PG_OBJECT *object,
+                           BD_PG_PALETTE *palette)
+{
+    if (gc->overlay_proc) {
+        BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_DRAW,
+            .pts     = pts,
+            .plane   = plane,
+            .x       = x,
+            .y       = y,
+            .w       = object->width,
+            .h       = object->height,
+            .palette = palette->entry,
+            .img     = object->img,
+        };
+
+        gc->overlay_proc(gc->overlay_proc_handle, &ov);
     }
 }
 
+/*
+ * page selection and IG effects
+ */
+
+static void _select_button(GRAPHICS_CONTROLLER *gc, uint32_t button_id)
+{
+    bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, button_id);
+    gc->auto_action_triggered = 0;
+}
+
 static void _select_page(GRAPHICS_CONTROLLER *gc, uint16_t page_id)
 {
     bd_psr_write(gc->regs, PSR_MENU_PAGE_ID, page_id);
-    _clear_osd(gc, 1);
+    if (gc->ig_open) {
+        _clear_osd(gc, BD_OVERLAY_IG);
+    }
     _reset_page_state(gc);
 
     uint16_t button_id = _find_selected_button_id(gc);
-    bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, button_id);
+    _select_button(gc, button_id);
+
+    gc->valid_mouse_position = 0;
 }
 
 static void _gc_reset(GRAPHICS_CONTROLLER *gc)
 {
-    _clear_osd(gc, 0);
-    _clear_osd(gc, 1);
+    if (gc->pg_open) {
+        _close_osd(gc, BD_OVERLAY_PG);
+    }
+    if (gc->ig_open) {
+        _close_osd(gc, BD_OVERLAY_IG);
+    }
 
     gc->popup_visible = 0;
+    gc->valid_mouse_position = 0;
 
     graphics_processor_free(&gc->igp);
     graphics_processor_free(&gc->pgp);
@@ -330,6 +542,44 @@
 }
 
 /*
+ * register hook
+ */
+static void _process_psr_event(void *handle, BD_PSR_EVENT *ev)
+{
+    GRAPHICS_CONTROLLER *gc = (GRAPHICS_CONTROLLER *)handle;
+
+    if (ev->ev_type == BD_PSR_SAVE) {
+        BD_DEBUG(DBG_GC, "PSR SAVE event\n");
+
+        /* save menu page state */
+        bd_mutex_lock(&gc->mutex);
+        _save_page_state(gc);
+        bd_mutex_unlock(&gc->mutex);
+
+        return;
+    }
+
+    if (ev->ev_type == BD_PSR_RESTORE) {
+        switch (ev->psr_idx) {
+
+            case PSR_SELECTED_BUTTON_ID:
+              return;
+
+            case PSR_MENU_PAGE_ID:
+                /* restore menus */
+                bd_mutex_lock(&gc->mutex);
+                _restore_page_state(gc);
+                bd_mutex_unlock(&gc->mutex);
+                return;
+
+            default:
+                /* others: ignore */
+                return;
+        }
+    }
+}
+
+/*
  * init / free
  */
 
@@ -344,6 +594,8 @@
 
     bd_mutex_init(&p->mutex);
 
+    bd_psr_register_cb(regs, _process_psr_event, p);
+
     return p;
 }
 
@@ -351,13 +603,17 @@
 {
     if (p && *p) {
 
-        _gc_reset(*p);
+        GRAPHICS_CONTROLLER *gc = *p;
+
+        bd_psr_unregister_cb(gc->regs, _process_psr_event, gc);
 
-        if ((*p)->overlay_proc) {
-            (*p)->overlay_proc((*p)->overlay_proc_handle, NULL);
+        _gc_reset(gc);
+
+        if (gc->overlay_proc) {
+            gc->overlay_proc(gc->overlay_proc_handle, NULL);
         }
 
-        bd_mutex_destroy(&(*p)->mutex);
+        bd_mutex_destroy(&gc->mutex);
 
         X_FREE(*p);
     }
@@ -367,11 +623,11 @@
  * graphics stream input
  */
 
-void gc_decode_ts(GRAPHICS_CONTROLLER *gc, uint16_t pid, uint8_t *block, unsigned num_blocks, int64_t stc)
+int gc_decode_ts(GRAPHICS_CONTROLLER *gc, uint16_t pid, uint8_t *block, unsigned num_blocks, int64_t stc)
 {
     if (!gc) {
         GC_TRACE("gc_decode_ts(): no graphics controller\n");
-        return;
+        return -1;
     }
 
     if (pid >= 0x1400 && pid < 0x1500) {
@@ -383,19 +639,22 @@
 
         bd_mutex_lock(&gc->mutex);
 
-        graphics_processor_decode_ts(gc->igp, &gc->igs,
-                                     pid, block, num_blocks,
-                                     stc);
-        if (!gc->igs || !gc->igs->complete) {
+        if (!graphics_processor_decode_ts(gc->igp, &gc->igs,
+                                          pid, block, num_blocks,
+                                          stc)) {
+            /* no new complete display set */
             bd_mutex_unlock(&gc->mutex);
-            return;
+            return 0;
         }
 
-        gc->popup_visible = 0;
-
-        _select_page(gc, 0);
+        if (!gc->igs || !gc->igs->complete) {
+            bd_mutex_unlock(&gc->mutex);
+            return 0;
+        }
 
         bd_mutex_unlock(&gc->mutex);
+
+        return 1;
     }
 
     else if (pid >= 0x1200 && pid < 0x1300) {
@@ -408,9 +667,13 @@
                                      stc);
 
         if (!gc->pgs || !gc->pgs->complete) {
-            return;
+            return 0;
         }
+
+        return 1;
     }
+
+    return -1;
 }
 
 /*
@@ -420,10 +683,7 @@
 static void _render_button(GRAPHICS_CONTROLLER *gc, BD_IG_BUTTON *button, BD_PG_PALETTE *palette,
                            int state, BOG_DATA *bog_data)
 {
-    BD_PG_OBJECT *object    = NULL;
-    BD_OVERLAY    ov;
-
-    object = _find_object_for_button(gc->igs, button, state);
+    BD_PG_OBJECT *object = _find_object_for_button(gc->igs, button, state, bog_data);
     if (!object) {
         GC_TRACE("_render_button(#%d): object (state %d) not found\n", button->id, state);
 
@@ -432,24 +692,58 @@
         return;
     }
 
-    ov.pts   = -1;
-    ov.plane = 1; /* IG */
+    /* object already rendered ? */
+    if (bog_data->visible_object_id == object->id &&
+        bog_data->x == button->x_pos && bog_data->y == button->y_pos &&
+        bog_data->w == object->width && bog_data->h == object->height) {
 
-    ov.x = bog_data->x = button->x_pos;
-    ov.y = bog_data->y = button->y_pos;
-    ov.w = bog_data->w = object->width;
-    ov.h = bog_data->h = object->height;
+        GC_TRACE("skipping already rendered button #%d (object #%d at %d,%d %dx%d)\n",
+                 button->id, object->id,
+                 button->x_pos, button->y_pos, object->width, object->height);
 
-    ov.img     = object->img;
-    ov.palette = palette->entry;
+        return;
+    }
 
-    if (gc->overlay_proc) {
-        gc->overlay_proc(gc->overlay_proc_handle, &ov);
-        gc->ig_drawn = 1;
+    /* new object is smaller than already drawn one ? -> need to render background */
+    if (bog_data->w > object->width ||
+        bog_data->h > object->height) {
+
+        /* make sure we won't wipe other buttons */
+        unsigned ii, skip = 0;
+        for (ii = 0; &gc->bog_data[ii] != bog_data; ii++) {
+            if (_areas_overlap(bog_data, &gc->bog_data[ii]))
+                skip = 1;
+            /* FIXME: clean non-overlapping area */
+        }
+
+        GC_TRACE("object size changed, %sclearing background at %d,%d %dx%d\n",
+                 skip ? " ** NOT ** " : "",
+                 bog_data->x, bog_data->y, bog_data->w, bog_data->h);
+
+        if (!skip) {
+            _clear_bog_area(gc, bog_data);
+        }
     }
+
+    GC_TRACE("render button #%d using object #%d at %d,%d %dx%d\n",
+             button->id, object->id,
+             button->x_pos, button->y_pos, object->width, object->height);
+
+    _render_object(gc, -1, BD_OVERLAY_IG,
+                   button->x_pos, button->y_pos,
+                   object, palette);
+
+    bog_data->x = button->x_pos;
+    bog_data->y = button->y_pos;
+    bog_data->w = object->width;
+    bog_data->h = object->height;
+    bog_data->visible_object_id = object->id;
+
+    gc->ig_drawn = 1;
+    gc->ig_dirty = 1;
 }
 
-static void _render_page(GRAPHICS_CONTROLLER *gc,
+static int _render_page(GRAPHICS_CONTROLLER *gc,
                          unsigned activated_button_id,
                          GC_NAV_CMDS *cmds)
 {
@@ -461,30 +755,40 @@
     unsigned        selected_button_id = bd_psr_read(gc->regs, PSR_SELECTED_BUTTON_ID);
 
     if (s->ics->interactive_composition.ui_model == IG_UI_MODEL_POPUP && !gc->popup_visible) {
-        GC_TRACE("_render_page(): popup menu not visible\n");
 
-        _clear_osd(gc, 1);
+        if (gc->ig_open) {
+            GC_TRACE("_render_page(): popup menu not visible\n");
+            _close_osd(gc, BD_OVERLAY_IG);
+            return 1;
+        }
 
-        return;
+        return 0;
     }
 
     page = _find_page(&s->ics->interactive_composition, page_id);
     if (!page) {
         GC_ERROR("_render_page: unknown page id %d (have %d pages)\n",
               page_id, s->ics->interactive_composition.num_pages);
-        return;
+        return -1;
     }
 
     palette = _find_palette(s, page->palette_id_ref);
     if (!palette) {
         GC_ERROR("_render_page: unknown palette id %d (have %d palettes)\n",
               page->palette_id_ref, s->num_palette);
-        return;
+        return -1;
     }
 
     GC_TRACE("rendering page #%d using palette #%d. page has %d bogs\n",
           page->id, page->palette_id_ref, page->num_bogs);
 
+    if (!gc->ig_open) {
+        _open_osd(gc, BD_OVERLAY_IG,
+                  s->ics->video_descriptor.video_width,
+                  s->ics->video_descriptor.video_height);
+    }
+
+
     for (ii = 0; ii < page->num_bogs; ii++) {
         BD_IG_BOG    *bog      = &page->bog[ii];
         unsigned      valid_id = gc->bog_data[ii].enabled_button;
@@ -495,18 +799,32 @@
         if (!button) {
             GC_TRACE("_render_page(): bog %d: button %d not found\n", ii, valid_id);
 
+            // render background
+            _clear_bog_area(gc, &gc->bog_data[ii]);
+
         } else if (button->id == activated_button_id) {
+            GC_TRACE("    button #%d activated\n", button->id);
+
             _render_button(gc, button, palette, BTN_ACTIVATED, &gc->bog_data[ii]);
 
         } else if (button->id == selected_button_id) {
 
-            _render_button(gc, button, palette, BTN_SELECTED, &gc->bog_data[ii]);
+            if (button->auto_action_flag && !gc->auto_action_triggered) {
+                if (cmds) {
+                    GC_TRACE("   auto-activate #%d\n", button->id);
+
+                    cmds->num_nav_cmds = button->num_nav_cmds;
+                    cmds->nav_cmds     = button->nav_cmds;
+
+                    gc->auto_action_triggered = 1;
+                } else {
+                    GC_ERROR("   auto-activate #%d not triggered (!cmds)\n", button->id);
+                }
 
-            bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, selected_button_id);
+                _render_button(gc, button, palette, BTN_ACTIVATED, &gc->bog_data[ii]);
 
-            if (button->auto_action_flag && cmds) {
-                cmds->num_nav_cmds = button->num_nav_cmds;
-                cmds->nav_cmds     = button->nav_cmds;
+            } else {
+                _render_button(gc, button, palette, BTN_SELECTED, &gc->bog_data[ii]);
             }
 
         } else {
@@ -514,6 +832,14 @@
 
         }
     }
+
+    if (gc->ig_dirty) {
+        _flush_osd(gc, BD_OVERLAY_IG, -1);
+        gc->ig_dirty = 0;
+        return 1;
+    }
+
+    return 0;
 }
 
 /*
@@ -614,7 +940,7 @@
     /* render page ? */
     if (new_btn_id != cur_btn_id || activated_btn_id >= 0) {
 
-        bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, new_btn_id);
+        _select_button(gc, new_btn_id);
 
         _render_page(gc, activated_btn_id, cmds);
 
@@ -698,10 +1024,10 @@
 
     if (button) {
         gc->bog_data[bog_idx].enabled_button = button_id;
-        bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, button_id);
+        _select_button(gc, button_id);
     }
 
-    _render_page(gc, 0xffff, NULL);
+    _render_page(gc, 0xffff, NULL); /* auto action not triggered yet */
 }
 
 static void _enable_button(GRAPHICS_CONTROLLER *gc, uint32_t button_id, unsigned enable)
@@ -757,14 +1083,14 @@
     /* special case: triggered only after enable button disables selected button */
     if (button_id & 0x10000) {
         button_id &= 0xffff;
-        bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, button_id);
+        _select_button(gc, button_id);
         GC_TRACE("_update_selected_button() -> #%d [last enabled]\n", button_id);
         return;
     }
 
     if (button_id == 0xffff) {
         button_id = _find_selected_button_id(gc);
-        bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, button_id);
+        _select_button(gc, button_id);
     }
 }
 
@@ -780,7 +1106,7 @@
     gc->valid_mouse_position = 0;
 
     if (!gc->ig_drawn) {
-        GC_ERROR("_mouse_move(): menu not visible\n");
+        GC_TRACE("_mouse_move(): menu not visible\n");
         return -1;
     }
 
@@ -803,7 +1129,7 @@
             continue;
 
         /* Check for SELECTED state object (button that can be selected) */
-        BD_PG_OBJECT *object = _find_object_for_button(s, button, BTN_SELECTED);
+        BD_PG_OBJECT *object = _find_object_for_button(s, button, BTN_SELECTED, NULL);
         if (!object)
             continue;
 
@@ -815,15 +1141,20 @@
 
         /* is button already selected? */
         if (button->id == cur_btn_id) {
-            return 0;
+            return 1;
         }
 
         new_btn_id = button->id;
+
+        if (cmds) {
+            cmds->sound_id_ref = button->selected_sound_id_ref;
+        }
+
         break;
     }
 
     if (new_btn_id != 0xffff) {
-        bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, new_btn_id);
+        _select_button(gc, new_btn_id);
 
         _render_page(gc, -1, cmds);
     }
@@ -839,6 +1170,7 @@
         cmds->num_nav_cmds = 0;
         cmds->nav_cmds     = NULL;
         cmds->sound_id_ref = -1;
+        cmds->status       = GC_STATUS_NONE;
     }
 
     if (!gc) {
@@ -855,6 +1187,7 @@
 
             bd_mutex_unlock(&gc->mutex);
             return 0;
+
         default:;
     }
 
@@ -894,6 +1227,11 @@
             /* fall thru */
 
         case GC_CTRL_NOP:
+            result = _render_page(gc, 0xffff, cmds);
+            break;
+
+        case GC_CTRL_INIT_MENU:
+            _select_page(gc, 0);
             _render_page(gc, 0xffff, cmds);
             break;
 
@@ -913,11 +1251,21 @@
         case GC_CTRL_MOUSE_MOVE:
             result = _mouse_move(gc, param >> 16, param & 0xffff, cmds);
             break;
+
         case GC_CTRL_RESET:
             /* already handled */
             break;
     }
 
+    if (cmds) {
+        if (gc->igs->ics->interactive_composition.ui_model == IG_UI_MODEL_POPUP) {
+            cmds->status |= GC_STATUS_POPUP;
+        }
+        if (gc->ig_drawn) {
+            cmds->status |= GC_STATUS_MENU_OPEN;
+        }
+    }
+
     bd_mutex_unlock(&gc->mutex);
 
     return result;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_controller.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_controller.h Changed

@@ -41,6 +41,7 @@
 
 typedef enum {
     /* */
+    GC_CTRL_INIT_MENU,       /* */
     GC_CTRL_NOP,             /* No input. Render page / run timers / run animations */
     GC_CTRL_RESET,           /* reset graphics controller */
 
@@ -57,6 +58,11 @@
 
 } gc_ctrl_e;
 
+
+#define GC_STATUS_NONE      0
+#define GC_STATUS_POPUP     1  /* popup menu loaded */
+#define GC_STATUS_MENU_OPEN 2  /* menu open */
+
 typedef struct {
     /* HDMV navigation command sequence */
     int   num_nav_cmds;
@@ -64,6 +70,9 @@
 
     /* Sound idx */
     int   sound_id_ref;
+
+    /* graphics status (none, menu, popup) */
+    uint32_t status; /* bit mask */
 } GC_NAV_CMDS;
 
 /*
@@ -75,11 +84,18 @@
 
 BD_PRIVATE void                 gc_free(GRAPHICS_CONTROLLER **p);
 
-/*
- * input stream (MPEG-TS IG stream)
+/**
+ *
+ *  Decode data from MPEG-TS input stream
+ *
+ * @param p  GRAPHICS_CONTROLLER object
+ * @param pid  mpeg-ts PID to decode (HDMV IG/PG stream)
+ * @param block  mpeg-ts data
+ * @param num_blocks  number of aligned units in data
+ * @param stc  current playback time
+ * @return <0 on error, 0 when not complete, >0 when complete
  */
-
-BD_PRIVATE void                 gc_decode_ts(GRAPHICS_CONTROLLER *p,
+BD_PRIVATE int                  gc_decode_ts(GRAPHICS_CONTROLLER *p,
                                              uint16_t pid,
                                              uint8_t *block, unsigned num_blocks,
                                              int64_t stc);

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_processor.c -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_processor.c Changed

@@ -358,9 +358,7 @@
         *s = calloc(1, sizeof(PG_DISPLAY_SET));
     }
 
-    (*s)->complete = 0;
-
-    while (*p && !(*s)->complete) {
+    while (*p) {
 
         /* time to decode next segment ? */
         if (stc >= 0 && (*p)->dts > stc) {
@@ -375,18 +373,30 @@
             return 0;
         }
 
+        if ((*p)->len <= 2) {
+            BD_DEBUG(DBG_DECODE, "segment too short, skipping (%d bytes)\n", (*p)->len);
+            pes_buffer_remove(p, *p);
+            continue;
+        }
+
+        /* decode segment */
+
         GP_TRACE("Decoding segment, dts %010"PRId64" pts %010"PRId64" len %d\n",
                  (*p)->dts, (*p)->pts, (*p)->len);
 
-        /* decode segment */
-        if ((*p)->len > 2) {
-            _decode_segment(*s, *p);
-        }
+        (*s)->complete = 0;
+
+        _decode_segment(*s, *p);
 
         pes_buffer_remove(p, *p);
+
+        if ((*s)->complete) {
+            return 1;
+        }
+
     }
 
-    return (*s)->complete;
+    return 0;
 }
 
 /*
@@ -437,5 +447,9 @@
         unit += 6144;
     }
 
-    return graphics_processor_decode_pes(s, &p->queue, stc);
+    if (p->queue) {
+        return graphics_processor_decode_pes(s, &p->queue, stc);
+    }
+
+    return 0;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_processor.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_processor.h Changed

@@ -61,23 +61,40 @@
 BD_PRIVATE GRAPHICS_PROCESSOR *graphics_processor_init(void);
 BD_PRIVATE void                graphics_processor_free(GRAPHICS_PROCESSOR **p);
 
-/*
- *  stc:      current STC
+/**
  *
- *  return:   0 : wait for more data
- *            1 : display set complete
+ *  Decode data from MPEG-PES input stream
  *
  *  Only segments where DTS <= STC are decoded.
  *  If STC < 0, all segments are immediately decoded to display set.
  *
  *  All decoded PES packets are removed from buffer.
+ *
+ * @param s  display set
+ * @param buf  data to decode
+ * @param stc  current playback time
+ * @return 1 if display set was completed, 0 otherwise
  */
-
 BD_PRIVATE int
 graphics_processor_decode_pes(PG_DISPLAY_SET **s,
                               struct pes_buffer_s **buf,
                               int64_t stc);
 
+/**
+ *
+ *  Decode data from MPEG-TS input stream
+ *
+ *  Segments are queued and decoded when DTS <= STC.
+ *  If STC < 0, all segments are immediately decoded to display set.
+ *
+ * @param p  GRAPHICS_PROCESSOR object
+ * @param s  display set
+ * @param pid  mpeg-ts PID to decode (HDMV IG/PG stream)
+ * @param unit  mpeg-ts data
+ * @param num_units  number of aligned units in data
+ * @param stc  current playback time
+ * @return 1 if display set was completed, 0 otherwise
+ */
 BD_PRIVATE int
 graphics_processor_decode_ts(GRAPHICS_PROCESSOR *p,
                              PG_DISPLAY_SET **s,

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/overlay.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/overlay.h Changed

@@ -22,6 +22,22 @@
 
 #include <stdint.h>
 
+#define BD_OVERLAY_INTERFACE_VERSION 2
+
+typedef enum {
+    BD_OVERLAY_PG = 0,  /* Presentation Graphics plane */
+    BD_OVERLAY_IG = 1,  /* Interactive Graphics plane (on top of PG plane) */
+} bd_overlay_plane_e;
+
+typedef enum {
+    BD_OVERLAY_INIT,    /* init overlay plane. Size of full plane in x,y,w,h */
+    BD_OVERLAY_CLEAR,   /* clear plane */
+    BD_OVERLAY_DRAW,    /* draw bitmap (x,y,w,h,img,palette) */
+    BD_OVERLAY_WIPE,    /* clear area (x,y,w,h) */
+    BD_OVERLAY_FLUSH,   /* all changes have been done, flush overlay to display at given pts */
+    BD_OVERLAY_CLOSE,   /* close overlay */
+} bd_overlay_cmd_e;
+
 typedef struct bd_pg_palette_entry_s {
     uint8_t Y;
     uint8_t Cr;
@@ -36,7 +52,8 @@
 
 typedef struct bd_overlay_s {
     int64_t  pts;
-    uint8_t  plane; /* 0 - PG, 1 - IG */
+    uint8_t  plane; /* bd_overlay_plane_e */
+    uint8_t  cmd;   /* bd_overlay_cmd_e */
 
     uint16_t x;
     uint16_t y;
@@ -45,6 +62,7 @@
 
     const BD_PG_PALETTE_ENTRY * palette;
     const BD_PG_RLE_ELEM      * img;
+
 } BD_OVERLAY;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/pg.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/pg_decode.c -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg_decode.c Changed

@@ -112,7 +112,15 @@
     int num_rle     = 0;
     int rle_size    = p->width * p->height / 4;
 
+    if (rle_size < 1)
+        rle_size = 1;
+
     p->img = realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
+    if (!p->img) {
+        BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): relloc(%zu) failed\n",
+                 rle_size * sizeof(BD_PG_RLE_ELEM));
+        return 0;
+    }
 
     while (!bb_eof(bb)) {
         uint32_t len   = 1;
@@ -140,10 +148,22 @@
 
         pixels_left -= len;
 
+        if (pixels_left < 0) {
+            BD_DEBUG(DBG_DECODE, "pg_decode_object(): too many pixels (%d)\n", -pixels_left);
+            return 0;
+        }
+
         num_rle++;
         if (num_rle >= rle_size) {
+            void *tmp = p->img;
             rle_size *= 2;
             p->img = realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
+            if (!p->img) {
+                BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): relloc(%zu) failed\n",
+                         rle_size * sizeof(BD_PG_RLE_ELEM));
+                X_FREE(tmp);
+                return 0;
+            }
         }
     }
 
@@ -151,10 +171,6 @@
         BD_DEBUG(DBG_DECODE, "pg_decode_object(): missing %d pixels\n", pixels_left);
         return 0;
     }
-    if (pixels_left < 0) {
-        BD_DEBUG(DBG_DECODE, "pg_decode_object(): too many pixels (%d)\n", -pixels_left);
-        return 0;
-    }
 
     return 1;
 }
@@ -218,6 +234,20 @@
     return 1;
 }
 
+int pg_decode_windows(BITBUFFER *bb, BD_PG_WINDOWS *p)
+{
+    unsigned ii;
+
+    p->num_windows = bb_read(bb, 8);
+    p->window = calloc(p->num_windows, sizeof(BD_PG_WINDOW));
+
+    for (ii = 0; ii < p->num_windows; ii++) {
+        pg_decode_window(bb, &p->window[ii]);
+    }
+
+    return 1;
+}
+
 /*
  * cleanup
  */
@@ -236,10 +266,10 @@
     }
 }
 
-void pg_free_window(BD_PG_WINDOW **p)
+void pg_clean_windows(BD_PG_WINDOWS *p)
 {
-    if (p && *p) {
-        X_FREE(*p);
+    if (p) {
+        X_FREE(p->window);
     }
 }
 
@@ -265,3 +295,11 @@
         X_FREE(*p);
     }
 }
+
+void pg_free_windows(BD_PG_WINDOWS **p)
+{
+    if (p && *p) {
+        pg_clean_windows(*p);
+        X_FREE(*p);
+    }
+}

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/pg_decode.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg_decode.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/hdmv/hdmv_vm.c -> libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/hdmv_vm.c Changed

@@ -56,6 +56,10 @@
     MOBJ_OBJECTS  *movie_objects; /* disc movie objects */
     MOBJ_OBJECT   *ig_object;     /* current object from IG stream */
 
+    /* object currently playing playlist */
+    MOBJ_OBJECT *playing_object;
+    int          playing_pc;
+
     /* suspended object */
     MOBJ_OBJECT *suspended_object;
     int          suspended_pc;
@@ -299,6 +303,38 @@
     return play_pl;
 }
 
+static int _suspend_for_play_pl(HDMV_VM *p)
+{
+    if (p->playing_object) {
+        BD_DEBUG(DBG_HDMV|DBG_CRIT, "_suspend_for_play_pl(): object already playing playlist !\n");
+        return -1;
+    }
+
+    p->playing_object = p->object;
+    p->playing_pc     = p->pc;
+
+    p->object = NULL;
+
+    return 0;
+}
+
+static int _resume_from_play_pl(HDMV_VM *p)
+{
+    if (!p->playing_object) {
+        BD_DEBUG(DBG_HDMV|DBG_CRIT, "_resume_from_play_pl(): object not playing playlist !\n");
+        return -1;
+    }
+
+    p->object = p->playing_object;
+    p->pc     = p->playing_pc + 1;
+
+    p->playing_object = NULL;
+
+    _free_ig_object(p);
+
+    return 0;
+}
+
 static void _suspend_object(HDMV_VM *p, int psr_backup)
 {
     BD_DEBUG(DBG_HDMV, "_suspend_object()\n");
@@ -312,10 +348,31 @@
         bd_psr_save_state(p->regs);
     }
 
-    p->suspended_object = p->object;
-    p->suspended_pc     = p->pc;
+    if (p->ig_object) {
+        if (!p->playing_object) {
+            BD_DEBUG(DBG_HDMV|DBG_CRIT, "_suspend_object: IG object tries to suspend, no playing object !\n");
+            return;
+        }
+        p->suspended_object = p->playing_object;
+        p->suspended_pc     = p->playing_pc;
+
+        p->playing_object = NULL;
+
+    } else {
+
+        if (p->playing_object) {
+            BD_DEBUG(DBG_HDMV|DBG_CRIT, "_suspend_object: Movie object tries to suspend, also playing object present !\n");
+            return;
+        }
+
+        p->suspended_object = p->object;
+        p->suspended_pc     = p->pc;
+
+    }
 
     p->object = NULL;
+
+    _free_ig_object(p);
 }
 
 static int _resume_object(HDMV_VM *p, int psr_restore)
@@ -325,19 +382,33 @@
         return -1;
     }
 
+    p->object = NULL;
+    p->playing_object = NULL;
     _free_ig_object(p);
 
-    p->object = p->suspended_object;
-    p->pc     = p->suspended_pc + 1;
-
     if (psr_restore) {
+        /* check if suspended in play_pl */
+        if (_suspended_at_play_pl(p)) {
+            BD_DEBUG(DBG_HDMV, "resuming playlist playback\n");
+            p->playing_object = p->suspended_object;
+            p->playing_pc     = p->suspended_pc;
+            p->suspended_object = NULL;
+            bd_psr_restore_state(p->regs);
+
+            return 0;
+        }
         bd_psr_restore_state(p->regs);
     }
 
-    BD_DEBUG(DBG_HDMV, "resuming object %p at %d\n", p->object, p->pc + 1);
+    p->object = p->suspended_object;
+    p->pc     = p->suspended_pc + 1;
 
     p->suspended_object = NULL;
 
+    BD_DEBUG(DBG_HDMV, "resuming object %p at %d\n", p->object, p->pc);
+
+    _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+
     return 0;
 }
 
@@ -370,8 +441,12 @@
 
     BD_DEBUG(DBG_HDMV, "_jump_object(): jumping to object %d\n", object);
 
+    _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+
     _free_ig_object(p);
 
+    p->playing_object = NULL;
+
     p->pc     = 0;
     p->object = &p->movie_objects->objects[object];
 
@@ -387,6 +462,7 @@
 
         /* discard suspended object */
         p->suspended_object = NULL;
+        p->playing_object = NULL;
         bd_psr_reset_backup_registers(p->regs);
 
         _queue_event(p, HDMV_EVENT_TITLE, title);
@@ -402,6 +478,7 @@
 {
     BD_DEBUG(DBG_HDMV, "_call_object(%d)\n", object);
 
+    _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
     _suspend_object(p, 1);
 
     return _jump_object(p, object);
@@ -415,6 +492,7 @@
         _suspend_object(p, 1);
 
         _queue_event(p, HDMV_EVENT_TITLE, title);
+
         return 0;
     }
 
@@ -448,7 +526,7 @@
 
     if (playlist >= 0) {
         _queue_event(p, HDMV_EVENT_PLAY_PL, playlist);
-        _suspend_object(p, 0);
+        _suspend_for_play_pl(p);
     }
 
     if (playitem >= 0) {
@@ -471,6 +549,7 @@
 
     BD_DEBUG(DBG_HDMV, "_play_stop()\n");
     _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+
     return 0;
 }
 
@@ -992,7 +1071,7 @@
 
     bd_mutex_lock(&p->mutex);
 
-    if ((o = p->object ? p->object : p->suspended_object)) {
+    if ((o = p->object ? p->object : (p->playing_object ? p->playing_object : p->suspended_object))) {
         mask |= o->menu_call_mask;
         mask |= o->title_search_mask << 1;
     }
@@ -1006,7 +1085,7 @@
     int result;
     bd_mutex_lock(&p->mutex);
 
-    result = _resume_object(p, 0);
+    result = _resume_from_play_pl(p);
 
     bd_mutex_unlock(&p->mutex);
     return result;
@@ -1020,19 +1099,21 @@
     if (p->object || p->ig_object) {
         BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): HDMV VM is still running\n");
 
-    } else if (!p->suspended_object) {
-        BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): No suspended object\n");
+    } else if (!p->playing_object) {
+        BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): No playing object\n");
 
-    } else if (!_suspended_at_play_pl(p)) {
-        BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): Object is not playing playlist\n");
-
-    } else if (!p->suspended_object->resume_intention_flag) {
+    } else if (!p->playing_object->resume_intention_flag) {
         BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): no resume intention flag\n");
 
-        p->suspended_object = NULL;
+        p->playing_object = NULL;
         result = 0;
 
     } else {
+        p->suspended_object = p->playing_object;
+        p->suspended_pc     = p->playing_pc;
+
+        p->playing_object = NULL;
+
         bd_psr_save_state(p->regs);
         result = 0;
     }
@@ -1061,6 +1142,13 @@
 
     while (--max_loop > 0) {
 
+        /* suspended ? */
+        if (!p->object) {
+            BD_DEBUG(DBG_HDMV, "hdmv_vm_run(): object suspended\n");
+            _get_event(p, ev);
+            return 0;
+        }
+
         /* terminated ? */
         if (p->pc >= p->object->num_cmds) {
             BD_DEBUG(DBG_HDMV, "terminated with PC=%d\n", p->pc);

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/hdmv/mobj_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_parse.c Changed

@@ -24,6 +24,7 @@
 #include "mobj_parse.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #define MOBJ_SIG1  ('M' << 24 | 'O' << 16 | 'B' << 8 | 'J')
 #define MOBJ_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
@@ -109,7 +110,7 @@
     }
 }
 
-MOBJ_OBJECTS *mobj_parse(const char *file_name)
+static MOBJ_OBJECTS *_mobj_parse(const char *file_name)
 {
     BITSTREAM     bs;
     BD_FILE_H    *fp;
@@ -134,6 +135,12 @@
     bs_seek_byte(&bs, 40);
 
     data_len = bs_read(&bs, 32);
+
+    if ((bs_end(&bs) - bs_pos(&bs))/8 < (off_t)data_len) {
+        BD_DEBUG(DBG_NAV | DBG_CRIT, "%s: invalid data_len %d !\n", file_name, data_len);
+        goto error;
+    }
+
     bs_skip(&bs, 32); /* reserved */
     num_objects = bs_read(&bs, 16);
 
@@ -156,3 +163,23 @@
     file_close(fp);
     return NULL;
 }
+
+MOBJ_OBJECTS *mobj_parse(const char *file_name)
+{
+    MOBJ_OBJECTS *objects = _mobj_parse(file_name);
+
+    /* if failed, try backup file */
+    if (!objects) {
+        int   len    = strlen(file_name);
+        char *backup = malloc(len + 8);
+
+        strcpy(backup, file_name);
+        strcpy(backup + len - 16, "BACKUP/MovieObject.bdmv");
+
+        objects = _mobj_parse(backup);
+
+        X_FREE(backup);
+    }
+
+    return objects;
+}

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/hdmv/mobj_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/register.c -> libbluray-0.2.3.tar.bz2/src/libbluray/register.c Changed

@@ -252,6 +252,22 @@
     memcpy(p->psr + 36, p->psr + 4,  sizeof(uint32_t) * 5);
     memcpy(p->psr + 42, p->psr + 10, sizeof(uint32_t) * 3);
 
+    /* generate save event */
+
+    if (p->num_cb) {
+        BD_PSR_EVENT ev = {
+            .ev_type = BD_PSR_SAVE,
+            .psr_idx = -1,
+            .old_val = 0,
+            .new_val = 0,
+        };
+
+        unsigned j;
+        for (j = 0; j < p->num_cb; j++) {
+            p->cb[j].cb(p->cb[j].handle, &ev);
+        }
+    }
+
     bd_psr_unlock(p);
 }
 
@@ -367,14 +383,11 @@
         return -1;
     }
 
-    if (p->psr[reg] == val) {
-        BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): no change in value\n", reg, val);
-        return 0;
-    }
-
     bd_psr_lock(p);
 
-    if (bd_psr_name[reg]) {
+    if (p->psr[reg] == val) {
+        BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): no change in value\n", reg, val);
+    } else if (bd_psr_name[reg]) {
         BD_DEBUG(DBG_BLURAY, "bd_psr_write(): PSR%-4d (%s) 0x%x -> 0x%x\n", reg, bd_psr_name[reg], p->psr[reg], val);
     } else {
         BD_DEBUG(DBG_BLURAY, "bd_psr_write(): PSR%-4d 0x%x -> 0x%x\n", reg, p->psr[reg], val);
@@ -384,7 +397,7 @@
         BD_PSR_EVENT ev;
         unsigned i;
 
-        ev.ev_type = BD_PSR_CHANGE;
+        ev.ev_type = p->psr[reg] == val ? BD_PSR_WRITE : BD_PSR_CHANGE;
         ev.psr_idx = reg;
         ev.old_val = p->psr[reg];
         ev.new_val = val;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/register.h -> libbluray-0.2.3.tar.bz2/src/libbluray/register.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/util/bits.h -> libbluray-0.2.3.tar.bz2/src/util/bits.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/util/mutex.h -> libbluray-0.2.3.tar.bz2/src/util/mutex.h Changed

libogg-1.3.0.tar.gz Deleted

libsamplerate-0.1.4.tar.gz Deleted

libtheora-1.1.0.tar.bz2 Deleted

libvorbis-aotuv_b6.03.tar.bz2 Deleted

libxml2-2.7.7.tar.gz Deleted

x264-r2146-bcd41db.tar.gz Deleted

x264-r2273-b3065e6.tar.gz Added

yasm-1.1.0.tar.gz/Makefile.am -> yasm-1.2.0.tar.gz/Makefile.am Changed

@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2299 2010-03-04 05:08:00Z peter $
-
 SUBDIRS = po .
 
 ACLOCAL_AMFLAGS = -I m4
@@ -33,6 +31,8 @@
 
 # libyasm-stdint.h doesn't clean up after itself?
 CONFIG_CLEAN_FILES = libyasm-stdint.h
+CONFIG_CLEAN_FILES += YASM-VERSION-FILE
+CONFIG_CLEAN_FILES += YASM-VERSION.h
 
 EXTRA_DIST += tools/Makefile.inc
 EXTRA_DIST += libyasm/Makefile.inc
@@ -57,6 +57,7 @@
 EXTRA_DIST += GNU_GPL-2.0
 EXTRA_DIST += GNU_LGPL-2.0
 EXTRA_DIST += splint.sh
+EXTRA_DIST += YASM-VERSION-GEN.sh
 EXTRA_DIST += Mkfiles/Makefile.flat
 EXTRA_DIST += Mkfiles/Makefile.dj
 EXTRA_DIST += Mkfiles/dj/config.h
@@ -89,6 +90,7 @@
 EXTRA_DIST += Mkfiles/vc10/crt_secure_no_deprecate.props
 EXTRA_DIST += Mkfiles/vc10/crt_secure_no_deprecate.vsprops
 EXTRA_DIST += Mkfiles/vc10/libyasm-stdint.h
+EXTRA_DIST += Mkfiles/vc10/out_copy_rename.bat
 EXTRA_DIST += Mkfiles/vc10/readme.vc10.txt
 EXTRA_DIST += Mkfiles/vc10/vsyasm.props
 EXTRA_DIST += Mkfiles/vc10/vsyasm.targets
@@ -124,6 +126,15 @@
 # Until this gets fixed in automake
 DISTCLEANFILES += libyasm/stamp-h libyasm/stamp-h[0-9]*
 
+dist-hook: YASM-VERSION-FILE YASM-VERSION.h
+	cp YASM-VERSION-FILE $(distdir)/version
+	cp YASM-VERSION.h $(distdir)/Mkfiles/dj/
+	cp YASM-VERSION.h $(distdir)/Mkfiles/vc9/
+	cp YASM-VERSION.h $(distdir)/Mkfiles/vc10/
+
+YASM-VERSION-FILE: $(top_srcdir)/YASM-VERSION-GEN.sh
+	$(top_srcdir)/YASM-VERSION-GEN.sh
+
 distclean-local:
 	-rm -rf results
 if HAVE_PYTHON

yasm-1.1.0.tar.gz/Makefile.in -> yasm-1.2.0.tar.gz/Makefile.in Changed

@@ -15,184 +15,24 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 2299 2010-03-04 05:08:00Z peter $
-
-# $Id: Makefile.inc 2084 2008-05-09 07:08:17Z peter $
-
-# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $
-
 # These utility programs have to be built for BUILD host in cross-build.
 # This makes things rather non-standard automake
 
-# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $
-
 # These utility programs have to be built for BUILD host in cross-build.
 # This makes things rather non-standard automake
 
-# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $
-
 # These utility programs have to be built for BUILD host in cross-build.
 # This makes things rather non-standard automake
 
-# $Id: Makefile.inc 2256 2010-01-01 20:55:07Z peter $
-
-# $Id: Makefile.inc 1951 2007-09-14 05:19:10Z peter $
-
-# $Id: Makefile.inc 1598 2006-08-10 04:02:59Z peter $
-
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $
-
-# $Id: Makefile.inc 2339 2010-07-23 03:35:21Z peter $
-
-# $Id: Makefile.inc 2239 2009-12-01 03:33:03Z peter $
-
-# $Id: Makefile.inc 2238 2009-11-30 03:43:10Z peter $
-
-# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $
-
-# $Id: Makefile.inc 1928 2007-09-07 22:03:34Z peter $
-
-# $Id: Makefile.inc 1152 2004-10-02 06:18:30Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 2279 2010-01-19 07:57:43Z peter $
-
-# $Id: Makefile.inc 2169 2009-01-02 20:46:57Z peter $
-
-# $Id$
-
-# $Id: Makefile.inc 2278 2010-01-19 07:28:08Z peter $
-
-# $Id: Makefile.inc 2323 2010-05-16 03:37:00Z peter $
-
-# $Id: Makefile.inc 1137 2004-09-04 01:24:57Z peter $
-
-# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $
-
-# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $
-
-# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $
-
-# $Id: Makefile.inc 2243 2009-12-23 06:45:17Z peter $
-
-# $Id$
-
-# $Id$
-
-# $Id: Makefile.inc 2130 2008-10-07 05:38:11Z peter $
-
-# $Id: Makefile.inc 2311 2010-04-08 03:32:04Z peter $
-
-# $Id: Makefile.inc 2172 2009-01-27 06:38:14Z peter $
-
-# $Id: Makefile.inc 2176 2009-03-04 07:39:02Z peter $
-
 # Makefile for cpp module.
 # Copied from raw preprocessor module.
 
-# $Id: Makefile.inc 2268 2010-01-07 06:55:03Z peter $
-
-# $Id: Makefile.inc 2243 2009-12-23 06:45:17Z peter $
-
 #TESTS += modules/preprocs/gas/tests/rawpp_test.sh
 
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 1428 2006-03-27 02:15:19Z peter $
-
-# $Id: Makefile.inc 1378 2006-02-12 01:27:39Z peter $
-
-# $Id: Makefile.inc 1350 2006-01-29 21:11:03Z peter $
-
-# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $
-
-# $Id: Makefile.inc 1617 2006-09-16 05:43:41Z peter $
-
-# $Id: Makefile.inc 1350 2006-01-29 21:11:03Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id$
-
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 2130 2008-10-07 05:38:11Z peter $
-
-# $Id: Makefile.inc 2010 2007-11-14 08:33:32Z peter $
-
-# $Id: Makefile.inc 2010 2007-11-14 08:33:32Z peter $
-
-# $Id: Makefile.inc 1252 2005-09-28 05:50:51Z peter $
-
-# $Id: Makefile.inc 2036 2008-02-09 04:06:47Z peter $
-
-# $Id: Makefile.inc 2126 2008-10-03 08:13:00Z peter $
-
-# $Id: Makefile.inc 2206 2009-07-21 06:48:42Z peter $
-
-# $Id: Makefile.inc 1168 2004-10-31 01:07:52Z peter $
-
-# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $
-
-# $Id: Makefile.inc 1617 2006-09-16 05:43:41Z peter $
-
-# $Id: Makefile.inc 1732 2007-01-13 19:34:04Z peter $
-
-# $Id: Makefile.inc 1777 2007-02-19 08:21:17Z peter $
-
-# $Id: Makefile.inc 1782 2007-02-21 06:45:39Z peter $
-
-# $Id: Makefile.inc 2108 2008-06-05 08:48:21Z peter $
-
-# $Id: Makefile.inc 2345 2010-08-01 01:27:40Z peter $
-
-# $Id: Makefile.inc 2108 2008-06-05 08:48:21Z peter $
-
-# $Id: Makefile.inc 1653 2006-10-17 06:58:41Z peter $
-
-# $Id: Makefile.inc 1653 2006-10-17 06:58:41Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
 # Assume objfmt_coff is included
 
-# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $
-
-# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $
-
-# $Id: Makefile.inc 1331 2006-01-15 22:48:55Z peter $
-
 # Assume objfmt_coff is included
 
-# $Id: Makefile.inc 2120 2008-09-04 04:45:30Z peter $
-
-# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $
-
-# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $
-
-# $Id: Makefile.inc 2233 2009-10-31 21:45:55Z peter $
-
-# $Id: Makefile.inc 2284 2010-02-06 09:27:32Z peter $
-
-# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $
-
-# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $
-
-# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $
-
 
 
 VPATH = @srcdir@
@@ -228,6 +68,7 @@
 	modules/preprocs/tasm/tests/tasmpp_test.sh \
 	modules/preprocs/nasm/tests/nasmpp_test.sh \
 	modules/preprocs/raw/tests/rawpp_test.sh \
+	modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh \
 	modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh \
 	modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh \
 	modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh \
@@ -280,6 +121,7 @@
 	$(srcdir)/modules/dbgfmts/codeview/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc \
+	$(srcdir)/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc \
@@ -601,6 +443,7 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
@@ -801,10 +644,16 @@
 	modules/arch/x86/tests/avx.asm modules/arch/x86/tests/avx.hex \
 	modules/arch/x86/tests/avx16.asm \
 	modules/arch/x86/tests/avx16.hex \
+	modules/arch/x86/tests/avx2.asm \
+	modules/arch/x86/tests/avx2.hex \
 	modules/arch/x86/tests/avxcc.asm \
 	modules/arch/x86/tests/avxcc.hex \
 	modules/arch/x86/tests/bittest.asm \
 	modules/arch/x86/tests/bittest.hex \
+	modules/arch/x86/tests/bmi1.asm \
+	modules/arch/x86/tests/bmi1.hex \
+	modules/arch/x86/tests/bmi2.asm \
+	modules/arch/x86/tests/bmi2.hex \
 	modules/arch/x86/tests/bswap64.asm \
 	modules/arch/x86/tests/bswap64.hex \
 	modules/arch/x86/tests/clmul.asm \
@@ -854,6 +703,8 @@
 	modules/arch/x86/tests/imm64.asm \
 	modules/arch/x86/tests/imm64.errwarn \
 	modules/arch/x86/tests/imm64.hex \
+	modules/arch/x86/tests/invpcid.asm \
+	modules/arch/x86/tests/invpcid.hex \
 	modules/arch/x86/tests/iret.asm \
 	modules/arch/x86/tests/iret.hex \
 	modules/arch/x86/tests/jmp64-1.asm \
@@ -870,11 +721,17 @@
 	modules/arch/x86/tests/jmp64-6.hex \
 	modules/arch/x86/tests/jmpfar.asm \
 	modules/arch/x86/tests/jmpfar.hex \
+	modules/arch/x86/tests/larlsl.asm \
+	modules/arch/x86/tests/larlsl.hex \
 	modules/arch/x86/tests/lds.asm modules/arch/x86/tests/lds.hex \
+	modules/arch/x86/tests/lfs64.asm \
+	modules/arch/x86/tests/lfs64.hex \
 	modules/arch/x86/tests/loopadsz.asm \
 	modules/arch/x86/tests/loopadsz.hex \
 	modules/arch/x86/tests/lsahf.asm \
 	modules/arch/x86/tests/lsahf.hex \
+	modules/arch/x86/tests/lzcnt.asm \
+	modules/arch/x86/tests/lzcnt.hex \
 	modules/arch/x86/tests/mem64-err.asm \
 	modules/arch/x86/tests/mem64-err.errwarn \
 	modules/arch/x86/tests/mem64.asm \
@@ -948,6 +805,8 @@
 	modules/arch/x86/tests/segoff-err.errwarn \
 	modules/arch/x86/tests/shift.asm \
 	modules/arch/x86/tests/shift.hex \
+	modules/arch/x86/tests/shift64.asm \
+	modules/arch/x86/tests/shift64.hex \
 	modules/arch/x86/tests/simd-1.asm \
 	modules/arch/x86/tests/simd-1.hex \
 	modules/arch/x86/tests/simd-2.asm \
@@ -988,6 +847,12 @@
 	modules/arch/x86/tests/vmx.asm modules/arch/x86/tests/vmx.hex \
 	modules/arch/x86/tests/vmx-err.asm \
 	modules/arch/x86/tests/vmx-err.errwarn \
+	modules/arch/x86/tests/vsib.asm \
+	modules/arch/x86/tests/vsib.hex \
+	modules/arch/x86/tests/vsib-err.asm \
+	modules/arch/x86/tests/vsib-err.errwarn \
+	modules/arch/x86/tests/vsib2-err.asm \
+	modules/arch/x86/tests/vsib2-err.errwarn \
 	modules/arch/x86/tests/x86label.asm \
 	modules/arch/x86/tests/x86label.hex \
 	modules/arch/x86/tests/xchg64.asm \
@@ -1021,6 +886,8 @@
 	modules/arch/x86/tests/gas32/gas-movdq32.hex \
 	modules/arch/x86/tests/gas32/gas-movsd.asm \
 	modules/arch/x86/tests/gas32/gas-movsd.hex \
+	modules/arch/x86/tests/gas32/gas-pop.asm \
+	modules/arch/x86/tests/gas32/gas-pop.hex \
 	modules/arch/x86/tests/gas32/gas32-jmpcall.asm \
 	modules/arch/x86/tests/gas32/gas32-jmpcall.hex \
 	modules/arch/x86/tests/gas64/x86_gas64_test.sh \
@@ -1128,6 +995,8 @@
 	modules/parsers/gas/tests/bin/gas-macro.hex \
 	modules/parsers/gas/tests/bin/gas-set.asm \
 	modules/parsers/gas/tests/bin/gas-set.hex \
+	modules/parsers/gas/tests/bin/gas-str.asm \
+	modules/parsers/gas/tests/bin/gas-str.hex \
 	modules/parsers/gas/tests/bin/rept-err.asm \
 	modules/parsers/gas/tests/bin/rept-err.errwarn \
 	modules/parsers/gas/tests/bin/reptempty.asm \
@@ -1185,6 +1054,8 @@
 	modules/parsers/nasm/tests/strucalign.hex \
 	modules/parsers/nasm/tests/struczero.asm \
 	modules/parsers/nasm/tests/struczero.hex \
+	modules/parsers/nasm/tests/strucbase.asm \
+	modules/parsers/nasm/tests/strucbase.hex \
 	modules/parsers/nasm/tests/syntax-err.asm \
 	modules/parsers/nasm/tests/syntax-err.errwarn \
 	modules/parsers/nasm/tests/uscore.asm \
@@ -1283,9 +1154,13 @@
 	modules/dbgfmts/stabs/Makefile.inc \
 	modules/dbgfmts/codeview/cv8.txt \
 	modules/dbgfmts/dwarf2/tests/Makefile.inc \
+	modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc \
 	modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc \
 	modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc \
 	modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc \
+	modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh \
+	modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.asm \
+	modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex \
 	modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh \
 	modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.asm \
 	modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn \
@@ -1448,6 +1323,8 @@
 	modules/objfmts/elf/tests/amd64/elfso64.hex \
 	modules/objfmts/elf/tests/amd64/gotpcrel.asm \
 	modules/objfmts/elf/tests/amd64/gotpcrel.hex \
+	modules/objfmts/elf/tests/amd64/multiplefixup.asm \
+	modules/objfmts/elf/tests/amd64/multiplefixup.hex \
 	modules/objfmts/elf/tests/gas32/elf_gas32_test.sh \
 	modules/objfmts/elf/tests/gas32/elf_gas32_ssym.asm \
 	modules/objfmts/elf/tests/gas32/elf_gas32_ssym.hex \
@@ -1493,6 +1370,8 @@
 	modules/objfmts/macho/tests/nasm32/machotest.hex \
 	modules/objfmts/macho/tests/nasm32/macho-reloc.asm \
 	modules/objfmts/macho/tests/nasm32/macho-reloc.hex \
+	modules/objfmts/macho/tests/nasm32/macho32-pext.asm \
+	modules/objfmts/macho/tests/nasm32/macho32-pext.hex \
 	modules/objfmts/macho/tests/nasm32/macho32-pic.asm \
 	modules/objfmts/macho/tests/nasm32/macho32-pic.hex \
 	modules/objfmts/macho/tests/nasm32/macho32-sect.asm \
@@ -1549,6 +1428,10 @@
 	modules/objfmts/win32/tests/gas/win32_gas_test.sh \
 	modules/objfmts/win32/tests/gas/win32at.asm \
 	modules/objfmts/win32/tests/gas/win32at.hex \
+	modules/objfmts/win32/tests/gas/win32def.asm \
+	modules/objfmts/win32/tests/gas/win32def.hex \
+	modules/objfmts/win32/tests/gas/win32secrel32.asm \
+	modules/objfmts/win32/tests/gas/win32secrel32.hex \
 	modules/objfmts/win64/tests/Makefile.inc \
 	modules/objfmts/win64/tests/win64_test.sh \
 	modules/objfmts/win64/tests/sce1.asm \
@@ -1577,6 +1460,8 @@
 	modules/objfmts/win64/tests/win64-dataref2.asm \
 	modules/objfmts/win64/tests/win64-dataref2.hex \
 	modules/objfmts/win64/tests/win64-dataref2.masm \
+	modules/objfmts/win64/tests/win64-imagebase.hex \
+	modules/objfmts/win64/tests/win64-imagebase.asm \
 	modules/objfmts/win64/tests/gas/Makefile.inc \
 	modules/objfmts/win64/tests/gas/win64_gas_test.sh \
 	modules/objfmts/win64/tests/gas/win64-gas-sce.asm \
@@ -1610,6 +1495,8 @@
 	libyasm/tests/emptydata.hex libyasm/tests/equ-expand.asm \
 	libyasm/tests/equ-expand.hex libyasm/tests/expr-fold-level.asm \
 	libyasm/tests/expr-fold-level.hex \
+	libyasm/tests/expr-simplify-identity.asm \
+	libyasm/tests/expr-simplify-identity.hex \
 	libyasm/tests/expr-wide-ident.asm \
 	libyasm/tests/expr-wide-ident.hex libyasm/tests/externdef.asm \
 	libyasm/tests/externdef.errwarn libyasm/tests/externdef.hex \
@@ -1663,8 +1550,9 @@
 	m4/lib-prefix.m4 m4/longlong.m4 m4/progtest.m4 m4/stdint_h.m4 \
 	m4/uintmax_t.m4 m4/pythonhead.m4 m4/cython.m4 out_test.sh \
 	Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0 splint.sh \
-	Mkfiles/Makefile.flat Mkfiles/Makefile.dj Mkfiles/dj/config.h \
-	Mkfiles/dj/libyasm-stdint.h Mkfiles/vc9/config.h \
+	YASM-VERSION-GEN.sh Mkfiles/Makefile.flat Mkfiles/Makefile.dj \
+	Mkfiles/dj/config.h Mkfiles/dj/libyasm-stdint.h \
+	Mkfiles/vc9/config.h \
 	Mkfiles/vc9/crt_secure_no_deprecate.vsprops \
 	Mkfiles/vc9/libyasm-stdint.h Mkfiles/vc9/readme.vc9.txt \
 	Mkfiles/vc9/vc98_swap.py Mkfiles/vc9/vsyasm.vcproj \
@@ -1685,11 +1573,12 @@
 	Mkfiles/vc10/config.h \
 	Mkfiles/vc10/crt_secure_no_deprecate.props \
 	Mkfiles/vc10/crt_secure_no_deprecate.vsprops \
-	Mkfiles/vc10/libyasm-stdint.h Mkfiles/vc10/readme.vc10.txt \
-	Mkfiles/vc10/vsyasm.props Mkfiles/vc10/vsyasm.targets \
-	Mkfiles/vc10/vsyasm.vcxproj Mkfiles/vc10/vsyasm.xml \
-	Mkfiles/vc10/yasm.sln Mkfiles/vc10/yasm.vcxproj \
-	Mkfiles/vc10/yasm.vcxproj.filters Mkfiles/vc10/ytasm.vcxproj \
+	Mkfiles/vc10/libyasm-stdint.h Mkfiles/vc10/out_copy_rename.bat \
+	Mkfiles/vc10/readme.vc10.txt Mkfiles/vc10/vsyasm.props \
+	Mkfiles/vc10/vsyasm.targets Mkfiles/vc10/vsyasm.vcxproj \
+	Mkfiles/vc10/vsyasm.xml Mkfiles/vc10/yasm.sln \
+	Mkfiles/vc10/yasm.vcxproj Mkfiles/vc10/yasm.vcxproj.filters \
+	Mkfiles/vc10/ytasm.vcxproj \
 	Mkfiles/vc10/genmacro/genmacro.vcxproj \
 	Mkfiles/vc10/genmacro/genmacro.vcxproj.filters \
 	Mkfiles/vc10/genmacro/run.bat \
@@ -1714,7 +1603,7 @@
 	Mkfiles/vc10/re2c/run.bat genstring.c
 
 # libyasm-stdint.h doesn't clean up after itself?
-CONFIG_CLEAN_FILES = libyasm-stdint.h
+CONFIG_CLEAN_FILES = libyasm-stdint.h YASM-VERSION-FILE YASM-VERSION.h
 re2c_SOURCES = 
 re2c_LDADD = re2c-main.$(OBJEXT) re2c-code.$(OBJEXT) \
 	re2c-dfa.$(OBJEXT) re2c-parser.$(OBJEXT) \
@@ -1851,7 +1740,7 @@
 .SUFFIXES: .gperf .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/tools/Makefile.inc $(srcdir)/tools/re2c/Makefile.inc $(srcdir)/tools/genmacro/Makefile.inc $(srcdir)/tools/genperf/Makefile.inc $(srcdir)/tools/python-yasm/Makefile.inc $(srcdir)/tools/python-yasm/tests/Makefile.inc $(srcdir)/modules/Makefile.inc $(srcdir)/modules/arch/Makefile.inc $(srcdir)/modules/arch/x86/Makefile.inc $(srcdir)/modules/arch/x86/tests/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas32/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas64/Makefile.inc $(srcdir)/modules/arch/lc3b/Makefile.inc $(srcdir)/modules/arch/lc3b/tests/Makefile.inc $(srcdir)/modules/listfmts/Makefile.inc $(srcdir)/modules/listfmts/nasm/Makefile.inc $(srcdir)/modules/parsers/Makefile.inc $(srcdir)/modules/parsers/gas/Makefile.inc $(srcdir)/modules/parsers/gas/tests/Makefile.inc $(srcdir)/modules/parsers/gas/tests/bin/Makefile.inc $(srcdir)/modules/parsers/nasm/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/worphan/Makefile.inc $(srcdir)/modules/parsers/tasm/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/exe/Makefile.inc $(srcdir)/modules/preprocs/Makefile.inc $(srcdir)/modules/preprocs/tasm/Makefile.inc $(srcdir)/modules/preprocs/tasm/tests/Makefile.inc $(srcdir)/modules/preprocs/nasm/Makefile.inc $(srcdir)/modules/preprocs/nasm/tests/Makefile.inc $(srcdir)/modules/preprocs/raw/Makefile.inc $(srcdir)/modules/preprocs/raw/tests/Makefile.inc $(srcdir)/modules/preprocs/cpp/Makefile.inc $(srcdir)/modules/preprocs/gas/Makefile.inc $(srcdir)/modules/preprocs/gas/tests/Makefile.inc $(srcdir)/modules/dbgfmts/Makefile.inc $(srcdir)/modules/dbgfmts/codeview/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc $(srcdir)/modules/dbgfmts/null/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/tests/Makefile.inc $(srcdir)/modules/objfmts/Makefile.inc $(srcdir)/modules/objfmts/dbg/Makefile.inc $(srcdir)/modules/objfmts/bin/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/multisect/Makefile.inc $(srcdir)/modules/objfmts/elf/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/amd64/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/coff/Makefile.inc $(srcdir)/modules/objfmts/coff/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm64/Makefile.inc $(srcdir)/modules/objfmts/rdf/Makefile.inc $(srcdir)/modules/objfmts/rdf/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/win64/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/xdf/Makefile.inc $(srcdir)/modules/objfmts/xdf/tests/Makefile.inc $(srcdir)/libyasm/Makefile.inc $(srcdir)/libyasm/tests/Makefile.inc $(srcdir)/frontends/Makefile.inc $(srcdir)/frontends/yasm/Makefile.inc $(srcdir)/frontends/tasm/Makefile.inc $(srcdir)/frontends/vsyasm/Makefile.inc $(srcdir)/m4/Makefile.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/tools/Makefile.inc $(srcdir)/tools/re2c/Makefile.inc $(srcdir)/tools/genmacro/Makefile.inc $(srcdir)/tools/genperf/Makefile.inc $(srcdir)/tools/python-yasm/Makefile.inc $(srcdir)/tools/python-yasm/tests/Makefile.inc $(srcdir)/modules/Makefile.inc $(srcdir)/modules/arch/Makefile.inc $(srcdir)/modules/arch/x86/Makefile.inc $(srcdir)/modules/arch/x86/tests/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas32/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas64/Makefile.inc $(srcdir)/modules/arch/lc3b/Makefile.inc $(srcdir)/modules/arch/lc3b/tests/Makefile.inc $(srcdir)/modules/listfmts/Makefile.inc $(srcdir)/modules/listfmts/nasm/Makefile.inc $(srcdir)/modules/parsers/Makefile.inc $(srcdir)/modules/parsers/gas/Makefile.inc $(srcdir)/modules/parsers/gas/tests/Makefile.inc $(srcdir)/modules/parsers/gas/tests/bin/Makefile.inc $(srcdir)/modules/parsers/nasm/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/worphan/Makefile.inc $(srcdir)/modules/parsers/tasm/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/exe/Makefile.inc $(srcdir)/modules/preprocs/Makefile.inc $(srcdir)/modules/preprocs/tasm/Makefile.inc $(srcdir)/modules/preprocs/tasm/tests/Makefile.inc $(srcdir)/modules/preprocs/nasm/Makefile.inc $(srcdir)/modules/preprocs/nasm/tests/Makefile.inc $(srcdir)/modules/preprocs/raw/Makefile.inc $(srcdir)/modules/preprocs/raw/tests/Makefile.inc $(srcdir)/modules/preprocs/cpp/Makefile.inc $(srcdir)/modules/preprocs/gas/Makefile.inc $(srcdir)/modules/preprocs/gas/tests/Makefile.inc $(srcdir)/modules/dbgfmts/Makefile.inc $(srcdir)/modules/dbgfmts/codeview/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc $(srcdir)/modules/dbgfmts/null/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/tests/Makefile.inc $(srcdir)/modules/objfmts/Makefile.inc $(srcdir)/modules/objfmts/dbg/Makefile.inc $(srcdir)/modules/objfmts/bin/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/multisect/Makefile.inc $(srcdir)/modules/objfmts/elf/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/amd64/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/coff/Makefile.inc $(srcdir)/modules/objfmts/coff/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm64/Makefile.inc $(srcdir)/modules/objfmts/rdf/Makefile.inc $(srcdir)/modules/objfmts/rdf/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/win64/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/xdf/Makefile.inc $(srcdir)/modules/objfmts/xdf/tests/Makefile.inc $(srcdir)/libyasm/Makefile.inc $(srcdir)/libyasm/tests/Makefile.inc $(srcdir)/frontends/Makefile.inc $(srcdir)/frontends/yasm/Makefile.inc $(srcdir)/frontends/tasm/Makefile.inc $(srcdir)/frontends/vsyasm/Makefile.inc $(srcdir)/m4/Makefile.inc $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -3737,6 +3626,9 @@
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -3982,8 +3874,8 @@
 	all all-am all-local am--refresh check check-TESTS check-am \
 	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 	clean-libLIBRARIES clean-noinstPROGRAMS ctags ctags-recursive \
-	dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
+	dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-local distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -4198,6 +4090,15 @@
 
 $(srcdir)/frontends/vsyasm/vsyasm.c: license.c
 
+dist-hook: YASM-VERSION-FILE YASM-VERSION.h
+	cp YASM-VERSION-FILE $(distdir)/version
+	cp YASM-VERSION.h $(distdir)/Mkfiles/dj/
+	cp YASM-VERSION.h $(distdir)/Mkfiles/vc9/
+	cp YASM-VERSION.h $(distdir)/Mkfiles/vc10/
+
+YASM-VERSION-FILE: $(top_srcdir)/YASM-VERSION-GEN.sh
+	$(top_srcdir)/YASM-VERSION-GEN.sh
+
 distclean-local:
 	-rm -rf results
 @HAVE_PYTHON_TRUE@	-rm -rf build

yasm-1.1.0.tar.gz/Mkfiles/Makefile.dj -> yasm-1.2.0.tar.gz/Mkfiles/Makefile.dj Changed

yasm-1.1.0.tar.gz/Mkfiles/Makefile.flat -> yasm-1.2.0.tar.gz/Mkfiles/Makefile.flat Changed

yasm-1.2.0.tar.gz/Mkfiles/dj/YASM-VERSION.h Added

yasm-1.1.0.tar.gz/Mkfiles/dj/config.h -> yasm-1.2.0.tar.gz/Mkfiles/dj/config.h Changed

@@ -1,5 +1,4 @@
-/* $Id: config.h 2353 2010-08-07 16:37:52Z peter $ */
-
+#include "YASM-VERSION.h"
 #define yasm__splitpath(path, tail)     yasm__splitpath_win(path, tail)
 #define yasm__abspath(path)             yasm__abspath_win(path)
 #define yasm__combpath(from, to)        yasm__combpath_win(from, to)
@@ -118,23 +117,17 @@
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
 
-/* Define to build version of this package. */
-#define PACKAGE_BUILD "2352"
-
-/* Define to internal version of this package. */
-#define PACKAGE_INTVER "1.1.0"
-
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 1.1.0"
+/*#define PACKAGE_STRING "yasm HEAD"*/
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+/*#define PACKAGE_VERSION "HEAD"*/
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -158,7 +151,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "HEAD"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */

yasm-1.2.0.tar.gz/Mkfiles/vc10/YASM-VERSION.h Added

yasm-1.1.0.tar.gz/Mkfiles/vc10/config.h -> yasm-1.2.0.tar.gz/Mkfiles/vc10/config.h Changed

@@ -1,5 +1,4 @@
-/* $Id: config.h 1137 2004-09-04 01:24:57Z peter $ */
-
+#include "YASM-VERSION.h"
 #define yasm__splitpath(path, tail)     yasm__splitpath_win(path, tail)
 #define yasm__abspath(path)             yasm__abspath_win(path)
 #define yasm__combpath(from, to)        yasm__combpath_win(from, to)
@@ -116,23 +115,17 @@
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
 
-/* Define to build version of this package. */
-#define PACKAGE_BUILD "2352"
-
-/* Define to internal version of this package. */
-#define PACKAGE_INTVER "1.1.0"
-
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 1.1.0"
+/*#define PACKAGE_STRING "yasm HEAD"*/
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+/*#define PACKAGE_VERSION "HEAD"*/
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -156,7 +149,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "HEAD"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */

yasm-1.1.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genversion/genversion.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genversion/genversion.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj Changed

@@ -226,6 +226,7 @@
     <ClCompile Include="..\..\..\libyasm\xstrdup.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\libyasm.h" />
     <ClInclude Include="..\..\..\libyasm\file.h" />
     <ClInclude Include="..\..\..\libyasm\arch.h" />
     <ClInclude Include="..\..\..\libyasm\assocdat.h" />
@@ -242,7 +243,9 @@
     <ClInclude Include="..\..\..\libyasm\intnum.h" />
     <ClInclude Include="..\..\..\libyasm\inttree.h" />
     <ClInclude Include="..\..\..\libyasm\linemap.h" />
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />
     <ClInclude Include="..\..\..\libyasm\md5.h" />
+    <ClInclude Include="..\..\..\libyasm\module.h" />
     <ClInclude Include="..\..\..\libyasm\objfmt.h" />
     <ClInclude Include="..\..\..\libyasm\parser.h" />
     <ClInclude Include="..\..\..\libyasm\phash.h" />
@@ -251,6 +254,9 @@
     <ClInclude Include="..\..\..\libyasm\symrec.h" />
     <ClInclude Include="..\..\..\libyasm\valparam.h" />
     <ClInclude Include="..\..\..\libyasm\value.h" />
+    <ClInclude Include="..\..\..\util.h" />
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\libyasm-stdint.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\libyasm\module.in" />

yasm-1.1.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj Changed

@@ -250,6 +250,32 @@
     <ClCompile Include="..\..\..\modules\listfmts\nasm\nasm-listfmt.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\libyasm.h" />
+    <ClInclude Include="..\..\..\libyasm\arch.h" />
+    <ClInclude Include="..\..\..\libyasm\bitvect.h" />
+    <ClInclude Include="..\..\..\libyasm\bytecode.h" />
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />
+    <ClInclude Include="..\..\..\libyasm\coretype.h" />
+    <ClInclude Include="..\..\..\libyasm\dbgfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\errwarn.h" />
+    <ClInclude Include="..\..\..\libyasm\expr.h" />
+    <ClInclude Include="..\..\..\libyasm\file.h" />
+    <ClInclude Include="..\..\..\libyasm\floatnum.h" />
+    <ClInclude Include="..\..\..\libyasm\hamt.h" />
+    <ClInclude Include="..\..\..\libyasm\insn.h" />
+    <ClInclude Include="..\..\..\libyasm\intnum.h" />
+    <ClInclude Include="..\..\..\libyasm\linemap.h" />
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\md5.h" />
+    <ClInclude Include="..\..\..\libyasm\module.h" />
+    <ClInclude Include="..\..\..\libyasm\objfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\parser.h" />
+    <ClInclude Include="..\..\..\libyasm\phash.h" />
+    <ClInclude Include="..\..\..\libyasm\preproc.h" />
+    <ClInclude Include="..\..\..\libyasm\section.h" />
+    <ClInclude Include="..\..\..\libyasm\symrec.h" />
+    <ClInclude Include="..\..\..\libyasm\valparam.h" />
+    <ClInclude Include="..\..\..\libyasm\value.h" />
     <ClInclude Include="..\..\..\modules\arch\lc3b\lc3barch.h" />
     <ClInclude Include="..\..\..\modules\arch\x86\x86arch.h" />
     <ClInclude Include="..\..\..\modules\dbgfmts\codeview\cv-dbgfmt.h" />
@@ -258,12 +284,16 @@
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf-machine.h" />
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf.h" />
     <ClInclude Include="..\..\..\modules\parsers\gas\gas-parser.h" />
+    <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser-struct.h" />
     <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser.h" />
     <ClInclude Include="..\..\..\modules\preprocs\gas\gas-eval.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-eval.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-pp.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasmlib.h" />
+    <ClInclude Include="..\..\..\util.h" />
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\libyasm-stdint.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\genmacro\genmacro.vcxproj">

yasm-1.1.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj.filters Changed

@@ -219,5 +219,35 @@
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasmlib.h">
       <Filter>Source Files\preprocs\nasm</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\libyasm\arch.h" />
+    <ClInclude Include="..\..\..\libyasm\bitvect.h" />
+    <ClInclude Include="..\..\..\libyasm\bytecode.h" />
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\..\..\libyasm\coretype.h" />
+    <ClInclude Include="..\..\..\libyasm\dbgfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\errwarn.h" />
+    <ClInclude Include="..\..\..\libyasm\expr.h" />
+    <ClInclude Include="..\..\..\libyasm\file.h" />
+    <ClInclude Include="..\..\..\libyasm\floatnum.h" />
+    <ClInclude Include="..\..\..\libyasm\hamt.h" />
+    <ClInclude Include="..\..\..\libyasm\insn.h" />
+    <ClInclude Include="..\..\..\libyasm\intnum.h" />
+    <ClInclude Include="..\libyasm-stdint.h" />
+    <ClInclude Include="..\..\..\libyasm.h" />
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\md5.h" />
+    <ClInclude Include="..\..\..\libyasm\module.h" />
+    <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser-struct.h" />
+    <ClInclude Include="..\..\..\libyasm\objfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\parser.h" />
+    <ClInclude Include="..\..\..\libyasm\phash.h" />
+    <ClInclude Include="..\..\..\libyasm\preproc.h" />
+    <ClInclude Include="..\..\..\libyasm\value.h" />
+    <ClInclude Include="..\..\..\libyasm\valparam.h" />
+    <ClInclude Include="..\..\..\libyasm\symrec.h" />
+    <ClInclude Include="..\..\..\libyasm\linemap.h" />
+    <ClInclude Include="..\..\..\libyasm\section.h" />
+    <ClInclude Include="..\..\..\util.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

yasm-1.2.0.tar.gz/Mkfiles/vc10/out_copy_rename.bat Added

yasm-1.1.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/readme.vc10.txt -> yasm-1.2.0.tar.gz/Mkfiles/vc10/readme.vc10.txt Changed

@@ -2,7 +2,7 @@
 -----------------------------------------------------------
 
 This note describes how to build YASM using Microsoft Visual
-Studio 2010 (C/C++ v10 - currently releasxed as beta 2).  
+Studio 2010 (C/C++ v10).
 
 1. The Compiler
 ---------------
@@ -36,18 +36,22 @@
 --------------------------------------------------------
 
 The YASM version vsyasm.exe is designed specifically for use
-with Visual Studio 2010.  To tell Visual Studio where to find
+with Visual Studio 2010. To tell Visual Studio where to find
 vsyasm.exe, the environment variable YASMPATH can be set to 
 the absolute path of the directory in which vsyasm.exe is
 located (this path should include the final backslash). 
 
 Alternatively you can find the directory (or directories) 
 where the VC++ compiler binaries are located and put copies 
-of the vsyasm.exe binary in these directories. A typical 
-location is:
+of the vsyasm.exe binary in these directories. The typical 
+location on 64-bit Windows is:
 
 C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin
 
+On 32-bit Windows it is normally at:
+  
+C:\Program Files\Microsoft Visual Studio 10.0\VC\bin
+
 Depending on your system you can use either the win32 or the
 x64 version of vsyasm.exe, which must be named vsyasm.exe. 
 
@@ -61,6 +65,10 @@
   which is typically at:
 
     C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations
+  
+  or:
+  
+    C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations
 
   b. put them in a convenient location and set this path in the 
      'Build Customisations Search Path' in the Visual Studio 
@@ -108,4 +116,4 @@
 YASM's creator, has given me in tracking down issues in using
 YASM for the production of Windows x64 code.
 
-  Brian Gladman, 10th June 2010
+  Brian Gladman, 29th January 2011

yasm-1.1.0.tar.gz/Mkfiles/vc10/vsyasm.props -> yasm-1.2.0.tar.gz/Mkfiles/vc10/vsyasm.props Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/vsyasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/vsyasm.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/yasm.sln -> yasm-1.2.0.tar.gz/Mkfiles/vc10/yasm.sln Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/yasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/yasm.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/yasm.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/yasm.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/ytasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/ytasm.vcxproj Changed

yasm-1.2.0.tar.gz/Mkfiles/vc9/YASM-VERSION.h Added

yasm-1.1.0.tar.gz/Mkfiles/vc9/config.h -> yasm-1.2.0.tar.gz/Mkfiles/vc9/config.h Changed

yasm-1.1.0.tar.gz/Mkfiles/vc9/genversion/genversion.vcproj -> yasm-1.2.0.tar.gz/Mkfiles/vc9/genversion/genversion.vcproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc9/yasm.rules -> yasm-1.2.0.tar.gz/Mkfiles/vc9/yasm.rules Changed

@@ -19,7 +19,7 @@
 					DisplayName="Definitions"
 					Category="Pre-Defined Symbols"
 					Description="Specify pre-defined symbols (&apos;symbol&apos; or &apos;symbol = value&apos;) "
-					Switch="-D [value]"
+					Switch="-D &quot;[value]&quot;"
 					Delimited="true"
 					Inheritable="true"
 				/>
@@ -28,7 +28,7 @@
 					DisplayName="Include Paths"
 					Category="Configuration"
 					Description="Set the paths for any additional include files"
-					Switch="-I [value]"
+					Switch="-I &quot;[value]&quot;"
 					Delimited="true"
 					Inheritable="true"
 				/>
@@ -37,7 +37,7 @@
 					DisplayName="Remove Definitions"
 					Category="Pre-Defined Symbols"
 					Description="Remove pre-defined symbols "
-					Switch="-U [value]"
+					Switch="-U &quot;[value]&quot;"
 					Delimited="true"
 					Inheritable="true"
 				/>
@@ -46,7 +46,7 @@
 					DisplayName="Object File Name"
 					Category="Output"
 					Description="Select the output file name"
-					Switch="-o [value]"
+					Switch="-o &quot;[value]&quot;"
 					DefaultValue="$(IntDir)\$(InputName).obj"
 				/>
         <StringProperty
@@ -54,14 +54,14 @@
 					DisplayName="List File Name"
 					Category="Output"
 					Description="Select an output listing by setting its file name"
-					Switch="-l [value]"
+					Switch="-l &quot;[value]&quot;"
 				/>
         <StringProperty
 					Name="PreIncludeFile"
 					DisplayName="Pre Include File"
 					Category="Configuration"
 					Description="Select a pre-included file by setting its name"
-					Switch="-P [value]"
+					Switch="-P &quot;[value]&quot;"
 				/>
         <BooleanProperty
 					Name="Debug"

yasm-1.1.0.tar.gz/Mkfiles/vc9/yasm.sln -> yasm-1.2.0.tar.gz/Mkfiles/vc9/yasm.sln Changed

yasm-1.2.0.tar.gz/YASM-VERSION-GEN.sh Added

yasm-1.1.0.tar.gz/aclocal.m4 -> yasm-1.2.0.tar.gz/aclocal.m4 Changed

@@ -13,12 +13,64 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -843,7 +895,7 @@
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
 python2.1 python2.0])
 
   m4_if([$1],[],[

yasm-1.1.0.tar.gz/config.h.in -> yasm-1.2.0.tar.gz/config.h.in Changed

yasm-1.1.0.tar.gz/configure -> yasm-1.2.0.tar.gz/configure Changed

@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for yasm 1.1.0.
+# Generated by GNU Autoconf 2.68 for yasm 1.2.0.
 #
 # Report bugs to <bug-yasm@tortall.net>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -319,7 +327,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -359,19 +367,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -533,7 +541,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -552,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='yasm'
 PACKAGE_TARNAME='yasm'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='yasm 1.1.0'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='yasm 1.2.0'
 PACKAGE_BUGREPORT='bug-yasm@tortall.net'
 PACKAGE_URL=''
 
@@ -624,6 +632,7 @@
 INTLLIBS
 LTLIBICONV
 LIBICONV
+INTL_MACOSX_LIBS
 host_os
 host_vendor
 host_cpu
@@ -824,8 +833,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -870,7 +880,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -896,7 +906,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1100,7 +1110,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1116,7 +1126,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1146,8 +1156,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1155,7 +1165,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1165,7 +1175,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1173,13 +1183,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1202,7 +1212,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1216,8 +1226,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1232,9 +1242,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1273,11 +1283,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1303,7 +1313,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures yasm 1.1.0 to adapt to many kinds of systems.
+\`configure' configures yasm 1.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1317,7 +1327,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1373,7 +1383,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yasm 1.1.0:";;
+     short | recursive ) echo "Configuration of yasm 1.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1488,10 +1498,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-yasm configure 1.1.0
-generated by GNU Autoconf 2.65
+yasm configure 1.2.0
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1535,7 +1545,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1561,7 +1571,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1572,7 +1582,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1614,7 +1624,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1627,10 +1637,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1666,7 +1676,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1689,17 +1699,15 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ----------------------------------- ##
+( $as_echo "## ----------------------------------- ##
 ## Report this to bug-yasm@tortall.net ##
-## ----------------------------------- ##
-_ASBOX
+## ----------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1708,7 +1716,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1721,7 +1729,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1739,7 +1747,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1752,7 +1760,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -1793,7 +1801,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -1970,7 +1978,7 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -2016,7 +2024,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2029,7 +2037,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2084,15 +2092,15 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by yasm $as_me 1.1.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by yasm $as_me 1.2.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2202,11 +2210,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2240,11 +2246,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2257,11 +2261,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2275,11 +2277,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2334,7 +2334,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2349,7 +2354,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2426,7 +2435,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2442,16 +2451,22 @@
 #AC_CONFIG_SRCDIR([src/main.c])
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2485,7 +2500,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2572,11 +2587,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2598,7 +2613,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2608,7 +2623,7 @@
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2662,7 +2677,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2702,7 +2717,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2755,7 +2770,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2806,7 +2821,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2846,7 +2861,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2854,7 +2869,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2888,7 +2903,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2904,7 +2919,7 @@
 
 # Define the identity of the package.
  PACKAGE='yasm'
- VERSION='1.1.0'
+ VERSION='1.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2968,13 +2983,6 @@
 
 
 
-
-$as_echo "#define PACKAGE_INTVER \"1.1.0\"" >>confdefs.h
-
-
-$as_echo "#define PACKAGE_BUILD \"2352\"" >>confdefs.h
-
-
 #
 # autoconf command-line options
 #
@@ -2983,7 +2991,7 @@
   enableval=$enable_debug; case "${enableval}" in
   yes) debugging="yes" ;;
   no)  debugging="no" ;;
-  *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
 esac
 fi
 
@@ -2993,7 +3001,7 @@
   enableval=$enable_warnerror; case "${enableval}" in
   yes) warnerror="yes" ;;
   no)  warnerror="no" ;;
-  *) as_fn_error "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;;
 esac
 fi
 
@@ -3003,7 +3011,7 @@
   enableval=$enable_profiling; case "${enableval}" in
   yes) profiling="yes" ;;
   no)  profiling="no" ;;
-  *) as_fn_error "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;;
 esac
 fi
 
@@ -3013,7 +3021,7 @@
   enableval=$enable_gcov; case "${enableval}" in
   yes) gcov="yes" ;;
   no)  gcov="no" ;;
-  *) as_fn_error "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;;
 esac
 fi
 
@@ -3023,7 +3031,7 @@
   enableval=$enable_python; case "${enableval}" in
   yes) enable_python="yes" ;;
   no)  enable_python="no" ;;
-  *) as_fn_error "bad value ${enableval} for --enable-python" "$LINENO" 5 ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;;
 esac
 else
   enable_python="auto"
@@ -3035,7 +3043,7 @@
   enableval=$enable_python_bindings; case "${enableval}" in
   yes) enable_python_bindings="yes" ;;
   no)  enable_python_bindings="no" ;;
-  *) as_fn_error "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;;
 esac
 else
   enable_python_bindings="no"
@@ -3117,7 +3125,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3157,7 +3165,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3210,7 +3218,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3250,7 +3258,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3309,7 +3317,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3353,7 +3361,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3407,8 +3415,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3522,9 +3530,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3566,8 +3573,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3624,9 +3631,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3637,7 +3644,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3677,8 +3684,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3688,7 +3695,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3725,7 +3732,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3803,7 +3810,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3902,7 +3909,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4037,7 +4044,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4067,7 +4074,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4083,11 +4090,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -4126,7 +4133,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4142,18 +4149,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4168,7 +4175,7 @@
   *) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if test "${ac_cv_prog_cc_c99+set}" = set; then :
+if ${ac_cv_prog_cc_c99+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
@@ -4343,7 +4350,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4439,7 +4446,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
 $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
-  if test "${ac_cv_prog_cc_stdc+set}" = set; then :
+  if ${ac_cv_prog_cc_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 
@@ -4475,7 +4482,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -4519,7 +4526,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -4573,7 +4580,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -4613,7 +4620,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -4663,7 +4670,7 @@
 
 # REQUIRE a standard (ANSI/ISO) C compiler
 if test "$ac_cv_prog_cc_stdc" = no; then
-	as_fn_error "A standard (ANSI/ISO C89) C compiler is required." "$LINENO" 5
+	as_fn_error $? "A standard (ANSI/ISO C89) C compiler is required." "$LINENO" 5
 fi
 
 # Check for xmlto (for rendering manpages, needed only for development)
@@ -4673,7 +4680,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_XMLTO+set}" = set; then :
+if ${ac_cv_prog_XMLTO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$XMLTO"; then
@@ -4761,7 +4768,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4810,7 +4817,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4824,7 +4831,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4876,7 +4883,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4891,7 +4898,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5008,8 +5015,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -5023,8 +5029,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -5036,7 +5041,7 @@
 
 # REQUIRE standard C headers
 if test "$ac_cv_header_stdc" != yes; then
-	as_fn_error "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5
+	as_fn_error $? "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5
 fi
 
 #
@@ -5044,7 +5049,7 @@
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5124,7 +5129,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -5181,7 +5186,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -5197,7 +5202,7 @@
 ac_stdint_h=`echo libyasm-stdint.h`
 # try to shortcircuit - if the default include path of the compiler
 # can find a "stdint.h" header then we assume that all compilers can.
-if test "${ac_cv_header_stdint_t+set}" = set; then :
+if ${ac_cv_header_stdint_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5253,7 +5258,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
 $as_echo_n "checking for stdint uintptr_t... " >&6; }
-if test "${ac_cv_header_stdint_x+set}" = set; then :
+if ${ac_cv_header_stdint_x+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5265,7 +5270,7 @@
    unset ac_cv_type_uint64_t
    ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i>
 "
-if test "x$ac_cv_type_uintptr_t" = x""yes; then :
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
   ac_cv_header_stdint_x=$i
 else
   continue
@@ -5273,7 +5278,7 @@
 
    ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
 "
-if test "x$ac_cv_type_uint64_t" = x""yes; then :
+if test "x$ac_cv_type_uint64_t" = xyes; then :
   and64="/uint64_t"
 else
   and64=""
@@ -5293,7 +5298,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
 $as_echo_n "checking for stdint uint32_t... " >&6; }
-if test "${ac_cv_header_stdint_o+set}" = set; then :
+if ${ac_cv_header_stdint_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5305,7 +5310,7 @@
    unset ac_cv_type_uint64_t
    ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i>
 "
-if test "x$ac_cv_type_uint32_t" = x""yes; then :
+if test "x$ac_cv_type_uint32_t" = xyes; then :
   ac_cv_header_stdint_o=$i
 else
   continue
@@ -5313,7 +5318,7 @@
 
    ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
 "
-if test "x$ac_cv_type_uint64_t" = x""yes; then :
+if test "x$ac_cv_type_uint64_t" = xyes; then :
   and64="/uint64_t"
 else
   and64=""
@@ -5335,7 +5340,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
 $as_echo_n "checking for stdint u_int32_t... " >&6; }
-if test "${ac_cv_header_stdint_u+set}" = set; then :
+if ${ac_cv_header_stdint_u+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5347,7 +5352,7 @@
    unset ac_cv_type_u_int64_t
    ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i>
 "
-if test "x$ac_cv_type_u_int32_t" = x""yes; then :
+if test "x$ac_cv_type_u_int32_t" = xyes; then :
   ac_cv_header_stdint_u=$i
 else
   continue
@@ -5355,7 +5360,7 @@
 
    ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i>
 "
-if test "x$ac_cv_type_u_int64_t" = x""yes; then :
+if test "x$ac_cv_type_u_int64_t" = xyes; then :
   and64="/u_int64_t"
 else
   and64=""
@@ -5384,7 +5389,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
 $as_echo_n "checking size of char... " >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then :
+if ${ac_cv_sizeof_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
@@ -5393,9 +5398,8 @@
   if test "$ac_cv_type_char" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (char)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (char)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_char=0
    fi
@@ -5418,7 +5422,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -5427,9 +5431,8 @@
   if test "$ac_cv_type_short" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (short)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -5452,7 +5455,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -5461,9 +5464,8 @@
   if test "$ac_cv_type_int" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (int)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -5486,7 +5488,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -5495,9 +5497,8 @@
   if test "$ac_cv_type_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -5520,7 +5521,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
 $as_echo_n "checking size of void*... " >&6; }
-if test "${ac_cv_sizeof_voidp+set}" = set; then :
+if ${ac_cv_sizeof_voidp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"; then :
@@ -5529,9 +5530,8 @@
   if test "$ac_cv_type_voidp" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (void*)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (void*)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_voidp=0
    fi
@@ -5600,19 +5600,19 @@
 unset ac_cv_type_int_fast32_t
 ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint>
 "
-if test "x$ac_cv_type_int_least32_t" = x""yes; then :
+if test "x$ac_cv_type_int_least32_t" = xyes; then :
 
 fi
 
 ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint>
 "
-if test "x$ac_cv_type_int_fast32_t" = x""yes; then :
+if test "x$ac_cv_type_int_fast32_t" = xyes; then :
 
 fi
 
 ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint>
 "
-if test "x$ac_cv_type_intmax_t" = x""yes; then :
+if test "x$ac_cv_type_intmax_t" = xyes; then :
 
 fi
 
@@ -5640,8 +5640,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -5653,8 +5652,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -5666,8 +5664,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -5680,8 +5677,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -5747,7 +5743,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -5788,7 +5784,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -5870,7 +5866,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -5948,7 +5944,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -6012,27 +6008,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -6050,14 +6046,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -6065,7 +6061,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6141,7 +6137,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then :
+if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -6175,10 +6171,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+if ${acl_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -6198,7 +6194,7 @@
 
                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then :
+if ${acl_cv_rpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6709,7 +6705,81 @@
 
 
 
-    gt_INTL_MACOSX
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+  gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else
+  gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
+
 
 
 
@@ -6748,7 +6818,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$gt_func_gnugettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6811,7 +6881,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6868,7 +6938,7 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7419,7 +7489,7 @@
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -7605,7 +7675,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU C Library" >&5
 $as_echo_n "checking for GNU C Library... " >&6; }
-if test "${yasm_cv_header_gnulib+set}" = set; then :
+if ${yasm_cv_header_gnulib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7767,7 +7837,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "too old" "$LINENO" 5
+  as_fn_error $? "too old" "$LINENO" 5
 fi
       am_display_PYTHON=$PYTHON
     else
@@ -7775,11 +7845,11 @@
       # VERSION.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.4" >&5
 $as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
-if test "${am_cv_pathless_PYTHON+set}" = set; then :
+if ${am_cv_pathless_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+	for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -7809,7 +7879,7 @@
 set dummy $am_cv_pathless_PYTHON; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
+if ${ac_cv_path_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
@@ -7858,7 +7928,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
 $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if test "${am_cv_python_version+set}" = set; then :
+if ${am_cv_python_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
@@ -7877,7 +7947,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if test "${am_cv_python_platform+set}" = set; then :
+if ${am_cv_python_platform+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
@@ -7891,7 +7961,7 @@
 
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if test "${am_cv_python_pythondir+set}" = set; then :
+if ${am_cv_python_pythondir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$prefix" = xNONE
@@ -7929,7 +7999,7 @@
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if test "${am_cv_python_pyexecdir+set}" = set; then :
+if ${am_cv_python_pyexecdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$exec_prefix" = xNONE
@@ -7978,7 +8048,7 @@
 
     if test x$have_python = xno ; then
         if test x$enable_python = xyes ; then
-            as_fn_error "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5
+            as_fn_error $? "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5
         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable version of Python" >&5
 $as_echo "$as_me: WARNING: Could not find a suitable version of Python" >&2;}
@@ -7999,14 +8069,19 @@
 $as_echo_n "checking for Cython >= 0.11.3... " >&6; }
         prog="import sys
 from Cython.Compiler.Version import version
+def get_int(arg):
+    try:
+        return int(arg)
+    except ValueError:
+        return 0
 # split strings by '.' and convert to numeric.  Append some zeros
 # because we need at least 4 digits for the hex conversion.
-ver = map(int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0]
+ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0]
 verhex = 0
-for i in xrange(0, 4): verhex = (verhex << 8) + ver[i]
-minver = map(int, '0.11.3'.split('.')) + [0, 0, 0]
+for i in range(0, 4): verhex = (verhex << 8) + ver[i]
+minver = map(get_int, '0.11.3'.split('.')) + [0, 0, 0]
 minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+for i in range(0, 4): minverhex = (minverhex << 8) + minver[i]
 sys.exit(verhex < minverhex)"
   if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
    ($PYTHON -c "$prog") >&5 2>&5
@@ -8047,7 +8122,7 @@
 $as_echo "not found" >&6; }
 have_python_headers=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 CPPFLAGS="$save_CPPFLAGS"
 
 
@@ -8058,7 +8133,7 @@
 
     if test x$have_python_bindings = xno ; then
         if test x$enable_python_bindings = xyes ; then
-            as_fn_error "Building Python bindings explicitly requested, but can't build Python bindings because either Cython, Python headers or a suitable Python version was not found" "$LINENO" 5
+            as_fn_error $? "Building Python bindings explicitly requested, but can't build Python bindings because either Cython, Python headers or a suitable Python version was not found" "$LINENO" 5
         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find either Cython, the Python headers or a suitable version of Python, not building Python bindings" >&5
 $as_echo "$as_me: WARNING: Couldn't find either Cython, the Python headers or a suitable version of Python, not building Python bindings" >&2;}
@@ -8149,10 +8224,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -8168,6 +8254,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -8191,31 +8278,31 @@
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_MAN_TRUE}" && test -z "${BUILD_MAN_FALSE}"; then
-  as_fn_error "conditional \"BUILD_MAN\" was never defined.
+  as_fn_error $? "conditional \"BUILD_MAN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PYTHON\" was never defined.
+  as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PYTHON_BINDINGS_TRUE}" && test -z "${HAVE_PYTHON_BINDINGS_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PYTHON_BINDINGS\" was never defined.
+  as_fn_error $? "conditional \"HAVE_PYTHON_BINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -8316,6 +8403,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8361,19 +8449,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -8569,7 +8657,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -8622,8 +8710,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by yasm $as_me 1.1.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by yasm $as_me 1.2.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8647,9 +8735,9 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="`echo $ac_config_files`"
-config_headers="`echo $ac_config_headers`"
-config_commands="`echo $ac_config_commands`"
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
 _ACEOF
 
@@ -8688,11 +8776,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-yasm config.status 1.1.0
-configured by $0, generated by GNU Autoconf 2.65,
+yasm config.status 1.2.0
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -8710,11 +8798,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X$[^=]*$='`
     ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X$[^=]*$='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -8736,6 +8829,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -8748,7 +8842,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -8757,7 +8851,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -8843,7 +8937,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -8866,9 +8960,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -8876,12 +8971,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -8898,12 +8994,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -8912,18 +9008,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -8931,7 +9027,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -8979,7 +9075,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = "&#x7;"
 
@@ -9011,21 +9107,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^$[^=]*=[	 ]*$:*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/$=[	 ]*$.*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -9037,7 +9141,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -9049,11 +9153,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -9138,7 +9242,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -9151,7 +9255,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -9170,7 +9274,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -9179,7 +9283,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -9205,8 +9309,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -9342,23 +9446,24 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -9367,21 +9472,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -10108,7 +10213,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -10129,7 +10234,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

yasm-1.1.0.tar.gz/configure.ac -> yasm-1.2.0.tar.gz/configure.ac Changed

yasm-1.1.0.tar.gz/frontends/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/tasm/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/tasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/tasm/tasm-options.c -> yasm-1.2.0.tar.gz/frontends/tasm/tasm-options.c Changed

yasm-1.1.0.tar.gz/frontends/tasm/tasm-options.h -> yasm-1.2.0.tar.gz/frontends/tasm/tasm-options.h Changed

yasm-1.1.0.tar.gz/frontends/tasm/tasm.c -> yasm-1.2.0.tar.gz/frontends/tasm/tasm.c Changed

yasm-1.1.0.tar.gz/frontends/vsyasm/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/vsyasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/vsyasm/vsyasm.c -> yasm-1.2.0.tar.gz/frontends/vsyasm/vsyasm.c Changed

yasm-1.1.0.tar.gz/frontends/yasm/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/yasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm-options.c -> yasm-1.2.0.tar.gz/frontends/yasm/yasm-options.c Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm-options.h -> yasm-1.2.0.tar.gz/frontends/yasm/yasm-options.h Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm.c -> yasm-1.2.0.tar.gz/frontends/yasm/yasm.c Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm.xml -> yasm-1.2.0.tar.gz/frontends/yasm/yasm.xml Changed

@@ -2,8 +2,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
           "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
-     
-
 <refentry id="yasm">
 
  <refentryinfo>
@@ -172,16 +170,6 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>-h</option> or <option>--help</option>: Print a
-      summary of options</term>
-
-     <listitem>
-      <para>Prints a summary of invocation options.  All other options
-       are ignored, and no output file is generated.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
      <term><option>-L <replaceable>list</replaceable></option> or
       <option>--lformat=<replaceable>list</replaceable></option>:
       Select list file format</term>
@@ -290,6 +278,16 @@
     </varlistentry>
 
     <varlistentry>
+     <term><option>-h</option> or <option>--help</option>: Print a
+      summary of options</term>
+
+     <listitem>
+      <para>Prints a summary of invocation options.  All other options
+       are ignored, and no output file is generated.</para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
      <term><option>--version</option>: Get the Yasm version</term>
 
      <listitem>

yasm-1.1.0.tar.gz/genstring.c -> yasm-1.2.0.tar.gz/genstring.c Changed

yasm-1.1.0.tar.gz/libyasm.h -> yasm-1.2.0.tar.gz/libyasm.h Changed

yasm-1.1.0.tar.gz/libyasm/Makefile.inc -> yasm-1.2.0.tar.gz/libyasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/libyasm/arch.h -> yasm-1.2.0.tar.gz/libyasm/arch.h Changed

yasm-1.1.0.tar.gz/libyasm/assocdat.c -> yasm-1.2.0.tar.gz/libyasm/assocdat.c Changed

yasm-1.1.0.tar.gz/libyasm/assocdat.h -> yasm-1.2.0.tar.gz/libyasm/assocdat.h Changed

yasm-1.1.0.tar.gz/libyasm/bc-align.c -> yasm-1.2.0.tar.gz/libyasm/bc-align.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-align.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -58,7 +57,8 @@
 static int bc_align_expand(yasm_bytecode *bc, int span, long old_val,
                            long new_val, /*@out@*/ long *neg_thres,
                            /*@out@*/ long *pos_thres);
-static int bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                            unsigned char *bufstart, void *d,
                             yasm_output_value_func output_value,
                             /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -164,7 +164,8 @@
 }
 
 static int
-bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                 unsigned char *bufstart, void *d,
                  yasm_output_value_func output_value,
                  /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bc-data.c -> yasm-1.2.0.tar.gz/libyasm/bc-data.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-data.c 2133 2008-10-07 05:59:29Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -70,7 +69,8 @@
 static int bc_data_item_size(yasm_bytecode *bc);
 static int bc_data_calc_len(yasm_bytecode *bc, yasm_bc_add_span_func add_span,
                             void *add_span_data);
-static int bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                           unsigned char *bufstart, void *d,
                            yasm_output_value_func output_value,
                            /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -203,13 +203,13 @@
 }
 
 static int
-bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                unsigned char *bufstart, void *d,
                 yasm_output_value_func output_value,
                 /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     bytecode_data *bc_data = (bytecode_data *)bc->contents;
     yasm_dataval *dv;
-    unsigned char *bufp_orig = *bufp;
     yasm_intnum *intn;
     unsigned int val_len;
     unsigned long multiple, i;
@@ -224,7 +224,7 @@
                 val_len = dv->data.val.size/8;
                 for (i=0; i<multiple; i++) {
                     if (output_value(&dv->data.val, *bufp, val_len,
-                                     (unsigned long)(*bufp-bufp_orig), bc, 1,
+                                     (unsigned long)(*bufp-bufstart), bc, 1,
                                      d))
                         return 1;
                     *bufp += val_len;
@@ -480,6 +480,14 @@
     return retval;
 }
 
+yasm_value *
+yasm_dv_get_value(yasm_dataval *dv)
+{
+    if (dv->type != DV_VALUE)
+        return NULL;
+    return &dv->data.val;
+}
+
 void
 yasm_dv_set_multiple(yasm_dataval *dv, yasm_expr *e)
 {

yasm-1.1.0.tar.gz/libyasm/bc-incbin.c -> yasm-1.2.0.tar.gz/libyasm/bc-incbin.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-incbin.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -58,7 +57,8 @@
 static void bc_incbin_finalize(yasm_bytecode *bc, yasm_bytecode *prev_bc);
 static int bc_incbin_calc_len(yasm_bytecode *bc, yasm_bc_add_span_func add_span,
                               void *add_span_data);
-static int bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                             unsigned char *bufstart, void *d,
                              yasm_output_value_func output_value,
                              /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -195,7 +195,8 @@
 }
 
 static int
-bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                  unsigned char *bufstart, void *d,
                   yasm_output_value_func output_value,
                   /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bc-org.c -> yasm-1.2.0.tar.gz/libyasm/bc-org.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-org.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -52,7 +51,8 @@
 static int bc_org_expand(yasm_bytecode *bc, int span, long old_val,
                          long new_val, /*@out@*/ long *neg_thres,
                          /*@out@*/ long *pos_thres);
-static int bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                          unsigned char *bufstart, void *d,
                           yasm_output_value_func output_value,
                           /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -120,7 +120,8 @@
 }
 
 static int
-bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+               unsigned char *bufstart, void *d,
                yasm_output_value_func output_value,
                /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bc-reserve.c -> yasm-1.2.0.tar.gz/libyasm/bc-reserve.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-reserve.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -50,7 +49,8 @@
 static int bc_reserve_calc_len(yasm_bytecode *bc,
                                yasm_bc_add_span_func add_span,
                                void *add_span_data);
-static int bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                              unsigned char *bufstart, void *d,
                               yasm_output_value_func output_value,
                               /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -114,7 +114,8 @@
 }
 
 static int
-bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                   unsigned char *bufstart, void *d,
                    yasm_output_value_func output_value,
                    /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bitvect.c -> yasm-1.2.0.tar.gz/libyasm/bitvect.c Changed

yasm-1.1.0.tar.gz/libyasm/bitvect.h -> yasm-1.2.0.tar.gz/libyasm/bitvect.h Changed

yasm-1.1.0.tar.gz/libyasm/bytecode.c -> yasm-1.2.0.tar.gz/libyasm/bytecode.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bytecode.c 2233 2009-10-31 21:45:55Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -73,7 +72,8 @@
 }
 
 int
-yasm_bc_tobytes_common(yasm_bytecode *bc, unsigned char **bufp, void *d,
+yasm_bc_tobytes_common(yasm_bytecode *bc, unsigned char **buf,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        /*@null@*/ yasm_output_reloc_func output_reloc)
 {
@@ -305,6 +305,7 @@
     /*@sets *buf@*/
 {
     /*@only@*/ /*@null@*/ unsigned char *mybuf = NULL;
+    unsigned char *bufstart;
     unsigned char *origbuf, *destbuf;
     long i;
     int error = 0;
@@ -329,6 +330,7 @@
         destbuf = mybuf;
     } else
         destbuf = buf;
+    bufstart = destbuf;
 
     *bufsize = bc->len*bc->mult_int;
 
@@ -336,7 +338,7 @@
         yasm_internal_error(N_("got empty bytecode in bc_tobytes"));
     else for (i=0; i<bc->mult_int; i++) {
         origbuf = destbuf;
-        error = bc->callback->tobytes(bc, &destbuf, d, output_value,
+        error = bc->callback->tobytes(bc, &destbuf, bufstart, d, output_value,
                                       output_reloc);
 
         if (!error && ((unsigned long)(destbuf - origbuf) != bc->len))

yasm-1.1.0.tar.gz/libyasm/bytecode.h -> yasm-1.2.0.tar.gz/libyasm/bytecode.h Changed

@@ -2,10 +2,6 @@
  * \file libyasm/bytecode.h
  * \brief YASM bytecode interface.
  *
- * \rcs
- * $Id: bytecode.h 2130 2008-10-07 05:38:11Z peter $
- * \endrcs
- *
  * \license
  *  Copyright (C) 2001-2007  Peter Johnson
  *
@@ -147,6 +143,8 @@
      *                      passed-in buf matches the bytecode length
      *                      (it's okay not to do this if an error
      *                      indication is returned)
+     * \param bufstart      For calculating the correct offset parameter for
+     *                      the \a output_value calls: *bufp - bufstart.
      * \param d             data to pass to each call to
      *                      output_value/output_reloc
      * \param output_value  function to call to convert values into their byte
@@ -158,7 +156,8 @@
      *       preferable if calling this function twice would result in the
      *       same output.
      */
-    int (*tobytes) (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    int (*tobytes) (yasm_bytecode *bc, unsigned char **bufp,
+                    unsigned char *bufstart, void *d,
                     yasm_output_value_func output_value,
                     /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -277,7 +276,7 @@
  */
 YASM_LIB_DECL
 int yasm_bc_tobytes_common
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -575,6 +574,12 @@
                                                        (unsigned long)(l))
 #endif
 
+/** Get the underlying value of a data value.
+ * \param dv    data value
+ * \return Value, or null if non-value (e.g. string or raw).
+ */
+yasm_value *yasm_dv_get_value(yasm_dataval *dv);
+
 /** Set multiple field of a data value.
  * A data value can be repeated a number of times when output.  This function
  * sets that multiple.

yasm-1.1.0.tar.gz/libyasm/compat-queue.h -> yasm-1.2.0.tar.gz/libyasm/compat-queue.h Changed

yasm-1.1.0.tar.gz/libyasm/coretype.h -> yasm-1.2.0.tar.gz/libyasm/coretype.h Changed

yasm-1.1.0.tar.gz/libyasm/dbgfmt.h -> yasm-1.2.0.tar.gz/libyasm/dbgfmt.h Changed

yasm-1.1.0.tar.gz/libyasm/errwarn.c -> yasm-1.2.0.tar.gz/libyasm/errwarn.c Changed

yasm-1.1.0.tar.gz/libyasm/errwarn.h -> yasm-1.2.0.tar.gz/libyasm/errwarn.h Changed

yasm-1.1.0.tar.gz/libyasm/expr.c -> yasm-1.2.0.tar.gz/libyasm/expr.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: expr.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -535,7 +534,7 @@
  * NOTE: Really designed to only be used by expr_level_op().
  */
 static int
-expr_simplify_identity(yasm_expr *e, int numterms, int int_term,
+expr_simplify_identity(yasm_expr *e, int numterms, int *int_term,
                        int simplify_reg_mul)
 {
     int i;
@@ -547,26 +546,27 @@
     save_numterms = e->numterms;
     e->numterms = numterms;
     if (simplify_reg_mul || e->op != YASM_EXPR_MUL
-        || !yasm_intnum_is_pos1(e->terms[int_term].data.intn)
+        || !yasm_intnum_is_pos1(e->terms[*int_term].data.intn)
         || !yasm_expr__contains(e, YASM_EXPR_REG)) {
         /* Check for simple identities that delete the intnum.
          * Don't delete if the intnum is the only thing in the expn.
          */
-        if ((int_term == 0 && numterms > 1 &&
+        if ((*int_term == 0 && numterms > 1 &&
              expr_can_destroy_int_left(e->op, e->terms[0].data.intn)) ||
-            (int_term > 0 &&
-             expr_can_destroy_int_right(e->op, e->terms[int_term].data.intn))) {
+            (*int_term > 0 &&
+             expr_can_destroy_int_right(e->op,
+                                        e->terms[*int_term].data.intn))) {
             /* Delete the intnum */
-            yasm_intnum_destroy(e->terms[int_term].data.intn);
+            yasm_intnum_destroy(e->terms[*int_term].data.intn);
 
             /* Slide everything to its right over by 1 */
-            if (int_term != numterms-1) /* if it wasn't last.. */
-                memmove(&e->terms[int_term], &e->terms[int_term+1],
-                        (numterms-1-int_term)*sizeof(yasm_expr__item));
+            if (*int_term != numterms-1) /* if it wasn't last.. */
+                memmove(&e->terms[*int_term], &e->terms[*int_term+1],
+                        (numterms-1-*int_term)*sizeof(yasm_expr__item));
 
             /* Update numterms */
             numterms--;
-            int_term = -1;      /* no longer an int term */
+            *int_term = -1;     /* no longer an int term */
         }
     }
     e->numterms = save_numterms;
@@ -574,23 +574,23 @@
     /* Check for simple identites that delete everything BUT the intnum.
      * Don't bother if the intnum is the only thing in the expn.
      */
-    if (numterms > 1 && int_term != -1 &&
-        expr_is_constant(e->op, e->terms[int_term].data.intn)) {
+    if (numterms > 1 && *int_term != -1 &&
+        expr_is_constant(e->op, e->terms[*int_term].data.intn)) {
         /* Loop through, deleting everything but the integer term */
         for (i=0; i<e->numterms; i++)
-            if (i != int_term)
+            if (i != *int_term)
                 expr_delete_term(&e->terms[i], 1);
 
         /* Move integer term to the first term (if not already there) */
-        if (int_term != 0)
-            e->terms[0] = e->terms[int_term];   /* structure copy */
+        if (*int_term != 0)
+            e->terms[0] = e->terms[*int_term];  /* structure copy */
 
         /* Set numterms to 1 */
         numterms = 1;
     }
 
     /* Compute NOT, NEG, and LNOT on single intnum. */
-    if (numterms == 1 && int_term == 0 &&
+    if (numterms == 1 && *int_term == 0 &&
         (e->op == YASM_EXPR_NOT || e->op == YASM_EXPR_NEG ||
          e->op == YASM_EXPR_LNOT))
         yasm_intnum_calc(e->terms[0].data.intn, e->op, NULL);
@@ -698,7 +698,7 @@
             int new_fold_numterms;
             /* Simplify identities and make IDENT if possible. */
             new_fold_numterms =
-                expr_simplify_identity(e, fold_numterms, first_int_term,
+                expr_simplify_identity(e, fold_numterms, &first_int_term,
                                        simplify_reg_mul);
             level_numterms -= fold_numterms-new_fold_numterms;
             fold_numterms = new_fold_numterms;
@@ -789,7 +789,7 @@
     /* Simplify identities, make IDENT if possible, and save to e->numterms. */
     if (simplify_ident && first_int_term != -1) {
         e->numterms = expr_simplify_identity(e, level_numterms,
-                                             first_int_term, simplify_reg_mul);
+                                             &first_int_term, simplify_reg_mul);
     } else {
         e->numterms = level_numterms;
         if (level_numterms == 1)

yasm-1.1.0.tar.gz/libyasm/expr.h -> yasm-1.2.0.tar.gz/libyasm/expr.h Changed

yasm-1.1.0.tar.gz/libyasm/file.c -> yasm-1.2.0.tar.gz/libyasm/file.c Changed

yasm-1.1.0.tar.gz/libyasm/file.h -> yasm-1.2.0.tar.gz/libyasm/file.h Changed

yasm-1.1.0.tar.gz/libyasm/floatnum.c -> yasm-1.2.0.tar.gz/libyasm/floatnum.c Changed

yasm-1.1.0.tar.gz/libyasm/floatnum.h -> yasm-1.2.0.tar.gz/libyasm/floatnum.h Changed

yasm-1.1.0.tar.gz/libyasm/genmodule.c -> yasm-1.2.0.tar.gz/libyasm/genmodule.c Changed

yasm-1.1.0.tar.gz/libyasm/hamt.c -> yasm-1.2.0.tar.gz/libyasm/hamt.c Changed

yasm-1.1.0.tar.gz/libyasm/hamt.h -> yasm-1.2.0.tar.gz/libyasm/hamt.h Changed

yasm-1.1.0.tar.gz/libyasm/insn.c -> yasm-1.2.0.tar.gz/libyasm/insn.c Changed

yasm-1.1.0.tar.gz/libyasm/insn.h -> yasm-1.2.0.tar.gz/libyasm/insn.h Changed

yasm-1.1.0.tar.gz/libyasm/intnum.c -> yasm-1.2.0.tar.gz/libyasm/intnum.c Changed

yasm-1.1.0.tar.gz/libyasm/intnum.h -> yasm-1.2.0.tar.gz/libyasm/intnum.h Changed

yasm-1.1.0.tar.gz/libyasm/inttree.c -> yasm-1.2.0.tar.gz/libyasm/inttree.c Changed

yasm-1.1.0.tar.gz/libyasm/inttree.h -> yasm-1.2.0.tar.gz/libyasm/inttree.h Changed

yasm-1.1.0.tar.gz/libyasm/linemap.c -> yasm-1.2.0.tar.gz/libyasm/linemap.c Changed

yasm-1.1.0.tar.gz/libyasm/linemap.h -> yasm-1.2.0.tar.gz/libyasm/linemap.h Changed

yasm-1.1.0.tar.gz/libyasm/listfmt.h -> yasm-1.2.0.tar.gz/libyasm/listfmt.h Changed

yasm-1.1.0.tar.gz/libyasm/md5.c -> yasm-1.2.0.tar.gz/libyasm/md5.c Changed

yasm-1.1.0.tar.gz/libyasm/md5.h -> yasm-1.2.0.tar.gz/libyasm/md5.h Changed

yasm-1.1.0.tar.gz/libyasm/mergesort.c -> yasm-1.2.0.tar.gz/libyasm/mergesort.c Changed

yasm-1.1.0.tar.gz/libyasm/module.h -> yasm-1.2.0.tar.gz/libyasm/module.h Changed

yasm-1.1.0.tar.gz/libyasm/module.in -> yasm-1.2.0.tar.gz/libyasm/module.in Changed

yasm-1.1.0.tar.gz/libyasm/objfmt.h -> yasm-1.2.0.tar.gz/libyasm/objfmt.h Changed

yasm-1.1.0.tar.gz/libyasm/parser.h -> yasm-1.2.0.tar.gz/libyasm/parser.h Changed

yasm-1.1.0.tar.gz/libyasm/phash.c -> yasm-1.2.0.tar.gz/libyasm/phash.c Changed

yasm-1.1.0.tar.gz/libyasm/phash.h -> yasm-1.2.0.tar.gz/libyasm/phash.h Changed

yasm-1.1.0.tar.gz/libyasm/preproc.h -> yasm-1.2.0.tar.gz/libyasm/preproc.h Changed

yasm-1.1.0.tar.gz/libyasm/section.c -> yasm-1.2.0.tar.gz/libyasm/section.c Changed

yasm-1.1.0.tar.gz/libyasm/section.h -> yasm-1.2.0.tar.gz/libyasm/section.h Changed

yasm-1.1.0.tar.gz/libyasm/strcasecmp.c -> yasm-1.2.0.tar.gz/libyasm/strcasecmp.c Changed

yasm-1.1.0.tar.gz/libyasm/strsep.c -> yasm-1.2.0.tar.gz/libyasm/strsep.c Changed

yasm-1.1.0.tar.gz/libyasm/symrec.c -> yasm-1.2.0.tar.gz/libyasm/symrec.c Changed

yasm-1.1.0.tar.gz/libyasm/symrec.h -> yasm-1.2.0.tar.gz/libyasm/symrec.h Changed

yasm-1.1.0.tar.gz/libyasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/libyasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/libyasm/tests/bitvect_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/bitvect_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/combpath_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/combpath_test.c Changed

yasm-1.2.0.tar.gz/libyasm/tests/expr-simplify-identity.asm Added

yasm-1.2.0.tar.gz/libyasm/tests/expr-simplify-identity.hex Added

yasm-1.1.0.tar.gz/libyasm/tests/floatnum_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/floatnum_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/leb128_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/leb128_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/libyasm_test.sh -> yasm-1.2.0.tar.gz/libyasm/tests/libyasm_test.sh Changed

yasm-1.1.0.tar.gz/libyasm/tests/splitpath_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/splitpath_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/uncstring_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/uncstring_test.c Changed

yasm-1.1.0.tar.gz/libyasm/valparam.c -> yasm-1.2.0.tar.gz/libyasm/valparam.c Changed

yasm-1.1.0.tar.gz/libyasm/valparam.h -> yasm-1.2.0.tar.gz/libyasm/valparam.h Changed

yasm-1.1.0.tar.gz/libyasm/value.c -> yasm-1.2.0.tar.gz/libyasm/value.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: value.c 2220 2009-07-24 19:01:35Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -453,10 +452,17 @@
         yasm_value_initialize(value, NULL, size);
         return 0;
     }
+    yasm_value_initialize(value, e, size);
+    return yasm_value_finalize(value, precbc);
+}
 
-    yasm_value_initialize(value,
-                          yasm_expr__level_tree(e, 1, 1, 0, 0, NULL, NULL),
-                          size);
+int
+yasm_value_finalize(yasm_value *value, yasm_bytecode *precbc)
+{
+    if (!value->abs)
+        return 0;
+
+    value->abs = yasm_expr__level_tree(value->abs, 1, 1, 0, 0, NULL, NULL);
 
     /* quit early if there was an issue in simplify() */
     if (yasm_error_occurred())
@@ -549,13 +555,6 @@
     return 0;
 }
 
-int
-yasm_value_finalize(yasm_value *value, yasm_bytecode *precbc)
-{
-    unsigned int valsize = value->size;
-    return yasm_value_finalize_expr(value, value->abs, precbc, valsize);
-}
-
 yasm_intnum *
 yasm_value_get_intnum(yasm_value *value, yasm_bytecode *bc, int calc_bc_dist)
 {

yasm-1.1.0.tar.gz/libyasm/value.h -> yasm-1.2.0.tar.gz/libyasm/value.h Changed

yasm-1.1.0.tar.gz/libyasm/xmalloc.c -> yasm-1.2.0.tar.gz/libyasm/xmalloc.c Changed

yasm-1.1.0.tar.gz/libyasm/xstrdup.c -> yasm-1.2.0.tar.gz/libyasm/xstrdup.c Changed

yasm-1.1.0.tar.gz/m4/cython.m4 -> yasm-1.2.0.tar.gz/m4/cython.m4 Changed

yasm-1.1.0.tar.gz/modules/Makefile.inc -> yasm-1.2.0.tar.gz/modules/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/lc3b/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3barch.c -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3barch.c Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3barch.h -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3barch.h Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3bbc.c -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3bbc.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: lc3bbc.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -44,6 +43,7 @@
                                long new_val, /*@out@*/ long *neg_thres,
                                /*@out@*/ long *pos_thres);
 static int lc3b_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                                unsigned char *bufstart,
                                 void *d, yasm_output_value_func output_value,
                                 /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -165,12 +165,14 @@
 }
 
 static int
-lc3b_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+lc3b_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                     unsigned char *bufstart, void *d,
                      yasm_output_value_func output_value,
                      /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     lc3b_insn *insn = (lc3b_insn *)bc->contents;
     /*@only@*/ yasm_intnum *delta;
+    unsigned long buf_off = (unsigned long)(*bufp - bufstart);
 
     /* Output opcode */
     YASM_SAVE_16_L(*bufp, insn->opcode);
@@ -181,29 +183,29 @@
             break;
         case LC3B_IMM_4:
             insn->imm.size = 4;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_5:
             insn->imm.size = 5;
             insn->imm.sign = 1;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_6_WORD:
             insn->imm.size = 6;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_6_BYTE:
             insn->imm.size = 6;
             insn->imm.sign = 1;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_8:
             insn->imm.size = 8;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_9_PC:
@@ -220,12 +222,12 @@
 
             insn->imm.size = 9;
             insn->imm.sign = 1;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_9:
             insn->imm.size = 9;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         default:

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3bid.re -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3bid.re Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/lc3b/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/tests/lc3b_test.sh -> yasm-1.2.0.tar.gz/modules/arch/lc3b/tests/lc3b_test.sh Changed

yasm-1.1.0.tar.gz/modules/arch/x86/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/x86/gen_x86_insn.py -> yasm-1.2.0.tar.gz/modules/arch/x86/gen_x86_insn.py Changed

@@ -28,13 +28,8 @@
 
 from sys import stdout, version_info
 
-rcstag = "$Id: gen_x86_insn.py 2346 2010-08-01 01:37:37Z peter $"
-try:
-    scriptname = rcstag.split()[1]
-    scriptrev = rcstag.split()[2]
-except IndexError:
-    scriptname = "gen_x86_insn.py"
-    scriptrev = "HEAD"
+scriptname = "gen_x86_insn.py"
+scriptrev = "HEAD"
 
 ordered_cpus = [
     "086", "186", "286", "386", "486", "586", "686", "K6", "Athlon", "P3",
@@ -43,7 +38,8 @@
     "FPU", "Cyrix", "AMD", "MMX", "3DNow", "SMM", "SSE", "SSE2",
     "SSE3", "SVM", "PadLock", "SSSE3", "SSE41", "SSE42", "SSE4a", "SSE5",
     "AVX", "FMA", "AES", "CLMUL", "MOVBE", "XOP", "FMA4", "F16C",
-    "FSGSBASE", "RDRAND", "XSAVEOPT", "EPTVPID", "SMX"]
+    "FSGSBASE", "RDRAND", "XSAVEOPT", "EPTVPID", "SMX", "AVX2", "BMI1",
+    "BMI2", "INVPCID", "LZCNT"]
 unordered_cpu_features = ["Priv", "Prot", "Undoc", "Obs"]
 
 # Predefined VEX prefix field values
@@ -560,11 +556,13 @@
                         keyword = name
                     else:
                         keyword = name+suffix
+                    keyword = keyword.lower()
                     if keyword in gas_insns:
                         raise ValueError("duplicate gas instruction %s" %
                                          keyword)
                     newinsn = insn.copy()
-                    newinsn.suffix = suffix
+                    if insn.suffix is None:
+                        newinsn.suffix = suffix
                     newinsn.auto_cpu("gas")
                     newinsn.auto_misc_flags("gas")
                     gas_insns[keyword] = newinsn
@@ -1131,6 +1129,10 @@
 # Push instructions
 #
 add_group("push",
+    def_opersize_64=64,
+    opcode=[0x50],
+    operands=[Operand(type="Reg", size="BITS", dest="Op0Add")])
+add_group("push",
     suffix="w",
     opersize=16,
     def_opersize_64=64,
@@ -1144,9 +1146,16 @@
     operands=[Operand(type="Reg", size=32, dest="Op0Add")])
 add_group("push",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0x50],
     operands=[Operand(type="Reg", size=64, dest="Op0Add")])
+
+add_group("push",
+    def_opersize_64=64,
+    opcode=[0xFF],
+    spare=6,
+    operands=[Operand(type="RM", size="BITS", dest="EA")])
 add_group("push",
     suffix="w",
     opersize=16,
@@ -1163,10 +1172,12 @@
     operands=[Operand(type="RM", size=32, dest="EA")])
 add_group("push",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0xFF],
     spare=6,
     operands=[Operand(type="RM", size=64, dest="EA")])
+
 add_group("push",
     cpu=["186"],
     parsers=["nasm"],
@@ -1338,6 +1349,10 @@
 # Pop instructions
 #
 add_group("pop",
+    def_opersize_64=64,
+    opcode=[0x58],
+    operands=[Operand(type="Reg", size="BITS", dest="Op0Add")])
+add_group("pop",
     suffix="w",
     opersize=16,
     def_opersize_64=64,
@@ -1351,9 +1366,15 @@
     operands=[Operand(type="Reg", size=32, dest="Op0Add")])
 add_group("pop",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0x58],
     operands=[Operand(type="Reg", size=64, dest="Op0Add")])
+
+add_group("pop",
+    def_opersize_64=64,
+    opcode=[0x8F],
+    operands=[Operand(type="RM", size="BITS", dest="EA")])
 add_group("pop",
     suffix="w",
     opersize=16,
@@ -1368,9 +1389,11 @@
     operands=[Operand(type="RM", size=32, dest="EA")])
 add_group("pop",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0x8F],
     operands=[Operand(type="RM", size=64, dest="EA")])
+
 # POP CS is debateably valid on the 8086, if obsolete and undocumented.
 # We don't include it because it's VERY unlikely it will ever be used
 # anywhere.  If someone really wants it they can db 0x0F it.
@@ -1727,7 +1750,7 @@
 add_insn("lds", "ldes", modifiers=[0xC5])
 add_insn("les", "ldes", modifiers=[0xC4])
 
-for sfx, sz in zip("wl", [16, 32]):
+for sfx, sz in zip("wlq", [16, 32, 64]):
     add_group("lfgss",
         suffix=sfx,
         cpu=["386"],
@@ -3079,8 +3102,24 @@
 #
 # Protection control
 #
-add_insn("lar", "bsfr", modifiers=[0x02], cpu=["286", "Prot"])
-add_insn("lsl", "bsfr", modifiers=[0x03], cpu=["286", "Prot"])
+for sfx, sz, sz2 in zip("wlq", [16, 32, 64], [16, 32, 32]):
+    add_group("larlsl",
+        suffix=sfx,
+        modifiers=["Op1Add"],
+        opersize=sz,
+        opcode=[0x0F, 0x00],
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="Reg", size=sz2, dest="EA")])
+    add_group("larlsl",
+        suffix=sfx,
+        modifiers=["Op1Add"],
+        opersize=sz,
+        opcode=[0x0F, 0x00],
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=16, relaxed=True, dest="EA")])
+
+add_insn("lar", "larlsl", modifiers=[0x02], cpu=["286", "Prot"])
+add_insn("lsl", "larlsl", modifiers=[0x03], cpu=["286", "Prot"])
 
 add_group("arpl",
     suffix="w",
@@ -3953,44 +3992,44 @@
 add_insn("pxor",      "mmxsse2", modifiers=[0xEF])
 
 # AVX versions don't support the MMX registers
-add_insn("vpackssdw",  "xmm_xmm128", modifiers=[0x66, 0x6B, VEXL0], avx=True)
-add_insn("vpacksswb",  "xmm_xmm128", modifiers=[0x66, 0x63, VEXL0], avx=True)
-add_insn("vpackuswb",  "xmm_xmm128", modifiers=[0x66, 0x67, VEXL0], avx=True)
-add_insn("vpaddb",     "xmm_xmm128", modifiers=[0x66, 0xFC, VEXL0], avx=True)
-add_insn("vpaddw",     "xmm_xmm128", modifiers=[0x66, 0xFD, VEXL0], avx=True)
-add_insn("vpaddd",     "xmm_xmm128", modifiers=[0x66, 0xFE, VEXL0], avx=True)
-add_insn("vpaddq",     "xmm_xmm128", modifiers=[0x66, 0xD4, VEXL0], avx=True)
-add_insn("vpaddsb",    "xmm_xmm128", modifiers=[0x66, 0xEC, VEXL0], avx=True)
-add_insn("vpaddsw",    "xmm_xmm128", modifiers=[0x66, 0xED, VEXL0], avx=True)
-add_insn("vpaddusb",   "xmm_xmm128", modifiers=[0x66, 0xDC, VEXL0], avx=True)
-add_insn("vpaddusw",   "xmm_xmm128", modifiers=[0x66, 0xDD, VEXL0], avx=True)
-add_insn("vpand",      "xmm_xmm128", modifiers=[0x66, 0xDB, VEXL0], avx=True)
-add_insn("vpandn",     "xmm_xmm128", modifiers=[0x66, 0xDF, VEXL0], avx=True)
-add_insn("vpcmpeqb",   "xmm_xmm128", modifiers=[0x66, 0x74, VEXL0], avx=True)
-add_insn("vpcmpeqw",   "xmm_xmm128", modifiers=[0x66, 0x75, VEXL0], avx=True)
-add_insn("vpcmpeqd",   "xmm_xmm128", modifiers=[0x66, 0x76, VEXL0], avx=True)
-add_insn("vpcmpgtb",   "xmm_xmm128", modifiers=[0x66, 0x64, VEXL0], avx=True)
-add_insn("vpcmpgtw",   "xmm_xmm128", modifiers=[0x66, 0x65, VEXL0], avx=True)
-add_insn("vpcmpgtd",   "xmm_xmm128", modifiers=[0x66, 0x66, VEXL0], avx=True)
-add_insn("vpmaddwd",   "xmm_xmm128", modifiers=[0x66, 0xF5, VEXL0], avx=True)
-add_insn("vpmulhw",    "xmm_xmm128", modifiers=[0x66, 0xE5, VEXL0], avx=True)
-add_insn("vpmullw",    "xmm_xmm128", modifiers=[0x66, 0xD5, VEXL0], avx=True)
-add_insn("vpor",       "xmm_xmm128", modifiers=[0x66, 0xEB, VEXL0], avx=True)
-add_insn("vpsubb",     "xmm_xmm128", modifiers=[0x66, 0xF8, VEXL0], avx=True)
-add_insn("vpsubw",     "xmm_xmm128", modifiers=[0x66, 0xF9, VEXL0], avx=True)
-add_insn("vpsubd",     "xmm_xmm128", modifiers=[0x66, 0xFA, VEXL0], avx=True)
-add_insn("vpsubq",     "xmm_xmm128", modifiers=[0x66, 0xFB, VEXL0], avx=True)
-add_insn("vpsubsb",    "xmm_xmm128", modifiers=[0x66, 0xE8, VEXL0], avx=True)
-add_insn("vpsubsw",    "xmm_xmm128", modifiers=[0x66, 0xE9, VEXL0], avx=True)
-add_insn("vpsubusb",   "xmm_xmm128", modifiers=[0x66, 0xD8, VEXL0], avx=True)
-add_insn("vpsubusw",   "xmm_xmm128", modifiers=[0x66, 0xD9, VEXL0], avx=True)
-add_insn("vpunpckhbw", "xmm_xmm128", modifiers=[0x66, 0x68, VEXL0], avx=True)
-add_insn("vpunpckhwd", "xmm_xmm128", modifiers=[0x66, 0x69, VEXL0], avx=True)
-add_insn("vpunpckhdq", "xmm_xmm128", modifiers=[0x66, 0x6A, VEXL0], avx=True)
-add_insn("vpunpcklbw", "xmm_xmm128", modifiers=[0x66, 0x60, VEXL0], avx=True)
-add_insn("vpunpcklwd", "xmm_xmm128", modifiers=[0x66, 0x61, VEXL0], avx=True)
-add_insn("vpunpckldq", "xmm_xmm128", modifiers=[0x66, 0x62, VEXL0], avx=True)
-add_insn("vpxor",      "xmm_xmm128", modifiers=[0x66, 0xEF, VEXL0], avx=True)
+add_insn("vpackssdw",  "xmm_xmm128_256avx2", modifiers=[0x66, 0x6B, VEXL0], avx=True)
+add_insn("vpacksswb",  "xmm_xmm128_256avx2", modifiers=[0x66, 0x63, VEXL0], avx=True)
+add_insn("vpackuswb",  "xmm_xmm128_256avx2", modifiers=[0x66, 0x67, VEXL0], avx=True)
+add_insn("vpaddb",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xFC, VEXL0], avx=True)
+add_insn("vpaddw",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xFD, VEXL0], avx=True)
+add_insn("vpaddd",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xFE, VEXL0], avx=True)
+add_insn("vpaddq",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xD4, VEXL0], avx=True)
+add_insn("vpaddsb",    "xmm_xmm128_256avx2", modifiers=[0x66, 0xEC, VEXL0], avx=True)
+add_insn("vpaddsw",    "xmm_xmm128_256avx2", modifiers=[0x66, 0xED, VEXL0], avx=True)
+add_insn("vpaddusb",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xDC, VEXL0], avx=True)
+add_insn("vpaddusw",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xDD, VEXL0], avx=True)
+add_insn("vpand",      "xmm_xmm128_256avx2", modifiers=[0x66, 0xDB, VEXL0], avx=True)
+add_insn("vpandn",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xDF, VEXL0], avx=True)
+add_insn("vpcmpeqb",   "xmm_xmm128_256avx2", modifiers=[0x66, 0x74, VEXL0], avx=True)
+add_insn("vpcmpeqw",   "xmm_xmm128_256avx2", modifiers=[0x66, 0x75, VEXL0], avx=True)
+add_insn("vpcmpeqd",   "xmm_xmm128_256avx2", modifiers=[0x66, 0x76, VEXL0], avx=True)
+add_insn("vpcmpgtb",   "xmm_xmm128_256avx2", modifiers=[0x66, 0x64, VEXL0], avx=True)
+add_insn("vpcmpgtw",   "xmm_xmm128_256avx2", modifiers=[0x66, 0x65, VEXL0], avx=True)
+add_insn("vpcmpgtd",   "xmm_xmm128_256avx2", modifiers=[0x66, 0x66, VEXL0], avx=True)
+add_insn("vpmaddwd",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xF5, VEXL0], avx=True)
+add_insn("vpmulhw",    "xmm_xmm128_256avx2", modifiers=[0x66, 0xE5, VEXL0], avx=True)
+add_insn("vpmullw",    "xmm_xmm128_256avx2", modifiers=[0x66, 0xD5, VEXL0], avx=True)
+add_insn("vpor",       "xmm_xmm128_256avx2", modifiers=[0x66, 0xEB, VEXL0], avx=True)
+add_insn("vpsubb",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xF8, VEXL0], avx=True)
+add_insn("vpsubw",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xF9, VEXL0], avx=True)
+add_insn("vpsubd",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xFA, VEXL0], avx=True)
+add_insn("vpsubq",     "xmm_xmm128_256avx2", modifiers=[0x66, 0xFB, VEXL0], avx=True)
+add_insn("vpsubsb",    "xmm_xmm128_256avx2", modifiers=[0x66, 0xE8, VEXL0], avx=True)
+add_insn("vpsubsw",    "xmm_xmm128_256avx2", modifiers=[0x66, 0xE9, VEXL0], avx=True)
+add_insn("vpsubusb",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xD8, VEXL0], avx=True)
+add_insn("vpsubusw",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xD9, VEXL0], avx=True)
+add_insn("vpunpckhbw", "xmm_xmm128_256avx2", modifiers=[0x66, 0x68, VEXL0], avx=True)
+add_insn("vpunpckhwd", "xmm_xmm128_256avx2", modifiers=[0x66, 0x69, VEXL0], avx=True)
+add_insn("vpunpckhdq", "xmm_xmm128_256avx2", modifiers=[0x66, 0x6A, VEXL0], avx=True)
+add_insn("vpunpcklbw", "xmm_xmm128_256avx2", modifiers=[0x66, 0x60, VEXL0], avx=True)
+add_insn("vpunpcklwd", "xmm_xmm128_256avx2", modifiers=[0x66, 0x61, VEXL0], avx=True)
+add_insn("vpunpckldq", "xmm_xmm128_256avx2", modifiers=[0x66, 0x62, VEXL0], avx=True)
+add_insn("vpxor",      "xmm_xmm128_256avx2", modifiers=[0x66, 0xEF, VEXL0], avx=True)
 
 add_group("pshift",
     cpu=["MMX"],
@@ -4031,42 +4070,43 @@
 add_insn("psrlq", "pshift", modifiers=[0xD3, 0x73, 2])
 
 # Ran out of modifiers, so AVX has to be separate
-add_group("vpshift",
-    cpu=["AVX"],
-    modifiers=["Op1Add"],
-    vex=128,
-    prefix=0x66,
-    opcode=[0x0F, 0x00],
-    operands=[Operand(type="SIMDReg", size=128, dest="SpareVEX"),
-              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
-add_group("vpshift",
-    cpu=["AVX"],
-    modifiers=["Gap", "Op1Add", "SpAdd"],
-    vex=128,
-    prefix=0x66,
-    opcode=[0x0F, 0x00],
-    spare=0,
-    operands=[Operand(type="SIMDReg", size=128, dest="EAVEX"),
-              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
-add_group("vpshift",
-    cpu=["AVX"],
-    modifiers=["Op1Add"],
-    vex=128,
-    prefix=0x66,
-    opcode=[0x0F, 0x00],
-    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
-              Operand(type="SIMDReg", size=128, dest="VEX"),
-              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
-add_group("vpshift",
-    cpu=["AVX"],
-    modifiers=["Gap", "Op1Add", "SpAdd"],
-    vex=128,
-    prefix=0x66,
-    opcode=[0x0F, 0x00],
-    spare=0,
-    operands=[Operand(type="SIMDReg", size=128, dest="VEX"),
-              Operand(type="SIMDReg", size=128, dest="EA"),
-              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+for cpu, sz in zip(["AVX", "AVX2"], [128, 256]):
+    add_group("vpshift",
+        cpu=[cpu],
+        modifiers=["Op1Add"],
+        vex=sz,
+        prefix=0x66,
+        opcode=[0x0F, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="SpareVEX"),
+                  Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
+    add_group("vpshift",
+        cpu=[cpu],
+        modifiers=["Gap", "Op1Add", "SpAdd"],
+        vex=sz,
+        prefix=0x66,
+        opcode=[0x0F, 0x00],
+        spare=0,
+        operands=[Operand(type="SIMDReg", size=sz, dest="EAVEX"),
+                  Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+    add_group("vpshift",
+        cpu=[cpu],
+        modifiers=["Op1Add"],
+        vex=sz,
+        prefix=0x66,
+        opcode=[0x0F, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
+    add_group("vpshift",
+        cpu=[cpu],
+        modifiers=["Gap", "Op1Add", "SpAdd"],
+        vex=sz,
+        prefix=0x66,
+        opcode=[0x0F, 0x00],
+        spare=0,
+        operands=[Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDReg", size=sz, dest="EA"),
+                  Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
 
 add_insn("vpsllw", "vpshift", modifiers=[0xF1, 0x71, 6])
 add_insn("vpslld", "vpshift", modifiers=[0xF2, 0x72, 6])
@@ -4090,14 +4130,14 @@
 add_insn("psadbw",  "mmxsse2", modifiers=[0xF6], cpu=["P3", "MMX"])
 
 # AVX versions don't support MMX register
-add_insn("vpavgb",   "xmm_xmm128", modifiers=[0x66, 0xE0, VEXL0], avx=True)
-add_insn("vpavgw",   "xmm_xmm128", modifiers=[0x66, 0xE3, VEXL0], avx=True)
-add_insn("vpmaxsw",  "xmm_xmm128", modifiers=[0x66, 0xEE, VEXL0], avx=True)
-add_insn("vpmaxub",  "xmm_xmm128", modifiers=[0x66, 0xDE, VEXL0], avx=True)
-add_insn("vpminsw",  "xmm_xmm128", modifiers=[0x66, 0xEA, VEXL0], avx=True)
-add_insn("vpminub",  "xmm_xmm128", modifiers=[0x66, 0xDA, VEXL0], avx=True)
-add_insn("vpmulhuw", "xmm_xmm128", modifiers=[0x66, 0xE4, VEXL0], avx=True)
-add_insn("vpsadbw",  "xmm_xmm128", modifiers=[0x66, 0xF6, VEXL0], avx=True)
+add_insn("vpavgb",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xE0, VEXL0], avx=True)
+add_insn("vpavgw",   "xmm_xmm128_256avx2", modifiers=[0x66, 0xE3, VEXL0], avx=True)
+add_insn("vpmaxsw",  "xmm_xmm128_256avx2", modifiers=[0x66, 0xEE, VEXL0], avx=True)
+add_insn("vpmaxub",  "xmm_xmm128_256avx2", modifiers=[0x66, 0xDE, VEXL0], avx=True)
+add_insn("vpminsw",  "xmm_xmm128_256avx2", modifiers=[0x66, 0xEA, VEXL0], avx=True)
+add_insn("vpminub",  "xmm_xmm128_256avx2", modifiers=[0x66, 0xDA, VEXL0], avx=True)
+add_insn("vpmulhuw", "xmm_xmm128_256avx2", modifiers=[0x66, 0xE4, VEXL0], avx=True)
+add_insn("vpsadbw",  "xmm_xmm128_256avx2", modifiers=[0x66, 0xF6, VEXL0], avx=True)
 
 add_insn("prefetchnta", "twobytemem", modifiers=[0, 0x0F, 0x18], cpu=["P3"])
 add_insn("prefetcht0", "twobytemem", modifiers=[1, 0x0F, 0x18], cpu=["P3"])
@@ -4128,6 +4168,49 @@
     vex=256,
     prefix=0x00,
     opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
+add_group("xmm_xmm128_256",
+    cpu=["AVX"],
+    modifiers=["PreAdd", "Op1Add"],
+    vex=256,
+    prefix=0x00,
+    opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
+
+# Same as above, except 256-bit version only available in AVX2
+add_group("xmm_xmm128_256avx2",
+    cpu=["SSE"],
+    modifiers=["PreAdd", "Op1Add", "SetVEX"],
+    prefix=0x00,
+    opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
+add_group("xmm_xmm128_256avx2",
+    cpu=["AVX"],
+    modifiers=["PreAdd", "Op1Add"],
+    vex=128,
+    prefix=0x00,
+    opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="SIMDReg", size=128, dest="VEX"),
+              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
+add_group("xmm_xmm128_256avx2",
+    cpu=["AVX2"],
+    modifiers=["PreAdd", "Op1Add"],
+    vex=256,
+    prefix=0x00,
+    opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
+add_group("xmm_xmm128_256avx2",
+    cpu=["AVX2"],
+    modifiers=["PreAdd", "Op1Add"],
+    vex=256,
+    prefix=0x00,
+    opcode=[0x0F, 0x00],
     operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="SIMDReg", size=256, dest="VEX"),
               Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
@@ -4482,6 +4565,23 @@
 add_insn("cmpps", "xmm_xmm128_imm", modifiers=[0, 0xC2])
 add_insn("shufps", "xmm_xmm128_imm", modifiers=[0, 0xC6])
 
+# YMM register AVX2 version of above
+add_group("xmm_xmm128_imm_256avx2",
+    cpu=["SSE"],
+    modifiers=["PreAdd", "Op1Add", "SetVEX"],
+    opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("xmm_xmm128_imm_256avx2",
+    cpu=["AVX2"],
+    modifiers=["PreAdd", "Op1Add"],
+    vex=256,
+    opcode=[0x0F, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+
 # YMM register and 4-operand version of above
 add_group("xmm_xmm128_imm_256",
     cpu=["SSE"],
@@ -4947,10 +5047,19 @@
     operands=[Operand(type="Reg", size=32, dest="Spare"),
               Operand(type="SIMDReg", size=128, dest="EA")])
 add_group("pmovmskb",
+    suffix="l",
+    cpu=["AVX2"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0xD7],
+    operands=[Operand(type="Reg", size=32, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="EA")])
+add_group("pmovmskb",
     suffix="q",
     cpu=["MMX", "P3"],
     notavx=True,
     opersize=64,
+    def_opersize_64=64,
     opcode=[0x0F, 0xD7],
     operands=[Operand(type="Reg", size=64, dest="Spare"),
               Operand(type="SIMDReg", size=64, dest="EA")])
@@ -4959,10 +5068,21 @@
     cpu=["SSE2"],
     modifiers=["SetVEX"],
     opersize=64,
+    def_opersize_64=64,
     prefix=0x66,
     opcode=[0x0F, 0xD7],
     operands=[Operand(type="Reg", size=64, dest="Spare"),
               Operand(type="SIMDReg", size=128, dest="EA")])
+add_group("pmovmskb",
+    suffix="q",
+    cpu=["SSE2"],
+    vex=256,
+    opersize=64,
+    def_opersize_64=64,
+    prefix=0x66,
+    opcode=[0x0F, 0xD7],
+    operands=[Operand(type="Reg", size=64, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="EA")])
 
 add_insn("pmovmskb", "pmovmskb")
 add_insn("vpmovmskb", "pmovmskb", modifiers=[VEXL0], avx=True)
@@ -5373,12 +5493,12 @@
 add_insn("vcvttsd2si", "cvt_rx_xmm64", modifiers=[0xF2, 0x2C, VEXL0], avx=True)
 # vcvttpd2dq takes xmm, ymm combination
 # vcvttps2dq is two-operand
-add_insn("vpmuludq", "xmm_xmm128", modifiers=[0x66, 0xF4, VEXL0], avx=True)
-add_insn("vpshufd", "xmm_xmm128_imm", modifiers=[0x66, 0x70, VEXL0], avx=True)
-add_insn("vpshufhw", "xmm_xmm128_imm", modifiers=[0xF3, 0x70, VEXL0], avx=True)
-add_insn("vpshuflw", "xmm_xmm128_imm", modifiers=[0xF2, 0x70, VEXL0], avx=True)
-add_insn("vpunpckhqdq", "xmm_xmm128", modifiers=[0x66, 0x6D, VEXL0], avx=True)
-add_insn("vpunpcklqdq", "xmm_xmm128", modifiers=[0x66, 0x6C, VEXL0], avx=True)
+add_insn("vpmuludq", "xmm_xmm128_256avx2", modifiers=[0x66, 0xF4, VEXL0], avx=True)
+add_insn("vpshufd", "xmm_xmm128_imm_256avx2", modifiers=[0x66, 0x70, VEXL0], avx=True)
+add_insn("vpshufhw", "xmm_xmm128_imm_256avx2", modifiers=[0xF3, 0x70, VEXL0], avx=True)
+add_insn("vpshuflw", "xmm_xmm128_imm_256avx2", modifiers=[0xF2, 0x70, VEXL0], avx=True)
+add_insn("vpunpckhqdq", "xmm_xmm128_256avx2", modifiers=[0x66, 0x6D, VEXL0], avx=True)
+add_insn("vpunpcklqdq", "xmm_xmm128_256avx2", modifiers=[0x66, 0x6C, VEXL0], avx=True)
 
 add_insn("cvtss2sd", "xmm_xmm32", modifiers=[0xF3, 0x5A], cpu=["SSE2"])
 add_insn("vcvtss2sd", "xmm_xmm32", modifiers=[0xF3, 0x5A, VEXL0], avx=True)
@@ -5434,6 +5554,25 @@
     operands=[Operand(type="SIMDReg", size=128, dest="VEX"),
               Operand(type="SIMDReg", size=128, dest="EA"),
               Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("pslrldq",
+    cpu=["AVX2"],
+    modifiers=["SpAdd"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x73],
+    spare=0,
+    operands=[Operand(type="SIMDReg", size=256, dest="EAVEX"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("pslrldq",
+    cpu=["AVX2"],
+    modifiers=["SpAdd"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x73],
+    spare=0,
+    operands=[Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDReg", size=256, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
 
 add_insn("pslldq", "pslrldq", modifiers=[7])
 add_insn("psrldq", "pslrldq", modifiers=[3])
@@ -5510,6 +5649,23 @@
     operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
               Operand(type="SIMDReg", size=128, dest="VEX"),
               Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
+add_group("ssse3",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
+add_group("ssse3",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
 
 add_insn("pshufb",    "ssse3", modifiers=[0x00])
 add_insn("phaddw",    "ssse3", modifiers=[0x01])
@@ -5558,7 +5714,7 @@
               Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
 
 add_insn("palignr", "ssse3imm", modifiers=[0x0F])
-add_insn("vpalignr", "sse4imm", modifiers=[0x0F, VEXL0], avx=True)
+add_insn("vpalignr", "sse4imm_256avx2", modifiers=[0x0F, VEXL0], avx=True)
 
 #####################################################################
 # SSE4.1 / SSE4.2 instructions
@@ -5638,6 +5794,54 @@
     vex=256,
     prefix=0x66,
     opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("sse4imm_256",
+    cpu=["AVX"],
+    modifiers=["Op2Add"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+
+# Same as above except AVX2 required for 256-bit.
+add_group("sse4imm_256avx2",
+    cpu=["SSE41"],
+    modifiers=["Op2Add", "SetVEX"],
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("sse4imm_256avx2",
+    cpu=["AVX"],
+    modifiers=["Op2Add"],
+    vex=128,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="SIMDReg", size=128, dest="VEX"),
+              Operand(type="SIMDRM", size=128, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("sse4imm_256avx2",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="SpareVEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+add_group("sse4imm_256avx2",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
     operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="SIMDReg", size=256, dest="VEX"),
               Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
@@ -5712,13 +5916,14 @@
 add_insn("roundsd", "sse4m64imm", modifiers=[0x0B])
 add_insn("roundss", "sse4m32imm", modifiers=[0x0A])
 
-# vdppd, vmpsadbw, and vpblendw do not allow YMM registers
+# vdppd does not allow YMM registers
+# vmpsadbw and vpblendw do not allow YMM registers unless AVX2
 add_insn("vblendpd", "sse4imm_256", modifiers=[0x0D, VEXL0], avx=True)
 add_insn("vblendps", "sse4imm_256", modifiers=[0x0C, VEXL0], avx=True)
 add_insn("vdppd",    "sse4imm", modifiers=[0x41, VEXL0], avx=True)
 add_insn("vdpps",    "sse4imm_256", modifiers=[0x40, VEXL0], avx=True)
-add_insn("vmpsadbw", "sse4imm", modifiers=[0x42, VEXL0], avx=True)
-add_insn("vpblendw", "sse4imm", modifiers=[0x0E, VEXL0], avx=True)
+add_insn("vmpsadbw", "sse4imm_256avx2", modifiers=[0x42, VEXL0], avx=True)
+add_insn("vpblendw", "sse4imm_256avx2", modifiers=[0x0E, VEXL0], avx=True)
 # vroundpd and vroundps don't add another register operand
 add_insn("vroundsd", "sse4m64imm", modifiers=[0x0B, VEXL0], avx=True)
 add_insn("vroundss", "sse4m32imm", modifiers=[0x0A, VEXL0], avx=True)
@@ -5768,9 +5973,9 @@
 add_insn("vblendvpd", "avx_sse4xmm0", modifiers=[0x4B])
 add_insn("vblendvps", "avx_sse4xmm0", modifiers=[0x4A])
 
-# vpblendvb doesn't have a 256-bit form
-add_group("avx_sse4xmm0_128",
-    cpu=["AVX"],
+# vpblendvb didn't have a 256-bit form until AVX2
+add_group("avx2_sse4xmm0",
+    cpu=["AVX2"],
     modifiers=["Op2Add"],
     vex=128,
     prefix=0x66,
@@ -5779,8 +5984,18 @@
               Operand(type="SIMDReg", size=128, dest="VEX"),
               Operand(type="SIMDRM", size=128, relaxed=True, dest="EA"),
               Operand(type="SIMDReg", size=128, dest="VEXImmSrc")])
+add_group("avx2_sse4xmm0",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=256, dest="VEXImmSrc")])
 
-add_insn("vpblendvb", "avx_sse4xmm0_128", modifiers=[0x4C])
+add_insn("vpblendvb", "avx2_sse4xmm0", modifiers=[0x4C])
 
 for sfx, sz in zip("bwl", [8, 16, 32]):
     add_group("crc32",
@@ -5869,6 +6084,13 @@
     opcode=[0x0F, 0x38, 0x2A],
     operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
               Operand(type="Mem", size=128, relaxed=True, dest="EA")])
+add_group("movntdqa",
+    cpu=["AVX2"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x2A],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="Mem", size=256, relaxed=True, dest="EA")])
 
 add_insn("movntdqa", "movntdqa")
 add_insn("vmovntdqa", "movntdqa", modifiers=[VEXL0], avx=True)
@@ -6043,6 +6265,22 @@
         opcode=[0x0F, 0x38, 0x00],
         operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
                   Operand(type="SIMDReg", size=128, dest="EA")])
+    add_group("sse4m%d" % sz,
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=256,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x00],
+        operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+                  Operand(type="Mem", size=sz*2, relaxed=True, dest="EA")])
+    add_group("sse4m%d" % sz,
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=256,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x00],
+        operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+                  Operand(type="SIMDReg", size=128, dest="EA")])
 
 add_insn("pmovsxbw", "sse4m64", modifiers=[0x20])
 add_insn("pmovsxwd", "sse4m64", modifiers=[0x23])
@@ -6319,12 +6557,22 @@
     opcode=[0x0F, 0x38, 0x00],
     operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
               Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
-
-add_insn("vpabsb",     "avx_ssse3_2op", modifiers=[0x1C], avx=True)
-add_insn("vpabsw",     "avx_ssse3_2op", modifiers=[0x1D], avx=True)
-add_insn("vpabsd",     "avx_ssse3_2op", modifiers=[0x1E], avx=True)
 add_insn("vphminposuw", "avx_ssse3_2op", modifiers=[0x41], avx=True)
 
+# VPABS* are extended to 256-bit in AVX2
+for cpu, sz in zip(["AVX", "AVX2"], [128, 256]):
+    add_group("avx2_ssse3_2op",
+        cpu=[cpu],
+        modifiers=["Op2Add"],
+        vex=sz,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDRM", size=sz, relaxed=True, dest="EA")])
+add_insn("vpabsb",     "avx2_ssse3_2op", modifiers=[0x1C], avx=True)
+add_insn("vpabsw",     "avx2_ssse3_2op", modifiers=[0x1D], avx=True)
+add_insn("vpabsd",     "avx2_ssse3_2op", modifiers=[0x1E], avx=True)
+
 # Some conversion functions take xmm, ymm combination
 # Need separate x and y versions for gas mode
 add_group("avx_cvt_xmm128_x",
@@ -6391,6 +6639,20 @@
     opcode=[0x0F, 0x38, 0x18],
     operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="Mem", size=32, relaxed=True, dest="EA")])
+add_group("vbroadcastss",
+    cpu=["AVX2"],
+    vex=128,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x18],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="SIMDReg", size=128, dest="EA")])
+add_group("vbroadcastss",
+    cpu=["AVX2"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x18],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=128, dest="EA")])
 
 add_insn("vbroadcastss", "vbroadcastss")
 
@@ -6401,41 +6663,51 @@
     opcode=[0x0F, 0x38, 0x19],
     operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="Mem", size=64, relaxed=True, dest="EA")])
+add_group("vbroadcastsd",
+    cpu=["AVX2"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x19],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=128, dest="EA")])
 
 add_insn("vbroadcastsd", "vbroadcastsd")
 
-add_group("vbroadcastf128",
-    cpu=["AVX"],
+add_group("vbroadcastif128",
+    modifiers=["Op2Add"],
     vex=256,
     prefix=0x66,
-    opcode=[0x0F, 0x38, 0x1A],
+    opcode=[0x0F, 0x38, 0x00],
     operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="Mem", size=128, relaxed=True, dest="EA")])
 
-add_insn("vbroadcastf128", "vbroadcastf128")
+add_insn("vbroadcastf128", "vbroadcastif128", modifiers=[0x1A], cpu=["AVX"])
+add_insn("vbroadcasti128", "vbroadcastif128", modifiers=[0x5A], cpu=["AVX2"])
 
-add_group("vextractf128",
-    cpu=["AVX"],
+add_group("vextractif128",
+    modifiers=["Op2Add"],
     vex=256,
     prefix=0x66,
-    opcode=[0x0F, 0x3A, 0x19],
+    opcode=[0x0F, 0x3A, 0x00],
     operands=[Operand(type="SIMDRM", size=128, relaxed=True, dest="EA"),
               Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
 
-add_insn("vextractf128", "vextractf128")
+add_insn("vextractf128", "vextractif128", modifiers=[0x19], cpu=["AVX"])
+add_insn("vextracti128", "vextractif128", modifiers=[0x39], cpu=["AVX2"])
 
-add_group("vinsertf128",
-    cpu=["AVX"],
+add_group("vinsertif128",
+    modifiers=["Op2Add"],
     vex=256,
     prefix=0x66,
-    opcode=[0x0F, 0x3A, 0x18],
+    opcode=[0x0F, 0x3A, 0x00],
     operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
               Operand(type="SIMDReg", size=256, dest="VEX"),
               Operand(type="SIMDRM", size=128, relaxed=True, dest="EA"),
               Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
 
-add_insn("vinsertf128", "vinsertf128")
+add_insn("vinsertf128", "vinsertif128", modifiers=[0x18], cpu=["AVX"])
+add_insn("vinserti128", "vinsertif128", modifiers=[0x38], cpu=["AVX2"])
 
 add_group("vzero",
     cpu=["AVX"],
@@ -6447,7 +6719,6 @@
 add_insn("vzeroupper", "vzero", modifiers=[VEXL0])
 
 add_group("vmaskmov",
-    cpu=["AVX"],
     modifiers=["Op2Add"],
     vex=128,
     prefix=0x66,
@@ -6456,7 +6727,6 @@
               Operand(type="SIMDReg", size=128, dest="VEX"),
               Operand(type="SIMDRM", size=128, relaxed=True, dest="EA")])
 add_group("vmaskmov",
-    cpu=["AVX"],
     modifiers=["Op2Add"],
     vex=256,
     prefix=0x66,
@@ -6465,7 +6735,6 @@
               Operand(type="SIMDReg", size=256, dest="VEX"),
               Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
 add_group("vmaskmov",
-    cpu=["AVX"],
     modifiers=["Op2Add"],
     vex=128,
     prefix=0x66,
@@ -6474,7 +6743,6 @@
               Operand(type="SIMDReg", size=128, dest="VEX"),
               Operand(type="SIMDReg", size=128, dest="Spare")])
 add_group("vmaskmov",
-    cpu=["AVX"],
     modifiers=["Op2Add"],
     vex=256,
     prefix=0x66,
@@ -6483,8 +6751,8 @@
               Operand(type="SIMDReg", size=256, dest="VEX"),
               Operand(type="SIMDReg", size=256, dest="Spare")])
 
-add_insn("vmaskmovps", "vmaskmov", modifiers=[0x2C])
-add_insn("vmaskmovpd", "vmaskmov", modifiers=[0x2D])
+add_insn("vmaskmovps", "vmaskmov", modifiers=[0x2C], cpu=["AVX"])
+add_insn("vmaskmovpd", "vmaskmov", modifiers=[0x2D], cpu=["AVX"])
 
 add_group("vpermil",
     cpu=["AVX"],
@@ -6539,6 +6807,315 @@
 add_insn("vperm2f128", "vperm2f128")
 
 #####################################################################
+# Intel AVX2 instructions
+#####################################################################
+
+# Most AVX2 instructions are mixed in with above SSEx/AVX groups.
+# Some make more sense to have separate groups.
+
+# vex.vvvv=1111b
+add_group("vperm_var_avx2",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    vexw=0,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
+
+add_insn("vpermd",     "vperm_var_avx2", modifiers=[0x36])
+add_insn("vpermps",    "vperm_var_avx2", modifiers=[0x16])
+
+# vex.vvvv=1111b
+add_group("vperm_imm_avx2",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    vexw=1,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+
+add_insn("vpermq",     "vperm_imm_avx2", modifiers=[0x00])
+add_insn("vpermpd",    "vperm_imm_avx2", modifiers=[0x01])
+
+add_group("vperm2i128_avx2",
+    cpu=["AVX2"],
+    vex=256,
+    prefix=0x66,
+    opcode=[0x0F, 0x3A, 0x46],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="SIMDReg", size=256, dest="VEX"),
+              Operand(type="SIMDRM", size=256, relaxed=True, dest="EA"),
+              Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+
+add_insn("vperm2i128", "vperm2i128_avx2")
+
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastb_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x78],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=128, relaxed=True, dest="EA")])
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastb_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x78],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=8, relaxed=True, dest="EA")])
+
+add_insn("vpbroadcastb", "vpbroadcastb_avx2")
+
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastw_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x79],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=128, relaxed=True, dest="EA")])
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastw_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x79],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=16, relaxed=True, dest="EA")])
+
+add_insn("vpbroadcastw", "vpbroadcastw_avx2")
+
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastd_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x58],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=128, relaxed=True, dest="EA")])
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastd_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x58],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=32, relaxed=True, dest="EA")])
+
+add_insn("vpbroadcastd", "vpbroadcastd_avx2")
+
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastq_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x59],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=128, relaxed=True, dest="EA")])
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vpbroadcastq_avx2",
+        cpu=["AVX2"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x59],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=64, relaxed=True, dest="EA")])
+
+add_insn("vpbroadcastq", "vpbroadcastq_avx2")
+
+for sz in [128, 256]:
+    add_group("vpshiftv_vexw0_avx2",
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDRM", size=sz, relaxed=True, dest="EA")])
+
+for sz in [128, 256]:
+    add_group("vpshiftv_vexw1_avx2",
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=sz,
+        vexw=1,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDRM", size=sz, relaxed=True, dest="EA")])
+
+add_insn("vpsrlvd", "vpshiftv_vexw0_avx2", modifiers=[0x45])
+add_insn("vpsrlvq", "vpshiftv_vexw1_avx2", modifiers=[0x45])
+add_insn("vpsravd", "vpshiftv_vexw0_avx2", modifiers=[0x46])
+
+add_insn("vpsllvd", "vpshiftv_vexw0_avx2", modifiers=[0x47])
+add_insn("vpsllvq", "vpshiftv_vexw1_avx2", modifiers=[0x47])
+
+add_insn("vpmaskmovd", "vmaskmov", modifiers=[0x8C], cpu=["AVX2"])
+
+# vex.vvvv=1111b
+for sz in [128, 256]:
+    add_group("vmaskmov_vexw1_avx2",
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=sz,
+        vexw=1,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDRM", size=sz, relaxed=True, dest="EA")])
+ 
+for sz in [128, 256]:
+    add_group("vmaskmov_vexw1_avx2",
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=sz,
+        vexw=1,
+        prefix=0x66,
+        opcode=[0x0F, 0x38, 0x02],
+        operands=[Operand(type="SIMDRM", size=sz, relaxed=True, dest="EA"),
+                  Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDReg", size=sz, dest="Spare")])
+ 
+add_insn("vpmaskmovq", "vmaskmov_vexw1_avx2", modifiers=[0x8C])
+
+for sz in [128, 256]:
+    add_group("vex_66_0F3A_imm8_avx2",
+        cpu=["AVX2"],
+        modifiers=["Op2Add"],
+        vex=sz,
+        vexw=0,
+        prefix=0x66,
+        opcode=[0x0F, 0x3A, 0x00],
+        operands=[Operand(type="SIMDReg", size=sz, dest="Spare"),
+                  Operand(type="SIMDReg", size=sz, dest="VEX"),
+                  Operand(type="SIMDRM", size=sz, relaxed=True, dest="EA"),
+                  Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+
+add_insn("vpblendd", "vex_66_0F3A_imm8_avx2", modifiers=[0x02]) 
+
+# Vector register in EA.
+add_group("gather_64x_64x",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=128,
+    vexw=1,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="MemXMMIndex", size=64, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=128, dest="VEX")])
+add_group("gather_64x_64x",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    vexw=1,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="MemXMMIndex", size=64, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=256, dest="VEX")])
+add_insn("vgatherdpd", "gather_64x_64x", modifiers=[0x92])
+add_insn("vpgatherdq", "gather_64x_64x", modifiers=[0x90])
+
+add_group("gather_64x_64y",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=128,
+    vexw=1,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="MemXMMIndex", size=64, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=128, dest="VEX")])
+add_group("gather_64x_64y",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    vexw=1,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="MemYMMIndex", size=64, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=256, dest="VEX")])
+add_insn("vgatherqpd", "gather_64x_64y", modifiers=[0x93])
+add_insn("vpgatherqq", "gather_64x_64y", modifiers=[0x91])
+
+add_group("gather_32x_32y",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=128,
+    vexw=0,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="MemXMMIndex", size=32, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=128, dest="VEX")])
+add_group("gather_32x_32y",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    vexw=0,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=256, dest="Spare"),
+              Operand(type="MemYMMIndex", size=32, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=256, dest="VEX")])
+add_insn("vgatherdps", "gather_32x_32y", modifiers=[0x92])
+add_insn("vpgatherdd", "gather_32x_32y", modifiers=[0x90])
+
+add_group("gather_32x_32y_128",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=128,
+    vexw=0,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="MemXMMIndex", size=32, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=128, dest="VEX")])
+add_group("gather_32x_32y_128",
+    cpu=["AVX2"],
+    modifiers=["Op2Add"],
+    vex=256,
+    vexw=0,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x00],
+    operands=[Operand(type="SIMDReg", size=128, dest="Spare"),
+              Operand(type="MemYMMIndex", size=32, relaxed=True, dest="EA"),
+              Operand(type="SIMDReg", size=128, dest="VEX")])
+add_insn("vgatherqps", "gather_32x_32y_128", modifiers=[0x93])
+add_insn("vpgatherqd", "gather_32x_32y_128", modifiers=[0x91])
+
+#####################################################################
 # Intel FMA instructions
 #####################################################################
 
@@ -6564,7 +7141,7 @@
               Operand(type="SIMDReg", size=256, dest="VEX"),
               Operand(type="SIMDRM", size=256, relaxed=True, dest="EA")])
 
-### 128/256b FMA PD(W=1) 
+### 128/256b FMA PD(W=1)
 add_group("vfma_pd",
     cpu=["FMA"],
     modifiers=["Op2Add"],
@@ -7310,6 +7887,115 @@
 add_insn("movbe", "movbe")
 
 #####################################################################
+# Intel advanced bit manipulations (BMI1/2)
+#####################################################################
+
+add_insn("tzcnt", "cnt", modifiers=[0xBC], cpu=["BMI1"])
+# LZCNT is present as AMD ext
+
+for sfx, sz in zip("wlq", [32, 64]):
+    add_group("vex_gpr_ndd_rm_0F38_regext",
+        suffix=sfx,
+        modifiers=["PreAdd", "Op2Add", "SpAdd" ],
+        opersize=sz,
+        prefix=0x00,
+        opcode=[0x0F, 0x38, 0x00],
+        vex=0, ## VEX.L=0
+        operands=[Operand(type="Reg", size=sz, dest="VEX"),
+                  Operand(type="RM", size=sz, relaxed=True, dest="EA")])
+
+
+add_insn("blsr",   "vex_gpr_ndd_rm_0F38_regext", modifiers=[0x00, 0xF3, 1],
+         cpu=["BMI1"])
+add_insn("blsmsk", "vex_gpr_ndd_rm_0F38_regext", modifiers=[0x00, 0xF3, 2],
+         cpu=["BMI1"])
+add_insn("blsi",   "vex_gpr_ndd_rm_0F38_regext", modifiers=[0x00, 0xF3, 3],
+         cpu=["BMI1"])
+
+for sfx, sz in zip("wlq", [32, 64]):
+    add_group("vex_gpr_reg_rm_0F_imm8",
+        suffix=sfx,
+        modifiers=["PreAdd", "Op1Add", "Op2Add"],
+        opersize=sz,
+        prefix=0x00,
+        opcode=[0x0F, 0x00, 0x00],
+        vex=0, ## VEX.L=0
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=sz, relaxed=True, dest="EA"),
+                  Operand(type="Imm", size=8, relaxed=True, dest="Imm")])
+
+add_insn("rorx", "vex_gpr_reg_rm_0F_imm8", modifiers=[0xF2, 0x3A, 0xF0],
+         cpu=["BMI2"])
+
+for sfx, sz in zip("lq", [32, 64]):  # no 16-bit forms
+    add_group("vex_gpr_reg_nds_rm_0F",
+        suffix=sfx,
+        modifiers=["PreAdd", "Op1Add", "Op2Add"],
+        opersize=sz,
+        prefix=0x00,
+        opcode=[0x0F, 0x00, 0x00],
+        vex=0,
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="Reg", size=sz, dest="VEX"),
+                  Operand(type="RM", size=sz, relaxed=True, dest="EA")])
+
+add_insn("andn", "vex_gpr_reg_nds_rm_0F", modifiers=[0x00, 0x38, 0xF2],
+         cpu=["BMI1"])
+
+add_insn("pdep", "vex_gpr_reg_nds_rm_0F", modifiers=[0xF2, 0x38, 0xF5],
+         cpu=["BMI2"])
+add_insn("pext", "vex_gpr_reg_nds_rm_0F", modifiers=[0xF3, 0x38, 0xF5],
+         cpu=["BMI2"])
+
+for sfx, sz in zip("lq", [32, 64]):  # no 16-bit forms
+    add_group("vex_gpr_reg_rm_nds_0F",
+        suffix=sfx,
+        modifiers=["PreAdd", "Op1Add", "Op2Add"],
+        opersize=sz,
+        prefix=0x00,
+        opcode=[0x0F, 0x00, 0x00],
+        vex=0,
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=sz, relaxed=True, dest="EA"),
+                  Operand(type="Reg", size=sz, dest="VEX")])
+
+add_insn("bzhi", "vex_gpr_reg_rm_nds_0F", modifiers=[0x00, 0x38, 0xF5],
+         cpu=["BMI2"])
+add_insn("bextr","vex_gpr_reg_rm_nds_0F", modifiers=[0x00, 0x38, 0xF7],
+         cpu=["BMI1"])
+add_insn("shlx", "vex_gpr_reg_rm_nds_0F", modifiers=[0x66, 0x38, 0xF7],
+         cpu=["BMI2"])
+add_insn("shrx", "vex_gpr_reg_rm_nds_0F", modifiers=[0xF2, 0x38, 0xF7],
+         cpu=["BMI2"])
+add_insn("sarx", "vex_gpr_reg_rm_nds_0F", modifiers=[0xF3, 0x38, 0xF7],
+         cpu=["BMI2"])
+
+add_insn("mulx", "vex_gpr_reg_nds_rm_0F", modifiers=[0xF2, 0x38, 0xF6],
+         cpu=["BMI2"])
+
+
+
+#####################################################################
+# Intel INVPCID instruction
+#####################################################################
+add_group("invpcid",
+    cpu=["INVPCID", "Priv"],
+    not64=True,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x82],
+    operands=[Operand(type="Reg", size=32, dest="Spare"),
+              Operand(type="Mem", size=128, relaxed=True, dest="EA")])
+add_group("invpcid",
+    cpu=["INVPCID", "Priv"],
+    only64=True,
+    def_opersize_64=64,
+    prefix=0x66,
+    opcode=[0x0F, 0x38, 0x82],
+    operands=[Operand(type="Reg", size=64, dest="Spare"),
+              Operand(type="Mem", size=128, relaxed=True, dest="EA")])
+add_insn("invpcid", "invpcid")
+
+#####################################################################
 # AMD 3DNow! instructions
 #####################################################################
 
@@ -7357,7 +8043,7 @@
 for sfx in [None, "l", "q"]:
     add_insn("sysret"+(sfx or ""), "twobyte", suffix=sfx, modifiers=[0x0F, 0x07],
              cpu=["686", "AMD", "Priv"])
-add_insn("lzcnt", "cnt", modifiers=[0xBD], cpu=["686", "AMD"])
+add_insn("lzcnt", "cnt", modifiers=[0xBD], cpu=["LZCNT"])
 
 #####################################################################
 # AMD x86-64 extensions

yasm-1.1.0.tar.gz/modules/arch/x86/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/Makefile.inc Changed

@@ -1,5 +1,3 @@
-# $Id: Makefile.inc 2339 2010-07-23 03:35:21Z peter $
-
 TESTS += modules/arch/x86/tests/x86_test.sh
 
 EXTRA_DIST += modules/arch/x86/tests/x86_test.sh
@@ -25,10 +23,16 @@
 EXTRA_DIST += modules/arch/x86/tests/avx.hex
 EXTRA_DIST += modules/arch/x86/tests/avx16.asm
 EXTRA_DIST += modules/arch/x86/tests/avx16.hex
+EXTRA_DIST += modules/arch/x86/tests/avx2.asm
+EXTRA_DIST += modules/arch/x86/tests/avx2.hex
 EXTRA_DIST += modules/arch/x86/tests/avxcc.asm
 EXTRA_DIST += modules/arch/x86/tests/avxcc.hex
 EXTRA_DIST += modules/arch/x86/tests/bittest.asm
 EXTRA_DIST += modules/arch/x86/tests/bittest.hex
+EXTRA_DIST += modules/arch/x86/tests/bmi1.asm
+EXTRA_DIST += modules/arch/x86/tests/bmi1.hex
+EXTRA_DIST += modules/arch/x86/tests/bmi2.asm
+EXTRA_DIST += modules/arch/x86/tests/bmi2.hex
 EXTRA_DIST += modules/arch/x86/tests/bswap64.asm
 EXTRA_DIST += modules/arch/x86/tests/bswap64.hex
 EXTRA_DIST += modules/arch/x86/tests/clmul.asm
@@ -79,6 +83,8 @@
 EXTRA_DIST += modules/arch/x86/tests/imm64.asm
 EXTRA_DIST += modules/arch/x86/tests/imm64.errwarn
 EXTRA_DIST += modules/arch/x86/tests/imm64.hex
+EXTRA_DIST += modules/arch/x86/tests/invpcid.asm
+EXTRA_DIST += modules/arch/x86/tests/invpcid.hex
 EXTRA_DIST += modules/arch/x86/tests/iret.asm
 EXTRA_DIST += modules/arch/x86/tests/iret.hex
 EXTRA_DIST += modules/arch/x86/tests/jmp64-1.asm
@@ -95,12 +101,18 @@
 EXTRA_DIST += modules/arch/x86/tests/jmp64-6.hex
 EXTRA_DIST += modules/arch/x86/tests/jmpfar.asm
 EXTRA_DIST += modules/arch/x86/tests/jmpfar.hex
+EXTRA_DIST += modules/arch/x86/tests/larlsl.asm
+EXTRA_DIST += modules/arch/x86/tests/larlsl.hex
 EXTRA_DIST += modules/arch/x86/tests/lds.asm
 EXTRA_DIST += modules/arch/x86/tests/lds.hex
+EXTRA_DIST += modules/arch/x86/tests/lfs64.asm
+EXTRA_DIST += modules/arch/x86/tests/lfs64.hex
 EXTRA_DIST += modules/arch/x86/tests/loopadsz.asm
 EXTRA_DIST += modules/arch/x86/tests/loopadsz.hex
 EXTRA_DIST += modules/arch/x86/tests/lsahf.asm
 EXTRA_DIST += modules/arch/x86/tests/lsahf.hex
+EXTRA_DIST += modules/arch/x86/tests/lzcnt.asm
+EXTRA_DIST += modules/arch/x86/tests/lzcnt.hex
 EXTRA_DIST += modules/arch/x86/tests/mem64-err.asm
 EXTRA_DIST += modules/arch/x86/tests/mem64-err.errwarn
 EXTRA_DIST += modules/arch/x86/tests/mem64.asm
@@ -177,6 +189,8 @@
 EXTRA_DIST += modules/arch/x86/tests/segoff-err.errwarn
 EXTRA_DIST += modules/arch/x86/tests/shift.asm
 EXTRA_DIST += modules/arch/x86/tests/shift.hex
+EXTRA_DIST += modules/arch/x86/tests/shift64.asm
+EXTRA_DIST += modules/arch/x86/tests/shift64.hex
 EXTRA_DIST += modules/arch/x86/tests/simd-1.asm
 EXTRA_DIST += modules/arch/x86/tests/simd-1.hex
 EXTRA_DIST += modules/arch/x86/tests/simd-2.asm
@@ -221,6 +235,12 @@
 EXTRA_DIST += modules/arch/x86/tests/vmx.hex
 EXTRA_DIST += modules/arch/x86/tests/vmx-err.asm
 EXTRA_DIST += modules/arch/x86/tests/vmx-err.errwarn
+EXTRA_DIST += modules/arch/x86/tests/vsib.asm
+EXTRA_DIST += modules/arch/x86/tests/vsib.hex
+EXTRA_DIST += modules/arch/x86/tests/vsib-err.asm
+EXTRA_DIST += modules/arch/x86/tests/vsib-err.errwarn
+EXTRA_DIST += modules/arch/x86/tests/vsib2-err.asm
+EXTRA_DIST += modules/arch/x86/tests/vsib2-err.errwarn
 EXTRA_DIST += modules/arch/x86/tests/x86label.asm
 EXTRA_DIST += modules/arch/x86/tests/x86label.hex
 EXTRA_DIST += modules/arch/x86/tests/xchg64.asm

yasm-1.1.0.tar.gz/modules/arch/x86/tests/avx.hex -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/avx.hex Changed

yasm-1.2.0.tar.gz/modules/arch/x86/tests/avx2.asm Added

@@ -0,0 +1,652 @@
+; Exhaustive test of AVX2 instructions
+;
+;  Copyright (C) 2011  Peter Johnson
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions
+; are met:
+; 1. Redistributions of source code must retain the above copyright
+;    notice, this list of conditions and the following disclaimer.
+; 2. Redistributions in binary form must reproduce the above copyright
+;    notice, this list of conditions and the following disclaimer in the
+;    documentation and/or other materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER 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 AUTHOR OR OTHER 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.
+;
+
+[bits 64]
+
+vmpsadbw ymm1, ymm3, 3			; c4 e3 75 42 cb 03
+vmpsadbw ymm1, yword [rax], 3		; c4 e3 75 42 08 03
+vmpsadbw ymm1, ymm2, ymm3, 3		; c4 e3 6d 42 cb 03
+vmpsadbw ymm1, ymm2, yword [rax], 3	; c4 e3 6d 42 08 03
+
+vpabsb ymm1, ymm2			; c4 e2 7d 1c ca
+vpabsb ymm1, yword [rax]		; c4 e2 7d 1c 08
+
+vpabsw ymm1, ymm2			; c4 e2 7d 1d ca
+vpabsw ymm1, yword [rax]		; c4 e2 7d 1d 08
+
+vpabsd ymm1, ymm2			; c4 e2 7d 1e ca
+vpabsd ymm1, yword [rax]		; c4 e2 7d 1e 08
+
+vpacksswb ymm1, ymm3			; c5 f5 63 cb
+vpacksswb ymm1, yword [rax]		; c5 f5 63 08
+vpacksswb ymm1, ymm2, ymm3		; c5 ed 63 cb
+vpacksswb ymm1, ymm2, yword [rax]	; c5 ed 63 08
+
+vpackssdw ymm1, ymm3			; c5 f5 6b cb
+vpackssdw ymm1, yword [rax]		; c5 f5 6b 08
+vpackssdw ymm1, ymm2, ymm3		; c5 ed 6b cb
+vpackssdw ymm1, ymm2, yword [rax]	; c5 ed 6b 08
+
+vpackusdw ymm1, ymm3			; c4 e2 75 2b cb
+vpackusdw ymm1, yword [rax]		; c4 e2 75 2b 08
+vpackusdw ymm1, ymm2, ymm3		; c4 e2 6d 2b cb
+vpackusdw ymm1, ymm2, yword [rax]	; c4 e2 6d 2b 08
+
+vpackuswb ymm1, ymm3			; c5 f5 67 cb
+vpackuswb ymm1, yword [rax]		; c5 f5 67 08
+vpackuswb ymm1, ymm2, ymm3		; c5 ed 67 cb
+vpackuswb ymm1, ymm2, yword [rax]	; c5 ed 67 08
+
+vpaddb ymm1, ymm3			; c5 f5 fc cb
+vpaddb ymm1, yword [rax]		; c5 f5 fc 08
+vpaddb ymm1, ymm2, ymm3			; c5 ed fc cb
+vpaddb ymm1, ymm2, yword [rax]		; c5 ed fc 08
+
+vpaddw ymm1, ymm3			; c5 f5 fd cb
+vpaddw ymm1, yword [rax]		; c5 f5 fd 08
+vpaddw ymm1, ymm2, ymm3			; c5 ed fd cb
+vpaddw ymm1, ymm2, yword [rax]		; c5 ed fd 08
+
+vpaddd ymm1, ymm3			; c5 f5 fe cb
+vpaddd ymm1, yword [rax]		; c5 f5 fe 08
+vpaddd ymm1, ymm2, ymm3			; c5 ed fe cb
+vpaddd ymm1, ymm2, yword [rax]		; c5 ed fe 08
+
+vpaddq ymm1, ymm3			; c5 f5 d4 cb
+vpaddq ymm1, yword [rax]		; c5 f5 d4 08
+vpaddq ymm1, ymm2, ymm3			; c5 ed d4 cb
+vpaddq ymm1, ymm2, yword [rax]		; c5 ed d4 08
+
+vpaddsb ymm1, ymm3			; c5 f5 ec cb
+vpaddsb ymm1, yword [rax]		; c5 f5 ec 08
+vpaddsb ymm1, ymm2, ymm3		; c5 ed ec cb
+vpaddsb ymm1, ymm2, yword [rax]		; c5 ed ec 08
+
+vpaddsw ymm1, ymm3			; c5 f5 ed cb
+vpaddsw ymm1, yword [rax]		; c5 f5 ed 08
+vpaddsw ymm1, ymm2, ymm3		; c5 ed ed cb
+vpaddsw ymm1, ymm2, yword [rax]		; c5 ed ed 08
+
+vpaddusb ymm1, ymm3			; c5 f5 dc cb
+vpaddusb ymm1, yword [rax]		; c5 f5 dc 08
+vpaddusb ymm1, ymm2, ymm3		; c5 ed dc cb
+vpaddusb ymm1, ymm2, yword [rax]	; c5 ed dc 08
+
+vpaddusw ymm1, ymm3			; c5 f5 dd cb
+vpaddusw ymm1, yword [rax]		; c5 f5 dd 08
+vpaddusw ymm1, ymm2, ymm3		; c5 ed dd cb
+vpaddusw ymm1, ymm2, yword [rax]	; c5 ed dd 08
+
+vpalignr ymm1, ymm2, ymm3, 3		; c4 e3 6d 0f cb 03
+vpalignr ymm1, ymm2, yword [rax], 3	; c4 e3 6d 0f 08 03
+
+vpand ymm1, ymm3			; c5 f5 db cb
+vpand ymm1, yword [rax]			; c5 f5 db 08
+vpand ymm1, ymm2, ymm3			; c5 ed db cb
+vpand ymm1, ymm2, yword [rax]		; c5 ed db 08
+
+vpandn ymm1, ymm3			; c5 f5 df cb
+vpandn ymm1, yword [rax]		; c5 f5 df 08
+vpandn ymm1, ymm2, ymm3			; c5 ed df cb
+vpandn ymm1, ymm2, yword [rax]		; c5 ed df 08
+
+vpavgb ymm1, ymm3			; c5 f5 e0 cb
+vpavgb ymm1, yword [rax]		; c5 f5 e0 08
+vpavgb ymm1, ymm2, ymm3			; c5 ed e0 cb
+vpavgb ymm1, ymm2, yword [rax]		; c5 ed e0 08
+
+vpavgw ymm1, ymm3			; c5 f5 e3 cb
+vpavgw ymm1, yword [rax]		; c5 f5 e3 08
+vpavgw ymm1, ymm2, ymm3			; c5 ed e3 cb
+vpavgw ymm1, ymm2, yword [rax]		; c5 ed e3 08
+
+vpblendvb ymm1, ymm2, ymm3, ymm4	; c4 e3 6d 4c cb 40
+vpblendvb ymm1, ymm2, yword [rax], ymm4	; c4 e3 6d 4c 08 40
+
+vpblendw ymm1, ymm3, 3			; c4 e3 75 0e cb 03
+vpblendw ymm1, yword [rax], 3		; c4 e3 75 0e 08 03
+vpblendw ymm1, ymm2, ymm3, 3		; c4 e3 6d 0e cb 03
+vpblendw ymm1, ymm2, yword [rax], 3	; c4 e3 6d 0e 08 03
+
+vpcmpeqb ymm1, ymm3			; c5 f5 74 cb
+vpcmpeqb ymm1, yword [rax]		; c5 f5 74 08
+vpcmpeqb ymm1, ymm2, ymm3		; c5 ed 74 cb
+vpcmpeqb ymm1, ymm2, yword [rax]	; c5 ed 74 08
+
+vpcmpeqw ymm1, ymm3			; c5 f5 75 cb
+vpcmpeqw ymm1, yword [rax]		; c5 f5 75 08
+vpcmpeqw ymm1, ymm2, ymm3		; c5 ed 75 cb
+vpcmpeqw ymm1, ymm2, yword [rax]	; c5 ed 75 08
+
+vpcmpeqd ymm1, ymm3			; c5 f5 76 cb
+vpcmpeqd ymm1, yword [rax]		; c5 f5 76 08
+vpcmpeqd ymm1, ymm2, ymm3		; c5 ed 76 cb
+vpcmpeqd ymm1, ymm2, yword [rax]	; c5 ed 76 08
+
+vpcmpeqq ymm1, ymm3			; c4 e2 75 29 cb
+vpcmpeqq ymm1, yword [rax]		; c4 e2 75 29 08
+vpcmpeqq ymm1, ymm2, ymm3		; c4 e2 6d 29 cb
+vpcmpeqq ymm1, ymm2, yword [rax]	; c4 e2 6d 29 08
+
+vpcmpgtb ymm1, ymm3			; c5 f5 64 cb
+vpcmpgtb ymm1, yword [rax]		; c5 f5 64 08
+vpcmpgtb ymm1, ymm2, ymm3		; c5 ed 64 cb
+vpcmpgtb ymm1, ymm2, yword [rax]	; c5 ed 64 08
+
+vpcmpgtw ymm1, ymm3			; c5 f5 65 cb
+vpcmpgtw ymm1, yword [rax]		; c5 f5 65 08
+vpcmpgtw ymm1, ymm2, ymm3		; c5 ed 65 cb
+vpcmpgtw ymm1, ymm2, yword [rax]	; c5 ed 65 08
+
+vpcmpgtd ymm1, ymm3			; c5 f5 66 cb
+vpcmpgtd ymm1, yword [rax]		; c5 f5 66 08
+vpcmpgtd ymm1, ymm2, ymm3		; c5 ed 66 cb
+vpcmpgtd ymm1, ymm2, yword [rax]	; c5 ed 66 08
+
+vpcmpgtq ymm1, ymm3			; c4 e2 75 37 cb
+vpcmpgtq ymm1, yword [rax]		; c4 e2 75 37 08
+vpcmpgtq ymm1, ymm2, ymm3		; c4 e2 6d 37 cb
+vpcmpgtq ymm1, ymm2, yword [rax]	; c4 e2 6d 37 08
+
+vphaddw ymm1, ymm3			; c4 e2 75 01 cb
+vphaddw ymm1, yword [rax]		; c4 e2 75 01 08
+vphaddw ymm1, ymm2, ymm3		; c4 e2 6d 01 cb
+vphaddw ymm1, ymm2, yword [rax]		; c4 e2 6d 01 08
+
+vphaddd ymm1, ymm3			; c4 e2 75 02 cb
+vphaddd ymm1, yword [rax]		; c4 e2 75 02 08
+vphaddd ymm1, ymm2, ymm3		; c4 e2 6d 02 cb
+vphaddd ymm1, ymm2, yword [rax]		; c4 e2 6d 02 08
+
+vphaddsw ymm1, ymm3			; c4 e2 75 03 cb
+vphaddsw ymm1, yword [rax]		; c4 e2 75 03 08
+vphaddsw ymm1, ymm2, ymm3		; c4 e2 6d 03 cb
+vphaddsw ymm1, ymm2, yword [rax]	; c4 e2 6d 03 08
+
+vphsubw ymm1, ymm3			; c4 e2 75 05 cb
+vphsubw ymm1, yword [rax]		; c4 e2 75 05 08
+vphsubw ymm1, ymm2, ymm3		; c4 e2 6d 05 cb
+vphsubw ymm1, ymm2, yword [rax]		; c4 e2 6d 05 08
+
+vphsubd ymm1, ymm3			; c4 e2 75 06 cb
+vphsubd ymm1, yword [rax]		; c4 e2 75 06 08
+vphsubd ymm1, ymm2, ymm3		; c4 e2 6d 06 cb
+vphsubd ymm1, ymm2, yword [rax]		; c4 e2 6d 06 08
+
+vphsubsw ymm1, ymm3			; c4 e2 75 07 cb
+vphsubsw ymm1, yword [rax]		; c4 e2 75 07 08
+vphsubsw ymm1, ymm2, ymm3		; c4 e2 6d 07 cb
+vphsubsw ymm1, ymm2, yword [rax]	; c4 e2 6d 07 08
+
+vpmaddubsw ymm1, ymm3			; c4 e2 75 04 cb
+vpmaddubsw ymm1, yword [rax]		; c4 e2 75 04 08
+vpmaddubsw ymm1, ymm2, ymm3		; c4 e2 6d 04 cb
+vpmaddubsw ymm1, ymm2, yword [rax]	; c4 e2 6d 04 08
+
+vpmaddwd ymm1, ymm3			; c5 f5 f5 cb
+vpmaddwd ymm1, yword [rax]		; c5 f5 f5 08
+vpmaddwd ymm1, ymm2, ymm3		; c5 ed f5 cb
+vpmaddwd ymm1, ymm2, yword [rax]	; c5 ed f5 08
+
+vpmaxsb ymm1, ymm3			; c4 e2 75 3c cb
+vpmaxsb ymm1, yword [rax]		; c4 e2 75 3c 08
+vpmaxsb ymm1, ymm2, ymm3		; c4 e2 6d 3c cb
+vpmaxsb ymm1, ymm2, yword [rax]		; c4 e2 6d 3c 08
+
+vpmaxsw ymm1, ymm3			; c5 f5 ee cb
+vpmaxsw ymm1, yword [rax]		; c5 f5 ee 08
+vpmaxsw ymm1, ymm2, ymm3		; c5 ed ee cb
+vpmaxsw ymm1, ymm2, yword [rax]		; c5 ed ee 08
+
+vpmaxsd ymm1, ymm3			; c4 e2 75 3d cb
+vpmaxsd ymm1, yword [rax]		; c4 e2 75 3d 08
+vpmaxsd ymm1, ymm2, ymm3		; c4 e2 6d 3d cb
+vpmaxsd ymm1, ymm2, yword [rax]		; c4 e2 6d 3d 08
+
+vpmaxub ymm1, ymm3			; c5 f5 de cb
+vpmaxub ymm1, yword [rax]		; c5 f5 de 08
+vpmaxub ymm1, ymm2, ymm3		; c5 ed de cb
+vpmaxub ymm1, ymm2, yword [rax]		; c5 ed de 08
+
+vpmaxuw ymm1, ymm3			; c4 e2 75 3e cb
+vpmaxuw ymm1, yword [rax]		; c4 e2 75 3e 08
+vpmaxuw ymm1, ymm2, ymm3		; c4 e2 6d 3e cb
+vpmaxuw ymm1, ymm2, yword [rax]		; c4 e2 6d 3e 08
+
+vpmaxud ymm1, ymm3			; c4 e2 75 3f cb
+vpmaxud ymm1, yword [rax]		; c4 e2 75 3f 08
+vpmaxud ymm1, ymm2, ymm3		; c4 e2 6d 3f cb
+vpmaxud ymm1, ymm2, yword [rax]		; c4 e2 6d 3f 08
+
+vpminsb ymm1, ymm3			; c4 e2 75 38 cb
+vpminsb ymm1, yword [rax]		; c4 e2 75 38 08
+vpminsb ymm1, ymm2, ymm3		; c4 e2 6d 38 cb
+vpminsb ymm1, ymm2, yword [rax]		; c4 e2 6d 38 08
+
+vpminsw ymm1, ymm3			; c5 f5 ea cb
+vpminsw ymm1, yword [rax]		; c5 f5 ea 08
+vpminsw ymm1, ymm2, ymm3		; c5 ed ea cb
+vpminsw ymm1, ymm2, yword [rax]		; c5 ed ea 08
+
+vpminsd ymm1, ymm3			; c4 e2 75 39 cb
+vpminsd ymm1, yword [rax]		; c4 e2 75 39 08
+vpminsd ymm1, ymm2, ymm3		; c4 e2 6d 39 cb
+vpminsd ymm1, ymm2, yword [rax]		; c4 e2 6d 39 08
+
+vpminub ymm1, ymm3			; c5 f5 da cb
+vpminub ymm1, yword [rax]		; c5 f5 da 08
+vpminub ymm1, ymm2, ymm3		; c5 ed da cb
+vpminub ymm1, ymm2, yword [rax]		; c5 ed da 08
+
+vpminuw ymm1, ymm3			; c4 e2 75 3a cb
+vpminuw ymm1, yword [rax]		; c4 e2 75 3a 08
+vpminuw ymm1, ymm2, ymm3		; c4 e2 6d 3a cb
+vpminuw ymm1, ymm2, yword [rax]		; c4 e2 6d 3a 08
+
+vpminud ymm1, ymm3			; c4 e2 75 3b cb
+vpminud ymm1, yword [rax]		; c4 e2 75 3b 08
+vpminud ymm1, ymm2, ymm3		; c4 e2 6d 3b cb
+vpminud ymm1, ymm2, yword [rax]		; c4 e2 6d 3b 08
+
+vpmovmskb eax, ymm1			; c5 fd d7 c1
+vpmovmskb rax, ymm1			; c5 fd d7 c1
+
+vpmovsxbw ymm1, xmm2			; c4 e2 7d 20 ca
+vpmovsxbw ymm1, [rax]			; c4 e2 7d 20 08
+vpmovsxbw ymm1, oword [rax]		; c4 e2 7d 20 08
+
+vpmovsxbd ymm1, xmm2			; c4 e2 7d 21 ca
+vpmovsxbd ymm1, [rax]			; c4 e2 7d 21 08
+vpmovsxbd ymm1, qword [rax]		; c4 e2 7d 21 08
+
+vpmovsxbq ymm1, xmm2			; c4 e2 7d 22 ca
+vpmovsxbq ymm1, [rax]			; c4 e2 7d 22 08
+vpmovsxbq ymm1, dword [rax]		; c4 e2 7d 22 08
+
+vpmovsxwd ymm1, xmm2			; c4 e2 7d 23 ca
+vpmovsxwd ymm1, [rax]			; c4 e2 7d 23 08
+vpmovsxwd ymm1, oword [rax]		; c4 e2 7d 23 08
+
+vpmovsxwq ymm1, xmm2			; c4 e2 7d 24 ca
+vpmovsxwq ymm1, [rax]			; c4 e2 7d 24 08
+vpmovsxwq ymm1, qword [rax]		; c4 e2 7d 24 08
+
+vpmovsxdq ymm1, xmm2			; c4 e2 7d 25 ca
+vpmovsxdq ymm1, [rax]			; c4 e2 7d 25 08
+vpmovsxdq ymm1, oword [rax]		; c4 e2 7d 25 08
+
+vpmovzxbw ymm1, xmm2			; c4 e2 7d 30 ca
+vpmovzxbw ymm1, [rax]			; c4 e2 7d 30 08
+vpmovzxbw ymm1, oword [rax]		; c4 e2 7d 30 08
+
+vpmovzxbd ymm1, xmm2			; c4 e2 7d 31 ca
+vpmovzxbd ymm1, [rax]			; c4 e2 7d 31 08
+vpmovzxbd ymm1, qword [rax]		; c4 e2 7d 31 08
+
+vpmovzxbq ymm1, xmm2			; c4 e2 7d 32 ca
+vpmovzxbq ymm1, [rax]			; c4 e2 7d 32 08
+vpmovzxbq ymm1, dword [rax]		; c4 e2 7d 32 08
+
+vpmovzxwd ymm1, xmm2			; c4 e2 7d 33 ca
+vpmovzxwd ymm1, [rax]			; c4 e2 7d 33 08
+vpmovzxwd ymm1, oword [rax]		; c4 e2 7d 33 08
+
+vpmovzxwq ymm1, xmm2			; c4 e2 7d 34 ca
+vpmovzxwq ymm1, [rax]			; c4 e2 7d 34 08
+vpmovzxwq ymm1, qword [rax]		; c4 e2 7d 34 08
+
+vpmovzxdq ymm1, xmm2			; c4 e2 7d 35 ca
+vpmovzxdq ymm1, [rax]			; c4 e2 7d 35 08
+vpmovzxdq ymm1, oword [rax]		; c4 e2 7d 35 08
+
+vpmuldq ymm1, ymm3			; c4 e2 75 28 cb
+vpmuldq ymm1, yword [rax]		; c4 e2 75 28 08
+vpmuldq ymm1, ymm2, ymm3		; c4 e2 6d 28 cb
+vpmuldq ymm1, ymm2, yword [rax]		; c4 e2 6d 28 08
+
+vpmulhrsw ymm1, ymm3			; c4 e2 75 0b cb
+vpmulhrsw ymm1, yword [rax]		; c4 e2 75 0b 08
+vpmulhrsw ymm1, ymm2, ymm3		; c4 e2 6d 0b cb
+vpmulhrsw ymm1, ymm2, yword [rax]	; c4 e2 6d 0b 08
+
+vpmulhuw ymm1, ymm3			; c5 f5 e4 cb
+vpmulhuw ymm1, yword [rax]		; c5 f5 e4 08
+vpmulhuw ymm1, ymm2, ymm3		; c5 ed e4 cb
+vpmulhuw ymm1, ymm2, yword [rax]	; c5 ed e4 08
+
+vpmulhw ymm1, ymm3			; c5 f5 e5 cb
+vpmulhw ymm1, yword [rax]		; c5 f5 e5 08
+vpmulhw ymm1, ymm2, ymm3		; c5 ed e5 cb
+vpmulhw ymm1, ymm2, yword [rax]		; c5 ed e5 08
+
+vpmullw ymm1, ymm3			; c5 f5 d5 cb
+vpmullw ymm1, yword [rax]		; c5 f5 d5 08
+vpmullw ymm1, ymm2, ymm3		; c5 ed d5 cb
+vpmullw ymm1, ymm2, yword [rax]		; c5 ed d5 08
+
+vpmulld ymm1, ymm3			; c4 e2 75 40 cb
+vpmulld ymm1, yword [rax]		; c4 e2 75 40 08
+vpmulld ymm1, ymm2, ymm3		; c4 e2 6d 40 cb
+vpmulld ymm1, ymm2, yword [rax]		; c4 e2 6d 40 08
+
+vpmuludq ymm1, ymm3			; c5 f5 f4 cb
+vpmuludq ymm1, yword [rax]		; c5 f5 f4 08
+vpmuludq ymm1, ymm2, ymm3		; c5 ed f4 cb
+vpmuludq ymm1, ymm2, yword [rax]	; c5 ed f4 08
+
+vpor ymm1, ymm3				; c5 f5 eb cb
+vpor ymm1, yword [rax]			; c5 f5 eb 08
+vpor ymm1, ymm2, ymm3			; c5 ed eb cb
+vpor ymm1, ymm2, yword [rax]		; c5 ed eb 08
+
+vpsadbw ymm1, ymm3			; c5 f5 f6 cb
+vpsadbw ymm1, yword [rax]		; c5 f5 f6 08
+vpsadbw ymm1, ymm2, ymm3		; c5 ed f6 cb
+vpsadbw ymm1, ymm2, yword [rax]		; c5 ed f6 08
+
+vpshufb ymm1, ymm3			; c4 e2 75 00 cb
+vpshufb ymm1, yword [rax]		; c4 e2 75 00 08
+vpshufb ymm1, ymm2, ymm3		; c4 e2 6d 00 cb
+vpshufb ymm1, ymm2, yword [rax]		; c4 e2 6d 00 08
+
+vpshufd ymm1, ymm3, 3			; c5 fd 70 cb 03
+vpshufd ymm1, yword [rax], 3		; c5 fd 70 08 03
+
+vpshufhw ymm1, ymm3, 3			; c5 fe 70 cb 03
+vpshufhw ymm1, yword [rax], 3		; c5 fe 70 08 03
+
+vpshuflw ymm1, ymm3, 3			; c5 ff 70 cb 03
+vpshuflw ymm1, yword [rax], 3		; c5 ff 70 08 03
+
+vpsignb ymm1, ymm3			; c4 e2 75 08 cb
+vpsignb ymm1, yword [rax]		; c4 e2 75 08 08
+vpsignb ymm1, ymm2, ymm3		; c4 e2 6d 08 cb
+vpsignb ymm1, ymm2, yword [rax]		; c4 e2 6d 08 08
+
+vpsignw ymm1, ymm3			; c4 e2 75 09 cb
+vpsignw ymm1, yword [rax]		; c4 e2 75 09 08
+vpsignw ymm1, ymm2, ymm3		; c4 e2 6d 09 cb
+vpsignw ymm1, ymm2, yword [rax]		; c4 e2 6d 09 08
+
+vpsignd ymm1, ymm3			; c4 e2 75 0a cb
+vpsignd ymm1, yword [rax]		; c4 e2 75 0a 08
+vpsignd ymm1, ymm2, ymm3		; c4 e2 6d 0a cb
+vpsignd ymm1, ymm2, yword [rax]		; c4 e2 6d 0a 08
+
+vpslldq ymm1, 3				; c5 f5 73 f9 03
+vpslldq ymm1, ymm2, 3			; c5 f5 73 fa 03
+
+vpsllw ymm1, xmm3			; c5 f5 f1 cb
+vpsllw ymm1, oword [rax]		; c5 f5 f1 08
+vpsllw ymm1, 3				; c5 f5 71 f1 03
+vpsllw ymm1, ymm2, xmm3			; c5 ed f1 cb
+vpsllw ymm1, ymm2, oword [rax]		; c5 ed f1 08
+vpsllw ymm1, ymm2, 3			; c5 f5 71 f2 03
+
+vpslld ymm1, xmm3			; c5 f5 f2 cb
+vpslld ymm1, oword [rax]		; c5 f5 f2 08
+vpslld ymm1, 3				; c5 f5 72 f1 03
+vpslld ymm1, ymm2, xmm3			; c5 ed f2 cb
+vpslld ymm1, ymm2, oword [rax]		; c5 ed f2 08
+vpslld ymm1, ymm2, 3			; c5 f5 72 f2 03
+
+vpsllq ymm1, xmm3			; c5 f5 f3 cb
+vpsllq ymm1, oword [rax]		; c5 f5 f3 08
+vpsllq ymm1, 3				; c5 f5 73 f1 03
+vpsllq ymm1, ymm2, xmm3			; c5 ed f3 cb
+vpsllq ymm1, ymm2, oword [rax]		; c5 ed f3 08
+vpsllq ymm1, ymm2, 3			; c5 f5 73 f2 03
+
+vpsraw ymm1, xmm3			; c5 f5 e1 cb
+vpsraw ymm1, oword [rax]		; c5 f5 e1 08
+vpsraw ymm1, 3				; c5 f5 71 e1 03
+vpsraw ymm1, ymm2, xmm3			; c5 ed e1 cb
+vpsraw ymm1, ymm2, oword [rax]		; c5 ed e1 08
+vpsraw ymm1, ymm2, 3			; c5 f5 71 e2 03
+
+vpsrad ymm1, xmm3			; c5 f5 e2 cb
+vpsrad ymm1, oword [rax]		; c5 f5 e2 08
+vpsrad ymm1, 3				; c5 f5 72 e1 03
+vpsrad ymm1, ymm2, xmm3			; c5 ed e2 cb
+vpsrad ymm1, ymm2, oword [rax]		; c5 ed e2 08
+vpsrad ymm1, ymm2, 3			; c5 f5 72 e2 03
+
+vpsrldq ymm1, 3				; c5 f5 73 d9 03
+vpsrldq ymm1, ymm2, 3			; c5 f5 73 da 03
+
+vpsrlw ymm1, xmm3			; c5 f5 d1 cb
+vpsrlw ymm1, oword [rax]		; c5 f5 d1 08
+vpsrlw ymm1, 3				; c5 f5 71 d1 03
+vpsrlw ymm1, ymm2, xmm3			; c5 ed d1 cb
+vpsrlw ymm1, ymm2, oword [rax]		; c5 ed d1 08
+vpsrlw ymm1, ymm2, 3			; c5 f5 71 d2 03
+
+vpsrld ymm1, xmm3			; c5 f5 d2 cb
+vpsrld ymm1, oword [rax]		; c5 f5 d2 08
+vpsrld ymm1, 3				; c5 f5 72 d1 03
+vpsrld ymm1, ymm2, xmm3			; c5 ed d2 cb
+vpsrld ymm1, ymm2, oword [rax]		; c5 ed d2 08
+vpsrld ymm1, ymm2, 3			; c5 f5 72 d2 03
+
+vpsrld ymm1, xmm3			; c5 f5 d2 cb
+vpsrld ymm1, oword [rax]		; c5 f5 d2 08
+vpsrld ymm1, 3				; c5 f5 72 d1 03
+vpsrld ymm1, ymm2, xmm3			; c5 ed d2 cb
+vpsrld ymm1, ymm2, oword [rax]		; c5 ed d2 08
+vpsrld ymm1, ymm2, 3			; c5 f5 72 d2 03
+
+vpsubsb ymm1, ymm3			; c5 f5 e8 cb
+vpsubsb ymm1, yword [rax]		; c5 f5 e8 08
+vpsubsb ymm1, ymm2, ymm3		; c5 ed e8 cb
+vpsubsb ymm1, ymm2, yword [rax]		; c5 ed e8 08
+
+vpsubsw ymm1, ymm3			; c5 f5 e9 cb
+vpsubsw ymm1, yword [rax]		; c5 f5 e9 08
+vpsubsw ymm1, ymm2, ymm3		; c5 ed e9 cb
+vpsubsw ymm1, ymm2, yword [rax]		; c5 ed e9 08
+
+vpsubusb ymm1, ymm3			; c5 f5 d8 cb
+vpsubusb ymm1, yword [rax]		; c5 f5 d8 08
+vpsubusb ymm1, ymm2, ymm3		; c5 ed d8 cb
+vpsubusb ymm1, ymm2, yword [rax]	; c5 ed d8 08
+
+vpsubusw ymm1, ymm3			; c5 f5 d9 cb
+vpsubusw ymm1, yword [rax]		; c5 f5 d9 08
+vpsubusw ymm1, ymm2, ymm3		; c5 ed d9 cb
+vpsubusw ymm1, ymm2, yword [rax]	; c5 ed d9 08
+
+vpunpckhbw ymm1, ymm3			; c5 f5 68 cb
+vpunpckhbw ymm1, yword [rax]		; c5 f5 68 08
+vpunpckhbw ymm1, ymm2, ymm3		; c5 ed 68 cb
+vpunpckhbw ymm1, ymm2, yword [rax]	; c5 ed 68 08
+
+vpunpckhwd ymm1, ymm3			; c5 f5 69 cb
+vpunpckhwd ymm1, yword [rax]		; c5 f5 69 08
+vpunpckhwd ymm1, ymm2, ymm3		; c5 ed 69 cb
+vpunpckhwd ymm1, ymm2, yword [rax]	; c5 ed 69 08
+
+vpunpckhdq ymm1, ymm3			; c5 f5 6a cb
+vpunpckhdq ymm1, yword [rax]		; c5 f5 6a 08
+vpunpckhdq ymm1, ymm2, ymm3		; c5 ed 6a cb
+vpunpckhdq ymm1, ymm2, yword [rax]	; c5 ed 6a 08
+
+vpunpckhqdq ymm1, ymm3			; c5 f5 6d cb
+vpunpckhqdq ymm1, yword [rax]		; c5 f5 6d 08
+vpunpckhqdq ymm1, ymm2, ymm3		; c5 ed 6d cb
+vpunpckhqdq ymm1, ymm2, yword [rax]	; c5 ed 6d 08
+
+vpunpcklbw ymm1, ymm3			; c5 f5 60 cb
+vpunpcklbw ymm1, yword [rax]		; c5 f5 60 08
+vpunpcklbw ymm1, ymm2, ymm3		; c5 ed 60 cb
+vpunpcklbw ymm1, ymm2, yword [rax]	; c5 ed 60 08
+
+vpunpcklwd ymm1, ymm3			; c5 f5 61 cb
+vpunpcklwd ymm1, yword [rax]		; c5 f5 61 08
+vpunpcklwd ymm1, ymm2, ymm3		; c5 ed 61 cb
+vpunpcklwd ymm1, ymm2, yword [rax]	; c5 ed 61 08
+
+vpunpckldq ymm1, ymm3			; c5 f5 62 cb
+vpunpckldq ymm1, yword [rax]		; c5 f5 62 08
+vpunpckldq ymm1, ymm2, ymm3		; c5 ed 62 cb
+vpunpckldq ymm1, ymm2, yword [rax]	; c5 ed 62 08
+
+vpunpcklqdq ymm1, ymm3			; c5 f5 6c cb
+vpunpcklqdq ymm1, yword [rax]		; c5 f5 6c 08
+vpunpcklqdq ymm1, ymm2, ymm3		; c5 ed 6c cb
+vpunpcklqdq ymm1, ymm2, yword [rax]	; c5 ed 6c 08
+
+vpxor ymm1, ymm3			; c5 f5 ef cb
+vpxor ymm1, yword [rax]			; c5 f5 ef 08
+vpxor ymm1, ymm2, ymm3			; c5 ed ef cb
+vpxor ymm1, ymm2, yword [rax]		; c5 ed ef 08
+
+vmovntdqa ymm1, yword [rax]		; c4 e2 7d 2a 08
+
+vbroadcastss xmm1, xmm2			; c4 e2 79 18 ca
+vbroadcastss ymm1, xmm2			; c4 e2 7d 18 ca
+
+vbroadcastsd ymm1, xmm2			; c4 e2 7d 19 ca
+
+vbroadcasti128 ymm1, oword [rax]	; c4 e2 7d 5a 08
+
+vpblendd ymm1, ymm2, ymm3, 3		; c4 e3 6d 02 cb 03
+vpblendd ymm1, ymm2, yword [rax], 3	; c4 e3 6d 02 08 03
+
+vpbroadcastb xmm1, xmm2			; c4 e2 79 78 ca
+vpbroadcastb xmm1, byte [rax]		; c4 e2 79 78 08
+vpbroadcastb ymm1, xmm2			; c4 e2 7d 78 ca
+vpbroadcastb ymm1, byte [rax]		; c4 e2 7d 78 08
+
+vpbroadcastw xmm1, xmm2			; c4 e2 79 79 ca
+vpbroadcastw xmm1, word [rax]		; c4 e2 79 79 08
+vpbroadcastw ymm1, xmm2			; c4 e2 7d 79 ca
+vpbroadcastw ymm1, word [rax]		; c4 e2 7d 79 08
+
+vpbroadcastd xmm1, xmm2			; c4 e2 79 58 ca
+vpbroadcastd xmm1, dword [rax]		; c4 e2 79 58 08
+vpbroadcastd ymm1, xmm2			; c4 e2 7d 58 ca
+vpbroadcastd ymm1, dword [rax]		; c4 e2 7d 58 08
+
+vpbroadcastq xmm1, xmm2			; c4 e2 79 59 ca
+vpbroadcastq xmm1, qword [rax]		; c4 e2 79 59 08
+vpbroadcastq ymm1, xmm2			; c4 e2 7d 59 ca
+vpbroadcastq ymm1, qword [rax]		; c4 e2 7d 59 08
+
+vpermd ymm1, ymm2, ymm3			; c4 e2 6d 36 cb
+vpermd ymm1, ymm2, yword [rax]		; c4 e2 6d 36 08
+
+vpermpd ymm1, ymm2, 3			; c4 e3 fd 01 ca 03
+vpermpd ymm1, yword [rax], 3		; c4 e3 fd 01 08 03
+
+vpermps ymm1, ymm2, ymm3		; c4 e2 6d 16 cb
+vpermps ymm1, ymm2, yword [rax]		; c4 e2 6d 16 08
+
+vpermq ymm1, ymm2, 3			; c4 e3 fd 00 ca 03
+vpermq ymm1, yword [rax], 3		; c4 e3 fd 00 08 03
+
+vperm2i128 ymm1, ymm2, ymm3, 3		; c4 e3 6d 46 cb 03
+vperm2i128 ymm1, ymm2, yword [rax], 3	; c4 e3 6d 46 08 03
+
+vextracti128 xmm1, ymm2, 3		; c4 e3 7d 39 d1 03
+vextracti128 oword [rax], ymm2, 3	; c4 e3 7d 39 10 03
+
+vinserti128 ymm1, ymm2, xmm3, 3		; c4 e3 6d 38 cb 03
+vinserti128 ymm1, ymm2, oword [rax], 3	; c4 e3 6d 38 08 03
+
+vpmaskmovd xmm1, xmm2, oword [rax]	; c4 e2 69 8c 08
+vpmaskmovd ymm1, ymm2, yword [rax]	; c4 e2 6d 8c 08
+vpmaskmovd oword [rax], xmm1, xmm2	; c4 e2 71 8e 10
+vpmaskmovd yword [rax], ymm1, ymm2	; c4 e2 75 8e 10
+
+vpmaskmovq xmm1, xmm2, oword [rax]	; c4 e2 e9 8c 08
+vpmaskmovq ymm1, ymm2, yword [rax]	; c4 e2 ed 8c 08
+vpmaskmovq oword [rax], xmm1, xmm2	; c4 e2 f1 8e 10
+vpmaskmovq yword [rax], ymm1, ymm2	; c4 e2 f5 8e 10
+
+vpsllvd xmm1, xmm2, xmm3		; c4 e2 69 47 cb
+vpsllvd xmm1, xmm2, oword [rax]		; c4 e2 69 47 08
+vpsllvd ymm1, ymm2, ymm3		; c4 e2 6d 47 cb
+vpsllvd ymm1, ymm2, yword [rax]		; c4 e2 6d 47 08
+
+vpsllvq xmm1, xmm2, xmm3		; c4 e2 e9 47 cb
+vpsllvq xmm1, xmm2, oword [rax]		; c4 e2 e9 47 08
+vpsllvq ymm1, ymm2, ymm3		; c4 e2 ed 47 cb
+vpsllvq ymm1, ymm2, yword [rax]		; c4 e2 ed 47 08
+
+vpsravd xmm1, xmm2, xmm3		; c4 e2 69 46 cb
+vpsravd xmm1, xmm2, oword [rax]		; c4 e2 69 46 08
+vpsravd ymm1, ymm2, ymm3		; c4 e2 6d 46 cb
+vpsravd ymm1, ymm2, yword [rax]		; c4 e2 6d 46 08
+
+vpsrlvd xmm1, xmm2, xmm3		; c4 e2 69 45 cb
+vpsrlvd xmm1, xmm2, oword [rax]		; c4 e2 69 45 08
+vpsrlvd ymm1, ymm2, ymm3		; c4 e2 6d 45 cb
+vpsrlvd ymm1, ymm2, yword [rax]		; c4 e2 6d 45 08
+
+vpsrlvq xmm1, xmm2, xmm3		; c4 e2 e9 45 cb
+vpsrlvq xmm1, xmm2, oword [rax]		; c4 e2 e9 45 08
+vpsrlvq ymm1, ymm2, ymm3		; c4 e2 ed 45 cb
+vpsrlvq ymm1, ymm2, yword [rax]		; c4 e2 ed 45 08
+
+vgatherdpd xmm1, [rax+xmm1], xmm2	; c4 e2 e9 92 0c 08
+vgatherdpd xmm1, qword [rax+xmm1], xmm2	; c4 e2 e9 92 0c 08
+vgatherdpd ymm1, [rax+xmm1], ymm2	; c4 e2 ed 92 0c 08
+vgatherdpd ymm1, qword [rax+xmm1], ymm2	; c4 e2 ed 92 0c 08
+
+vgatherqpd xmm1, [rax+xmm1], xmm2	; c4 e2 e9 93 0c 08
+vgatherqpd xmm1, qword [rax+xmm1], xmm2	; c4 e2 e9 93 0c 08
+vgatherqpd ymm1, [rax+ymm1], ymm2	; c4 e2 ed 93 0c 08
+vgatherqpd ymm1, qword [rax+ymm1], ymm2	; c4 e2 ed 93 0c 08
+
+vgatherdps xmm1, [rax+xmm1], xmm2	; c4 e2 69 92 0c 08
+vgatherdps xmm1, dword [rax+xmm1], xmm2	; c4 e2 69 92 0c 08
+vgatherdps ymm1, [rax+ymm1], ymm2	; c4 e2 6d 92 0c 08
+vgatherdps ymm1, dword [rax+ymm1], ymm2	; c4 e2 6d 92 0c 08
+
+vgatherqps xmm1, [rax+xmm1], xmm2	; c4 e2 69 93 0c 08
+vgatherqps xmm1, dword [rax+xmm1], xmm2	; c4 e2 69 93 0c 08
+vgatherqps xmm1, [rax+ymm1], xmm2	; c4 e2 6d 93 0c 08
+vgatherqps xmm1, dword [rax+ymm1], xmm2	; c4 e2 6d 93 0c 08
+
+vpgatherdd xmm1, [rax+xmm1], xmm2	; c4 e2 69 90 0c 08
+vpgatherdd xmm1, dword [rax+xmm1], xmm2	; c4 e2 69 90 0c 08
+vpgatherdd ymm1, [rax+ymm1], ymm2	; c4 e2 6d 90 0c 08
+vpgatherdd ymm1, dword [rax+ymm1], ymm2	; c4 e2 6d 90 0c 08
+
+vpgatherqd xmm1, [rax+xmm1], xmm2	; c4 e2 69 91 0c 08
+vpgatherqd xmm1, dword [rax+xmm1], xmm2	; c4 e2 69 91 0c 08
+vpgatherqd xmm1, [rax+ymm1], xmm2	; c4 e2 6d 91 0c 08
+vpgatherqd xmm1, dword [rax+ymm1], xmm2	; c4 e2 6d 91 0c 08
+
+vpgatherdq xmm1, [rax+xmm1], xmm2	; c4 e2 e9 90 0c 08
+vpgatherdq xmm1, qword [rax+xmm1], xmm2	; c4 e2 e9 90 0c 08
+vpgatherdq ymm1, [rax+xmm1], ymm2	; c4 e2 ed 90 0c 08
+vpgatherdq ymm1, qword [rax+xmm1], ymm2	; c4 e2 ed 90 0c 08
+
+vpgatherqq xmm1, [rax+xmm1], xmm2	; c4 e2 e9 91 0c 08
+vpgatherqq xmm1, qword [rax+xmm1], xmm2	; c4 e2 e9 91 0c 08
+vpgatherqq ymm1, [rax+ymm1], ymm2	; c4 e2 ed 91 0c 08
+vpgatherqq ymm1, qword [rax+ymm1], ymm2	; c4 e2 ed 91 0c 08

yasm-1.2.0.tar.gz/modules/arch/x86/tests/avx2.hex Added

@@ -0,0 +1,2297 @@
+c4 
+e3 
+75 
+42 
+cb 
+03 
+c4 
+e3 
+75 
+42 
+08 
+03 
+c4 
+e3 
+6d 
+42 
+cb 
+03 
+c4 
+e3 
+6d 
+42 
+08 
+03 
+c4 
+e2 
+7d 
+1c 
+ca 
+c4 
+e2 
+7d 
+1c 
+08 
+c4 
+e2 
+7d 
+1d 
+ca 
+c4 
+e2 
+7d 
+1d 
+08 
+c4 
+e2 
+7d 
+1e 
+ca 
+c4 
+e2 
+7d 
+1e 
+08 
+c5 
+f5 
+63 
+cb 
+c5 
+f5 
+63 
+08 
+c5 
+ed 
+63 
+cb 
+c5 
+ed 
+63 
+08 
+c5 
+f5 
+6b 
+cb 
+c5 
+f5 
+6b 
+08 
+c5 
+ed 
+6b 
+cb 
+c5 
+ed 
+6b 
+08 
+c4 
+e2 
+75 
+2b 
+cb 
+c4 
+e2 
+75 
+2b 
+08 
+c4 
+e2 
+6d 
+2b 
+cb 
+c4 
+e2 
+6d 
+2b 
+08 
+c5 
+f5 
+67 
+cb 
+c5 
+f5 
+67 
+08 
+c5 
+ed 
+67 
+cb 
+c5 
+ed 
+67 
+08 
+c5 
+f5 
+fc 
+cb 
+c5 
+f5 
+fc 
+08 
+c5 
+ed 
+fc 
+cb 
+c5 
+ed 
+fc 
+08 
+c5 
+f5 
+fd 
+cb 
+c5 
+f5 
+fd 
+08 
+c5 
+ed 
+fd 
+cb 
+c5 
+ed 
+fd 
+08 
+c5 
+f5 
+fe 
+cb 
+c5 
+f5 
+fe 
+08 
+c5 
+ed 
+fe 
+cb 
+c5 
+ed 
+fe 
+08 
+c5 
+f5 
+d4 
+cb 
+c5 
+f5 
+d4 
+08 
+c5 
+ed 
+d4 
+cb 
+c5 
+ed 
+d4 
+08 
+c5 
+f5 
+ec 
+cb 
+c5 
+f5 
+ec 
+08 
+c5 
+ed 
+ec 
+cb 
+c5 
+ed 
+ec 
+08 
+c5 
+f5 
+ed 
+cb 
+c5 
+f5 
+ed 
+08 
+c5 
+ed 
+ed 
+cb 
+c5 
+ed 
+ed 
+08 
+c5 
+f5 
+dc 
+cb 
+c5 
+f5 
+dc 
+08 
+c5 
+ed 
+dc 
+cb 
+c5 
+ed 
+dc 
+08 
+c5 
+f5 
+dd 
+cb 
+c5 
+f5 
+dd 
+08 
+c5 
+ed 
+dd 
+cb 
+c5 
+ed 
+dd 
+08 
+c4 
+e3 
+6d 
+0f 
+cb 
+03 
+c4 
+e3 
+6d 
+0f 
+08 
+03 
+c5 
+f5 
+db 
+cb 
+c5 
+f5 
+db 
+08 
+c5 
+ed 
+db 
+cb 
+c5 
+ed 
+db 
+08 
+c5 
+f5 
+df 
+cb 
+c5 
+f5 
+df 
+08 
+c5 
+ed 
+df 
+cb 
+c5 
+ed 
+df 
+08 
+c5 
+f5 
+e0 
+cb 
+c5 
+f5 
+e0 
+08 
+c5 
+ed 
+e0 
+cb 
+c5 
+ed 
+e0 
+08 
+c5 
+f5 
+e3 
+cb 
+c5 
+f5 
+e3 
+08 
+c5 
+ed 
+e3 
+cb 
+c5 
+ed 
+e3 
+08 
+c4 
+e3 
+6d 
+4c 
+cb 
+40 
+c4 
+e3 
+6d 
+4c 
+08 
+40 
+c4 
+e3 
+75 
+0e 
+cb 
+03 
+c4 
+e3 
+75 
+0e 
+08 
+03 
+c4 
+e3 
+6d 
+0e 
+cb 
+03 
+c4 
+e3 
+6d 
+0e 
+08 
+03 
+c5 
+f5 
+74 
+cb 
+c5 
+f5 
+74 
+08 
+c5 
+ed 
+74 
+cb 
+c5 
+ed 
+74 
+08 
+c5 
+f5 
+75 
+cb 
+c5 
+f5 
+75 
+08 
+c5 
+ed 
+75 
+cb 
+c5 
+ed 
+75 
+08 
+c5 
+f5 
+76 
+cb 
+c5 
+f5 
+76 
+08 
+c5 
+ed 
+76 
+cb 
+c5 
+ed 
+76 
+08 
+c4 
+e2 
+75 
+29 
+cb 
+c4 
+e2 
+75 
+29 
+08 
+c4 
+e2 
+6d 
+29 
+cb 
+c4 
+e2 
+6d 
+29 
+08 
+c5 
+f5 
+64 
+cb 
+c5 
+f5 
+64 
+08 
+c5 
+ed 
+64 
+cb 
+c5 
+ed 
+64 
+08 
+c5 
+f5 
+65 
+cb 
+c5 
+f5 
+65 
+08 
+c5 
+ed 
+65 
+cb 
+c5 
+ed 
+65 
+08 
+c5 
+f5 
+66 
+cb 
+c5 
+f5 
+66 
+08 
+c5 
+ed 
+66 
+cb 
+c5 
+ed 
+66 
+08 
+c4 
+e2 
+75 
+37 
+cb 
+c4 
+e2 
+75 
+37 
+08 
+c4 
+e2 
+6d 
+37 
+cb 
+c4 
+e2 
+6d 
+37 
+08 
+c4 
+e2 
+75 
+01 
+cb 
+c4 
+e2 
+75 
+01 
+08 
+c4 
+e2 
+6d 
+01 
+cb 
+c4 
+e2 
+6d 
+01 
+08 
+c4 
+e2 
+75 
+02 
+cb 
+c4 
+e2 
+75 
+02 
+08 
+c4 
+e2 
+6d 
+02 
+cb 
+c4 
+e2 
+6d 
+02 
+08 
+c4 
+e2 
+75 
+03 
+cb 
+c4 
+e2 
+75 
+03 
+08 
+c4 
+e2 
+6d 
+03 
+cb 
+c4 
+e2 
+6d 
+03 
+08 
+c4 
+e2 
+75 
+05 
+cb 
+c4 
+e2 
+75 
+05 
+08 
+c4 
+e2 
+6d 
+05 
+cb 
+c4 
+e2 
+6d 
+05 
+08 
+c4 
+e2 
+75 
+06 
+cb 
+c4 
+e2 
+75 
+06 
+08 
+c4 
+e2 
+6d 
+06 
+cb 
+c4 
+e2 
+6d 
+06 
+08 
+c4 
+e2 
+75 
+07 
+cb 
+c4 
+e2 
+75 
+07 
+08 
+c4 
+e2 
+6d 
+07 
+cb 
+c4 
+e2 
+6d 
+07 
+08 
+c4 
+e2 
+75 
+04 
+cb 
+c4 
+e2 
+75 
+04 
+08 
+c4 
+e2 
+6d 
+04 
+cb 
+c4 
+e2 
+6d 
+04 
+08 
+c5 
+f5 
+f5 
+cb 
+c5 
+f5 
+f5 
+08 
+c5 
+ed 
+f5 
+cb 
+c5 
+ed 
+f5 
+08 
+c4 
+e2 
+75 
+3c 
+cb 
+c4 
+e2 
+75 
+3c 
+08 
+c4 
+e2 
+6d 
+3c 
+cb 
+c4 
+e2 
+6d 
+3c 
+08 
+c5 
+f5 
+ee 
+cb 
+c5 
+f5 
+ee 
+08 
+c5 
+ed 
+ee 
+cb 
+c5 
+ed 
+ee 
+08 
+c4 
+e2 
+75 
+3d 
+cb 
+c4 
+e2 
+75 
+3d 
+08 
+c4 
+e2 
+6d 
+3d 
+cb 
+c4 
+e2 
+6d 
+3d 
+08 
+c5 
+f5 
+de 
+cb 
+c5 
+f5 
+de 
+08 
+c5 
+ed 
+de 
+cb 
+c5 
+ed 
+de 
+08 
+c4 
+e2 
+75 
+3e 
+cb 
+c4 
+e2 
+75 
+3e 
+08 
+c4 
+e2 
+6d 
+3e 
+cb 
+c4 
+e2 
+6d 
+3e 
+08 
+c4 
+e2 
+75 
+3f 
+cb 
+c4 
+e2 
+75 
+3f 
+08 
+c4 
+e2 
+6d 
+3f 
+cb 
+c4 
+e2 
+6d 
+3f 
+08 
+c4 
+e2 
+75 
+38 
+cb 
+c4 
+e2 
+75 
+38 
+08 
+c4 
+e2 
+6d 
+38 
+cb 
+c4 
+e2 
+6d 
+38 
+08 
+c5 
+f5 
+ea 
+cb 
+c5 
+f5 
+ea 
+08 
+c5 
+ed 
+ea 
+cb 
+c5 
+ed 
+ea 
+08 
+c4 
+e2 
+75 
+39 
+cb 
+c4 
+e2 
+75 
+39 
+08 
+c4 
+e2 
+6d 
+39 
+cb 
+c4 
+e2 
+6d 
+39 
+08 
+c5 
+f5 
+da 
+cb 
+c5 
+f5 
+da 
+08 
+c5 
+ed 
+da 
+cb 
+c5 
+ed 
+da 
+08 
+c4 
+e2 
+75 
+3a 
+cb 
+c4 
+e2 
+75 
+3a 
+08 
+c4 
+e2 
+6d 
+3a 
+cb 
+c4 
+e2 
+6d 
+3a 
+08 
+c4 
+e2 
+75 
+3b 
+cb 
+c4 
+e2 
+75 
+3b 
+08 
+c4 
+e2 
+6d 
+3b 
+cb 
+c4 
+e2 
+6d 
+3b 
+08 
+c5 
+fd 
+d7 
+c1 
+c5 
+fd 
+d7 
+c1 
+c4 
+e2 
+7d 
+20 
+ca 
+c4 
+e2 
+7d 
+20 
+08 
+c4 
+e2 
+7d 
+20 
+08 
+c4 
+e2 
+7d 
+21 
+ca 
+c4 
+e2 
+7d 
+21 
+08 
+c4 
+e2 
+7d 
+21 
+08 
+c4 
+e2 
+7d 
+22 
+ca 
+c4 
+e2 
+7d 
+22 
+08 
+c4 
+e2 
+7d 
+22 
+08 
+c4 
+e2 
+7d 
+23 
+ca 
+c4 
+e2 
+7d 
+23 
+08 
+c4 
+e2 
+7d 
+23 
+08 
+c4 
+e2 
+7d 
+24 
+ca 
+c4 
+e2 
+7d 
+24 
+08 
+c4 
+e2 
+7d 
+24 
+08 
+c4 
+e2 
+7d 
+25 
+ca 
+c4 
+e2 
+7d 
+25 
+08 
+c4 
+e2 
+7d 
+25 
+08 
+c4 
+e2 
+7d 
+30 
+ca 
+c4 
+e2 
+7d 
+30 
+08 
+c4 
+e2 
+7d 
+30 
+08 
+c4 
+e2 
+7d 
+31 
+ca 
+c4 
+e2 
+7d 
+31 
+08 
+c4 
+e2 
+7d 
+31 
+08 
+c4 
+e2 
+7d 
+32 
+ca 
+c4 
+e2 
+7d 
+32 
+08 
+c4 
+e2 
+7d 
+32 
+08 
+c4 
+e2 
+7d 
+33 
+ca 
+c4 
+e2 
+7d 
+33 
+08 
+c4 
+e2 
+7d 
+33 
+08 
+c4 
+e2 
+7d 
+34 
+ca 
+c4 
+e2 
+7d 
+34 
+08 
+c4 
+e2 
+7d 
+34 
+08 
+c4 
+e2 
+7d 
+35 
+ca 
+c4 
+e2 
+7d 
+35 
+08 
+c4 
+e2 
+7d 
+35 
+08 
+c4 
+e2 
+75 
+28 
+cb 
+c4 
+e2 
+75 
+28 
+08 
+c4 
+e2 
+6d 
+28 
+cb 
+c4 
+e2 
+6d 
+28 
+08 
+c4 
+e2 
+75 
+0b 
+cb 
+c4 
+e2 
+75 
+0b 
+08 
+c4 
+e2 
+6d 
+0b 
+cb 
+c4 
+e2 
+6d 
+0b 
+08 
+c5 
+f5 
+e4 
+cb 
+c5 
+f5 
+e4 
+08 
+c5 
+ed 
+e4 
+cb 
+c5 
+ed 
+e4 
+08 
+c5 
+f5 
+e5 
+cb 
+c5 
+f5 
+e5 
+08 
+c5 
+ed 
+e5 
+cb 
+c5 
+ed 
+e5 
+08 
+c5 
+f5 
+d5 
+cb 
+c5 
+f5 
+d5 
+08 
+c5 
+ed 
+d5 
+cb 
+c5 
+ed 
+d5 
+08 
+c4 
+e2 
+75 
+40 
+cb 
+c4 
+e2 
+75 
+40 
+08 
+c4 
+e2 
+6d 
+40 
+cb 
+c4 
+e2 
+6d 
+40 
+08 
+c5 
+f5 
+f4 
+cb 
+c5 
+f5 
+f4 
+08 
+c5 
+ed 
+f4 
+cb 
+c5 
+ed 
+f4 
+08 
+c5 
+f5 
+eb 
+cb 
+c5 
+f5 
+eb 
+08 
+c5 
+ed 
+eb 
+cb 
+c5 
+ed 
+eb 
+08 
+c5 
+f5 
+f6 
+cb 
+c5 
+f5 
+f6 
+08 
+c5 
+ed 
+f6 
+cb 
+c5 
+ed 
+f6 
+08 
+c4 
+e2 
+75 
+00 
+cb 
+c4 
+e2 
+75 
+00 
+08 
+c4 
+e2 
+6d 
+00 
+cb 
+c4 
+e2 
+6d 
+00 
+08 
+c5 
+fd 
+70 
+cb 
+03 
+c5 
+fd 
+70 
+08 
+03 
+c5 
+fe 
+70 
+cb 
+03 
+c5 
+fe 
+70 
+08 
+03 
+c5 
+ff 
+70 
+cb 
+03 
+c5 
+ff 
+70 
+08 
+03 
+c4 
+e2 
+75 
+08 
+cb 
+c4 
+e2 
+75 
+08 
+08 
+c4 
+e2 
+6d 
+08 
+cb 
+c4 
+e2 
+6d 
+08 
+08 
+c4 
+e2 
+75 
+09 
+cb 
+c4 
+e2 
+75 
+09 
+08 
+c4 
+e2 
+6d 
+09 
+cb 
+c4 
+e2 
+6d 
+09 
+08 
+c4 
+e2 
+75 
+0a 
+cb 
+c4 
+e2 
+75 
+0a 
+08 
+c4 
+e2 
+6d 
+0a 
+cb 
+c4 
+e2 
+6d 
+0a 
+08 
+c5 
+f5 
+73 
+f9 
+03 
+c5 
+f5 
+73 
+fa 
+03 
+c5 
+f5 
+f1 
+cb 
+c5 
+f5 
+f1 
+08 
+c5 
+f5 
+71 
+f1 
+03 
+c5 
+ed 
+f1 
+cb 
+c5 
+ed 
+f1 
+08 
+c5 
+f5 
+71 
+f2 
+03 
+c5 
+f5 
+f2 
+cb 
+c5 
+f5 
+f2 
+08 
+c5 
+f5 
+72 
+f1 
+03 
+c5 
+ed 
+f2 
+cb 
+c5 
+ed 
+f2 
+08 
+c5 
+f5 
+72 
+f2 
+03 
+c5 
+f5 
+f3 
+cb 
+c5 
+f5 
+f3 
+08 
+c5 
+f5 
+73 
+f1 
+03 
+c5 
+ed 
+f3 
+cb 
+c5 
+ed 
+f3 
+08 
+c5 
+f5 
+73 
+f2 
+03 
+c5 
+f5 
+e1 
+cb 
+c5 
+f5 
+e1 
+08 
+c5 
+f5 
+71 
+e1 
+03 
+c5 
+ed 
+e1 
+cb 
+c5 
+ed 
+e1 
+08 
+c5 
+f5 
+71 
+e2 
+03 
+c5 
+f5 
+e2 
+cb 
+c5 
+f5 
+e2 
+08 
+c5 
+f5 
+72 
+e1 
+03 
+c5 
+ed 
+e2 
+cb 
+c5 
+ed 
+e2 
+08 
+c5 
+f5 
+72 
+e2 
+03 
+c5 
+f5 
+73 
+d9 
+03 
+c5 
+f5 
+73 
+da 
+03 
+c5 
+f5 
+d1 
+cb 
+c5 
+f5 
+d1 
+08 
+c5 
+f5 
+71 
+d1 
+03 
+c5 
+ed 
+d1 
+cb 
+c5 
+ed 
+d1 
+08 
+c5 
+f5 
+71 
+d2 
+03 
+c5 
+f5 
+d2 
+cb 
+c5 
+f5 
+d2 
+08 
+c5 
+f5 
+72 
+d1 
+03 
+c5 
+ed 
+d2 
+cb 
+c5 
+ed 
+d2 
+08 
+c5 
+f5 
+72 
+d2 
+03 
+c5 
+f5 
+d2 
+cb 
+c5 
+f5 
+d2 
+08 
+c5 
+f5 
+72 
+d1 
+03 
+c5 
+ed 
+d2 
+cb 
+c5 
+ed 
+d2 
+08 
+c5 
+f5 
+72 
+d2 
+03 
+c5 
+f5 
+e8 
+cb 
+c5 
+f5 
+e8 
+08 
+c5 
+ed 
+e8 
+cb 
+c5 
+ed 
+e8 
+08 
+c5 
+f5 
+e9 
+cb 
+c5 
+f5 
+e9 
+08 
+c5 
+ed 
+e9 
+cb 
+c5 
+ed 
+e9 
+08 
+c5 
+f5 
+d8 
+cb 
+c5 
+f5 
+d8 
+08 
+c5 
+ed 
+d8 
+cb 
+c5 
+ed 
+d8 
+08 
+c5 
+f5 
+d9 
+cb 
+c5 
+f5 
+d9 
+08 
+c5 
+ed 
+d9 
+cb 
+c5 
+ed 
+d9 
+08 
+c5 
+f5 
+68 
+cb 
+c5 
+f5 
+68 
+08 
+c5 
+ed 
+68 
+cb 
+c5 
+ed 
+68 
+08 
+c5 
+f5 
+69 
+cb 
+c5 
+f5 
+69 
+08 
+c5 
+ed 
+69 
+cb 
+c5 
+ed 
+69 
+08 
+c5 
+f5 
+6a 
+cb 
+c5 
+f5 
+6a 
+08 
+c5 
+ed 
+6a 
+cb 
+c5 
+ed 
+6a 
+08 
+c5 
+f5 
+6d 
+cb 
+c5 
+f5 
+6d 
+08 
+c5 
+ed 
+6d 
+cb 
+c5 
+ed 
+6d 
+08 
+c5 
+f5 
+60 
+cb 
+c5 
+f5 
+60 
+08 
+c5 
+ed 
+60 
+cb 
+c5 
+ed 
+60 
+08 
+c5 
+f5 
+61 
+cb 
+c5 
+f5 
+61 
+08 
+c5 
+ed 
+61 
+cb 
+c5 
+ed 
+61 
+08 
+c5 
+f5 
+62 
+cb 
+c5 
+f5 
+62 
+08 
+c5 
+ed 
+62 
+cb 
+c5 
+ed 
+62 
+08 
+c5 
+f5 
+6c 
+cb 
+c5 
+f5 
+6c 
+08 
+c5 
+ed 
+6c 
+cb 
+c5 
+ed 
+6c 
+08 
+c5 
+f5 
+ef 
+cb 
+c5 
+f5 
+ef 
+08 
+c5 
+ed 
+ef 
+cb 
+c5 
+ed 
+ef 
+08 
+c4 
+e2 
+7d 
+2a 
+08 
+c4 
+e2 
+79 
+18 
+ca 
+c4 
+e2 
+7d 
+18 
+ca 
+c4 
+e2 
+7d 
+19 
+ca 
+c4 
+e2 
+7d 
+5a 
+08 
+c4 
+e3 
+6d 
+02 
+cb 
+03 
+c4 
+e3 
+6d 
+02 
+08 
+03 
+c4 
+e2 
+79 
+78 
+ca 
+c4 
+e2 
+79 
+78 
+08 
+c4 
+e2 
+7d 
+78 
+ca 
+c4 
+e2 
+7d 
+78 
+08 
+c4 
+e2 
+79 
+79 
+ca 
+c4 
+e2 
+79 
+79 
+08 
+c4 
+e2 
+7d 
+79 
+ca 
+c4 
+e2 
+7d 
+79 
+08 
+c4 
+e2 
+79 
+58 
+ca 
+c4 
+e2 
+79 
+58 
+08 
+c4 
+e2 
+7d 
+58 
+ca 
+c4 
+e2 
+7d 
+58 
+08 
+c4 
+e2 
+79 
+59 
+ca 
+c4 
+e2 
+79 
+59 
+08 
+c4 
+e2 
+7d 
+59 
+ca 
+c4 
+e2 
+7d 
+59 
+08 
+c4 
+e2 
+6d 
+36 
+cb 
+c4 
+e2 
+6d 
+36 
+08 
+c4 
+e3 
+fd 
+01 
+ca 
+03 
+c4 
+e3 
+fd 
+01 
+08 
+03 
+c4 
+e2 
+6d 
+16 
+cb 
+c4 
+e2 
+6d 
+16 
+08 
+c4 
+e3 
+fd 
+00 
+ca 
+03 
+c4 
+e3 
+fd 
+00 
+08 
+03 
+c4 
+e3 
+6d 
+46 
+cb 
+03 
+c4 
+e3 
+6d 
+46 
+08 
+03 
+c4 
+e3 
+7d 
+39 
+d1 
+03 
+c4 
+e3 
+7d 
+39 
+10 
+03 
+c4 
+e3 
+6d 
+38 
+cb 
+03 
+c4 
+e3 
+6d 
+38 
+08 
+03 
+c4 
+e2 
+69 
+8c 
+08 
+c4 
+e2 
+6d 
+8c 
+08 
+c4 
+e2 
+71 
+8e 
+10 
+c4 
+e2 
+75 
+8e 
+10 
+c4 
+e2 
+e9 
+8c 
+08 
+c4 
+e2 
+ed 
+8c 
+08 
+c4 
+e2 
+f1 
+8e 
+10 
+c4 
+e2 
+f5 
+8e 
+10 
+c4 
+e2 
+69 
+47 
+cb 
+c4 
+e2 
+69 
+47 
+08 
+c4 
+e2 
+6d 
+47 
+cb 
+c4 
+e2 
+6d 
+47 
+08 
+c4 
+e2 
+e9 
+47 
+cb 
+c4 
+e2 
+e9 
+47 
+08 
+c4 
+e2 
+ed 
+47 
+cb 
+c4 
+e2 
+ed 
+47 
+08 
+c4 
+e2 
+69 
+46 
+cb 
+c4 
+e2 
+69 
+46 
+08 
+c4 
+e2 
+6d 
+46 
+cb 
+c4 
+e2 
+6d 
+46 
+08 
+c4 
+e2 
+69 
+45 
+cb 
+c4 
+e2 
+69 
+45 
+08 
+c4 
+e2 
+6d 
+45 
+cb 
+c4 
+e2 
+6d 
+45 
+08 
+c4 
+e2 
+e9 
+45 
+cb 
+c4 
+e2 
+e9 
+45 
+08 
+c4 
+e2 
+ed 
+45 
+cb 
+c4 
+e2 
+ed 
+45 
+08 
+c4 
+e2 
+e9 
+92 
+0c 
+08 
+c4 
+e2 
+e9 
+92 
+0c 
+08 
+c4 
+e2 
+ed 
+92 
+0c 
+08 
+c4 
+e2 
+ed 
+92 
+0c 
+08 
+c4 
+e2 
+e9 
+93 
+0c 
+08 
+c4 
+e2 
+e9 
+93 
+0c 
+08 
+c4 
+e2 
+ed 
+93 
+0c 
+08 
+c4 
+e2 
+ed 
+93 
+0c 
+08 
+c4 
+e2 
+69 
+92 
+0c 
+08 
+c4 
+e2 
+69 
+92 
+0c 
+08 
+c4 
+e2 
+6d 
+92 
+0c 
+08 
+c4 
+e2 
+6d 
+92 
+0c 
+08 
+c4 
+e2 
+69 
+93 
+0c 
+08 
+c4 
+e2 
+69 
+93 
+0c 
+08 
+c4 
+e2 
+6d 
+93 
+0c 
+08 
+c4 
+e2 
+6d 
+93 
+0c 
+08 
+c4 
+e2 
+69 
+90 
+0c 
+08 
+c4 
+e2 
+69 
+90 
+0c 
+08 
+c4 
+e2 
+6d 
+90 
+0c 
+08 
+c4 
+e2 
+6d 
+90 
+0c 
+08 
+c4 
+e2 
+69 
+91 
+0c 
+08 
+c4 
+e2 
+69 
+91 
+0c 
+08 
+c4 
+e2 
+6d 
+91 
+0c 
+08 
+c4 
+e2 
+6d 
+91 
+0c 
+08 
+c4 
+e2 
+e9 
+90 
+0c 
+08 
+c4 
+e2 
+e9 
+90 
+0c 
+08 
+c4 
+e2 
+ed 
+90 
+0c 
+08 
+c4 
+e2 
+ed 
+90 
+0c 
+08 
+c4 
+e2 
+e9 
+91 
+0c 
+08 
+c4 
+e2 
+e9 
+91 
+0c 
+08 
+c4 
+e2 
+ed 
+91 
+0c 
+08 
+c4 
+e2 
+ed 
+91 
+0c 
+08

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi1.asm Added

@@ -0,0 +1,32 @@
+[bits 64]
+andn eax, ebx, ecx	; c4 e2 60 f2 c1
+andn eax, ebx, [0]	; c4 e2 60 f2 04 25 00 00 00 00
+andn rax, rbx, rcx	; c4 e2 e0 f2 c1
+andn rax, rbx, [0]	; c4 e2 e0 f2 04 25 00 00 00 00
+
+bextr eax, ebx, ecx	; c4 e2 70 f7 c3
+bextr eax, [0], ecx	; c4 e2 70 f7 04 25 00 00 00 00
+bextr rax, rbx, rcx	; c4 e2 f0 f7 c3
+bextr rax, [0], rcx	; c4 e2 f0 f7 04 25 00 00 00 00
+
+blsi eax, ecx		; c4 e2 78 f3 d9
+blsi eax, [0]		; c4 e2 78 f3 1c 25 00 00 00 00
+blsi rax, rcx		; c4 e2 f8 f3 d9
+blsi rax, [0]		; c4 e2 f8 f3 1c 25 00 00 00 00
+
+blsmsk eax, ecx		; c4 e2 78 f3 d1
+blsmsk eax, [0]		; c4 e2 78 f3 14 25 00 00 00 00
+blsmsk rax, rcx		; c4 e2 f8 f3 d1
+blsmsk rax, [0]		; c4 e2 f8 f3 14 25 00 00 00 00
+
+blsr eax, ecx		; c4 e2 78 f3 c9
+blsr eax, [0]		; c4 e2 78 f3 0c 25 00 00 00 00
+blsr rax, rcx		; c4 e2 f8 f3 c9
+blsr rax, [0]		; c4 e2 f8 f3 0c 25 00 00 00 00
+
+tzcnt ax, bx		; 66 f3 0f bc c3
+tzcnt ax, [0]		; 66 f3 0f bc 04 25 00 00 00 00
+tzcnt eax, ebx		; f3 0f bc c3
+tzcnt eax, [0]		; f3 0f bc 04 25 00 00 00 00
+tzcnt rax, rbx		; f3 48 0f bc c3
+tzcnt rax, [0]		; f3 48 0f bc 04 25 00 00 00 00

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi1.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi2.asm Added

@@ -0,0 +1,40 @@
+[bits 64]
+bzhi eax, ebx, ecx	; c4 e2 70 f5 c3
+bzhi eax, [0], ecx	; c4 e2 70 f5 04 25 00 00 00 00
+bzhi rax, rbx, rcx	; c4 e2 f0 f5 c3
+bzhi rax, [0], rcx	; c4 e2 f0 f5 04 25 00 00 00 00
+
+mulx eax, ebx, ecx	; c4 e2 63 f6 c1
+mulx eax, ebx, [0]	; c4 e2 63 f6 04 25 00 00 00 00
+mulx rax, rbx, rcx	; c4 e2 e3 f6 c1
+mulx rax, rbx, [0]	; c4 e2 e3 f6 04 25 00 00 00 00
+
+pdep eax, ebx, ecx	; c4 e2 63 f5 c1
+pdep eax, ebx, [0]	; c4 e2 63 f5 04 25 00 00 00 00
+pdep rax, rbx, rcx	; c4 e2 e3 f5 c1
+pdep rax, rbx, [0]	; c4 e2 e3 f5 04 25 00 00 00 00
+
+pext eax, ebx, ecx	; c4 e2 62 f5 c1
+pext eax, ebx, [0]	; c4 e2 62 f5 04 25 00 00 00 00
+pext rax, rbx, rcx	; c4 e2 e2 f5 c1
+pext rax, rbx, [0]	; c4 e2 e2 f5 04 25 00 00 00 00
+
+rorx eax, ebx, 3	; c4 e3 7b f0 c3 03
+rorx eax, [0], 3	; c4 e3 7b f0 04 25 00 00 00 00 03
+rorx rax, rbx, 3	; c4 e3 fb f0 c3 03
+rorx rax, [0], 3	; c4 e3 fb f0 04 25 00 00 00 00 03
+
+sarx eax, ebx, ecx	; c4 e2 72 f7 c3
+sarx eax, [0], ecx	; c4 e2 72 f7 04 25 00 00 00 00
+sarx rax, rbx, rcx	; c4 e2 f2 f7 c3
+sarx rax, [0], rcx	; c4 e2 f2 f7 04 25 00 00 00 00
+
+shlx eax, ebx, ecx	; c4 e2 71 f7 c3
+shlx eax, [0], ecx	; c4 e2 71 f7 04 25 00 00 00 00
+shlx rax, rbx, rcx	; c4 e2 f1 f7 c3
+shlx rax, [0], rcx	; c4 e2 f1 f7 04 25 00 00 00 00
+
+shrx eax, ebx, ecx	; c4 e2 73 f7 c3
+shrx eax, [0], ecx	; c4 e2 73 f7 04 25 00 00 00 00
+shrx rax, rbx, rcx	; c4 e2 f3 f7 c3
+shrx rax, [0], rcx	; c4 e2 f3 f7 04 25 00 00 00 00

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi2.hex Added

@@ -0,0 +1,244 @@
+c4 
+e2 
+70 
+f5 
+c3 
+c4 
+e2 
+70 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f0 
+f5 
+c3 
+c4 
+e2 
+f0 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+63 
+f6 
+c1 
+c4 
+e2 
+63 
+f6 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+e3 
+f6 
+c1 
+c4 
+e2 
+e3 
+f6 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+63 
+f5 
+c1 
+c4 
+e2 
+63 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+e3 
+f5 
+c1 
+c4 
+e2 
+e3 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+62 
+f5 
+c1 
+c4 
+e2 
+62 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+e2 
+f5 
+c1 
+c4 
+e2 
+e2 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e3 
+7b 
+f0 
+c3 
+03 
+c4 
+e3 
+7b 
+f0 
+04 
+25 
+00 
+00 
+00 
+00 
+03 
+c4 
+e3 
+fb 
+f0 
+c3 
+03 
+c4 
+e3 
+fb 
+f0 
+04 
+25 
+00 
+00 
+00 
+00 
+03 
+c4 
+e2 
+72 
+f7 
+c3 
+c4 
+e2 
+72 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f2 
+f7 
+c3 
+c4 
+e2 
+f2 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+71 
+f7 
+c3 
+c4 
+e2 
+71 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f1 
+f7 
+c3 
+c4 
+e2 
+f1 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+73 
+f7 
+c3 
+c4 
+e2 
+73 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f3 
+f7 
+c3 
+c4 
+e2 
+f3 
+f7 
+04 
+25 
+00 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/Makefile.inc Changed

yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/gas-pop.asm Added

@@ -0,0 +1,50 @@
+.code64
+push %cx		# out: 66 51
+pop %cx			# out: 66 59
+push %rcx		# out: 51
+pop %rcx		# out: 59
+pushw %cx		# out: 66 51
+popw %cx		# out: 66 59
+pushq %rcx		# out: 51
+popq %rcx		# out: 59
+
+push -24(%rcx)		# out: ff 71 e8
+pop -24(%rcx)		# out: 8f 41 e8
+pushw -24(%rcx)		# out: 66 ff 71 e8
+popw -24(%rcx)		# out: 66 8f 41 e8
+pushq -24(%rcx)		# out: ff 71 e8
+popq -24(%rcx)		# out: 8f 41 e8
+
+.code32
+push %cx		# out: 66 51
+pop %cx			# out: 66 59
+push %ecx		# out: 51
+pop %ecx		# out: 59
+pushw %cx		# out: 66 51
+popw %cx		# out: 66 59
+pushl %ecx		# out: 51
+popl %ecx		# out: 59
+
+push -24(%ecx)		# out: ff 71 e8
+pop -24(%ecx)		# out: 8f 41 e8
+pushw -24(%ecx)		# out: 66 ff 71 e8
+popw -24(%ecx)		# out: 66 8f 41 e8
+pushl -24(%ecx)		# out: ff 71 e8
+popl -24(%ecx)		# out: 8f 41 e8
+
+.code16
+push %cx		# out: 51
+pop %cx			# out: 59
+push %ecx		# out: 66 51
+pop %ecx		# out: 66 59
+pushw %cx		# out: 51
+popw %cx		# out: 59
+pushl %ecx		# out: 66 51
+popl %ecx		# out: 66 59
+
+push -24(%bp)		# out: ff 76 e8
+pop -24(%bp)		# out: 8f 46 e8
+pushw -24(%bp)		# out: ff 76 e8
+popw -24(%bp)		# out: 8f 46 e8
+pushl -24(%bp)		# out: 66 ff 76 e8
+popl -24(%bp)		# out: 66 8f 46 e8

yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/gas-pop.hex Added

@@ -0,0 +1,456 @@
+7f 
+45 
+4c 
+46 
+01 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+03 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+34 
+00 
+00 
+00 
+00 
+00 
+28 
+00 
+05 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+66 
+51 
+66 
+59 
+51 
+59 
+66 
+51 
+66 
+59 
+51 
+59 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+66 
+ff 
+71 
+e8 
+66 
+8f 
+41 
+e8 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+66 
+51 
+66 
+59 
+51 
+59 
+66 
+51 
+66 
+59 
+51 
+59 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+66 
+ff 
+71 
+e8 
+66 
+8f 
+41 
+e8 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+51 
+59 
+66 
+51 
+66 
+59 
+51 
+59 
+66 
+51 
+66 
+59 
+ff 
+76 
+e8 
+8f 
+46 
+e8 
+ff 
+76 
+e8 
+8f 
+46 
+e8 
+66 
+ff 
+76 
+e8 
+66 
+8f 
+46 
+e8 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+2e 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+2e 
+73 
+79 
+6d 
+74 
+61 
+62 
+00 
+2e 
+73 
+68 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+00 
+00 
+00 
+00 
+2d 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+f1 
+ff 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+17 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+a0 
+00 
+00 
+00 
+21 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+c4 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0f 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+c8 
+00 
+00 
+00 
+30 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+60 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas32/x86_gas32_test.sh -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/x86_gas32_test.sh Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/gas-moreinsn.hex -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/gas-moreinsn.hex Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.asm -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.asm Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.hex -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.hex Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/x86_gas64_test.sh -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/x86_gas64_test.sh Changed

yasm-1.2.0.tar.gz/modules/arch/x86/tests/invpcid.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/invpcid.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/larlsl.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/larlsl.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lfs64.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lfs64.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lzcnt.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lzcnt.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/shift64.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/shift64.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib-err.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib-err.errwarn Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib.asm Added

@@ -0,0 +1,114 @@
+[bits 16]
+; test promotion to 32-bit address size
+vpgatherdq xmm0,[xmm0],xmm0		; 67 c4 e2 f9 90 04 05 00 00 00 00
+vpgatherqq ymm0,[ymm0],ymm0		; 67 c4 e2 fd 91 04 05 00 00 00 00
+
+[bits 32]
+; test promotion from base to index
+vpgatherdq xmm0,[xmm0],xmm0		; c4 e2 f9 90 04 05 00 00 00 00
+vpgatherqq ymm0,[ymm0],ymm0		; c4 e2 fd 91 04 05 00 00 00 00
+
+; various combinations
+vpgatherdq xmm0,[ecx+xmm5],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ecx+ymm5],ymm0		; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[ebp+xmm5],xmm0		; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ebp+ymm5],ymm0		; c4 e2 fd 91 44 2d 00
+ 
+vpgatherdq xmm0,[xmm5+ecx],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm5+ecx],ymm0		; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[xmm5+ebp],xmm0		; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+ebp],ymm0		; c4 e2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[ecx+xmm5*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ecx+ymm5*1],ymm0	; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[ebp+xmm5*1],xmm0	; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ebp+ymm5*1],ymm0	; c4 e2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[xmm5+ecx*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm5+ecx*1],ymm0	; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[xmm5+ebp*1],xmm0	; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+ebp*1],ymm0	; c4 e2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[nosplit 12345678h + xmm5*1],xmm0; c4 e2 f9 90 04 2d 78 56 34 12
+vpgatherqq ymm0,[nosplit 12345678h + ymm5*1],ymm0; c4 e2 fd 91 04 2d 78 56 34 12
+
+vpgatherdq xmm0,[byte ecx + 12 + xmm5*2],xmm0	; c4 e2 f9 90 44 69 0c
+vpgatherqq ymm0,[byte ecx + 12 + ymm5*2],ymm0	; c4 e2 fd 91 44 69 0c
+vpgatherdq xmm0,[byte ebp + 12 + xmm5*2],xmm0	; c4 e2 f9 90 44 6d 0c
+vpgatherqq ymm0,[byte ebp + 12 + ymm5*2],ymm0	; c4 e2 fd 91 44 6d 0c
+
+vpgatherdq xmm0,[dword ecx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 0c 00 00 00
+vpgatherqq ymm0,[dword ecx + 12 + ymm5*4],ymm0	; c4 e2 fd 91 84 a9 0c 00 00 00
+vpgatherdq xmm0,[dword ebp + 12 + xmm5*4],xmm0	; c4 e2 f9 90 84 ad 0c 00 00 00
+vpgatherqq ymm0,[dword ebp + 12 + ymm5*4],ymm0	; c4 e2 fd 91 84 ad 0c 00 00 00
+
+vpgatherdq xmm0,[ecx + 12345678h + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 78 56 34 12
+vpgatherqq ymm0,[ecx + 12345678h + ymm5*4],ymm0	; c4 e2 fd 91 84 a9 78 56 34 12
+vpgatherdq xmm0,[ebp + 12345678h + xmm5*4],xmm0	; c4 e2 f9 90 84 ad 78 56 34 12
+vpgatherqq ymm0,[ebp + 12345678h + ymm5*4],ymm0	; c4 e2 fd 91 84 ad 78 56 34 12
+
+vpgatherdq xmm0,[ecx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 44 a9 0c
+vpgatherqq ymm0,[ecx + 12 + ymm5*4],ymm0	; c4 e2 fd 91 44 a9 0c
+vpgatherdq xmm0,[ebp + 12 + xmm5*4],xmm0	; c4 e2 f9 90 44 ad 0c
+vpgatherqq ymm0,[ebp + 12 + ymm5*4],ymm0	; c4 e2 fd 91 44 ad 0c
+
+vpgatherdq xmm0,[dword 12 + xmm5*8],xmm0	; c4 e2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[dword 12 + ymm5*8],ymm0	; c4 e2 fd 91 04 ed 0c 00 00 00
+vpgatherdq xmm0,[12 + xmm5*8],xmm0		; c4 e2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[12 + ymm5*8],ymm0		; c4 e2 fd 91 04 ed 0c 00 00 00
+
+[bits 64]
+; test promotion from base to index
+vpgatherdq xmm0,[xmm0],xmm0		; c4 e2 f9 90 04 05 00 00 00 00
+vpgatherqq ymm0,[ymm0],ymm0		; c4 e2 fd 91 04 05 00 00 00 00
+
+; various combinations
+vpgatherdq xmm0,[rcx+xmm5],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[rcx+ymm13],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[r13+xmm13],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[r13+ymm5],ymm0		; c4 c2 fd 91 44 2d 00
+ 
+vpgatherdq xmm0,[xmm5+rcx],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm13+rcx],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[xmm13+r13],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+r13],ymm0		; c4 c2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[rcx+xmm5*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[rcx+ymm13*1],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[r13+xmm13*1],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[r13+ymm5*1],ymm0	; c4 c2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[xmm5+rcx*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm13+rcx*1],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[xmm13+r13*1],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+r13*1],ymm0	; c4 c2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[nosplit 12345678h + xmm5*1],xmm0; c4 e2 f9 90 04 2d 78 56 34 12
+vpgatherqq ymm0,[nosplit 12345678h + ymm5*1],ymm0; c4 e2 fd 91 04 2d 78 56 34 12
+
+vpgatherdq xmm0,[byte rcx + 12 + xmm5*2],xmm0	; c4 e2 f9 90 44 69 0c
+vpgatherqq ymm0,[byte rcx + 12 + ymm13*2],ymm0	; c4 a2 fd 91 44 69 0c
+vpgatherdq xmm0,[byte r13 + 12 + xmm13*2],xmm0	; c4 82 f9 90 44 6d 0c
+vpgatherqq ymm0,[byte r13 + 12 + ymm5*2],ymm0	; c4 c2 fd 91 44 6d 0c
+
+vpgatherdq xmm0,[dword rcx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 0c 00 00 00
+vpgatherqq ymm0,[dword rcx + 12 + ymm13*4],ymm0	; c4 a2 fd 91 84 a9 0c 00 00 00
+vpgatherdq xmm0,[dword r13 + 12 + xmm13*4],xmm0	; c4 82 f9 90 84 ad 0c 00 00 00
+vpgatherqq ymm0,[dword r13 + 12 + ymm5*4],ymm0	; c4 c2 fd 91 84 ad 0c 00 00 00
+
+vpgatherdq xmm0,[rcx + 12345678h + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 78 56 34 12
+vpgatherqq ymm0,[rcx + 12345678h + ymm13*4],ymm0; c4 a2 fd 91 84 a9 78 56 34 12
+vpgatherdq xmm0,[r13 + 12345678h + xmm13*4],xmm0; c4 82 f9 90 84 ad 78 56 34 12
+vpgatherqq ymm0,[r13 + 12345678h + ymm5*4],ymm0	; c4 c2 fd 91 84 ad 78 56 34 12
+
+vpgatherdq xmm0,[rcx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 44 a9 0c
+vpgatherqq ymm0,[rcx + 12 + ymm13*4],ymm0	; c4 a2 fd 91 44 a9 0c
+vpgatherdq xmm0,[r13 + 12 + xmm13*4],xmm0	; c4 82 f9 90 44 ad 0c
+vpgatherqq ymm0,[r13 + 12 + ymm5*4],ymm0	; c4 c2 fd 91 44 ad 0c
+
+vpgatherdq xmm0,[dword 12 + xmm5*8],xmm0	; c4 e2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[dword 12 + ymm13*8],ymm0	; c4 a2 fd 91 04 ed 0c 00 00 00
+vpgatherdq xmm0,[12 + xmm13*8],xmm0		; c4 a2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[12 + ymm5*8],ymm0		; c4 e2 fd 91 04 ed 0c 00 00 00
+
+

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib.hex Added

@@ -0,0 +1,662 @@
+67 
+c4 
+e2 
+f9 
+90 
+04 
+05 
+00 
+00 
+00 
+00 
+67 
+c4 
+e2 
+fd 
+91 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+2d 
+78 
+56 
+34 
+12 
+c4 
+e2 
+fd 
+91 
+04 
+2d 
+78 
+56 
+34 
+12 
+c4 
+e2 
+f9 
+90 
+44 
+69 
+0c 
+c4 
+e2 
+fd 
+91 
+44 
+69 
+0c 
+c4 
+e2 
+f9 
+90 
+44 
+6d 
+0c 
+c4 
+e2 
+fd 
+91 
+44 
+6d 
+0c 
+c4 
+e2 
+f9 
+90 
+84 
+a9 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+84 
+a9 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+84 
+ad 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+84 
+ad 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+84 
+a9 
+78 
+56 
+34 
+12 
+c4 
+e2 
+fd 
+91 
+84 
+a9 
+78 
+56 
+34 
+12 
+c4 
+e2 
+f9 
+90 
+84 
+ad 
+78 
+56 
+34 
+12 
+c4 
+e2 
+fd 
+91 
+84 
+ad 
+78 
+56 
+34 
+12 
+c4 
+e2 
+f9 
+90 
+44 
+a9 
+0c 
+c4 
+e2 
+fd 
+91 
+44 
+a9 
+0c 
+c4 
+e2 
+f9 
+90 
+44 
+ad 
+0c 
+c4 
+e2 
+fd 
+91 
+44 
+ad 
+0c 
+c4 
+e2 
+f9 
+90 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+a2 
+fd 
+91 
+04 
+29 
+c4 
+82 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+c2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+a2 
+fd 
+91 
+04 
+29 
+c4 
+82 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+c2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+a2 
+fd 
+91 
+04 
+29 
+c4 
+82 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+c2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+a2 
+fd 
+91 
+04 
+29 
+c4 
+82 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+c2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+2d 
+78 
+56 
+34 
+12 
+c4 
+e2 
+fd 
+91 
+04 
+2d 
+78 
+56 
+34 
+12 
+c4 
+e2 
+f9 
+90 
+44 
+69 
+0c 
+c4 
+a2 
+fd 
+91 
+44 
+69 
+0c 
+c4 
+82 
+f9 
+90 
+44 
+6d 
+0c 
+c4 
+c2 
+fd 
+91 
+44 
+6d 
+0c 
+c4 
+e2 
+f9 
+90 
+84 
+a9 
+0c 
+00 
+00 
+00 
+c4 
+a2 
+fd 
+91 
+84 
+a9 
+0c 
+00 
+00 
+00 
+c4 
+82 
+f9 
+90 
+84 
+ad 
+0c 
+00 
+00 
+00 
+c4 
+c2 
+fd 
+91 
+84 
+ad 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+84 
+a9 
+78 
+56 
+34 
+12 
+c4 
+a2 
+fd 
+91 
+84 
+a9 
+78 
+56 
+34 
+12 
+c4 
+82 
+f9 
+90 
+84 
+ad 
+78 
+56 
+34 
+12 
+c4 
+c2 
+fd 
+91 
+84 
+ad 
+78 
+56 
+34 
+12 
+c4 
+e2 
+f9 
+90 
+44 
+a9 
+0c 
+c4 
+a2 
+fd 
+91 
+44 
+a9 
+0c 
+c4 
+82 
+f9 
+90 
+44 
+ad 
+0c 
+c4 
+c2 
+fd 
+91 
+44 
+ad 
+0c 
+c4 
+e2 
+f9 
+90 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+a2 
+fd 
+91 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+a2 
+f9 
+90 
+04 
+ed 
+0c 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+04 
+ed 
+0c 
+00 
+00 
+00

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib2-err.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib2-err.errwarn Added

yasm-1.1.0.tar.gz/modules/arch/x86/tests/x86_test.sh -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/x86_test.sh Changed

yasm-1.1.0.tar.gz/modules/arch/x86/x86arch.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86arch.c Changed

yasm-1.1.0.tar.gz/modules/arch/x86/x86arch.h -> yasm-1.2.0.tar.gz/modules/arch/x86/x86arch.h Changed

@@ -1,4 +1,4 @@
-/* $Id: x86arch.h 2346 2010-08-01 01:37:37Z peter $
+/*
  * x86 Architecture header file
  *
  *  Copyright (C) 2001-2007  Peter Johnson
@@ -78,6 +78,11 @@
 #define CPU_XSAVEOPT 44     /* Intel XSAVEOPT instruction */
 #define CPU_EPTVPID 45      /* Intel INVEPT, INVVPID instructions */
 #define CPU_SMX     46      /* Intel SMX instruction (GETSEC) */
+#define CPU_AVX2    47      /* Intel AVX2 instructions */
+#define CPU_BMI1    48      /* Intel BMI1 instructions */
+#define CPU_BMI2    49      /* Intel BMI2 instructions */
+#define CPU_INVPCID 50      /* Intel INVPCID instruction */
+#define CPU_LZCNT   51      /* Intel LZCNT instruction */
 
 enum x86_parser_type {
     X86_PARSER_NASM = 0,
@@ -172,6 +177,9 @@
 typedef struct x86_effaddr {
     yasm_effaddr ea;            /* base structure */
 
+    /* VSIB uses the normal SIB byte, but this flag enables it. */
+    unsigned char vsib_mode;    /* 0 if not, 1 if XMM, 2 if YMM */
+
     /* How the spare (register) bits in Mod/RM are handled:
      * Even if valid_modrm=0, the spare bits are still valid (don't overwrite!)
      * They're set in bytecode_create_insn().

yasm-1.1.0.tar.gz/modules/arch/x86/x86bc.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86bc.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: x86bc.c 2279 2010-01-19 07:57:43Z peter $");
 
 #include <libyasm.h>
 
@@ -44,6 +43,7 @@
                               long new_val, /*@out@*/ long *neg_thres,
                               /*@out@*/ long *pos_thres);
 static int x86_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                               unsigned char *bufstart,
                                void *d, yasm_output_value_func output_value,
                                /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -56,6 +56,7 @@
                              long new_val, /*@out@*/ long *neg_thres,
                              /*@out@*/ long *pos_thres);
 static int x86_bc_jmp_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                              unsigned char *bufstart,
                               void *d, yasm_output_value_func output_value,
                               /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -66,7 +67,7 @@
                                   yasm_bc_add_span_func add_span,
                                   void *add_span_data);
 static int x86_bc_jmpfar_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -189,6 +190,7 @@
     x86_ea->ea.pc_rel = 0;
     x86_ea->ea.not_pc_rel = 0;
     x86_ea->ea.data_len = 0;
+    x86_ea->vsib_mode = 0;
     x86_ea->modrm = 0;
     x86_ea->valid_modrm = 0;
     x86_ea->need_modrm = 0;
@@ -380,6 +382,8 @@
     fprintf(f, "%*sNoSplit=%u\n", indent_level, "", (unsigned int)ea->nosplit);
     fprintf(f, "%*sSegmentOv=%02x\n", indent_level, "",
             (unsigned int)x86_ea->ea.segreg);
+    fprintf(f, "%*sVSIBMode=%u\n", indent_level, "",
+            (unsigned int)x86_ea->vsib_mode);
     fprintf(f, "%*sModRM=%03o ValidRM=%u NeedRM=%u\n", indent_level, "",
             (unsigned int)x86_ea->modrm, (unsigned int)x86_ea->valid_modrm,
             (unsigned int)x86_ea->need_modrm);
@@ -800,14 +804,14 @@
 }
 
 static int
-x86_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+x86_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                    unsigned char *bufstart, void *d,
                     yasm_output_value_func output_value,
                     /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     x86_insn *insn = (x86_insn *)bc->contents;
     /*@null@*/ x86_effaddr *x86_ea = (x86_effaddr *)insn->x86_ea;
     yasm_value *imm = insn->imm;
-    unsigned char *bufp_orig = *bufp;
 
     /* Prefixes */
     x86_common_tobytes(&insn->common, bufp,
@@ -874,7 +878,7 @@
                                          yasm_expr_int(delta), bc->line);
             }
             if (output_value(&x86_ea->ea.disp, *bufp, disp_len,
-                             (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                             (unsigned long)(*bufp-bufstart), bc, 1, d))
                 return 1;
             *bufp += disp_len;
         }
@@ -892,7 +896,7 @@
             imm_len = 1;
         } else
             imm_len = imm->size/8;
-        if (output_value(imm, *bufp, imm_len, (unsigned long)(*bufp-bufp_orig),
+        if (output_value(imm, *bufp, imm_len, (unsigned long)(*bufp-bufstart),
                          bc, 1, d))
             return 1;
         *bufp += imm_len;
@@ -902,14 +906,14 @@
 }
 
 static int
-x86_bc_jmp_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+x86_bc_jmp_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                   unsigned char *bufstart, void *d,
                    yasm_output_value_func output_value,
                    /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     x86_jmp *jmp = (x86_jmp *)bc->contents;
     unsigned char opersize;
     unsigned int i;
-    unsigned char *bufp_orig = *bufp;
     /*@only@*/ yasm_intnum *delta;
 
     /* Prefixes */
@@ -944,7 +948,7 @@
             jmp->target.size = 8;
             jmp->target.sign = 1;
             if (output_value(&jmp->target, *bufp, 1,
-                             (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                             (unsigned long)(*bufp-bufstart), bc, 1, d))
                 return 1;
             *bufp += 1;
             break;
@@ -976,7 +980,7 @@
             jmp->target.size = i*8;
             jmp->target.sign = 1;
             if (output_value(&jmp->target, *bufp, i,
-                             (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                             (unsigned long)(*bufp-bufstart), bc, 1, d))
                 return 1;
             *bufp += i;
             break;
@@ -989,13 +993,13 @@
 }
 
 static int
-x86_bc_jmpfar_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+x86_bc_jmpfar_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                      unsigned char *bufstart, void *d,
                       yasm_output_value_func output_value,
                       /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     x86_jmpfar *jmpfar = (x86_jmpfar *)bc->contents;
     unsigned int i;
-    unsigned char *bufp_orig = *bufp;
     unsigned char opersize;
 
     x86_common_tobytes(&jmpfar->common, bufp, 0);
@@ -1009,12 +1013,12 @@
     i = (opersize == 16) ? 2 : 4;
     jmpfar->offset.size = i*8;
     if (output_value(&jmpfar->offset, *bufp, i,
-                     (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                     (unsigned long)(*bufp-bufstart), bc, 1, d))
         return 1;
     *bufp += i;
     jmpfar->segment.size = 16;
     if (output_value(&jmpfar->segment, *bufp, 2,
-                     (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                     (unsigned long)(*bufp-bufstart), bc, 1, d))
         return 1;
     *bufp += 2;

yasm-1.1.0.tar.gz/modules/arch/x86/x86cpu.gperf -> yasm-1.2.0.tar.gz/modules/arch/x86/x86cpu.gperf Changed

yasm-1.1.0.tar.gz/modules/arch/x86/x86expr.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86expr.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: x86expr.c 2199 2009-05-10 05:24:46Z peter $");
 
 #include <libyasm.h>
 
@@ -34,6 +33,7 @@
 
 typedef struct x86_checkea_reg3264_data {
     int *regs;          /* total multiplier for each reg */
+    unsigned char vsib_mode;
     unsigned char bits;
     unsigned char addrsize;
 } x86_checkea_reg3264_data;
@@ -58,6 +58,20 @@
                 return 0;
             *regnum = (unsigned int)(ei->data.reg & 0xF);
             break;
+        case X86_XMMREG:
+            if (data->vsib_mode != 1)
+                return 0;
+            if (data->bits != 64 && (ei->data.reg & 0x8) == 0x8)
+                return 0;
+            *regnum = 17+(unsigned int)(ei->data.reg & 0xF);
+            break;
+        case X86_YMMREG:
+            if (data->vsib_mode != 2)
+                return 0;
+            if (data->bits != 64 && (ei->data.reg & 0x8) == 0x8)
+                return 0;
+            *regnum = 17+(unsigned int)(ei->data.reg & 0xF);
+            break;
         case X86_RIP:
             if (data->bits != 64)
                 return 0;
@@ -606,6 +620,11 @@
                 }
                 /*@fallthrough@*/
             default:
+                /* If SIB is required, but we're in 16-bit mode, set to 32. */
+                if (bits == 16 && x86_ea->need_sib == 1) {
+                    *addrsize = 32;
+                    break;
+                }
                 /* check for use of 16 or 32-bit registers; if none are used
                  * default to bits setting.
                  */
@@ -643,13 +662,19 @@
             REG64_R13,
             REG64_R14,
             REG64_R15,
-            REG64_RIP
+            REG64_RIP,
+            SIMDREGS
         } reg3264type;
-        int reg3264mult[17] = {0, 0, 0, 0, 0, 0, 0, 0,
-                               0, 0, 0, 0, 0, 0, 0, 0, 0};
+        int reg3264mult[33] =
+            {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
         x86_checkea_reg3264_data reg3264_data;
         int basereg = REG3264_NONE;     /* "base" register (for SIB) */
         int indexreg = REG3264_NONE;    /* "index" register (for SIB) */
+        int regcount = 17;              /* normally don't check SIMD regs */
+
+        if (x86_ea->vsib_mode != 0)
+            regcount = 33;
 
         /* We can only do 64-bit addresses in 64-bit mode. */
         if (*addrsize == 64 && bits != 64) {
@@ -665,6 +690,7 @@
         }
 
         reg3264_data.regs = reg3264mult;
+        reg3264_data.vsib_mode = x86_ea->vsib_mode;
         reg3264_data.bits = bits;
         reg3264_data.addrsize = *addrsize;
         if (x86_ea->ea.disp.abs) {
@@ -698,7 +724,7 @@
          * Also, if an indexreg hasn't been assigned, try to find one.
          * Meanwhile, check to make sure there's no negative register mults.
          */
-        for (i=0; i<17; i++) {
+        for (i=0; i<regcount; i++) {
             if (reg3264mult[i] < 0) {
                 yasm_error_set(YASM_ERROR_VALUE,
                                N_("invalid effective address"));
@@ -711,10 +737,26 @@
                 indexreg = i;
         }
 
-        /* Handle certain special cases of indexreg mults when basereg is
-         * empty.
-         */
-        if (indexreg != REG3264_NONE && basereg == REG3264_NONE)
+        if (x86_ea->vsib_mode != 0) {
+            /* For VSIB, the SIMD register needs to go into the indexreg.
+             * Also check basereg (must be a GPR if present) and indexreg
+             * (must be a SIMD register).
+             */
+            if (basereg >= SIMDREGS &&
+                (indexreg == REG3264_NONE || reg3264mult[indexreg] == 1)) {
+                int temp = basereg;
+                basereg = indexreg;
+                indexreg = temp;
+            }
+            if (basereg >= REG64_RIP || indexreg < SIMDREGS) {
+                yasm_error_set(YASM_ERROR_VALUE,
+                               N_("invalid effective address"));
+                return 1;
+            }
+        } else if (indexreg != REG3264_NONE && basereg == REG3264_NONE)
+            /* Handle certain special cases of indexreg mults when basereg is
+             * empty.
+             */
             switch (reg3264mult[indexreg]) {
                 case 1:
                     /* Only optimize this way if nosplit wasn't specified */
@@ -741,7 +783,7 @@
         /* Make sure there's no other registers than the basereg and indexreg
          * we just found.
          */
-        for (i=0; i<17; i++)
+        for (i=0; i<regcount; i++)
             if (i != basereg && i != indexreg && reg3264mult[i] != 0) {
                 yasm_error_set(YASM_ERROR_VALUE,
                                N_("invalid effective address"));
@@ -861,10 +903,17 @@
                 x86_ea->sib |= 040;
                 /* Any scale field is valid, just leave at 0. */
             else {
-                if (yasm_x86__set_rex_from_reg(rex, &low3, (unsigned int)
-                                               (X86_REG64 | indexreg), bits,
-                                               X86_REX_X))
-                    return 1;
+                if (indexreg >= SIMDREGS) {
+                    if (yasm_x86__set_rex_from_reg(rex, &low3,
+                            (unsigned int)(X86_XMMREG | (indexreg-SIMDREGS)),
+                            bits, X86_REX_X))
+                        return 1;
+                } else {
+                    if (yasm_x86__set_rex_from_reg(rex, &low3,
+                            (unsigned int)(X86_REG64 | indexreg),
+                            bits, X86_REX_X))
+                        return 1;
+                }
                 x86_ea->sib |= low3 << 3;
                 /* Set scale field, 1 case -> 0, so don't bother. */
                 switch (reg3264mult[indexreg]) {

yasm-1.1.0.tar.gz/modules/arch/x86/x86id.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86id.c Changed

@@ -26,7 +26,6 @@
  */
 #include <ctype.h>
 #include <util.h>
-RCSID("$Id: x86id.c 2279 2010-01-19 07:57:43Z peter $");
 
 #include <libyasm.h>
 #include <libyasm/phash.h>
@@ -111,7 +110,11 @@
      */
     OPT_MemrAX = 25,
     /* EAX memory operand only (EA) [special case for SVM skinit opcode] */
-    OPT_MemEAX = 26
+    OPT_MemEAX = 26,
+    /* XMM VSIB memory operand */
+    OPT_MemXMMIndex = 27,
+    /* YMM VSIB memory operand */
+    OPT_MemYMMIndex = 28
 };
 
 enum x86_operand_size {
@@ -347,6 +350,37 @@
 
 #include "x86insns.c"
 
+/* Looks for the first SIMD register match for the purposes of VSIB matching.
+ * Full legality checking is performed in EA code.
+ */
+static int
+x86_expr_contains_simd_cb(const yasm_expr__item *ei, void *d)
+{
+    int ymm = *((int *)d);
+    if (ei->type != YASM_EXPR_REG)
+        return 0;
+    switch ((x86_expritem_reg_size)(ei->data.reg & ~0xFUL)) {
+        case X86_XMMREG:
+            if (!ymm)
+                return 1;
+            break;
+        case X86_YMMREG:
+            if (ymm)
+                return 1;
+            break;
+        default:
+            break;
+    }
+    return 0;
+}
+
+static int
+x86_expr_contains_simd(const yasm_expr *e, int ymm)
+{
+    return yasm_expr__traverse_leaves_in_const(e, &ymm,
+                                               x86_expr_contains_simd_cb);
+}
+
 static void
 x86_finalize_common(x86_common *common, const x86_insn_info *info,
                     unsigned int mode_bits)
@@ -851,6 +885,16 @@
                         mismatch = 1;
                     break;
                 }
+                case OPT_MemXMMIndex:
+                    if (op->type != YASM_INSN__OPERAND_MEMORY ||
+                        !x86_expr_contains_simd(op->data.ea->disp.abs, 0))
+                        mismatch = 1;
+                    break;
+                case OPT_MemYMMIndex:
+                    if (op->type != YASM_INSN__OPERAND_MEMORY ||
+                        !x86_expr_contains_simd(op->data.ea->disp.abs, 1))
+                        mismatch = 1;
+                    break;
                 default:
                     yasm_internal_error(N_("invalid operand type"));
             }
@@ -1231,12 +1275,20 @@
                             if (info_ops[i].type == OPT_MemOffs)
                                 /* Special-case for MOV MemOffs instruction */
                                 yasm_x86__ea_set_disponly(insn->x86_ea);
-                            else if (id_insn->default_rel &&
-                                     !op->data.ea->not_pc_rel &&
-                                     op->data.ea->segreg != 0x6404 &&
-                                     op->data.ea->segreg != 0x6505 &&
-                                     !yasm_expr__contains(
-                                        op->data.ea->disp.abs, YASM_EXPR_REG))
+                            else if (info_ops[i].type == OPT_MemXMMIndex) {
+                                /* Remember VSIB mode */
+                                insn->x86_ea->vsib_mode = 1;
+                                insn->x86_ea->need_sib = 1;
+                            } else if (info_ops[i].type == OPT_MemYMMIndex) {
+                                /* Remember VSIB mode */
+                                insn->x86_ea->vsib_mode = 2;
+                                insn->x86_ea->need_sib = 1;
+                            } else if (id_insn->default_rel &&
+                                       !op->data.ea->not_pc_rel &&
+                                       op->data.ea->segreg != 0x6404 &&
+                                       op->data.ea->segreg != 0x6505 &&
+                                       !yasm_expr__contains(
+                                          op->data.ea->disp.abs, YASM_EXPR_REG))
                                 /* Enable default PC-rel if no regs and segreg
                                  * is not FS or GS.
                                  */

yasm-1.1.0.tar.gz/modules/arch/x86/x86regtmod.gperf -> yasm-1.2.0.tar.gz/modules/arch/x86/x86regtmod.gperf Changed

yasm-1.1.0.tar.gz/modules/arch/yasm_arch.xml -> yasm-1.2.0.tar.gz/modules/arch/yasm_arch.xml Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.h -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.h Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-symline.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-symline.c Changed

@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: cv-symline.c 2258 2010-01-03 01:04:18Z peter $");
 
 #include <libyasm.h>
 
@@ -163,7 +162,7 @@
 static int cv8_symhead_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_symhead_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -173,7 +172,7 @@
 static int cv8_fileinfo_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_fileinfo_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -183,7 +182,7 @@
 static int cv8_lineinfo_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_lineinfo_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -192,7 +191,7 @@
 static int cv_sym_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv_sym_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -638,9 +637,12 @@
     /* add object and compile flag first */
     cv8_add_sym_objname(info.debug_symline,
                         yasm__abspath(object->obj_filename));
-    cv8_add_sym_compile(object, info.debug_symline,
-                        yasm__xstrdup(PACKAGE_NAME " " PACKAGE_INTVER "."
-                                      PACKAGE_BUILD));
+    if (getenv("YASM_TEST_SUITE"))
+        cv8_add_sym_compile(object, info.debug_symline,
+                            yasm__xstrdup("yasm HEAD"));
+    else
+        cv8_add_sym_compile(object, info.debug_symline,
+                            yasm__xstrdup(PACKAGE_STRING));
     /* then iterate through symbol table */
     yasm_symtab_traverse(object->symtab, &info, cv_generate_sym);
     cv8_set_symhead_end(head, yasm_section_bcs_last(info.debug_symline));
@@ -724,7 +726,8 @@
 }
 
 static int
-cv8_symhead_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_symhead_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        yasm_output_reloc_func output_reloc)
 {
@@ -797,7 +800,8 @@
 }
 
 static int
-cv8_fileinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_fileinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -864,7 +868,8 @@
 }
 
 static int
-cv8_lineinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_lineinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -876,7 +881,8 @@
     cv8_lineset *ls;
 
     /* start offset and section */
-    cv_out_sym(li->sectsym, 0, bc, &buf, d, output_value);
+    cv_out_sym(li->sectsym, (unsigned long)(buf - bufstart), bc, &buf,
+               d, output_value);
 
     /* Two bytes of pad/alignment */
     YASM_WRITE_8(buf, 0);
@@ -1019,7 +1025,8 @@
 }
 
 static int
-cv_sym_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv_sym_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                  unsigned char *bufstart, void *d,
                   yasm_output_value_func output_value,
                   yasm_output_reloc_func output_reloc)
 {
@@ -1061,7 +1068,7 @@
                 break;
             case 'Y':
                 cv_out_sym((yasm_symrec *)cvs->args[arg++].p,
-                           (unsigned long)(buf-(*bufp)), bc, &buf, d,
+                           (unsigned long)(buf-bufstart), bc, &buf, d,
                            output_value);
                 break;
             case 'T':

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-type.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-type.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-aranges.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-aranges.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: dwarf2-dbgfmt.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -46,7 +45,7 @@
 static int dwarf2_head_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_head_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -248,7 +247,8 @@
 }
 
 static int
-dwarf2_head_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_head_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        yasm_output_reloc_func output_reloc)
 {
@@ -288,7 +288,7 @@
                                 yasm_section_bcs_first(head->debug_ptr)),
             dbgfmt_dwarf2->sizeof_offset*8);
         output_value(&value, buf, dbgfmt_dwarf2->sizeof_offset,
-                     (unsigned long)(buf-*bufp), bc, 0, d);
+                     (unsigned long)(buf-bufstart), bc, 0, d);
         buf += dbgfmt_dwarf2->sizeof_offset;
     }

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.h -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.h Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-info.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-info.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: dwarf2-info.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -197,7 +196,7 @@
 static int dwarf2_abbrev_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_abbrev_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -337,7 +336,10 @@
 
     /* producer - assembler name */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_producer, DW_FORM_string);
-    dwarf2_append_str(debug_info, PACKAGE " " VERSION);
+    if (getenv("YASM_TEST_SUITE"))
+        dwarf2_append_str(debug_info, "yasm HEAD");
+    else
+        dwarf2_append_str(debug_info, PACKAGE_STRING);
 
     /* language - no standard code for assembler, use MIPS as a substitute */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_language, DW_FORM_data2);
@@ -394,7 +396,8 @@
 }
 
 static int
-dwarf2_abbrev_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_abbrev_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                         unsigned char *bufstart, void *d,
                          yasm_output_value_func output_value,
                          yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-line.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-line.c Changed

@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: dwarf2-line.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -77,7 +76,8 @@
 typedef enum {
     DW_LNE_end_sequence = 1,
     DW_LNE_set_address,
-    DW_LNE_define_file
+    DW_LNE_define_file,
+    DW_LNE_set_discriminator
 } dwarf_line_number_ext_op;
 
 /* Base and range for line offsets in special opcodes */
@@ -120,6 +120,7 @@
     /* extended opcode */
     dwarf_line_number_ext_op ext_opcode;
     /*@null@*/ /*@dependent@*/ yasm_symrec *ext_operand;  /* unsigned */
+    /*@null@*/ /*@dependent@*/ yasm_intnum *ext_operand_int; /* unsigned */
     unsigned long ext_operandsize;
 } dwarf2_line_op;
 
@@ -130,7 +131,7 @@
 static int dwarf2_spp_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_spp_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -140,7 +141,7 @@
 static int dwarf2_line_op_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_line_op_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -254,6 +255,7 @@
     line_op->operand = operand;
     line_op->ext_opcode = 0;
     line_op->ext_operand = NULL;
+    line_op->ext_operand_int = NULL;
     line_op->ext_operandsize = 0;
 
     bc = yasm_bc_create_common(&dwarf2_line_op_bc_callback, line_op, 0);
@@ -282,6 +284,31 @@
     line_op->operand = yasm_intnum_create_uint(ext_operandsize+1);
     line_op->ext_opcode = ext_opcode;
     line_op->ext_operand = ext_operand;
+    line_op->ext_operand_int = NULL;
+    line_op->ext_operandsize = ext_operandsize;
+
+    bc = yasm_bc_create_common(&dwarf2_line_op_bc_callback, line_op, 0);
+    bc->len = 2 + yasm_intnum_size_leb128(line_op->operand, 0) +
+        ext_operandsize;
+
+    yasm_dwarf2__append_bc(sect, bc);
+    return bc;
+}
+
+static yasm_bytecode *
+dwarf2_dbgfmt_append_line_ext_op_int(yasm_section *sect,
+                                     dwarf_line_number_ext_op ext_opcode,
+                                     /*@only@*/ yasm_intnum *ext_operand)
+{
+    dwarf2_line_op *line_op = yasm_xmalloc(sizeof(dwarf2_line_op));
+    unsigned long ext_operandsize = yasm_intnum_size_leb128(ext_operand, 0);
+    yasm_bytecode *bc;
+
+    line_op->opcode = DW_LNS_extended_op;
+    line_op->operand = yasm_intnum_create_uint(ext_operandsize+1);
+    line_op->ext_opcode = ext_opcode;
+    line_op->ext_operand = NULL;
+    line_op->ext_operand_int = ext_operand;
     line_op->ext_operandsize = ext_operandsize;
 
     bc = yasm_bc_create_common(&dwarf2_line_op_bc_callback, line_op, 0);
@@ -344,6 +371,11 @@
         dwarf2_dbgfmt_append_line_op(debug_line, DW_LNS_set_column,
                                      yasm_intnum_create_uint(state->column));
     }
+    if (loc->discriminator != 0) {
+        dwarf2_dbgfmt_append_line_ext_op_int(debug_line,
+            DW_LNE_set_discriminator,
+            yasm_intnum_create_uint(loc->discriminator));
+    }
 #ifdef WITH_DWARF3
     if (loc->isa_change) {
         state->isa = loc->isa;
@@ -453,12 +485,34 @@
 } dwarf2_line_bc_info;
 
 static int
+dwarf2_filename_equals(const dwarf2_filename *fn,
+                       char **dirs,
+                       const char *pathname,
+                       unsigned long dirlen,
+                       const char *filename)
+{
+    /* check directory */
+    if (fn->dir == 0) {
+        if (dirlen != 0)
+            return 0;
+    } else {
+        if (strncmp(dirs[fn->dir-1], pathname, dirlen) != 0 ||
+            dirs[fn->dir-1][dirlen] != '\0')
+            return 0;
+    }
+
+    /* check filename */
+    return strcmp(fn->filename, filename) == 0;
+}
+
+static int
 dwarf2_generate_line_bc(yasm_bytecode *bc, /*@null@*/ void *d)
 {
     dwarf2_line_bc_info *info = (dwarf2_line_bc_info *)d;
     yasm_dbgfmt_dwarf2 *dbgfmt_dwarf2 = info->dbgfmt_dwarf2;
     unsigned long i;
-    const char *filename;
+    size_t dirlen;
+    const char *pathname, *filename;
     /*@null@*/ yasm_bytecode *nextbc = yasm_bc__next(bc);
 
     if (nextbc && bc->offset == nextbc->offset)
@@ -476,15 +530,20 @@
         }
     }
 
-    yasm_linemap_lookup(info->linemap, bc->line, &filename, &info->loc.line);
+    yasm_linemap_lookup(info->linemap, bc->line, &pathname, &info->loc.line);
+    dirlen = yasm__splitpath(pathname, &filename);
+
     /* Find file index; just linear search it unless it was the last used */
     if (info->lastfile > 0
-        && strcmp(filename, dbgfmt_dwarf2->filenames[info->lastfile-1].pathname)
-           == 0)
+        && dwarf2_filename_equals(&dbgfmt_dwarf2->filenames[info->lastfile-1],
+                                  dbgfmt_dwarf2->dirs, pathname, dirlen,
+                                  filename))
         info->loc.file = info->lastfile;
     else {
         for (i=0; i<dbgfmt_dwarf2->filenames_size; i++) {
-            if (strcmp(filename, dbgfmt_dwarf2->filenames[i].pathname) == 0)
+            if (dwarf2_filename_equals(&dbgfmt_dwarf2->filenames[i],
+                                       dbgfmt_dwarf2->dirs, pathname, dirlen,
+                                       filename))
                 break;
         }
         if (i >= dbgfmt_dwarf2->filenames_size)
@@ -561,6 +620,7 @@
         bcinfo.lastfile = 0;
         bcinfo.loc.isa_change = 0;
         bcinfo.loc.column = 0;
+        bcinfo.loc.discriminator = 0;
         bcinfo.loc.is_stmt = IS_STMT_NOCHANGE;
         bcinfo.loc.basic_block = 0;
         bcinfo.loc.prologue_end = 0;
@@ -717,7 +777,8 @@
 }
 
 static int
-dwarf2_spp_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_spp_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                      unsigned char *bufstart, void *d,
                       yasm_output_value_func output_value,
                       yasm_output_reloc_func output_reloc)
 {
@@ -780,6 +841,8 @@
     dwarf2_line_op *line_op = (dwarf2_line_op *)contents;
     if (line_op->operand)
         yasm_intnum_destroy(line_op->operand);
+    if (line_op->ext_operand_int)
+        yasm_intnum_destroy(line_op->ext_operand_int);
     yasm_xfree(contents);
 }
 
@@ -799,7 +862,8 @@
 }
 
 static int
-dwarf2_line_op_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_line_op_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                          unsigned char *bufstart, void *d,
                           yasm_output_value_func output_value,
                           yasm_output_reloc_func output_reloc)
 {
@@ -817,9 +881,12 @@
             yasm_value_init_sym(&value, line_op->ext_operand,
                                 line_op->ext_operandsize*8);
             output_value(&value, buf, line_op->ext_operandsize,
-                         (unsigned long)(buf-*bufp), bc, 0, d);
+                         (unsigned long)(buf-bufstart), bc, 0, d);
             buf += line_op->ext_operandsize;
         }
+        if (line_op->ext_operand_int) {
+            buf += yasm_intnum_get_leb128(line_op->ext_operand_int, buf, 0);
+        }
     }
 
     *bufp = buf;
@@ -831,7 +898,7 @@
                      yasm_valparamhead *objext_valparams, unsigned long line)
 {
     yasm_valparam *vp;
-    int in_is_stmt = 0, in_isa = 0;
+    int in_is_stmt = 0, in_isa = 0, in_discriminator = 0;
 
     /*@dependent@*/ /*@null@*/ const yasm_intnum *intn;
     dwarf2_section_data *dsd;
@@ -892,6 +959,7 @@
 
     /* Defaults for optional settings */
     loc->column = 0;
+    loc->discriminator = 0;
     loc->isa_change = 0;
     loc->isa = 0;
     loc->is_stmt = IS_STMT_NOCHANGE;
@@ -966,11 +1034,33 @@
             loc->isa_change = 1;
             loc->isa = yasm_intnum_get_uint(intn);
             yasm_expr_destroy(e);
+        } else if (in_discriminator) {
+            in_discriminator = 0;
+            if (!(e = yasm_vp_expr(vp, object->symtab, line)) ||
+                !(intn = yasm_expr_get_intnum(&e, 0))) {
+                yasm_error_set(YASM_ERROR_NOT_CONSTANT,
+                               N_("discriminator value is not a constant"));
+                yasm_xfree(loc);
+                if (e)
+                    yasm_expr_destroy(e);
+                return;
+            }
+            if (yasm_intnum_sign(intn) < 0) {
+                yasm_error_set(YASM_ERROR_VALUE,
+                               N_("discriminator value less than zero"));
+                yasm_xfree(loc);
+                yasm_expr_destroy(e);
+                return;
+            }
+            loc->discriminator = yasm_intnum_get_uint(intn);
+            yasm_expr_destroy(e);
         } else if (!vp->val && (s = yasm_vp_id(vp))) {
             if (yasm__strcasecmp(s, "is_stmt") == 0)
                 in_is_stmt = 1;
             else if (yasm__strcasecmp(s, "isa") == 0)
                 in_isa = 1;
+            else if (yasm__strcasecmp(s, "discriminator") == 0)
+                in_discriminator = 1;
             else if (yasm__strcasecmp(s, "basic_block") == 0)
                 loc->basic_block = 1;
             else if (yasm__strcasecmp(s, "prologue_end") == 0)
@@ -989,15 +1079,19 @@
         } else if (yasm__strcasecmp(vp->val, "isa") == 0) {
             in_isa = 1;
             goto restart; /* don't go to the next valparam */
+        } else if (yasm__strcasecmp(vp->val, "discriminator") == 0) {
+            in_discriminator = 1;
+            goto restart; /* don't go to the next valparam */
         } else
             yasm_warn_set(YASM_WARN_GENERAL,
                           N_("unrecognized loc option `%s'"), vp->val);
         vp = yasm_vps_next(vp);
     }
 
-    if (in_is_stmt || in_isa) {
+    if (in_is_stmt || in_isa || in_discriminator) {
         yasm_error_set(YASM_ERROR_SYNTAX, N_("%s requires value"),
-                       in_is_stmt ? "is_stmt" : "isa");
+                       in_is_stmt ? "is_stmt" :
+                       (in_isa ? "isa" : "discriminator"));
         yasm_xfree(loc);
         return;
     }

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/Makefile.inc Changed

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64 Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.asm Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex Added

@@ -0,0 +1,1632 @@
+7f 
+45 
+4c 
+46 
+02 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+3e 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+60 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+0c 
+00 
+01 
+00 
+31 
+ed 
+e8 
+10 
+00 
+00 
+00 
+48 
+31 
+c0 
+48 
+89 
+c7 
+48 
+c7 
+c0 
+3c 
+00 
+00 
+00 
+0f 
+05 
+f4 
+55 
+48 
+89 
+e5 
+48 
+83 
+ec 
+20 
+48 
+83 
+ec 
+40 
+4c 
+00 
+00 
+00 
+02 
+00 
+29 
+00 
+00 
+00 
+01 
+01 
+fb 
+0e 
+0d 
+00 
+01 
+01 
+01 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+01 
+00 
+2d 
+00 
+00 
+00 
+00 
+73 
+6f 
+6d 
+65 
+5f 
+66 
+69 
+6c 
+65 
+6e 
+61 
+6d 
+65 
+00 
+00 
+00 
+00 
+00 
+04 
+02 
+00 
+09 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+2e 
+58 
+3c 
+3c 
+74 
+2e 
+20 
+20 
+3c 
+4b 
+02 
+04 
+00 
+01 
+01 
+00 
+38 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+11 
+00 
+10 
+06 
+11 
+01 
+12 
+01 
+03 
+08 
+1b 
+08 
+25 
+08 
+13 
+05 
+00 
+00 
+00 
+2d 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+08 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2d 
+00 
+2e 
+2f 
+00 
+79 
+61 
+73 
+6d 
+20 
+48 
+45 
+41 
+44 
+00 
+01 
+80 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0c 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+23 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2c 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+23 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+6c 
+69 
+6e 
+65 
+00 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+61 
+62 
+62 
+72 
+65 
+76 
+00 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+69 
+6e 
+66 
+6f 
+00 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+61 
+72 
+61 
+6e 
+67 
+65 
+73 
+00 
+2e 
+72 
+65 
+6c 
+61 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+6c 
+69 
+6e 
+65 
+00 
+2e 
+72 
+65 
+6c 
+61 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+69 
+6e 
+66 
+6f 
+00 
+2e 
+72 
+65 
+6c 
+61 
+2e 
+64 
+65 
+62 
+75 
+67 
+5f 
+61 
+72 
+61 
+6e 
+67 
+65 
+73 
+00 
+2e 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+2e 
+73 
+79 
+6d 
+74 
+61 
+62 
+00 
+2e 
+73 
+68 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+00 
+2d 
+00 
+5f 
+73 
+74 
+61 
+72 
+74 
+00 
+6d 
+61 
+69 
+6e 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+04 
+00 
+f1 
+ff 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+0a 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+07 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+05 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+17 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+10 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+82 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+e0 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+8c 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+72 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+6c 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+0f 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+7a 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+7c 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+d8 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+23 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+63 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+50 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+3c 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+b4 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+13 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+cc 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+14 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+21 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+e0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+31 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+4d 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+14 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+60 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2d 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+80 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+30 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+5e 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+b0 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+30 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.errwarn -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.errwarn Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/null/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/null/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/null/null-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/null/null-dbgfmt.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/stabs-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/stabs-dbgfmt.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: stabs-dbgfmt.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -119,7 +118,7 @@
 static int stabs_bc_str_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int stabs_bc_str_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -129,7 +128,7 @@
 static int stabs_bc_stab_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int stabs_bc_stab_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -405,7 +404,8 @@
 }
 
 static int
-stabs_bc_stab_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+stabs_bc_stab_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                      unsigned char *bufstart, void *d,
                       yasm_output_value_func output_value,
                       yasm_output_reloc_func output_reloc)
 {
@@ -439,7 +439,8 @@
 }
 
 static int
-stabs_bc_str_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+stabs_bc_str_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                     unsigned char *bufstart, void *d,
                      yasm_output_value_func output_value,
                      yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/tests/stabs_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/tests/stabs_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/yasm_dbgfmts.xml -> yasm-1.2.0.tar.gz/modules/dbgfmts/yasm_dbgfmts.xml Changed

yasm-1.1.0.tar.gz/modules/listfmts/Makefile.inc -> yasm-1.2.0.tar.gz/modules/listfmts/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/listfmts/nasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/listfmts/nasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/listfmts/nasm/nasm-listfmt.c -> yasm-1.2.0.tar.gz/modules/listfmts/nasm/nasm-listfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/bin/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/bin-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/bin/bin-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/bin_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/bin_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/multisect/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/multisect/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/multisect/bin_multi_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/multisect/bin_multi_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/coff/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/coff-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/coff/coff-objfmt.c Changed

@@ -26,7 +26,6 @@
  */
 #include <util.h>
 #include <time.h>
-/*@unused@*/ RCSID("$Id: coff-objfmt.c 2347 2010-08-01 17:31:12Z peter $");
 
 #include <libyasm.h>
 
@@ -183,10 +182,15 @@
 
     coff_symrec_data *filesym_data;         /* Data for .file symbol */
 
+    /* data for .def/.endef and related directives */
+    coff_symrec_data *def_sym;              /* symbol specified by .def */
+
     /* data for win64 proc_frame and related directives */
     unsigned long proc_frame;   /* Line number of start of proc, or 0 */
     unsigned long done_prolog;  /* Line number of end of prologue, or 0 */
     /*@null@*/ coff_unwind_info *unwind;        /* Unwind info */
+
+    yasm_symrec *ssym_imagebase;            /* ..imagebase symbol for win64 */
 } yasm_objfmt_coff;
 
 typedef struct coff_objfmt_output_info {
@@ -227,7 +231,7 @@
 static int win32_sxdata_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int win32_sxdata_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -294,6 +298,7 @@
     objfmt_coff->proc_frame = 0;
     objfmt_coff->done_prolog = 0;
     objfmt_coff->unwind = NULL;
+    objfmt_coff->ssym_imagebase = NULL;
 
     return objfmt_coff;
 }
@@ -380,6 +385,8 @@
         objfmt_coff->objfmt.module = &yasm_win64_LTX_objfmt;
         objfmt_coff->win32 = 1;
         objfmt_coff->win64 = 1;
+        objfmt_coff->ssym_imagebase =
+            yasm_symtab_define_label(object->symtab, "..imagebase", NULL, 0, 0);
     }
     return (yasm_objfmt *)objfmt_coff;
 }
@@ -487,14 +494,18 @@
         /*@dependent@*/ /*@null@*/ yasm_symrec *sym = value->rel;
         unsigned long addr;
         coff_reloc *reloc;
+        int nobase = info->csd->flags2 & COFF_FLAG_NOBASE;
 
         /* Sometimes we want the relocation to be generated against one
          * symbol but the value generated correspond to a different symbol.
          * This is done through (sym being referenced) WRT (sym used for
          * reloc).  Note both syms need to be in the same section!
          */
-        if (value->wrt) {
+        if (value->wrt && value->wrt == objfmt_coff->ssym_imagebase)
+            nobase = 1;
+        else if (value->wrt) {
             /*@dependent@*/ /*@null@*/ yasm_bytecode *rel_precbc, *wrt_precbc;
+
             if (!yasm_symrec_get_label(sym, &rel_precbc)
                 || !yasm_symrec_get_label(value->wrt, &wrt_precbc)) {
                 yasm_error_set(YASM_ERROR_TOO_COMPLEX,
@@ -569,8 +580,8 @@
                 intn_minus = bc->offset;
         }
 
-        if (value->seg_of || value->section_rel) {
-            /* Segment or section-relative generation; zero value. */
+        if (value->seg_of) {
+            /* Segment generation; zero value. */
             intn_val = 0;
             intn_minus = 0;
         }
@@ -642,13 +653,13 @@
                 yasm_internal_error(N_("coff objfmt: unrecognized machine"));
         } else {
             if (objfmt_coff->machine == COFF_MACHINE_I386) {
-                if (info->csd->flags2 & COFF_FLAG_NOBASE)
+                if (nobase)
                     reloc->type = COFF_RELOC_I386_ADDR32NB;
                 else
                     reloc->type = COFF_RELOC_I386_ADDR32;
             } else if (objfmt_coff->machine == COFF_MACHINE_AMD64) {
                 if (valsize == 32) {
-                    if (info->csd->flags2 & COFF_FLAG_NOBASE)
+                    if (nobase)
                         reloc->type = COFF_RELOC_AMD64_ADDR32NB;
                     else
                         reloc->type = COFF_RELOC_AMD64_ADDR32;
@@ -1512,6 +1523,7 @@
     } else if (objfmt_coff->win64 && strcmp(sectname, ".xdata") == 0) {
         data.flags = COFF_STYP_DATA | COFF_STYP_READ;
         align = 8;
+        data.flags2 = COFF_FLAG_NOBASE;
     } else if (objfmt_coff->win32 && strcmp(sectname, ".sxdata") == 0) {
         data.flags = COFF_STYP_INFO;
     } else if (strcmp(sectname, ".comment") == 0) {
@@ -1594,6 +1606,17 @@
     return NULL;
 }
 
+static /*@observer@*/ /*@null@*/ yasm_symrec *
+win64_objfmt_get_special_sym(yasm_object *object, const char *name,
+                             const char *parser)
+{
+    if (yasm__strcasecmp(name, "imagebase") == 0) {
+        yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+        return objfmt_coff->ssym_imagebase;
+    }
+    return NULL;
+}
+
 static void
 coff_section_data_destroy(void *data)
 {
@@ -1758,7 +1781,8 @@
 }
 
 static int
-win32_sxdata_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+win32_sxdata_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -1840,6 +1864,131 @@
 }
 
 static void
+dir_secrel32(yasm_object *object, yasm_valparamhead *valparams,
+             yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_datavalhead dvs;
+    yasm_valparam *vp;
+
+    if (!object->cur_section) {
+        yasm_error_set(YASM_ERROR_SYNTAX,
+                       N_(".secrel32 can only be used inside of a section"));
+        return;
+    }
+
+    vp = yasm_vps_first(valparams);
+    yasm_dvs_initialize(&dvs);
+    do {
+        yasm_expr *e = yasm_vp_expr(vp, object->symtab, line);
+        yasm_dataval *dv;
+        if (!e) {
+            yasm_error_set(YASM_ERROR_VALUE,
+                           N_(".secrel32 requires expressions"));
+            yasm_dvs_delete(&dvs);
+            return;
+        }
+        dv = yasm_dv_create_expr(e);
+        yasm_dv_get_value(dv)->section_rel = 1;
+        yasm_dvs_append(&dvs, dv);
+    } while ((vp = yasm_vps_next(vp)));
+
+    yasm_section_bcs_append(object->cur_section,
+        yasm_bc_create_data(&dvs, 4, 0, object->arch, line));
+}
+
+static void
+dir_def(yasm_object *object, yasm_valparamhead *valparams,
+        yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+    yasm_valparam *vp;
+    const char *symname;
+    yasm_symrec *sym;
+    coff_symrec_data *sym_data;
+
+    if (objfmt_coff->def_sym) {
+        yasm_warn_set(YASM_WARN_GENERAL,
+                      N_(".def pseudo-op used inside of .def/.endef; ignored"));
+        return;
+    }
+
+    vp = yasm_vps_first(valparams);
+    symname = yasm_vp_id(vp);
+    if (!symname) {
+        yasm_error_set(YASM_ERROR_SYNTAX,
+                       N_("argument to SAFESEH must be symbol name"));
+        return;
+    }
+
+    sym = yasm_symtab_use(object->symtab, symname, line);
+    sym_data = yasm_symrec_get_data(sym, &coff_symrec_data_cb);
+    if (!sym_data) {
+        sym_data = coff_objfmt_sym_set_data(sym, COFF_SCL_NULL, 0,
+                                            COFF_SYMTAB_AUX_NONE);
+    }
+    objfmt_coff->def_sym = sym_data;
+}
+
+static void
+dir_scl(yasm_object *object, yasm_valparamhead *valparams,
+        yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+    yasm_intnum *intn = NULL;
+
+    if (!objfmt_coff->def_sym) {
+        yasm_warn_set(YASM_WARN_GENERAL,
+                      N_("%s pseudo-op used outside of .def/.endef; ignored"),
+                      ".scl");
+        return;
+    }
+
+    if (yasm_dir_helper_intn(object, yasm_vps_first(valparams), line,
+                             &intn, 0) < 0)
+        return;
+    if (!intn)
+        return;
+    objfmt_coff->def_sym->sclass = yasm_intnum_get_uint(intn);
+    yasm_intnum_destroy(intn);
+}
+
+static void
+dir_type(yasm_object *object, yasm_valparamhead *valparams,
+         yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+    yasm_intnum *intn = NULL;
+
+    if (!objfmt_coff->def_sym) {
+        yasm_warn_set(YASM_WARN_GENERAL,
+                      N_("%s pseudo-op used outside of .def/.endef; ignored"),
+                      ".type");
+        return;
+    }
+
+    if (yasm_dir_helper_intn(object, yasm_vps_first(valparams), line,
+                             &intn, 0) < 0)
+        return;
+    if (!intn)
+        return;
+    objfmt_coff->def_sym->type = yasm_intnum_get_uint(intn);
+    yasm_intnum_destroy(intn);
+}
+
+static void
+dir_endef(yasm_object *object, yasm_valparamhead *valparams,
+          yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+    if (!objfmt_coff->def_sym) {
+        yasm_warn_set(YASM_WARN_GENERAL,
+                      N_(".endef pseudo-op used before .def; ignored"));
+        return;
+    }
+    objfmt_coff->def_sym = NULL;
+}
+
+static void
 dir_proc_frame(yasm_object *object, /*@null@*/ yasm_valparamhead *valparams,
                yasm_valparamhead *objext_valparams, unsigned long line)
 {
@@ -2194,6 +2343,11 @@
 static const yasm_directive coff_objfmt_directives[] = {
     { ".ident",         "gas",  dir_ident,      YASM_DIR_ANY },
     { "ident",          "nasm", dir_ident,      YASM_DIR_ANY },
+    { ".def",           "gas",  dir_def,        YASM_DIR_ID_REQUIRED },
+    { ".endef",         "gas",  dir_endef,      YASM_DIR_ANY },
+    { ".scl",           "gas",  dir_scl,        YASM_DIR_ARG_REQUIRED },
+    { ".type",          "gas",  dir_type,       YASM_DIR_ARG_REQUIRED },
+    { ".secrel32",      "gas",  dir_secrel32,   YASM_DIR_ARG_REQUIRED },
     { NULL, NULL, NULL, 0 }
 };
 
@@ -2228,6 +2382,11 @@
 static const yasm_directive win32_objfmt_directives[] = {
     { ".ident",         "gas",  dir_ident,      YASM_DIR_ANY },
     { "ident",          "nasm", dir_ident,      YASM_DIR_ANY },
+    { ".def",           "gas",  dir_def,        YASM_DIR_ID_REQUIRED },
+    { ".endef",         "gas",  dir_endef,      YASM_DIR_ANY },
+    { ".scl",           "gas",  dir_scl,        YASM_DIR_ARG_REQUIRED },
+    { ".type",          "gas",  dir_type,       YASM_DIR_ARG_REQUIRED },
+    { ".secrel32",      "gas",  dir_secrel32,   YASM_DIR_ARG_REQUIRED },
     { ".export",        "gas",  dir_export,     YASM_DIR_ID_REQUIRED },
     { "export",         "nasm", dir_export,     YASM_DIR_ID_REQUIRED },
     { ".safeseh",       "gas",  dir_safeseh,    YASM_DIR_ID_REQUIRED },
@@ -2273,6 +2432,11 @@
 static const yasm_directive win64_objfmt_directives[] = {
     { ".ident",         "gas",  dir_ident,      YASM_DIR_ANY },
     { "ident",          "nasm", dir_ident,      YASM_DIR_ANY },
+    { ".def",           "gas",  dir_def,        YASM_DIR_ID_REQUIRED },
+    { ".endef",         "gas",  dir_endef,      YASM_DIR_ANY },
+    { ".scl",           "gas",  dir_scl,        YASM_DIR_ARG_REQUIRED },
+    { ".type",          "gas",  dir_type,       YASM_DIR_ARG_REQUIRED },
+    { ".secrel32",      "gas",  dir_secrel32,   YASM_DIR_ARG_REQUIRED },
     { ".export",        "gas",  dir_export,     YASM_DIR_ID_REQUIRED },
     { "export",         "nasm", dir_export,     YASM_DIR_ID_REQUIRED },
     { ".proc_frame",    "gas",  dir_proc_frame, YASM_DIR_ID_REQUIRED },
@@ -2322,7 +2486,7 @@
     coff_objfmt_add_default_section,
     coff_objfmt_init_new_section,
     coff_objfmt_section_switch,
-    coff_objfmt_get_special_sym
+    win64_objfmt_get_special_sym
 };
 yasm_objfmt_module yasm_x64_LTX_objfmt = {
     "Win64",
@@ -2340,5 +2504,5 @@
     coff_objfmt_add_default_section,
     coff_objfmt_init_new_section,
     coff_objfmt_section_switch,
-    coff_objfmt_get_special_sym
+    win64_objfmt_get_special_sym
 };

yasm-1.1.0.tar.gz/modules/objfmts/coff/coff-objfmt.h -> yasm-1.2.0.tar.gz/modules/objfmts/coff/coff-objfmt.h Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/coff/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/tests/coff_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/coff/tests/coff_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/tests/x86id.asm -> yasm-1.2.0.tar.gz/modules/objfmts/coff/tests/x86id.asm Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/win64-except.c -> yasm-1.2.0.tar.gz/modules/objfmts/coff/win64-except.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: win64-except.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -48,7 +47,7 @@
                                   long new_val, /*@out@*/ long *neg_thres,
                                   /*@out@*/ long *pos_thres);
 static int win64_uwinfo_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -63,7 +62,7 @@
                                   long new_val, /*@out@*/ long *neg_thres,
                                   /*@out@*/ long *pos_thres);
 static int win64_uwcode_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -279,7 +278,8 @@
 }
 
 static int
-win64_uwinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+win64_uwinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -295,12 +295,12 @@
         YASM_WRITE_8(buf, 1);
 
     /* Size of prolog */
-    output_value(&info->prolog_size, buf, 1, (unsigned long)(buf-*bufp),
+    output_value(&info->prolog_size, buf, 1, (unsigned long)(buf-bufstart),
                  bc, 1, d);
     buf += 1;
 
     /* Count of codes */
-    output_value(&info->codes_count, buf, 1, (unsigned long)(buf-*bufp),
+    output_value(&info->codes_count, buf, 1, (unsigned long)(buf-bufstart),
                  bc, 1, d);
     buf += 1;
 
@@ -459,7 +459,8 @@
 }
 
 static int
-win64_uwcode_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+win64_uwcode_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -476,7 +477,7 @@
         yasm_expr_create(YASM_EXPR_SUB, yasm_expr_sym(code->loc),
                          yasm_expr_sym(code->proc), bc->line),
         8);
-    output_value(&val, buf, 1, (unsigned long)(buf-*bufp), bc, 1, d);
+    output_value(&val, buf, 1, (unsigned long)(buf-bufstart), bc, 1, d);
     buf += 1;
     yasm_value_delete(&val);

yasm-1.1.0.tar.gz/modules/objfmts/dbg/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/dbg/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/dbg/dbg-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/dbg/dbg-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-machine.h -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-machine.h Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-x86-amd64.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-x86-amd64.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-x86-x86.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-x86-x86.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf.h -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf.h Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/amd64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh Changed

yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/multiplefixup.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/multiplefixup.hex Added

@@ -0,0 +1,992 @@
+7f 
+45 
+4c 
+46 
+02 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+3e 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+07 
+00 
+01 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+eb 
+c2 
+eb 
+c0 
+eb 
+be 
+eb 
+bc 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+0a 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+11 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+20 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+28 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+30 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+38 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2a 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+2e 
+64 
+61 
+74 
+61 
+00 
+2e 
+72 
+65 
+6c 
+61 
+2e 
+74 
+65 
+78 
+74 
+00 
+2e 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+2e 
+73 
+79 
+6d 
+74 
+61 
+62 
+00 
+2e 
+73 
+68 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+00 
+00 
+00 
+2d 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+04 
+00 
+f1 
+ff 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+28 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+4c 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+32 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+80 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+84 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+90 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+44 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0d 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+84 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+c0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+44 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/elf-x86id.asm -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/elf-x86id.asm Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/elf_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/elf_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/macho-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/macho/macho-objfmt.c Changed

@@ -91,7 +91,6 @@
 */
 
 #include <util.h>
-/*@unused@*/ RCSID("$Id: macho-objfmt.c 2345 2010-08-01 01:27:40Z peter $");
 
 #include <libyasm.h>
 
@@ -922,7 +921,26 @@
             }
             /*printf("common symbol %s val %lu\n", name, yasm_intnum_get_uint(val));*/
         } else if (vis & YASM_SYM_GLOBAL) {
-            n_type |= N_EXT;
+            yasm_valparamhead *valparams =
+                yasm_symrec_get_objext_valparams(sym);
+
+            struct macho_global_data {
+                unsigned long flag; /* N_PEXT */
+            } data;
+
+            data.flag = 0;
+
+            if (valparams) {
+                static const yasm_dir_help help[] = {
+                    { "private_extern", 0, yasm_dir_helper_flag_set,
+                      offsetof(struct macho_global_data, flag), N_PEXT },
+                };
+                yasm_dir_helper(sym, yasm_vps_first(valparams),
+                                yasm_symrec_get_decl_line(sym), help, NELEMS(help),
+                                &data, yasm_dir_helper_valparam_warn);
+            }
+
+            n_type |= N_EXT | data.flag;
         }
 
         localbuf = info->buf;

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas32/gas_macho32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas32/gas_macho32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas64/gas_macho64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas64/gas_macho64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/Makefile.inc Changed

yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32-pext.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32-pext.hex Added

@@ -0,0 +1,202 @@
+ce 
+fa 
+ed 
+fe 
+07 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+94 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+7c 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+b0 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+5f 
+5f 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+5f 
+5f 
+54 
+45 
+58 
+54 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+b0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+80 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+b4 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+c0 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+c3 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+1f 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+66 
+75 
+6e 
+63 
+74 
+69 
+6f 
+6e 
+00

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm64/macho64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm64/macho64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/rdf-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/rdf-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/tests/rdf_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/tests/rdf_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/gas/win32_gas_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32_gas_test.sh Changed

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32def.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32def.hex Added

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32secrel32.asm Added

@@ -0,0 +1,80 @@
+# [oformat win32]
+.text
+
+	.ascii ">>>>"
+pre04:	.ascii "<<<<"
+	.ascii ">>>>>"
+pre0d:	.ascii "<<<"
+	.ascii ">>>>>>"
+pre16:	.ascii "<<"
+	.ascii ">>>>>>>"
+pre1f:	.ascii "<"
+
+.data
+
+	.ascii ">>>>"
+sam04:	.ascii "<<<<"
+	.ascii ">>>>>"
+sam0d:	.ascii "<<<"
+	.ascii ">>>>>>"
+sam16:	.ascii "<<"
+	.ascii ">>>>>>>"
+sam1f:	.ascii "<"
+
+	.ascii ">>>>"
+	.secrel32 pre04
+	.byte 0x11
+	.secrel32 pre0d
+	.byte 0x11
+	.secrel32 pre16
+	.byte 0x11
+	.secrel32 pre1f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+	.ascii ">>>>"
+	.secrel32 sam04
+	.byte 0x11
+	.secrel32 sam0d
+	.byte 0x11
+	.secrel32 sam16
+	.byte 0x11
+	.secrel32 sam1f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+	.ascii ">>>>"
+	.secrel32 nex04
+	.byte 0x11
+	.secrel32 nex0d
+	.byte 0x11
+	.secrel32 nex16
+	.byte 0x11
+	.secrel32 nex1f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+	.ascii ">>>>"
+	.secrel32 ext24
+	.byte 0x11
+	.secrel32 ext2d
+	.byte 0x11
+	.secrel32 ext36
+	.byte 0x11
+	.secrel32 ext3f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+.section .rdata
+
+	.ascii ">>>>"
+nex04:	.ascii "<<<<"
+	.ascii ">>>>>"
+nex0d:	.ascii "<<<"
+	.ascii ">>>>>>"
+nex16:	.ascii "<<"
+	.ascii ">>>>>>>"
+nex1f:	.ascii "<"
+	.ascii ">>>>"
+
+	.p2align 4,0

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32secrel32.hex Added

@@ -0,0 +1,778 @@
+4c 
+01 
+03 
+00 
+00 
+00 
+00 
+00 
+1c 
+02 
+00 
+00 
+0d 
+00 
+00 
+00 
+00 
+00 
+0c 
+01 
+2e 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+00 
+00 
+8c 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+50 
+60 
+2e 
+64 
+61 
+74 
+61 
+00 
+00 
+00 
+20 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+a0 
+00 
+00 
+00 
+ac 
+00 
+00 
+00 
+4c 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+40 
+00 
+30 
+c0 
+2e 
+72 
+64 
+61 
+74 
+61 
+00 
+00 
+c0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+30 
+00 
+00 
+00 
+ec 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+50 
+40 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3e 
+3e 
+3e 
+3e 
+04 
+00 
+00 
+00 
+11 
+0d 
+00 
+00 
+00 
+11 
+16 
+00 
+00 
+00 
+11 
+1f 
+00 
+00 
+00 
+11 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+04 
+00 
+00 
+00 
+11 
+0d 
+00 
+00 
+00 
+11 
+16 
+00 
+00 
+00 
+11 
+1f 
+00 
+00 
+00 
+11 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+04 
+00 
+00 
+00 
+11 
+0d 
+00 
+00 
+00 
+11 
+16 
+00 
+00 
+00 
+11 
+1f 
+00 
+00 
+00 
+11 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+00 
+00 
+00 
+00 
+11 
+00 
+00 
+00 
+00 
+11 
+00 
+00 
+00 
+00 
+11 
+00 
+00 
+00 
+00 
+11 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+3c 
+24 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+0b 
+00 
+29 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+0b 
+00 
+2e 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+0b 
+00 
+33 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+0b 
+00 
+44 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+0b 
+00 
+49 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+0b 
+00 
+4e 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+0b 
+00 
+53 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+0b 
+00 
+64 
+00 
+00 
+00 
+0b 
+00 
+00 
+00 
+0b 
+00 
+69 
+00 
+00 
+00 
+0b 
+00 
+00 
+00 
+0b 
+00 
+6e 
+00 
+00 
+00 
+0b 
+00 
+00 
+00 
+0b 
+00 
+73 
+00 
+00 
+00 
+0b 
+00 
+00 
+00 
+0b 
+00 
+84 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+0b 
+00 
+89 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+0b 
+00 
+8e 
+00 
+00 
+00 
+09 
+00 
+00 
+00 
+0b 
+00 
+93 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+0b 
+00 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3e 
+3e 
+3e 
+3e 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2e 
+66 
+69 
+6c 
+65 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+fe 
+ff 
+00 
+00 
+67 
+01 
+2d 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+66 
+65 
+61 
+74 
+2e 
+30 
+30 
+01 
+00 
+00 
+00 
+ff 
+ff 
+00 
+00 
+03 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+03 
+01 
+20 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2e 
+64 
+61 
+74 
+61 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+03 
+01 
+a0 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+65 
+78 
+74 
+32 
+34 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+65 
+78 
+74 
+32 
+64 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+65 
+78 
+74 
+33 
+36 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+65 
+78 
+74 
+33 
+66 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+2e 
+72 
+64 
+61 
+74 
+61 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+03 
+01 
+30 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/win32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/win32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/gas/win64_gas_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/gas/win64_gas_test.sh Changed

yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/win64-imagebase.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/win64-imagebase.hex Added

@@ -0,0 +1,512 @@
+64 
+86 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+0e 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+b4 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+50 
+60 
+2e 
+70 
+64 
+61 
+74 
+61 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0c 
+00 
+00 
+00 
+b6 
+00 
+00 
+00 
+c2 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+40 
+00 
+30 
+40 
+2e 
+78 
+64 
+61 
+74 
+61 
+00 
+00 
+0e 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+e0 
+00 
+00 
+00 
+e8 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+40 
+00 
+40 
+40 
+2e 
+66 
+6f 
+6f 
+00 
+00 
+00 
+00 
+16 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+f2 
+00 
+00 
+00 
+f6 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+20 
+00 
+00 
+60 
+c3 
+c3 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+03 
+00 
+04 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+03 
+00 
+08 
+00 
+00 
+00 
+09 
+00 
+00 
+00 
+03 
+00 
+09 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+03 
+00 
+2e 
+66 
+69 
+6c 
+65 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+fe 
+ff 
+00 
+00 
+67 
+01 
+2d 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+03 
+01 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+68 
+61 
+6e 
+64 
+6c 
+65 
+72 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+03 
+00 
+66 
+75 
+6e 
+63 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+03 
+00 
+66 
+75 
+6e 
+63 
+5f 
+65 
+6e 
+64 
+02 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+03 
+00 
+2e 
+70 
+64 
+61 
+74 
+61 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+03 
+01 
+0c 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+6d 
+79 
+75 
+6e 
+77 
+6e 
+64 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+03 
+00 
+2e 
+78 
+64 
+61 
+74 
+61 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+03 
+01 
+08 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+2e 
+66 
+6f 
+6f 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+03 
+01 
+04 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/win64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/win64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/tests/xdf_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/tests/xdf_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/xdf-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/xdf-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/yasm_objfmts.xml -> yasm-1.2.0.tar.gz/modules/objfmts/yasm_objfmts.xml Changed

yasm-1.1.0.tar.gz/modules/parsers/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parse-intel.c -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parse-intel.c Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parse.c -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parse.c Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parser.c -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parser.c Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parser.h -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parser.h Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-token.re -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-token.re Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.asm -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.asm Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.hex -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.hex Changed

yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-str.asm Added

yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-str.hex Added

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/gas_bin_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas_bin_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/gas_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/gas_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/nasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parse.c -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parse.c Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parser-struct.h -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parser-struct.h Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parser.c -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parser.c Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parser.h -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parser.h Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-std.mac -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-std.mac Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-token.re -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-token.re Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/nasm_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/nasm_test.sh Changed

yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/strucbase.asm Added

yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/strucbase.hex Added

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/worphan/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/worphan/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/tasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/exe/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/exe/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/exe/tasm_exe_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/exe/tasm_exe_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/tasm_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/tasm_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/yasm_parsers.xml -> yasm-1.2.0.tar.gz/modules/parsers/yasm_parsers.xml Changed

yasm-1.1.0.tar.gz/modules/preprocs/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/gas/gas-eval.c -> yasm-1.2.0.tar.gz/modules/preprocs/gas/gas-eval.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/gas/gas-preproc.c -> yasm-1.2.0.tar.gz/modules/preprocs/gas/gas-preproc.c Changed

@@ -26,7 +26,6 @@
  */
 #include <util.h>
 #include <ctype.h>
-/*@unused@*/ RCSID("$Id: gas-preproc.c 2348 2010-08-01 17:44:56Z peter $");
 
 #include <libyasm.h>
 #include "modules/preprocs/gas/gas-eval.h"
@@ -60,6 +59,18 @@
     STAILQ_ENTRY(macro_entry) next;
 } macro_entry;
 
+typedef struct deferred_define {
+    char *name;
+    char *value;
+    SLIST_ENTRY(deferred_define) next;
+} deferred_define;
+
+typedef struct expr_state {
+    const char *string;
+    char *symbol;
+    int string_cursor;
+} expr_state;
+
 typedef struct yasm_preproc_gas {
     yasm_preproc_base preproc;   /* base structure */
 
@@ -67,15 +78,14 @@
     char *in_filename;
 
     yasm_symtab *defines;
+    SLIST_HEAD(deferred_defines_head, deferred_define) deferred_defines;
 
     int depth;
     int skip_depth;
 
     int in_comment;
 
-    const char *expr_string;
-    char *expr_symbol;
-    int expr_string_cursor;
+    expr_state expr;
 
     SLIST_HEAD(buffered_lines_head, buffered_line) buffered_lines;
     SLIST_HEAD(included_files_head, included_file) included_files;
@@ -88,10 +98,15 @@
     yasm_linemap *cur_lm;
     yasm_errwarns *errwarns;
     int fatal_error;
+    int detect_errors_only;
 } yasm_preproc_gas;
 
 yasm_preproc_module yasm_gas_LTX_preproc;
 
+/* Forward declarations. */
+
+static int substitute_values(yasm_preproc_gas *pp, char **line_ptr);
+
 /* String helpers. */
 
 static const char *starts_with(const char *big, const char *little)
@@ -278,17 +293,44 @@
 
 static char get_char(yasm_preproc_gas *pp)
 {
-    return pp->expr_string[pp->expr_string_cursor];
+    return pp->expr.string[pp->expr.string_cursor];
 }
 
 static const char *get_str(yasm_preproc_gas *pp)
 {
-    return pp->expr_string + pp->expr_string_cursor;
+    return pp->expr.string + pp->expr.string_cursor;
 }
 
 static void next_char(yasm_preproc_gas *pp)
 {
-    pp->expr_string_cursor++;
+    pp->expr.string_cursor++;
+}
+
+static int ishex(char c)
+{
+    c = tolower(c);
+    return isdigit(c) || (c >= 'a' && c <= 'f');
+}
+
+static void gas_scan_init(yasm_preproc_gas *pp, struct tokenval *tokval, const char *arg1)
+{
+    pp->expr.symbol = NULL;
+    pp->expr.string = arg1;
+    pp->expr.string_cursor = 0;
+    memset(tokval, 0, sizeof(struct tokenval));
+    tokval->t_type = TOKEN_INVALID;
+}
+
+static void gas_scan_cleanup(yasm_preproc_gas *pp, struct tokenval *tokval)
+{
+    if (tokval->t_integer) {
+        yasm_intnum_destroy(tokval->t_integer);
+        tokval->t_integer = NULL;
+    }
+    if (pp->expr.symbol) {
+        yasm_xfree(pp->expr.symbol);
+        pp->expr.symbol = NULL;
+    }
 }
 
 static int gas_scan(void *preproc, struct tokenval *tokval)
@@ -311,12 +353,34 @@
     }
 
     if (isdigit(c)) {
+        int char_index = 0;
         int value = 0;
+
         do {
             value = value*10 + (c - '0');
+            char_index++;
             next_char(pp);
             c = get_char(pp);
+            if (char_index == 1 && c == 'x' && value == 0) {
+                next_char(pp);
+                c = get_char(pp);
+                /* Hex notation. */
+                while (ishex(c)) {
+                    if (isdigit(c)) {
+                        value = (value << 4) | (c - '0');
+                    } else {
+                        value = (value << 4) | (tolower(c) - 'a' + 0xa);
+                    }
+                    next_char(pp);
+                    c = get_char(pp);
+                }
+                break;
+            }
         } while (isdigit(c));
+
+        if (tokval->t_integer) {
+            yasm_intnum_destroy(tokval->t_integer);
+        }
         tokval->t_integer = yasm_intnum_create_int(value);
         return tokval->t_type = TOKEN_NUM;
     }
@@ -373,12 +437,12 @@
                 c = get_char(pp);
             }
 
-            pp->expr_symbol = yasm_xrealloc(pp->expr_symbol, symbol_length + 1);
-            memcpy(pp->expr_symbol, str, symbol_length);
-            pp->expr_symbol[symbol_length] = '\0';
+            pp->expr.symbol = yasm_xrealloc(pp->expr.symbol, symbol_length + 1);
+            memcpy(pp->expr.symbol, str, symbol_length);
+            pp->expr.symbol[symbol_length] = '\0';
 
             tokval->t_type = TOKEN_ID;
-            tokval->t_charptr = pp->expr_symbol;
+            tokval->t_charptr = pp->expr.symbol;
         }
     }
     
@@ -390,10 +454,12 @@
     va_list args;
     yasm_preproc_gas *pp = private_data;
 
-    va_start(args, fmt);
-    yasm_error_set_va(YASM_ERROR_SYNTAX, N_(fmt), args);
-    yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
-    va_end(args);
+    if (!pp->detect_errors_only) {
+        va_start(args, fmt);
+        yasm_error_set_va(YASM_ERROR_SYNTAX, N_(fmt), args);
+        yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
+        va_end(args);
+    }
 
     pp->fatal_error = 1;
 }
@@ -404,25 +470,20 @@
     yasm_expr *expr;
     yasm_intnum *intn;
     long value;
+    expr_state prev_state;
 
     if (!*arg1) {
         return 0;
     }
 
-    tv.t_type = TOKEN_INVALID;
-
-    pp->expr_symbol = NULL;
-    pp->expr_string = arg1;
-    pp->expr_string_cursor = 0;
+    prev_state = pp->expr;
+    gas_scan_init(pp, &tv, arg1);
     expr = evaluate(gas_scan, pp, &tv, pp, CRITICAL, gas_err, pp->defines);
     intn = yasm_expr_get_intnum(&expr, 0);
     value = yasm_intnum_get_int(intn);
     yasm_expr_destroy(expr);
-
-    if (pp->expr_symbol) {
-        yasm_xfree(pp->expr_symbol);
-        pp->expr_symbol = NULL;
-    }
+    gas_scan_cleanup(pp, &tv);
+    pp->expr = prev_state;
 
     return value;
 }
@@ -623,24 +684,103 @@
     return 1;
 }
 
-static int eval_set(yasm_preproc_gas *pp, int allow_redefine, const char *name, const char *value)
+static int try_eval_expr(yasm_preproc_gas *pp, const char *value, long *result)
 {
-    if (!pp->skip_depth) {
-        yasm_intnum *num = yasm_intnum_create_int(eval_expr(pp, value));
-        yasm_expr *expr = yasm_expr_create_ident(yasm_expr_int(num), 0);
-        yasm_symrec *rec = yasm_symtab_get(pp->defines, name);
-        if (rec) {
-            if (!allow_redefine) {
-                yasm_error_set(YASM_ERROR_SYNTAX, N_("symbol \"%s\" is already defined"), name);
-                yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
-                return 0;
-            }
-            /* TODO */
-            yasm_error_set(YASM_ERROR_SYNTAX, N_("redefining symbols not yet implimented"), name);
+    int success;
+
+    pp->detect_errors_only = 1;
+    *result = eval_expr(pp, value);
+    success = !pp->fatal_error;
+    pp->fatal_error = 0;
+    pp->detect_errors_only = 0;
+
+    return success;
+}
+
+static int remove_define(yasm_preproc_gas *pp, const char *name, int allow_redefine)
+{
+    yasm_symrec *rec = yasm_symtab_get(pp->defines, name);
+    if (rec) {
+        const yasm_symtab_iter *entry;
+        yasm_symtab *new_defines;
+
+        if (!allow_redefine) {
+            yasm_error_set(YASM_ERROR_SYNTAX, N_("symbol \"%s\" is already defined"), name);
             yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
             return 0;
+        }
+
+        new_defines = yasm_symtab_create();
+
+        for (entry = yasm_symtab_first(pp->defines); entry; entry = yasm_symtab_next(entry)) {
+            yasm_symrec *entry_rec = yasm_symtab_iter_value(entry);
+            const char *rec_name = yasm_symrec_get_name(entry_rec);
+            if (strcmp(rec_name, name)) {
+                yasm_intnum *num = yasm_intnum_create_int(eval_expr(pp, rec_name));
+                yasm_expr *expr = yasm_expr_create_ident(yasm_expr_int(num), 0);
+                yasm_symtab_define_equ(new_defines, rec_name, expr, 0);
+            } 
+        }
+
+        yasm_symtab_destroy(pp->defines);
+        pp->defines = new_defines;
+    }
+    return (rec != NULL);
+}
+
+static void add_define(yasm_preproc_gas *pp, const char *name, long value, int allow_redefine, int substitute)
+{
+    deferred_define *def, *prev_def, *temp_def;
+    yasm_intnum *num;
+    yasm_expr *expr;
+
+    remove_define(pp, name, allow_redefine);
+
+    /* Add the new define. */
+    num = yasm_intnum_create_int(value);
+    expr = yasm_expr_create_ident(yasm_expr_int(num), 0);
+    yasm_symtab_define_equ(pp->defines, name, expr, 0);
+
+    /* Perform substitution on any deferred defines. */
+    if (substitute) {
+        prev_def = NULL;
+        temp_def = NULL;
+        SLIST_FOREACH_SAFE(def, &pp->deferred_defines, next, temp_def) {
+            if (substitute_values(pp, &def->value)) {
+                /* Value was updated - check if it can be added to the symtab. */
+                if (try_eval_expr(pp, def->value, &value)) {
+                    add_define(pp, def->name, value, FALSE, FALSE);
+                    if (prev_def) {
+                        SLIST_NEXT(prev_def, next) = SLIST_NEXT(def, next);
+                    } else {
+                        SLIST_FIRST(&pp->deferred_defines) = SLIST_NEXT(def, next);
+                    }
+                    yasm_xfree(def->name);
+                    yasm_xfree(def->value);
+                    yasm_xfree(def);
+                    continue;
+                }
+            }
+            prev_def = def;
+        }
+    }
+}
+
+static int eval_set(yasm_preproc_gas *pp, int allow_redefine, const char *name, const char *value)
+{
+    if (!pp->skip_depth) {
+        long result;
+
+        if (!try_eval_expr(pp, value, &result)) {
+            deferred_define *def;
+            remove_define(pp, name, allow_redefine);
+            def = yasm_xmalloc(sizeof(deferred_define));
+            def->name = yasm__xstrdup(name);
+            def->value = yasm__xstrdup(value);
+            substitute_values(pp, &def->value);
+            SLIST_INSERT_HEAD(&pp->deferred_defines, def, next);
         } else {
-            yasm_symtab_define_equ(pp->defines, name, expr, 0);
+            add_define(pp, name, result, allow_redefine, TRUE);
         }
     }
     return 1;
@@ -751,7 +891,7 @@
 
 static void expand_macro(yasm_preproc_gas *pp, macro_entry *macro, const char *args)
 {
-    int i, j, k;
+    int i, j;
     buffered_line *prev_bline = NULL;
 
     for (i = 0; i < macro->num_lines; i++) {
@@ -760,10 +900,9 @@
         int prev_was_backslash = FALSE;
         int line_length = strlen(macro->lines[i]);
         char *work = yasm__xstrdup(macro->lines[i]);
+        expr_state prev_state = pp->expr;
 
-        pp->expr_symbol = NULL;
-        pp->expr_string = work;
-        pp->expr_string_cursor = 0;
+        gas_scan_init(pp, &tokval, work);
         while (gas_scan(pp, &tokval) != TOKEN_EOS) {
             if (prev_was_backslash) {
                 if (tokval.t_type == TOKEN_ID) {
@@ -775,8 +914,8 @@
                             && tokval.t_charptr[len] == '\0') {
                             /* now, find matching argument. */
                             const char *value;
-                            char *line = work + (pp->expr_string - work);
-                            int cursor = pp->expr_string_cursor;
+                            char *line = work + (pp->expr.string - work);
+                            int cursor = pp->expr.string_cursor;
                             int value_length, delta;
 
                             get_param_value(macro, j, args, &value, &value_length);
@@ -786,16 +925,15 @@
                             line_length += delta;
                             if (delta > 0) {
                                 line = yasm_xrealloc(line, line_length + 1);
-                                for (k = strlen(line); k >= cursor; k--) {
-                                    line[k + delta] = line[k];
-                                }
-                                memcpy(line + cursor - len, value, value_length);
-                            } else {
-                                memcpy(line + cursor - len, value, value_length);
-                                memmove(line + cursor - len + value_length, line + cursor, strlen(line + cursor) + 1);
                             }
-                            pp->expr_string = work = line;
-                            pp->expr_string_cursor += delta;
+                            memmove(line + cursor - len + value_length, line + cursor, strlen(line + cursor) + 1);
+                            memcpy(line + cursor - len, value, value_length);
+                            pp->expr.string = work = line;
+                            pp->expr.string_cursor += delta;
+                            if (pp->expr.symbol) {
+                                yasm_xfree(pp->expr.symbol);
+                                pp->expr.symbol = NULL;
+                            }
                         }
                     }
                 }
@@ -804,10 +942,11 @@
                 prev_was_backslash = TRUE;
             }
         }
+        gas_scan_cleanup(pp, &tokval);
 
-        bline->line = work + (pp->expr_string - work);
+        bline->line = work + (pp->expr.string - work);
         bline->line_number = -1;
-        pp->expr_string = NULL;
+        pp->expr = prev_state;
 
         if (prev_bline) {
             SLIST_INSERT_AFTER(prev_bline, bline, next);
@@ -849,7 +988,7 @@
                         SLIST_INSERT_HEAD(&pp->buffered_lines, bline, next);
                     }
                     prev_bline = bline;
-                 }
+                }
             }
             if (!SLIST_EMPTY(&pp->included_files)) {
                 included_file *inc_file = SLIST_FIRST(&pp->included_files);
@@ -936,21 +1075,21 @@
    }
 }
 
-static void substitute_values(yasm_preproc_gas *pp, char *line)
+static int substitute_values(yasm_preproc_gas *pp, char **line_ptr)
 {
+    int changed = 0;
+    char *line = *line_ptr;
     int line_length = strlen(line);
     struct tokenval tokval;
+    expr_state prev_state = pp->expr;
 
-    pp->expr_string = line;
-    pp->expr_string_cursor = 0;
-    pp->expr_symbol = NULL;
-
+    gas_scan_init(pp, &tokval, line);
     while (gas_scan(pp, &tokval) != TOKEN_EOS) {
         if (tokval.t_type == TOKEN_ID) {
             yasm_symrec *rec = yasm_symtab_get(pp->defines, tokval.t_charptr);
             if (rec) {
-                int cursor = pp->expr_string_cursor;
-                int k, len = strlen(tokval.t_charptr);
+                int cursor = pp->expr.string_cursor;
+                int len = strlen(tokval.t_charptr);
                 char value[64];
                 int value_length = sprintf(value, "%ld", eval_expr(pp, tokval.t_charptr));
                 int delta = value_length - len;
@@ -958,26 +1097,32 @@
                 line_length += delta;
                 if (delta > 0) {
                     line = yasm_xrealloc(line, line_length + 1);
-                    for (k = line_length; k >= cursor; k--) {
-                        line[k + delta] = line[k];
-                    }
-                    memcpy(line + cursor - len, value, value_length);
-                } else {
-                    memcpy(line + cursor - len, value, value_length);
-                    memmove(line + cursor - len + value_length, line + cursor, strlen(line + cursor) + 1);
                 }
-                pp->expr_string = line;
-                pp->expr_string_cursor = cursor + delta;
-                pp->expr_symbol = NULL;
+                memmove(line + cursor - len + value_length, line + cursor, strlen(line + cursor) + 1);
+                memcpy(line + cursor - len, value, value_length);
+                pp->expr.string = line;
+                pp->expr.string_cursor = cursor + delta;
+                changed = 1;
             }
+            yasm_xfree(pp->expr.symbol);
+            pp->expr.symbol = NULL;
         }
     }
+    gas_scan_cleanup(pp, &tokval);
+    pp->expr = prev_state;
+
+    if (changed) {
+        *line_ptr = line;
+    }
+
+    return changed;
 }
 
-static int process_line(yasm_preproc_gas *pp, char *line)
+static int process_line(yasm_preproc_gas *pp, char **line_ptr)
 {
     macro_entry *macro;
     size_t i;
+    char *line = *line_ptr;
     struct {
         const char *name;
         int nargs;
@@ -1071,7 +1216,7 @@
     }
 
     if (pp->skip_depth == 0) {
-        substitute_values(pp, line);
+        substitute_values(pp, line_ptr);
         return TRUE;
     }
 
@@ -1100,6 +1245,7 @@
     pp->in = f;
     pp->in_filename = yasm__xstrdup(in_filename);
     pp->defines = yasm_symtab_create();
+    SLIST_INIT(&pp->deferred_defines);
     yasm_symtab_set_case_sensitive(pp->defines, 1);
     pp->depth = 0;
     pp->skip_depth = 0;
@@ -1113,6 +1259,7 @@
     pp->cur_lm = lm;
     pp->errwarns = errwarns;
     pp->fatal_error = 0;
+    pp->detect_errors_only = 0;
 
     return (yasm_preproc *) pp;
 }
@@ -1123,6 +1270,13 @@
     yasm_preproc_gas *pp = (yasm_preproc_gas *) preproc;
     yasm_xfree(pp->in_filename);
     yasm_symtab_destroy(pp->defines);
+    while (!SLIST_EMPTY(&pp->deferred_defines)) {
+        deferred_define *def = SLIST_FIRST(&pp->deferred_defines);
+        SLIST_REMOVE_HEAD(&pp->deferred_defines, next);
+        yasm_xfree(def->name);
+        yasm_xfree(def->value);
+        yasm_xfree(def);
+    }
     while (!SLIST_EMPTY(&pp->buffered_lines)) {
         buffered_line *bline = SLIST_FIRST(&pp->buffered_lines);
         SLIST_REMOVE_HEAD(&pp->buffered_lines, next);
@@ -1177,7 +1331,7 @@
             }
             return NULL;
         }
-        done = process_line(pp, line);
+        done = process_line(pp, &line);
     } while (!done);
 
     yasm_linemap_set(pp->cur_lm, pp->in_filename, pp->current_line_number, pp->next_line_number, 0);

yasm-1.1.0.tar.gz/modules/preprocs/gas/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/gas/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/genversion.c -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/genversion.c Changed

@@ -1,4 +1,4 @@
-/* $Id: genversion.c 2082 2008-05-09 06:46:02Z peter $
+/*
  *
  * Generate version.mac
  *
@@ -36,14 +36,19 @@
 main(int argc, char *argv[])
 {
     FILE *out;
-    int major, minor, subminor;
+    int major, minor, subminor, patchlevel, matched;
 
     if (argc != 2) {
         fprintf(stderr, "Usage: %s <outfile>\n", argv[0]);
         return EXIT_FAILURE;
     }
 
-    if (sscanf(PACKAGE_INTVER, "%d.%d.%d", &major, &minor, &subminor) != 3) {
+    matched = sscanf(PACKAGE_VERSION, "%d.%d.%d.%d", &major, &minor, &subminor,
+                     &patchlevel);
+
+    if (matched == 3)
+        patchlevel = 0;
+    else if (matched != 4) {
         fprintf(stderr, "Version tokenizing error\n");
         return EXIT_FAILURE;
     }
@@ -61,17 +66,15 @@
     fprintf(out, "%%define __YASM_MAJOR__ %d\n", major);
     fprintf(out, "%%define __YASM_MINOR__ %d\n", minor);
     fprintf(out, "%%define __YASM_SUBMINOR__ %d\n", subminor);
-    if (!isdigit(PACKAGE_BUILD[0]))
-        fprintf(out, "%%define __YASM_BUILD__ 0\n");
-    else
-        fprintf(out, "%%define __YASM_BUILD__ %d\n", atoi(PACKAGE_BUILD));
+    fprintf(out, "%%define __YASM_BUILD__ %d\n", patchlevel);
+    fprintf(out, "%%define __YASM_PATCHLEVEL__ %d\n", patchlevel);
 
     /* Version id (hex number) */
-    fprintf(out, "%%define __YASM_VERSION_ID__ 0%02x%02x%02x00h\n", major,
-            minor, subminor);
+    fprintf(out, "%%define __YASM_VERSION_ID__ 0%02x%02x%02x%02xh\n", major,
+            minor, subminor, patchlevel);
 
-    /* Version string - version sans build */
-    fprintf(out, "%%define __YASM_VER__ \"%s\"\n", PACKAGE_INTVER);
+    /* Version string */
+    fprintf(out, "%%define __YASM_VER__ \"%s\"\n", PACKAGE_VERSION);
     fclose(out);
 
     return EXIT_SUCCESS;

yasm-1.1.0.tar.gz/modules/preprocs/nasm/nasm-pp.c -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/nasm-pp.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/nasm-preproc.c -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/nasm-preproc.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/tests/nasmpp_test.sh -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/tests/nasmpp_test.sh Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/raw/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/raw-preproc.c -> yasm-1.2.0.tar.gz/modules/preprocs/raw/raw-preproc.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/raw/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/tests/rawpp_test.sh -> yasm-1.2.0.tar.gz/modules/preprocs/raw/tests/rawpp_test.sh Changed

yasm-1.1.0.tar.gz/modules/preprocs/tasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/tasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/tasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/tasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/tasm/tests/tasmpp_test.sh -> yasm-1.2.0.tar.gz/modules/preprocs/tasm/tests/tasmpp_test.sh Changed

yasm-1.1.0.tar.gz/out_test.sh -> yasm-1.2.0.tar.gz/out_test.sh Changed

yasm-1.1.0.tar.gz/po/POTFILES.in -> yasm-1.2.0.tar.gz/po/POTFILES.in Changed

yasm-1.2.0.tar.gz/po/stamp-po Added

yasm-1.2.0.tar.gz/po/yasm.pot Added

@@ -0,0 +1,2420 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Peter Johnson and other YASM developers
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: yasm 1.2.0\n"
+"Report-Msgid-Bugs-To: bug-yasm@tortall.net\n"
+"POT-Creation-Date: 2011-10-31 00:12-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: frontends/yasm/yasm-options.c:86
+#, c-format
+msgid "option `--%s' needs an argument!"
+msgstr ""
+
+#: frontends/yasm/yasm-options.c:106 frontends/yasm/yasm-options.c:144
+#, c-format
+msgid "warning: unrecognized option `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm-options.c:125
+#, c-format
+msgid "option `-%c' needs an argument!"
+msgstr ""
+
+#: frontends/yasm/yasm-options.c:179 frontends/yasm/yasm-options.c:187
+msgid "param"
+msgstr ""
+
+#: frontends/yasm/yasm.c:146
+msgid "show version text"
+msgstr ""
+
+#: frontends/yasm/yasm.c:148
+msgid "show license text"
+msgstr ""
+
+#: frontends/yasm/yasm.c:150
+msgid "show help text"
+msgstr ""
+
+#: frontends/yasm/yasm.c:152
+msgid "select architecture (list with -a help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:152
+msgid "arch"
+msgstr ""
+
+#: frontends/yasm/yasm.c:154
+msgid "select parser (list with -p help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:154 frontends/yasm/yasm.c:406
+#: frontends/yasm/yasm.c:447 frontends/yasm/yasm.c:675
+#: frontends/yasm/yasm.c:877
+msgid "parser"
+msgstr ""
+
+#: frontends/yasm/yasm.c:156
+msgid "select preprocessor (list with -r help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:156
+msgid "preproc"
+msgstr ""
+
+#: frontends/yasm/yasm.c:158
+msgid "select object format (list with -f help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:158
+msgid "format"
+msgstr ""
+
+#: frontends/yasm/yasm.c:160
+msgid "select debugging format (list with -g help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:160
+msgid "debug"
+msgstr ""
+
+#: frontends/yasm/yasm.c:162
+msgid "select list format (list with -L help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:162
+msgid "list"
+msgstr ""
+
+#: frontends/yasm/yasm.c:164
+msgid "name of list-file output"
+msgstr ""
+
+#: frontends/yasm/yasm.c:164
+msgid "listfile"
+msgstr ""
+
+#: frontends/yasm/yasm.c:166
+msgid "name of object-file output"
+msgstr ""
+
+#: frontends/yasm/yasm.c:166 frontends/yasm/yasm.c:168
+#: frontends/yasm/yasm.c:190
+msgid "filename"
+msgstr ""
+
+#: frontends/yasm/yasm.c:168
+msgid "name of map-file output"
+msgstr ""
+
+#: frontends/yasm/yasm.c:170
+msgid "select machine (list with -m help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:170 frontends/yasm/yasm.c:400
+msgid "machine"
+msgstr ""
+
+#: frontends/yasm/yasm.c:172
+msgid "treat all sized operands as if `strict' was used"
+msgstr ""
+
+#: frontends/yasm/yasm.c:174
+msgid "inhibits warning messages"
+msgstr ""
+
+#: frontends/yasm/yasm.c:176
+msgid "enables/disables warning"
+msgstr ""
+
+#: frontends/yasm/yasm.c:178
+msgid "generate Makefile dependencies on stdout"
+msgstr ""
+
+#: frontends/yasm/yasm.c:180
+msgid "redirect error messages to file"
+msgstr ""
+
+#: frontends/yasm/yasm.c:180
+msgid "file"
+msgstr ""
+
+#: frontends/yasm/yasm.c:182
+msgid "redirect error messages to stdout"
+msgstr ""
+
+#: frontends/yasm/yasm.c:184
+msgid "preprocess only (writes output to stdout by default)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:186 frontends/yasm/yasm.c:188
+msgid "add include path"
+msgstr ""
+
+#: frontends/yasm/yasm.c:186 frontends/yasm/yasm.c:188
+msgid "path"
+msgstr ""
+
+#: frontends/yasm/yasm.c:190
+msgid "pre-include file"
+msgstr ""
+
+#: frontends/yasm/yasm.c:192 frontends/yasm/yasm.c:194
+msgid "pre-define a macro, optionally to value"
+msgstr ""
+
+#: frontends/yasm/yasm.c:192 frontends/yasm/yasm.c:194
+msgid "macro[=value]"
+msgstr ""
+
+#: frontends/yasm/yasm.c:196 frontends/yasm/yasm.c:198
+msgid "undefine a macro"
+msgstr ""
+
+#: frontends/yasm/yasm.c:196 frontends/yasm/yasm.c:198
+msgid "macro"
+msgstr ""
+
+#: frontends/yasm/yasm.c:200
+msgid "select error/warning message style (`gnu' or `vc')"
+msgstr ""
+
+#: frontends/yasm/yasm.c:200
+msgid "style"
+msgstr ""
+
+#: frontends/yasm/yasm.c:202
+msgid "prepend argument to name of all external symbols"
+msgstr ""
+
+#: frontends/yasm/yasm.c:202
+msgid "prefix"
+msgstr ""
+
+#: frontends/yasm/yasm.c:204 frontends/yasm/yasm.c:206
+msgid "append argument to name of all external symbols"
+msgstr ""
+
+#: frontends/yasm/yasm.c:204 frontends/yasm/yasm.c:206
+msgid "suffix"
+msgstr ""
+
+#: frontends/yasm/yasm.c:209
+msgid "load plugin module"
+msgstr ""
+
+#: frontends/yasm/yasm.c:209
+msgid "plugin"
+msgstr ""
+
+#: frontends/yasm/yasm.c:223
+msgid ""
+"usage: yasm [option]* file\n"
+"Options:\n"
+msgstr ""
+
+#: frontends/yasm/yasm.c:226
+msgid ""
+"\n"
+"Files are asm sources to be assembled.\n"
+"\n"
+"Sample invocation:\n"
+"   yasm -f elf -o object.o source.asm\n"
+"\n"
+"Report bugs to bug-yasm@tortall.net\n"
+msgstr ""
+
+#: frontends/yasm/yasm.c:399 frontends/yasm/yasm.c:404
+#: frontends/yasm/yasm.c:445
+#, c-format
+msgid "%s: `%s' is not a valid %s for %s `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:400 frontends/yasm/yasm.c:405
+#: frontends/yasm/yasm.c:410 frontends/yasm/yasm.c:425
+#: frontends/yasm/yasm.c:445 frontends/yasm/yasm.c:589
+#: frontends/yasm/yasm.c:600 frontends/yasm/yasm.c:642
+#: frontends/yasm/yasm.c:652 frontends/yasm/yasm.c:674
+#: frontends/yasm/yasm.c:686 frontends/yasm/yasm.c:709
+#: frontends/yasm/yasm.c:720 frontends/yasm/yasm.c:858
+#: frontends/yasm/yasm.c:877 frontends/yasm/yasm.c:896
+#: frontends/yasm/yasm.c:916 frontends/yasm/yasm.c:940
+#: frontends/yasm/yasm.c:960 frontends/yasm/yasm.c:1343 libyasm/errwarn.c:180
+msgid "FATAL"
+msgstr ""
+
+#: frontends/yasm/yasm.c:401 frontends/yasm/yasm.c:406
+#: frontends/yasm/yasm.c:653 frontends/yasm/yasm.c:662
+#: frontends/yasm/yasm.c:859
+msgid "architecture"
+msgstr ""
+
+#: frontends/yasm/yasm.c:410
+#, c-format
+msgid "%s: unknown architecture error"
+msgstr ""
+
+#: frontends/yasm/yasm.c:446 frontends/yasm/yasm.c:687
+#: frontends/yasm/yasm.c:897
+msgid "preprocessor"
+msgstr ""
+
+#: frontends/yasm/yasm.c:494
+#, c-format
+msgid "warning: object format `%s' does not support map files"
+msgstr ""
+
+#: frontends/yasm/yasm.c:589
+#, c-format
+msgid "%s: could not initialize BitVector"
+msgstr ""
+
+#: frontends/yasm/yasm.c:600
+#, c-format
+msgid "%s: could not load standard modules"
+msgstr ""
+
+#: frontends/yasm/yasm.c:642 frontends/yasm/yasm.c:652
+#: frontends/yasm/yasm.c:674 frontends/yasm/yasm.c:686
+#: frontends/yasm/yasm.c:709 frontends/yasm/yasm.c:720
+#, c-format
+msgid "%s: could not load default %s"
+msgstr ""
+
+#: frontends/yasm/yasm.c:643 frontends/yasm/yasm.c:917
+msgid "object format"
+msgstr ""
+
+#: frontends/yasm/yasm.c:661
+#, c-format
+msgid "Available %s for %s `%s':\n"
+msgstr ""
+
+#: frontends/yasm/yasm.c:661
+msgid "machines"
+msgstr ""
+
+#: frontends/yasm/yasm.c:695
+msgid "No input files specified"
+msgstr ""
+
+#: frontends/yasm/yasm.c:710 frontends/yasm/yasm.c:961
+msgid "list format"
+msgstr ""
+
+#: frontends/yasm/yasm.c:721 frontends/yasm/yasm.c:941
+msgid "debug format"
+msgstr ""
+
+#: frontends/yasm/yasm.c:738
+#, c-format
+msgid "could not open file `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:812
+msgid ""
+"warning: can open only one input file, only the last file will be processed"
+msgstr ""
+
+#: frontends/yasm/yasm.c:853 frontends/yasm/yasm.c:872
+#: frontends/yasm/yasm.c:891 frontends/yasm/yasm.c:911
+#: frontends/yasm/yasm.c:935 frontends/yasm/yasm.c:955
+#, c-format
+msgid "Available yasm %s:\n"
+msgstr ""
+
+#: frontends/yasm/yasm.c:853
+msgid "architectures"
+msgstr ""
+
+#: frontends/yasm/yasm.c:858 frontends/yasm/yasm.c:877
+#: frontends/yasm/yasm.c:896 frontends/yasm/yasm.c:916
+#: frontends/yasm/yasm.c:940 frontends/yasm/yasm.c:960
+#, c-format
+msgid "%s: unrecognized %s `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:872
+msgid "parsers"
+msgstr ""
+
+#: frontends/yasm/yasm.c:891
+msgid "preprocessors"
+msgstr ""
+
+#: frontends/yasm/yasm.c:911
+msgid "object formats"
+msgstr ""
+
+#: frontends/yasm/yasm.c:935
+msgid "debug formats"
+msgstr ""
+
+#: frontends/yasm/yasm.c:955
+msgid "list formats"
+msgstr ""
+
+#: frontends/yasm/yasm.c:973
+msgid "warning: can output to only one list file, last specified used"
+msgstr ""
+
+#: frontends/yasm/yasm.c:989
+msgid "warning: can output to only one object file, last specified used"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1005
+msgid "warning: can output to only one map file, last specified used"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1082
+msgid "warning: can output to only one error file, last specified used"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1140
+#, c-format
+msgid "warning: unrecognized message style `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1186
+#, c-format
+msgid "warning: could not load plugin `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1280
+#, c-format
+msgid "file name already ends in `.%s': output will be in `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1289
+#, c-format
+msgid "file name already has no extension: output will be in `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1331 libyasm/errwarn.c:165
+#, c-format
+msgid "INTERNAL ERROR at %s, line %u: %s\n"
+msgstr ""
+
+#: frontends/yasm/yasm.c:1371 frontends/yasm/yasm.c:1373
+#: frontends/yasm/yasm.c:1377 frontends/yasm/yasm.c:1380
+msgid "error: "
+msgstr ""
+
+#: frontends/yasm/yasm.c:1389 frontends/yasm/yasm.c:1392
+msgid "warning: "
+msgstr ""
+
+#: libyasm/bc-align.c:110
+msgid "align boundary must be a constant"
+msgstr ""
+
+#: libyasm/bc-align.c:113
+msgid "align fill must be a constant"
+msgstr ""
+
+#: libyasm/bc-align.c:116
+msgid "align maximum skip must be a constant"
+msgstr ""
+
+#: libyasm/bc-align.c:205
+msgid "could not find any code alignment size"
+msgstr ""
+
+#: libyasm/bc-align.c:218
+#, c-format
+msgid "invalid alignment size %d"
+msgstr ""
+
+#: libyasm/bc-data.c:119
+msgid "data expression too complex"
+msgstr ""
+
+#: libyasm/bc-data.c:128
+msgid "LEB128 requires constant values"
+msgstr ""
+
+#: libyasm/bc-data.c:137
+msgid "negative value in unsigned LEB128"
+msgstr ""
+
+#: libyasm/bc-data.c:146 libyasm/bytecode.c:182
+msgid "multiple expression too complex"
+msgstr ""
+
+#: libyasm/bc-data.c:149 libyasm/bytecode.c:185
+msgid "multiple expression not absolute"
+msgstr ""
+
+#: libyasm/bc-data.c:188 libyasm/bc-data.c:243
+msgid "non-constant in data_tobytes"
+msgstr ""
+
+#: libyasm/bc-data.c:437
+msgid "LEB128 does not allow string constants"
+msgstr ""
+
+#: libyasm/bc-data.c:511 libyasm/bytecode.c:362
+msgid "could not determine multiple"
+msgstr ""
+
+#: libyasm/bc-data.c:515 libyasm/bytecode.c:258 libyasm/bytecode.c:366
+msgid "multiple is negative"
+msgstr ""
+
+#: libyasm/bc-incbin.c:115
+msgid "start expression too complex"
+msgstr ""
+
+#: libyasm/bc-incbin.c:118
+msgid "start expression not absolute"
+msgstr ""
+
+#: libyasm/bc-incbin.c:123
+msgid "maximum length expression too complex"
+msgstr ""
+
+#: libyasm/bc-incbin.c:126
+msgid "maximum length expression not absolute"
+msgstr ""
+
+#: libyasm/bc-incbin.c:147 libyasm/bc-incbin.c:160
+msgid "incbin does not yet understand non-constant"
+msgstr ""
+
+#: libyasm/bc-incbin.c:169 libyasm/bc-incbin.c:220
+#, c-format
+msgid "`incbin': unable to open file `%s'"
+msgstr ""
+
+#: libyasm/bc-incbin.c:175 libyasm/bc-incbin.c:228
+#, c-format
+msgid "`incbin': unable to seek on file `%s'"
+msgstr ""
+
+#: libyasm/bc-incbin.c:185
+#, c-format
+msgid "`incbin': start past end of file `%s'"
+msgstr ""
+
+#: libyasm/bc-incbin.c:213
+msgid "could not determine start in bc_tobytes_incbin"
+msgstr ""
+
+#: libyasm/bc-incbin.c:237
+#, c-format
+msgid "`incbin': unable to read %lu bytes from file `%s'"
+msgstr ""
+
+#: libyasm/bc-org.c:113 libyasm/bc-org.c:134
+msgid "ORG overlap with already existing data"
+msgstr ""
+
+#: libyasm/bc-reserve.c:122
+msgid "bc_reserve_tobytes called"
+msgstr ""
+
+#: libyasm/bytecode.c:60
+msgid "bytecode length cannot be calculated"
+msgstr ""
+
+#: libyasm/bytecode.c:69
+msgid "bytecode does not have any dependent spans"
+msgstr ""
+
+#: libyasm/bytecode.c:80
+msgid "bytecode cannot be converted to bytes"
+msgstr ""
+
+#: libyasm/bytecode.c:229
+msgid "got empty bytecode in yasm_bc_elem_size"
+msgstr ""
+
+#: libyasm/bytecode.c:246
+msgid "got empty bytecode in yasm_bc_calc_len"
+msgstr ""
+
+#: libyasm/bytecode.c:265
+msgid "expression must not contain floating point value"
+msgstr ""
+
+#: libyasm/bytecode.c:292
+msgid "got empty bytecode in yasm_bc_expand"
+msgstr ""
+
+#: libyasm/bytecode.c:338
+msgid "got empty bytecode in bc_tobytes"
+msgstr ""
+
+#: libyasm/bytecode.c:346
+msgid "written length does not match optimized length"
+msgstr ""
+
+#: libyasm/errwarn.c:238
+msgid "Unexpected errwarn insert action"
+msgstr ""
+
+#: libyasm/errwarn.c:498
+msgid "warnings being treated as errors"
+msgstr ""
+
+#: libyasm/expr.c:79 libyasm/expr.c:102
+msgid "could not find expritem in pool"
+msgstr ""
+
+#: libyasm/expr.c:95
+msgid "Right side of expression must exist"
+msgstr ""
+
+#: libyasm/expr.c:137
+msgid "too many expritems"
+msgstr ""
+
+#: libyasm/expr.c:828 libyasm/section.c:973 libyasm/section.c:1182
+msgid "circular reference detected"
+msgstr ""
+
+#: libyasm/file.c:171
+msgid "octal value out of range"
+msgstr ""
+
+#: libyasm/file.c:255
+msgid "could not determine current working directory"
+msgstr ""
+
+#: libyasm/floatnum.c:519
+msgid "Unsupported floating-point arithmetic operation"
+msgstr ""
+
+#: libyasm/floatnum.c:596
+msgid "Both underflow and overflow set"
+msgstr ""
+
+#: libyasm/floatnum.c:620
+msgid "Byte length of BitVector does not match bit length"
+msgstr ""
+
+#: libyasm/floatnum.c:681
+msgid "unsupported floatnum functionality"
+msgstr ""
+
+#: libyasm/floatnum.c:697
+msgid "Invalid float conversion size"
+msgstr ""
+
+#: libyasm/floatnum.c:704
+msgid "underflow in floating point expression"
+msgstr ""
+
+#: libyasm/floatnum.c:707
+msgid "overflow in floating point expression"
+msgstr ""
+
+#: libyasm/hamt.c:69
+msgid "Subtrie is seen as subtrie before flag is set (misaligned?)"
+msgstr ""
+
+#: libyasm/hamt.c:75
+msgid "Value is seen as subtrie (misaligned?)"
+msgstr ""
+
+#: libyasm/hamt.c:241
+msgid "Data is seen as subtrie (misaligned?)"
+msgstr ""
+
+#: libyasm/insn.c:49 modules/arch/x86/x86id.c:1513
+msgid "multiple segment overrides, using leftmost"
+msgstr ""
+
+#: libyasm/intnum.c:139
+msgid "invalid decimal literal"
+msgstr ""
+
+#: libyasm/intnum.c:143 libyasm/intnum.c:163 libyasm/intnum.c:183
+#: libyasm/intnum.c:203 libyasm/intnum.c:357 libyasm/intnum.c:374
+msgid "Numeric constant too large for internal format"
+msgstr ""
+
+#: libyasm/intnum.c:159
+msgid "invalid binary literal"
+msgstr ""
+
+#: libyasm/intnum.c:179
+msgid "invalid octal literal"
+msgstr ""
+
+#: libyasm/intnum.c:199
+msgid "invalid hex literal"
+msgstr ""
+
+#: libyasm/intnum.c:221 libyasm/intnum.c:267
+msgid "Character constant too large for internal format"
+msgstr ""
+
+#: libyasm/intnum.c:380 libyasm/intnum.c:801 libyasm/intnum.c:832
+msgid "big endian not implemented"
+msgstr ""
+
+#: libyasm/intnum.c:438
+msgid "operation needs an operand"
+msgstr ""
+
+#: libyasm/intnum.c:457 libyasm/intnum.c:465 libyasm/intnum.c:474
+#: libyasm/intnum.c:482
+msgid "divide by zero"
+msgstr ""
+
+#: libyasm/intnum.c:582 libyasm/intnum.c:586 libyasm/intnum.c:590
+#, c-format
+msgid "invalid use of '%s'"
+msgstr ""
+
+#: libyasm/intnum.c:599
+msgid "invalid operation in intnum calculation"
+msgstr ""
+
+#: libyasm/intnum.c:736 libyasm/intnum.c:768
+msgid "unknown intnum type"
+msgstr ""
+
+#: libyasm/intnum.c:787
+msgid "destination too large"
+msgstr ""
+
+#: libyasm/intnum.c:792
+#, c-format
+msgid "value does not fit in signed %d bit field"
+msgstr ""
+
+#: libyasm/intnum.c:796
+#, c-format
+msgid "value does not fit in %d bit field"
+msgstr ""
+
+#: libyasm/intnum.c:814
+msgid "misaligned value, truncating to boundary"
+msgstr ""
+
+#: libyasm/section.c:136
+#, c-format
+msgid "no size specified in %s declaration"
+msgstr ""
+
+#: libyasm/section.c:160
+#, c-format
+msgid "invalid argument to directive `%s'"
+msgstr ""
+
+#: libyasm/section.c:248
+#, c-format
+msgid "object format `%s' does not support architecture `%s' machine `%s'"
+msgstr ""
+
+#: libyasm/section.c:270
+#, c-format
+msgid "`%s' is not a valid debug format for object format `%s'"
+msgstr ""
+
+#: libyasm/section.c:279
+#, c-format
+msgid "debug format `%s' does not work with object format `%s'"
+msgstr ""
+
+#: libyasm/section.c:567
+msgid "NULL destroy function given to add_reloc"
+msgstr ""
+
+#: libyasm/section.c:569
+msgid "different destroy function given to add_reloc"
+msgstr ""
+
+#: libyasm/section.c:944 libyasm/section.c:1417
+msgid "could not calculate bc distance"
+msgstr ""
+
+#: libyasm/section.c:1348
+msgid "cannot combine multiples and setting assembly position"
+msgstr ""
+
+#: libyasm/section.c:1383
+msgid "secondary expansion of an external/complex value"
+msgstr ""
+
+#: libyasm/section.c:1552
+msgid "org/align went to negative offset"
+msgstr ""
+
+#: libyasm/symrec.c:302
+#, c-format
+msgid "`%s' previously defined here"
+msgstr ""
+
+#: libyasm/symrec.c:303
+#, c-format
+msgid "redefinition of `%s'"
+msgstr ""
+
+#: libyasm/symrec.c:308
+#, c-format
+msgid "`%s' both defined and declared extern"
+msgstr ""
+
+#: libyasm/symrec.c:399
+#, c-format
+msgid "duplicate definition of `%s'; first defined on line %lu"
+msgstr ""
+
+#: libyasm/symrec.c:421
+#, c-format
+msgid "undefined symbol `%s' (first use)"
+msgstr ""
+
+#: libyasm/symrec.c:442
+msgid " (Each undefined symbol is reported only once.)"
+msgstr ""
+
+#: libyasm/valparam.c:50 modules/parsers/nasm/nasm-parse.c:1575
+#: modules/parsers/nasm/nasm-parse.c:1611
+#, c-format
+msgid "directive `%s' requires an argument"
+msgstr ""
+
+#: libyasm/valparam.c:59
+#, c-format
+msgid "directive `%s' requires an identifier parameter"
+msgstr ""
+
+#: libyasm/valparam.c:314
+#, c-format
+msgid "argument to `%s' is not an expression"
+msgstr ""
+
+#: libyasm/valparam.c:335 modules/objfmts/rdf/rdf-objfmt.c:619
+#, c-format
+msgid "argument to `%s' is not an integer"
+msgstr ""
+
+#: libyasm/valparam.c:357
+#, c-format
+msgid "argument to `%s' is not a string or identifier"
+msgstr ""
+
+#: libyasm/valparam.c:372 libyasm/valparam.c:378
+#: modules/objfmts/elf/elf-objfmt.c:245 modules/objfmts/rdf/rdf-objfmt.c:636
+#, c-format
+msgid "Unrecognized qualifier `%s'"
+msgstr ""
+
+#: libyasm/valparam.c:380
+msgid "Unrecognized string qualifier"
+msgstr ""
+
+#: libyasm/valparam.c:382
+msgid "Unrecognized numeric qualifier"
+msgstr ""
+
+#: libyasm/value.c:165
+#, c-format
+msgid "expression on line %d has too many add terms; internal limit of 32"
+msgstr ""
+
+#: libyasm/value.c:539
+msgid "unexpected expr term type"
+msgstr ""
+
+#: libyasm/value.c:649
+msgid "floating point expression too complex"
+msgstr ""
+
+#: libyasm/value.c:670
+msgid "expression too complex"
+msgstr ""
+
+#: libyasm/xmalloc.c:71 libyasm/xmalloc.c:86 libyasm/xmalloc.c:103
+msgid "out of memory"
+msgstr ""
+
+#: modules/arch/lc3b/lc3barch.c:146
+msgid "LC-3b does not support floating point"
+msgstr ""
+
+#: modules/arch/lc3b/lc3bbc.c:163
+msgid "jump target out of range"
+msgstr ""
+
+#: modules/arch/lc3b/lc3bbc.c:234
+msgid "Unrecognized immediate type"
+msgstr ""
+
+#: modules/arch/x86/x86arch.c:133
+msgid "ignoring default rel in non-64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86arch.c:159 modules/arch/x86/x86arch.c:166
+#: modules/arch/x86/x86arch.c:188
+#, c-format
+msgid "invalid argument to [%s]"
+msgstr ""
+
+#: modules/arch/x86/x86arch.c:447
+msgid "Invalid mode_bits in x86_get_fill"
+msgstr ""
+
+#: modules/arch/x86/x86arch.c:476 modules/arch/x86/x86arch.c:571
+msgid "unknown register size"
+msgstr ""
+
+#: modules/arch/x86/x86arch.c:507
+msgid "bad register group"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:123 modules/arch/x86/x86bc.c:131
+msgid "cannot use A/B/C/DH with instruction needing REX"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:165
+msgid "effective address too complex"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:285
+msgid "multiple LOCK or REP prefixes, using leftmost"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:297 modules/arch/x86/x86bc.c:314
+msgid "ignoring REX prefix on jump"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:300 modules/arch/x86/x86bc.c:317
+msgid "REX prefix not allowed on this instruction, ignoring"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:322
+msgid "overriding generated REX prefix"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:325
+msgid "multiple REX prefixes, using leftmost"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:680 modules/arch/x86/x86bc.c:960
+msgid "near jump does not exist"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:694 modules/arch/x86/x86bc.c:932
+msgid "short jump does not exist"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:741 modules/objfmts/coff/win64-except.c:275
+msgid "unrecognized span id"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:748
+msgid "short jump out of range"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:753
+msgid "trying to expand an already-near jump"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:838
+msgid "x86: REX.WXB set, but 2-byte VEX"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:841
+msgid "x86: got a REX prefix in non-64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:854
+msgid "invalid Mod/RM in x86 tobytes_insn"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:860
+msgid "invalid SIB in x86 tobytes_insn"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:988
+msgid "jump op_sel cannot be JMP_NONE in tobytes"
+msgstr ""
+
+#: modules/arch/x86/x86bc.c:990
+msgid "unrecognized relative jump op_sel"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:223
+msgid "Register expression not ADD or EXPN"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:360
+msgid "Non-integer value in reg expn"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:417
+msgid "unexpected expr op"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:458
+msgid "invalid displacement size; fixed"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:471 modules/arch/x86/x86expr.c:607
+msgid "invalid effective address (displacement size)"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:480
+msgid "strange EA displacement size"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:682 modules/arch/x86/x86expr.c:1026
+msgid "invalid effective address (64-bit in non-64-bit mode)"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:688
+msgid "RIP-relative directive ignored in non-64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:703 modules/arch/x86/x86expr.c:730
+#: modules/arch/x86/x86expr.c:753 modules/arch/x86/x86expr.c:789
+#: modules/arch/x86/x86expr.c:797 modules/arch/x86/x86expr.c:808
+#: modules/arch/x86/x86expr.c:819 modules/arch/x86/x86expr.c:977
+#: modules/arch/x86/x86expr.c:993 modules/arch/x86/x86expr.c:1009
+msgid "invalid effective address"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:961 modules/arch/x86/x86expr.c:1038
+#: modules/arch/x86/x86id.c:1400
+msgid "16-bit addresses not supported in 64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86expr.c:1055
+msgid "invalid floating point constant size"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:435 modules/arch/x86/x86id.c:455
+msgid "jump target segment too complex"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:439 modules/arch/x86/x86id.c:459
+msgid "jump target offset too complex"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:448 modules/arch/x86/x86id.c:523
+msgid "jump target expression too complex"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:463
+msgid "didn't get FAR expression in jmpfar"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:517 modules/arch/x86/x86id.c:1269
+#: modules/arch/x86/x86id.c:1307 modules/arch/x86/x86id.c:1321
+#: modules/arch/x86/x86id.c:1332 modules/arch/x86/x86id.c:1342
+#: modules/arch/x86/x86id.c:1346 modules/arch/x86/x86id.c:1360
+#: modules/arch/x86/x86id.c:1370 modules/arch/x86/x86id.c:1387
+#: modules/arch/x86/x86id.c:1396 modules/arch/x86/x86id.c:1415
+#: modules/arch/x86/x86id.c:1420 modules/arch/x86/x86id.c:1445
+msgid "invalid operand conversion"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:525
+msgid "invalid jump target"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:600
+msgid "no SHORT form of that jump instruction exists"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:603
+msgid "no NEAR form of that jump instruction exists"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:899
+msgid "invalid operand type"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:984
+msgid "invalid target modifier type"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1017
+msgid "invalid number of operands"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1031 modules/arch/x86/x86id.c:1036
+#: modules/arch/x86/x86id.c:1041
+#, c-format
+msgid "invalid size for operand %d"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1045
+msgid "one of source operand 1 or 3 must match dest operand"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1051
+#, c-format
+msgid "requires CPU%s"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1057
+msgid "invalid combination of opcode and operands"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1087
+msgid "too many operands"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1118
+msgid "indirect call without `*'"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1126
+msgid "skipping prefixes on this instruction"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1273
+msgid "invalid segment in effective address"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1316 modules/arch/x86/x86id.c:1326
+msgid "immediate does not support segment"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1409
+msgid "unsupported address size"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1467
+msgid "unknown operand action"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1501
+msgid "unknown operand postponed action"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1517
+msgid "unhandled segment prefix"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1523
+msgid "immediate expression too complex"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1534
+msgid "address size override ignored"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1607
+msgid "first opcode byte of XOP must be 0x08 or 0x09"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1616
+msgid "first opcode byte of VEX must be 0x0F"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1645
+msgid "unrecognized special prefix"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1831
+#, c-format
+msgid "`%s' is an instruction in 64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1836
+#, c-format
+msgid "`%s' invalid in 64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1864
+#, c-format
+msgid "`%s' is an instruction in CPU%s"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1891
+msgid "Cannot override data size to 32 bits in 64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1897
+msgid "Cannot override address size to 16 bits in 64-bit mode"
+msgstr ""
+
+#: modules/arch/x86/x86id.c:1903
+#, c-format
+msgid "`%s' is a prefix in 64-bit mode"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:375
+msgid "codeview: could not open source file"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:468
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:550
+msgid "could not find filename in table"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:588
+#, c-format
+msgid "codeview file number %d unassigned"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:723
+msgid "tried to calc_len a codeview symhead bytecode"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:797
+msgid "tried to calc_len a codeview fileinfo bytecode"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:865
+msgid "tried to calc_len a codeview linehead bytecode"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:975
+#: modules/dbgfmts/codeview/cv-symline.c:1004
+msgid "unknown sym format character"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:1022
+msgid "tried to calc_len a codeview sym bytecode"
+msgstr ""
+
+#: modules/dbgfmts/codeview/cv-symline.c:1095
+#: modules/dbgfmts/codeview/cv-type.c:560
+#: modules/dbgfmts/codeview/cv-type.c:601
+#: modules/dbgfmts/codeview/cv-type.c:658
+msgid "unknown leaf format character"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c:244
+msgid "tried to calc_len a dwarf2 head bytecode"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-info.c:393
+msgid "tried to calc_len a dwarf2 aranges head bytecode"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:415
+msgid "could not find label prior to loc"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:423
+msgid "dwarf2 address went backwards?"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:732
+#, c-format
+msgid "dwarf2 file number %d unassigned"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:774
+msgid "tried to calc_len a dwarf2 spp bytecode"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:859
+msgid "tried to calc_len a dwarf2 line_op bytecode"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:910
+msgid "file number required"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:917
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1132
+msgid "file number is not a constant"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:922
+msgid "file number less than one"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:931
+msgid "line number required"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:938
+msgid "line number is not a constant"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:947
+#: modules/objfmts/coff/coff-objfmt.c:2047
+#, c-format
+msgid "[%s] can only be used inside of a section"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:976
+msgid "column number is not a constant"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:998
+msgid "is_stmt value is not a constant"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1010
+msgid "is_stmt value not 0 or 1"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1021
+msgid "isa value is not a constant"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1029
+msgid "isa value less than zero"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1042
+msgid "discriminator value is not a constant"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1050
+msgid "discriminator value less than zero"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1072
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1087
+#, c-format
+msgid "unrecognized loc option `%s'"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1075
+msgid "unrecognized numeric qualifier"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1092
+#, c-format
+msgid "%s requires value"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1116
+#, c-format
+msgid "[%s] requires an argument"
+msgstr ""
+
+#: modules/dbgfmts/dwarf2/dwarf2-line.c:1140
+msgid "file number given but no filename"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:340
+msgid "stabs debugging conflicts with user-defined section .stab"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:345
+msgid "stabs debugging overrides empty section .stab"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:356
+msgid "stabs debugging conflicts with user-defined section .stabstr"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:361
+msgid "stabs debugging overrides empty section .stabstr"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:399
+msgid "over 65535 stabs"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:489
+msgid "tried to resolve a stabs stab bytecode"
+msgstr ""
+
+#: modules/dbgfmts/stabs/stabs-dbgfmt.c:498
+msgid "tried to resolve a stabs str bytecode"
+msgstr ""
+
+#: modules/listfmts/nasm/nasm-listfmt.c:127
+msgid "relocation too complex"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:216
+msgid "binary object format does not support extern variables"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:220
+msgid "binary object format does not support global variables"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:224
+msgid "binary object format does not support common variables"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:253 modules/objfmts/bin/bin-objfmt.c:430
+#, c-format
+msgid ""
+"section `%s' internal align of %lu is greater than `%s' of %lu; using `%s'"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:256 modules/objfmts/bin/bin-objfmt.c:258
+msgid "align"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:269
+msgid "start expression is too complex"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:282
+msgid "vstart expression is too complex"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:361
+msgid "start inconsistent with align; using aligned value"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:433 modules/objfmts/bin/bin-objfmt.c:435
+msgid "valign"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:448
+msgid "vstart inconsistent with valign"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:755
+#, c-format
+msgid "unable to open map file `%s'"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:883
+#, c-format
+msgid "sections `%s' and `%s' overlap by %lu bytes"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:970
+msgid "binary object format does not support external references"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:998 modules/objfmts/coff/coff-objfmt.c:741
+#: modules/objfmts/elf/elf-objfmt.c:614
+msgid "uninitialized space declared in code/data section: zeroing"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1044
+msgid "initialized space declared in nobits section: ignoring"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1067
+#, c-format
+msgid "section `%s' starts before origin (ORG)"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1074
+#, c-format
+msgid "section `%s' start value too large"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1081
+#: modules/objfmts/coff/coff-objfmt.c:1205
+#: modules/objfmts/coff/coff-objfmt.c:1250
+#: modules/objfmts/elf/elf-objfmt.c:753 modules/objfmts/elf/elf-objfmt.c:865
+#: modules/objfmts/macho/macho-objfmt.c:1101
+#: modules/objfmts/macho/macho-objfmt.c:1121
+#: modules/objfmts/macho/macho-objfmt.c:1232
+#: modules/objfmts/rdf/rdf-objfmt.c:685 modules/objfmts/rdf/rdf-objfmt.c:774
+#: modules/objfmts/xdf/xdf-objfmt.c:555 modules/objfmts/xdf/xdf-objfmt.c:582
+msgid "could not seek on output file"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1122
+msgid "ORG expression is too complex"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1127
+msgid "ORG expression is negative"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1171
+#, c-format
+msgid "section `%s' follows an invalid or unknown section `%s'"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1184
+#, c-format
+msgid "follows loop between section `%s' and section `%s'"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1295
+#, c-format
+msgid "section `%s' vfollows an invalid or unknown section `%s'"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1309
+#, c-format
+msgid "vfollows loop between section `%s' and section `%s'"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1528
+msgid "cannot combine `start' and `follows' section attributes"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1534
+msgid "cannot combine `vstart' and `vfollows' section attributes"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1544 modules/objfmts/bin/bin-objfmt.c:1557
+#: modules/objfmts/coff/coff-objfmt.c:1561
+#: modules/objfmts/elf/elf-objfmt.c:1089
+#: modules/objfmts/macho/macho-objfmt.c:1465
+#: modules/objfmts/xdf/xdf-objfmt.c:725
+#, c-format
+msgid "argument to `%s' is not a power of two"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1603
+msgid "program origin redefined"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1612
+msgid "argument to ORG must be expression"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1629
+msgid "map file already specified"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1636
+msgid "unexpected expression in [map]"
+msgstr ""
+
+#: modules/objfmts/bin/bin-objfmt.c:1928
+#, c-format
+msgid "%s: could not find symbol `start'"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:486
+#: modules/objfmts/coff/coff-objfmt.c:695
+msgid "coff: relocation too complex"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:512
+msgid "coff: wrt expression too complex"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:518
+msgid "coff: cannot wrt across sections"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:538
+msgid "coff: common size too complex"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:544
+msgid "coff: common size is negative"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:603
+#: modules/objfmts/coff/coff-objfmt.c:609
+#: modules/objfmts/coff/coff-objfmt.c:635
+#: modules/objfmts/coff/coff-objfmt.c:670
+msgid "coff: invalid relocation size"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:639
+#: modules/objfmts/coff/coff-objfmt.c:646
+#: modules/objfmts/coff/coff-objfmt.c:653
+#: modules/objfmts/coff/coff-objfmt.c:674
+msgid "coff objfmt: unrecognized machine"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:796
+#: modules/objfmts/coff/coff-objfmt.c:827
+#: modules/objfmts/coff/coff-objfmt.c:1236
+#: modules/objfmts/elf/elf-objfmt.c:431 modules/objfmts/rdf/rdf-objfmt.c:750
+#: modules/objfmts/rdf/rdf-objfmt.c:767 modules/objfmts/xdf/xdf-objfmt.c:303
+#: modules/objfmts/xdf/xdf-objfmt.c:331
+msgid "could not get file position on output file"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:810
+msgid "coff: section computed size did not match actual size"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:852
+msgid "coff: no symbol data for relocated symbol"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:938
+#, c-format
+msgid "too many relocations in section `%s'"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1020
+#: modules/objfmts/coff/coff-objfmt.c:1143
+msgid "coff: expected sym data to be present"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1041
+#: modules/objfmts/macho/macho-objfmt.c:877
+#: modules/objfmts/rdf/rdf-objfmt.c:258 modules/objfmts/rdf/rdf-objfmt.c:551
+#: modules/objfmts/xdf/xdf-objfmt.c:483
+msgid "didn't understand section"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1051
+#: modules/objfmts/macho/macho-objfmt.c:895
+#: modules/objfmts/xdf/xdf-objfmt.c:493
+msgid "global EQU value not an integer expression"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1067
+#: modules/objfmts/macho/macho-objfmt.c:917
+#: modules/objfmts/rdf/rdf-objfmt.c:599
+msgid "COMMON data size not an integer expression"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1116
+msgid "coff: unrecognized aux symtab type"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1178
+#: modules/objfmts/coff/coff-objfmt.c:2265
+msgid "procedure started here"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1180
+msgid "end of file in procedure frame"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1333
+#: modules/objfmts/elf/elf-objfmt.c:948
+msgid "non-string section attribute"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1373
+#: modules/objfmts/elf/elf-objfmt.c:983
+#, c-format
+msgid "unrecognized section attribute: `%c'"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1514
+msgid "Standard COFF does not support read-only data sections"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1569
+msgid "Win32 does not support alignments > 8192"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1581
+msgid "COFF section names limited to 8 characters: truncating"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1598
+#: modules/objfmts/elf/elf-objfmt.c:1124
+#: modules/objfmts/macho/macho-objfmt.c:1502
+#: modules/objfmts/rdf/rdf-objfmt.c:960 modules/objfmts/xdf/xdf-objfmt.c:767
+msgid "section flags ignored on section redeclaration"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1689
+msgid "argument to EXPORT must be symbol name"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1740
+#: modules/objfmts/coff/coff-objfmt.c:1919
+msgid "argument to SAFESEH must be symbol name"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1795
+msgid "coff: no symbol data for SAFESEH symbol"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1854
+#: modules/objfmts/elf/elf-objfmt.c:1259
+msgid ".comment requires string parameters"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1875
+msgid ".secrel32 can only be used inside of a section"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1886
+msgid ".secrel32 requires expressions"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1911
+msgid ".def pseudo-op used inside of .def/.endef; ignored"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1941
+#: modules/objfmts/coff/coff-objfmt.c:1964
+#, c-format
+msgid "%s pseudo-op used outside of .def/.endef; ignored"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:1985
+msgid ".endef pseudo-op used before .def; ignored"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2001
+msgid "previous procedure started here"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2003
+msgid "nested procedures not supported (didn't use [ENDPROC_FRAME]?)"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2024
+#: modules/objfmts/coff/coff-objfmt.c:2259
+#, c-format
+msgid "[%s] without preceding [PROC_FRAME]"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2029
+#: modules/objfmts/coff/win64-except.c:261
+msgid "prologue ended here"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2030
+#, c-format
+msgid "[%s] after end of prologue"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2035
+#: modules/objfmts/coff/coff-objfmt.c:2275
+msgid "unwind info not present"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2070
+#: modules/objfmts/coff/coff-objfmt.c:2101
+#: modules/objfmts/coff/coff-objfmt.c:2171
+#, c-format
+msgid "[%s] requires a register as the first parameter"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2138
+#, c-format
+msgid "[%s] requires a size"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2180
+#, c-format
+msgid "[%s] requires an offset as the second parameter"
+msgstr ""
+
+#: modules/objfmts/coff/coff-objfmt.c:2267
+msgid "ended procedure without ending prologue"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:211
+msgid "prolog size expression too complex"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:214
+msgid "codes count expression too complex"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:218
+#: modules/objfmts/coff/win64-except.c:311
+msgid "frame offset expression too complex"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:240
+#: modules/objfmts/coff/win64-except.c:271
+#: modules/objfmts/coff/win64-except.c:317
+#, c-format
+msgid "frame offset of %ld bytes, must be between 0 and 240"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:244
+#: modules/objfmts/coff/win64-except.c:320
+#, c-format
+msgid "frame offset of %ld is not a multiple of 16"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:263
+#, c-format
+msgid "prologue %ld bytes, must be <256"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:267
+#, c-format
+msgid "%ld unwind codes, maximum of 255"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:348
+#: modules/objfmts/coff/win64-except.c:526
+msgid "offset expression too complex"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:397
+#: modules/objfmts/coff/win64-except.c:518
+msgid "unrecognied unwind opcode"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:412
+#: modules/objfmts/coff/win64-except.c:429
+msgid "negative offset not allowed"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:415
+#: modules/objfmts/coff/win64-except.c:538
+#, c-format
+msgid "offset of %ld is not a multiple of %ld"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:436
+msgid "expansion on already largest alloc"
+msgstr ""
+
+#: modules/objfmts/coff/win64-except.c:532
+#, c-format
+msgid "offset of %ld bytes, must be between %ld and %ld"
+msgstr ""
+
+#: modules/objfmts/dbg/dbg-objfmt.c:50
+msgid "could not open temporary file"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:124 modules/objfmts/elf/elf-objfmt.c:149
+#: modules/objfmts/elf/elf-objfmt.c:1173
+#, c-format
+msgid "unrecognized symbol type `%s'"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:202
+msgid "More than one symbol visibility provided; using last"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:229
+msgid "alignment constraint is not an integer"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:240 modules/objfmts/rdf/rdf-objfmt.c:631
+msgid "alignment constraint is not a power of two"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:439
+msgid "could not set file position on output file"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:459
+msgid "elf: invalid relocation size"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:508 modules/objfmts/elf/elf-objfmt.c:568
+msgid "elf: relocation too complex"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:555
+msgid "elf: invalid relocation (WRT or size)"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:669 modules/objfmts/elf/elf.c:773
+msgid "couldn't read position on output stream"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:674 modules/objfmts/elf/elf.c:778
+msgid "couldn't seek on output stream"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:827
+msgid "missing .stab or .stabstr section/data"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:1102
+msgid "invalid merge entity size"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:1105
+msgid "entity size for SHF_MERGE not specified"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:1175
+msgid "no type specified"
+msgstr ""
+
+#: modules/objfmts/elf/elf-objfmt.c:1202
+msgid "no size specified"
+msgstr ""
+
+#: modules/objfmts/elf/elf-x86-amd64.c:84 modules/objfmts/elf/elf-x86-x86.c:92
+msgid "symbol references section without data"
+msgstr ""
+
+#: modules/objfmts/elf/elf-x86-amd64.c:155
+#: modules/objfmts/elf/elf-x86-x86.c:158
+msgid "Unsupported WRT"
+msgstr ""
+
+#: modules/objfmts/elf/elf-x86-amd64.c:179
+#: modules/objfmts/elf/elf-x86-amd64.c:187
+#: modules/objfmts/elf/elf-x86-x86.c:176 modules/objfmts/elf/elf-x86-x86.c:183
+msgid "Unsupported relocation size"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:157 modules/objfmts/elf/elf.c:527
+#: modules/objfmts/elf/elf.c:678 modules/objfmts/elf/elf.c:706
+#: modules/objfmts/elf/elf.c:725 modules/objfmts/elf/elf.c:745
+msgid "Unsupported machine for ELF output"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:399 modules/objfmts/elf/elf.c:428
+#: modules/objfmts/elf/elf.c:448
+msgid "symtab is missing initial dummy entry"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:469
+msgid "symtab is null"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:483
+msgid "size specifier not an integer expression"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:502
+msgid "EQU value not an integer expression"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:616
+msgid "unsupported ELF format"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:628
+msgid "shead is null"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:682 modules/objfmts/elf/elf.c:749
+msgid "Failed to write an elf section header"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:797 modules/objfmts/elf/elf.c:802
+msgid "Unsupported arch/machine for elf output"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:918
+#, c-format
+msgid "alignment %d for section `%s' is not a power of 2"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:929 modules/objfmts/elf/elf.c:947
+msgid "Unsupported ELF format for output"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:951
+msgid "ELF program header is not proper length"
+msgstr ""
+
+#: modules/objfmts/elf/elf.c:956
+msgid "Failed to write ELF program header"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:440
+msgid "macho: relocation too complex for current implementation"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:465
+msgid "macho: relocation size unsupported"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:476
+msgid "macho: shifted relocations not supported"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:483
+msgid "macho: SEG not supported"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:494
+msgid "macho: invalid WRT"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:521
+msgid ""
+"macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, "
+"consider \"[_symbol wrt rip]\" for mem access, \"qword\" and \"dq _foo\" for "
+"pointers."
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:564
+msgid "macho: relocation too complex"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:603
+#: modules/objfmts/rdf/rdf-objfmt.c:320 modules/objfmts/xdf/xdf-objfmt.c:261
+msgid "uninitialized space: zeroing"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:1054
+msgid "no sections defined"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:1426
+msgid "segment name is too long, max 16 chars; truncating"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:1430
+#: modules/objfmts/macho/macho-objfmt.c:1441
+msgid "section name is too long, max 16 chars; truncating"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:1473
+msgid "macho implementation does not support alignments > 16384"
+msgstr ""
+
+#: modules/objfmts/macho/macho-objfmt.c:1480
+msgid "Unknown section name, defaulting to __TEXT segment"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:215 modules/objfmts/rdf/rdf-objfmt.c:284
+msgid "rdf: relocation too complex"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:221
+msgid "rdf: WRT not supported"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:267
+msgid "rdf: no symbol data for relocated symbol"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:375
+msgid "rdf: section computed size did not match actual size"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:555
+msgid "rdf does not support exporting EQU/absolute values"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:565
+#, c-format
+msgid "label name too long, truncating to %d bytes"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:940
+msgid "new segment declared without type code"
+msgstr ""
+
+#: modules/objfmts/rdf/rdf-objfmt.c:1023
+#, c-format
+msgid "name too long, truncating to %d bytes"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:180 modules/objfmts/xdf/xdf-objfmt.c:222
+msgid "xdf: relocation too complex"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:316
+msgid "xdf: section computed size did not match actual size"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:345
+msgid "xdf: no symbol data for relocated symbol"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:354
+msgid "xdf: no symbol data for relocated base symbol"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:359
+msgid "xdf: no base symbol for WRT relocation"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:429
+msgid "XDF object format does not support common variables"
+msgstr ""
+
+#: modules/objfmts/xdf/xdf-objfmt.c:737
+msgid "XDF does not support alignments > 4096"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:90
+msgid "can only have one token of lookahead"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:131 modules/parsers/nasm/nasm-parse.c:144
+#, c-format
+msgid "junk at end of line, first unrecognized character is `%c'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:218 modules/parsers/gas/gas-parse.c:649
+#: modules/parsers/gas/gas-parse.c:671 modules/parsers/gas/gas-parse.c:694
+#: modules/parsers/gas/gas-parse.c:807
+#, c-format
+msgid "expression expected after `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:234
+#, c-format
+msgid "directive `%s' not recognized"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:237
+#, c-format
+msgid "instruction not recognized: `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:254 modules/parsers/nasm/nasm-parse.c:465
+msgid "label or instruction expected at start of line"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:292 modules/parsers/gas/gas-parse.c:384
+#: modules/parsers/gas/gas-parse.c:464
+msgid "line number is negative"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:354
+msgid "junk at end of cpp line marker"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:411
+msgid "line increment is negative"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:498
+msgid ".align directive must specify alignment"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:574
+#, c-format
+msgid "size expected for `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:747
+msgid "flag string expected"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:960
+msgid "expression syntax error"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1163 modules/parsers/gas/gas-parse.c:1197
+msgid "invalid memory expression"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1187
+msgid "non-integer scale"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1209
+#, c-format
+msgid "scale factor of %u without an index register"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1270 modules/parsers/nasm/nasm-parse.c:939
+msgid "integer register index expected"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1277 modules/parsers/nasm/nasm-parse.c:946
+msgid "missing closing parenthesis for register index"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1283 modules/parsers/nasm/nasm-parse.c:952
+#, c-format
+msgid "bad register index `%u'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1296 modules/parsers/gas/gas-parse.c:1310
+#, c-format
+msgid "expression missing after `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1445 modules/parsers/nasm/nasm-parse.c:1408
+msgid "missing parenthesis"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1477
+msgid "expected identifier after `@'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1485
+msgid "unrecognized identifier after `@'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1585
+#, c-format
+msgid "invalid section name `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-parse.c:1637
+msgid "size must be an absolute expression"
+msgstr ""
+
+#: modules/parsers/gas/gas-parser.c:87 modules/preprocs/gas/gas-preproc.c:1328
+msgid "end of file in comment"
+msgstr ""
+
+#: modules/parsers/gas/gas-token.re:350
+#, c-format
+msgid "Unrecognized register name `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-token.re:409 modules/parsers/nasm/nasm-token.re:504
+#: modules/parsers/nasm/nasm-token.re:729
+#, c-format
+msgid "ignoring unrecognized character `%s'"
+msgstr ""
+
+#: modules/parsers/gas/gas-token.re:529 modules/parsers/gas/gas-token.re:550
+msgid "unexpected end of file in string"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:94
+msgid "only can have one token of lookahead"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:259
+msgid "only RES* allowed within absolute section"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:344
+msgid "[warning] directive not supported; ignored"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:361 modules/parsers/nasm/nasm-parse.c:370
+#, c-format
+msgid "invalid arguments to [%s]"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:403
+msgid "label alone on a line without a colon might be in error"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:425 modules/parsers/nasm/nasm-parse.c:546
+#: modules/parsers/nasm/nasm-parse.c:680
+#, c-format
+msgid "expression expected after %s"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:457
+msgid "instruction expected after label"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:553
+msgid "instruction expected after TIMES expression"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:600 modules/parsers/nasm/nasm-parse.c:632
+msgid "can not handle more than one '?'"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:610 modules/parsers/nasm/nasm-parse.c:649
+msgid "expression or string expected"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:618
+msgid "expected ( after DUP"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:626 modules/parsers/nasm/nasm-parse.c:641
+msgid "expected ) after DUPlicated expression"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:694
+msgid "filename string expected after INCBIN"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:708
+msgid "expression expected for INCBIN start"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:720
+msgid "expression expected for INCBIN maximum length"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:755
+#, c-format
+msgid "unexpected %s after instruction"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:759
+#, c-format
+msgid "expected operand, got %s"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:816 modules/parsers/nasm/nasm-parse.c:871
+msgid "memory address expected"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:831
+msgid "relative adressing not supported\n"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:840
+msgid "register adressing not supported\n"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:848
+msgid "expected expression after ]"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:878
+msgid "OFFSET applied to non-memory operand"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:883
+msgid "OFFSET applied to non-absolute memory operand"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:916
+msgid "segment applied to non-memory operand"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:977
+msgid "cannot override register size"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:989
+#, c-format
+msgid "overriding operand size from %u-bit to %u-bit"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:993
+msgid "double operand size override"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1024
+msgid "expected expression after ["
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1029
+msgid "missing closing bracket"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1100
+msgid "`:' required after segment register"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1197
+#: modules/parsers/nasm/nasm-parse.c:1259
+#: modules/parsers/nasm/nasm-parse.c:1287
+#: modules/parsers/nasm/nasm-parse.c:1316
+#: modules/parsers/nasm/nasm-parse.c:1345
+#: modules/parsers/nasm/nasm-parse.c:1353
+#: modules/parsers/nasm/nasm-parse.c:1362
+#: modules/parsers/nasm/nasm-parse.c:1371
+#: modules/parsers/nasm/nasm-parse.c:1381
+#: modules/parsers/nasm/nasm-parse.c:1395
+#: modules/parsers/nasm/nasm-parse.c:1404
+#, c-format
+msgid "expected expression after %s"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1420
+msgid "data values can't have registers"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1628
+#, c-format
+msgid "unrecognized default `%s'"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1631
+msgid "unrecognized default value"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-parse.c:1636
+#, c-format
+msgid "unrecognized directive `%s'"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-token.re:102
+#, c-format
+msgid "no non-local label before `%s'"
+msgstr ""
+
+#: modules/parsers/nasm/nasm-token.re:784
+msgid "unterminated string"
+msgstr ""
+
+#: modules/preprocs/cpp/cpp-preproc.c:87
+msgid "command line too long!"
+msgstr ""
+
+#: modules/preprocs/cpp/cpp-preproc.c:143
+#: modules/preprocs/cpp/cpp-preproc.c:175
+msgid "Failed to execute preprocessor"
+msgstr ""
+
+#: modules/preprocs/cpp/cpp-preproc.c:145
+#: modules/preprocs/cpp/cpp-preproc.c:177
+msgid "Cannot execute preprocessor, no popen available"
+msgstr ""
+
+#: modules/preprocs/cpp/cpp-preproc.c:224
+msgid "Preprocessor exited with failure"
+msgstr ""
+
+#: modules/preprocs/cpp/cpp-preproc.c:259
+#: modules/preprocs/gas/gas-preproc.c:208
+#: modules/preprocs/raw/raw-preproc.c:87
+msgid "error when reading from file"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:286
+msgid "expected comma"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:510
+msgid "\".endif\" without \".if\""
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:520
+#, c-format
+msgid "\".%s\" without \".if\""
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:535
+msgid "expression is required in \".if\" statement"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:557
+msgid "expression is required in \".elseif\" statement"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:592
+#, c-format
+msgid "\"%s\" expects two single-quoted or unquoted arguments"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:609
+#, c-format
+msgid "\"%s\" expects two double-quoted arguments"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:646
+msgid "string expected"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:658
+#, c-format
+msgid "unable to open included file \"%s\""
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:708
+#, c-format
+msgid "symbol \"%s\" is already defined"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:841
+msgid "unexpected EOF in \".macro\" block"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:848
+msgid "\".endm\" without \".macro\""
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:1023
+msgid "rept without matching endr"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:1030
+msgid "\".endr\" without \".rept\""
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:1206
+#, c-format
+msgid "\".%s\" expects two arguments"
+msgstr ""
+
+#: modules/preprocs/gas/gas-preproc.c:1238
+#: modules/preprocs/nasm/nasm-preproc.c:145
+#: modules/preprocs/raw/raw-preproc.c:54
+msgid "Could not open input file"
+msgstr ""

yasm-1.1.0.tar.gz/test_hd.c -> yasm-1.2.0.tar.gz/test_hd.c Changed

yasm-1.1.0.tar.gz/tools/Makefile.inc -> yasm-1.2.0.tar.gz/tools/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/genmacro/Makefile.inc -> yasm-1.2.0.tar.gz/tools/genmacro/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/genmacro/genmacro.c -> yasm-1.2.0.tar.gz/tools/genmacro/genmacro.c Changed

yasm-1.1.0.tar.gz/tools/genperf/Makefile.inc -> yasm-1.2.0.tar.gz/tools/genperf/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/genperf/genperf.c -> yasm-1.2.0.tar.gz/tools/genperf/genperf.c Changed

yasm-1.1.0.tar.gz/tools/genperf/perfect.c -> yasm-1.2.0.tar.gz/tools/genperf/perfect.c Changed

yasm-1.1.0.tar.gz/tools/python-yasm/Makefile.inc -> yasm-1.2.0.tar.gz/tools/python-yasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/__init__.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/__init__.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/python_test.sh -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/python_test.sh Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_bytecode.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_bytecode.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_expr.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_expr.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_intnum.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_intnum.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_symrec.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_symrec.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/yasm.pyx -> yasm-1.2.0.tar.gz/tools/python-yasm/yasm.pyx Changed

yasm-1.1.0.tar.gz/tools/re2c/Makefile.inc -> yasm-1.2.0.tar.gz/tools/re2c/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/re2c/code.c -> yasm-1.2.0.tar.gz/tools/re2c/code.c Changed

@@ -1,3 +1,7 @@
+#ifdef _WIN32
+#include <windows.h>
+#include <io.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -6,6 +10,57 @@
 #include "tools/re2c/dfa.h"
 #include "tools/re2c/parse.h"
 
+#ifdef _WIN32
+/* tmpfile() replacment for Windows.
+ *
+ * On Windows tmpfile() creates the file in the root directory. This
+ * may fail due to unsufficient privileges.
+ */
+static FILE *
+win32_tmpfile (void)
+{
+    DWORD path_len;
+    WCHAR path_name[MAX_PATH + 1];
+    WCHAR file_name[MAX_PATH + 1];
+    HANDLE handle;
+    int fd;
+    FILE *fp;
+
+    path_len = GetTempPathW (MAX_PATH, path_name);
+    if (path_len <= 0 || path_len >= MAX_PATH)
+	return NULL;
+
+    if (GetTempFileNameW (path_name, L"ps_", 0, file_name) == 0)
+	return NULL;
+
+    handle = CreateFileW (file_name,
+			 GENERIC_READ | GENERIC_WRITE,
+			 0,
+			 NULL,
+			 CREATE_ALWAYS,
+			 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
+			 NULL);
+    if (handle == INVALID_HANDLE_VALUE) {
+	DeleteFileW (file_name);
+	return NULL;
+    }
+
+    fd = _open_osfhandle((intptr_t) handle, 0);
+    if (fd < 0) {
+	CloseHandle (handle);
+	return NULL;
+    }
+
+    fp = fdopen(fd, "w+b");
+    if (fp == NULL) {
+	_close(fd);
+	return NULL;
+    }
+
+    return fp;
+}
+#endif
+
 static void useLabel(size_t value) {
     while (value >= vUsedLabelAlloc) {
 	vUsedLabels = realloc(vUsedLabels, vUsedLabelAlloc * 2);
@@ -844,14 +899,17 @@
     nOrgOline = oline;
     maxFillIndexes = vFillIndexes;
     orgVFillIndexes = vFillIndexes;
-    tmpo = fopen("re2c.tmp", "wt");
+#ifdef _WIN32
+    tmpo = win32_tmpfile();
+#else
+    tmpo = tmpfile();
+#endif
     for(s = d->head; s; s = s->next){
 	int readCh = 0;
 	State_emit(s, tmpo, &readCh);
 	Go_genGoto(&s->go, tmpo, s, s->next, &readCh);
     }
     fclose(tmpo);
-    remove("re2c.tmp");
     maxFillIndexes = vFillIndexes;
     vFillIndexes = orgVFillIndexes;
     oline = nOrgOline;

yasm-1.1.0.tar.gz/util.h -> yasm-1.2.0.tar.gz/util.h Changed

yasm-1.2.0.tar.gz/version Added

yasm-1.1.0.tar.gz/x86insn_gas.gperf -> yasm-1.2.0.tar.gz/x86insn_gas.gperf Changed

@@ -1,4 +1,4 @@
-/* Generated by gen_x86_insn.py r2346, do not edit */
+/* Generated by gen_x86_insn.py rHEAD, do not edit */
 %ignore-case
 %language=ANSI-C
 %compare-strncmp
@@ -21,10 +21,9 @@
 add,	arith_insn,	22,	SUF_Z,	0x00,	0x00,	0,	0,	0,	0,	0
 addb,	arith_insn,	22,	SUF_B,	0x00,	0x00,	0,	0,	0,	0,	0
 addl,	arith_insn,	22,	SUF_L,	0x00,	0x00,	0,	0,	CPU_386,	0,	0
-addq,	arith_insn,	22,	SUF_Q,	0x00,	0x00,	0,	ONLY_64,	0,	0,	0
-addw,	arith_insn,	22,	SUF_W,	0x00,	0x00,	0,	0,	0,	0,	0
 addpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x58,	0,	0,	CPU_SSE2,	0,	0
 addps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x58,	0,	0,	CPU_SSE,	0,	0
+addq,	arith_insn,	22,	SUF_Q,	0x00,	0x00,	0,	ONLY_64,	0,	0,	0
 addr16,	NULL,	X86_ADDRSIZE>>8,	0x10,	0,	0,	0,	0,	0,	0,	0
 addr32,	NULL,	X86_ADDRSIZE>>8,	0x20,	0,	0,	0,	0,	0,	0,	0
 addr64,	NULL,	X86_ADDRSIZE>>8,	0x40,	0,	0,	0,	ONLY_64,	0,	0,	0
@@ -32,6 +31,7 @@
 addss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x58,	0,	0,	CPU_SSE,	0,	0
 addsubpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD0,	0,	0,	CPU_SSE3,	0,	0
 addsubps,	xmm_xmm128_insn,	2,	SUF_Z,	0xF2,	0xD0,	0,	0,	CPU_SSE3,	0,	0
+addw,	arith_insn,	22,	SUF_W,	0x00,	0x00,	0,	0,	0,	0,	0
 adword,	NULL,	X86_ADDRSIZE>>8,	0x20,	0,	0,	0,	0,	0,	0,	0
 aesdec,	aes_insn,	2,	SUF_Z,	0x38,	0xDE,	0,	0,	CPU_AVX,	0,	0
 aesdeclast,	aes_insn,	2,	SUF_Z,	0x38,	0xDF,	0,	0,	CPU_AVX,	0,	0
@@ -42,20 +42,35 @@
 and,	arith_insn,	22,	SUF_Z,	0x20,	0x04,	0,	0,	0,	0,	0
 andb,	arith_insn,	22,	SUF_B,	0x20,	0x04,	0,	0,	0,	0,	0
 andl,	arith_insn,	22,	SUF_L,	0x20,	0x04,	0,	0,	CPU_386,	0,	0
-andq,	arith_insn,	22,	SUF_Q,	0x20,	0x04,	0,	ONLY_64,	0,	0,	0
-andw,	arith_insn,	22,	SUF_W,	0x20,	0x04,	0,	0,	0,	0,	0
+andn,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF2,	ONLY_AVX,	CPU_BMI1,	0,	0
+andnl,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_L,	0x00,	0x38,	0xF2,	ONLY_AVX,	CPU_BMI1,	0,	0
 andnpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x55,	0,	0,	CPU_SSE2,	0,	0
 andnps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x55,	0,	0,	CPU_SSE,	0,	0
+andnq,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Q,	0x00,	0x38,	0xF2,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
 andpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x54,	0,	0,	CPU_SSE2,	0,	0
 andps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x54,	0,	0,	CPU_SSE,	0,	0
+andq,	arith_insn,	22,	SUF_Q,	0x20,	0x04,	0,	ONLY_64,	0,	0,	0
+andw,	arith_insn,	22,	SUF_W,	0x20,	0x04,	0,	0,	0,	0,	0
 aqword,	NULL,	X86_ADDRSIZE>>8,	0x40,	0,	0,	0,	ONLY_64,	0,	0,	0
 arpl,	arpl_insn,	1,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_286,	CPU_Prot,	0
 arplw,	arpl_insn,	1,	SUF_W,	0,	0,	0,	NOT_64,	CPU_286,	CPU_Prot,	0
 aword,	NULL,	X86_ADDRSIZE>>8,	0x10,	0,	0,	0,	0,	0,	0,	0
+bextr,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI1,	0,	0
+bextrl,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0x00,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI1,	0,	0
+bextrq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0x00,	0x38,	0xF7,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
 blendpd,	sse4imm_insn,	2,	SUF_Z,	0x0D,	0,	0,	0,	CPU_SSE41,	0,	0
 blendps,	sse4imm_insn,	2,	SUF_Z,	0x0C,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvpd,	sse4xmm0_insn,	2,	SUF_Z,	0x15,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvps,	sse4xmm0_insn,	2,	SUF_Z,	0x14,	0,	0,	0,	CPU_SSE41,	0,	0
+blsi,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x03,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsil,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_L,	0x00,	0xF3,	0x03,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
+blsiw,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_W,	0x00,	0xF3,	0x03,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsmsk,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x02,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsmskl,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_L,	0x00,	0xF3,	0x02,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
+blsmskw,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_W,	0x00,	0xF3,	0x02,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsr,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x01,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsrl,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_L,	0x00,	0xF3,	0x01,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
+blsrw,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_W,	0x00,	0xF3,	0x01,	ONLY_AVX,	CPU_BMI1,	0,	0
 bound,	bound_insn,	2,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_186,	0,	0
 boundl,	bound_insn,	2,	SUF_L,	0,	0,	0,	NOT_64,	CPU_386,	0,	0
 boundw,	bound_insn,	2,	SUF_W,	0,	0,	0,	NOT_64,	CPU_186,	0,	0
@@ -71,13 +86,12 @@
 bswapl,	bswap_insn,	2,	SUF_L,	0,	0,	0,	0,	CPU_486,	0,	0
 bswapq,	bswap_insn,	2,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
 bt,	bittest_insn,	6,	SUF_Z,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
-btl,	bittest_insn,	6,	SUF_L,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
-btq,	bittest_insn,	6,	SUF_Q,	0xA3,	0x04,	0,	ONLY_64,	CPU_386,	0,	0
-btw,	bittest_insn,	6,	SUF_W,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
 btc,	bittest_insn,	6,	SUF_Z,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
 btcl,	bittest_insn,	6,	SUF_L,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
 btcq,	bittest_insn,	6,	SUF_Q,	0xBB,	0x07,	0,	ONLY_64,	CPU_386,	0,	0
 btcw,	bittest_insn,	6,	SUF_W,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
+btl,	bittest_insn,	6,	SUF_L,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
+btq,	bittest_insn,	6,	SUF_Q,	0xA3,	0x04,	0,	ONLY_64,	CPU_386,	0,	0
 btr,	bittest_insn,	6,	SUF_Z,	0xB3,	0x06,	0,	0,	CPU_386,	0,	0
 btrl,	bittest_insn,	6,	SUF_L,	0xB3,	0x06,	0,	0,	CPU_386,	0,	0
 btrq,	bittest_insn,	6,	SUF_Q,	0xB3,	0x06,	0,	ONLY_64,	CPU_386,	0,	0
@@ -86,6 +100,10 @@
 btsl,	bittest_insn,	6,	SUF_L,	0xAB,	0x05,	0,	0,	CPU_386,	0,	0
 btsq,	bittest_insn,	6,	SUF_Q,	0xAB,	0x05,	0,	ONLY_64,	CPU_386,	0,	0
 btsw,	bittest_insn,	6,	SUF_W,	0xAB,	0x05,	0,	0,	CPU_386,	0,	0
+btw,	bittest_insn,	6,	SUF_W,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
+bzhi,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+bzhil,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0x00,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+bzhiq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0x00,	0x38,	0xF5,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 call,	call_insn,	30,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 calll,	call_insn,	30,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
 callq,	call_insn,	30,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
@@ -104,21 +122,21 @@
 clts,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x06,	0,	0,	CPU_286,	CPU_Priv,	0
 cmc,	onebyte_insn,	1,	SUF_Z,	0xF5,	0,	0,	0,	0,	0,	0
 cmova,	cmovcc_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_686,	0,	0
-cmoval,	cmovcc_insn,	3,	SUF_L,	0x07,	0,	0,	0,	CPU_686,	0,	0
-cmovaq,	cmovcc_insn,	3,	SUF_Q,	0x07,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovaw,	cmovcc_insn,	3,	SUF_W,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovae,	cmovcc_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovael,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovaeq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovaew,	cmovcc_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_686,	0,	0
+cmoval,	cmovcc_insn,	3,	SUF_L,	0x07,	0,	0,	0,	CPU_686,	0,	0
+cmovaq,	cmovcc_insn,	3,	SUF_Q,	0x07,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovaw,	cmovcc_insn,	3,	SUF_W,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovb,	cmovcc_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_686,	0,	0
-cmovbl,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
-cmovbq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovbw,	cmovcc_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovbe,	cmovcc_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovbel,	cmovcc_insn,	3,	SUF_L,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovbeq,	cmovcc_insn,	3,	SUF_Q,	0x06,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovbew,	cmovcc_insn,	3,	SUF_W,	0x06,	0,	0,	0,	CPU_686,	0,	0
+cmovbl,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
+cmovbq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovbw,	cmovcc_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovc,	cmovcc_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovcl,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovcq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -128,37 +146,37 @@
 cmoveq,	cmovcc_insn,	3,	SUF_Q,	0x04,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovew,	cmovcc_insn,	3,	SUF_W,	0x04,	0,	0,	0,	CPU_686,	0,	0
 cmovg,	cmovcc_insn,	3,	SUF_Z,	0x0F,	0,	0,	0,	CPU_686,	0,	0
-cmovgl,	cmovcc_insn,	3,	SUF_L,	0x0F,	0,	0,	0,	CPU_686,	0,	0
-cmovgq,	cmovcc_insn,	3,	SUF_Q,	0x0F,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovgw,	cmovcc_insn,	3,	SUF_W,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovge,	cmovcc_insn,	3,	SUF_Z,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovgel,	cmovcc_insn,	3,	SUF_L,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovgeq,	cmovcc_insn,	3,	SUF_Q,	0x0D,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovgew,	cmovcc_insn,	3,	SUF_W,	0x0D,	0,	0,	0,	CPU_686,	0,	0
+cmovgl,	cmovcc_insn,	3,	SUF_L,	0x0F,	0,	0,	0,	CPU_686,	0,	0
+cmovgq,	cmovcc_insn,	3,	SUF_Q,	0x0F,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovgw,	cmovcc_insn,	3,	SUF_W,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovl,	cmovcc_insn,	3,	SUF_Z,	0x0C,	0,	0,	0,	CPU_686,	0,	0
-cmovll,	cmovcc_insn,	3,	SUF_L,	0x0C,	0,	0,	0,	CPU_686,	0,	0
-cmovlq,	cmovcc_insn,	3,	SUF_Q,	0x0C,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovlw,	cmovcc_insn,	3,	SUF_W,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovle,	cmovcc_insn,	3,	SUF_Z,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovlel,	cmovcc_insn,	3,	SUF_L,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovleq,	cmovcc_insn,	3,	SUF_Q,	0x0E,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovlew,	cmovcc_insn,	3,	SUF_W,	0x0E,	0,	0,	0,	CPU_686,	0,	0
+cmovll,	cmovcc_insn,	3,	SUF_L,	0x0C,	0,	0,	0,	CPU_686,	0,	0
+cmovlq,	cmovcc_insn,	3,	SUF_Q,	0x0C,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovlw,	cmovcc_insn,	3,	SUF_W,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovna,	cmovcc_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_686,	0,	0
-cmovnal,	cmovcc_insn,	3,	SUF_L,	0x06,	0,	0,	0,	CPU_686,	0,	0
-cmovnaq,	cmovcc_insn,	3,	SUF_Q,	0x06,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovnaw,	cmovcc_insn,	3,	SUF_W,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovnae,	cmovcc_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovnael,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovnaeq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnaew,	cmovcc_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_686,	0,	0
+cmovnal,	cmovcc_insn,	3,	SUF_L,	0x06,	0,	0,	0,	CPU_686,	0,	0
+cmovnaq,	cmovcc_insn,	3,	SUF_Q,	0x06,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovnaw,	cmovcc_insn,	3,	SUF_W,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovnb,	cmovcc_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_686,	0,	0
-cmovnbl,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
-cmovnbq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovnbw,	cmovcc_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovnbe,	cmovcc_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovnbel,	cmovcc_insn,	3,	SUF_L,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovnbeq,	cmovcc_insn,	3,	SUF_Q,	0x07,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnbew,	cmovcc_insn,	3,	SUF_W,	0x07,	0,	0,	0,	CPU_686,	0,	0
+cmovnbl,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
+cmovnbq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovnbw,	cmovcc_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovnc,	cmovcc_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovncl,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovncq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -168,21 +186,21 @@
 cmovneq,	cmovcc_insn,	3,	SUF_Q,	0x05,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnew,	cmovcc_insn,	3,	SUF_W,	0x05,	0,	0,	0,	CPU_686,	0,	0
 cmovng,	cmovcc_insn,	3,	SUF_Z,	0x0E,	0,	0,	0,	CPU_686,	0,	0
-cmovngl,	cmovcc_insn,	3,	SUF_L,	0x0E,	0,	0,	0,	CPU_686,	0,	0
-cmovngq,	cmovcc_insn,	3,	SUF_Q,	0x0E,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovngw,	cmovcc_insn,	3,	SUF_W,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovnge,	cmovcc_insn,	3,	SUF_Z,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovngel,	cmovcc_insn,	3,	SUF_L,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovngeq,	cmovcc_insn,	3,	SUF_Q,	0x0C,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovngew,	cmovcc_insn,	3,	SUF_W,	0x0C,	0,	0,	0,	CPU_686,	0,	0
+cmovngl,	cmovcc_insn,	3,	SUF_L,	0x0E,	0,	0,	0,	CPU_686,	0,	0
+cmovngq,	cmovcc_insn,	3,	SUF_Q,	0x0E,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovngw,	cmovcc_insn,	3,	SUF_W,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovnl,	cmovcc_insn,	3,	SUF_Z,	0x0D,	0,	0,	0,	CPU_686,	0,	0
-cmovnll,	cmovcc_insn,	3,	SUF_L,	0x0D,	0,	0,	0,	CPU_686,	0,	0
-cmovnlq,	cmovcc_insn,	3,	SUF_Q,	0x0D,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovnlw,	cmovcc_insn,	3,	SUF_W,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovnle,	cmovcc_insn,	3,	SUF_Z,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovnlel,	cmovcc_insn,	3,	SUF_L,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovnleq,	cmovcc_insn,	3,	SUF_Q,	0x0F,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnlew,	cmovcc_insn,	3,	SUF_W,	0x0F,	0,	0,	0,	CPU_686,	0,	0
+cmovnll,	cmovcc_insn,	3,	SUF_L,	0x0D,	0,	0,	0,	CPU_686,	0,	0
+cmovnlq,	cmovcc_insn,	3,	SUF_Q,	0x0D,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovnlw,	cmovcc_insn,	3,	SUF_W,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovno,	cmovcc_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_686,	0,	0
 cmovnol,	cmovcc_insn,	3,	SUF_L,	0x01,	0,	0,	0,	CPU_686,	0,	0
 cmovnoq,	cmovcc_insn,	3,	SUF_Q,	0x01,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -204,17 +222,17 @@
 cmovoq,	cmovcc_insn,	3,	SUF_Q,	0x00,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovow,	cmovcc_insn,	3,	SUF_W,	0x00,	0,	0,	0,	CPU_686,	0,	0
 cmovp,	cmovcc_insn,	3,	SUF_Z,	0x0A,	0,	0,	0,	CPU_686,	0,	0
-cmovpl,	cmovcc_insn,	3,	SUF_L,	0x0A,	0,	0,	0,	CPU_686,	0,	0
-cmovpq,	cmovcc_insn,	3,	SUF_Q,	0x0A,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovpw,	cmovcc_insn,	3,	SUF_W,	0x0A,	0,	0,	0,	CPU_686,	0,	0
 cmovpe,	cmovcc_insn,	3,	SUF_Z,	0x0A,	0,	0,	0,	CPU_686,	0,	0
 cmovpel,	cmovcc_insn,	3,	SUF_L,	0x0A,	0,	0,	0,	CPU_686,	0,	0
 cmovpeq,	cmovcc_insn,	3,	SUF_Q,	0x0A,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovpew,	cmovcc_insn,	3,	SUF_W,	0x0A,	0,	0,	0,	CPU_686,	0,	0
+cmovpl,	cmovcc_insn,	3,	SUF_L,	0x0A,	0,	0,	0,	CPU_686,	0,	0
 cmovpo,	cmovcc_insn,	3,	SUF_Z,	0x0B,	0,	0,	0,	CPU_686,	0,	0
 cmovpol,	cmovcc_insn,	3,	SUF_L,	0x0B,	0,	0,	0,	CPU_686,	0,	0
 cmovpoq,	cmovcc_insn,	3,	SUF_Q,	0x0B,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovpow,	cmovcc_insn,	3,	SUF_W,	0x0B,	0,	0,	0,	CPU_686,	0,	0
+cmovpq,	cmovcc_insn,	3,	SUF_Q,	0x0A,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovpw,	cmovcc_insn,	3,	SUF_W,	0x0A,	0,	0,	0,	CPU_686,	0,	0
 cmovs,	cmovcc_insn,	3,	SUF_Z,	0x08,	0,	0,	0,	CPU_686,	0,	0
 cmovsl,	cmovcc_insn,	3,	SUF_L,	0x08,	0,	0,	0,	CPU_686,	0,	0
 cmovsq,	cmovcc_insn,	3,	SUF_Q,	0x08,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -225,13 +243,11 @@
 cmovzw,	cmovcc_insn,	3,	SUF_W,	0x04,	0,	0,	0,	CPU_686,	0,	0
 cmp,	arith_insn,	22,	SUF_Z,	0x38,	0x07,	0,	0,	0,	0,	0
 cmpb,	arith_insn,	22,	SUF_B,	0x38,	0x07,	0,	0,	0,	0,	0
-cmpl,	arith_insn,	22,	SUF_L,	0x38,	0x07,	0,	0,	CPU_386,	0,	0
-cmpq,	arith_insn,	22,	SUF_Q,	0x38,	0x07,	0,	ONLY_64,	0,	0,	0
-cmpw,	arith_insn,	22,	SUF_W,	0x38,	0x07,	0,	0,	0,	0,	0
 cmpeqpd,	ssecmp_128_insn,	3,	SUF_Z,	0x00,	0x66,	0,	0,	CPU_SSE,	0,	0
 cmpeqps,	ssecmp_128_insn,	3,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSE,	0,	0
 cmpeqsd,	ssecmp_64_insn,	4,	SUF_Z,	0x00,	0xF2,	0,	0,	CPU_SSE2,	0,	0
 cmpeqss,	ssecmp_32_insn,	4,	SUF_Z,	0x00,	0xF3,	0,	0,	CPU_SSE,	0,	0
+cmpl,	arith_insn,	22,	SUF_L,	0x38,	0x07,	0,	0,	CPU_386,	0,	0
 cmplepd,	ssecmp_128_insn,	3,	SUF_Z,	0x02,	0x66,	0,	0,	CPU_SSE,	0,	0
 cmpleps,	ssecmp_128_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSE,	0,	0
 cmplesd,	ssecmp_64_insn,	4,	SUF_Z,	0x02,	0xF2,	0,	0,	CPU_SSE2,	0,	0
@@ -258,6 +274,7 @@
 cmpordss,	ssecmp_32_insn,	4,	SUF_Z,	0x07,	0xF3,	0,	0,	CPU_SSE,	0,	0
 cmppd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0xC2,	0,	0,	CPU_SSE2,	0,	0
 cmpps,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x00,	0xC2,	0,	0,	CPU_SSE,	0,	0
+cmpq,	arith_insn,	22,	SUF_Q,	0x38,	0x07,	0,	ONLY_64,	0,	0,	0
 cmpsb,	onebyte_insn,	1,	SUF_Z,	0xA6,	0x00,	0,	0,	0,	0,	0
 cmpsd,	cmpsd_insn,	5,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 cmpsl,	onebyte_insn,	1,	SUF_Z,	0xA7,	0x20,	0,	0,	CPU_386,	0,	0
@@ -268,6 +285,7 @@
 cmpunordps,	ssecmp_128_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSE,	0,	0
 cmpunordsd,	ssecmp_64_insn,	4,	SUF_Z,	0x03,	0xF2,	0,	0,	CPU_SSE2,	0,	0
 cmpunordss,	ssecmp_32_insn,	4,	SUF_Z,	0x03,	0xF3,	0,	0,	CPU_SSE,	0,	0
+cmpw,	arith_insn,	22,	SUF_W,	0x38,	0x07,	0,	0,	0,	0,	0
 cmpxchg,	cmpxchgxadd_insn,	4,	SUF_Z,	0xB0,	0,	0,	0,	CPU_486,	0,	0
 cmpxchg16b,	cmpxchg16b_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_64,	0,	0,	0
 cmpxchg8b,	cmpxchg8b_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_586,	0,	0
@@ -337,12 +355,12 @@
 div,	div_insn,	8,	SUF_Z,	0x06,	0,	0,	0,	0,	0,	0
 divb,	div_insn,	8,	SUF_B,	0x06,	0,	0,	0,	0,	0,	0
 divl,	div_insn,	8,	SUF_L,	0x06,	0,	0,	0,	CPU_386,	0,	0
-divq,	div_insn,	8,	SUF_Q,	0x06,	0,	0,	ONLY_64,	0,	0,	0
-divw,	div_insn,	8,	SUF_W,	0x06,	0,	0,	0,	0,	0,	0
 divpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x5E,	0,	0,	CPU_SSE2,	0,	0
 divps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x5E,	0,	0,	CPU_SSE,	0,	0
+divq,	div_insn,	8,	SUF_Q,	0x06,	0,	0,	ONLY_64,	0,	0,	0
 divsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5E,	0,	0,	CPU_SSE2,	0,	0
 divss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5E,	0,	0,	CPU_SSE,	0,	0
+divw,	div_insn,	8,	SUF_W,	0x06,	0,	0,	0,	0,	0,	0
 dppd,	sse4imm_insn,	2,	SUF_Z,	0x41,	0,	0,	0,	CPU_SSE41,	0,	0
 dpps,	sse4imm_insn,	2,	SUF_Z,	0x40,	0,	0,	0,	CPU_SSE41,	0,	0
 dword,	NULL,	X86_OPERSIZE>>8,	0x20,	0,	0,	0,	0,	0,	0,	0
@@ -357,8 +375,8 @@
 fabs,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xE1,	0,	0,	CPU_FPU,	0,	0
 fadd,	farith_insn,	7,	SUF_Z,	0xC0,	0xC0,	0x00,	0,	CPU_FPU,	0,	0
 faddl,	farith_insn,	7,	SUF_L,	0xC0,	0xC0,	0x00,	0,	CPU_FPU,	0,	0
-fadds,	farith_insn,	7,	SUF_S,	0xC0,	0xC0,	0x00,	0,	CPU_FPU,	0,	0
 faddp,	farithp_insn,	3,	SUF_Z,	0xC0,	0,	0,	0,	CPU_FPU,	0,	0
+fadds,	farith_insn,	7,	SUF_S,	0xC0,	0xC0,	0x00,	0,	CPU_FPU,	0,	0
 fbld,	fbldstp_insn,	1,	SUF_Z,	0x04,	0,	0,	0,	CPU_FPU,	0,	0
 fbstp,	fbldstp_insn,	1,	SUF_Z,	0x06,	0,	0,	0,	CPU_FPU,	0,	0
 fchs,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xE0,	0,	0,	CPU_FPU,	0,	0
@@ -372,24 +390,24 @@
 fcmovnu,	fcmovcc_insn,	1,	SUF_Z,	0xDB,	0xD8,	0,	0,	CPU_686,	CPU_FPU,	0
 fcmovu,	fcmovcc_insn,	1,	SUF_Z,	0xDA,	0xD8,	0,	0,	CPU_686,	CPU_FPU,	0
 fcom,	fcom_insn,	6,	SUF_Z,	0xD0,	0x02,	0,	0,	CPU_FPU,	0,	0
-fcoml,	fcom_insn,	6,	SUF_L,	0xD0,	0x02,	0,	0,	CPU_FPU,	0,	0
-fcoms,	fcom_insn,	6,	SUF_S,	0xD0,	0x02,	0,	0,	CPU_FPU,	0,	0
 fcomi,	fcom2_insn,	2,	SUF_Z,	0xDB,	0xF0,	0,	0,	CPU_686,	CPU_FPU,	0
 fcomip,	fcom2_insn,	2,	SUF_Z,	0xDF,	0xF0,	0,	0,	CPU_686,	CPU_FPU,	0
+fcoml,	fcom_insn,	6,	SUF_L,	0xD0,	0x02,	0,	0,	CPU_FPU,	0,	0
 fcomp,	fcom_insn,	6,	SUF_Z,	0xD8,	0x03,	0,	0,	CPU_FPU,	0,	0
 fcompl,	fcom_insn,	6,	SUF_L,	0xD8,	0x03,	0,	0,	CPU_FPU,	0,	0
-fcomps,	fcom_insn,	6,	SUF_S,	0xD8,	0x03,	0,	0,	CPU_FPU,	0,	0
 fcompp,	twobyte_insn,	1,	SUF_Z,	0xDE,	0xD9,	0,	0,	CPU_FPU,	0,	0
+fcomps,	fcom_insn,	6,	SUF_S,	0xD8,	0x03,	0,	0,	CPU_FPU,	0,	0
+fcoms,	fcom_insn,	6,	SUF_S,	0xD0,	0x02,	0,	0,	CPU_FPU,	0,	0
 fcos,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xFF,	0,	0,	CPU_286,	CPU_FPU,	0
 fdecstp,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xF6,	0,	0,	CPU_FPU,	0,	0
 fdiv,	farith_insn,	7,	SUF_Z,	0xF8,	0xF0,	0x06,	0,	CPU_FPU,	0,	0
 fdivl,	farith_insn,	7,	SUF_L,	0xF8,	0xF0,	0x06,	0,	CPU_FPU,	0,	0
-fdivs,	farith_insn,	7,	SUF_S,	0xF8,	0xF0,	0x06,	0,	CPU_FPU,	0,	0
 fdivp,	farithp_insn,	3,	SUF_Z,	0xF0,	0,	0,	0,	CPU_FPU,	0,	0
 fdivr,	farith_insn,	7,	SUF_Z,	0xF0,	0xF8,	0x07,	0,	CPU_FPU,	0,	0
 fdivrl,	farith_insn,	7,	SUF_L,	0xF0,	0xF8,	0x07,	0,	CPU_FPU,	0,	0
-fdivrs,	farith_insn,	7,	SUF_S,	0xF0,	0xF8,	0x07,	0,	CPU_FPU,	0,	0
 fdivrp,	farithp_insn,	3,	SUF_Z,	0xF8,	0,	0,	0,	CPU_FPU,	0,	0
+fdivrs,	farith_insn,	7,	SUF_S,	0xF0,	0xF8,	0x07,	0,	CPU_FPU,	0,	0
+fdivs,	farith_insn,	7,	SUF_S,	0xF8,	0xF0,	0x06,	0,	CPU_FPU,	0,	0
 femms,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x0E,	0,	0,	CPU_3DNow,	0,	0
 ffree,	ffree_insn,	1,	SUF_Z,	0xDD,	0,	0,	0,	CPU_FPU,	0,	0
 ffreep,	ffree_insn,	1,	SUF_Z,	0xDF,	0,	0,	0,	CPU_686,	CPU_FPU,	CPU_Undoc
@@ -398,21 +416,21 @@
 fiadds,	fiarith_insn,	2,	SUF_S,	0x00,	0xDA,	0,	0,	CPU_FPU,	0,	0
 ficom,	fiarith_insn,	2,	SUF_Z,	0x02,	0xDA,	0,	0,	CPU_FPU,	0,	0
 ficoml,	fiarith_insn,	2,	SUF_L,	0x02,	0xDA,	0,	0,	CPU_FPU,	0,	0
-ficoms,	fiarith_insn,	2,	SUF_S,	0x02,	0xDA,	0,	0,	CPU_FPU,	0,	0
 ficomp,	fiarith_insn,	2,	SUF_Z,	0x03,	0xDA,	0,	0,	CPU_FPU,	0,	0
 ficompl,	fiarith_insn,	2,	SUF_L,	0x03,	0xDA,	0,	0,	CPU_FPU,	0,	0
 ficomps,	fiarith_insn,	2,	SUF_S,	0x03,	0xDA,	0,	0,	CPU_FPU,	0,	0
+ficoms,	fiarith_insn,	2,	SUF_S,	0x02,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fidiv,	fiarith_insn,	2,	SUF_Z,	0x06,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fidivl,	fiarith_insn,	2,	SUF_L,	0x06,	0xDA,	0,	0,	CPU_FPU,	0,	0
-fidivs,	fiarith_insn,	2,	SUF_S,	0x06,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fidivr,	fiarith_insn,	2,	SUF_Z,	0x07,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fidivrl,	fiarith_insn,	2,	SUF_L,	0x07,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fidivrs,	fiarith_insn,	2,	SUF_S,	0x07,	0xDA,	0,	0,	CPU_FPU,	0,	0
+fidivs,	fiarith_insn,	2,	SUF_S,	0x06,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fild,	fildstp_insn,	4,	SUF_Z,	0x00,	0x02,	0x05,	0,	CPU_FPU,	0,	0
 fildl,	fildstp_insn,	4,	SUF_L,	0x00,	0x02,	0x05,	0,	CPU_FPU,	0,	0
+fildll,	fbldstp_insn,	1,	SUF_Z,	0x05,	0,	0,	0,	CPU_FPU,	0,	0
 fildq,	fildstp_insn,	4,	SUF_Q,	0x00,	0x02,	0x05,	0,	CPU_FPU,	0,	0
 filds,	fildstp_insn,	4,	SUF_S,	0x00,	0x02,	0x05,	0,	CPU_FPU,	0,	0
-fildll,	fbldstp_insn,	1,	SUF_Z,	0x05,	0,	0,	0,	CPU_FPU,	0,	0
 fimul,	fiarith_insn,	2,	SUF_Z,	0x01,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fimull,	fiarith_insn,	2,	SUF_L,	0x01,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fimuls,	fiarith_insn,	2,	SUF_S,	0x01,	0xDA,	0,	0,	CPU_FPU,	0,	0
@@ -420,54 +438,54 @@
 finit,	threebyte_insn,	1,	SUF_Z,	0x9B,	0xDB,	0xE3,	0,	CPU_FPU,	0,	0
 fist,	fiarith_insn,	2,	SUF_Z,	0x02,	0xDB,	0,	0,	CPU_FPU,	0,	0
 fistl,	fiarith_insn,	2,	SUF_L,	0x02,	0xDB,	0,	0,	CPU_FPU,	0,	0
-fists,	fiarith_insn,	2,	SUF_S,	0x02,	0xDB,	0,	0,	CPU_FPU,	0,	0
 fistp,	fildstp_insn,	4,	SUF_Z,	0x03,	0x02,	0x07,	0,	CPU_FPU,	0,	0
 fistpl,	fildstp_insn,	4,	SUF_L,	0x03,	0x02,	0x07,	0,	CPU_FPU,	0,	0
+fistpll,	fbldstp_insn,	1,	SUF_Z,	0x07,	0,	0,	0,	CPU_FPU,	0,	0
 fistpq,	fildstp_insn,	4,	SUF_Q,	0x03,	0x02,	0x07,	0,	CPU_FPU,	0,	0
 fistps,	fildstp_insn,	4,	SUF_S,	0x03,	0x02,	0x07,	0,	CPU_FPU,	0,	0
-fistpll,	fbldstp_insn,	1,	SUF_Z,	0x07,	0,	0,	0,	CPU_FPU,	0,	0
+fists,	fiarith_insn,	2,	SUF_S,	0x02,	0xDB,	0,	0,	CPU_FPU,	0,	0
 fisttp,	fildstp_insn,	4,	SUF_Z,	0x01,	0x00,	0x01,	0,	CPU_SSE3,	0,	0
 fisttpl,	fildstp_insn,	4,	SUF_L,	0x01,	0x00,	0x01,	0,	CPU_SSE3,	0,	0
+fisttpll,	fildstp_insn,	4,	SUF_Q,	0x07,	0,	0,	0,	CPU_SSE3,	0,	0
 fisttpq,	fildstp_insn,	4,	SUF_Q,	0x01,	0x00,	0x01,	0,	CPU_SSE3,	0,	0
 fisttps,	fildstp_insn,	4,	SUF_S,	0x01,	0x00,	0x01,	0,	CPU_SSE3,	0,	0
-fisttpll,	fildstp_insn,	4,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSE3,	0,	0
 fisub,	fiarith_insn,	2,	SUF_Z,	0x04,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fisubl,	fiarith_insn,	2,	SUF_L,	0x04,	0xDA,	0,	0,	CPU_FPU,	0,	0
-fisubs,	fiarith_insn,	2,	SUF_S,	0x04,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fisubr,	fiarith_insn,	2,	SUF_Z,	0x05,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fisubrl,	fiarith_insn,	2,	SUF_L,	0x05,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fisubrs,	fiarith_insn,	2,	SUF_S,	0x05,	0xDA,	0,	0,	CPU_FPU,	0,	0
+fisubs,	fiarith_insn,	2,	SUF_S,	0x04,	0xDA,	0,	0,	CPU_FPU,	0,	0
 fld,	fld_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fld1,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xE8,	0,	0,	CPU_FPU,	0,	0
-fldl,	fld_insn,	4,	SUF_L,	0,	0,	0,	0,	CPU_FPU,	0,	0
-flds,	fld_insn,	4,	SUF_S,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fldcw,	fldnstcw_insn,	1,	SUF_Z,	0x05,	0,	0,	0,	CPU_FPU,	0,	0
 fldcww,	fldnstcw_insn,	1,	SUF_W,	0x05,	0,	0,	0,	CPU_FPU,	0,	0
 fldenv,	onebytemem_insn,	1,	SUF_Z,	0x04,	0xD9,	0,	0,	CPU_FPU,	0,	0
-fldenvl,	onebytemem_insn,	1,	SUF_Z,	0x04,	0xD9,	0,	0,	CPU_FPU,	0,	0
-fldenvs,	onebytemem_insn,	1,	SUF_Z,	0x04,	0xD9,	0,	0,	CPU_FPU,	0,	0
+fldenvl,	onebytemem_insn,	1,	SUF_L,	0x04,	0xD9,	0,	0,	CPU_FPU,	0,	0
+fldenvs,	onebytemem_insn,	1,	SUF_S,	0x04,	0xD9,	0,	0,	CPU_FPU,	0,	0
+fldl,	fld_insn,	4,	SUF_L,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fldl2e,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xEA,	0,	0,	CPU_FPU,	0,	0
 fldl2t,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xE9,	0,	0,	CPU_FPU,	0,	0
 fldlg2,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xEC,	0,	0,	CPU_FPU,	0,	0
 fldln2,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xED,	0,	0,	CPU_FPU,	0,	0
 fldpi,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xEB,	0,	0,	CPU_FPU,	0,	0
+flds,	fld_insn,	4,	SUF_S,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fldt,	fldstpt_insn,	1,	SUF_Z,	0x05,	0,	0,	0,	CPU_FPU,	0,	0
 fldz,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xEE,	0,	0,	CPU_FPU,	0,	0
 fmul,	farith_insn,	7,	SUF_Z,	0xC8,	0xC8,	0x01,	0,	CPU_FPU,	0,	0
 fmull,	farith_insn,	7,	SUF_L,	0xC8,	0xC8,	0x01,	0,	CPU_FPU,	0,	0
-fmuls,	farith_insn,	7,	SUF_S,	0xC8,	0xC8,	0x01,	0,	CPU_FPU,	0,	0
 fmulp,	farithp_insn,	3,	SUF_Z,	0xC8,	0,	0,	0,	CPU_FPU,	0,	0
+fmuls,	farith_insn,	7,	SUF_S,	0xC8,	0xC8,	0x01,	0,	CPU_FPU,	0,	0
 fnclex,	twobyte_insn,	1,	SUF_Z,	0xDB,	0xE2,	0,	0,	CPU_FPU,	0,	0
 fninit,	twobyte_insn,	1,	SUF_Z,	0xDB,	0xE3,	0,	0,	CPU_FPU,	0,	0
 fnop,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xD0,	0,	0,	CPU_FPU,	0,	0
 fnsave,	onebytemem_insn,	1,	SUF_Z,	0x06,	0xDD,	0,	0,	CPU_FPU,	0,	0
-fnsavel,	onebytemem_insn,	1,	SUF_Z,	0x06,	0xDD,	0,	0,	CPU_FPU,	0,	0
-fnsaves,	onebytemem_insn,	1,	SUF_Z,	0x06,	0xDD,	0,	0,	CPU_FPU,	0,	0
+fnsavel,	onebytemem_insn,	1,	SUF_L,	0x06,	0xDD,	0,	0,	CPU_FPU,	0,	0
+fnsaves,	onebytemem_insn,	1,	SUF_S,	0x06,	0xDD,	0,	0,	CPU_FPU,	0,	0
 fnstcw,	fldnstcw_insn,	1,	SUF_Z,	0x07,	0,	0,	0,	CPU_FPU,	0,	0
 fnstcww,	fldnstcw_insn,	1,	SUF_W,	0x07,	0,	0,	0,	CPU_FPU,	0,	0
 fnstenv,	onebytemem_insn,	1,	SUF_Z,	0x06,	0xD9,	0,	0,	CPU_FPU,	0,	0
-fnstenvl,	onebytemem_insn,	1,	SUF_Z,	0x06,	0xD9,	0,	0,	CPU_FPU,	0,	0
-fnstenvs,	onebytemem_insn,	1,	SUF_Z,	0x06,	0xD9,	0,	0,	CPU_FPU,	0,	0
+fnstenvl,	onebytemem_insn,	1,	SUF_L,	0x06,	0xD9,	0,	0,	CPU_FPU,	0,	0
+fnstenvs,	onebytemem_insn,	1,	SUF_S,	0x06,	0xD9,	0,	0,	CPU_FPU,	0,	0
 fnstsw,	fnstsw_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fnstsww,	fnstsw_insn,	2,	SUF_W,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fpatan,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xF3,	0,	0,	CPU_FPU,	0,	0
@@ -476,38 +494,38 @@
 fptan,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xF2,	0,	0,	CPU_FPU,	0,	0
 frndint,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xFC,	0,	0,	CPU_FPU,	0,	0
 frstor,	onebytemem_insn,	1,	SUF_Z,	0x04,	0xDD,	0,	0,	CPU_FPU,	0,	0
-frstorl,	onebytemem_insn,	1,	SUF_Z,	0x04,	0xDD,	0,	0,	CPU_FPU,	0,	0
-frstors,	onebytemem_insn,	1,	SUF_Z,	0x04,	0xDD,	0,	0,	CPU_FPU,	0,	0
+frstorl,	onebytemem_insn,	1,	SUF_L,	0x04,	0xDD,	0,	0,	CPU_FPU,	0,	0
+frstors,	onebytemem_insn,	1,	SUF_S,	0x04,	0xDD,	0,	0,	CPU_FPU,	0,	0
 fsave,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x9B,	0xDD,	0,	CPU_FPU,	0,	0
-fsavel,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x9B,	0xDD,	0,	CPU_FPU,	0,	0
-fsaves,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x9B,	0xDD,	0,	CPU_FPU,	0,	0
+fsavel,	twobytemem_insn,	1,	SUF_L,	0x06,	0x9B,	0xDD,	0,	CPU_FPU,	0,	0
+fsaves,	twobytemem_insn,	1,	SUF_S,	0x06,	0x9B,	0xDD,	0,	CPU_FPU,	0,	0
 fscale,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xFD,	0,	0,	CPU_FPU,	0,	0
 fsetpm,	twobyte_insn,	1,	SUF_Z,	0xDB,	0xE4,	0,	0,	CPU_286,	CPU_FPU,	CPU_Obs
 fsin,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xFE,	0,	0,	CPU_286,	CPU_FPU,	0
 fsincos,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xFB,	0,	0,	CPU_286,	CPU_FPU,	0
 fsqrt,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xFA,	0,	0,	CPU_FPU,	0,	0
 fst,	fst_insn,	3,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
-fstl,	fst_insn,	3,	SUF_L,	0,	0,	0,	0,	CPU_FPU,	0,	0
-fsts,	fst_insn,	3,	SUF_S,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstcw,	fstcw_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstcww,	fstcw_insn,	1,	SUF_W,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstenv,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x9B,	0xD9,	0,	CPU_FPU,	0,	0
-fstenvl,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x9B,	0xD9,	0,	CPU_FPU,	0,	0
-fstenvs,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x9B,	0xD9,	0,	CPU_FPU,	0,	0
+fstenvl,	twobytemem_insn,	1,	SUF_L,	0x06,	0x9B,	0xD9,	0,	CPU_FPU,	0,	0
+fstenvs,	twobytemem_insn,	1,	SUF_S,	0x06,	0x9B,	0xD9,	0,	CPU_FPU,	0,	0
+fstl,	fst_insn,	3,	SUF_L,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstp,	fstp_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstpl,	fstp_insn,	4,	SUF_L,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstps,	fstp_insn,	4,	SUF_S,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstpt,	fldstpt_insn,	1,	SUF_Z,	0x07,	0,	0,	0,	CPU_FPU,	0,	0
+fsts,	fst_insn,	3,	SUF_S,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstsw,	fstsw_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fstsww,	fstsw_insn,	2,	SUF_W,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fsub,	farith_insn,	7,	SUF_Z,	0xE8,	0xE0,	0x04,	0,	CPU_FPU,	0,	0
 fsubl,	farith_insn,	7,	SUF_L,	0xE8,	0xE0,	0x04,	0,	CPU_FPU,	0,	0
-fsubs,	farith_insn,	7,	SUF_S,	0xE8,	0xE0,	0x04,	0,	CPU_FPU,	0,	0
 fsubp,	farithp_insn,	3,	SUF_Z,	0xE0,	0,	0,	0,	CPU_FPU,	0,	0
 fsubr,	farith_insn,	7,	SUF_Z,	0xE0,	0xE8,	0x05,	0,	CPU_FPU,	0,	0
 fsubrl,	farith_insn,	7,	SUF_L,	0xE0,	0xE8,	0x05,	0,	CPU_FPU,	0,	0
-fsubrs,	farith_insn,	7,	SUF_S,	0xE0,	0xE8,	0x05,	0,	CPU_FPU,	0,	0
 fsubrp,	farithp_insn,	3,	SUF_Z,	0xE8,	0,	0,	0,	CPU_FPU,	0,	0
+fsubrs,	farith_insn,	7,	SUF_S,	0xE0,	0xE8,	0x05,	0,	CPU_FPU,	0,	0
+fsubs,	farith_insn,	7,	SUF_S,	0xE8,	0xE0,	0x04,	0,	CPU_FPU,	0,	0
 ftst,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xE4,	0,	0,	CPU_FPU,	0,	0
 fucom,	fcom2_insn,	2,	SUF_Z,	0xDD,	0xE0,	0,	0,	CPU_286,	CPU_FPU,	0
 fucomi,	fcom2_insn,	2,	SUF_Z,	0xDB,	0xE8,	0,	0,	CPU_686,	CPU_FPU,	0
@@ -518,9 +536,9 @@
 fxam,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xE5,	0,	0,	CPU_FPU,	0,	0
 fxch,	fxch_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_FPU,	0,	0
 fxrstor,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0xAE,	0,	CPU_686,	CPU_FPU,	0
-fxrstorq,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0xAE,	0,	CPU_686,	CPU_FPU,	0
+fxrstorq,	twobytemem_insn,	1,	SUF_Q,	0x01,	0x0F,	0xAE,	0,	CPU_686,	CPU_FPU,	0
 fxsave,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0xAE,	0,	CPU_686,	CPU_FPU,	0
-fxsaveq,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0xAE,	0,	CPU_686,	CPU_FPU,	0
+fxsaveq,	twobytemem_insn,	1,	SUF_Q,	0x00,	0x0F,	0xAE,	0,	CPU_686,	CPU_FPU,	0
 fxtract,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xF4,	0,	0,	CPU_FPU,	0,	0
 fyl2x,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xF1,	0,	0,	CPU_FPU,	0,	0
 fyl2xp1,	twobyte_insn,	1,	SUF_Z,	0xD9,	0xF9,	0,	0,	CPU_FPU,	0,	0
@@ -545,13 +563,12 @@
 imulw,	imul_insn,	19,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 in,	in_insn,	12,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 inb,	in_insn,	12,	SUF_B,	0,	0,	0,	0,	0,	0,	0
-inl,	in_insn,	12,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
-inw,	in_insn,	12,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 inc,	incdec_insn,	6,	SUF_Z,	0x40,	0x00,	0,	0,	0,	0,	0
 incb,	incdec_insn,	6,	SUF_B,	0x40,	0x00,	0,	0,	0,	0,	0
 incl,	incdec_insn,	6,	SUF_L,	0x40,	0x00,	0,	0,	CPU_386,	0,	0
 incq,	incdec_insn,	6,	SUF_Q,	0x40,	0x00,	0,	ONLY_64,	0,	0,	0
 incw,	incdec_insn,	6,	SUF_W,	0x40,	0x00,	0,	0,	0,	0,	0
+inl,	in_insn,	12,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
 insb,	onebyte_insn,	1,	SUF_Z,	0x6C,	0x00,	0,	0,	0,	0,	0
 insertps,	insertps_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 insertq,	insertq_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SSE4a,	0,	0
@@ -566,9 +583,11 @@
 inveptq,	eptvpid_insn,	2,	SUF_Q,	0x00,	0,	0,	ONLY_64,	CPU_EPTVPID,	0,	0
 invlpg,	twobytemem_insn,	1,	SUF_Z,	0x07,	0x0F,	0x01,	0,	CPU_486,	CPU_Priv,	0
 invlpga,	invlpga_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SVM,	0,	0
+invpcid,	invpcid_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_INVPCID,	CPU_Priv
 invvpid,	eptvpid_insn,	2,	SUF_Z,	0x01,	0,	0,	0,	CPU_386,	CPU_EPTVPID,	0
 invvpidl,	eptvpid_insn,	2,	SUF_L,	0x01,	0,	0,	NOT_64,	CPU_386,	CPU_EPTVPID,	0
 invvpidq,	eptvpid_insn,	2,	SUF_Q,	0x01,	0,	0,	ONLY_64,	CPU_EPTVPID,	0,	0
+inw,	in_insn,	12,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 iret,	onebyte_insn,	1,	SUF_Z,	0xCF,	0,	0,	0,	0,	0,	0
 iretl,	onebyte_insn,	1,	SUF_Z,	0xCF,	0x20,	0,	0,	CPU_386,	0,	0
 iretq,	onebyte_insn,	1,	SUF_Z,	0xCF,	0x40,	0,	ONLY_64,	0,	0,	0
@@ -611,10 +630,10 @@
 js,	jcc_insn,	9,	SUF_Z,	0x08,	0,	0,	0,	0,	0,	0
 jz,	jcc_insn,	9,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 lahf,	onebyte_insn,	1,	SUF_Z,	0x9F,	0,	0,	0,	0,	0,	0
-lar,	bsfr_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-larl,	bsfr_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-larq,	bsfr_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_286,	CPU_Prot,	0
-larw,	bsfr_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lar,	larlsl_insn,	6,	SUF_Z,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+larl,	larlsl_insn,	6,	SUF_L,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+larq,	larlsl_insn,	6,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_286,	CPU_Prot,	0
+larw,	larlsl_insn,	6,	SUF_W,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
 lcall,	ljmpcall_insn,	7,	SUF_Z,	0x03,	0x9A,	0,	0,	0,	0,	0
 lcalll,	ljmpcall_insn,	7,	SUF_L,	0x03,	0x9A,	0,	0,	CPU_386,	0,	0
 lcallq,	ljmpcall_insn,	7,	SUF_Q,	0x03,	0x9A,	0,	ONLY_64,	0,	0,	0
@@ -627,29 +646,31 @@
 lea,	lea_insn,	3,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 leal,	lea_insn,	3,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
 leaq,	lea_insn,	3,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
-leaw,	lea_insn,	3,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 leave,	onebyte_insn,	1,	SUF_Z,	0xC9,	0x00,	0x40,	0,	CPU_186,	0,	0
 leavel,	onebyte_insn,	1,	SUF_Z,	0xC9,	0x00,	0x40,	0,	CPU_186,	0,	0
 leaveq,	onebyte_insn,	1,	SUF_Z,	0xC9,	0x00,	0x40,	ONLY_64,	0,	0,	0
 leavew,	onebyte_insn,	1,	SUF_Z,	0xC9,	0x10,	0x00,	0,	CPU_186,	0,	0
+leaw,	lea_insn,	3,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 les,	ldes_insn,	2,	SUF_Z,	0xC4,	0,	0,	NOT_64,	0,	0,	0
 lesl,	ldes_insn,	2,	SUF_L,	0xC4,	0,	0,	NOT_64,	CPU_386,	0,	0
 lesw,	ldes_insn,	2,	SUF_W,	0xC4,	0,	0,	NOT_64,	0,	0,	0
 lfence,	threebyte_insn,	1,	SUF_Z,	0x0F,	0xAE,	0xE8,	0,	CPU_P3,	0,	0
-lfs,	lfgss_insn,	2,	SUF_Z,	0xB4,	0,	0,	0,	CPU_386,	0,	0
-lfsl,	lfgss_insn,	2,	SUF_L,	0xB4,	0,	0,	0,	CPU_386,	0,	0
-lfsw,	lfgss_insn,	2,	SUF_W,	0xB4,	0,	0,	0,	CPU_386,	0,	0
+lfs,	lfgss_insn,	3,	SUF_Z,	0xB4,	0,	0,	0,	CPU_386,	0,	0
+lfsl,	lfgss_insn,	3,	SUF_L,	0xB4,	0,	0,	0,	CPU_386,	0,	0
+lfsq,	lfgss_insn,	3,	SUF_Q,	0xB4,	0,	0,	ONLY_64,	CPU_386,	0,	0
+lfsw,	lfgss_insn,	3,	SUF_W,	0xB4,	0,	0,	0,	CPU_386,	0,	0
 lgdt,	twobytemem_insn,	1,	SUF_Z,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lgdtl,	twobytemem_insn,	1,	SUF_Z,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lgdtq,	twobytemem_insn,	1,	SUF_Z,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lgdtw,	twobytemem_insn,	1,	SUF_Z,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lgs,	lfgss_insn,	2,	SUF_Z,	0xB5,	0,	0,	0,	CPU_386,	0,	0
-lgsl,	lfgss_insn,	2,	SUF_L,	0xB5,	0,	0,	0,	CPU_386,	0,	0
-lgsw,	lfgss_insn,	2,	SUF_W,	0xB5,	0,	0,	0,	CPU_386,	0,	0
+lgdtl,	twobytemem_insn,	1,	SUF_L,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+lgdtq,	twobytemem_insn,	1,	SUF_Q,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+lgdtw,	twobytemem_insn,	1,	SUF_W,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+lgs,	lfgss_insn,	3,	SUF_Z,	0xB5,	0,	0,	0,	CPU_386,	0,	0
+lgsl,	lfgss_insn,	3,	SUF_L,	0xB5,	0,	0,	0,	CPU_386,	0,	0
+lgsq,	lfgss_insn,	3,	SUF_Q,	0xB5,	0,	0,	ONLY_64,	CPU_386,	0,	0
+lgsw,	lfgss_insn,	3,	SUF_W,	0xB5,	0,	0,	0,	CPU_386,	0,	0
 lidt,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lidtl,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lidtq,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lidtw,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+lidtl,	twobytemem_insn,	1,	SUF_L,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+lidtq,	twobytemem_insn,	1,	SUF_Q,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+lidtw,	twobytemem_insn,	1,	SUF_W,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
 ljmp,	ljmpcall_insn,	7,	SUF_Z,	0x05,	0xEA,	0,	0,	0,	0,	0
 ljmpl,	ljmpcall_insn,	7,	SUF_L,	0x05,	0xEA,	0,	0,	CPU_386,	0,	0
 ljmpq,	ljmpcall_insn,	7,	SUF_Q,	0x05,	0xEA,	0,	ONLY_64,	0,	0,	0
@@ -686,22 +707,23 @@
 loopzq,	loopq_insn,	4,	SUF_Z,	0x01,	0x40,	0,	ONLY_64,	0,	0,	0
 loopzw,	loopw_insn,	4,	SUF_Z,	0x01,	0x10,	0,	NOT_64,	0,	0,	0
 lret,	retnf_insn,	6,	SUF_Z,	0xCA,	0,	0,	0,	0,	0,	0
-lretl,	retnf_insn,	6,	SUF_Z,	0xCA,	0,	0,	0,	0,	0,	0
-lretq,	retnf_insn,	6,	SUF_Z,	0xCA,	0x40,	0,	ONLY_64,	0,	0,	0
-lretw,	retnf_insn,	6,	SUF_Z,	0xCA,	0x10,	0,	0,	0,	0,	0
-lsl,	bsfr_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-lsll,	bsfr_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-lslq,	bsfr_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_286,	CPU_Prot,	0
-lslw,	bsfr_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-lss,	lfgss_insn,	2,	SUF_Z,	0xB2,	0,	0,	0,	CPU_386,	0,	0
-lssl,	lfgss_insn,	2,	SUF_L,	0xB2,	0,	0,	0,	CPU_386,	0,	0
-lssw,	lfgss_insn,	2,	SUF_W,	0xB2,	0,	0,	0,	CPU_386,	0,	0
+lretl,	retnf_insn,	6,	SUF_L,	0xCA,	0,	0,	0,	0,	0,	0
+lretq,	retnf_insn,	6,	SUF_Q,	0xCA,	0x40,	0,	ONLY_64,	0,	0,	0
+lretw,	retnf_insn,	6,	SUF_W,	0xCA,	0x10,	0,	0,	0,	0,	0
+lsl,	larlsl_insn,	6,	SUF_Z,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lsll,	larlsl_insn,	6,	SUF_L,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lslq,	larlsl_insn,	6,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_286,	CPU_Prot,	0
+lslw,	larlsl_insn,	6,	SUF_W,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lss,	lfgss_insn,	3,	SUF_Z,	0xB2,	0,	0,	0,	CPU_386,	0,	0
+lssl,	lfgss_insn,	3,	SUF_L,	0xB2,	0,	0,	0,	CPU_386,	0,	0
+lssq,	lfgss_insn,	3,	SUF_Q,	0xB2,	0,	0,	ONLY_64,	CPU_386,	0,	0
+lssw,	lfgss_insn,	3,	SUF_W,	0xB2,	0,	0,	0,	CPU_386,	0,	0
 ltr,	prot286_insn,	1,	SUF_Z,	0x03,	0x00,	0,	0,	CPU_286,	CPU_Priv,	CPU_Prot
 ltrw,	prot286_insn,	1,	SUF_W,	0x03,	0x00,	0,	0,	CPU_286,	CPU_Priv,	CPU_Prot
-lzcnt,	cnt_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_686,	CPU_AMD,	0
-lzcntl,	cnt_insn,	3,	SUF_L,	0xBD,	0,	0,	0,	CPU_686,	CPU_AMD,	0
-lzcntq,	cnt_insn,	3,	SUF_Q,	0xBD,	0,	0,	ONLY_64,	CPU_686,	CPU_AMD,	0
-lzcntw,	cnt_insn,	3,	SUF_W,	0xBD,	0,	0,	0,	CPU_686,	CPU_AMD,	0
+lzcnt,	cnt_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_LZCNT,	0,	0
+lzcntl,	cnt_insn,	3,	SUF_L,	0xBD,	0,	0,	0,	CPU_LZCNT,	0,	0
+lzcntq,	cnt_insn,	3,	SUF_Q,	0xBD,	0,	0,	ONLY_64,	CPU_LZCNT,	0,	0
+lzcntw,	cnt_insn,	3,	SUF_W,	0xBD,	0,	0,	0,	CPU_LZCNT,	0,	0
 maskmovdqu,	maskmovdqu_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE2,	0,	0
 maskmovq,	maskmovq_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 maxpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x5F,	0,	0,	CPU_SSE2,	0,	0
@@ -716,10 +738,6 @@
 monitor,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC8,	0,	CPU_SSE3,	0,	0
 montmul,	padlock_insn,	1,	SUF_Z,	0xC0,	0xF3,	0xA6,	0,	CPU_PadLock,	0,	0
 mov,	mov_insn,	69,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
-movb,	mov_insn,	69,	SUF_B,	0,	0,	0,	0,	0,	0,	0
-movl,	mov_insn,	69,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
-movq,	mov_insn,	69,	SUF_Q,	0,	0,	0,	0,	0,	0,	0
-movw,	mov_insn,	69,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 movabs,	movabs_insn,	9,	SUF_Z,	0,	0,	0,	ONLY_64,	0,	0,	0
 movabsb,	movabs_insn,	9,	SUF_B,	0,	0,	0,	ONLY_64,	0,	0,	0
 movabsl,	movabs_insn,	9,	SUF_L,	0,	0,	0,	ONLY_64,	0,	0,	0
@@ -727,6 +745,7 @@
 movabsw,	movabs_insn,	9,	SUF_W,	0,	0,	0,	ONLY_64,	0,	0,	0
 movapd,	movau_insn,	6,	SUF_Z,	0x66,	0x28,	0x01,	0,	CPU_SSE2,	0,	0
 movaps,	movau_insn,	6,	SUF_Z,	0x00,	0x28,	0x01,	0,	CPU_SSE,	0,	0
+movb,	mov_insn,	69,	SUF_B,	0,	0,	0,	0,	0,	0,	0
 movbe,	movbe_insn,	6,	SUF_Z,	0,	0,	0,	0,	CPU_MOVBE,	0,	0
 movd,	movd_insn,	8,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_MMX,	0
 movddup,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x12,	0,	0,	CPU_SSE3,	0,	0
@@ -736,6 +755,7 @@
 movhlps,	movhllhps_insn,	2,	SUF_Z,	0x12,	0,	0,	0,	CPU_SSE,	0,	0
 movhpd,	movhlp_insn,	3,	SUF_Z,	0x66,	0x16,	0,	0,	CPU_SSE2,	0,	0
 movhps,	movhlp_insn,	3,	SUF_Z,	0x00,	0x16,	0,	0,	CPU_SSE,	0,	0
+movl,	mov_insn,	69,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
 movlhps,	movhllhps_insn,	2,	SUF_Z,	0x16,	0,	0,	0,	CPU_SSE,	0,	0
 movlpd,	movhlp_insn,	3,	SUF_Z,	0x66,	0x12,	0,	0,	CPU_SSE2,	0,	0
 movlps,	movhlp_insn,	3,	SUF_Z,	0x00,	0x12,	0,	0,	CPU_SSE,	0,	0
@@ -746,7 +766,7 @@
 movmskpsl,	movmsk_insn,	4,	SUF_L,	0,	0,	0,	0,	CPU_386,	CPU_SSE,	0
 movmskpsq,	movmsk_insn,	4,	SUF_Q,	0,	0,	0,	ONLY_64,	CPU_SSE,	0,	0
 movntdq,	movnt_insn,	2,	SUF_Z,	0x66,	0xE7,	0,	0,	CPU_SSE2,	0,	0
-movntdqa,	movntdqa_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
+movntdqa,	movntdqa_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 movnti,	movnti_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
 movntil,	movnti_insn,	2,	SUF_L,	0,	0,	0,	0,	CPU_P4,	0,	0
 movntiq,	movnti_insn,	2,	SUF_Q,	0,	0,	0,	ONLY_64,	CPU_P4,	0,	0
@@ -755,31 +775,33 @@
 movntq,	movntq_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE,	0,	0
 movntsd,	movntsd_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE4a,	0,	0
 movntss,	movntss_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE4a,	0,	0
+movq,	mov_insn,	69,	SUF_Q,	0,	0,	0,	0,	0,	0,	0
 movq2dq,	movq2dq_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE2,	0,	0
 movsb,	onebyte_insn,	1,	SUF_Z,	0xA4,	0x00,	0,	0,	0,	0,	0
-movsbl,	movszx_insn,	5,	SUF_Z,	0xBE,	0,	0,	0,	CPU_386,	0,	0
-movsbq,	movszx_insn,	5,	SUF_Z,	0xBE,	0,	0,	ONLY_64,	CPU_386,	0,	0
-movsbw,	movszx_insn,	5,	SUF_Z,	0xBE,	0,	0,	0,	CPU_386,	0,	0
+movsbl,	movszx_insn,	5,	SUF_B,	0xBE,	0,	0,	0,	CPU_386,	0,	0
+movsbq,	movszx_insn,	5,	SUF_B,	0xBE,	0,	0,	ONLY_64,	CPU_386,	0,	0
+movsbw,	movszx_insn,	5,	SUF_B,	0xBE,	0,	0,	0,	CPU_386,	0,	0
 movsd,	movsd_insn,	5,	SUF_Z,	0,	0,	0,	0,	CPU_386,	0,	0
 movshdup,	xmm_xmm128_insn,	2,	SUF_Z,	0xF3,	0x16,	0,	0,	CPU_SSE3,	0,	0
 movsl,	onebyte_insn,	1,	SUF_Z,	0xA5,	0x20,	0,	0,	CPU_386,	0,	0
 movsldup,	xmm_xmm128_insn,	2,	SUF_Z,	0xF3,	0x12,	0,	0,	CPU_SSE3,	0,	0
-movslq,	movsxd_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_64,	0,	0,	0
+movslq,	movsxd_insn,	1,	SUF_L,	0,	0,	0,	ONLY_64,	0,	0,	0
 movsq,	onebyte_insn,	1,	SUF_Z,	0xA5,	0x40,	0,	ONLY_64,	0,	0,	0
 movss,	movss_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_SSE,	0,	0
 movsw,	onebyte_insn,	1,	SUF_Z,	0xA5,	0x10,	0,	0,	0,	0,	0
-movswl,	movszx_insn,	5,	SUF_Z,	0xBE,	0,	0,	0,	CPU_386,	0,	0
-movswq,	movszx_insn,	5,	SUF_Z,	0xBE,	0,	0,	ONLY_64,	CPU_386,	0,	0
+movswl,	movszx_insn,	5,	SUF_W,	0xBE,	0,	0,	0,	CPU_386,	0,	0
+movswq,	movszx_insn,	5,	SUF_W,	0xBE,	0,	0,	ONLY_64,	CPU_386,	0,	0
 movsx,	movszx_insn,	5,	SUF_Z,	0xBE,	0,	0,	0,	CPU_386,	0,	0
 movsxb,	movszx_insn,	5,	SUF_B,	0xBE,	0,	0,	0,	CPU_386,	0,	0
 movsxw,	movszx_insn,	5,	SUF_W,	0xBE,	0,	0,	0,	CPU_386,	0,	0
 movupd,	movau_insn,	6,	SUF_Z,	0x66,	0x10,	0x01,	0,	CPU_SSE2,	0,	0
 movups,	movau_insn,	6,	SUF_Z,	0x00,	0x10,	0x01,	0,	CPU_SSE,	0,	0
-movzbl,	movszx_insn,	5,	SUF_Z,	0xB6,	0,	0,	0,	CPU_386,	0,	0
-movzbq,	movszx_insn,	5,	SUF_Z,	0xB6,	0,	0,	ONLY_64,	CPU_386,	0,	0
-movzbw,	movszx_insn,	5,	SUF_Z,	0xB6,	0,	0,	0,	CPU_386,	0,	0
-movzwl,	movszx_insn,	5,	SUF_Z,	0xB6,	0,	0,	0,	CPU_386,	0,	0
-movzwq,	movszx_insn,	5,	SUF_Z,	0xB6,	0,	0,	ONLY_64,	CPU_386,	0,	0
+movw,	mov_insn,	69,	SUF_W,	0,	0,	0,	0,	0,	0,	0
+movzbl,	movszx_insn,	5,	SUF_B,	0xB6,	0,	0,	0,	CPU_386,	0,	0
+movzbq,	movszx_insn,	5,	SUF_B,	0xB6,	0,	0,	ONLY_64,	CPU_386,	0,	0
+movzbw,	movszx_insn,	5,	SUF_B,	0xB6,	0,	0,	0,	CPU_386,	0,	0
+movzwl,	movszx_insn,	5,	SUF_W,	0xB6,	0,	0,	0,	CPU_386,	0,	0
+movzwq,	movszx_insn,	5,	SUF_W,	0xB6,	0,	0,	ONLY_64,	CPU_386,	0,	0
 movzx,	movszx_insn,	5,	SUF_Z,	0xB6,	0,	0,	0,	CPU_386,	0,	0
 movzxb,	movszx_insn,	5,	SUF_B,	0xB6,	0,	0,	0,	CPU_386,	0,	0
 movzxw,	movszx_insn,	5,	SUF_W,	0xB6,	0,	0,	0,	CPU_386,	0,	0
@@ -787,12 +809,15 @@
 mul,	f6_insn,	4,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 mulb,	f6_insn,	4,	SUF_B,	0x04,	0,	0,	0,	0,	0,	0
 mull,	f6_insn,	4,	SUF_L,	0x04,	0,	0,	0,	CPU_386,	0,	0
-mulq,	f6_insn,	4,	SUF_Q,	0x04,	0,	0,	ONLY_64,	0,	0,	0
-mulw,	f6_insn,	4,	SUF_W,	0x04,	0,	0,	0,	0,	0,	0
 mulpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x59,	0,	0,	CPU_SSE2,	0,	0
 mulps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x59,	0,	0,	CPU_SSE,	0,	0
+mulq,	f6_insn,	4,	SUF_Q,	0x04,	0,	0,	ONLY_64,	0,	0,	0
 mulsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x59,	0,	0,	CPU_SSE2,	0,	0
 mulss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x59,	0,	0,	CPU_SSE,	0,	0
+mulw,	f6_insn,	4,	SUF_W,	0x04,	0,	0,	0,	0,	0,	0
+mulx,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF6,	ONLY_AVX,	CPU_BMI2,	0,	0
+mulxl,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_L,	0xF2,	0x38,	0xF6,	ONLY_AVX,	CPU_BMI2,	0,	0
+mulxq,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Q,	0xF2,	0x38,	0xF6,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 mwait,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC9,	0,	CPU_SSE3,	0,	0
 neg,	f6_insn,	4,	SUF_Z,	0x03,	0,	0,	0,	0,	0,	0
 negb,	f6_insn,	4,	SUF_B,	0x03,	0,	0,	0,	0,	0,	0
@@ -808,20 +833,20 @@
 or,	arith_insn,	22,	SUF_Z,	0x08,	0x01,	0,	0,	0,	0,	0
 orb,	arith_insn,	22,	SUF_B,	0x08,	0x01,	0,	0,	0,	0,	0
 orl,	arith_insn,	22,	SUF_L,	0x08,	0x01,	0,	0,	CPU_386,	0,	0
-orq,	arith_insn,	22,	SUF_Q,	0x08,	0x01,	0,	ONLY_64,	0,	0,	0
-orw,	arith_insn,	22,	SUF_W,	0x08,	0x01,	0,	0,	0,	0,	0
 orpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x56,	0,	0,	CPU_SSE2,	0,	0
 orps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x56,	0,	0,	CPU_SSE,	0,	0
+orq,	arith_insn,	22,	SUF_Q,	0x08,	0x01,	0,	ONLY_64,	0,	0,	0
+orw,	arith_insn,	22,	SUF_W,	0x08,	0x01,	0,	0,	0,	0,	0
 out,	out_insn,	12,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 outb,	out_insn,	12,	SUF_B,	0,	0,	0,	0,	0,	0,	0
 outl,	out_insn,	12,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
-outw,	out_insn,	12,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 outsb,	onebyte_insn,	1,	SUF_Z,	0x6E,	0x00,	0,	0,	0,	0,	0
 outsl,	onebyte_insn,	1,	SUF_Z,	0x6F,	0x20,	0,	0,	CPU_386,	0,	0
 outsw,	onebyte_insn,	1,	SUF_Z,	0x6F,	0x10,	0,	0,	0,	0,	0
-pabsb,	ssse3_insn,	3,	SUF_Z,	0x1C,	0,	0,	0,	CPU_SSSE3,	0,	0
-pabsd,	ssse3_insn,	3,	SUF_Z,	0x1E,	0,	0,	0,	CPU_SSSE3,	0,	0
-pabsw,	ssse3_insn,	3,	SUF_Z,	0x1D,	0,	0,	0,	CPU_SSSE3,	0,	0
+outw,	out_insn,	12,	SUF_W,	0,	0,	0,	0,	0,	0,	0
+pabsb,	ssse3_insn,	5,	SUF_Z,	0x1C,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsd,	ssse3_insn,	5,	SUF_Z,	0x1E,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsw,	ssse3_insn,	5,	SUF_Z,	0x1D,	0,	0,	0,	CPU_SSSE3,	0,	0
 packssdw,	mmxsse2_insn,	2,	SUF_Z,	0x6B,	0,	0,	0,	CPU_MMX,	0,	0
 packsswb,	mmxsse2_insn,	2,	SUF_Z,	0x63,	0,	0,	0,	CPU_MMX,	0,	0
 packusdw,	sse4_insn,	2,	SUF_Z,	0x2B,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -862,7 +887,13 @@
 pcmpgtw,	mmxsse2_insn,	2,	SUF_Z,	0x65,	0,	0,	0,	CPU_MMX,	0,	0
 pcmpistri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x63,	0,	0,	0,	CPU_SSE42,	0,	0
 pcmpistrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x62,	0,	0,	0,	CPU_SSE42,	0,	0
+pdep,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+pdepl,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_L,	0xF2,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+pdepq,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Q,	0xF2,	0x38,	0xF5,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 pdistib,	cyrixmmx_insn,	1,	SUF_Z,	0x54,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
+pext,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF3,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+pextl,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_L,	0xF3,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+pextq,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Q,	0xF3,	0x38,	0xF5,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 pextrb,	pextrb_insn,	3,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 pextrd,	pextrd_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_SSE41,	0
 pextrq,	pextrq_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_64,	CPU_SSE41,	0,	0
@@ -888,13 +919,13 @@
 pfrsqrt,	now3d_insn,	1,	SUF_Z,	0x97,	0,	0,	0,	CPU_3DNow,	0,	0
 pfsub,	now3d_insn,	1,	SUF_Z,	0x9A,	0,	0,	0,	CPU_3DNow,	0,	0
 pfsubr,	now3d_insn,	1,	SUF_Z,	0xAA,	0,	0,	0,	CPU_3DNow,	0,	0
-phaddd,	ssse3_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSSE3,	0,	0
-phaddsw,	ssse3_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSSE3,	0,	0
-phaddw,	ssse3_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddd,	ssse3_insn,	5,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddsw,	ssse3_insn,	5,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddw,	ssse3_insn,	5,	SUF_Z,	0x01,	0,	0,	0,	CPU_SSSE3,	0,	0
 phminposuw,	sse4_insn,	2,	SUF_Z,	0x41,	0,	0,	0,	CPU_SSE41,	0,	0
-phsubd,	ssse3_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_SSSE3,	0,	0
-phsubsw,	ssse3_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSSE3,	0,	0
-phsubw,	ssse3_insn,	3,	SUF_Z,	0x05,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubd,	ssse3_insn,	5,	SUF_Z,	0x06,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubsw,	ssse3_insn,	5,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubw,	ssse3_insn,	5,	SUF_Z,	0x05,	0,	0,	0,	CPU_SSSE3,	0,	0
 pi2fd,	now3d_insn,	1,	SUF_Z,	0x0D,	0,	0,	0,	CPU_3DNow,	0,	0
 pi2fw,	now3d_insn,	1,	SUF_Z,	0x0C,	0,	0,	0,	CPU_3DNow,	CPU_Athlon,	0
 pinsrb,	pinsrb_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -904,7 +935,7 @@
 pinsrwl,	pinsrw_insn,	9,	SUF_L,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 pinsrwq,	pinsrw_insn,	9,	SUF_Q,	0,	0,	0,	ONLY_64,	CPU_MMX,	CPU_P3,	0
 pmachriw,	pmachriw_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pmaddubsw,	ssse3_insn,	3,	SUF_Z,	0x04,	0,	0,	0,	CPU_SSSE3,	0,	0
+pmaddubsw,	ssse3_insn,	5,	SUF_Z,	0x04,	0,	0,	0,	CPU_SSSE3,	0,	0
 pmaddwd,	mmxsse2_insn,	2,	SUF_Z,	0xF5,	0,	0,	0,	CPU_MMX,	0,	0
 pmagw,	cyrixmmx_insn,	1,	SUF_Z,	0x52,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmaxsb,	sse4_insn,	2,	SUF_Z,	0x3C,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -919,24 +950,24 @@
 pminub,	mmxsse2_insn,	2,	SUF_Z,	0xDA,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 pminud,	sse4_insn,	2,	SUF_Z,	0x3B,	0,	0,	0,	CPU_SSE41,	0,	0
 pminuw,	sse4_insn,	2,	SUF_Z,	0x3A,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovmskb,	pmovmskb_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pmovmskbl,	pmovmskb_insn,	4,	SUF_L,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pmovmskbq,	pmovmskb_insn,	4,	SUF_Q,	0,	0,	0,	ONLY_64,	CPU_MMX,	CPU_P3,	0
-pmovsxbd,	sse4m32_insn,	2,	SUF_Z,	0x21,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxbq,	sse4m16_insn,	2,	SUF_Z,	0x22,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxbw,	sse4m64_insn,	2,	SUF_Z,	0x20,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxdq,	sse4m64_insn,	2,	SUF_Z,	0x25,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxwd,	sse4m64_insn,	2,	SUF_Z,	0x23,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxwq,	sse4m32_insn,	2,	SUF_Z,	0x24,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbd,	sse4m32_insn,	2,	SUF_Z,	0x31,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbq,	sse4m16_insn,	2,	SUF_Z,	0x32,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbw,	sse4m64_insn,	2,	SUF_Z,	0x30,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxdq,	sse4m64_insn,	2,	SUF_Z,	0x35,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxwd,	sse4m64_insn,	2,	SUF_Z,	0x33,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxwq,	sse4m32_insn,	2,	SUF_Z,	0x34,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovmskb,	pmovmskb_insn,	6,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
+pmovmskbl,	pmovmskb_insn,	6,	SUF_L,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
+pmovmskbq,	pmovmskb_insn,	6,	SUF_Q,	0,	0,	0,	ONLY_64,	CPU_MMX,	CPU_P3,	0
+pmovsxbd,	sse4m32_insn,	4,	SUF_Z,	0x21,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxbq,	sse4m16_insn,	4,	SUF_Z,	0x22,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxbw,	sse4m64_insn,	4,	SUF_Z,	0x20,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxdq,	sse4m64_insn,	4,	SUF_Z,	0x25,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxwd,	sse4m64_insn,	4,	SUF_Z,	0x23,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxwq,	sse4m32_insn,	4,	SUF_Z,	0x24,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbd,	sse4m32_insn,	4,	SUF_Z,	0x31,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbq,	sse4m16_insn,	4,	SUF_Z,	0x32,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbw,	sse4m64_insn,	4,	SUF_Z,	0x30,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxdq,	sse4m64_insn,	4,	SUF_Z,	0x35,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxwd,	sse4m64_insn,	4,	SUF_Z,	0x33,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxwq,	sse4m32_insn,	4,	SUF_Z,	0x34,	0,	0,	0,	CPU_SSE41,	0,	0
 pmuldq,	sse4_insn,	2,	SUF_Z,	0x28,	0,	0,	0,	CPU_SSE41,	0,	0
 pmulhriw,	cyrixmmx_insn,	1,	SUF_Z,	0x5D,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pmulhrsw,	ssse3_insn,	3,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSSE3,	0,	0
+pmulhrsw,	ssse3_insn,	5,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSSE3,	0,	0
 pmulhrwa,	now3d_insn,	1,	SUF_Z,	0xB7,	0,	0,	0,	CPU_3DNow,	0,	0
 pmulhrwc,	cyrixmmx_insn,	1,	SUF_Z,	0x59,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmulhuw,	mmxsse2_insn,	2,	SUF_Z,	0xE4,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
@@ -948,10 +979,7 @@
 pmvlzb,	cyrixmmx_insn,	1,	SUF_Z,	0x5B,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmvnzb,	cyrixmmx_insn,	1,	SUF_Z,	0x5A,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmvzb,	cyrixmmx_insn,	1,	SUF_Z,	0x58,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pop,	pop_insn,	21,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
-popl,	pop_insn,	21,	SUF_L,	0,	0,	0,	NOT_64,	CPU_386,	0,	0
-popq,	pop_insn,	21,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
-popw,	pop_insn,	21,	SUF_W,	0,	0,	0,	0,	0,	0,	0
+pop,	pop_insn,	23,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 popa,	onebyte_insn,	1,	SUF_Z,	0x61,	0x00,	0,	NOT_64,	CPU_186,	0,	0
 popal,	onebyte_insn,	1,	SUF_Z,	0x61,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 popaw,	onebyte_insn,	1,	SUF_Z,	0x61,	0x10,	0,	NOT_64,	CPU_186,	0,	0
@@ -963,6 +991,9 @@
 popfl,	onebyte_insn,	1,	SUF_Z,	0x9D,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 popfq,	onebyte_insn,	1,	SUF_Z,	0x9D,	0x40,	0x40,	ONLY_64,	0,	0,	0
 popfw,	onebyte_insn,	1,	SUF_Z,	0x9D,	0x10,	0x40,	0,	0,	0,	0
+popl,	pop_insn,	23,	SUF_L,	0,	0,	0,	NOT_64,	CPU_386,	0,	0
+popq,	pop_insn,	23,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
+popw,	pop_insn,	23,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 por,	mmxsse2_insn,	2,	SUF_Z,	0xEB,	0,	0,	0,	CPU_MMX,	0,	0
 prefetch,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x0D,	0,	CPU_3DNow,	0,	0
 prefetchnta,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x18,	0,	CPU_P3,	0,	0
@@ -971,22 +1002,22 @@
 prefetcht2,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x18,	0,	CPU_P3,	0,	0
 prefetchw,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x0D,	0,	CPU_3DNow,	0,	0
 psadbw,	mmxsse2_insn,	2,	SUF_Z,	0xF6,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pshufb,	ssse3_insn,	3,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSSE3,	0,	0
+pshufb,	ssse3_insn,	5,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSSE3,	0,	0
 pshufd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0x70,	0,	0,	CPU_SSE2,	0,	0
 pshufhw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF3,	0x70,	0,	0,	CPU_SSE2,	0,	0
 pshuflw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF2,	0x70,	0,	0,	CPU_SSE2,	0,	0
 pshufw,	pshufw_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-psignb,	ssse3_insn,	3,	SUF_Z,	0x08,	0,	0,	0,	CPU_SSSE3,	0,	0
-psignd,	ssse3_insn,	3,	SUF_Z,	0x0A,	0,	0,	0,	CPU_SSSE3,	0,	0
-psignw,	ssse3_insn,	3,	SUF_Z,	0x09,	0,	0,	0,	CPU_SSSE3,	0,	0
+psignb,	ssse3_insn,	5,	SUF_Z,	0x08,	0,	0,	0,	CPU_SSSE3,	0,	0
+psignd,	ssse3_insn,	5,	SUF_Z,	0x0A,	0,	0,	0,	CPU_SSSE3,	0,	0
+psignw,	ssse3_insn,	5,	SUF_Z,	0x09,	0,	0,	0,	CPU_SSSE3,	0,	0
 pslld,	pshift_insn,	4,	SUF_Z,	0xF2,	0x72,	0x06,	0,	CPU_MMX,	0,	0
-pslldq,	pslrldq_insn,	2,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSE2,	0,	0
+pslldq,	pslrldq_insn,	4,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSE2,	0,	0
 psllq,	pshift_insn,	4,	SUF_Z,	0xF3,	0x73,	0x06,	0,	CPU_MMX,	0,	0
 psllw,	pshift_insn,	4,	SUF_Z,	0xF1,	0x71,	0x06,	0,	CPU_MMX,	0,	0
 psrad,	pshift_insn,	4,	SUF_Z,	0xE2,	0x72,	0x04,	0,	CPU_MMX,	0,	0
 psraw,	pshift_insn,	4,	SUF_Z,	0xE1,	0x71,	0x04,	0,	CPU_MMX,	0,	0
 psrld,	pshift_insn,	4,	SUF_Z,	0xD2,	0x72,	0x02,	0,	CPU_MMX,	0,	0
-psrldq,	pslrldq_insn,	2,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSE2,	0,	0
+psrldq,	pslrldq_insn,	4,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSE2,	0,	0
 psrlq,	pshift_insn,	4,	SUF_Z,	0xD3,	0x73,	0x02,	0,	CPU_MMX,	0,	0
 psrlw,	pshift_insn,	4,	SUF_Z,	0xD1,	0x71,	0x02,	0,	CPU_MMX,	0,	0
 psubb,	mmxsse2_insn,	2,	SUF_Z,	0xF8,	0,	0,	0,	CPU_MMX,	0,	0
@@ -1008,10 +1039,7 @@
 punpckldq,	mmxsse2_insn,	2,	SUF_Z,	0x62,	0,	0,	0,	CPU_MMX,	0,	0
 punpcklqdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6C,	0,	0,	CPU_SSE2,	0,	0
 punpcklwd,	mmxsse2_insn,	2,	SUF_Z,	0x61,	0,	0,	0,	CPU_MMX,	0,	0
-push,	push_insn,	33,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
-pushl,	push_insn,	33,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
-pushq,	push_insn,	33,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
-pushw,	push_insn,	33,	SUF_W,	0,	0,	0,	0,	0,	0,	0
+push,	push_insn,	35,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 pusha,	onebyte_insn,	1,	SUF_Z,	0x60,	0x00,	0,	NOT_64,	CPU_186,	0,	0
 pushal,	onebyte_insn,	1,	SUF_Z,	0x60,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 pushaw,	onebyte_insn,	1,	SUF_Z,	0x60,	0x10,	0,	NOT_64,	CPU_186,	0,	0
@@ -1019,6 +1047,9 @@
 pushfl,	onebyte_insn,	1,	SUF_Z,	0x9C,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 pushfq,	onebyte_insn,	1,	SUF_Z,	0x9C,	0x40,	0x40,	ONLY_64,	0,	0,	0
 pushfw,	onebyte_insn,	1,	SUF_Z,	0x9C,	0x10,	0x40,	0,	0,	0,	0
+pushl,	push_insn,	35,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
+pushq,	push_insn,	35,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
+pushw,	push_insn,	35,	SUF_W,	0,	0,	0,	0,	0,	0,	0
 pxor,	mmxsse2_insn,	2,	SUF_Z,	0xEF,	0,	0,	0,	CPU_MMX,	0,	0
 qword,	NULL,	X86_OPERSIZE>>8,	0x40,	0,	0,	0,	ONLY_64,	0,	0,	0
 rcl,	shift_insn,	16,	SUF_Z,	0x02,	0,	0,	0,	0,	0,	0
@@ -1076,6 +1107,9 @@
 rorl,	shift_insn,	16,	SUF_L,	0x01,	0,	0,	0,	CPU_386,	0,	0
 rorq,	shift_insn,	16,	SUF_Q,	0x01,	0,	0,	ONLY_64,	0,	0,	0
 rorw,	shift_insn,	16,	SUF_W,	0x01,	0,	0,	0,	0,	0,	0
+rorx,	vex_gpr_reg_rm_0F_imm8_insn,	2,	SUF_Z,	0xF2,	0x3A,	0xF0,	ONLY_AVX,	CPU_BMI2,	0,	0
+rorxl,	vex_gpr_reg_rm_0F_imm8_insn,	2,	SUF_L,	0xF2,	0x3A,	0xF0,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
+rorxw,	vex_gpr_reg_rm_0F_imm8_insn,	2,	SUF_W,	0xF2,	0x3A,	0xF0,	ONLY_AVX,	CPU_BMI2,	0,	0
 roundpd,	sse4imm_insn,	2,	SUF_Z,	0x09,	0,	0,	0,	CPU_SSE41,	0,	0
 roundps,	sse4imm_insn,	2,	SUF_Z,	0x08,	0,	0,	0,	CPU_SSE41,	0,	0
 roundsd,	sse4m64imm_insn,	4,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -1089,15 +1123,18 @@
 sahf,	onebyte_insn,	1,	SUF_Z,	0x9E,	0,	0,	0,	0,	0,	0
 sal,	shift_insn,	16,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 salb,	shift_insn,	16,	SUF_B,	0x04,	0,	0,	0,	0,	0,	0
+salc,	onebyte_insn,	1,	SUF_Z,	0xD6,	0,	0,	NOT_64,	CPU_Undoc,	0,	0
 sall,	shift_insn,	16,	SUF_L,	0x04,	0,	0,	0,	CPU_386,	0,	0
 salq,	shift_insn,	16,	SUF_Q,	0x04,	0,	0,	ONLY_64,	0,	0,	0
 salw,	shift_insn,	16,	SUF_W,	0x04,	0,	0,	0,	0,	0,	0
-salc,	onebyte_insn,	1,	SUF_Z,	0xD6,	0,	0,	NOT_64,	CPU_Undoc,	0,	0
 sar,	shift_insn,	16,	SUF_Z,	0x07,	0,	0,	0,	0,	0,	0
 sarb,	shift_insn,	16,	SUF_B,	0x07,	0,	0,	0,	0,	0,	0
 sarl,	shift_insn,	16,	SUF_L,	0x07,	0,	0,	0,	CPU_386,	0,	0
 sarq,	shift_insn,	16,	SUF_Q,	0x07,	0,	0,	ONLY_64,	0,	0,	0
 sarw,	shift_insn,	16,	SUF_W,	0x07,	0,	0,	0,	0,	0,	0
+sarx,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0xF3,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
+sarxl,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0xF3,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
+sarxq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0xF3,	0x38,	0xF7,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 sbb,	arith_insn,	22,	SUF_Z,	0x18,	0x03,	0,	0,	0,	0,	0
 sbbb,	arith_insn,	22,	SUF_B,	0x18,	0x03,	0,	0,	0,	0,	0
 sbbl,	arith_insn,	22,	SUF_L,	0x18,	0x03,	0,	0,	CPU_386,	0,	0
@@ -1169,33 +1206,39 @@
 setzb,	setcc_insn,	1,	SUF_B,	0x04,	0,	0,	0,	CPU_386,	0,	0
 sfence,	threebyte_insn,	1,	SUF_Z,	0x0F,	0xAE,	0xF8,	0,	CPU_P3,	0,	0
 sgdt,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-sgdtl,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-sgdtq,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-sgdtw,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+sgdtl,	twobytemem_insn,	1,	SUF_L,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+sgdtq,	twobytemem_insn,	1,	SUF_Q,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+sgdtw,	twobytemem_insn,	1,	SUF_W,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
 shl,	shift_insn,	16,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 shlb,	shift_insn,	16,	SUF_B,	0x04,	0,	0,	0,	0,	0,	0
-shll,	shift_insn,	16,	SUF_L,	0x04,	0,	0,	0,	CPU_386,	0,	0
-shlq,	shift_insn,	16,	SUF_Q,	0x04,	0,	0,	ONLY_64,	0,	0,	0
-shlw,	shift_insn,	16,	SUF_W,	0x04,	0,	0,	0,	0,	0,	0
 shld,	shlrd_insn,	9,	SUF_Z,	0xA4,	0,	0,	0,	CPU_386,	0,	0
 shldl,	shlrd_insn,	9,	SUF_L,	0xA4,	0,	0,	0,	CPU_386,	0,	0
 shldq,	shlrd_insn,	9,	SUF_Q,	0xA4,	0,	0,	ONLY_64,	CPU_386,	0,	0
 shldw,	shlrd_insn,	9,	SUF_W,	0xA4,	0,	0,	0,	CPU_386,	0,	0
+shll,	shift_insn,	16,	SUF_L,	0x04,	0,	0,	0,	CPU_386,	0,	0
+shlq,	shift_insn,	16,	SUF_Q,	0x04,	0,	0,	ONLY_64,	0,	0,	0
+shlw,	shift_insn,	16,	SUF_W,	0x04,	0,	0,	0,	0,	0,	0
+shlx,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x66,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
+shlxl,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0x66,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
+shlxq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0x66,	0x38,	0xF7,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 shr,	shift_insn,	16,	SUF_Z,	0x05,	0,	0,	0,	0,	0,	0
 shrb,	shift_insn,	16,	SUF_B,	0x05,	0,	0,	0,	0,	0,	0
-shrl,	shift_insn,	16,	SUF_L,	0x05,	0,	0,	0,	CPU_386,	0,	0
-shrq,	shift_insn,	16,	SUF_Q,	0x05,	0,	0,	ONLY_64,	0,	0,	0
-shrw,	shift_insn,	16,	SUF_W,	0x05,	0,	0,	0,	0,	0,	0
 shrd,	shlrd_insn,	9,	SUF_Z,	0xAC,	0,	0,	0,	CPU_386,	0,	0
 shrdl,	shlrd_insn,	9,	SUF_L,	0xAC,	0,	0,	0,	CPU_386,	0,	0
 shrdq,	shlrd_insn,	9,	SUF_Q,	0xAC,	0,	0,	ONLY_64,	CPU_386,	0,	0
 shrdw,	shlrd_insn,	9,	SUF_W,	0xAC,	0,	0,	0,	CPU_386,	0,	0
+shrl,	shift_insn,	16,	SUF_L,	0x05,	0,	0,	0,	CPU_386,	0,	0
+shrq,	shift_insn,	16,	SUF_Q,	0x05,	0,	0,	ONLY_64,	0,	0,	0
+shrw,	shift_insn,	16,	SUF_W,	0x05,	0,	0,	0,	0,	0,	0
+shrx,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
+shrxl,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0xF2,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
+shrxq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0xF2,	0x38,	0xF7,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 shufpd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0xC6,	0,	0,	CPU_SSE2,	0,	0
 shufps,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x00,	0xC6,	0,	0,	CPU_SSE,	0,	0
 sidt,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-sidtl,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-sidtq,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-sidtw,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+sidtl,	twobytemem_insn,	1,	SUF_L,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+sidtq,	twobytemem_insn,	1,	SUF_Q,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
+sidtw,	twobytemem_insn,	1,	SUF_W,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
 skinit,	skinit_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SVM,	0,	0
 sldt,	sldtmsw_insn,	6,	SUF_Z,	0x00,	0x00,	0,	0,	CPU_286,	0,	0
 sldtl,	sldtmsw_insn,	6,	SUF_L,	0x00,	0x00,	0,	0,	CPU_386,	0,	0
@@ -1236,12 +1279,12 @@
 sub,	arith_insn,	22,	SUF_Z,	0x28,	0x05,	0,	0,	0,	0,	0
 subb,	arith_insn,	22,	SUF_B,	0x28,	0x05,	0,	0,	0,	0,	0
 subl,	arith_insn,	22,	SUF_L,	0x28,	0x05,	0,	0,	CPU_386,	0,	0
-subq,	arith_insn,	22,	SUF_Q,	0x28,	0x05,	0,	ONLY_64,	0,	0,	0
-subw,	arith_insn,	22,	SUF_W,	0x28,	0x05,	0,	0,	0,	0,	0
 subpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x5C,	0,	0,	CPU_SSE2,	0,	0
 subps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x5C,	0,	0,	CPU_SSE,	0,	0
+subq,	arith_insn,	22,	SUF_Q,	0x28,	0x05,	0,	ONLY_64,	0,	0,	0
 subsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5C,	0,	0,	CPU_SSE2,	0,	0
 subss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5C,	0,	0,	CPU_SSE,	0,	0
+subw,	arith_insn,	22,	SUF_W,	0x28,	0x05,	0,	0,	0,	0,	0
 svdc,	svdc_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_486,	CPU_Cyrix,	CPU_SMM
 svldt,	cyrixsmm_insn,	1,	SUF_Z,	0x7A,	0,	0,	0,	CPU_486,	CPU_Cyrix,	CPU_SMM
 svts,	cyrixsmm_insn,	1,	SUF_Z,	0x7C,	0,	0,	0,	CPU_486,	CPU_Cyrix,	CPU_SMM
@@ -1250,13 +1293,17 @@
 sysenter,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x34,	0,	NOT_64,	CPU_686,	0,	0
 sysexit,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x35,	0,	NOT_64,	CPU_686,	CPU_Priv,	0
 sysret,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x07,	0,	0,	CPU_686,	CPU_AMD,	CPU_Priv
-sysretl,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x07,	0,	0,	CPU_686,	CPU_AMD,	CPU_Priv
-sysretq,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x07,	0,	0,	CPU_686,	CPU_AMD,	CPU_Priv
+sysretl,	twobyte_insn,	1,	SUF_L,	0x0F,	0x07,	0,	0,	CPU_686,	CPU_AMD,	CPU_Priv
+sysretq,	twobyte_insn,	1,	SUF_Q,	0x0F,	0x07,	0,	0,	CPU_686,	CPU_AMD,	CPU_Priv
 test,	test_insn,	20,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 testb,	test_insn,	20,	SUF_B,	0,	0,	0,	0,	0,	0,	0
 testl,	test_insn,	20,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
 testq,	test_insn,	20,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
 testw,	test_insn,	20,	SUF_W,	0,	0,	0,	0,	0,	0,	0
+tzcnt,	cnt_insn,	3,	SUF_Z,	0xBC,	0,	0,	0,	CPU_BMI1,	0,	0
+tzcntl,	cnt_insn,	3,	SUF_L,	0xBC,	0,	0,	0,	CPU_BMI1,	0,	0
+tzcntq,	cnt_insn,	3,	SUF_Q,	0xBC,	0,	0,	ONLY_64,	CPU_BMI1,	0,	0
+tzcntw,	cnt_insn,	3,	SUF_W,	0xBC,	0,	0,	0,	CPU_BMI1,	0,	0
 ucomisd,	xmm_xmm64_insn,	4,	SUF_Z,	0x66,	0x2E,	0,	0,	CPU_SSE2,	0,	0
 ucomiss,	xmm_xmm32_insn,	4,	SUF_Z,	0x00,	0x2E,	0,	0,	CPU_SSE,	0,	0
 ud1,	twobyte_insn,	1,	SUF_Z,	0x0F,	0xB9,	0,	0,	CPU_286,	CPU_Undoc,	0
@@ -1266,29 +1313,30 @@
 unpckhps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x15,	0,	0,	CPU_SSE,	0,	0
 unpcklpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x14,	0,	0,	CPU_SSE2,	0,	0
 unpcklps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x14,	0,	0,	CPU_SSE,	0,	0
-vaddpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vaddps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaddsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaddss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vaddsubpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vaddsubps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0xF2,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddsubpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddsubps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0xF2,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesdec,	aes_insn,	2,	SUF_Z,	0x38,	0xDE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesdeclast,	aes_insn,	2,	SUF_Z,	0x38,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesenc,	aes_insn,	2,	SUF_Z,	0x38,	0xDC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesenclast,	aes_insn,	2,	SUF_Z,	0x38,	0xDD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesimc,	aesimc_insn,	1,	SUF_Z,	0x38,	0xDB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaeskeygenassist,	aes_imm_insn,	1,	SUF_Z,	0x3A,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandnpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandnps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vblendpd,	sse4imm_256_insn,	3,	SUF_Z,	0x0D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vblendps,	sse4imm_256_insn,	3,	SUF_Z,	0x0C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandnpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandnps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vblendpd,	sse4imm_256_insn,	4,	SUF_Z,	0x0D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vblendps,	sse4imm_256_insn,	4,	SUF_Z,	0x0C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vblendvpd,	avx_sse4xmm0_insn,	2,	SUF_Z,	0x4B,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vblendvps,	avx_sse4xmm0_insn,	2,	SUF_Z,	0x4A,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vbroadcastf128,	vbroadcastf128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vbroadcastsd,	vbroadcastsd_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vbroadcastss,	vbroadcastss_insn,	2,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vbroadcastf128,	vbroadcastif128_insn,	1,	SUF_Z,	0x1A,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vbroadcasti128,	vbroadcastif128_insn,	1,	SUF_Z,	0x5A,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vbroadcastsd,	vbroadcastsd_insn,	2,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vbroadcastss,	vbroadcastss_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcmpeq_ospd,	ssecmp_128_insn,	3,	SUF_Z,	0x10,	0x66,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcmpeq_osps,	ssecmp_128_insn,	3,	SUF_Z,	0x10,	0x00,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcmpeq_ossd,	ssecmp_64_insn,	4,	SUF_Z,	0x10,	0xF2,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
@@ -1459,17 +1507,18 @@
 vcvttss2si,	cvt_rx_xmm32_insn,	4,	SUF_Z,	0xF3,	0x2C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcvttss2sil,	cvt_rx_xmm32_insn,	4,	SUF_L,	0xF3,	0x2C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcvttss2siq,	cvt_rx_xmm32_insn,	4,	SUF_Q,	0xF3,	0x2C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vdivpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vdivps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vdivpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vdivps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vdivsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vdivss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vdppd,	sse4imm_insn,	2,	SUF_Z,	0x41,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vdpps,	sse4imm_256_insn,	3,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vdpps,	sse4imm_256_insn,	4,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 verr,	prot286_insn,	1,	SUF_Z,	0x04,	0x00,	0,	0,	CPU_286,	CPU_Prot,	0
 verrw,	prot286_insn,	1,	SUF_W,	0x04,	0x00,	0,	0,	CPU_286,	CPU_Prot,	0
 verw,	prot286_insn,	1,	SUF_Z,	0x05,	0x00,	0,	0,	CPU_286,	CPU_Prot,	0
 verww,	prot286_insn,	1,	SUF_W,	0x05,	0x00,	0,	0,	CPU_286,	CPU_Prot,	0
-vextractf128,	vextractf128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vextractf128,	vextractif128_insn,	1,	SUF_Z,	0x19,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vextracti128,	vextractif128_insn,	1,	SUF_Z,	0x39,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vextractps,	extractps_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vfmadd132pd,	vfma_pd_insn,	2,	SUF_Z,	0x98,	0,	0,	ONLY_AVX,	CPU_FMA,	0,	0
 vfmadd132ps,	vfma_ps_insn,	2,	SUF_Z,	0x98,	0,	0,	ONLY_AVX,	CPU_FMA,	0,	0
@@ -1555,25 +1604,30 @@
 vfrczps,	vfrc_pdps_insn,	2,	SUF_Z,	0x00,	0,	0,	0,	CPU_XOP,	0,	0
 vfrczsd,	vfrczsd_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
 vfrczss,	vfrczss_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
-vhaddpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vhaddps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0xF2,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vhsubpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vhsubps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0xF2,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vinsertf128,	vinsertf128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vgatherdpd,	gather_64x_64x_insn,	2,	SUF_Z,	0x92,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vgatherdps,	gather_32x_32y_insn,	2,	SUF_Z,	0x92,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vgatherqpd,	gather_64x_64y_insn,	2,	SUF_Z,	0x93,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vgatherqps,	gather_32x_32y_128_insn,	2,	SUF_Z,	0x93,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vhaddpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vhaddps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0xF2,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vhsubpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vhsubps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0xF2,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vinsertf128,	vinsertif128_insn,	1,	SUF_Z,	0x18,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vinserti128,	vinsertif128_insn,	1,	SUF_Z,	0x38,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vinsertps,	insertps_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vlddqu,	lddqu_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vldmxcsr,	ldstmxcsr_insn,	1,	SUF_Z,	0x02,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaskmovdqu,	maskmovdqu_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaskmovpd,	vmaskmov_insn,	4,	SUF_Z,	0x2D,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaskmovps,	vmaskmov_insn,	4,	SUF_Z,	0x2C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmaxpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmaxps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmaxpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmaxps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaxsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaxss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmcall,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC1,	0,	CPU_P4,	0,	0
 vmclear,	vmxthreebytemem_insn,	1,	SUF_Z,	0x66,	0,	0,	0,	CPU_P4,	0,	0
-vminpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vminps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vminpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vminps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vminsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vminss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmlaunch,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC2,	0,	CPU_P4,	0,	0
@@ -1598,7 +1652,7 @@
 vmovmskpsl,	movmsk_insn,	4,	SUF_L,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovmskpsq,	movmsk_insn,	4,	SUF_Q,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovntdq,	movnt_insn,	2,	SUF_Z,	0x66,	0xE7,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmovntdqa,	movntdqa_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmovntdqa,	movntdqa_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovntpd,	movnt_insn,	2,	SUF_Z,	0x66,	0x2B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovntps,	movnt_insn,	2,	SUF_Z,	0x00,	0x2B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovq,	vmovq_insn,	5,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
@@ -1608,7 +1662,7 @@
 vmovss,	movss_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovupd,	movau_insn,	6,	SUF_Z,	0x66,	0x10,	0x01,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovups,	movau_insn,	6,	SUF_Z,	0x00,	0x10,	0x01,	ONLY_AVX,	CPU_AVX,	0,	0
-vmpsadbw,	sse4imm_insn,	2,	SUF_Z,	0x42,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmpsadbw,	sse4imm_256avx2_insn,	4,	SUF_Z,	0x42,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmptrld,	vmxtwobytemem_insn,	1,	SUF_Z,	0x06,	0,	0,	0,	CPU_P4,	0,	0
 vmptrst,	vmxtwobytemem_insn,	1,	SUF_Z,	0x07,	0,	0,	0,	CPU_P4,	0,	0
 vmread,	vmxmemrd_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
@@ -1617,8 +1671,8 @@
 vmresume,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC3,	0,	CPU_P4,	0,	0
 vmrun,	svm_rax_insn,	2,	SUF_Z,	0xD8,	0,	0,	0,	CPU_SVM,	0,	0
 vmsave,	svm_rax_insn,	2,	SUF_Z,	0xDB,	0,	0,	0,	CPU_SVM,	0,	0
-vmulpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmulps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmulpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmulps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmulsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmulss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmwrite,	vmxmemwr_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
@@ -1626,46 +1680,51 @@
 vmwriteq,	vmxmemwr_insn,	2,	SUF_Q,	0,	0,	0,	ONLY_64,	CPU_P4,	0,	0
 vmxoff,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC4,	0,	CPU_P4,	0,	0
 vmxon,	vmxthreebytemem_insn,	1,	SUF_Z,	0xF3,	0,	0,	0,	CPU_P4,	0,	0
-vorpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vorps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpabsb,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x1C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpabsd,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x1E,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpabsw,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x1D,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpackssdw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpacksswb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x63,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpackusdw,	ssse3_insn,	3,	SUF_Z,	0x2B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpackuswb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x67,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddsb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xED,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddusb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddusw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpalignr,	sse4imm_insn,	2,	SUF_Z,	0x0F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpand,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpandn,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpavgb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpavgw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE3,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpblendvb,	avx_sse4xmm0_128_insn,	1,	SUF_Z,	0x4C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpblendw,	sse4imm_insn,	2,	SUF_Z,	0x0E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vorpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vorps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpabsb,	avx2_ssse3_2op_insn,	2,	SUF_Z,	0x1C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpabsd,	avx2_ssse3_2op_insn,	2,	SUF_Z,	0x1E,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpabsw,	avx2_ssse3_2op_insn,	2,	SUF_Z,	0x1D,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpackssdw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpacksswb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x63,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpackusdw,	ssse3_insn,	5,	SUF_Z,	0x2B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpackuswb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x67,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddsb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xED,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddusb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddusw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpalignr,	sse4imm_256avx2_insn,	4,	SUF_Z,	0x0F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpand,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpandn,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpavgb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpavgw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE3,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpblendd,	vex_66_0F3A_imm8_avx2_insn,	2,	SUF_Z,	0x02,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpblendvb,	avx2_sse4xmm0_insn,	2,	SUF_Z,	0x4C,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpblendw,	sse4imm_256avx2_insn,	4,	SUF_Z,	0x0E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpbroadcastb,	vpbroadcastb_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpbroadcastd,	vpbroadcastd_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpbroadcastq,	vpbroadcastq_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpbroadcastw,	vpbroadcastw_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vpclmulhqhqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x11,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmulhqlqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x01,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmullqhqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x10,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmullqlqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmulqdq,	pclmulqdq_insn,	2,	SUF_Z,	0x3A,	0x44,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmov,	vpcmov_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
-vpcmpeqb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x74,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpeqd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x76,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpeqq,	ssse3_insn,	3,	SUF_Z,	0x29,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpeqw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x75,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x74,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x76,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqq,	ssse3_insn,	5,	SUF_Z,	0x29,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x75,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpestri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x61,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpestrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x60,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x64,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x66,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtq,	ssse3_insn,	3,	SUF_Z,	0x37,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x65,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x64,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x66,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtq,	ssse3_insn,	5,	SUF_Z,	0x37,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x65,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpistri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x63,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpistrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x62,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcomb,	vpcom_imm_insn,	1,	SUF_Z,	0xCC,	0,	0,	0,	CPU_XOP,	0,	0
@@ -1749,35 +1808,44 @@
 vpcomuw,	vpcom_imm_insn,	1,	SUF_Z,	0xED,	0,	0,	0,	CPU_XOP,	0,	0
 vpcomw,	vpcom_imm_insn,	1,	SUF_Z,	0xCD,	0,	0,	0,	CPU_XOP,	0,	0
 vperm2f128,	vperm2f128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vperm2i128,	vperm2i128_avx2_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpermd,	vperm_var_avx2_insn,	1,	SUF_Z,	0x36,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vpermilpd,	vpermil_insn,	4,	SUF_Z,	0x05,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpermilps,	vpermil_insn,	4,	SUF_Z,	0x04,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpermpd,	vperm_imm_avx2_insn,	1,	SUF_Z,	0x01,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpermps,	vperm_var_avx2_insn,	1,	SUF_Z,	0x16,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpermq,	vperm_imm_avx2_insn,	1,	SUF_Z,	0x00,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vpextrb,	pextrb_insn,	3,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrd,	pextrd_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrq,	pextrq_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrw,	pextrw_insn,	7,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrwl,	pextrw_insn,	7,	SUF_L,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrwq,	pextrw_insn,	7,	SUF_Q,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpgatherdd,	gather_32x_32y_insn,	2,	SUF_Z,	0x90,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpgatherdq,	gather_64x_64x_insn,	2,	SUF_Z,	0x90,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpgatherqd,	gather_32x_32y_128_insn,	2,	SUF_Z,	0x91,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpgatherqq,	gather_64x_64y_insn,	2,	SUF_Z,	0x91,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vphaddbd,	vphaddsub_insn,	1,	SUF_Z,	0xC2,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddbq,	vphaddsub_insn,	1,	SUF_Z,	0xC3,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddbw,	vphaddsub_insn,	1,	SUF_Z,	0xC1,	0,	0,	0,	CPU_XOP,	0,	0
-vphaddd,	ssse3_insn,	3,	SUF_Z,	0x02,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphaddd,	ssse3_insn,	5,	SUF_Z,	0x02,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphadddq,	vphaddsub_insn,	1,	SUF_Z,	0xCB,	0,	0,	0,	CPU_XOP,	0,	0
-vphaddsw,	ssse3_insn,	3,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphaddsw,	ssse3_insn,	5,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphaddubd,	vphaddsub_insn,	1,	SUF_Z,	0xD2,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddubq,	vphaddsub_insn,	1,	SUF_Z,	0xD3,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddubw,	vphaddsub_insn,	1,	SUF_Z,	0xD1,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddudq,	vphaddsub_insn,	1,	SUF_Z,	0xD8,	0,	0,	0,	CPU_XOP,	0,	0
 vphadduwd,	vphaddsub_insn,	1,	SUF_Z,	0xD6,	0,	0,	0,	CPU_XOP,	0,	0
 vphadduwq,	vphaddsub_insn,	1,	SUF_Z,	0xD7,	0,	0,	0,	CPU_XOP,	0,	0
-vphaddw,	ssse3_insn,	3,	SUF_Z,	0x01,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphaddw,	ssse3_insn,	5,	SUF_Z,	0x01,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphaddwd,	vphaddsub_insn,	1,	SUF_Z,	0xC6,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddwq,	vphaddsub_insn,	1,	SUF_Z,	0xC7,	0,	0,	0,	CPU_XOP,	0,	0
 vphminposuw,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x41,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphsubbw,	vphaddsub_insn,	1,	SUF_Z,	0xE1,	0,	0,	0,	CPU_XOP,	0,	0
-vphsubd,	ssse3_insn,	3,	SUF_Z,	0x06,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphsubd,	ssse3_insn,	5,	SUF_Z,	0x06,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphsubdq,	vphaddsub_insn,	1,	SUF_Z,	0xE3,	0,	0,	0,	CPU_XOP,	0,	0
-vphsubsw,	ssse3_insn,	3,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vphsubw,	ssse3_insn,	3,	SUF_Z,	0x05,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphsubsw,	ssse3_insn,	5,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphsubw,	ssse3_insn,	5,	SUF_Z,	0x05,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphsubwd,	vphaddsub_insn,	1,	SUF_Z,	0xE2,	0,	0,	0,	CPU_XOP,	0,	0
 vpinsrb,	pinsrb_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpinsrd,	pinsrd_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
@@ -1797,49 +1865,51 @@
 vpmacsww,	vpma_insn,	1,	SUF_Z,	0x95,	0,	0,	0,	CPU_XOP,	0,	0
 vpmadcsswd,	vpma_insn,	1,	SUF_Z,	0xA6,	0,	0,	0,	CPU_XOP,	0,	0
 vpmadcswd,	vpma_insn,	1,	SUF_Z,	0xB6,	0,	0,	0,	CPU_XOP,	0,	0
-vpmaddubsw,	ssse3_insn,	3,	SUF_Z,	0x04,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaddwd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxsb,	ssse3_insn,	3,	SUF_Z,	0x3C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxsd,	ssse3_insn,	3,	SUF_Z,	0x3D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxub,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxud,	ssse3_insn,	3,	SUF_Z,	0x3F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxuw,	ssse3_insn,	3,	SUF_Z,	0x3E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminsb,	ssse3_insn,	3,	SUF_Z,	0x38,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminsd,	ssse3_insn,	3,	SUF_Z,	0x39,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminub,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminud,	ssse3_insn,	3,	SUF_Z,	0x3B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminuw,	ssse3_insn,	3,	SUF_Z,	0x3A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovmskb,	pmovmskb_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovmskbl,	pmovmskb_insn,	4,	SUF_L,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovmskbq,	pmovmskb_insn,	4,	SUF_Q,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxbd,	sse4m32_insn,	2,	SUF_Z,	0x21,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxbq,	sse4m16_insn,	2,	SUF_Z,	0x22,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxbw,	sse4m64_insn,	2,	SUF_Z,	0x20,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxdq,	sse4m64_insn,	2,	SUF_Z,	0x25,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxwd,	sse4m64_insn,	2,	SUF_Z,	0x23,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxwq,	sse4m32_insn,	2,	SUF_Z,	0x24,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxbd,	sse4m32_insn,	2,	SUF_Z,	0x31,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxbq,	sse4m16_insn,	2,	SUF_Z,	0x32,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxbw,	sse4m64_insn,	2,	SUF_Z,	0x30,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxdq,	sse4m64_insn,	2,	SUF_Z,	0x35,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxwd,	sse4m64_insn,	2,	SUF_Z,	0x33,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxwq,	sse4m32_insn,	2,	SUF_Z,	0x34,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmuldq,	ssse3_insn,	3,	SUF_Z,	0x28,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulhrsw,	ssse3_insn,	3,	SUF_Z,	0x0B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulhuw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulhw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulld,	ssse3_insn,	3,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmullw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmuludq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpor,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaddubsw,	ssse3_insn,	5,	SUF_Z,	0x04,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaddwd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaskmovd,	vmaskmov_insn,	4,	SUF_Z,	0x8C,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpmaskmovq,	vmaskmov_vexw1_avx2_insn,	4,	SUF_Z,	0x8C,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpmaxsb,	ssse3_insn,	5,	SUF_Z,	0x3C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxsd,	ssse3_insn,	5,	SUF_Z,	0x3D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxub,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxud,	ssse3_insn,	5,	SUF_Z,	0x3F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxuw,	ssse3_insn,	5,	SUF_Z,	0x3E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminsb,	ssse3_insn,	5,	SUF_Z,	0x38,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminsd,	ssse3_insn,	5,	SUF_Z,	0x39,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminub,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminud,	ssse3_insn,	5,	SUF_Z,	0x3B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminuw,	ssse3_insn,	5,	SUF_Z,	0x3A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovmskb,	pmovmskb_insn,	6,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovmskbl,	pmovmskb_insn,	6,	SUF_L,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovmskbq,	pmovmskb_insn,	6,	SUF_Q,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxbd,	sse4m32_insn,	4,	SUF_Z,	0x21,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxbq,	sse4m16_insn,	4,	SUF_Z,	0x22,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxbw,	sse4m64_insn,	4,	SUF_Z,	0x20,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxdq,	sse4m64_insn,	4,	SUF_Z,	0x25,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxwd,	sse4m64_insn,	4,	SUF_Z,	0x23,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxwq,	sse4m32_insn,	4,	SUF_Z,	0x24,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxbd,	sse4m32_insn,	4,	SUF_Z,	0x31,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxbq,	sse4m16_insn,	4,	SUF_Z,	0x32,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxbw,	sse4m64_insn,	4,	SUF_Z,	0x30,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxdq,	sse4m64_insn,	4,	SUF_Z,	0x35,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxwd,	sse4m64_insn,	4,	SUF_Z,	0x33,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxwq,	sse4m32_insn,	4,	SUF_Z,	0x34,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmuldq,	ssse3_insn,	5,	SUF_Z,	0x28,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulhrsw,	ssse3_insn,	5,	SUF_Z,	0x0B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulhuw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulhw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulld,	ssse3_insn,	5,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmullw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmuludq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpor,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpperm,	vpperm_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
 vprotb,	vprot_insn,	3,	SUF_Z,	0x00,	0,	0,	0,	CPU_XOP,	0,	0
 vprotd,	vprot_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_XOP,	0,	0
 vprotq,	vprot_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_XOP,	0,	0
 vprotw,	vprot_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_XOP,	0,	0
-vpsadbw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF6,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsadbw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF6,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpshab,	amd_vpshift_insn,	2,	SUF_Z,	0x98,	0,	0,	0,	CPU_XOP,	0,	0
 vpshad,	amd_vpshift_insn,	2,	SUF_Z,	0x9A,	0,	0,	0,	CPU_XOP,	0,	0
 vpshaq,	amd_vpshift_insn,	2,	SUF_Z,	0x9B,	0,	0,	0,	CPU_XOP,	0,	0
@@ -1848,41 +1918,46 @@
 vpshld,	amd_vpshift_insn,	2,	SUF_Z,	0x96,	0,	0,	0,	CPU_XOP,	0,	0
 vpshlq,	amd_vpshift_insn,	2,	SUF_Z,	0x97,	0,	0,	0,	CPU_XOP,	0,	0
 vpshlw,	amd_vpshift_insn,	2,	SUF_Z,	0x95,	0,	0,	0,	CPU_XOP,	0,	0
-vpshufb,	ssse3_insn,	3,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpshufd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpshufhw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF3,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpshuflw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF2,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsignb,	ssse3_insn,	3,	SUF_Z,	0x08,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsignd,	ssse3_insn,	3,	SUF_Z,	0x0A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsignw,	ssse3_insn,	3,	SUF_Z,	0x09,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpslld,	vpshift_insn,	4,	SUF_Z,	0xF2,	0x72,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
-vpslldq,	pslrldq_insn,	2,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsllq,	vpshift_insn,	4,	SUF_Z,	0xF3,	0x73,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsllw,	vpshift_insn,	4,	SUF_Z,	0xF1,	0x71,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrad,	vpshift_insn,	4,	SUF_Z,	0xE2,	0x72,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsraw,	vpshift_insn,	4,	SUF_Z,	0xE1,	0x71,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrld,	vpshift_insn,	4,	SUF_Z,	0xD2,	0x72,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrldq,	pslrldq_insn,	2,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrlq,	vpshift_insn,	4,	SUF_Z,	0xD3,	0x73,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrlw,	vpshift_insn,	4,	SUF_Z,	0xD1,	0x71,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubsb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubusb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubusw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshufb,	ssse3_insn,	5,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshufd,	xmm_xmm128_imm_256avx2_insn,	2,	SUF_Z,	0x66,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshufhw,	xmm_xmm128_imm_256avx2_insn,	2,	SUF_Z,	0xF3,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshuflw,	xmm_xmm128_imm_256avx2_insn,	2,	SUF_Z,	0xF2,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsignb,	ssse3_insn,	5,	SUF_Z,	0x08,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsignd,	ssse3_insn,	5,	SUF_Z,	0x0A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsignw,	ssse3_insn,	5,	SUF_Z,	0x09,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpslld,	vpshift_insn,	8,	SUF_Z,	0xF2,	0x72,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
+vpslldq,	pslrldq_insn,	4,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsllq,	vpshift_insn,	8,	SUF_Z,	0xF3,	0x73,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsllvd,	vpshiftv_vexw0_avx2_insn,	2,	SUF_Z,	0x47,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsllvq,	vpshiftv_vexw1_avx2_insn,	2,	SUF_Z,	0x47,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsllw,	vpshift_insn,	8,	SUF_Z,	0xF1,	0x71,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrad,	vpshift_insn,	8,	SUF_Z,	0xE2,	0x72,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsravd,	vpshiftv_vexw0_avx2_insn,	2,	SUF_Z,	0x46,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsraw,	vpshift_insn,	8,	SUF_Z,	0xE1,	0x71,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrld,	vpshift_insn,	8,	SUF_Z,	0xD2,	0x72,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrldq,	pslrldq_insn,	4,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrlq,	vpshift_insn,	8,	SUF_Z,	0xD3,	0x73,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrlvd,	vpshiftv_vexw0_avx2_insn,	2,	SUF_Z,	0x45,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsrlvq,	vpshiftv_vexw1_avx2_insn,	2,	SUF_Z,	0x45,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsrlw,	vpshift_insn,	8,	SUF_Z,	0xD1,	0x71,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubsb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubusb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubusw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vptest,	sse4_insn,	2,	SUF_Z,	0x17,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhbw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x68,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6A,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhqdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhwd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x69,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpcklbw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x60,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckldq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x62,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpcklqdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpcklwd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x61,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpxor,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhbw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x68,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhdq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6A,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhqdq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhwd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x69,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpcklbw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x60,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckldq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x62,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpcklqdq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpcklwd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x61,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpxor,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vrcpps,	avx_xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x53,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vrcpss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x53,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vroundpd,	avx_sse4imm_insn,	3,	SUF_Z,	0x09,	0,	0,	ONLY_AVX,	CPU_SSE41,	0,	0
@@ -1898,20 +1973,20 @@
 vsqrtsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x51,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vsqrtss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x51,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vstmxcsr,	ldstmxcsr_insn,	1,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vsubpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vsubps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vsubpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vsubps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vsubsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vsubss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vtestpd,	sse4_insn,	2,	SUF_Z,	0x0F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vtestps,	sse4_insn,	2,	SUF_Z,	0x0E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vucomisd,	avx_xmm_xmm64_insn,	2,	SUF_Z,	0x66,	0x2E,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vucomiss,	avx_xmm_xmm32_insn,	2,	SUF_Z,	0x00,	0x2E,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpckhpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpckhps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpcklpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpcklps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vxorpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vxorps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpckhpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpckhps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpcklpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpcklps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vxorpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vxorps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vzeroall,	vzero_insn,	1,	SUF_Z,	0xC4,	0,	0,	0,	CPU_AVX,	0,	0
 vzeroupper,	vzero_insn,	1,	SUF_Z,	0xC0,	0,	0,	0,	CPU_AVX,	0,	0
 wait,	onebyte_insn,	1,	SUF_Z,	0x9B,	0,	0,	0,	0,	0,	0
@@ -1942,10 +2017,10 @@
 xor,	arith_insn,	22,	SUF_Z,	0x30,	0x06,	0,	0,	0,	0,	0
 xorb,	arith_insn,	22,	SUF_B,	0x30,	0x06,	0,	0,	0,	0,	0
 xorl,	arith_insn,	22,	SUF_L,	0x30,	0x06,	0,	0,	CPU_386,	0,	0
-xorq,	arith_insn,	22,	SUF_Q,	0x30,	0x06,	0,	ONLY_64,	0,	0,	0
-xorw,	arith_insn,	22,	SUF_W,	0x30,	0x06,	0,	0,	0,	0,	0
 xorpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x57,	0,	0,	CPU_SSE2,	0,	0
 xorps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x57,	0,	0,	CPU_SSE,	0,	0
+xorq,	arith_insn,	22,	SUF_Q,	0x30,	0x06,	0,	ONLY_64,	0,	0,	0
+xorw,	arith_insn,	22,	SUF_W,	0x30,	0x06,	0,	0,	0,	0,	0
 xrstor,	twobytemem_insn,	1,	SUF_Z,	0x05,	0x0F,	0xAE,	0,	CPU_386,	CPU_XSAVE,	0
 xsave,	twobytemem_insn,	1,	SUF_Z,	0x04,	0x0F,	0xAE,	0,	CPU_386,	CPU_XSAVE,	0
 xsaveopt,	twobytemem_insn,	1,	SUF_Z,	0x06,	0x0F,	0xAE,	0,	CPU_XSAVEOPT,	0,	0

yasm-1.1.0.tar.gz/x86insn_nasm.gperf -> yasm-1.2.0.tar.gz/x86insn_nasm.gperf Changed

@@ -1,4 +1,4 @@
-/* Generated by gen_x86_insn.py r2346, do not edit */
+/* Generated by gen_x86_insn.py rHEAD, do not edit */
 %ignore-case
 %language=ANSI-C
 %compare-strncmp
@@ -31,15 +31,20 @@
 aesimc,	aesimc_insn,	1,	SUF_Z,	0x38,	0xDB,	0,	0,	CPU_AES,	0,	0
 aeskeygenassist,	aes_imm_insn,	1,	SUF_Z,	0x3A,	0xDF,	0,	0,	CPU_AES,	0,	0
 and,	arith_insn,	22,	SUF_Z,	0x20,	0x04,	0,	0,	0,	0,	0
+andn,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF2,	ONLY_AVX,	CPU_BMI1,	0,	0
 andnpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x55,	0,	0,	CPU_SSE2,	0,	0
 andnps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x55,	0,	0,	CPU_SSE,	0,	0
 andpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x54,	0,	0,	CPU_SSE2,	0,	0
 andps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x54,	0,	0,	CPU_SSE,	0,	0
 arpl,	arpl_insn,	1,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_286,	CPU_Prot,	0
+bextr,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI1,	0,	0
 blendpd,	sse4imm_insn,	2,	SUF_Z,	0x0D,	0,	0,	0,	CPU_SSE41,	0,	0
 blendps,	sse4imm_insn,	2,	SUF_Z,	0x0C,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvpd,	sse4xmm0_insn,	2,	SUF_Z,	0x15,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvps,	sse4xmm0_insn,	2,	SUF_Z,	0x14,	0,	0,	0,	CPU_SSE41,	0,	0
+blsi,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x03,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsmsk,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x02,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsr,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x01,	ONLY_AVX,	CPU_BMI1,	0,	0
 bound,	bound_insn,	2,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_186,	0,	0
 bsf,	bsfr_insn,	3,	SUF_Z,	0xBC,	0,	0,	0,	CPU_386,	0,	0
 bsr,	bsfr_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_386,	0,	0
@@ -48,6 +53,7 @@
 btc,	bittest_insn,	6,	SUF_Z,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
 btr,	bittest_insn,	6,	SUF_Z,	0xB3,	0x06,	0,	0,	CPU_386,	0,	0
 bts,	bittest_insn,	6,	SUF_Z,	0xAB,	0x05,	0,	0,	CPU_386,	0,	0
+bzhi,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
 call,	call_insn,	30,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 cbw,	onebyte_insn,	1,	SUF_Z,	0x98,	0x10,	0,	0,	0,	0,	0
 cdq,	onebyte_insn,	1,	SUF_Z,	0x99,	0x20,	0,	0,	CPU_386,	0,	0
@@ -300,6 +306,7 @@
 invept,	eptvpid_insn,	2,	SUF_Z,	0x00,	0,	0,	0,	CPU_386,	CPU_EPTVPID,	0
 invlpg,	twobytemem_insn,	1,	SUF_Z,	0x07,	0x0F,	0x01,	0,	CPU_486,	CPU_Priv,	0
 invlpga,	invlpga_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SVM,	0,	0
+invpcid,	invpcid_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_INVPCID,	CPU_Priv
 invvpid,	eptvpid_insn,	2,	SUF_Z,	0x01,	0,	0,	0,	CPU_386,	CPU_EPTVPID,	0
 iret,	onebyte_insn,	1,	SUF_Z,	0xCF,	0,	0,	0,	0,	0,	0
 iretd,	onebyte_insn,	1,	SUF_Z,	0xCF,	0x20,	0,	0,	CPU_386,	0,	0
@@ -340,7 +347,7 @@
 js,	jcc_insn,	9,	SUF_Z,	0x08,	0,	0,	0,	0,	0,	0
 jz,	jcc_insn,	9,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 lahf,	onebyte_insn,	1,	SUF_Z,	0x9F,	0,	0,	0,	0,	0,	0
-lar,	bsfr_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lar,	larlsl_insn,	6,	SUF_Z,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
 lddqu,	lddqu_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SSE3,	0,	0
 ldmxcsr,	ldstmxcsr_insn,	1,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSE,	0,	0
 lds,	ldes_insn,	2,	SUF_Z,	0xC5,	0,	0,	NOT_64,	0,	0,	0
@@ -348,9 +355,9 @@
 leave,	onebyte_insn,	1,	SUF_Z,	0xC9,	0x00,	0x40,	0,	CPU_186,	0,	0
 les,	ldes_insn,	2,	SUF_Z,	0xC4,	0,	0,	NOT_64,	0,	0,	0
 lfence,	threebyte_insn,	1,	SUF_Z,	0x0F,	0xAE,	0xE8,	0,	CPU_P3,	0,	0
-lfs,	lfgss_insn,	2,	SUF_Z,	0xB4,	0,	0,	0,	CPU_386,	0,	0
+lfs,	lfgss_insn,	3,	SUF_Z,	0xB4,	0,	0,	0,	CPU_386,	0,	0
 lgdt,	twobytemem_insn,	1,	SUF_Z,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lgs,	lfgss_insn,	2,	SUF_Z,	0xB5,	0,	0,	0,	CPU_386,	0,	0
+lgs,	lfgss_insn,	3,	SUF_Z,	0xB5,	0,	0,	0,	CPU_386,	0,	0
 lidt,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
 lldt,	prot286_insn,	1,	SUF_Z,	0x02,	0x00,	0,	0,	CPU_286,	CPU_Priv,	CPU_Prot
 lmsw,	prot286_insn,	1,	SUF_Z,	0x06,	0x01,	0,	0,	CPU_286,	CPU_Priv,	0
@@ -366,10 +373,10 @@
 loopne,	loop_insn,	8,	SUF_Z,	0x00,	0,	0,	0,	0,	0,	0
 loopnz,	loop_insn,	8,	SUF_Z,	0x00,	0,	0,	0,	0,	0,	0
 loopz,	loop_insn,	8,	SUF_Z,	0x01,	0,	0,	0,	0,	0,	0
-lsl,	bsfr_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-lss,	lfgss_insn,	2,	SUF_Z,	0xB2,	0,	0,	0,	CPU_386,	0,	0
+lsl,	larlsl_insn,	6,	SUF_Z,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lss,	lfgss_insn,	3,	SUF_Z,	0xB2,	0,	0,	0,	CPU_386,	0,	0
 ltr,	prot286_insn,	1,	SUF_Z,	0x03,	0x00,	0,	0,	CPU_286,	CPU_Priv,	CPU_Prot
-lzcnt,	cnt_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_686,	CPU_AMD,	0
+lzcnt,	cnt_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_LZCNT,	0,	0
 maskmovdqu,	maskmovdqu_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE2,	0,	0
 maskmovq,	maskmovq_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 maxpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x5F,	0,	0,	CPU_SSE2,	0,	0
@@ -401,7 +408,7 @@
 movmskpd,	movmsk_insn,	4,	SUF_Z,	0x66,	0,	0,	0,	CPU_SSE2,	0,	0
 movmskps,	movmsk_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_SSE,	0
 movntdq,	movnt_insn,	2,	SUF_Z,	0x66,	0xE7,	0,	0,	CPU_SSE2,	0,	0
-movntdqa,	movntdqa_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
+movntdqa,	movntdqa_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 movnti,	movnti_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
 movntpd,	movnt_insn,	2,	SUF_Z,	0x66,	0x2B,	0,	0,	CPU_SSE2,	0,	0
 movntps,	movnt_insn,	2,	SUF_Z,	0x00,	0x2B,	0,	0,	CPU_SSE,	0,	0
@@ -428,6 +435,7 @@
 mulps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x59,	0,	0,	CPU_SSE,	0,	0
 mulsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x59,	0,	0,	CPU_SSE2,	0,	0
 mulss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x59,	0,	0,	CPU_SSE,	0,	0
+mulx,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF6,	ONLY_AVX,	CPU_BMI2,	0,	0
 mwait,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC9,	0,	CPU_SSE3,	0,	0
 neg,	f6_insn,	4,	SUF_Z,	0x03,	0,	0,	0,	0,	0,	0
 nop,	onebyte_insn,	1,	SUF_Z,	0x90,	0,	0,	0,	0,	0,	0
@@ -442,9 +450,9 @@
 outsb,	onebyte_insn,	1,	SUF_Z,	0x6E,	0x00,	0,	0,	0,	0,	0
 outsd,	onebyte_insn,	1,	SUF_Z,	0x6F,	0x20,	0,	0,	CPU_386,	0,	0
 outsw,	onebyte_insn,	1,	SUF_Z,	0x6F,	0x10,	0,	0,	0,	0,	0
-pabsb,	ssse3_insn,	3,	SUF_Z,	0x1C,	0,	0,	0,	CPU_SSSE3,	0,	0
-pabsd,	ssse3_insn,	3,	SUF_Z,	0x1E,	0,	0,	0,	CPU_SSSE3,	0,	0
-pabsw,	ssse3_insn,	3,	SUF_Z,	0x1D,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsb,	ssse3_insn,	5,	SUF_Z,	0x1C,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsd,	ssse3_insn,	5,	SUF_Z,	0x1E,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsw,	ssse3_insn,	5,	SUF_Z,	0x1D,	0,	0,	0,	CPU_SSSE3,	0,	0
 packssdw,	mmxsse2_insn,	2,	SUF_Z,	0x6B,	0,	0,	0,	CPU_MMX,	0,	0
 packsswb,	mmxsse2_insn,	2,	SUF_Z,	0x63,	0,	0,	0,	CPU_MMX,	0,	0
 packusdw,	sse4_insn,	2,	SUF_Z,	0x2B,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -485,7 +493,9 @@
 pcmpgtw,	mmxsse2_insn,	2,	SUF_Z,	0x65,	0,	0,	0,	CPU_MMX,	0,	0
 pcmpistri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x63,	0,	0,	0,	CPU_SSE42,	0,	0
 pcmpistrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x62,	0,	0,	0,	CPU_SSE42,	0,	0
+pdep,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
 pdistib,	cyrixmmx_insn,	1,	SUF_Z,	0x54,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
+pext,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF3,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
 pextrb,	pextrb_insn,	3,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 pextrd,	pextrd_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_SSE41,	0
 pextrq,	pextrq_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_64,	CPU_SSE41,	0,	0
@@ -509,13 +519,13 @@
 pfrsqrt,	now3d_insn,	1,	SUF_Z,	0x97,	0,	0,	0,	CPU_3DNow,	0,	0
 pfsub,	now3d_insn,	1,	SUF_Z,	0x9A,	0,	0,	0,	CPU_3DNow,	0,	0
 pfsubr,	now3d_insn,	1,	SUF_Z,	0xAA,	0,	0,	0,	CPU_3DNow,	0,	0
-phaddd,	ssse3_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSSE3,	0,	0
-phaddsw,	ssse3_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSSE3,	0,	0
-phaddw,	ssse3_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddd,	ssse3_insn,	5,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddsw,	ssse3_insn,	5,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddw,	ssse3_insn,	5,	SUF_Z,	0x01,	0,	0,	0,	CPU_SSSE3,	0,	0
 phminposuw,	sse4_insn,	2,	SUF_Z,	0x41,	0,	0,	0,	CPU_SSE41,	0,	0
-phsubd,	ssse3_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_SSSE3,	0,	0
-phsubsw,	ssse3_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSSE3,	0,	0
-phsubw,	ssse3_insn,	3,	SUF_Z,	0x05,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubd,	ssse3_insn,	5,	SUF_Z,	0x06,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubsw,	ssse3_insn,	5,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubw,	ssse3_insn,	5,	SUF_Z,	0x05,	0,	0,	0,	CPU_SSSE3,	0,	0
 pi2fd,	now3d_insn,	1,	SUF_Z,	0x0D,	0,	0,	0,	CPU_3DNow,	0,	0
 pi2fw,	now3d_insn,	1,	SUF_Z,	0x0C,	0,	0,	0,	CPU_3DNow,	CPU_Athlon,	0
 pinsrb,	pinsrb_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -523,7 +533,7 @@
 pinsrq,	pinsrq_insn,	2,	SUF_Z,	0,	0,	0,	ONLY_64,	CPU_SSE41,	0,	0
 pinsrw,	pinsrw_insn,	9,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 pmachriw,	pmachriw_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pmaddubsw,	ssse3_insn,	3,	SUF_Z,	0x04,	0,	0,	0,	CPU_SSSE3,	0,	0
+pmaddubsw,	ssse3_insn,	5,	SUF_Z,	0x04,	0,	0,	0,	CPU_SSSE3,	0,	0
 pmaddwd,	mmxsse2_insn,	2,	SUF_Z,	0xF5,	0,	0,	0,	CPU_MMX,	0,	0
 pmagw,	cyrixmmx_insn,	1,	SUF_Z,	0x52,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmaxsb,	sse4_insn,	2,	SUF_Z,	0x3C,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -538,22 +548,22 @@
 pminub,	mmxsse2_insn,	2,	SUF_Z,	0xDA,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 pminud,	sse4_insn,	2,	SUF_Z,	0x3B,	0,	0,	0,	CPU_SSE41,	0,	0
 pminuw,	sse4_insn,	2,	SUF_Z,	0x3A,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovmskb,	pmovmskb_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pmovsxbd,	sse4m32_insn,	2,	SUF_Z,	0x21,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxbq,	sse4m16_insn,	2,	SUF_Z,	0x22,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxbw,	sse4m64_insn,	2,	SUF_Z,	0x20,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxdq,	sse4m64_insn,	2,	SUF_Z,	0x25,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxwd,	sse4m64_insn,	2,	SUF_Z,	0x23,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxwq,	sse4m32_insn,	2,	SUF_Z,	0x24,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbd,	sse4m32_insn,	2,	SUF_Z,	0x31,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbq,	sse4m16_insn,	2,	SUF_Z,	0x32,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbw,	sse4m64_insn,	2,	SUF_Z,	0x30,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxdq,	sse4m64_insn,	2,	SUF_Z,	0x35,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxwd,	sse4m64_insn,	2,	SUF_Z,	0x33,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxwq,	sse4m32_insn,	2,	SUF_Z,	0x34,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovmskb,	pmovmskb_insn,	6,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
+pmovsxbd,	sse4m32_insn,	4,	SUF_Z,	0x21,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxbq,	sse4m16_insn,	4,	SUF_Z,	0x22,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxbw,	sse4m64_insn,	4,	SUF_Z,	0x20,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxdq,	sse4m64_insn,	4,	SUF_Z,	0x25,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxwd,	sse4m64_insn,	4,	SUF_Z,	0x23,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxwq,	sse4m32_insn,	4,	SUF_Z,	0x24,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbd,	sse4m32_insn,	4,	SUF_Z,	0x31,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbq,	sse4m16_insn,	4,	SUF_Z,	0x32,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbw,	sse4m64_insn,	4,	SUF_Z,	0x30,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxdq,	sse4m64_insn,	4,	SUF_Z,	0x35,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxwd,	sse4m64_insn,	4,	SUF_Z,	0x33,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxwq,	sse4m32_insn,	4,	SUF_Z,	0x34,	0,	0,	0,	CPU_SSE41,	0,	0
 pmuldq,	sse4_insn,	2,	SUF_Z,	0x28,	0,	0,	0,	CPU_SSE41,	0,	0
 pmulhriw,	cyrixmmx_insn,	1,	SUF_Z,	0x5D,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pmulhrsw,	ssse3_insn,	3,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSSE3,	0,	0
+pmulhrsw,	ssse3_insn,	5,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSSE3,	0,	0
 pmulhrwa,	now3d_insn,	1,	SUF_Z,	0xB7,	0,	0,	0,	CPU_3DNow,	0,	0
 pmulhrwc,	cyrixmmx_insn,	1,	SUF_Z,	0x59,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmulhuw,	mmxsse2_insn,	2,	SUF_Z,	0xE4,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
@@ -565,7 +575,7 @@
 pmvlzb,	cyrixmmx_insn,	1,	SUF_Z,	0x5B,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmvnzb,	cyrixmmx_insn,	1,	SUF_Z,	0x5A,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmvzb,	cyrixmmx_insn,	1,	SUF_Z,	0x58,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pop,	pop_insn,	21,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
+pop,	pop_insn,	23,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 popa,	onebyte_insn,	1,	SUF_Z,	0x61,	0x00,	0,	NOT_64,	CPU_186,	0,	0
 popad,	onebyte_insn,	1,	SUF_Z,	0x61,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 popaw,	onebyte_insn,	1,	SUF_Z,	0x61,	0x10,	0,	NOT_64,	CPU_186,	0,	0
@@ -582,22 +592,22 @@
 prefetcht2,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x18,	0,	CPU_P3,	0,	0
 prefetchw,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x0D,	0,	CPU_3DNow,	0,	0
 psadbw,	mmxsse2_insn,	2,	SUF_Z,	0xF6,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pshufb,	ssse3_insn,	3,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSSE3,	0,	0
+pshufb,	ssse3_insn,	5,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSSE3,	0,	0
 pshufd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0x70,	0,	0,	CPU_SSE2,	0,	0
 pshufhw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF3,	0x70,	0,	0,	CPU_SSE2,	0,	0
 pshuflw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF2,	0x70,	0,	0,	CPU_SSE2,	0,	0
 pshufw,	pshufw_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-psignb,	ssse3_insn,	3,	SUF_Z,	0x08,	0,	0,	0,	CPU_SSSE3,	0,	0
-psignd,	ssse3_insn,	3,	SUF_Z,	0x0A,	0,	0,	0,	CPU_SSSE3,	0,	0
-psignw,	ssse3_insn,	3,	SUF_Z,	0x09,	0,	0,	0,	CPU_SSSE3,	0,	0
+psignb,	ssse3_insn,	5,	SUF_Z,	0x08,	0,	0,	0,	CPU_SSSE3,	0,	0
+psignd,	ssse3_insn,	5,	SUF_Z,	0x0A,	0,	0,	0,	CPU_SSSE3,	0,	0
+psignw,	ssse3_insn,	5,	SUF_Z,	0x09,	0,	0,	0,	CPU_SSSE3,	0,	0
 pslld,	pshift_insn,	4,	SUF_Z,	0xF2,	0x72,	0x06,	0,	CPU_MMX,	0,	0
-pslldq,	pslrldq_insn,	2,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSE2,	0,	0
+pslldq,	pslrldq_insn,	4,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSE2,	0,	0
 psllq,	pshift_insn,	4,	SUF_Z,	0xF3,	0x73,	0x06,	0,	CPU_MMX,	0,	0
 psllw,	pshift_insn,	4,	SUF_Z,	0xF1,	0x71,	0x06,	0,	CPU_MMX,	0,	0
 psrad,	pshift_insn,	4,	SUF_Z,	0xE2,	0x72,	0x04,	0,	CPU_MMX,	0,	0
 psraw,	pshift_insn,	4,	SUF_Z,	0xE1,	0x71,	0x04,	0,	CPU_MMX,	0,	0
 psrld,	pshift_insn,	4,	SUF_Z,	0xD2,	0x72,	0x02,	0,	CPU_MMX,	0,	0
-psrldq,	pslrldq_insn,	2,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSE2,	0,	0
+psrldq,	pslrldq_insn,	4,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSE2,	0,	0
 psrlq,	pshift_insn,	4,	SUF_Z,	0xD3,	0x73,	0x02,	0,	CPU_MMX,	0,	0
 psrlw,	pshift_insn,	4,	SUF_Z,	0xD1,	0x71,	0x02,	0,	CPU_MMX,	0,	0
 psubb,	mmxsse2_insn,	2,	SUF_Z,	0xF8,	0,	0,	0,	CPU_MMX,	0,	0
@@ -619,7 +629,7 @@
 punpckldq,	mmxsse2_insn,	2,	SUF_Z,	0x62,	0,	0,	0,	CPU_MMX,	0,	0
 punpcklqdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6C,	0,	0,	CPU_SSE2,	0,	0
 punpcklwd,	mmxsse2_insn,	2,	SUF_Z,	0x61,	0,	0,	0,	CPU_MMX,	0,	0
-push,	push_insn,	33,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
+push,	push_insn,	35,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 pusha,	onebyte_insn,	1,	SUF_Z,	0x60,	0x00,	0,	NOT_64,	CPU_186,	0,	0
 pushad,	onebyte_insn,	1,	SUF_Z,	0x60,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 pushaw,	onebyte_insn,	1,	SUF_Z,	0x60,	0x10,	0,	NOT_64,	CPU_186,	0,	0
@@ -650,6 +660,7 @@
 retn,	retnf_insn,	6,	SUF_Z,	0xC2,	0,	0,	0,	0,	0,	0
 rol,	shift_insn,	16,	SUF_Z,	0x00,	0,	0,	0,	0,	0,	0
 ror,	shift_insn,	16,	SUF_Z,	0x01,	0,	0,	0,	0,	0,	0
+rorx,	vex_gpr_reg_rm_0F_imm8_insn,	2,	SUF_Z,	0xF2,	0x3A,	0xF0,	ONLY_AVX,	CPU_BMI2,	0,	0
 roundpd,	sse4imm_insn,	2,	SUF_Z,	0x09,	0,	0,	0,	CPU_SSE41,	0,	0
 roundps,	sse4imm_insn,	2,	SUF_Z,	0x08,	0,	0,	0,	CPU_SSE41,	0,	0
 roundsd,	sse4m64imm_insn,	4,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -664,6 +675,7 @@
 sal,	shift_insn,	16,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 salc,	onebyte_insn,	1,	SUF_Z,	0xD6,	0,	0,	NOT_64,	CPU_Undoc,	0,	0
 sar,	shift_insn,	16,	SUF_Z,	0x07,	0,	0,	0,	0,	0,	0
+sarx,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0xF3,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
 sbb,	arith_insn,	22,	SUF_Z,	0x18,	0x03,	0,	0,	0,	0,	0
 scasb,	onebyte_insn,	1,	SUF_Z,	0xAE,	0x00,	0,	0,	0,	0,	0
 scasd,	onebyte_insn,	1,	SUF_Z,	0xAF,	0x20,	0,	0,	CPU_386,	0,	0
@@ -703,8 +715,10 @@
 sgdt,	twobytemem_insn,	1,	SUF_Z,	0x00,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
 shl,	shift_insn,	16,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 shld,	shlrd_insn,	9,	SUF_Z,	0xA4,	0,	0,	0,	CPU_386,	0,	0
+shlx,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x66,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
 shr,	shift_insn,	16,	SUF_Z,	0x05,	0,	0,	0,	0,	0,	0
 shrd,	shlrd_insn,	9,	SUF_Z,	0xAC,	0,	0,	0,	CPU_386,	0,	0
+shrx,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI2,	0,	0
 shufpd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0xC6,	0,	0,	CPU_SSE2,	0,	0
 shufps,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x00,	0xC6,	0,	0,	CPU_SSE,	0,	0
 sidt,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
@@ -742,6 +756,7 @@
 sysexit,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x35,	0,	NOT_64,	CPU_686,	CPU_Priv,	0
 sysret,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x07,	0,	0,	CPU_686,	CPU_AMD,	CPU_Priv
 test,	test_insn,	20,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
+tzcnt,	cnt_insn,	3,	SUF_Z,	0xBC,	0,	0,	0,	CPU_BMI1,	0,	0
 ucomisd,	xmm_xmm64_insn,	4,	SUF_Z,	0x66,	0x2E,	0,	0,	CPU_SSE2,	0,	0
 ucomiss,	xmm_xmm32_insn,	4,	SUF_Z,	0x00,	0x2E,	0,	0,	CPU_SSE,	0,	0
 ud1,	twobyte_insn,	1,	SUF_Z,	0x0F,	0xB9,	0,	0,	CPU_286,	CPU_Undoc,	0
@@ -751,29 +766,30 @@
 unpckhps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x15,	0,	0,	CPU_SSE,	0,	0
 unpcklpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x14,	0,	0,	CPU_SSE2,	0,	0
 unpcklps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x14,	0,	0,	CPU_SSE,	0,	0
-vaddpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vaddps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaddsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaddss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x58,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vaddsubpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vaddsubps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0xF2,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddsubpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vaddsubps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0xF2,	0xD0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesdec,	aes_insn,	2,	SUF_Z,	0x38,	0xDE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesdeclast,	aes_insn,	2,	SUF_Z,	0x38,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesenc,	aes_insn,	2,	SUF_Z,	0x38,	0xDC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesenclast,	aes_insn,	2,	SUF_Z,	0x38,	0xDD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaesimc,	aesimc_insn,	1,	SUF_Z,	0x38,	0xDB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vaeskeygenassist,	aes_imm_insn,	1,	SUF_Z,	0x3A,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandnpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandnps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vandps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vblendpd,	sse4imm_256_insn,	3,	SUF_Z,	0x0D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vblendps,	sse4imm_256_insn,	3,	SUF_Z,	0x0C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandnpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandnps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x55,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vandps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x54,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vblendpd,	sse4imm_256_insn,	4,	SUF_Z,	0x0D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vblendps,	sse4imm_256_insn,	4,	SUF_Z,	0x0C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vblendvpd,	avx_sse4xmm0_insn,	2,	SUF_Z,	0x4B,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vblendvps,	avx_sse4xmm0_insn,	2,	SUF_Z,	0x4A,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vbroadcastf128,	vbroadcastf128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vbroadcastsd,	vbroadcastsd_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vbroadcastss,	vbroadcastss_insn,	2,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vbroadcastf128,	vbroadcastif128_insn,	1,	SUF_Z,	0x1A,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vbroadcasti128,	vbroadcastif128_insn,	1,	SUF_Z,	0x5A,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vbroadcastsd,	vbroadcastsd_insn,	2,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vbroadcastss,	vbroadcastss_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcmpeq_ospd,	ssecmp_128_insn,	3,	SUF_Z,	0x10,	0x66,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcmpeq_osps,	ssecmp_128_insn,	3,	SUF_Z,	0x10,	0x00,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcmpeq_ossd,	ssecmp_64_insn,	4,	SUF_Z,	0x10,	0xF2,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
@@ -926,15 +942,16 @@
 vcvttps2dq,	avx_xmm_xmm128_insn,	2,	SUF_Z,	0xF3,	0x5B,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcvttsd2si,	cvt_rx_xmm64_insn,	4,	SUF_Z,	0xF2,	0x2C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vcvttss2si,	cvt_rx_xmm32_insn,	4,	SUF_Z,	0xF3,	0x2C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vdivpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vdivps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vdivpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vdivps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vdivsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vdivss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5E,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vdppd,	sse4imm_insn,	2,	SUF_Z,	0x41,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vdpps,	sse4imm_256_insn,	3,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vdpps,	sse4imm_256_insn,	4,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 verr,	prot286_insn,	1,	SUF_Z,	0x04,	0x00,	0,	0,	CPU_286,	CPU_Prot,	0
 verw,	prot286_insn,	1,	SUF_Z,	0x05,	0x00,	0,	0,	CPU_286,	CPU_Prot,	0
-vextractf128,	vextractf128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vextractf128,	vextractif128_insn,	1,	SUF_Z,	0x19,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vextracti128,	vextractif128_insn,	1,	SUF_Z,	0x39,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vextractps,	extractps_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vfmadd132pd,	vfma_pd_insn,	2,	SUF_Z,	0x98,	0,	0,	ONLY_AVX,	CPU_FMA,	0,	0
 vfmadd132ps,	vfma_ps_insn,	2,	SUF_Z,	0x98,	0,	0,	ONLY_AVX,	CPU_FMA,	0,	0
@@ -1020,25 +1037,30 @@
 vfrczps,	vfrc_pdps_insn,	2,	SUF_Z,	0x00,	0,	0,	0,	CPU_XOP,	0,	0
 vfrczsd,	vfrczsd_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
 vfrczss,	vfrczss_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
-vhaddpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vhaddps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0xF2,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vhsubpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vhsubps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0xF2,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vinsertf128,	vinsertf128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vgatherdpd,	gather_64x_64x_insn,	2,	SUF_Z,	0x92,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vgatherdps,	gather_32x_32y_insn,	2,	SUF_Z,	0x92,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vgatherqpd,	gather_64x_64y_insn,	2,	SUF_Z,	0x93,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vgatherqps,	gather_32x_32y_128_insn,	2,	SUF_Z,	0x93,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vhaddpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vhaddps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0xF2,	0x7C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vhsubpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vhsubps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0xF2,	0x7D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vinsertf128,	vinsertif128_insn,	1,	SUF_Z,	0x18,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vinserti128,	vinsertif128_insn,	1,	SUF_Z,	0x38,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vinsertps,	insertps_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vlddqu,	lddqu_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vldmxcsr,	ldstmxcsr_insn,	1,	SUF_Z,	0x02,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaskmovdqu,	maskmovdqu_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaskmovpd,	vmaskmov_insn,	4,	SUF_Z,	0x2D,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaskmovps,	vmaskmov_insn,	4,	SUF_Z,	0x2C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmaxpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmaxps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmaxpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmaxps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaxsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmaxss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5F,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmcall,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC1,	0,	CPU_P4,	0,	0
 vmclear,	vmxthreebytemem_insn,	1,	SUF_Z,	0x66,	0,	0,	0,	CPU_P4,	0,	0
-vminpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vminps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vminpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vminps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vminsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vminss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmlaunch,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC2,	0,	CPU_P4,	0,	0
@@ -1059,7 +1081,7 @@
 vmovmskpd,	movmsk_insn,	4,	SUF_Z,	0x66,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovmskps,	movmsk_insn,	4,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovntdq,	movnt_insn,	2,	SUF_Z,	0x66,	0xE7,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmovntdqa,	movntdqa_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmovntdqa,	movntdqa_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovntpd,	movnt_insn,	2,	SUF_Z,	0x66,	0x2B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovntps,	movnt_insn,	2,	SUF_Z,	0x00,	0x2B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovq,	vmovq_insn,	5,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
@@ -1069,60 +1091,65 @@
 vmovss,	movss_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovupd,	movau_insn,	6,	SUF_Z,	0x66,	0x10,	0x01,	ONLY_AVX,	CPU_AVX,	0,	0
 vmovups,	movau_insn,	6,	SUF_Z,	0x00,	0x10,	0x01,	ONLY_AVX,	CPU_AVX,	0,	0
-vmpsadbw,	sse4imm_insn,	2,	SUF_Z,	0x42,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmpsadbw,	sse4imm_256avx2_insn,	4,	SUF_Z,	0x42,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmptrld,	vmxtwobytemem_insn,	1,	SUF_Z,	0x06,	0,	0,	0,	CPU_P4,	0,	0
 vmptrst,	vmxtwobytemem_insn,	1,	SUF_Z,	0x07,	0,	0,	0,	CPU_P4,	0,	0
 vmread,	vmxmemrd_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
 vmresume,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC3,	0,	CPU_P4,	0,	0
 vmrun,	svm_rax_insn,	2,	SUF_Z,	0xD8,	0,	0,	0,	CPU_SVM,	0,	0
 vmsave,	svm_rax_insn,	2,	SUF_Z,	0xDB,	0,	0,	0,	CPU_SVM,	0,	0
-vmulpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vmulps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmulpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vmulps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmulsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmulss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x59,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vmwrite,	vmxmemwr_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
 vmxoff,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC4,	0,	CPU_P4,	0,	0
 vmxon,	vmxthreebytemem_insn,	1,	SUF_Z,	0xF3,	0,	0,	0,	CPU_P4,	0,	0
-vorpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vorps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpabsb,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x1C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpabsd,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x1E,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpabsw,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x1D,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpackssdw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpacksswb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x63,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpackusdw,	ssse3_insn,	3,	SUF_Z,	0x2B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpackuswb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x67,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddsb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xED,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddusb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddusw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpaddw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpalignr,	sse4imm_insn,	2,	SUF_Z,	0x0F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpand,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpandn,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpavgb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpavgw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE3,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpblendvb,	avx_sse4xmm0_128_insn,	1,	SUF_Z,	0x4C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpblendw,	sse4imm_insn,	2,	SUF_Z,	0x0E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vorpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vorps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x56,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpabsb,	avx2_ssse3_2op_insn,	2,	SUF_Z,	0x1C,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpabsd,	avx2_ssse3_2op_insn,	2,	SUF_Z,	0x1E,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpabsw,	avx2_ssse3_2op_insn,	2,	SUF_Z,	0x1D,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpackssdw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6B,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpacksswb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x63,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpackusdw,	ssse3_insn,	5,	SUF_Z,	0x2B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpackuswb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x67,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddsb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xED,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddusb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDC,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddusw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpaddw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFD,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpalignr,	sse4imm_256avx2_insn,	4,	SUF_Z,	0x0F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpand,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpandn,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpavgb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE0,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpavgw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE3,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpblendd,	vex_66_0F3A_imm8_avx2_insn,	2,	SUF_Z,	0x02,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpblendvb,	avx2_sse4xmm0_insn,	2,	SUF_Z,	0x4C,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpblendw,	sse4imm_256avx2_insn,	4,	SUF_Z,	0x0E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpbroadcastb,	vpbroadcastb_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpbroadcastd,	vpbroadcastd_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpbroadcastq,	vpbroadcastq_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpbroadcastw,	vpbroadcastw_avx2_insn,	4,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vpclmulhqhqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x11,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmulhqlqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x01,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmullqhqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x10,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmullqlqdq,	pclmulqdq_fixed_insn,	2,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpclmulqdq,	pclmulqdq_insn,	2,	SUF_Z,	0x3A,	0x44,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmov,	vpcmov_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
-vpcmpeqb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x74,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpeqd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x76,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpeqq,	ssse3_insn,	3,	SUF_Z,	0x29,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpeqw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x75,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x74,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x76,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqq,	ssse3_insn,	5,	SUF_Z,	0x29,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpeqw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x75,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpestri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x61,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpestrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x60,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x64,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x66,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtq,	ssse3_insn,	3,	SUF_Z,	0x37,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpcmpgtw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x65,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x64,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x66,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtq,	ssse3_insn,	5,	SUF_Z,	0x37,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpcmpgtw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x65,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpistri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x63,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcmpistrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x62,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpcomb,	vpcom_imm_insn,	1,	SUF_Z,	0xCC,	0,	0,	0,	CPU_XOP,	0,	0
@@ -1206,33 +1233,42 @@
 vpcomuw,	vpcom_imm_insn,	1,	SUF_Z,	0xED,	0,	0,	0,	CPU_XOP,	0,	0
 vpcomw,	vpcom_imm_insn,	1,	SUF_Z,	0xCD,	0,	0,	0,	CPU_XOP,	0,	0
 vperm2f128,	vperm2f128_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vperm2i128,	vperm2i128_avx2_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpermd,	vperm_var_avx2_insn,	1,	SUF_Z,	0x36,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vpermilpd,	vpermil_insn,	4,	SUF_Z,	0x05,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpermilps,	vpermil_insn,	4,	SUF_Z,	0x04,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpermpd,	vperm_imm_avx2_insn,	1,	SUF_Z,	0x01,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpermps,	vperm_var_avx2_insn,	1,	SUF_Z,	0x16,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpermq,	vperm_imm_avx2_insn,	1,	SUF_Z,	0x00,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vpextrb,	pextrb_insn,	3,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrd,	pextrd_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrq,	pextrq_insn,	1,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpextrw,	pextrw_insn,	7,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpgatherdd,	gather_32x_32y_insn,	2,	SUF_Z,	0x90,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpgatherdq,	gather_64x_64x_insn,	2,	SUF_Z,	0x90,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpgatherqd,	gather_32x_32y_128_insn,	2,	SUF_Z,	0x91,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpgatherqq,	gather_64x_64y_insn,	2,	SUF_Z,	0x91,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
 vphaddbd,	vphaddsub_insn,	1,	SUF_Z,	0xC2,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddbq,	vphaddsub_insn,	1,	SUF_Z,	0xC3,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddbw,	vphaddsub_insn,	1,	SUF_Z,	0xC1,	0,	0,	0,	CPU_XOP,	0,	0
-vphaddd,	ssse3_insn,	3,	SUF_Z,	0x02,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphaddd,	ssse3_insn,	5,	SUF_Z,	0x02,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphadddq,	vphaddsub_insn,	1,	SUF_Z,	0xCB,	0,	0,	0,	CPU_XOP,	0,	0
-vphaddsw,	ssse3_insn,	3,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphaddsw,	ssse3_insn,	5,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphaddubd,	vphaddsub_insn,	1,	SUF_Z,	0xD2,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddubq,	vphaddsub_insn,	1,	SUF_Z,	0xD3,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddubw,	vphaddsub_insn,	1,	SUF_Z,	0xD1,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddudq,	vphaddsub_insn,	1,	SUF_Z,	0xD8,	0,	0,	0,	CPU_XOP,	0,	0
 vphadduwd,	vphaddsub_insn,	1,	SUF_Z,	0xD6,	0,	0,	0,	CPU_XOP,	0,	0
 vphadduwq,	vphaddsub_insn,	1,	SUF_Z,	0xD7,	0,	0,	0,	CPU_XOP,	0,	0
-vphaddw,	ssse3_insn,	3,	SUF_Z,	0x01,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphaddw,	ssse3_insn,	5,	SUF_Z,	0x01,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphaddwd,	vphaddsub_insn,	1,	SUF_Z,	0xC6,	0,	0,	0,	CPU_XOP,	0,	0
 vphaddwq,	vphaddsub_insn,	1,	SUF_Z,	0xC7,	0,	0,	0,	CPU_XOP,	0,	0
 vphminposuw,	avx_ssse3_2op_insn,	1,	SUF_Z,	0x41,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphsubbw,	vphaddsub_insn,	1,	SUF_Z,	0xE1,	0,	0,	0,	CPU_XOP,	0,	0
-vphsubd,	ssse3_insn,	3,	SUF_Z,	0x06,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphsubd,	ssse3_insn,	5,	SUF_Z,	0x06,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphsubdq,	vphaddsub_insn,	1,	SUF_Z,	0xE3,	0,	0,	0,	CPU_XOP,	0,	0
-vphsubsw,	ssse3_insn,	3,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vphsubw,	ssse3_insn,	3,	SUF_Z,	0x05,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphsubsw,	ssse3_insn,	5,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vphsubw,	ssse3_insn,	5,	SUF_Z,	0x05,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vphsubwd,	vphaddsub_insn,	1,	SUF_Z,	0xE2,	0,	0,	0,	CPU_XOP,	0,	0
 vpinsrb,	pinsrb_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpinsrd,	pinsrd_insn,	2,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
@@ -1250,47 +1286,49 @@
 vpmacsww,	vpma_insn,	1,	SUF_Z,	0x95,	0,	0,	0,	CPU_XOP,	0,	0
 vpmadcsswd,	vpma_insn,	1,	SUF_Z,	0xA6,	0,	0,	0,	CPU_XOP,	0,	0
 vpmadcswd,	vpma_insn,	1,	SUF_Z,	0xB6,	0,	0,	0,	CPU_XOP,	0,	0
-vpmaddubsw,	ssse3_insn,	3,	SUF_Z,	0x04,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaddwd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxsb,	ssse3_insn,	3,	SUF_Z,	0x3C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxsd,	ssse3_insn,	3,	SUF_Z,	0x3D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxub,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxud,	ssse3_insn,	3,	SUF_Z,	0x3F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmaxuw,	ssse3_insn,	3,	SUF_Z,	0x3E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminsb,	ssse3_insn,	3,	SUF_Z,	0x38,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminsd,	ssse3_insn,	3,	SUF_Z,	0x39,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminub,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xDA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminud,	ssse3_insn,	3,	SUF_Z,	0x3B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpminuw,	ssse3_insn,	3,	SUF_Z,	0x3A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovmskb,	pmovmskb_insn,	4,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxbd,	sse4m32_insn,	2,	SUF_Z,	0x21,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxbq,	sse4m16_insn,	2,	SUF_Z,	0x22,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxbw,	sse4m64_insn,	2,	SUF_Z,	0x20,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxdq,	sse4m64_insn,	2,	SUF_Z,	0x25,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxwd,	sse4m64_insn,	2,	SUF_Z,	0x23,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovsxwq,	sse4m32_insn,	2,	SUF_Z,	0x24,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxbd,	sse4m32_insn,	2,	SUF_Z,	0x31,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxbq,	sse4m16_insn,	2,	SUF_Z,	0x32,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxbw,	sse4m64_insn,	2,	SUF_Z,	0x30,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxdq,	sse4m64_insn,	2,	SUF_Z,	0x35,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxwd,	sse4m64_insn,	2,	SUF_Z,	0x33,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmovzxwq,	sse4m32_insn,	2,	SUF_Z,	0x34,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmuldq,	ssse3_insn,	3,	SUF_Z,	0x28,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulhrsw,	ssse3_insn,	3,	SUF_Z,	0x0B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulhuw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulhw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmulld,	ssse3_insn,	3,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmullw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpmuludq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpor,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaddubsw,	ssse3_insn,	5,	SUF_Z,	0x04,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaddwd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaskmovd,	vmaskmov_insn,	4,	SUF_Z,	0x8C,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpmaskmovq,	vmaskmov_vexw1_avx2_insn,	4,	SUF_Z,	0x8C,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpmaxsb,	ssse3_insn,	5,	SUF_Z,	0x3C,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxsd,	ssse3_insn,	5,	SUF_Z,	0x3D,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxub,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDE,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxud,	ssse3_insn,	5,	SUF_Z,	0x3F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmaxuw,	ssse3_insn,	5,	SUF_Z,	0x3E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminsb,	ssse3_insn,	5,	SUF_Z,	0x38,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminsd,	ssse3_insn,	5,	SUF_Z,	0x39,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminub,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xDA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminud,	ssse3_insn,	5,	SUF_Z,	0x3B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpminuw,	ssse3_insn,	5,	SUF_Z,	0x3A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovmskb,	pmovmskb_insn,	6,	SUF_Z,	0xC0,	0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxbd,	sse4m32_insn,	4,	SUF_Z,	0x21,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxbq,	sse4m16_insn,	4,	SUF_Z,	0x22,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxbw,	sse4m64_insn,	4,	SUF_Z,	0x20,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxdq,	sse4m64_insn,	4,	SUF_Z,	0x25,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxwd,	sse4m64_insn,	4,	SUF_Z,	0x23,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovsxwq,	sse4m32_insn,	4,	SUF_Z,	0x24,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxbd,	sse4m32_insn,	4,	SUF_Z,	0x31,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxbq,	sse4m16_insn,	4,	SUF_Z,	0x32,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxbw,	sse4m64_insn,	4,	SUF_Z,	0x30,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxdq,	sse4m64_insn,	4,	SUF_Z,	0x35,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxwd,	sse4m64_insn,	4,	SUF_Z,	0x33,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmovzxwq,	sse4m32_insn,	4,	SUF_Z,	0x34,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmuldq,	ssse3_insn,	5,	SUF_Z,	0x28,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulhrsw,	ssse3_insn,	5,	SUF_Z,	0x0B,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulhuw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulhw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmulld,	ssse3_insn,	5,	SUF_Z,	0x40,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmullw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD5,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpmuludq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF4,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpor,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpperm,	vpperm_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_XOP,	0,	0
 vprotb,	vprot_insn,	3,	SUF_Z,	0x00,	0,	0,	0,	CPU_XOP,	0,	0
 vprotd,	vprot_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_XOP,	0,	0
 vprotq,	vprot_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_XOP,	0,	0
 vprotw,	vprot_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_XOP,	0,	0
-vpsadbw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF6,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsadbw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF6,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vpshab,	amd_vpshift_insn,	2,	SUF_Z,	0x98,	0,	0,	0,	CPU_XOP,	0,	0
 vpshad,	amd_vpshift_insn,	2,	SUF_Z,	0x9A,	0,	0,	0,	CPU_XOP,	0,	0
 vpshaq,	amd_vpshift_insn,	2,	SUF_Z,	0x9B,	0,	0,	0,	CPU_XOP,	0,	0
@@ -1299,41 +1337,46 @@
 vpshld,	amd_vpshift_insn,	2,	SUF_Z,	0x96,	0,	0,	0,	CPU_XOP,	0,	0
 vpshlq,	amd_vpshift_insn,	2,	SUF_Z,	0x97,	0,	0,	0,	CPU_XOP,	0,	0
 vpshlw,	amd_vpshift_insn,	2,	SUF_Z,	0x95,	0,	0,	0,	CPU_XOP,	0,	0
-vpshufb,	ssse3_insn,	3,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpshufd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpshufhw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF3,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpshuflw,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0xF2,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsignb,	ssse3_insn,	3,	SUF_Z,	0x08,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsignd,	ssse3_insn,	3,	SUF_Z,	0x0A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsignw,	ssse3_insn,	3,	SUF_Z,	0x09,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpslld,	vpshift_insn,	4,	SUF_Z,	0xF2,	0x72,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
-vpslldq,	pslrldq_insn,	2,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsllq,	vpshift_insn,	4,	SUF_Z,	0xF3,	0x73,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsllw,	vpshift_insn,	4,	SUF_Z,	0xF1,	0x71,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrad,	vpshift_insn,	4,	SUF_Z,	0xE2,	0x72,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsraw,	vpshift_insn,	4,	SUF_Z,	0xE1,	0x71,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrld,	vpshift_insn,	4,	SUF_Z,	0xD2,	0x72,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrldq,	pslrldq_insn,	2,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrlq,	vpshift_insn,	4,	SUF_Z,	0xD3,	0x73,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsrlw,	vpshift_insn,	4,	SUF_Z,	0xD1,	0x71,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xFB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubsb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubsw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xE9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubusb,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubusw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpsubw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xF9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshufb,	ssse3_insn,	5,	SUF_Z,	0x00,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshufd,	xmm_xmm128_imm_256avx2_insn,	2,	SUF_Z,	0x66,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshufhw,	xmm_xmm128_imm_256avx2_insn,	2,	SUF_Z,	0xF3,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpshuflw,	xmm_xmm128_imm_256avx2_insn,	2,	SUF_Z,	0xF2,	0x70,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsignb,	ssse3_insn,	5,	SUF_Z,	0x08,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsignd,	ssse3_insn,	5,	SUF_Z,	0x0A,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsignw,	ssse3_insn,	5,	SUF_Z,	0x09,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpslld,	vpshift_insn,	8,	SUF_Z,	0xF2,	0x72,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
+vpslldq,	pslrldq_insn,	4,	SUF_Z,	0x07,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsllq,	vpshift_insn,	8,	SUF_Z,	0xF3,	0x73,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsllvd,	vpshiftv_vexw0_avx2_insn,	2,	SUF_Z,	0x47,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsllvq,	vpshiftv_vexw1_avx2_insn,	2,	SUF_Z,	0x47,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsllw,	vpshift_insn,	8,	SUF_Z,	0xF1,	0x71,	0x06,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrad,	vpshift_insn,	8,	SUF_Z,	0xE2,	0x72,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsravd,	vpshiftv_vexw0_avx2_insn,	2,	SUF_Z,	0x46,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsraw,	vpshift_insn,	8,	SUF_Z,	0xE1,	0x71,	0x04,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrld,	vpshift_insn,	8,	SUF_Z,	0xD2,	0x72,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrldq,	pslrldq_insn,	4,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrlq,	vpshift_insn,	8,	SUF_Z,	0xD3,	0x73,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsrlvd,	vpshiftv_vexw0_avx2_insn,	2,	SUF_Z,	0x45,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsrlvq,	vpshiftv_vexw1_avx2_insn,	2,	SUF_Z,	0x45,	0,	0,	ONLY_AVX,	CPU_AVX2,	0,	0
+vpsrlw,	vpshift_insn,	8,	SUF_Z,	0xD1,	0x71,	0x02,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFA,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xFB,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubsb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubsw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xE9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubusb,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD8,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubusw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xD9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpsubw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xF9,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vptest,	sse4_insn,	2,	SUF_Z,	0x17,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhbw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x68,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6A,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhqdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckhwd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x69,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpcklbw,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x60,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpckldq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x62,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpcklqdq,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x6C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpunpcklwd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x61,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vpxor,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xEF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhbw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x68,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhdq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6A,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhqdq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6D,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckhwd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x69,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpcklbw,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x60,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpckldq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x62,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpcklqdq,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x6C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpunpcklwd,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0x61,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vpxor,	xmm_xmm128_256avx2_insn,	4,	SUF_Z,	0x66,	0xEF,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vrcpps,	avx_xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x53,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vrcpss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x53,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vroundpd,	avx_sse4imm_insn,	3,	SUF_Z,	0x09,	0,	0,	ONLY_AVX,	CPU_SSE41,	0,	0
@@ -1349,20 +1392,20 @@
 vsqrtsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x51,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vsqrtss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x51,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vstmxcsr,	ldstmxcsr_insn,	1,	SUF_Z,	0x03,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vsubpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vsubps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vsubpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vsubps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vsubsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vsubss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x5C,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vtestpd,	sse4_insn,	2,	SUF_Z,	0x0F,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vtestps,	sse4_insn,	2,	SUF_Z,	0x0E,	0xC0,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vucomisd,	avx_xmm_xmm64_insn,	2,	SUF_Z,	0x66,	0x2E,	0,	ONLY_AVX,	CPU_AVX,	0,	0
 vucomiss,	avx_xmm_xmm32_insn,	2,	SUF_Z,	0x00,	0x2E,	0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpckhpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpckhps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpcklpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vunpcklps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vxorpd,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x66,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
-vxorps,	xmm_xmm128_256_insn,	3,	SUF_Z,	0x00,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpckhpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpckhps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x15,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpcklpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vunpcklps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x14,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vxorpd,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x66,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
+vxorps,	xmm_xmm128_256_insn,	4,	SUF_Z,	0x00,	0x57,	0xC0,	ONLY_AVX,	CPU_AVX,	0,	0
 vzeroall,	vzero_insn,	1,	SUF_Z,	0xC4,	0,	0,	0,	CPU_AVX,	0,	0
 vzeroupper,	vzero_insn,	1,	SUF_Z,	0xC0,	0,	0,	0,	CPU_AVX,	0,	0
 wait,	onebyte_insn,	1,	SUF_Z,	0x9B,	0,	0,	0,	0,	0,	0

yasm-1.1.0.tar.gz/x86insns.c -> yasm-1.2.0.tar.gz/x86insns.c Changed

@@ -1,4 +1,4 @@
-/* Generated by gen_x86_insn.py r2346, do not edit */
+/* Generated by gen_x86_insn.py rHEAD, do not edit */
 static const x86_info_operand insn_operands[] = {
    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
@@ -10,6 +10,18 @@
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
@@ -26,10 +38,6 @@
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
@@ -56,18 +64,18 @@
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -82,15 +90,7 @@
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
-    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -134,15 +134,30 @@
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDRM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_Mem, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
@@ -182,11 +197,11 @@
     {OPT_Mem, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDRM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
@@ -206,12 +221,39 @@
     {OPT_Mem, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemXMMIndex, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemXMMIndex, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_XMM0, OPS_128, 0, 0, OPTM_None, OPA_None, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemXMMIndex, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemYMMIndex, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemYMMIndex, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
@@ -230,9 +272,9 @@
     {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Creg, OPS_8, 0, 0, OPTM_None, OPA_None, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_MemYMMIndex, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_RM, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -401,11 +443,23 @@
     {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
@@ -419,12 +473,12 @@
     {OPT_RM, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Areg, OPS_64, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_RM, OPS_64, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_Any, 0, 0, OPTM_None, OPA_JmpRel, OPAP_None},
     {OPT_Creg, OPS_32, 0, 0, OPTM_None, OPA_AdSizeR, OPAP_None},
     {OPT_Imm, OPS_Any, 0, 0, OPTM_Short, OPA_JmpRel, OPAP_None},
     {OPT_Creg, OPS_32, 0, 0, OPTM_None, OPA_AdSizeR, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Mem, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -437,8 +491,6 @@
     {OPT_Creg, OPS_16, 0, 0, OPTM_None, OPA_AdSizeR, OPAP_None},
     {OPT_Imm, OPS_Any, 0, 0, OPTM_Short, OPA_JmpRel, OPAP_None},
     {OPT_Creg, OPS_16, 0, 0, OPTM_None, OPA_AdSizeR, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_Areg, OPS_8, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
@@ -451,8 +503,12 @@
     {OPT_Areg, OPS_16, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Dreg, OPS_16, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Areg, OPS_32, 0, 0, OPTM_None, OPA_None, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EAVEX, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_EAVEX, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_MemrAX, OPS_Any, 0, 0, OPTM_None, OPA_AdSizeEA, OPAP_None},
     {OPT_Creg, OPS_32, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Areg, OPS_16, 0, 0, OPTM_None, OPA_None, OPAP_None},
@@ -481,6 +537,14 @@
     {OPT_RM, OPS_16, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_RM, OPS_8, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_RM, OPS_8, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Creg, OPS_8, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_RM, OPS_8, 0, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -529,8 +593,8 @@
     {OPT_Imm, OPS_32, 1, 0, OPTM_None, OPA_Imm, OPAP_SImm8},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -543,18 +607,18 @@
     {OPT_SIMDRM, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_256, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Areg, OPS_32, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Mem, OPS_80, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SegReg, OPS_16, 1, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Mem, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Areg, OPS_16, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Imm, OPS_16, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_Areg, OPS_32, 0, 0, OPTM_None, OPA_None, OPAP_None},
@@ -565,10 +629,16 @@
     {OPT_Mem, OPS_64, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Mem, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_RM, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_A16},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
@@ -581,6 +651,8 @@
     {OPT_Mem, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_MemEAX, OPS_Any, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_Mem, OPS_80, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_BITS, 0, 0, OPTM_None, OPA_Op0Add, OPAP_None},
+    {OPT_RM, OPS_BITS, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SS, OPS_Any, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_SS, OPS_16, 0, 0, OPTM_None, OPA_None, OPAP_None},
     {OPT_SS, OPS_32, 0, 0, OPTM_None, OPA_None, OPAP_None},
@@ -657,304 +729,309 @@
 };
 
 static const x86_insn_info onebytemem_insn[] = {
-   { SUF_L|SUF_Q|SUF_S|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 596 }
+   { SUF_L|SUF_Q|SUF_S|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 668 }
 };
 
 static const x86_insn_info twobytemem_insn[] = {
-   { SUF_L|SUF_Q|SUF_S|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, MOD_Op0Add, MOD_Op1Add}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 1, 470 }
+   { SUF_L|SUF_Q|SUF_S|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, MOD_Op0Add, MOD_Op1Add}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 1, 526 }
 };
 
 static const x86_insn_info mov_insn[] = {
-   { SUF_B|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA0, 0, 0}, 0, 2, 317 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 319 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 321 },
-    { SUF_B|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA2, 0, 0}, 0, 2, 323 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 325 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 327 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA0, 0, 0}, 0, 2, 293 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 295 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 297 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 299 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA2, 0, 0}, 0, 2, 301 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 303 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 305 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 307 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x88, 0xA2, 0}, 0, 2, 329 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x89, 0xA3, 0}, 0, 2, 331 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x89, 0xA3, 0}, 0, 2, 333 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x89, 0xA3, 0}, 0, 2, 335 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x88, 0, 0}, 0, 2, 275 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x89, 0, 0}, 0, 2, 212 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x89, 0, 0}, 0, 2, 218 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x89, 0, 0}, 0, 2, 224 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8A, 0xA0, 0}, 0, 2, 337 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8B, 0xA1, 0}, 0, 2, 339 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8B, 0xA1, 0}, 0, 2, 341 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8B, 0xA1, 0}, 0, 2, 343 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8A, 0, 0}, 0, 2, 277 },
+   { SUF_B|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA0, 0, 0}, 0, 2, 359 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 361 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 363 },
+    { SUF_B|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA2, 0, 0}, 0, 2, 365 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 367 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 369 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA0, 0, 0}, 0, 2, 335 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 337 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 339 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 341 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA2, 0, 0}, 0, 2, 343 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 345 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 347 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 349 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x88, 0xA2, 0}, 0, 2, 371 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x89, 0xA3, 0}, 0, 2, 373 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x89, 0xA3, 0}, 0, 2, 375 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x89, 0xA3, 0}, 0, 2, 377 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x88, 0, 0}, 0, 2, 317 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x89, 0, 0}, 0, 2, 254 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x89, 0, 0}, 0, 2, 260 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x89, 0, 0}, 0, 2, 266 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8A, 0xA0, 0}, 0, 2, 379 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8B, 0xA1, 0}, 0, 2, 381 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8B, 0xA1, 0}, 0, 2, 383 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8B, 0xA1, 0}, 0, 2, 385 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8A, 0, 0}, 0, 2, 319 },
     { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8B, 0, 0}, 0, 2, 98 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8B, 0, 0}, 0, 2, 101 },
     { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8B, 0, 0}, 0, 2, 104 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 345 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 347 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 349 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 351 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8E, 0, 0}, 0, 2, 353 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8E, 0, 0}, 0, 2, 348 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8E, 0, 0}, 0, 2, 350 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xB0, 0, 0}, 0, 2, 355 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 357 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 359 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 361 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xB8, 0xC7, 0}, 0, 2, 363 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xC6, 0, 0}, 0, 2, 365 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 367 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 369 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 371 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xC6, 0, 0}, 0, 2, 373 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 375 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 377 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 379 },
-    { SUF_L|SUF_Z, NOT_64, CPU_586, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x22, 0}, 0, 2, 381 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x22, 0}, 0, 2, 383 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x22, 0}, 0, 2, 385 },
-    { SUF_L|SUF_Z, NOT_64, CPU_586, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x20, 0}, 0, 2, 387 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x20, 0}, 0, 2, 382 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x20, 0}, 0, 2, 389 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x23, 0}, 0, 2, 391 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x23, 0}, 0, 2, 393 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x21, 0}, 0, 2, 392 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x21, 0}, 0, 2, 395 },
-    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x6F, 0}, 0, 2, 185 },
-    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 247 },
-    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x7F, 0}, 0, 2, 283 },
-    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 249 },
-    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 88 },
-    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 285 },
-    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 253 },
-    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xD6, 0}, 0, 2, 287 },
-    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 167 }
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 387 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 389 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 391 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8C, 0, 0}, 0, 2, 393 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8E, 0, 0}, 0, 2, 395 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8E, 0, 0}, 0, 2, 390 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x8E, 0, 0}, 0, 2, 392 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xB0, 0, 0}, 0, 2, 397 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 399 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 401 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 403 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xB8, 0xC7, 0}, 0, 2, 405 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xC6, 0, 0}, 0, 2, 407 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 409 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 411 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 413 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xC6, 0, 0}, 0, 2, 415 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 417 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 419 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xC7, 0, 0}, 0, 2, 421 },
+    { SUF_L|SUF_Z, NOT_64, CPU_586, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x22, 0}, 0, 2, 423 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x22, 0}, 0, 2, 425 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x22, 0}, 0, 2, 427 },
+    { SUF_L|SUF_Z, NOT_64, CPU_586, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x20, 0}, 0, 2, 429 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x20, 0}, 0, 2, 424 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x20, 0}, 0, 2, 431 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x23, 0}, 0, 2, 433 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x23, 0}, 0, 2, 435 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_Priv, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x21, 0}, 0, 2, 434 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_Priv, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x21, 0}, 0, 2, 437 },
+    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x6F, 0}, 0, 2, 140 },
+    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 289 },
+    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x7F, 0}, 0, 2, 325 },
+    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 291 },
+    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 64 },
+    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 327 },
+    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 295 },
+    { GAS_ONLY|SUF_Q|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xD6, 0}, 0, 2, 329 },
+    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 182 }
 };
 
 static const x86_insn_info movabs_insn[] = {
-   { SUF_B|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA0, 0, 0}, 0, 2, 293 },
-    { SUF_W|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 295 },
-    { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 297 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 299 },
-    { SUF_B|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA2, 0, 0}, 0, 2, 301 },
-    { SUF_W|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 303 },
-    { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 305 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 307 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 309 }
+   { SUF_B|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA0, 0, 0}, 0, 2, 335 },
+    { SUF_W|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 337 },
+    { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 339 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA1, 0, 0}, 0, 2, 341 },
+    { SUF_B|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA2, 0, 0}, 0, 2, 343 },
+    { SUF_W|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 345 },
+    { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 347 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA3, 0, 0}, 0, 2, 349 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xB8, 0, 0}, 0, 2, 351 }
 };
 
 static const x86_insn_info movszx_insn[] = {
-   { SUF_B|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 535 },
-    { SUF_B|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 475 },
-    { SUF_B|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 479 },
-    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 477 },
-    { SUF_W|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 537 }
+   { SUF_B|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 599 },
+    { SUF_B|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 531 },
+    { SUF_B|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 535 },
+    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 533 },
+    { SUF_W|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 601 }
 };
 
 static const x86_insn_info movsxd_insn[] = {
-   { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x63, 0, 0}, 0, 2, 571 }
+   { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x63, 0, 0}, 0, 2, 641 }
 };
 
 static const x86_insn_info push_insn[] = {
-   { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x50, 0, 0}, 0, 1, 357 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x50, 0, 0}, 0, 1, 359 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x50, 0, 0}, 0, 1, 309 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 6, 1, 239 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 6, 1, 235 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 6, 1, 238 },
+   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x50, 0, 0}, 0, 1, 651 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x50, 0, 0}, 0, 1, 399 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x50, 0, 0}, 0, 1, 401 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x50, 0, 0}, 0, 1, 351 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 6, 1, 652 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 6, 1, 281 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 6, 1, 277 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 6, 1, 280 },
     { GAS_ILLEGAL|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x6A, 0, 0}, 0, 1, 100 },
-    { GAS_ONLY|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x6A, 0, 0}, 0, 1, 624 },
+    { GAS_ONLY|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x6A, 0, 0}, 0, 1, 696 },
     { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0x6A, 0x68, 0}, 0, 1, 112 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_186, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x6A, 0x68, 0}, 0, 1, 625 },
-    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x6A, 0x68, 0}, 0, 1, 506 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6A, 0x68, 0}, 0, 1, 508 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x68, 0, 0}, 0, 1, 368 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x68, 0, 0}, 0, 1, 370 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0x68, 0, 0}, 0, 1, 626 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x0E, 0, 0}, 0, 1, 627 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x0E, 0, 0}, 0, 1, 628 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x0E, 0, 0}, 0, 1, 629 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x16, 0, 0}, 0, 1, 581 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x16, 0, 0}, 0, 1, 582 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x16, 0, 0}, 0, 1, 583 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x1E, 0, 0}, 0, 1, 584 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x1E, 0, 0}, 0, 1, 585 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x1E, 0, 0}, 0, 1, 586 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x06, 0, 0}, 0, 1, 587 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x06, 0, 0}, 0, 1, 588 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x06, 0, 0}, 0, 1, 589 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA0, 0}, 0, 1, 590 },
-    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA0, 0}, 0, 1, 591 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA0, 0}, 0, 1, 592 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA8, 0}, 0, 1, 593 },
-    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA8, 0}, 0, 1, 594 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA8, 0}, 0, 1, 595 }
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_186, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x6A, 0x68, 0}, 0, 1, 697 },
+    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x6A, 0x68, 0}, 0, 1, 570 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6A, 0x68, 0}, 0, 1, 572 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x68, 0, 0}, 0, 1, 410 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x68, 0, 0}, 0, 1, 412 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0x68, 0, 0}, 0, 1, 698 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x0E, 0, 0}, 0, 1, 699 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x0E, 0, 0}, 0, 1, 700 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x0E, 0, 0}, 0, 1, 701 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x16, 0, 0}, 0, 1, 653 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x16, 0, 0}, 0, 1, 654 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x16, 0, 0}, 0, 1, 655 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x1E, 0, 0}, 0, 1, 656 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x1E, 0, 0}, 0, 1, 657 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x1E, 0, 0}, 0, 1, 658 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x06, 0, 0}, 0, 1, 659 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x06, 0, 0}, 0, 1, 660 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x06, 0, 0}, 0, 1, 661 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA0, 0}, 0, 1, 662 },
+    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA0, 0}, 0, 1, 663 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA0, 0}, 0, 1, 664 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA8, 0}, 0, 1, 665 },
+    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA8, 0}, 0, 1, 666 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA8, 0}, 0, 1, 667 }
 };
 
 static const x86_insn_info pop_insn[] = {
-   { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x58, 0, 0}, 0, 1, 357 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x58, 0, 0}, 0, 1, 359 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x58, 0, 0}, 0, 1, 309 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x8F, 0, 0}, 0, 1, 239 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8F, 0, 0}, 0, 1, 235 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x8F, 0, 0}, 0, 1, 238 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x17, 0, 0}, 0, 1, 581 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x17, 0, 0}, 0, 1, 582 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x17, 0, 0}, 0, 1, 583 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x1F, 0, 0}, 0, 1, 584 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x1F, 0, 0}, 0, 1, 585 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x1F, 0, 0}, 0, 1, 586 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x07, 0, 0}, 0, 1, 587 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x07, 0, 0}, 0, 1, 588 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x07, 0, 0}, 0, 1, 589 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA1, 0}, 0, 1, 590 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA1, 0}, 0, 1, 591 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA1, 0}, 0, 1, 592 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA9, 0}, 0, 1, 593 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA9, 0}, 0, 1, 594 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA9, 0}, 0, 1, 595 }
+   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x58, 0, 0}, 0, 1, 651 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x58, 0, 0}, 0, 1, 399 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x58, 0, 0}, 0, 1, 401 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x58, 0, 0}, 0, 1, 351 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x8F, 0, 0}, 0, 1, 652 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0x8F, 0, 0}, 0, 1, 281 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8F, 0, 0}, 0, 1, 277 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0x8F, 0, 0}, 0, 1, 280 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x17, 0, 0}, 0, 1, 653 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x17, 0, 0}, 0, 1, 654 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x17, 0, 0}, 0, 1, 655 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x1F, 0, 0}, 0, 1, 656 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x1F, 0, 0}, 0, 1, 657 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x1F, 0, 0}, 0, 1, 658 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x07, 0, 0}, 0, 1, 659 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x07, 0, 0}, 0, 1, 660 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x07, 0, 0}, 0, 1, 661 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA1, 0}, 0, 1, 662 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA1, 0}, 0, 1, 663 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA1, 0}, 0, 1, 664 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xA9, 0}, 0, 1, 665 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA9, 0}, 0, 1, 666 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA9, 0}, 0, 1, 667 }
 };
 
 static const x86_insn_info xchg_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x86, 0, 0}, 0, 2, 275 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x86, 0, 0}, 0, 2, 277 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x90, 0, 0}, 0, 2, 455 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x90, 0, 0}, 0, 2, 457 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x87, 0, 0}, 0, 2, 212 },
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x86, 0, 0}, 0, 2, 317 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x86, 0, 0}, 0, 2, 319 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x90, 0, 0}, 0, 2, 511 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x90, 0, 0}, 0, 2, 513 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x87, 0, 0}, 0, 2, 254 },
     { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x87, 0, 0}, 0, 2, 98 },
-    { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x87, 0, 0}, 0, 2, 459 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x90, 0, 0}, 0, 2, 461 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x90, 0, 0}, 0, 2, 463 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x87, 0, 0}, 0, 2, 218 },
+    { SUF_L|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x87, 0, 0}, 0, 2, 515 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x90, 0, 0}, 0, 2, 517 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x90, 0, 0}, 0, 2, 519 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x87, 0, 0}, 0, 2, 260 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x87, 0, 0}, 0, 2, 101 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x90, 0, 0}, 0, 2, 465 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x90, 0, 0}, 0, 2, 308 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x90, 0, 0}, 0, 2, 467 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x87, 0, 0}, 0, 2, 224 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x90, 0, 0}, 0, 2, 521 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x90, 0, 0}, 0, 2, 350 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x90, 0, 0}, 0, 2, 523 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x87, 0, 0}, 0, 2, 266 },
     { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x87, 0, 0}, 0, 2, 104 }
 };
 
 static const x86_insn_info in_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xE4, 0, 0}, 0, 2, 440 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xE5, 0, 0}, 0, 2, 442 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE5, 0, 0}, 0, 2, 545 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEC, 0, 0}, 0, 2, 446 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xED, 0, 0}, 0, 2, 448 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xED, 0, 0}, 0, 2, 444 },
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xE4, 0, 0}, 0, 2, 492 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xE5, 0, 0}, 0, 2, 494 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE5, 0, 0}, 0, 2, 613 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEC, 0, 0}, 0, 2, 498 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xED, 0, 0}, 0, 2, 500 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xED, 0, 0}, 0, 2, 496 },
     { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xE4, 0, 0}, 0, 1, 3 },
     { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xE5, 0, 0}, 0, 1, 3 },
     { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE5, 0, 0}, 0, 1, 3 },
-    { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEC, 0, 0}, 0, 1, 445 },
-    { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xED, 0, 0}, 0, 1, 445 },
-    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xED, 0, 0}, 0, 1, 445 }
+    { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEC, 0, 0}, 0, 1, 497 },
+    { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xED, 0, 0}, 0, 1, 497 },
+    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xED, 0, 0}, 0, 1, 497 }
 };
 
 static const x86_insn_info out_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xE6, 0, 0}, 0, 2, 439 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xE7, 0, 0}, 0, 2, 441 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE7, 0, 0}, 0, 2, 443 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEE, 0, 0}, 0, 2, 445 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEF, 0, 0}, 0, 2, 447 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEF, 0, 0}, 0, 2, 449 },
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xE6, 0, 0}, 0, 2, 491 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xE7, 0, 0}, 0, 2, 493 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE7, 0, 0}, 0, 2, 495 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEE, 0, 0}, 0, 2, 497 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEF, 0, 0}, 0, 2, 499 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEF, 0, 0}, 0, 2, 501 },
     { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xE6, 0, 0}, 0, 1, 3 },
     { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xE7, 0, 0}, 0, 1, 3 },
     { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE7, 0, 0}, 0, 1, 3 },
-    { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEE, 0, 0}, 0, 1, 445 },
-    { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEF, 0, 0}, 0, 1, 445 },
-    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEF, 0, 0}, 0, 1, 445 }
+    { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEE, 0, 0}, 0, 1, 497 },
+    { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEF, 0, 0}, 0, 1, 497 },
+    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEF, 0, 0}, 0, 1, 497 }
 };
 
 static const x86_insn_info lea_insn[] = {
-   { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8D, 0, 0}, 0, 2, 469 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8D, 0, 0}, 0, 2, 471 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8D, 0, 0}, 0, 2, 473 }
+   { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x8D, 0, 0}, 0, 2, 525 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x8D, 0, 0}, 0, 2, 527 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x8D, 0, 0}, 0, 2, 529 }
 };
 
 static const x86_insn_info ldes_insn[] = {
-   { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x00, 0, 0}, 0, 2, 469 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 2, 471 }
+   { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x00, 0, 0}, 0, 2, 525 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 2, 527 }
 };
 
 static const x86_insn_info lfgss_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 469 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 471 }
+   { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 525 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 527 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 529 }
 };
 
 static const x86_insn_info arith_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x04, 0, 0}, 0, 2, 440 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op2Add, MOD_Op1AddSp, 0}, 16, 0, 0, 2, {0x83, 0xC0, 0x05}, 0, 2, 505 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op2Add, MOD_Op1AddSp, 0}, 32, 0, 0, 2, {0x83, 0xC0, 0x05}, 0, 2, 507 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op2Add, MOD_Op1AddSp, 0}, 64, 0, 0, 2, {0x83, 0xC0, 0x05}, 0, 2, 509 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0x80, 0, 0}, 0, 2, 373 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0x80, 0, 0}, 0, 2, 365 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0x83, 0, 0}, 0, 2, 511 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 513 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 515 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0x83, 0, 0}, 0, 2, 517 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 519 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 521 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 1, {0x83, 0, 0}, 0, 2, 523 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 525 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 2, 275 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x01, 0, 0}, 0, 2, 212 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x01, 0, 0}, 0, 2, 218 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 64, 0, 0, 1, {0x01, 0, 0}, 0, 2, 224 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x02, 0, 0}, 0, 2, 277 },
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x04, 0, 0}, 0, 2, 492 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op2Add, MOD_Op1AddSp, 0}, 16, 0, 0, 2, {0x83, 0xC0, 0x05}, 0, 2, 569 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op2Add, MOD_Op1AddSp, 0}, 32, 0, 0, 2, {0x83, 0xC0, 0x05}, 0, 2, 571 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op2Add, MOD_Op1AddSp, 0}, 64, 0, 0, 2, {0x83, 0xC0, 0x05}, 0, 2, 573 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0x80, 0, 0}, 0, 2, 415 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0x80, 0, 0}, 0, 2, 407 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0x83, 0, 0}, 0, 2, 575 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 577 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 579 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0x83, 0, 0}, 0, 2, 581 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 583 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 585 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 1, {0x83, 0, 0}, 0, 2, 587 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 1, {0x83, 0x81, 0}, 0, 2, 589 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 2, 317 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x01, 0, 0}, 0, 2, 254 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x01, 0, 0}, 0, 2, 260 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 64, 0, 0, 1, {0x01, 0, 0}, 0, 2, 266 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x02, 0, 0}, 0, 2, 319 },
     { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x03, 0, 0}, 0, 2, 98 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x03, 0, 0}, 0, 2, 101 },
     { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 64, 0, 0, 1, {0x03, 0, 0}, 0, 2, 104 }
 };
 
 static const x86_insn_info incdec_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xFE, 0, 0}, 0, 1, 373 },
-    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x00, 0, 0}, 0, 1, 357 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 239 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 1, 359 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 235 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 238 }
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xFE, 0, 0}, 0, 1, 415 },
+    { SUF_W|SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 16, 0, 0, 1, {0x00, 0, 0}, 0, 1, 399 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 281 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 1, 401 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 277 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 280 }
 };
 
 static const x86_insn_info f6_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 1, 373 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 239 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 235 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 238 }
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 1, 415 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 281 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 277 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 280 }
 };
 
 static const x86_insn_info div_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 1, 373 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 239 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 235 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 238 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 2, 411 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 413 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 415 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 417 }
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 1, 415 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 281 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 277 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 1, 280 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 2, 465 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 467 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 469 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 471 }
 };
 
 static const x86_insn_info test_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA8, 0, 0}, 0, 2, 440 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA9, 0, 0}, 0, 2, 555 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA9, 0, 0}, 0, 2, 557 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA9, 0, 0}, 0, 2, 559 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 2, 373 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 2, 365 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 375 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 367 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 377 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 369 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 379 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 371 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x84, 0, 0}, 0, 2, 275 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x85, 0, 0}, 0, 2, 212 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x85, 0, 0}, 0, 2, 218 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x85, 0, 0}, 0, 2, 224 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x84, 0, 0}, 0, 2, 277 },
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xA8, 0, 0}, 0, 2, 492 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xA9, 0, 0}, 0, 2, 619 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA9, 0, 0}, 0, 2, 621 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xA9, 0, 0}, 0, 2, 623 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 2, 415 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 0, 2, 407 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 417 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 409 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 419 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 411 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 421 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 0, 2, 413 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x84, 0, 0}, 0, 2, 317 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x85, 0, 0}, 0, 2, 254 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x85, 0, 0}, 0, 2, 260 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x85, 0, 0}, 0, 2, 266 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x84, 0, 0}, 0, 2, 319 },
     { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x85, 0, 0}, 0, 2, 98 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x85, 0, 0}, 0, 2, 101 },
     { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x85, 0, 0}, 0, 2, 104 }
@@ -966,201 +1043,201 @@
 };
 
 static const x86_insn_info imul_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 5, 1, 373 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 5, 1, 239 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 5, 1, 235 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 5, 1, 238 },
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xF6, 0, 0}, 5, 1, 415 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xF7, 0, 0}, 5, 1, 281 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xF7, 0, 0}, 5, 1, 277 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xF7, 0, 0}, 5, 1, 280 },
     { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xAF, 0}, 0, 2, 98 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xAF, 0}, 0, 2, 101 },
     { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xAF, 0}, 0, 2, 104 },
     { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x6B, 0, 0}, 0, 3, 98 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6B, 0, 0}, 0, 3, 101 },
     { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x6B, 0, 0}, 0, 3, 104 },
-    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x6B, 0, 0}, 0, 2, 255 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6B, 0, 0}, 0, 2, 257 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x6B, 0, 0}, 0, 2, 259 },
+    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x6B, 0, 0}, 0, 2, 297 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6B, 0, 0}, 0, 2, 299 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x6B, 0, 0}, 0, 2, 301 },
     { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x6B, 0x69, 0}, 0, 3, 107 },
     { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6B, 0x69, 0}, 0, 3, 110 },
     { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x6B, 0x69, 0}, 0, 3, 113 },
-    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x6B, 0x69, 0}, 0, 2, 261 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6B, 0x69, 0}, 0, 2, 263 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x6B, 0x69, 0}, 0, 2, 265 }
+    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x6B, 0x69, 0}, 0, 2, 303 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x6B, 0x69, 0}, 0, 2, 305 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x6B, 0x69, 0}, 0, 2, 307 }
 };
 
 static const x86_insn_info shift_insn[] = {
-   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD2, 0, 0}, 0, 2, 481 },
-    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD0, 0, 0}, 0, 2, 483 },
-    { SUF_B|SUF_Z, 0, CPU_186, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xC0, 0, 0}, 0, 2, 373 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xD3, 0, 0}, 0, 2, 485 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xD1, 0, 0}, 0, 2, 487 },
-    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xC1, 0, 0}, 0, 2, 239 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xD3, 0, 0}, 0, 2, 489 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xD1, 0, 0}, 0, 2, 491 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xC1, 0, 0}, 0, 2, 241 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xD3, 0, 0}, 0, 2, 493 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xD1, 0, 0}, 0, 2, 495 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xC1, 0, 0}, 0, 2, 243 },
-    { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD0, 0, 0}, 0, 1, 373 },
-    { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xD1, 0, 0}, 0, 1, 239 },
-    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xD1, 0, 0}, 0, 1, 235 },
-    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xD1, 0, 0}, 0, 1, 238 }
+   { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD2, 0, 0}, 0, 2, 545 },
+    { SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD0, 0, 0}, 0, 2, 547 },
+    { SUF_B|SUF_Z, 0, CPU_186, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xC0, 0, 0}, 0, 2, 415 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xD3, 0, 0}, 0, 2, 549 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xD1, 0, 0}, 0, 2, 551 },
+    { SUF_W|SUF_Z, 0, CPU_186, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xC1, 0, 0}, 0, 2, 281 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xD3, 0, 0}, 0, 2, 553 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xD1, 0, 0}, 0, 2, 555 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xC1, 0, 0}, 0, 2, 283 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xD3, 0, 0}, 0, 2, 557 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xD1, 0, 0}, 0, 2, 559 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xC1, 0, 0}, 0, 2, 285 },
+    { GAS_ONLY|SUF_B|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD0, 0, 0}, 0, 1, 415 },
+    { GAS_ONLY|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xD1, 0, 0}, 0, 1, 281 },
+    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xD1, 0, 0}, 0, 1, 277 },
+    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xD1, 0, 0}, 0, 1, 280 }
 };
 
 static const x86_insn_info shlrd_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 212 },
-    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x01, 0}, 0, 3, 215 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 218 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 3, 221 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 224 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 3, 227 },
-    { GAS_ONLY|SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 212 },
-    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 218 },
-    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 224 }
+   { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 254 },
+    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x01, 0}, 0, 3, 257 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 260 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 3, 263 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 266 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 3, 269 },
+    { GAS_ONLY|SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 254 },
+    { GAS_ONLY|SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 260 },
+    { GAS_ONLY|SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 266 }
 };
 
 static const x86_insn_info call_insn[] = {
-   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 597 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 0, {0, 0, 0}, 0, 1, 598 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 0, {0, 0, 0}, 0, 1, 599 },
-    { SUF_L|SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 0, {0, 0, 0}, 0, 1, 599 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xE8, 0, 0}, 0, 1, 600 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE8, 0, 0}, 0, 1, 601 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xE8, 0, 0}, 0, 1, 601 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xE8, 0, 0}, 0, 1, 602 },
-    { SUF_W, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 2, 1, 239 },
-    { SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 2, 1, 235 },
-    { SUF_Q, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 238 },
-    { GAS_ONLY|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 603 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 596 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 604 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 2, 1, 605 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 606 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 607 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 608 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 609 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 610 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 611 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 612 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 613 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 614 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 615 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 616 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 617 },
-    { GAS_ONLY|GAS_NO_REV|SUF_W, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x9A, 0, 0}, 0, 2, 499 },
-    { GAS_ONLY|GAS_NO_REV|SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x9A, 0, 0}, 0, 2, 501 },
-    { GAS_ONLY|GAS_NO_REV|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x9A, 0, 0}, 0, 2, 503 }
+   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 669 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 0, {0, 0, 0}, 0, 1, 670 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 0, {0, 0, 0}, 0, 1, 671 },
+    { SUF_L|SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 0, {0, 0, 0}, 0, 1, 671 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xE8, 0, 0}, 0, 1, 672 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE8, 0, 0}, 0, 1, 673 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xE8, 0, 0}, 0, 1, 673 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xE8, 0, 0}, 0, 1, 674 },
+    { SUF_W, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 2, 1, 281 },
+    { SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 2, 1, 277 },
+    { SUF_Q, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 280 },
+    { GAS_ONLY|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 675 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 668 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 676 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 2, 1, 677 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 678 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 2, 1, 679 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 680 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 681 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 682 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xFF, 0, 0}, 3, 1, 683 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 684 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 685 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 686 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 687 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 688 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x9A, 0, 0}, 0, 1, 689 },
+    { GAS_ONLY|GAS_NO_REV|SUF_W, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x9A, 0, 0}, 0, 2, 563 },
+    { GAS_ONLY|GAS_NO_REV|SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x9A, 0, 0}, 0, 2, 565 },
+    { GAS_ONLY|GAS_NO_REV|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0x9A, 0, 0}, 0, 2, 567 }
 };
 
 static const x86_insn_info jmp_insn[] = {
-   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 597 },
-    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 0, {0, 0, 0}, 0, 1, 598 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 1, 599 },
-    { SUF_L|SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x00, 0, 0}, 0, 1, 599 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xEB, 0, 0}, 0, 1, 421 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xE9, 0, 0}, 0, 1, 600 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE9, 0, 0}, 0, 1, 601 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xE9, 0, 0}, 0, 1, 601 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xE9, 0, 0}, 0, 1, 602 },
-    { SUF_W, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 239 },
-    { SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 4, 1, 235 },
-    { SUF_Q, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 238 },
-    { GAS_ONLY|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 603 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 596 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 604 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 4, 1, 605 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 606 },
-    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 607 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 608 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 609 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 610 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 611 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 612 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 613 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 614 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 615 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 616 },
-    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 617 },
-    { GAS_ONLY|GAS_NO_REV|SUF_W, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEA, 0, 0}, 0, 2, 499 },
-    { GAS_ONLY|GAS_NO_REV|SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEA, 0, 0}, 0, 2, 501 },
-    { GAS_ONLY|GAS_NO_REV|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEA, 0, 0}, 0, 2, 503 }
+   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 669 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 0, {0, 0, 0}, 0, 1, 670 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 1, 671 },
+    { SUF_L|SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0x00, 0, 0}, 0, 1, 671 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xEB, 0, 0}, 0, 1, 477 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xE9, 0, 0}, 0, 1, 672 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xE9, 0, 0}, 0, 1, 673 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xE9, 0, 0}, 0, 1, 673 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xE9, 0, 0}, 0, 1, 674 },
+    { SUF_W, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 281 },
+    { SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 4, 1, 277 },
+    { SUF_Q, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 280 },
+    { GAS_ONLY|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 675 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 668 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 676 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 4, 1, 677 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 678 },
+    { GAS_ILLEGAL|SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 1, {0xFF, 0, 0}, 4, 1, 679 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 680 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 681 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 682 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xFF, 0, 0}, 5, 1, 683 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 684 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 685 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 686 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 687 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 688 },
+    { GAS_ILLEGAL|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEA, 0, 0}, 0, 1, 689 },
+    { GAS_ONLY|GAS_NO_REV|SUF_W, NOT_64, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xEA, 0, 0}, 0, 2, 563 },
+    { GAS_ONLY|GAS_NO_REV|SUF_L, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xEA, 0, 0}, 0, 2, 565 },
+    { GAS_ONLY|GAS_NO_REV|SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xEA, 0, 0}, 0, 2, 567 }
 };
 
 static const x86_insn_info ljmpcall_insn[] = {
-   { SUF_W, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 22 },
-    { SUF_L, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 50 },
+   { SUF_W, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 16, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 34 },
+    { SUF_L, 0, CPU_386, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 58 },
     { SUF_Q, ONLY_64, 0, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 6 },
-    { SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 621 },
-    { GAS_NO_REV|SUF_W, NOT_64, 0, 0, 0, {MOD_Gap, MOD_Op0Add, 0}, 16, 0, 0, 1, {0x00, 0, 0}, 0, 2, 499 },
-    { GAS_NO_REV|SUF_L, NOT_64, CPU_386, 0, 0, {MOD_Gap, MOD_Op0Add, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 2, 501 },
-    { GAS_NO_REV|SUF_Z, NOT_64, 0, 0, 0, {MOD_Gap, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 2, 503 }
+    { SUF_Z, 0, 0, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xFF, 0, 0}, 0, 1, 693 },
+    { GAS_NO_REV|SUF_W, NOT_64, 0, 0, 0, {MOD_Gap, MOD_Op0Add, 0}, 16, 0, 0, 1, {0x00, 0, 0}, 0, 2, 563 },
+    { GAS_NO_REV|SUF_L, NOT_64, CPU_386, 0, 0, {MOD_Gap, MOD_Op0Add, 0}, 32, 0, 0, 1, {0x00, 0, 0}, 0, 2, 565 },
+    { GAS_NO_REV|SUF_Z, NOT_64, 0, 0, 0, {MOD_Gap, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 2, 567 }
 };
 
 static const x86_insn_info retnf_insn[] = {
    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x01, 0, 0}, 0, 0, 0 },
-    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 358 },
+    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 400 },
     { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, MOD_OpSizeR, 0}, 0, 0, 0, 1, {0x01, 0, 0}, 0, 0, 0 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, MOD_OpSizeR, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 358 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, MOD_OpSizeR, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 400 },
     { SUF_L|SUF_Q|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, MOD_OpSizeR, 0}, 0, 0, 0, 1, {0x01, 0, 0}, 0, 0, 0 },
-    { SUF_L|SUF_Q|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, MOD_OpSizeR, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 358 }
+    { SUF_L|SUF_Q|SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, MOD_OpSizeR, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 400 }
 };
 
 static const x86_insn_info enter_insn[] = {
-   { GAS_NO_REV|SUF_L|SUF_Z, NOT_64, CPU_186, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xC8, 0, 0}, 0, 2, 569 },
-    { GAS_NO_REV|SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xC8, 0, 0}, 0, 2, 569 },
-    { GAS_ONLY|GAS_NO_REV|SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xC8, 0, 0}, 0, 2, 569 }
+   { GAS_NO_REV|SUF_L|SUF_Z, NOT_64, CPU_186, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xC8, 0, 0}, 0, 2, 639 },
+    { GAS_NO_REV|SUF_Q|SUF_Z, ONLY_64, CPU_186, 0, 0, {0, 0, 0}, 64, 64, 0, 1, {0xC8, 0, 0}, 0, 2, 639 },
+    { GAS_ONLY|GAS_NO_REV|SUF_W|SUF_Z, 0, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0xC8, 0, 0}, 0, 2, 639 }
 };
 
 static const x86_insn_info jcc_insn[] = {
-   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 419 },
-    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 0, {0, 0, 0}, 0, 1, 622 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 0, {0, 0, 0}, 0, 1, 623 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 0, {0, 0, 0}, 0, 1, 623 },
-    { SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0x70, 0, 0}, 0, 1, 421 },
-    { SUF_Z, 0, CPU_186, 0, 0, {MOD_Op1Add, 0, 0}, 16, 64, 0, 2, {0x0F, 0x80, 0}, 0, 1, 600 },
-    { SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x80, 0}, 0, 1, 601 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 64, 0, 2, {0x0F, 0x80, 0}, 0, 1, 601 },
-    { SUF_Z, 0, CPU_186, 0, 0, {MOD_Op1Add, 0, 0}, 0, 64, 0, 2, {0x0F, 0x80, 0}, 0, 1, 602 }
+   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 475 },
+    { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 16, 0, 0, 0, {0, 0, 0}, 0, 1, 694 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 0, {0, 0, 0}, 0, 1, 695 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 0, {0, 0, 0}, 0, 1, 695 },
+    { SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0x70, 0, 0}, 0, 1, 477 },
+    { SUF_Z, 0, CPU_186, 0, 0, {MOD_Op1Add, 0, 0}, 16, 64, 0, 2, {0x0F, 0x80, 0}, 0, 1, 672 },
+    { SUF_Z, NOT_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x80, 0}, 0, 1, 673 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 64, 0, 2, {0x0F, 0x80, 0}, 0, 1, 673 },
+    { SUF_Z, 0, CPU_186, 0, 0, {MOD_Op1Add, 0, 0}, 0, 64, 0, 2, {0x0F, 0x80, 0}, 0, 1, 674 }
 };
 
 static const x86_insn_info jcxz_insn[] = {
-   { SUF_Z, 0, 0, 0, 0, {MOD_AdSizeR, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 419 },
-    { SUF_Z, 0, 0, 0, 0, {MOD_AdSizeR, 0, 0}, 0, 64, 0, 1, {0xE3, 0, 0}, 0, 1, 421 }
+   { SUF_Z, 0, 0, 0, 0, {MOD_AdSizeR, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 475 },
+    { SUF_Z, 0, 0, 0, 0, {MOD_AdSizeR, 0, 0}, 0, 64, 0, 1, {0xE3, 0, 0}, 0, 1, 477 }
 };
 
 static const x86_insn_info loop_insn[] = {
-   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 419 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 2, 433 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 419 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 429 },
-    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0xE0, 0, 0}, 0, 1, 421 },
-    { SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 435 },
-    { SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 421 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 431 }
+   { SUF_Z, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 1, 475 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, {0, 0, 0}, 0, 2, 487 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 475 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 483 },
+    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 1, {0xE0, 0, 0}, 0, 1, 477 },
+    { SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 489 },
+    { SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 477 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 485 }
 };
 
 static const x86_insn_info loopw_insn[] = {
-   { SUF_Z, NOT_64, 0, 0, 0, {MOD_Gap, MOD_AdSizeR, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 1, 419 },
-    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, MOD_AdSizeR, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 1, 421 },
-    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 433 },
-    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 435 }
+   { SUF_Z, NOT_64, 0, 0, 0, {MOD_Gap, MOD_AdSizeR, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 1, 475 },
+    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, MOD_AdSizeR, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 1, 477 },
+    { SUF_Z, NOT_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 487 },
+    { SUF_Z, NOT_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 489 }
 };
 
 static const x86_insn_info loopl_insn[] = {
-   { SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_AdSizeR, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 1, 419 },
-    { SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, MOD_AdSizeR, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 1, 421 },
-    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 419 },
-    { SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 421 }
+   { SUF_Z, 0, 0, 0, 0, {MOD_Gap, MOD_AdSizeR, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 1, 475 },
+    { SUF_Z, 0, 0, 0, 0, {MOD_Op0Add, MOD_AdSizeR, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 1, 477 },
+    { SUF_Z, 0, CPU_386, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 475 },
+    { SUF_Z, 0, CPU_386, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 477 }
 };
 
 static const x86_insn_info loopq_insn[] = {
-   { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_AdSizeR, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 1, 419 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, MOD_AdSizeR, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 1, 421 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 429 },
-    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 431 }
+   { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Gap, MOD_AdSizeR, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 1, 475 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, MOD_AdSizeR, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 1, 477 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 0, 64, 0, 0, {0, 0, 0}, 0, 2, 483 },
+    { SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op0Add, 0, 0}, 0, 64, 0, 1, {0xE0, 0, 0}, 0, 2, 485 }
 };
 
 static const x86_insn_info setcc_insn[] = {
-   { SUF_B|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x90, 0}, 2, 1, 275 }
+   { SUF_B|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x90, 0}, 2, 1, 317 }
 };
 
 static const x86_insn_info cmpsd_insn[] = {
@@ -1174,18 +1251,18 @@
 static const x86_insn_info movsd_insn[] = {
    { SUF_Z, NOT_AVX, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0xA5, 0, 0}, 0, 0, 0 },
     { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x10, 0}, 0, 2, 92 },
-    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x10, 0}, 0, 2, 401 },
-    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x11, 0}, 0, 2, 39 },
+    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x10, 0}, 0, 2, 445 },
+    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x11, 0}, 0, 2, 47 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC3, 2, {0x0F, 0x10, 0}, 0, 3, 0 }
 };
 
 static const x86_insn_info bittest_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 212 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 218 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 224 },
-    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 2, {0x0F, 0xBA, 0}, 0, 2, 239 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 2, {0x0F, 0xBA, 0}, 0, 2, 241 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 2, {0x0F, 0xBA, 0}, 0, 2, 243 }
+   { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 254 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 260 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 266 },
+    { SUF_W|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 16, 0, 0, 2, {0x0F, 0xBA, 0}, 0, 2, 281 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 32, 0, 0, 2, {0x0F, 0xBA, 0}, 0, 2, 283 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_386, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 64, 0, 0, 2, {0x0F, 0xBA, 0}, 0, 2, 285 }
 };
 
 static const x86_insn_info bsfr_insn[] = {
@@ -1199,18 +1276,27 @@
 };
 
 static const x86_insn_info bound_insn[] = {
-   { SUF_W|SUF_Z, NOT_64, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x62, 0, 0}, 0, 2, 405 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x62, 0, 0}, 0, 2, 311 }
+   { SUF_W|SUF_Z, NOT_64, CPU_186, 0, 0, {0, 0, 0}, 16, 0, 0, 1, {0x62, 0, 0}, 0, 2, 459 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, 0, 0, {0, 0, 0}, 32, 0, 0, 1, {0x62, 0, 0}, 0, 2, 353 }
+};
+
+static const x86_insn_info larlsl_insn[] = {
+   { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 449 },
+    { SUF_W|SUF_Z, 0, 0, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 98 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 451 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 453 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 455 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 457 }
 };
 
 static const x86_insn_info arpl_insn[] = {
-   { SUF_W|SUF_Z, NOT_64, CPU_286, CPU_Prot, 0, {0, 0, 0}, 0, 0, 0, 1, {0x63, 0, 0}, 0, 2, 212 }
+   { SUF_W|SUF_Z, NOT_64, CPU_286, CPU_Prot, 0, {0, 0, 0}, 0, 0, 0, 1, {0x63, 0, 0}, 0, 2, 254 }
 };
 
 static const x86_insn_info str_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_286, CPU_Prot, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 347 },
-    { SUF_L|SUF_Z, 0, CPU_386, CPU_Prot, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 14 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_286, CPU_Prot, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 18 },
+   { SUF_W|SUF_Z, 0, CPU_286, CPU_Prot, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 389 },
+    { SUF_L|SUF_Z, 0, CPU_386, CPU_Prot, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 26 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_286, CPU_Prot, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 30 },
     { SUF_L|SUF_W|SUF_Z, 0, CPU_286, CPU_Prot, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 1, 1, 99 }
 };
 
@@ -1219,123 +1305,123 @@
 };
 
 static const x86_insn_info sldtmsw_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 22 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 50 },
+   { SUF_W|SUF_Z, 0, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 34 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 58 },
     { SUF_Q|SUF_Z, ONLY_64, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 6 },
-    { SUF_W|SUF_Z, 0, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 347 },
-    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 14 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 18 }
+    { SUF_W|SUF_Z, 0, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 16, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 389 },
+    { SUF_L|SUF_Z, 0, CPU_386, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 32, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 26 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_286, 0, 0, {MOD_SpAdd, MOD_Op1Add, 0}, 64, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 30 }
 };
 
 static const x86_insn_info fld_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 0, 1, 578 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 0, 1, 197 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 5, 1, 580 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC0, 0}, 0, 1, 280 }
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 0, 1, 648 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 0, 1, 212 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 5, 1, 650 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC0, 0}, 0, 1, 322 }
 };
 
 static const x86_insn_info fstp_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 3, 1, 578 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 3, 1, 197 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 7, 1, 580 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xDD, 0xD8, 0}, 0, 1, 280 }
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 3, 1, 648 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 3, 1, 212 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 7, 1, 650 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xDD, 0xD8, 0}, 0, 1, 322 }
 };
 
 static const x86_insn_info fldstpt_insn[] = {
-   { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 0, 1, 498 }
+   { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 0, 1, 562 }
 };
 
 static const x86_insn_info fildstp_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDF, 0, 0}, 0, 1, 577 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 0, 1, 578 },
-    { SUF_Q|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op0Add, MOD_SpAdd}, 0, 0, 0, 1, {0xDD, 0, 0}, 0, 1, 197 },
-    { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDF, 0, 0}, 0, 1, 22 }
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDF, 0, 0}, 0, 1, 647 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDB, 0, 0}, 0, 1, 648 },
+    { SUF_Q|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op0Add, MOD_SpAdd}, 0, 0, 0, 1, {0xDD, 0, 0}, 0, 1, 212 },
+    { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDF, 0, 0}, 0, 1, 34 }
 };
 
 static const x86_insn_info fbldstp_insn[] = {
-   { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDF, 0, 0}, 0, 1, 498 }
+   { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xDF, 0, 0}, 0, 1, 562 }
 };
 
 static const x86_insn_info fst_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 2, 1, 578 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 2, 1, 197 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xDD, 0xD0, 0}, 0, 1, 280 }
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 2, 1, 648 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 2, 1, 212 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xDD, 0xD0, 0}, 0, 1, 322 }
 };
 
 static const x86_insn_info fxch_insn[] = {
-   { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC8, 0}, 0, 1, 280 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC8, 0}, 0, 2, 279 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC8, 0}, 0, 2, 281 },
+   { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC8, 0}, 0, 1, 322 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC8, 0}, 0, 2, 321 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC8, 0}, 0, 2, 323 },
     { SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xD9, 0xC9, 0}, 0, 0, 0 }
 };
 
 static const x86_insn_info fcom_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xD8, 0, 0}, 0, 1, 578 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xDC, 0, 0}, 0, 1, 197 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 1, 280 },
-    { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xD8, 0, 0}, 0, 1, 50 },
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xD8, 0, 0}, 0, 1, 648 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xDC, 0, 0}, 0, 1, 212 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 1, 322 },
+    { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_SpAdd, 0}, 0, 0, 0, 1, {0xD8, 0, 0}, 0, 1, 58 },
     { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xD8, 0x01, 0}, 0, 0, 0 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 2, 279 }
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 2, 321 }
 };
 
 static const x86_insn_info fcom2_insn[] = {
-   { SUF_Z, 0, CPU_286, CPU_FPU, 0, {MOD_Op0Add, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 1, 280 },
-    { SUF_Z, 0, CPU_286, CPU_FPU, 0, {MOD_Op0Add, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 2, 279 }
+   { SUF_Z, 0, CPU_286, CPU_FPU, 0, {MOD_Op0Add, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 1, 322 },
+    { SUF_Z, 0, CPU_286, CPU_FPU, 0, {MOD_Op0Add, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 2, 321 }
 };
 
 static const x86_insn_info farith_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Gap, MOD_SpAdd}, 0, 0, 0, 1, {0xD8, 0, 0}, 0, 1, 578 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Gap, MOD_SpAdd}, 0, 0, 0, 1, {0xDC, 0, 0}, 0, 1, 197 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op1Add, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 1, 280 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op1Add, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 2, 279 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDC, 0x00, 0}, 0, 1, 618 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDC, 0x00, 0}, 0, 2, 281 },
-    { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op1Add, 0}, 0, 0, 0, 2, {0xDC, 0x00, 0}, 0, 2, 281 }
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Gap, MOD_SpAdd}, 0, 0, 0, 1, {0xD8, 0, 0}, 0, 1, 648 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Gap, MOD_SpAdd}, 0, 0, 0, 1, {0xDC, 0, 0}, 0, 1, 212 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op1Add, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 1, 322 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op1Add, 0}, 0, 0, 0, 2, {0xD8, 0x00, 0}, 0, 2, 321 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDC, 0x00, 0}, 0, 1, 690 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDC, 0x00, 0}, 0, 2, 323 },
+    { GAS_ONLY|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Gap, MOD_Op1Add, 0}, 0, 0, 0, 2, {0xDC, 0x00, 0}, 0, 2, 323 }
 };
 
 static const x86_insn_info farithp_insn[] = {
    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDE, 0x01, 0}, 0, 0, 0 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDE, 0x00, 0}, 0, 1, 280 },
-    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDE, 0x00, 0}, 0, 2, 281 }
+    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDE, 0x00, 0}, 0, 1, 322 },
+    { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0xDE, 0x00, 0}, 0, 2, 323 }
 };
 
 static const x86_insn_info fiarith_insn[] = {
-   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x04, 0, 0}, 0, 1, 577 },
-    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 578 }
+   { SUF_S|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x04, 0, 0}, 0, 1, 647 },
+    { SUF_L|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, MOD_Op0Add, 0}, 0, 0, 0, 1, {0x00, 0, 0}, 0, 1, 648 }
 };
 
 static const x86_insn_info fldnstcw_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 0, 1, 22 }
+   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0, 1, {0xD9, 0, 0}, 0, 1, 34 }
 };
 
 static const x86_insn_info fstcw_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x9B, 0xD9, 0}, 7, 1, 22 }
+   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x9B, 0xD9, 0}, 7, 1, 34 }
 };
 
 static const x86_insn_info fnstsw_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 7, 1, 22 },
-    { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xDF, 0xE0, 0}, 0, 1, 295 }
+   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 1, {0xDD, 0, 0}, 7, 1, 34 },
+    { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0xDF, 0xE0, 0}, 0, 1, 337 }
 };
 
 static const x86_insn_info fstsw_insn[] = {
-   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x9B, 0xDD, 0}, 7, 1, 22 },
-    { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 3, {0x9B, 0xDF, 0xE0}, 0, 1, 295 }
+   { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x9B, 0xDD, 0}, 7, 1, 34 },
+    { SUF_W|SUF_Z, 0, CPU_FPU, 0, 0, {0, 0, 0}, 0, 0, 0, 3, {0x9B, 0xDF, 0xE0}, 0, 1, 337 }
 };
 
 static const x86_insn_info ffree_insn[] = {
-   { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 2, {0x00, 0xC0, 0}, 0, 1, 280 }
+   { SUF_Z, 0, CPU_FPU, 0, 0, {MOD_Op0Add, 0, 0}, 0, 0, 0, 2, {0x00, 0xC0, 0}, 0, 1, 322 }
 };
 
 static const x86_insn_info bswap_insn[] = {
-   { SUF_L|SUF_Z, 0, CPU_486, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xC8, 0}, 0, 1, 619 },
-    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC8, 0}, 0, 1, 620 }
+   { SUF_L|SUF_Z, 0, CPU_486, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xC8, 0}, 0, 1, 691 },
+    { SUF_Q|SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC8, 0}, 0, 1, 692 }
 };
 
 static const x86_insn_info cmpxchgxadd_insn[] = {
-   { SUF_B|SUF_Z, 0, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 275 },
-    { SUF_W|SUF_Z, 0, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 212 },
-    { SUF_L|SUF_Z, 0, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 218 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 224 }
+   { SUF_B|SUF_Z, 0, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 317 },
+    { SUF_W|SUF_Z, 0, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 16, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 254 },
+    { SUF_L|SUF_Z, 0, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 32, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 260 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_486, 0, 0, {MOD_Op1Add, 0, 0}, 64, 0, 0, 2, {0x0F, 0x01, 0}, 0, 2, 266 }
 };
 
 static const x86_insn_info cmpxchg8b_insn[] = {
@@ -1349,148 +1435,165 @@
 };
 
 static const x86_insn_info fcmovcc_insn[] = {
-   { SUF_Z, 0, CPU_686, CPU_FPU, 0, {MOD_Op0Add, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 2, 279 }
+   { SUF_Z, 0, CPU_686, CPU_FPU, 0, {MOD_Op0Add, MOD_Op1Add, 0}, 0, 0, 0, 2, {0x00, 0x00, 0}, 0, 2, 321 }
 };
 
 static const x86_insn_info movnti_insn[] = {
-   { SUF_L|SUF_Z, 0, CPU_P4, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xC3, 0}, 0, 2, 289 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_P4, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC3, 0}, 0, 2, 291 }
+   { SUF_L|SUF_Z, 0, CPU_P4, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xC3, 0}, 0, 2, 331 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_P4, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC3, 0}, 0, 2, 333 }
 };
 
 static const x86_insn_info clflush_insn[] = {
-   { SUF_Z, 0, CPU_P3, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xAE, 0}, 7, 1, 42 }
+   { SUF_Z, 0, CPU_P3, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xAE, 0}, 7, 1, 50 }
 };
 
 static const x86_insn_info movd_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_MMX, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 245 },
-    { SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 247 },
-    { SUF_Z, 0, CPU_386, CPU_MMX, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 246 },
-    { SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 249 },
-    { SUF_Z, 0, CPU_386, CPU_SSE2, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 251 },
-    { SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 253 },
-    { SUF_Z, 0, CPU_386, CPU_SSE2, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 173 },
-    { SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 167 }
+   { SUF_Z, 0, CPU_386, CPU_MMX, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 287 },
+    { SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 289 },
+    { SUF_Z, 0, CPU_386, CPU_MMX, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 288 },
+    { SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 291 },
+    { SUF_Z, 0, CPU_386, CPU_SSE2, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 293 },
+    { SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 295 },
+    { SUF_Z, 0, CPU_386, CPU_SSE2, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 188 },
+    { SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 182 }
 };
 
 static const x86_insn_info movq_insn[] = {
-   { GAS_ILLEGAL|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x6F, 0}, 0, 2, 185 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 247 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x7F, 0}, 0, 2, 283 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 249 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 88 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 285 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 253 },
-    { GAS_ILLEGAL|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xD6, 0}, 0, 2, 287 },
-    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 167 }
+   { GAS_ILLEGAL|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x6F, 0}, 0, 2, 140 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x6E, 0}, 0, 2, 289 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_MMX, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x7F, 0}, 0, 2, 325 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_MMX, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0x7E, 0}, 0, 2, 291 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 64 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x7E, 0}, 0, 2, 327 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x6E, 0}, 0, 2, 295 },
+    { GAS_ILLEGAL|SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xD6, 0}, 0, 2, 329 },
+    { GAS_ILLEGAL|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0x7E, 0}, 0, 2, 182 }
 };
 
 static const x86_insn_info mmxsse2_insn[] = {
-   { SUF_Z, 0, CPU_MMX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 185 },
-    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x00, 0}, 0, 2, 170 }
+   { SUF_Z, 0, CPU_MMX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 140 },
+    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x00, 0}, 0, 2, 155 }
 };
 
 static const x86_insn_info pshift_insn[] = {
-   { SUF_Z, 0, CPU_MMX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 185 },
-    { SUF_Z, 0, CPU_MMX, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 147 },
-    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x00, 0}, 0, 2, 170 },
+   { SUF_Z, 0, CPU_MMX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 140 },
+    { SUF_Z, 0, CPU_MMX, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 162 },
+    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x00, 0}, 0, 2, 155 },
     { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0x66, 2, {0x0F, 0x00, 0}, 0, 2, 2 }
 };
 
 static const x86_insn_info vpshift_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 2, 451 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 3, 1 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 2, 505 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0xC1, 2, {0x0F, 0x00, 0}, 0, 3, 1 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0xC5, 2, {0x0F, 0x00, 0}, 0, 2, 633 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0xC5, 2, {0x0F, 0x00, 0}, 0, 2, 507 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0xC5, 2, {0x0F, 0x00, 0}, 0, 3, 8 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Gap, MOD_Op1Add, MOD_SpAdd}, 0, 0, 0xC5, 2, {0x0F, 0x00, 0}, 0, 3, 200 }
 };
 
 static const x86_insn_info xmm_xmm128_256_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 3, 8 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 197 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 3, 16 }
+};
+
+static const x86_insn_info xmm_xmm128_256avx2_insn[] = {
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 197 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 3, 16 }
 };
 
 static const x86_insn_info xmm_xmm128_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 52 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 12 }
 };
 
 static const x86_insn_info cvt_rx_xmm32_insn[] = {
-   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 149 },
-    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 311 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 155 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 313 }
+   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 164 },
+    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 353 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 170 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 355 }
 };
 
 static const x86_insn_info cvt_mm_xmm64_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 267 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 269 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 309 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 311 }
 };
 
 static const x86_insn_info cvt_xmm_mm_ps_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 285 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 327 }
 };
 
 static const x86_insn_info cvt_xmm_rmx_insn[] = {
-   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 573 },
-    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 134 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 575 },
-    { SUF_L|SUF_Z, ONLY_AVX|NOT_64, CPU_386, CPU_AVX, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 24 },
-    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 233 },
-    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 64, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 236 }
+   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 643 },
+    { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 233 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 645 },
+    { SUF_L|SUF_Z, ONLY_AVX|NOT_64, CPU_386, CPU_AVX, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 88 },
+    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 275 },
+    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 64, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 278 }
 };
 
 static const x86_insn_info xmm_xmm32_insn[] = {
    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 92 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 140 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 146 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 0 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 48 }
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 56 }
 };
 
 static const x86_insn_info ssecmp_128_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Imm8, MOD_PreAdd, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0xC2, 0}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC0, 2, {0x0F, 0xC2, 0}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC4, 2, {0x0F, 0xC2, 0}, 0, 3, 8 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Imm8, MOD_PreAdd, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0xC2, 0}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC0, 2, {0x0F, 0xC2, 0}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC4, 2, {0x0F, 0xC2, 0}, 0, 3, 16 }
 };
 
 static const x86_insn_info ssecmp_32_insn[] = {
    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Imm8, MOD_PreAdd, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0xC2, 0}, 0, 2, 92 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Imm8, MOD_PreAdd, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0xC2, 0}, 0, 2, 140 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_Imm8, MOD_PreAdd, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0xC2, 0}, 0, 2, 146 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC0, 2, {0x0F, 0xC2, 0}, 0, 3, 0 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC0, 2, {0x0F, 0xC2, 0}, 0, 3, 48 }
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Imm8, MOD_PreAdd, 0}, 0, 0, 0xC0, 2, {0x0F, 0xC2, 0}, 0, 3, 56 }
 };
 
 static const x86_insn_info xmm_xmm128_imm_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 170 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 185 }
+};
+
+static const x86_insn_info xmm_xmm128_imm_256avx2_insn[] = {
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 185 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 3, 191 }
 };
 
 static const x86_insn_info xmm_xmm128_imm_256_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 4, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 4, 8 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 3, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 4, 60 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 4, 20 }
 };
 
 static const x86_insn_info xmm_xmm32_imm_insn[] = {
    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 3, 92 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 3, 140 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 3, 146 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 4, 0 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 4, 48 }
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 4, 56 }
 };
 
 static const x86_insn_info ldstmxcsr_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SpAdd, MOD_SetVEX, 0}, 0, 0, 0, 2, {0x0F, 0xAE, 0}, 0, 1, 50 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SpAdd, MOD_SetVEX, 0}, 0, 0, 0, 2, {0x0F, 0xAE, 0}, 0, 1, 58 }
 };
 
 static const x86_insn_info maskmovq_insn[] = {
-   { SUF_Z, 0, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xF7, 0}, 0, 2, 567 }
+   { SUF_Z, 0, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xF7, 0}, 0, 2, 635 }
 };
 
 static const x86_insn_info movau_insn[] = {
-   { SUF_Z, NOT_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 170 },
-    { SUF_Z, NOT_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op1Add}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 425 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 170 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op1Add}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 425 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 176 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op1Add}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 427 }
+   { SUF_Z, NOT_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 155 },
+    { SUF_Z, NOT_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op1Add}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 479 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 155 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op1Add}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 479 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 191 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op1Add}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 481 }
 };
 
 static const x86_insn_info movhllhps_insn[] = {
@@ -1500,41 +1603,41 @@
 
 static const x86_insn_info movhlp_insn[] = {
    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 95 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x01, 0}, 0, 2, 39 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x01, 0}, 0, 2, 47 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 3, 4 }
 };
 
 static const x86_insn_info movmsk_insn[] = {
-   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_SetVEX, 0}, 0, 0, 0x00, 2, {0x0F, 0x50, 0}, 0, 2, 149 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_SetVEX, 0}, 64, 0, 0x00, 2, {0x0F, 0x50, 0}, 0, 2, 155 },
-    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {MOD_PreAdd, 0, 0}, 0, 0, 0xC4, 2, {0x0F, 0x50, 0}, 0, 2, 271 },
-    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, 0, 0}, 64, 0, 0xC4, 2, {0x0F, 0x50, 0}, 0, 2, 273 }
+   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE, 0, {MOD_PreAdd, MOD_SetVEX, 0}, 0, 0, 0x00, 2, {0x0F, 0x50, 0}, 0, 2, 164 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_SetVEX, 0}, 64, 0, 0x00, 2, {0x0F, 0x50, 0}, 0, 2, 170 },
+    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {MOD_PreAdd, 0, 0}, 0, 0, 0xC4, 2, {0x0F, 0x50, 0}, 0, 2, 313 },
+    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, 0, 0}, 64, 0, 0xC4, 2, {0x0F, 0x50, 0}, 0, 2, 315 }
 };
 
 static const x86_insn_info movnt_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 531 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 533 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 595 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 597 }
 };
 
 static const x86_insn_info movntq_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xE7, 0}, 0, 2, 315 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xE7, 0}, 0, 2, 357 }
 };
 
 static const x86_insn_info movss_insn[] = {
    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x10, 0}, 0, 2, 92 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x10, 0}, 0, 2, 288 },
-    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x11, 0}, 0, 2, 529 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x10, 0}, 0, 2, 330 },
+    { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x11, 0}, 0, 2, 444 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC2, 2, {0x0F, 0x10, 0}, 0, 3, 0 }
 };
 
 static const x86_insn_info pextrw_insn[] = {
-   { SUF_L|SUF_Z, NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xC5, 0}, 0, 3, 146 },
-    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xC5, 0}, 0, 3, 149 },
-    { SUF_Q|SUF_Z, ONLY_64|NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC5, 0}, 0, 3, 152 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0xC5, 0}, 0, 3, 155 },
-    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x15}, 0, 3, 158 },
-    { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 32, 0, 0x66, 3, {0x0F, 0x3A, 0x15}, 0, 3, 161 },
-    { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x15}, 0, 3, 164 }
+   { SUF_L|SUF_Z, NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xC5, 0}, 0, 3, 161 },
+    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xC5, 0}, 0, 3, 164 },
+    { SUF_Q|SUF_Z, ONLY_64|NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC5, 0}, 0, 3, 167 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0xC5, 0}, 0, 3, 170 },
+    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x15}, 0, 3, 173 },
+    { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 32, 0, 0x66, 3, {0x0F, 0x3A, 0x15}, 0, 3, 176 },
+    { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x15}, 0, 3, 179 }
 };
 
 static const x86_insn_info pinsrw_insn[] = {
@@ -1544,20 +1647,22 @@
     { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xC4, 0}, 0, 3, 125 },
     { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 64, 64, 0x66, 2, {0x0F, 0xC4, 0}, 0, 3, 128 },
     { SUF_L|SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xC4, 0}, 0, 3, 131 },
-    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0xC4, 0}, 0, 4, 12 },
-    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 64, 0xC1, 2, {0x0F, 0xC4, 0}, 0, 4, 16 },
-    { SUF_L|SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0xC4, 0}, 0, 4, 20 }
+    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0xC4, 0}, 0, 4, 24 },
+    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 64, 0xC1, 2, {0x0F, 0xC4, 0}, 0, 4, 28 },
+    { SUF_L|SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0xC4, 0}, 0, 4, 32 }
 };
 
 static const x86_insn_info pmovmskb_insn[] = {
-   { SUF_L|SUF_Z, NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xD7, 0}, 0, 2, 146 },
-    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xD7, 0}, 0, 2, 149 },
-    { SUF_Q|SUF_Z, ONLY_64|NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xD7, 0}, 0, 2, 152 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 2, {0x0F, 0xD7, 0}, 0, 2, 155 }
+   { SUF_L|SUF_Z, NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0xD7, 0}, 0, 2, 161 },
+    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xD7, 0}, 0, 2, 164 },
+    { SUF_L|SUF_Z, ONLY_AVX, CPU_386, CPU_AVX2, 0, {0, 0, 0}, 0, 0, 0xC5, 2, {0x0F, 0xD7, 0}, 0, 2, 313 },
+    { SUF_Q|SUF_Z, ONLY_64|NOT_AVX, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 64, 64, 0, 2, {0x0F, 0xD7, 0}, 0, 2, 167 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 64, 64, 0x66, 2, {0x0F, 0xD7, 0}, 0, 2, 170 },
+    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, CPU_SSE2, 0, 0, {0, 0, 0}, 64, 64, 0xC5, 2, {0x0F, 0xD7, 0}, 0, 2, 315 }
 };
 
 static const x86_insn_info pshufw_insn[] = {
-   { SUF_Z, 0, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x70, 0}, 0, 3, 185 }
+   { SUF_Z, 0, CPU_MMX, CPU_P3, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x70, 0}, 0, 3, 140 }
 };
 
 static const x86_insn_info xmm_xmm64_insn[] = {
@@ -1575,28 +1680,28 @@
 };
 
 static const x86_insn_info cvt_rx_xmm64_insn[] = {
-   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 149 },
-    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 290 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 155 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 409 }
+   { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 164 },
+    { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE2, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 332 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 170 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_SetVEX}, 64, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 463 }
 };
 
 static const x86_insn_info cvt_mm_xmm_insn[] = {
-   { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 543 }
+   { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 611 }
 };
 
 static const x86_insn_info cvt_xmm_mm_ss_insn[] = {
-   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 285 }
+   { SUF_Z, 0, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0x00, 2, {0x0F, 0x00, 0}, 0, 2, 327 }
 };
 
 static const x86_insn_info eptvpid_insn[] = {
-   { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_EPTVPID, 0, {MOD_Op2Add, 0, 0}, 32, 0, 0x66, 3, {0x0F, 0x38, 0x80}, 0, 2, 551 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_EPTVPID, 0, 0, {MOD_Op2Add, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x38, 0x80}, 0, 2, 553 }
+   { SUF_L|SUF_Z, NOT_64, CPU_386, CPU_EPTVPID, 0, {MOD_Op2Add, 0, 0}, 32, 0, 0x66, 3, {0x0F, 0x38, 0x80}, 0, 2, 607 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_EPTVPID, 0, 0, {MOD_Op2Add, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x38, 0x80}, 0, 2, 609 }
 };
 
 static const x86_insn_info vmxmemrd_insn[] = {
-   { SUF_L|SUF_Z, NOT_64, CPU_P4, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x78, 0}, 0, 2, 218 },
-    { SUF_Q|SUF_Z, ONLY_64, CPU_P4, 0, 0, {0, 0, 0}, 64, 64, 0, 2, {0x0F, 0x78, 0}, 0, 2, 224 }
+   { SUF_L|SUF_Z, NOT_64, CPU_P4, 0, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x78, 0}, 0, 2, 260 },
+    { SUF_Q|SUF_Z, ONLY_64, CPU_P4, 0, 0, {0, 0, 0}, 64, 64, 0, 2, {0x0F, 0x78, 0}, 0, 2, 266 }
 };
 
 static const x86_insn_info vmxmemwr_insn[] = {
@@ -1613,59 +1718,71 @@
 };
 
 static const x86_insn_info maskmovdqu_insn[] = {
-   { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xF7, 0}, 0, 2, 88 }
+   { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0xF7, 0}, 0, 2, 64 }
 };
 
 static const x86_insn_info movdq2q_insn[] = {
-   { SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0xD6, 0}, 0, 2, 267 }
+   { SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0xD6, 0}, 0, 2, 309 }
 };
 
 static const x86_insn_info movq2dq_insn[] = {
-   { SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0xD6, 0}, 0, 2, 397 }
+   { SUF_Z, 0, CPU_SSE2, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0xD6, 0}, 0, 2, 439 }
 };
 
 static const x86_insn_info pslrldq_insn[] = {
-   { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SpAdd, MOD_SetVEX, 0}, 0, 0, 0x66, 2, {0x0F, 0x73, 0}, 0, 2, 451 },
-    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SpAdd, MOD_SetVEX, 0}, 0, 0, 0x66, 2, {0x0F, 0x73, 0}, 0, 3, 1 }
+   { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SpAdd, MOD_SetVEX, 0}, 0, 0, 0x66, 2, {0x0F, 0x73, 0}, 0, 2, 505 },
+    { SUF_Z, 0, CPU_SSE2, 0, 0, {MOD_SpAdd, MOD_SetVEX, 0}, 0, 0, 0x66, 2, {0x0F, 0x73, 0}, 0, 3, 1 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0xC5, 2, {0x0F, 0x73, 0}, 0, 2, 507 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_SpAdd, 0, 0}, 0, 0, 0xC5, 2, {0x0F, 0x73, 0}, 0, 3, 200 }
 };
 
 static const x86_insn_info lddqu_insn[] = {
-   { SUF_Z, 0, CPU_SSE3, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0xF0, 0}, 0, 2, 527 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC7, 2, {0x0F, 0xF0, 0}, 0, 2, 565 }
+   { SUF_Z, 0, CPU_SSE3, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0xF0, 0}, 0, 2, 591 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC7, 2, {0x0F, 0xF0, 0}, 0, 2, 593 }
 };
 
 static const x86_insn_info ssse3_insn[] = {
-   { SUF_Z, NOT_AVX, CPU_SSSE3, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x38, 0x00}, 0, 2, 185 },
-    { SUF_Z, 0, CPU_SSSE3, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 52 }
+   { SUF_Z, NOT_AVX, CPU_SSSE3, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x38, 0x00}, 0, 2, 140 },
+    { SUF_Z, 0, CPU_SSSE3, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 197 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 }
 };
 
 static const x86_insn_info ssse3imm_insn[] = {
-   { SUF_Z, 0, CPU_SSSE3, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x3A, 0x00}, 0, 3, 185 },
-    { SUF_Z, 0, CPU_SSSE3, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 170 }
+   { SUF_Z, 0, CPU_SSSE3, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x3A, 0x00}, 0, 3, 140 },
+    { SUF_Z, 0, CPU_SSSE3, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 185 }
 };
 
 static const x86_insn_info sse4_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 170 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 176 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 155 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 191 }
 };
 
 static const x86_insn_info sse4imm_256_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 8 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 197 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 20 }
+};
+
+static const x86_insn_info sse4imm_256avx2_insn[] = {
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 197 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 20 }
 };
 
 static const x86_insn_info sse4imm_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 52 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 }
 };
 
 static const x86_insn_info sse4m32imm_insn[] = {
    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 92 },
-    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 140 },
+    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 146 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 0 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 48 }
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 56 }
 };
 
 static const x86_insn_info sse4m64imm_insn[] = {
@@ -1676,91 +1793,99 @@
 };
 
 static const x86_insn_info sse4xmm0_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 170 },
-    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 3, 209 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 155 },
+    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 3, 236 }
 };
 
 static const x86_insn_info avx_sse4xmm0_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 64 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 16 }
 };
 
-static const x86_insn_info avx_sse4xmm0_128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 }
+static const x86_insn_info avx2_sse4xmm0_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 16 }
 };
 
 static const x86_insn_info crc32_insn[] = {
-   { SUF_B|SUF_Z, 0, CPU_386, CPU_SSE42, 0, {0, 0, 0}, 0, 0, 0xF2, 3, {0x0F, 0x38, 0xF0}, 0, 2, 475 },
-    { SUF_W|SUF_Z, 0, CPU_386, CPU_SSE42, 0, {0, 0, 0}, 16, 0, 0xF2, 3, {0x0F, 0x38, 0xF1}, 0, 2, 477 },
+   { SUF_B|SUF_Z, 0, CPU_386, CPU_SSE42, 0, {0, 0, 0}, 0, 0, 0xF2, 3, {0x0F, 0x38, 0xF0}, 0, 2, 531 },
+    { SUF_W|SUF_Z, 0, CPU_386, CPU_SSE42, 0, {0, 0, 0}, 16, 0, 0xF2, 3, {0x0F, 0x38, 0xF1}, 0, 2, 533 },
     { SUF_L|SUF_Z, 0, CPU_386, CPU_SSE42, 0, {0, 0, 0}, 32, 0, 0xF2, 3, {0x0F, 0x38, 0xF1}, 0, 2, 101 },
-    { SUF_B|SUF_Z, ONLY_64, CPU_SSE42, 0, 0, {0, 0, 0}, 64, 0, 0xF2, 3, {0x0F, 0x38, 0xF0}, 0, 2, 479 },
+    { SUF_B|SUF_Z, ONLY_64, CPU_SSE42, 0, 0, {0, 0, 0}, 64, 0, 0xF2, 3, {0x0F, 0x38, 0xF0}, 0, 2, 535 },
     { SUF_Q|SUF_Z, ONLY_64, CPU_SSE42, 0, 0, {0, 0, 0}, 64, 0, 0xF2, 3, {0x0F, 0x38, 0xF1}, 0, 2, 104 }
 };
 
 static const x86_insn_info extractps_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x17}, 0, 3, 173 },
-    { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x17}, 0, 3, 164 }
+   { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x17}, 0, 3, 188 },
+    { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x17}, 0, 3, 179 }
 };
 
 static const x86_insn_info insertps_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x21}, 0, 3, 140 },
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x21}, 0, 3, 146 },
     { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x21}, 0, 3, 92 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x21}, 0, 4, 48 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x21}, 0, 4, 56 },
     { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x21}, 0, 4, 0 }
 };
 
 static const x86_insn_info movntdqa_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x2A}, 0, 2, 527 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x2A}, 0, 2, 591 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x2A}, 0, 2, 593 }
 };
 
 static const x86_insn_info sse4pcmpstr_insn[] = {
-   { SUF_Z, 0, CPU_SSE42, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 170 }
+   { SUF_Z, 0, CPU_SSE42, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x00}, 0, 3, 185 }
 };
 
 static const x86_insn_info pextrb_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x14}, 0, 3, 179 },
-    { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x14}, 0, 3, 161 },
-    { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x14}, 0, 3, 164 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x14}, 0, 3, 194 },
+    { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x14}, 0, 3, 176 },
+    { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x14}, 0, 3, 179 }
 };
 
 static const x86_insn_info pextrd_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x16}, 0, 3, 173 }
+   { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x16}, 0, 3, 188 }
 };
 
 static const x86_insn_info pextrq_insn[] = {
-   { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x16}, 0, 3, 167 }
+   { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x16}, 0, 3, 182 }
 };
 
 static const x86_insn_info pinsrb_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x20}, 0, 3, 137 },
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x20}, 0, 3, 143 },
     { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x20}, 0, 3, 125 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x20}, 0, 4, 40 },
-    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x20}, 0, 4, 44 }
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x20}, 0, 4, 48 },
+    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x20}, 0, 4, 52 }
 };
 
 static const x86_insn_info pinsrd_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x22}, 0, 3, 134 },
-    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x22}, 0, 4, 24 }
+   { SUF_Z, 0, CPU_386, CPU_SSE41, 0, {MOD_SetVEX, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x22}, 0, 3, 233 },
+    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x22}, 0, 4, 88 }
 };
 
 static const x86_insn_info pinsrq_insn[] = {
-   { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x22}, 0, 3, 206 },
-    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 0, 0xC1, 3, {0x0F, 0x3A, 0x22}, 0, 4, 76 }
+   { SUF_Z, ONLY_64, CPU_SSE41, 0, 0, {MOD_SetVEX, 0, 0}, 64, 0, 0x66, 3, {0x0F, 0x3A, 0x22}, 0, 3, 227 },
+    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 0, 0xC1, 3, {0x0F, 0x3A, 0x22}, 0, 4, 84 }
 };
 
 static const x86_insn_info sse4m16_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 399 },
-    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 88 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 441 },
+    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 443 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 208 }
 };
 
 static const x86_insn_info sse4m32_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 288 },
-    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 88 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 330 },
+    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 473 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 208 }
 };
 
 static const x86_insn_info sse4m64_insn[] = {
-   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 401 },
-    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 88 }
+   { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 445 },
+    { SUF_Z, 0, CPU_SSE41, 0, 0, {MOD_Op2Add, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x00}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 503 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 208 }
 };
 
 static const x86_insn_info cnt_insn[] = {
@@ -1770,87 +1895,95 @@
 };
 
 static const x86_insn_info vmovd_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x6E, 0}, 0, 2, 251 },
-    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x7E, 0}, 0, 2, 173 }
+   { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x6E, 0}, 0, 2, 293 },
+    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0x7E, 0}, 0, 2, 188 }
 };
 
 static const x86_insn_info vmovq_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC2, 2, {0x0F, 0x7E, 0}, 0, 2, 88 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC2, 2, {0x0F, 0x7E, 0}, 0, 2, 401 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0xD6, 0}, 0, 2, 39 },
-    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 0, 0xC1, 2, {0x0F, 0x6E, 0}, 0, 2, 253 },
-    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 0, 0xC1, 2, {0x0F, 0x7E, 0}, 0, 2, 167 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC2, 2, {0x0F, 0x7E, 0}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC2, 2, {0x0F, 0x7E, 0}, 0, 2, 445 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 2, {0x0F, 0xD6, 0}, 0, 2, 47 },
+    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 0, 0xC1, 2, {0x0F, 0x6E, 0}, 0, 2, 295 },
+    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 64, 0, 0xC1, 2, {0x0F, 0x7E, 0}, 0, 2, 182 }
 };
 
 static const x86_insn_info avx_xmm_xmm128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 170 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 176 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 155 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 191 }
 };
 
 static const x86_insn_info avx_sse4imm_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_SSE41, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 3, 170 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 3, 170 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 176 }
+   { SUF_Z, ONLY_AVX, CPU_SSE41, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 3, 185 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 3, 185 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 191 }
 };
 
 static const x86_insn_info vmovddup_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 88 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 401 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 176 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 445 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 191 }
 };
 
 static const x86_insn_info avx_xmm_xmm64_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 88 },
-    { SUF_Z, ONLY_AVX, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 401 }
+   { SUF_Z, ONLY_AVX, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_SSE2, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 445 }
 };
 
 static const x86_insn_info avx_xmm_xmm32_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 88 },
-    { SUF_Z, ONLY_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 288 }
+   { SUF_Z, ONLY_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_SSE, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 330 }
 };
 
 static const x86_insn_info avx_cvt_xmm64_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 88 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 401 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 403 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 445 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 447 }
 };
 
 static const x86_insn_info avx_ssse3_2op_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 2, 170 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 2, 155 }
+};
+
+static const x86_insn_info avx2_ssse3_2op_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 2, 155 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 191 }
 };
 
 static const x86_insn_info avx_cvt_xmm128_x_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 170 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 155 }
 };
 
 static const x86_insn_info avx_cvt_xmm128_y_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 190 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 205 }
 };
 
 static const x86_insn_info avx_cvt_xmm128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 539 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 541 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC0, 2, {0x0F, 0x00, 0}, 0, 2, 603 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_PreAdd, MOD_Op1Add, 0}, 0, 0, 0xC4, 2, {0x0F, 0x00, 0}, 0, 2, 605 }
 };
 
 static const x86_insn_info vbroadcastss_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x18}, 0, 2, 288 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x18}, 0, 2, 437 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x18}, 0, 2, 330 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x18}, 0, 2, 443 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x18}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x18}, 0, 2, 208 }
 };
 
 static const x86_insn_info vbroadcastsd_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x19}, 0, 2, 423 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x19}, 0, 2, 473 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x19}, 0, 2, 208 }
 };
 
-static const x86_insn_info vbroadcastf128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x1A}, 0, 2, 547 }
+static const x86_insn_info vbroadcastif128_insn[] = {
+   { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 2, 503 }
 };
 
-static const x86_insn_info vextractf128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x19}, 0, 3, 230 }
+static const x86_insn_info vextractif128_insn[] = {
+   { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 230 }
 };
 
-static const x86_insn_info vinsertf128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x18}, 0, 4, 56 }
+static const x86_insn_info vinsertif128_insn[] = {
+   { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 8 }
 };
 
 static const x86_insn_info vzero_insn[] = {
@@ -1858,36 +1991,118 @@
 };
 
 static const x86_insn_info vmaskmov_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 8 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x02}, 0, 3, 188 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x02}, 0, 3, 191 }
+   { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 },
+    { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x02}, 0, 3, 203 },
+    { SUF_Z, ONLY_AVX, 0, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x02}, 0, 3, 206 }
 };
 
 static const x86_insn_info vpermil_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x08}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x08}, 0, 3, 8 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 3, 170 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 176 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x08}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x08}, 0, 3, 16 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 3, 185 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 3, 191 }
 };
 
 static const x86_insn_info vperm2f128_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x06}, 0, 4, 8 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x06}, 0, 4, 20 }
+};
+
+static const x86_insn_info vperm_var_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 }
+};
+
+static const x86_insn_info vperm_imm_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x3A, 0x00}, 0, 3, 191 }
+};
+
+static const x86_insn_info vperm2i128_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x46}, 0, 4, 20 }
+};
+
+static const x86_insn_info vpbroadcastb_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x78}, 0, 2, 537 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x78}, 0, 2, 539 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x78}, 0, 2, 629 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x78}, 0, 2, 631 }
+};
+
+static const x86_insn_info vpbroadcastw_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x79}, 0, 2, 537 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x79}, 0, 2, 539 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x79}, 0, 2, 541 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x79}, 0, 2, 543 }
+};
+
+static const x86_insn_info vpbroadcastd_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x58}, 0, 2, 537 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x58}, 0, 2, 539 },
+    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX2, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x58}, 0, 2, 293 },
+    { SUF_Z, ONLY_AVX, CPU_386, CPU_AVX2, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x58}, 0, 2, 637 }
+};
+
+static const x86_insn_info vpbroadcastq_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x59}, 0, 2, 537 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x59}, 0, 2, 539 },
+    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x59}, 0, 2, 295 },
+    { SUF_Z, ONLY_64|ONLY_AVX, CPU_AVX2, 0, 0, {0, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x59}, 0, 2, 617 }
+};
+
+static const x86_insn_info vpshiftv_vexw0_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 }
+};
+
+static const x86_insn_info vpshiftv_vexw1_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 }
+};
+
+static const x86_insn_info vmaskmov_vexw1_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x02}, 0, 3, 203 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x02}, 0, 3, 206 }
+};
+
+static const x86_insn_info vex_66_0F3A_imm8_avx2_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 20 }
+};
+
+static const x86_insn_info gather_64x_64x_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x00}, 0, 3, 221 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x00}, 0, 3, 224 }
+};
+
+static const x86_insn_info gather_64x_64y_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x00}, 0, 3, 221 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x00}, 0, 3, 272 }
+};
+
+static const x86_insn_info gather_32x_32y_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 239 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 245 }
+};
+
+static const x86_insn_info gather_32x_32y_128_insn[] = {
+   { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 239 },
+    { SUF_Z, ONLY_AVX, CPU_AVX2, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 242 }
 };
 
 static const x86_insn_info vfma_ps_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 8 }
+   { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 }
 };
 
 static const x86_insn_info vfma_pd_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x00}, 0, 3, 52 },
-    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x00}, 0, 3, 8 }
+   { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x38, 0x00}, 0, 3, 12 },
+    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x38, 0x00}, 0, 3, 16 }
 };
 
 static const x86_insn_info vfma_ss_insn[] = {
    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 0 },
-    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 48 }
+    { SUF_Z, ONLY_AVX, CPU_FMA, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x38, 0x00}, 0, 3, 56 }
 };
 
 static const x86_insn_info vfma_sd_insn[] = {
@@ -1896,178 +2111,203 @@
 };
 
 static const x86_insn_info aes_insn[] = {
-   { SUF_Z, 0, CPU_AES, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AES, CPU_AVX, 0, {MOD_Op1Add, MOD_Op2Add, 0}, 0, 0, 0xC1, 3, {0x0F, 0x00, 0x00}, 0, 3, 52 }
+   { SUF_Z, 0, CPU_AES, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AES, CPU_AVX, 0, {MOD_Op1Add, MOD_Op2Add, 0}, 0, 0, 0xC1, 3, {0x0F, 0x00, 0x00}, 0, 3, 12 }
 };
 
 static const x86_insn_info aesimc_insn[] = {
-   { SUF_Z, 0, CPU_AES, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 2, 170 }
+   { SUF_Z, 0, CPU_AES, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 2, 155 }
 };
 
 static const x86_insn_info aes_imm_insn[] = {
-   { SUF_Z, 0, CPU_AES, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 3, 170 }
+   { SUF_Z, 0, CPU_AES, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 3, 185 }
 };
 
 static const x86_insn_info pclmulqdq_insn[] = {
-   { SUF_Z, 0, CPU_CLMUL, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 3, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_CLMUL, 0, {MOD_Op1Add, MOD_Op2Add, 0}, 0, 0, 0xC1, 3, {0x0F, 0x00, 0x00}, 0, 4, 52 }
+   { SUF_Z, 0, CPU_CLMUL, 0, 0, {MOD_Op1Add, MOD_Op2Add, MOD_SetVEX}, 0, 0, 0x66, 3, {0x0F, 0x00, 0x00}, 0, 3, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_CLMUL, 0, {MOD_Op1Add, MOD_Op2Add, 0}, 0, 0, 0xC1, 3, {0x0F, 0x00, 0x00}, 0, 4, 60 }
 };
 
 static const x86_insn_info pclmulqdq_fixed_insn[] = {
-   { SUF_Z, 0, CPU_CLMUL, 0, 0, {MOD_Imm8, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x44}, 0, 2, 143 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_CLMUL, 0, {MOD_Imm8, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x44}, 0, 3, 52 }
+   { SUF_Z, 0, CPU_CLMUL, 0, 0, {MOD_Imm8, MOD_SetVEX, 0}, 0, 0, 0x66, 3, {0x0F, 0x3A, 0x44}, 0, 2, 158 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_CLMUL, 0, {MOD_Imm8, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x44}, 0, 3, 12 }
 };
 
 static const x86_insn_info rdrand_insn[] = {
-   { SUF_Z, 0, CPU_RDRAND, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xC7, 0}, 6, 1, 347 },
-    { SUF_Z, 0, CPU_386, CPU_RDRAND, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xC7, 0}, 6, 1, 14 },
-    { SUF_Z, ONLY_64, CPU_RDRAND, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC7, 0}, 6, 1, 18 }
+   { SUF_Z, 0, CPU_RDRAND, 0, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xC7, 0}, 6, 1, 389 },
+    { SUF_Z, 0, CPU_386, CPU_RDRAND, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xC7, 0}, 6, 1, 26 },
+    { SUF_Z, ONLY_64, CPU_RDRAND, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC7, 0}, 6, 1, 30 }
 };
 
 static const x86_insn_info fs_gs_base_insn[] = {
-   { SUF_Z, ONLY_64, CPU_FSGSBASE, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0xF3, 2, {0x0F, 0xAE, 0}, 0, 1, 14 },
-    { SUF_Z, ONLY_64, CPU_FSGSBASE, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0xF3, 2, {0x0F, 0xAE, 0}, 0, 1, 18 }
+   { SUF_Z, ONLY_64, CPU_FSGSBASE, 0, 0, {MOD_SpAdd, 0, 0}, 32, 0, 0xF3, 2, {0x0F, 0xAE, 0}, 0, 1, 26 },
+    { SUF_Z, ONLY_64, CPU_FSGSBASE, 0, 0, {MOD_SpAdd, 0, 0}, 64, 0, 0xF3, 2, {0x0F, 0xAE, 0}, 0, 1, 30 }
 };
 
 static const x86_insn_info avx_cvtps2ph_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x3A, 0x00}, 0, 3, 194 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x3A, 0x00}, 0, 3, 197 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x3A, 0x00}, 0, 3, 200 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x3A, 0x00}, 0, 3, 203 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x3A, 0x00}, 0, 3, 209 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x3A, 0x00}, 0, 3, 212 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x3A, 0x00}, 0, 3, 215 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x3A, 0x00}, 0, 3, 218 }
 };
 
 static const x86_insn_info avx_cvtph2ps_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x38, 0x00}, 0, 2, 88 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x38, 0x00}, 0, 2, 561 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x38, 0x00}, 0, 2, 193 },
-    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x38, 0x00}, 0, 2, 563 }
+   { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x38, 0x00}, 0, 2, 64 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC0, 3, {0x0F, 0x38, 0x00}, 0, 2, 625 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x38, 0x00}, 0, 2, 208 },
+    { SUF_Z, ONLY_AVX, CPU_AVX, CPU_F16C, 0, {MOD_PreAdd, MOD_Op2Add, 0}, 0, 0, 0xC4, 3, {0x0F, 0x38, 0x00}, 0, 2, 627 }
 };
 
 static const x86_insn_info extrq_insn[] = {
-   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x78, 0}, 0, 3, 89 },
-    { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x79, 0}, 0, 2, 88 }
+   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x78, 0}, 0, 3, 65 },
+    { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0x66, 2, {0x0F, 0x79, 0}, 0, 2, 64 }
 };
 
 static const x86_insn_info insertq_insn[] = {
-   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x78, 0}, 0, 4, 88 },
-    { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x79, 0}, 0, 2, 88 }
+   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x78, 0}, 0, 4, 64 },
+    { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x79, 0}, 0, 2, 64 }
 };
 
 static const x86_insn_info movntsd_insn[] = {
-   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x2B, 0}, 0, 2, 39 }
+   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF2, 2, {0x0F, 0x2B, 0}, 0, 2, 47 }
 };
 
 static const x86_insn_info movntss_insn[] = {
-   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x2B, 0}, 0, 2, 529 }
+   { SUF_Z, 0, CPU_SSE4a, 0, 0, {0, 0, 0}, 0, 0, 0xF3, 2, {0x0F, 0x2B, 0}, 0, 2, 444 }
 };
 
 static const x86_insn_info vfrc_pdps_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x80, 0}, 0, 2, 170 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x84, 2, {0x09, 0x80, 0}, 0, 2, 176 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x80, 0}, 0, 2, 155 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x84, 2, {0x09, 0x80, 0}, 0, 2, 191 }
 };
 
 static const x86_insn_info vfrczsd_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x83, 0}, 0, 2, 88 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x83, 0}, 0, 2, 401 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x83, 0}, 0, 2, 64 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x83, 0}, 0, 2, 445 }
 };
 
 static const x86_insn_info vfrczss_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x82, 0}, 0, 2, 88 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x82, 0}, 0, 2, 288 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x82, 0}, 0, 2, 64 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x82, 0}, 0, 2, 330 }
 };
 
 static const x86_insn_info vpcmov_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x08, 0xA2, 0}, 0, 4, 60 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x88, 2, {0x08, 0xA2, 0}, 0, 4, 80 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x84, 2, {0x08, 0xA2, 0}, 0, 4, 64 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x8C, 2, {0x08, 0xA2, 0}, 0, 4, 84 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x08, 0xA2, 0}, 0, 4, 12 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x88, 2, {0x08, 0xA2, 0}, 0, 4, 68 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x84, 2, {0x08, 0xA2, 0}, 0, 4, 16 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x8C, 2, {0x08, 0xA2, 0}, 0, 4, 72 }
 };
 
 static const x86_insn_info vpcom_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, MOD_Imm8, 0}, 0, 0, 0x80, 2, {0x08, 0x00, 0}, 0, 3, 52 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, MOD_Imm8, 0}, 0, 0, 0x80, 2, {0x08, 0x00, 0}, 0, 3, 12 }
 };
 
 static const x86_insn_info vpcom_imm_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x08, 0x00, 0}, 0, 4, 52 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x08, 0x00, 0}, 0, 4, 60 }
 };
 
 static const x86_insn_info vphaddsub_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x00, 0}, 0, 2, 170 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x00, 0}, 0, 2, 155 }
 };
 
 static const x86_insn_info vpma_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x08, 0x00, 0}, 0, 4, 60 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x08, 0x00, 0}, 0, 4, 12 }
 };
 
 static const x86_insn_info vpperm_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x08, 0xA3, 0}, 0, 4, 60 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x88, 2, {0x08, 0xA3, 0}, 0, 4, 80 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x80, 2, {0x08, 0xA3, 0}, 0, 4, 12 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {0, 0, 0}, 0, 0, 0x88, 2, {0x08, 0xA3, 0}, 0, 4, 68 }
 };
 
 static const x86_insn_info vprot_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x90, 0}, 0, 3, 182 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x88, 2, {0x09, 0x90, 0}, 0, 3, 52 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x08, 0xC0, 0}, 0, 3, 170 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x90, 0}, 0, 3, 155 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x88, 2, {0x09, 0x90, 0}, 0, 3, 12 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x08, 0xC0, 0}, 0, 3, 185 }
 };
 
 static const x86_insn_info amd_vpshift_insn[] = {
-   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x00, 0}, 0, 3, 182 },
-    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x88, 2, {0x09, 0x00, 0}, 0, 3, 52 }
+   { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x80, 2, {0x09, 0x00, 0}, 0, 3, 155 },
+    { SUF_Z, 0, CPU_XOP, 0, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0x88, 2, {0x09, 0x00, 0}, 0, 3, 12 }
 };
 
 static const x86_insn_info fma_128_256_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 60 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x3A, 0x00}, 0, 4, 80 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 64 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x3A, 0x00}, 0, 4, 84 }
+   { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 12 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x3A, 0x00}, 0, 4, 68 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC5, 3, {0x0F, 0x3A, 0x00}, 0, 4, 16 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xCD, 3, {0x0F, 0x3A, 0x00}, 0, 4, 72 }
 };
 
 static const x86_insn_info fma_128_m32_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 28 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 68 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x3A, 0x00}, 0, 4, 72 }
+   { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 36 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 76 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x3A, 0x00}, 0, 4, 80 }
 };
 
 static const x86_insn_info fma_128_m64_insn[] = {
-   { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 28 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 32 },
-    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x3A, 0x00}, 0, 4, 36 }
+   { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 36 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC1, 3, {0x0F, 0x3A, 0x00}, 0, 4, 40 },
+    { SUF_Z, ONLY_AVX, CPU_FMA4, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0xC9, 3, {0x0F, 0x3A, 0x00}, 0, 4, 44 }
 };
 
 static const x86_insn_info xsaveopt64_insn[] = {
-   { SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, MOD_Op0Add, MOD_Op1Add}, 64, 0, 0, 2, {0x00, 0x00, 0}, 0, 1, 470 }
+   { SUF_Z, ONLY_64, 0, 0, 0, {MOD_SpAdd, MOD_Op0Add, MOD_Op1Add}, 64, 0, 0, 2, {0x00, 0x00, 0}, 0, 1, 526 }
 };
 
 static const x86_insn_info movbe_insn[] = {
-   { SUF_Z, 0, CPU_MOVBE, 0, 0, {0, 0, 0}, 16, 0, 0, 3, {0x0F, 0x38, 0xF0}, 0, 2, 405 },
-    { SUF_Z, 0, CPU_MOVBE, 0, 0, {0, 0, 0}, 16, 0, 0, 3, {0x0F, 0x38, 0xF1}, 0, 2, 407 },
-    { SUF_Z, 0, CPU_386, CPU_MOVBE, 0, {0, 0, 0}, 32, 0, 0, 3, {0x0F, 0x38, 0xF0}, 0, 2, 311 },
-    { SUF_Z, 0, CPU_386, CPU_MOVBE, 0, {0, 0, 0}, 32, 0, 0, 3, {0x0F, 0x38, 0xF1}, 0, 2, 289 },
-    { SUF_Z, ONLY_64, CPU_MOVBE, 0, 0, {0, 0, 0}, 64, 0, 0, 3, {0x0F, 0x38, 0xF0}, 0, 2, 409 },
-    { SUF_Z, ONLY_64, CPU_MOVBE, 0, 0, {0, 0, 0}, 64, 0, 0, 3, {0x0F, 0x38, 0xF1}, 0, 2, 291 }
+   { SUF_Z, 0, CPU_MOVBE, 0, 0, {0, 0, 0}, 16, 0, 0, 3, {0x0F, 0x38, 0xF0}, 0, 2, 459 },
+    { SUF_Z, 0, CPU_MOVBE, 0, 0, {0, 0, 0}, 16, 0, 0, 3, {0x0F, 0x38, 0xF1}, 0, 2, 461 },
+    { SUF_Z, 0, CPU_386, CPU_MOVBE, 0, {0, 0, 0}, 32, 0, 0, 3, {0x0F, 0x38, 0xF0}, 0, 2, 353 },
+    { SUF_Z, 0, CPU_386, CPU_MOVBE, 0, {0, 0, 0}, 32, 0, 0, 3, {0x0F, 0x38, 0xF1}, 0, 2, 331 },
+    { SUF_Z, ONLY_64, CPU_MOVBE, 0, 0, {0, 0, 0}, 64, 0, 0, 3, {0x0F, 0x38, 0xF0}, 0, 2, 463 },
+    { SUF_Z, ONLY_64, CPU_MOVBE, 0, 0, {0, 0, 0}, 64, 0, 0, 3, {0x0F, 0x38, 0xF1}, 0, 2, 333 }
+};
+
+static const x86_insn_info vex_gpr_ndd_rm_0F38_regext_insn[] = {
+   { SUF_W|SUF_Z, ONLY_AVX, CPU_386, 0, 0, {MOD_PreAdd, MOD_Op2Add, MOD_SpAdd}, 32, 0, 0xC0, 3, {0x0F, 0x38, 0x00}, 0, 2, 249 },
+    { SUF_L|SUF_Z, ONLY_64|ONLY_AVX, 0, 0, 0, {MOD_PreAdd, MOD_Op2Add, MOD_SpAdd}, 64, 0, 0xC0, 3, {0x0F, 0x38, 0x00}, 0, 2, 252 }
+};
+
+static const x86_insn_info vex_gpr_reg_rm_0F_imm8_insn[] = {
+   { SUF_W|SUF_Z, ONLY_AVX, CPU_386, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op2Add}, 32, 0, 0xC0, 3, {0x0F, 0x00, 0x00}, 0, 3, 134 },
+    { SUF_L|SUF_Z, ONLY_64|ONLY_AVX, 0, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op2Add}, 64, 0, 0xC0, 3, {0x0F, 0x00, 0x00}, 0, 3, 137 }
+};
+
+static const x86_insn_info vex_gpr_reg_nds_rm_0F_insn[] = {
+   { SUF_L|SUF_Z, ONLY_AVX, CPU_386, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op2Add}, 32, 0, 0xC0, 3, {0x0F, 0x00, 0x00}, 0, 3, 248 },
+    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, 0, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op2Add}, 64, 0, 0xC0, 3, {0x0F, 0x00, 0x00}, 0, 3, 251 }
+};
+
+static const x86_insn_info vex_gpr_reg_rm_nds_0F_insn[] = {
+   { SUF_L|SUF_Z, ONLY_AVX, CPU_386, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op2Add}, 32, 0, 0xC0, 3, {0x0F, 0x00, 0x00}, 0, 3, 149 },
+    { SUF_Q|SUF_Z, ONLY_64|ONLY_AVX, 0, 0, 0, {MOD_PreAdd, MOD_Op1Add, MOD_Op2Add}, 64, 0, 0xC0, 3, {0x0F, 0x00, 0x00}, 0, 3, 152 }
+};
+
+static const x86_insn_info invpcid_insn[] = {
+   { SUF_Z, NOT_64, CPU_386, CPU_INVPCID, CPU_Priv, {0, 0, 0}, 0, 0, 0x66, 3, {0x0F, 0x38, 0x82}, 0, 2, 607 },
+    { SUF_Z, ONLY_64, CPU_INVPCID, CPU_Priv, 0, {0, 0, 0}, 0, 64, 0x66, 3, {0x0F, 0x38, 0x82}, 0, 2, 609 }
 };
 
 static const x86_insn_info now3d_insn[] = {
-   { SUF_Z, 0, CPU_3DNow, 0, 0, {MOD_Imm8, 0, 0}, 0, 0, 0, 2, {0x0F, 0x0F, 0}, 0, 2, 185 }
+   { SUF_Z, 0, CPU_3DNow, 0, 0, {MOD_Imm8, 0, 0}, 0, 0, 0, 2, {0x0F, 0x0F, 0}, 0, 2, 140 }
 };
 
 static const x86_insn_info cmpxchg16b_insn[] = {
-   { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC7, 0}, 1, 1, 528 }
+   { SUF_Z, ONLY_64, 0, 0, 0, {0, 0, 0}, 64, 0, 0, 2, {0x0F, 0xC7, 0}, 1, 1, 504 }
 };
 
 static const x86_insn_info invlpga_insn[] = {
    { SUF_Z, 0, CPU_SVM, 0, 0, {0, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0xDF}, 0, 0, 0 },
-    { SUF_Z, 0, CPU_386, CPU_SVM, 0, {0, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0xDF}, 0, 2, 453 }
+    { SUF_Z, 0, CPU_386, CPU_SVM, 0, {0, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0xDF}, 0, 2, 509 }
 };
 
 static const x86_insn_info skinit_insn[] = {
    { SUF_Z, 0, CPU_SVM, 0, 0, {0, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0xDE}, 0, 0, 0 },
-    { SUF_Z, 0, CPU_SVM, 0, 0, {0, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0xDE}, 0, 1, 579 }
+    { SUF_Z, 0, CPU_SVM, 0, 0, {0, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0xDE}, 0, 1, 649 }
 };
 
 static const x86_insn_info svm_rax_insn[] = {
    { SUF_Z, 0, CPU_SVM, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0x00}, 0, 0, 0 },
-    { SUF_Z, 0, CPU_SVM, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0x00}, 0, 1, 453 }
+    { SUF_Z, 0, CPU_SVM, 0, 0, {MOD_Op2Add, 0, 0}, 0, 0, 0, 3, {0x0F, 0x01, 0x00}, 0, 1, 509 }
 };
 
 static const x86_insn_info padlock_insn[] = {
@@ -2075,45 +2315,45 @@
 };
 
 static const x86_insn_info cyrixmmx_insn[] = {
-   { SUF_Z, 0, CPU_Cyrix, CPU_MMX, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 185 }
+   { SUF_Z, 0, CPU_Cyrix, CPU_MMX, 0, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 2, 140 }
 };
 
 static const x86_insn_info pmachriw_insn[] = {
-   { SUF_Z, 0, CPU_Cyrix, CPU_MMX, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x5E, 0}, 0, 2, 269 }
+   { SUF_Z, 0, CPU_Cyrix, CPU_MMX, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x5E, 0}, 0, 2, 311 }
 };
 
 static const x86_insn_info rdwrshr_insn[] = {
-   { SUF_Z, 0, CPU_686, CPU_Cyrix, CPU_SMM, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x36, 0}, 0, 1, 26 }
+   { SUF_Z, 0, CPU_686, CPU_Cyrix, CPU_SMM, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x36, 0}, 0, 1, 90 }
 };
 
 static const x86_insn_info rsdc_insn[] = {
-   { SUF_Z, 0, CPU_486, CPU_Cyrix, CPU_SMM, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x79, 0}, 0, 2, 497 }
+   { SUF_Z, 0, CPU_486, CPU_Cyrix, CPU_SMM, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x79, 0}, 0, 2, 561 }
 };
 
 static const x86_insn_info cyrixsmm_insn[] = {
-   { SUF_Z, 0, CPU_486, CPU_Cyrix, CPU_SMM, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 498 }
+   { SUF_Z, 0, CPU_486, CPU_Cyrix, CPU_SMM, {MOD_Op1Add, 0, 0}, 0, 0, 0, 2, {0x0F, 0x00, 0}, 0, 1, 562 }
 };
 
 static const x86_insn_info svdc_insn[] = {
-   { SUF_Z, 0, CPU_486, CPU_Cyrix, CPU_SMM, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x78, 0}, 0, 2, 549 }
+   { SUF_Z, 0, CPU_486, CPU_Cyrix, CPU_SMM, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x78, 0}, 0, 2, 615 }
 };
 
 static const x86_insn_info ibts_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA7, 0}, 0, 2, 212 },
-    { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA7, 0}, 0, 2, 218 }
+   { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA7, 0}, 0, 2, 254 },
+    { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA7, 0}, 0, 2, 260 }
 };
 
 static const x86_insn_info umov_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x10, 0}, 0, 2, 275 },
-    { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0x11, 0}, 0, 2, 212 },
-    { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x11, 0}, 0, 2, 218 },
-    { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x12, 0}, 0, 2, 277 },
+   { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x10, 0}, 0, 2, 317 },
+    { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0x11, 0}, 0, 2, 254 },
+    { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x11, 0}, 0, 2, 260 },
+    { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 0, 0, 0, 2, {0x0F, 0x12, 0}, 0, 2, 319 },
     { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0x13, 0}, 0, 2, 98 },
     { SUF_Z, 0, CPU_386, CPU_Undoc, 0, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0x13, 0}, 0, 2, 101 }
 };
 
 static const x86_insn_info xbts_insn[] = {
-   { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA6, 0}, 0, 2, 405 },
-    { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA6, 0}, 0, 2, 311 }
+   { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 16, 0, 0, 2, {0x0F, 0xA6, 0}, 0, 2, 459 },
+    { SUF_Z, 0, CPU_386, CPU_Obs, CPU_Undoc, {0, 0, 0}, 32, 0, 0, 2, {0x0F, 0xA6, 0}, 0, 2, 353 }
 };

yasm-1.1.0.tar.gz/yasm.1 -> yasm-1.2.0.tar.gz/yasm.1 Changed

@@ -1,47 +1,55 @@
+'\" t
 .\"     Title: yasm
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: April 2007
 .\"    Manual: The Yasm Modular Assembler
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM" "1" "April 2007" "Yasm" "The Yasm Modular Assembler"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm \- The Yasm Modular Assembler
 .SH "SYNOPSIS"
-.HP 5
+.HP \w'\fByasm\fR\ 'u
 \fByasm\fR [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-o\ \fR\fB\fIoutfile\fR\fR] [\fB\fIother\ options\fR\fR...] {\fIinfile\fR}
-.HP 5
+.HP \w'\fByasm\fR\ 'u
 \fByasm\fR \fB\-h\fR
 .SH "DESCRIPTION"
 .PP
 The Yasm Modular Assembler is a portable, retargetable assembler written under the
 \(lqnew\(rq
-(2 or 3 clause) BSD license. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats.
+(2 or 3 clause) BSD license\&. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats\&.
 .PP
 YASM consists of the
 \fByasm\fR
-command, libyasm, the core backend library, and a large number of modules. Currently, libyasm and the loadable modules are statically built into the
+command, libyasm, the core backend library, and a large number of modules\&. Currently, libyasm and the loadable modules are statically built into the
 \fByasm\fR
-executable.
+executable\&.
 .PP
 The
 \fByasm\fR
 command assembles the file infile and directs output to the file
 \fIoutfile\fR
-if specified. If
+if specified\&. If
 \fIoutfile\fR
 is not specified,
 \fByasm\fR
 will derive a default output file name from the name of its input file, usually by appending
-\fI.o\fR
+\&.o
 or
-\fI.obj\fR, or by removing all extensions for a raw binary file. Failing that, the output file name will be
-\fIyasm.out\fR.
+\&.obj, or by removing all extensions for a raw binary file\&. Failing that, the output file name will be
+yasm\&.out\&.
 .PP
 If called with an
 \fIinfile\fR
@@ -50,115 +58,115 @@
 \fByasm\fR
 assembles the standard input and directs output to the file
 \fIoutfile\fR, or
-\fIyasm.out\fR
+yasm\&.out
 if no
 \fIoutfile\fR
-is specified.
+is specified\&.
 .SH "OPTIONS"
 .PP
-Many options may be given in one of two forms: either a dash followed by a single letter, or two dashes followed by a long option name. Options are listed in alphabetical order.
+Many options may be given in one of two forms: either a dash followed by a single letter, or two dashes followed by a long option name\&. Options are listed in alphabetical order\&.
 .SS "General Options"
 .PP
 \fB\-a \fR\fB\fIarch\fR\fR or \fB\-\-arch=\fR\fB\fIarch\fR\fR: Select target architecture
 .RS 4
-Selects the target architecture. The default architecture is
-\(lqx86\(rq, which supports both the IA\-32 and derivatives and AMD64 instruction sets. To print a list of available architectures to standard output, use
+Selects the target architecture\&. The default architecture is
+\(lqx86\(rq, which supports both the IA\-32 and derivatives and AMD64 instruction sets\&. To print a list of available architectures to standard output, use
 \(lqhelp\(rq
 as
-\fIarch\fR. See
+\fIarch\fR\&. See
 \fByasm_arch\fR(7)
-for a list of supported architectures.
+for a list of supported architectures\&.
 .RE
 .PP
 \fB\-f \fR\fB\fIformat\fR\fR or \fB\-\-oformat=\fR\fB\fIformat\fR\fR: Select object format
 .RS 4
-Selects the output object format. The default object format is
-\(lqbin\(rq, which is a flat format binary with no relocation. To print a list of available object formats to standard output, use
+Selects the output object format\&. The default object format is
+\(lqbin\(rq, which is a flat format binary with no relocation\&. To print a list of available object formats to standard output, use
 \(lqhelp\(rq
 as
-\fIformat\fR. See
+\fIformat\fR\&. See
 \fByasm_objfmts\fR(7)
-for a list of supported object formats.
+for a list of supported object formats\&.
 .RE
 .PP
 \fB\-g \fR\fB\fIdebug\fR\fR or \fB\-\-dformat=\fR\fB\fIdebug\fR\fR: Select debugging format
 .RS 4
-Selects the debugging format for debug information. Debugging information can be used by a debugger to associate executable code back to the source file or get data structure and type information. Available debug formats vary between different object formats;
+Selects the debugging format for debug information\&. Debugging information can be used by a debugger to associate executable code back to the source file or get data structure and type information\&. Available debug formats vary between different object formats;
 \fByasm\fR
-will error when an invalid combination is selected. The default object format is selected by the object format. To print a list of available debugging formats to standard output, use
+will error when an invalid combination is selected\&. The default object format is selected by the object format\&. To print a list of available debugging formats to standard output, use
 \(lqhelp\(rq
 as
-\fIdebug\fR. See
+\fIdebug\fR\&. See
 \fByasm_dbgfmts\fR(7)
-for a list of supported debugging formats.
-.RE
-.PP
-\fB\-h\fR or \fB\-\-help\fR: Print a summary of options
-.RS 4
-Prints a summary of invocation options. All other options are ignored, and no output file is generated.
+for a list of supported debugging formats\&.
 .RE
 .PP
 \fB\-L \fR\fB\fIlist\fR\fR or \fB\-\-lformat=\fR\fB\fIlist\fR\fR: Select list file format
 .RS 4
-Selects the format/style of the output list file. List files typically intermix the original source with the machine code generated by the assembler. The default list format is
-\(lqnasm\(rq, which mimics the NASM list file format. To print a list of available list file formats to standard output, use
+Selects the format/style of the output list file\&. List files typically intermix the original source with the machine code generated by the assembler\&. The default list format is
+\(lqnasm\(rq, which mimics the NASM list file format\&. To print a list of available list file formats to standard output, use
 \(lqhelp\(rq
 as
-\fIlist\fR.
+\fIlist\fR\&.
 .RE
 .PP
 \fB\-l \fR\fB\fIlistfile\fR\fR or \fB\-\-list=\fR\fB\fIlistfile\fR\fR: Specify list filename
 .RS 4
-Specifies the name of the output list file. If this option is not used, no list file is generated.
+Specifies the name of the output list file\&. If this option is not used, no list file is generated\&.
 .RE
 .PP
 \fB\-m \fR\fB\fImachine\fR\fR or \fB\-\-machine=\fR\fB\fImachine\fR\fR: Select target machine architecture
 .RS 4
-Selects the target machine architecture. Essentially a subtype of the selected architecture, the machine type selects between major subsets of an architecture. For example, for the
+Selects the target machine architecture\&. Essentially a subtype of the selected architecture, the machine type selects between major subsets of an architecture\&. For example, for the
 \(lqx86\(rq
 architecture, the two available machines are
 \(lqx86\(rq, which is used for the IA\-32 and derivative 32\-bit instruction set, and
-\(lqamd64\(rq, which is used for the 64\-bit instruction set. This differentiation is required to generate the proper object file for relocatable object formats such as COFF and ELF. To print a list of available machines for a given architecture to standard output, use
+\(lqamd64\(rq, which is used for the 64\-bit instruction set\&. This differentiation is required to generate the proper object file for relocatable object formats such as COFF and ELF\&. To print a list of available machines for a given architecture to standard output, use
 \(lqhelp\(rq
 as
 \fImachine\fR
 and the given architecture using
-\fB\-a \fR\fB\fIarch\fR\fR. See
+\fB\-a \fR\fB\fIarch\fR\fR\&. See
 \fByasm_arch\fR(7)
-for more details.
+for more details\&.
 .RE
 .PP
 \fB\-o \fR\fB\fIfilename\fR\fR or \fB\-\-objfile=\fR\fB\fIfilename\fR\fR: Specify object filename
 .RS 4
-Specifies the name of the output file, overriding any default name generated by Yasm.
+Specifies the name of the output file, overriding any default name generated by Yasm\&.
 .RE
 .PP
 \fB\-p \fR\fB\fIparser\fR\fR or \fB\-\-parser=\fR\fB\fIparser\fR\fR: Select parser
 .RS 4
-Selects the parser (the assembler syntax). The default parser is
-\(lqnasm\(rq, which emulates the syntax of NASM, the Netwide Assembler. Another available parser is
-\(lqgas\(rq, which emulates the syntax of GNU AS. To print a list of available parsers to standard output, use
+Selects the parser (the assembler syntax)\&. The default parser is
+\(lqnasm\(rq, which emulates the syntax of NASM, the Netwide Assembler\&. Another available parser is
+\(lqgas\(rq, which emulates the syntax of GNU AS\&. To print a list of available parsers to standard output, use
 \(lqhelp\(rq
 as
-\fIparser\fR. See
+\fIparser\fR\&. See
 \fByasm_parsers\fR(7)
-for a list of supported parsers.
+for a list of supported parsers\&.
 .RE
 .PP
 \fB\-r \fR\fB\fIpreproc\fR\fR or \fB\-\-preproc=\fR\fB\fIpreproc\fR\fR: Select preprocessor
 .RS 4
-Selects the preprocessor to use on the input file before passing it to the parser. Preprocessors often provide macro functionality that is not included in the main parser. The default preprocessor is
-\(lqnasm\(rq, which is an imported version of the actual NASM preprocessor. A
+Selects the preprocessor to use on the input file before passing it to the parser\&. Preprocessors often provide macro functionality that is not included in the main parser\&. The default preprocessor is
+\(lqnasm\(rq, which is an imported version of the actual NASM preprocessor\&. A
 \(lqraw\(rq
-preprocessor is also available, which simply skips the preprocessing step, passing the input file directly to the parser. To print a list of available preprocessors to standard output, use
+preprocessor is also available, which simply skips the preprocessing step, passing the input file directly to the parser\&. To print a list of available preprocessors to standard output, use
 \(lqhelp\(rq
 as
-\fIpreproc\fR.
+\fIpreproc\fR\&.
+.RE
+.PP
+\fB\-h\fR or \fB\-\-help\fR: Print a summary of options
+.RS 4
+Prints a summary of invocation options\&. All other options are ignored, and no output file is generated\&.
 .RE
 .PP
 \fB\-\-version\fR: Get the Yasm version
 .RS 4
-This option causes Yasm to prints the version number of Yasm as well as a license summary to standard output. All other options are ignored, and no output file is generated.
+This option causes Yasm to prints the version number of Yasm as well as a license summary to standard output\&. All other options are ignored, and no output file is generated\&.
 .RE
 .SS "Warning Options"
 .PP
@@ -166,71 +174,71 @@
 options have two contrary forms:
 \fB\-W\fR\fB\fIname\fR\fR
 and
-\fB\-Wno\-\fR\fB\fIname\fR\fR. Only the non\-default forms are shown here.
+\fB\-Wno\-\fR\fB\fIname\fR\fR\&. Only the non\-default forms are shown here\&.
 .PP
 The warning options are handled in the order given on the command line, so if
 \fB\-w\fR
 is followed by
 \fB\-Worphan\-labels\fR, all warnings are turned off
 \fIexcept\fR
-for orphan\-labels.
+for orphan\-labels\&.
 .PP
 \fB\-w\fR: Inhibit all warning messages
 .RS 4
-This option causes Yasm to inhibit all warning messages. As discussed above, this option may be followed by other options to re\-enable specified warnings.
+This option causes Yasm to inhibit all warning messages\&. As discussed above, this option may be followed by other options to re\-enable specified warnings\&.
 .RE
 .PP
 \fB\-Werror\fR: Treat warnings as errors
 .RS 4
-This option causes Yasm to treat all warnings as errors. Normally warnings do not prevent an object file from being generated and do not result in a failure exit status from
-\fByasm\fR, whereas errors do. This option makes warnings equivalent to errors in terms of this behavior.
+This option causes Yasm to treat all warnings as errors\&. Normally warnings do not prevent an object file from being generated and do not result in a failure exit status from
+\fByasm\fR, whereas errors do\&. This option makes warnings equivalent to errors in terms of this behavior\&.
 .RE
 .PP
 \fB\-Wno\-unrecognized\-char\fR: Do not warn on unrecognized input characters
 .RS 4
-Causes Yasm to not warn on unrecognized characters found in the input. Normally Yasm will generate a warning for any non\-ASCII character found in the input file.
+Causes Yasm to not warn on unrecognized characters found in the input\&. Normally Yasm will generate a warning for any non\-ASCII character found in the input file\&.
 .RE
 .PP
 \fB\-Worphan\-labels\fR: Warn on labels lacking a trailing option
 .RS 4
-When using the NASM\-compatible parser, causes Yasm to warn about labels found alone on a line without a trailing colon. While these are legal labels in NASM syntax, they may be unintentional, due to typos or macro definition ordering.
+When using the NASM\-compatible parser, causes Yasm to warn about labels found alone on a line without a trailing colon\&. While these are legal labels in NASM syntax, they may be unintentional, due to typos or macro definition ordering\&.
 .RE
 .PP
 \fB\-X \fR\fB\fIstyle\fR\fR: Change error/warning reporting style
 .RS 4
-Selects a specific output style for error and warning messages. The default is
+Selects a specific output style for error and warning messages\&. The default is
 \(lqgnu\(rq
 style, which mimics the output of
-\fBgcc\fR. The
+\fBgcc\fR\&. The
 \(lqvc\(rq
-style is also available, which mimics the output of Microsoft's Visual C++ compiler.
+style is also available, which mimics the output of Microsoft\'s Visual C++ compiler\&.
 .sp
 This option is available so that Yasm integrates more naturally into IDE environments such as
 Visual Studio
 or
-Emacs, allowing the IDE to correctly recognize the error/warning message as such and link back to the offending line of source code.
+Emacs, allowing the IDE to correctly recognize the error/warning message as such and link back to the offending line of source code\&.
 .RE
 .SS "Preprocessor Options"
 .PP
 While these preprocessor options theoretically will affect any preprocessor, the only preprocessor currently in Yasm is the
 \(lqnasm\(rq
-preprocessor.
+preprocessor\&.
 .PP
 \fB\-D \fR\fB\fImacro[=value]\fR\fR: Pre\-define a macro
 .RS 4
-Pre\-defines a single\-line macro. The value is optional (if no value is given, the macro is still defined, but to an empty value).
+Pre\-defines a single\-line macro\&. The value is optional (if no value is given, the macro is still defined, but to an empty value)\&.
 .RE
 .PP
 \fB\-e\fR or \fB\-\-preproc\-only\fR: Only preprocess
 .RS 4
-Stops assembly after the preprocessing stage; preprocessed output is sent to the specified output name or, if no output name is specified, the standard output. No object file is produced.
+Stops assembly after the preprocessing stage; preprocessed output is sent to the specified output name or, if no output name is specified, the standard output\&. No object file is produced\&.
 .RE
 .PP
 \fB\-I \fR\fB\fIpath\fR\fR: Add include file path
 .RS 4
 Adds directory
 \fIpath\fR
-to the search path for include files. The search path defaults to only including the directory in which the source file resides.
+to the search path for include files\&. The search path defaults to only including the directory in which the source file resides\&.
 .RE
 .PP
 \fB\-P \fR\fB\fIfilename\fR\fR: Pre\-include a file
@@ -238,65 +246,77 @@
 Pre\-includes file
 \fIfilename\fR, making it look as though
 \fIfilename\fR
-was prepended to the input. Can be useful for prepending multi\-line macros that the
+was prepended to the input\&. Can be useful for prepending multi\-line macros that the
 \fB\-D\fR
-can't support.
+can\'t support\&.
 .RE
 .PP
 \fB\-U \fR\fB\fImacro\fR\fR: Undefine a macro
 .RS 4
 Undefines a single\-line macro (may be either a built\-in macro or one defined earlier in the command line with
-\fB\-D\fR.
+\fB\-D\fR\&.
 .RE
 .SH "EXAMPLES"
 .PP
 To assemble NASM syntax, 32\-bit x86 source
-\fIsource.asm\fR
+source\&.asm
 into ELF file
-\fIsource.o\fR, warning on orphan labels:
+source\&.o, warning on orphan labels:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
-yasm \-f elf32 \-Worphan\-labels source.asm
+yasm \-f elf32 \-Worphan\-labels source\&.asm
 .fi
+.if n \{\
 .RE
+.\}
 .PP
 To assemble NASM syntax AMD64 source
-\fIx.asm\fR
+x\&.asm
 into Win64 file
-\fIobject.obj\fR:
+object\&.obj:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
-yasm \-f win64 \-o object.obj x.asm
+yasm \-f win64 \-o object\&.obj x\&.asm
 .fi
+.if n \{\
 .RE
+.\}
 .PP
 To assemble already preprocessed NASM syntax x86 source
-\fIy.asm\fR
+y\&.asm
 into flat binary file
-\fIy.com\fR:
+y\&.com:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
-yasm \-f bin \-r raw \-o y.com y.asm
+yasm \-f bin \-r raw \-o y\&.com y\&.asm
 .fi
+.if n \{\
 .RE
+.\}
 .SH "DIAGNOSTICS"
 .PP
 The
 \fByasm\fR
-command exits 0 on success, and nonzero if an error occurs.
+command exits 0 on success, and nonzero if an error occurs\&.
 .SH "COMPATIBILITY"
 .PP
-Yasm's NASM parser and preprocessor, while they strive to be as compatible as possible with NASM, have a few incompatibilities due to YASM's different internal structure.
+Yasm\'s NASM parser and preprocessor, while they strive to be as compatible as possible with NASM, have a few incompatibilities due to YASM\'s different internal structure\&.
 .PP
-Yasm's GAS parser and preprocessor are missing a number of features present in GNU AS.
+Yasm\'s GAS parser and preprocessor are missing a number of features present in GNU AS\&.
 .SH "RESTRICTIONS"
 .PP
-As object files are often architecture and machine dependent, not all combinations of object formats, architectures, and machines are legal; trying to use an invalid combination will result in an error.
+As object files are often architecture and machine dependent, not all combinations of object formats, architectures, and machines are legal; trying to use an invalid combination will result in an error\&.
 .PP
-There is no support for symbol maps.
+There is no support for symbol maps\&.
 .SH "SEE ALSO"
 .PP
 \fByasm_arch\fR(7),
@@ -316,14 +336,14 @@
 \fBBITS 64\fR
 directive) and generate a 32\-bit object file (by failing to specify
 \fB\-m amd64\fR
-or selecting a 64\-bit object format such as ELF64 on the command line).
+or selecting a 64\-bit object format such as ELF64 on the command line)\&.
 .SH "AUTHOR"
 .PP
-\fBPeter Johnson\fR <\&peter@tortall.net\&>
-.sp -1n
-.IP "" 4
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2004, 2005, 2006, 2007 Peter Johnson
 .br
-

yasm-1.1.0.tar.gz/yasm_arch.7 -> yasm-1.2.0.tar.gz/yasm_arch.7 Changed

@@ -1,23 +1,31 @@
+'\" t
 .\"     Title: yasm_arch
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: October 2006
 .\"    Manual: Yasm Supported Architectures
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_ARCH" "7" "October 2006" "Yasm" "Yasm Supported Architectures"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_arch \- Yasm Supported Target Architectures
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-a\ \fR\fB\fIarch\fR\fR [\fB\-m\ \fR\fB\fImachine\fR\fR] \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-a\ \fR\fB\fIarch\fR\fR [\fB\-m\ \fR\fB\fImachine\fR\fR] \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different target architectures. Each target architecture can support one or more machine architectures.
+The standard Yasm distribution includes a number of modules for different target architectures\&. Each target architecture can support one or more machine architectures\&.
 .PP
 The architecture and machine are selected on the
 \fByasm\fR(1)
@@ -25,9 +33,9 @@
 \fB\-a \fR\fB\fIarch\fR\fR
 and
 \fB\-m \fR\fB\fImachine\fR\fR
-command line options, respectively.
+command line options, respectively\&.
 .PP
-The machine architecture may also automatically be selected by certain object formats. For example, the
+The machine architecture may also automatically be selected by certain object formats\&. For example, the
 \(lqelf32\(rq
 object format selects the
 \(lqx86\(rq
@@ -35,367 +43,533 @@
 \(lqelf64\(rq
 object format selects the
 \(lqamd64\(rq
-machine architecture by default.
+machine architecture by default\&.
 .SH "X86 ARCHITECTURE"
 .PP
 The
 \(lqx86\(rq
-architecture supports the IA\-32 instruction set and derivatives and the AMD64 instruction set. It consists of two machines:
+architecture supports the IA\-32 instruction set and derivatives and the AMD64 instruction set\&. It consists of two machines:
 \(lqx86\(rq
 (for the IA\-32 and derivatives) and
 \(lqamd64\(rq
-(for the AMD64 and derivatives). The default machine for the
+(for the AMD64 and derivatives)\&. The default machine for the
 \(lqx86\(rq
 architecture is the
 \(lqx86\(rq
-machine.
+machine\&.
 .SS "BITS Setting"
 .PP
-The x86 architecture BITS setting specifies to Yasm the processor mode in which the generated code is intended to execute. x86 processors can run in three different major execution modes: 16\-bit, 32\-bit, and on AMD64\-supporting processors, 64\-bit. As the x86 instruction set contains portions whose function is execution\-mode dependent (such as operand\-size and address\-size override prefixes), Yasm cannot assemble x86 instructions correctly unless it is told by the user in what processor mode the code will execute.
+The x86 architecture BITS setting specifies to Yasm the processor mode in which the generated code is intended to execute\&. x86 processors can run in three different major execution modes: 16\-bit, 32\-bit, and on AMD64\-supporting processors, 64\-bit\&. As the x86 instruction set contains portions whose function is execution\-mode dependent (such as operand\-size and address\-size override prefixes), Yasm cannot assemble x86 instructions correctly unless it is told by the user in what processor mode the code will execute\&.
 .PP
-The BITS setting can be changed in a variety of ways. When using the NASM\-compatible parser, the BITS setting can be changed directly via the use of the
+The BITS setting can be changed in a variety of ways\&. When using the NASM\-compatible parser, the BITS setting can be changed directly via the use of the
 \fBBITS xx\fR
-assembler directive. The default BITS setting is determined by the object format in use.
+assembler directive\&. The default BITS setting is determined by the object format in use\&.
 .SS "BITS 64 Extensions"
 .PP
-The AMD64 architecture is a new 64\-bit architecture developed by AMD, based on the 32\-bit x86 architecture. It extends the original x86 architecture by doubling the number of general purpose and SIMD registers, extending the arithmetic operations and address space to 64 bits, as well as other features.
+The AMD64 architecture is a new 64\-bit architecture developed by AMD, based on the 32\-bit x86 architecture\&. It extends the original x86 architecture by doubling the number of general purpose and SIMD registers, extending the arithmetic operations and address space to 64 bits, as well as other features\&.
 .PP
-Recently, Intel has introduced an essentially identical version of AMD64 called EM64T.
+Recently, Intel has introduced an essentially identical version of AMD64 called EM64T\&.
 .PP
-When an AMD64\-supporting processor is executing in 64\-bit mode, a number of additional extensions are available, including extra general purpose registers, extra SSE2 registers, and RIP\-relative addressing.
+When an AMD64\-supporting processor is executing in 64\-bit mode, a number of additional extensions are available, including extra general purpose registers, extra SSE2 registers, and RIP\-relative addressing\&.
 .PP
-Yasm extends the base NASM syntax to support AMD64 as follows. To enable assembly of instructions for the 64\-bit mode of AMD64 processors, use the directive
-\fBBITS 64\fR. As with NASM's BITS directive, this does not change the format of the output object file to 64 bits; it only changes the assembler mode to assume that the instructions being assembled will be run in 64\-bit mode. To specify an AMD64 object file, use
+Yasm extends the base NASM syntax to support AMD64 as follows\&. To enable assembly of instructions for the 64\-bit mode of AMD64 processors, use the directive
+\fBBITS 64\fR\&. As with NASM\'s BITS directive, this does not change the format of the output object file to 64 bits; it only changes the assembler mode to assume that the instructions being assembled will be run in 64\-bit mode\&. To specify an AMD64 object file, use
 \fB\-m amd64\fR
 on the Yasm command line, or explicitly target a 64\-bit object format such as
 \fB\-f win64\fR
 or
-\fB\-f elf64\fR.
+\fB\-f elf64\fR\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBRegister Changes\fR
-.RS
+.RS 4
 .PP
-The additional 64\-bit general purpose registers are named r8\-r15. There are also 8\-bit (rXb), 16\-bit (rXw), and 32\-bit (rXd) subregisters that map to the least significant 8, 16, or 32 bits of the 64\-bit register. The original 8 general purpose registers have also been extended to 64\-bits: eax, edx, ecx, ebx, esi, edi, esp, and ebp have new 64\-bit versions called rax, rdx, rcx, rbx, rsi, rdi, rsp, and rbp respectively. The old 32\-bit registers map to the least significant bits of the new 64\-bit registers.
+The additional 64\-bit general purpose registers are named r8\-r15\&. There are also 8\-bit (rXb), 16\-bit (rXw), and 32\-bit (rXd) subregisters that map to the least significant 8, 16, or 32 bits of the 64\-bit register\&. The original 8 general purpose registers have also been extended to 64\-bits: eax, edx, ecx, ebx, esi, edi, esp, and ebp have new 64\-bit versions called rax, rdx, rcx, rbx, rsi, rdi, rsp, and rbp respectively\&. The old 32\-bit registers map to the least significant bits of the new 64\-bit registers\&.
 .PP
-New 8\-bit registers are also available that map to the 8 least significant bits of rsi, rdi, rsp, and rbp. These are called sil, dil, spl, and bpl respectively. Unfortunately, due to the way instructions are encoded, these new 8\-bit registers are encoded the same as the old 8\-bit registers ah, dh, ch, and bh. The processor tells which is being used by the presence of the new REX prefix that is used to specify the other extended registers. This means it is illegal to mix the use of ah, dh, ch, and bh with an instruction that requires the REX prefix for other reasons. For instance:
+New 8\-bit registers are also available that map to the 8 least significant bits of rsi, rdi, rsp, and rbp\&. These are called sil, dil, spl, and bpl respectively\&. Unfortunately, due to the way instructions are encoded, these new 8\-bit registers are encoded the same as the old 8\-bit registers ah, dh, ch, and bh\&. The processor tells which is being used by the presence of the new REX prefix that is used to specify the other extended registers\&. This means it is illegal to mix the use of ah, dh, ch, and bh with an instruction that requires the REX prefix for other reasons\&. For instance:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add ah, [r10]
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-(NASM syntax) is not a legal instruction because the use of r10 requires a REX prefix, making it impossible to use ah.
+(NASM syntax) is not a legal instruction because the use of r10 requires a REX prefix, making it impossible to use ah\&.
 .PP
-In 64\-bit mode, an additional 8 SSE2 registers are also available. These are named xmm8\-xmm15.
+In 64\-bit mode, an additional 8 SSE2 registers are also available\&. These are named xmm8\-xmm15\&.
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fB64 Bit Instructions\fR
-.RS
+.RS 4
 .PP
-By default, most operations in 64\-bit mode remain 32\-bit; operations that are 64\-bit usually require a REX prefix (one bit in the REX prefix determines whether an operation is 64\-bit or 32\-bit). Thus, essentially all 32\-bit instructions have a 64\-bit version, and the 64\-bit versions of instructions can use extended registers
+By default, most operations in 64\-bit mode remain 32\-bit; operations that are 64\-bit usually require a REX prefix (one bit in the REX prefix determines whether an operation is 64\-bit or 32\-bit)\&. Thus, essentially all 32\-bit instructions have a 64\-bit version, and the 64\-bit versions of instructions can use extended registers
 \(lqfor free\(rq
-(as the REX prefix is already present). Examples in NASM syntax:
+(as the REX prefix is already present)\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov eax, 1  ; 32\-bit instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, 1  ; 64\-bit instruction
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-Instructions that modify the stack (push, pop, call, ret, enter, and leave) are implicitly 64\-bit. Their 32\-bit counterparts are not available, but their 16\-bit counterparts are. Examples in NASM syntax:
+Instructions that modify the stack (push, pop, call, ret, enter, and leave) are implicitly 64\-bit\&. Their 32\-bit counterparts are not available, but their 16\-bit counterparts are\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 push eax  ; illegal instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 push rbx  ; 1\-byte instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 push r11  ; 2\-byte instruction with REX prefix
 .fi
+.if n \{\
 .RE
+.\}
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBImplicit Zero Extension\fR
-.RS
+.RS 4
 .PP
-Results of 32\-bit operations are implicitly zero\-extended to the upper 32 bits of the corresponding 64\-bit register. 16 and 8 bit operations, on the other hand, do not affect upper bits of the register (just as in 32\-bit and 16\-bit modes). This can be used to generate smaller code in some instances. Examples in NASM syntax:
+Results of 32\-bit operations are implicitly zero\-extended to the upper 32 bits of the corresponding 64\-bit register\&. 16 and 8 bit operations, on the other hand, do not affect upper bits of the register (just as in 32\-bit and 16\-bit modes)\&. This can be used to generate smaller code in some instances\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov ecx, 1  ; 1 byte shorter than mov rcx, 1
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 and edx, 3  ; equivalent to and rdx, 3
 .fi
+.if n \{\
 .RE
+.\}
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBImmediates\fR
-.RS
+.RS 4
 .PP
-For most instructions in 64\-bit mode, immediate values remain 32 bits; their value is sign\-extended into the upper 32 bits of the target register prior to being used. The exception is the mov instruction, which can take a 64\-bit immediate when the destination is a 64\-bit register. Examples in NASM syntax:
+For most instructions in 64\-bit mode, immediate values remain 32 bits; their value is sign\-extended into the upper 32 bits of the target register prior to being used\&. The exception is the mov instruction, which can take a 64\-bit immediate when the destination is a 64\-bit register\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, 1           ; optimized down to signed 8\-bit
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, dword 1     ; force size to 32\-bit
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, 0xffffffff  ; sign\-extended 32\-bit
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, \-1          ; same as above
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, 0xffffffffffffffff ; truncated to 32\-bit (warning)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov eax, 1           ; 5 byte
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rax, 1           ; 5 byte (optimized to signed 32\-bit)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rax, qword 1     ; 10 byte (forced 64\-bit)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rbx, 0x1234567890abcdef ; 10 byte
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, 0xffffffff  ; 10 byte (does not fit in signed 32\-bit)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov ecx, \-1          ; 5 byte, equivalent to above
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, sym         ; 5 byte, 32\-bit size default for symbols
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, qword sym   ; 10 byte, override default size
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-The handling of mov reg64, unsized immediate is different between YASM and NASM 2.x; YASM follows the above behavior, while NASM 2.x does the following:
+The handling of mov reg64, unsized immediate is different between YASM and NASM 2\&.x; YASM follows the above behavior, while NASM 2\&.x does the following:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, 0xffffffff  ; sign\-extended 32\-bit immediate
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, \-1          ; same as above
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, 0xffffffffffffffff ; truncated 32\-bit (warning)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add rax, sym         ; sign\-extended 32\-bit immediate
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov eax, 1           ; 5 byte (32\-bit immediate)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rax, 1           ; 10 byte (64\-bit immediate)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rbx, 0x1234567890abcdef ; 10 byte instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, 0xffffffff  ; 10 byte instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov ecx, \-1          ; 5 byte, equivalent to above
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov ecx, sym         ; 5 byte (32\-bit immediate)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, sym         ; 10 byte instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, qword sym   ; 10 byte (64\-bit immediate)
 .fi
+.if n \{\
 .RE
+.\}
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBDisplacements\fR
-.RS
+.RS 4
 .PP
-Just like immediates, displacements, for the most part, remain 32 bits and are sign extended prior to use. Again, the exception is one restricted form of the mov instruction: between the al/ax/eax/rax register and a 64\-bit absolute address (no registers allowed in the effective address). In NASM syntax, use of the 64\-bit absolute form requires
-\fB[qword]\fR. Examples in NASM syntax:
+Just like immediates, displacements, for the most part, remain 32 bits and are sign extended prior to use\&. Again, the exception is one restricted form of the mov instruction: between the al/ax/eax/rax register and a 64\-bit absolute address (no registers allowed in the effective address)\&. In NASM syntax, use of the 64\-bit absolute form requires
+\fB[qword]\fR\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov eax, [1]    ; 32 bit, with sign extension
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov al, [rax\-1] ; 32 bit, with sign extension
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov al, [qword 0x1122334455667788] ; 64\-bit absolute
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov al, [0x1122334455667788] ; truncated to 32\-bit (warning)
 .fi
+.if n \{\
 .RE
+.\}
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBRIP Relative Addressing\fR
-.RS
+.RS 4
 .PP
-In 64\-bit mode, a new form of effective addressing is available to make it easier to write position\-independent code. Any memory reference may be made RIP relative (RIP is the instruction pointer register, which contains the address of the location immediately following the current instruction).
+In 64\-bit mode, a new form of effective addressing is available to make it easier to write position\-independent code\&. Any memory reference may be made RIP relative (RIP is the instruction pointer register, which contains the address of the location immediately following the current instruction)\&.
 .PP
 In NASM syntax, there are two ways to specify RIP\-relative addressing:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov dword [rip+10], 1
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-stores the value 1 ten bytes after the end of the instruction.
+stores the value 1 ten bytes after the end of the instruction\&.
 \fB10\fR
-can also be a symbolic constant, and will be treated the same way. On the other hand,
+can also be a symbolic constant, and will be treated the same way\&. On the other hand,
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov dword [symb wrt rip], 1
 .fi
+.if n \{\
 .RE
+.\}
 .PP
 stores the value 1 into the address of symbol
-\fBsymb\fR. This is distinctly different than the behavior of:
+\fBsymb\fR\&. This is distinctly different than the behavior of:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov dword [symb+rip], 1
 .fi
+.if n \{\
 .RE
+.\}
 .PP
 which takes the address of the end of the instruction, adds the address of
 \fBsymb\fR
-to it, then stores the value 1 there. If
+to it, then stores the value 1 there\&. If
 \fBsymb\fR
 is a variable, this will
 \fInot\fR
@@ -405,164 +579,249 @@
 .PP
 Yasm also supports the following syntax for RIP\-relative addressing:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [rel sym], rax  ; RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [abs sym], rax  ; not RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .PP
 The behavior of:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [sym], rax
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-Depends on a mode set by the DEFAULT directive, as follows. The default mode is always "abs", and in "rel" mode, use of registers, an fs or gs segment override, or an explicit "abs" override will result in a non\-RIP\-relative effective address.
+Depends on a mode set by the DEFAULT directive, as follows\&. The default mode is always "abs", and in "rel" mode, use of registers, an fs or gs segment override, or an explicit "abs" override will result in a non\-RIP\-relative effective address\&.
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 default rel
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [sym], rbx      ; RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [abs sym], rbx  ; not RIP\-relative (explicit override)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [rbx+1], rbx    ; not RIP\-relative (register use)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [fs:sym], rbx   ; not RIP\-relative (fs or gs use)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [ds:sym], rbx   ; RIP\-relative (segment, but not fs or gs)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [rel sym], rbx  ; RIP\-relative (redundant override)
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 default abs
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [sym], rbx      ; not RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [abs sym], rbx  ; not RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [rbx+1], rbx    ; not RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [fs:sym], rbx   ; not RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [ds:sym], rbx   ; not RIP\-relative
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov [rel sym], rbx  ; RIP\-relative (explicit override)
 .fi
+.if n \{\
 .RE
+.\}
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBMemory references\fR
-.RS
+.RS 4
 .PP
-Usually the size of a memory reference can be deduced by which registers you're moving\-\-for example, "mov [rax],ecx" is a 32\-bit move, because ecx is 32 bits. YASM currently gives the non\-obvious "invalid combination of opcode and operands" error if it can't figure out how much memory you're moving. The fix in this case is to add a memory size specifier: qword, dword, word, or byte.
+Usually the size of a memory reference can be deduced by which registers you\'re moving\-\-for example, "mov [rax],ecx" is a 32\-bit move, because ecx is 32 bits\&. YASM currently gives the non\-obvious "invalid combination of opcode and operands" error if it can\'t figure out how much memory you\'re moving\&. The fix in this case is to add a memory size specifier: qword, dword, word, or byte\&.
 .PP
-Here's a 64\-bit memory move, which sets 8 bytes starting at rax:
+Here\'s a 64\-bit memory move, which sets 8 bytes starting at rax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov qword [rax], 1
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-Here's a 32\-bit memory move, which sets 4 bytes:
+Here\'s a 32\-bit memory move, which sets 4 bytes:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov dword [rax], 1
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-Here's a 16\-bit memory move, which sets 2 bytes:
+Here\'s a 16\-bit memory move, which sets 2 bytes:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov word [rax], 1
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-Here's an 8\-bit memory move, which sets 1 byte:
+Here\'s an 8\-bit memory move, which sets 1 byte:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov byte [rax], 1
 .fi
+.if n \{\
 .RE
+.\}
 .RE
 .SH "LC3B ARCHITECTURE"
 .PP
 The
 \(lqlc3b\(rq
-architecture supports the LC\-3b ISA as used in the ECE 312 (now ECE 411) course at the University of Illinois, Urbana\-Champaign, as well as other university courses. See
-\fI\%http://courses.ece.uiuc.edu/ece411/\fR
-for more details and example code. The
+architecture supports the LC\-3b ISA as used in the ECE 312 (now ECE 411) course at the University of Illinois, Urbana\-Champaign, as well as other university courses\&. See
+\m[blue]\fB\%http://courses.ece.uiuc.edu/ece411/\fR\m[]
+for more details and example code\&. The
 \(lqlc3b\(rq
 architecture consists of only one machine:
-\(lqlc3b\(rq.
+\(lqlc3b\(rq\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1)
@@ -574,17 +833,17 @@
 \fBBITS 64\fR
 directive) and generate a 32\-bit object file (by failing to specify
 \fB\-m amd64\fR
-on the command line or selecting a 64\-bit object format). Similarly, specifying
+on the command line or selecting a 64\-bit object format)\&. Similarly, specifying
 \fB\-m amd64\fR
-does not default the BITS setting to 64. An easy way to avoid this is by directly specifying a 64\-bit object format such as
-\fB\-f elf64\fR.
+does not default the BITS setting to 64\&. An easy way to avoid this is by directly specifying a 64\-bit object format such as
+\fB\-f elf64\fR\&.
 .SH "AUTHOR"
 .PP
-\fBPeter Johnson\fR <\&peter@tortall.net\&>
-.sp -1n
-.IP "" 4
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2004, 2005, 2006, 2007 Peter Johnson
 .br
-

yasm-1.1.0.tar.gz/yasm_dbgfmts.7 -> yasm-1.2.0.tar.gz/yasm_dbgfmts.7 Changed

@@ -1,53 +1,63 @@
+'\" t
 .\"     Title: yasm_dbgfmts
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: October 2006
 .\"    Manual: Yasm Supported Debug Formats
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_DBGFMTS" "7" "October 2006" "Yasm" "Yasm Supported Debug Formats"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_dbgfmts \- Yasm Supported Debugging Formats
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-g\ \fR\fB\fIdbgfmt\fR\fR \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-g\ \fR\fB\fIdbgfmt\fR\fR \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different debugging formats. The debugging information is embedded into the object file. Use of a non\-\(lqnull\(rq
-debug format also causes Yasm to output all symbols to the object file (including local symbols).
+The standard Yasm distribution includes a number of modules for different debugging formats\&. The debugging information is embedded into the object file\&. Use of a non\-\(lqnull\(rq
+debug format also causes Yasm to output all symbols to the object file (including local symbols)\&.
 .PP
 The debug format is selected on the
 \fByasm\fR(1)
 command line by use of the
 \fB\-g \fR\fB\fIdbgfmt\fR\fR
-command line option.
+command line option\&.
 .SH "CV8"
 .PP
-The CV8 debug format is used by Microsoft Visual Studio 2005 (version 8.0) and is completely undocumented, although it bears strong similarities to earlier CodeView formats. Yasm's support for the CV8 debug format is currently limited to generating assembly\-level line number information (to allow some level of source\-level debugging). The CV8 debug information is stored in the .debug$S and .debug$T sections of the Win64 object file.
+The CV8 debug format is used by Microsoft Visual Studio 2005 (version 8\&.0) and is completely undocumented, although it bears strong similarities to earlier CodeView formats\&. Yasm\'s support for the CV8 debug format is currently limited to generating assembly\-level line number information (to allow some level of source\-level debugging)\&. The CV8 debug information is stored in the \&.debug$S and \&.debug$T sections of the Win64 object file\&.
 .SH "DWARF2"
 .PP
-The DWARF 2 debug format is a complex, well\-documented standard for debugging information. It was created to overcome shortcomings in STABS, allowing for much more detailed and compact descriptions of data structures, data variable movement, and complex language structures such as in C++. The debugging information is stored in sections (just like normal program sections) in the object file. Yasm supports full pass\-through of DWARF2 debugging information (e.g. from a C++ compiler), and can also generate assembly\-level line number information.
+The DWARF 2 debug format is a complex, well\-documented standard for debugging information\&. It was created to overcome shortcomings in STABS, allowing for much more detailed and compact descriptions of data structures, data variable movement, and complex language structures such as in C++\&. The debugging information is stored in sections (just like normal program sections) in the object file\&. Yasm supports full pass\-through of DWARF2 debugging information (e\&.g\&. from a C++ compiler), and can also generate assembly\-level line number information\&.
 .SH "NULL"
 .PP
 The
 \(lqnull\(rq
-debug format is a placeholder; it adds no debugging information to the output file.
+debug format is a placeholder; it adds no debugging information to the output file\&.
 .SH "STABS"
 .PP
-The STABS debug format is a poorly documented, semi\-standard format for debugging information in COFF and ELF object files. The debugging information is stored as part of the object file's symbol table and thus is limited in complexity and scope. Despite this, STABS is a common debugging format on older Unix and compatible systems, as well as DJGPP.
+The STABS debug format is a poorly documented, semi\-standard format for debugging information in COFF and ELF object files\&. The debugging information is stored as part of the object file\'s symbol table and thus is limited in complexity and scope\&. Despite this, STABS is a common debugging format on older Unix and compatible systems, as well as DJGPP\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1),
 \fByasm_objfmts\fR(7)
 .SH "AUTHOR"
 .PP
-\fBPeter\fR \fBJohnson\fR <peter@tortall.net>
-.sp -1n
-.IP "" 3n
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2006 Peter Johnson
+.br

yasm-1.1.0.tar.gz/yasm_objfmts.7 -> yasm-1.2.0.tar.gz/yasm_objfmts.7 Changed

@@ -1,81 +1,91 @@
+'\" t
 .\"     Title: yasm_objfmts
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: February 2007
 .\"    Manual: Yasm Supported Object Formats
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_OBJFMTS" "7" "February 2007" "Yasm" "Yasm Supported Object Formats"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_objfmts \- Yasm Supported Object Formats
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-f\ \fR\fB\fIobjfmt\fR\fR \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-f\ \fR\fB\fIobjfmt\fR\fR \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different object formats (Yasm's primary output).
+The standard Yasm distribution includes a number of modules for different object formats (Yasm\'s primary output)\&.
 .PP
 The object format is selected on the
 \fByasm\fR(1)
 command line by use of the
 \fB\-f \fR\fB\fIobjfmt\fR\fR
-command line option.
+command line option\&.
 .SH "BIN"
 .PP
 The
 \(lqbin\(rq
-object format produces a flat\-format, non\-relocatable binary file. It is appropriate for producing DOS .COM executables or things like boot blocks. It supports only 3 sections and those sections are written in a predefined order to the output file.
+object format produces a flat\-format, non\-relocatable binary file\&. It is appropriate for producing DOS \&.COM executables or things like boot blocks\&. It supports only 3 sections and those sections are written in a predefined order to the output file\&.
 .SH "COFF"
 .PP
-The COFF object format is an older relocatable object format used on older Unix and compatible systems, and also (more recently) on the DJGPP development system for DOS.
+The COFF object format is an older relocatable object format used on older Unix and compatible systems, and also (more recently) on the DJGPP development system for DOS\&.
 .SH "DBG"
 .PP
 The
 \(lqdbg\(rq
 object format is not a
 \(lqreal\(rq
-object format; the output file it creates simply describes the sequence of calls made to it by Yasm and the final object and symbol table information in a human\-readable text format (that in a normal object format would get processed into that object format's particular binary representation). This object format is not intended for real use, but rather for debugging Yasm's internals.
+object format; the output file it creates simply describes the sequence of calls made to it by Yasm and the final object and symbol table information in a human\-readable text format (that in a normal object format would get processed into that object format\'s particular binary representation)\&. This object format is not intended for real use, but rather for debugging Yasm\'s internals\&.
 .SH "ELF"
 .PP
 The ELF object format really comes in two flavors:
 \(lqelf32\(rq
 (for 32\-bit targets) and
 \(lqelf64\(rq
-(for 64\-bit targets). ELF is a standard object format in common use on modern Unix and compatible systems (e.g. Linux, FreeBSD). ELF has complex support for relocatable and shared objects.
+(for 64\-bit targets)\&. ELF is a standard object format in common use on modern Unix and compatible systems (e\&.g\&. Linux, FreeBSD)\&. ELF has complex support for relocatable and shared objects\&.
 .SH "MACHO"
 .PP
 The Mach\-O object format really comes in two flavors:
 \(lqmacho32\(rq
 (for 32\-bit targets) and
 \(lqmacho64\(rq
-(for 64\-bit targets). Mach\-O is used as the object format on MacOS X. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs.
+(for 64\-bit targets)\&. Mach\-O is used as the object format on MacOS X\&. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs\&.
 .SH "RDF"
 .PP
-The RDOFF2 object format is a simple multi\-section format originally designed for NASM. It supports segment references but not WRT references. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking. A complete toolchain (linker, librarian, and loader) is distributed with NASM.
+The RDOFF2 object format is a simple multi\-section format originally designed for NASM\&. It supports segment references but not WRT references\&. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking\&. A complete toolchain (linker, librarian, and loader) is distributed with NASM\&.
 .SH "WIN32"
 .PP
-The Win32 object format produces object files compatible with Microsoft compilers (such as Visual C++) that target the 32\-bit x86 Windows platform. The object format itself is an extended version of COFF.
+The Win32 object format produces object files compatible with Microsoft compilers (such as Visual C++) that target the 32\-bit x86 Windows platform\&. The object format itself is an extended version of COFF\&.
 .SH "WIN64"
 .PP
 The Win64 object format produces object files compatible with Microsoft compilers that target the 64\-bit
 \(lqx64\(rq
-Windows platform. This format is very similar to the win32 object format, but produces 64\-bit objects.
+Windows platform\&. This format is very similar to the win32 object format, but produces 64\-bit objects\&.
 .SH "XDF"
 .PP
-The XDF object format is essentially a simplified version of COFF. It's a multi\-section relocatable format that supports 64\-bit physical and virtual addresses.
+The XDF object format is essentially a simplified version of COFF\&. It\'s a multi\-section relocatable format that supports 64\-bit physical and virtual addresses\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1),
 \fByasm_arch\fR(7)
 .SH "AUTHOR"
 .PP
-\fBPeter\fR \fBJohnson\fR <peter@tortall.net>
-.sp -1n
-.IP "" 3n
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2006 Peter Johnson
+.br

yasm-1.1.0.tar.gz/yasm_parsers.7 -> yasm-1.2.0.tar.gz/yasm_parsers.7 Changed

@@ -1,48 +1,58 @@
+'\" t
 .\"     Title: yasm_parsers
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: October 2006
 .\"    Manual: Yasm Supported Parsers
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_PARSERS" "7" "October 2006" "Yasm" "Yasm Supported Parsers"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_parsers \- Yasm Supported Parsers (Assembler Syntaxes)
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-p\ \fR\fB\fIparser\fR\fR [\fB\-r\ \fR\fB\fIpreproc\fR\fR] \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-p\ \fR\fB\fIparser\fR\fR [\fB\-r\ \fR\fB\fIpreproc\fR\fR] \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different parsers (assembler syntaxes).
+The standard Yasm distribution includes a number of modules for different parsers (assembler syntaxes)\&.
 .PP
 The parser is selected on the
 \fByasm\fR(1)
 command line by use of the
 \fB\-p \fR\fB\fIparser\fR\fR
-command line option.
+command line option\&.
 .SH "NASM PARSER"
 .PP
 NASM syntax, selected with
-\fB\-p nasm\fR, is the most full\-featured syntax supported by Yasm. Yasm is nearly 100% compatible with NASM for 16\-bit and 32\-bit x86 code. Yasm additionally supports 64\-bit AMD64 code with Yasm extensions to the NASM syntax; see
+\fB\-p nasm\fR, is the most full\-featured syntax supported by Yasm\&. Yasm is nearly 100% compatible with NASM for 16\-bit and 32\-bit x86 code\&. Yasm additionally supports 64\-bit AMD64 code with Yasm extensions to the NASM syntax; see
 \fByasm_arch\fR(7)
-for details. NASM syntax is the Yasm default.
+for details\&. NASM syntax is the Yasm default\&.
 .SH "GAS PARSER"
 .PP
-The GNU Assembler (GAS) is the de\-facto cross\-platform assembler for modern Unix systems, and is used as the backend for the GCC compiler. Yasm's support for GAS syntax is moderately good, although immature: not all directives are supported, and only 32\-bit x86 and AMD64 architectures are supported. There is also no support for the GAS preprocessor. Despite these limitations, Yasm's GAS syntax support is good enough to handle essentially all x86 and AMD64 GCC compiler output. The GAS parser can be selected with
-\fB\-p gas\fR.
+The GNU Assembler (GAS) is the de\-facto cross\-platform assembler for modern Unix systems, and is used as the backend for the GCC compiler\&. Yasm\'s support for GAS syntax is moderately good, although immature: not all directives are supported, and only 32\-bit x86 and AMD64 architectures are supported\&. Nearly all of the GAS preprocessor is also supported\&. Yasm\'s GAS syntax support is good enough to handle essentially all x86 and AMD64 GCC compiler output\&. The GAS parser can be selected with
+\fB\-p gas\fR\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1),
 \fByasm_arch\fR(7)
 .SH "AUTHOR"
 .PP
-\fBPeter\fR \fBJohnson\fR <peter@tortall.net>
-.sp -1n
-.IP "" 3n
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2006 Peter Johnson
+.br

Build Results
RPM Lint

Refresh

Comments for request 463 0

Request History

dnh created request over 11 years ago

Update to 0.9.9, no idea where I got the .ebuild from ...

mrdocs accepted request over 11 years ago

Thanks for the update. Keep them coming.